Skip to content

Commit 8f9da9c

Browse files
committed
Merge branch 'develop'
2 parents 3e81ae3 + b16b01c commit 8f9da9c

File tree

6 files changed

+20
-6
lines changed

6 files changed

+20
-6
lines changed

library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"url": "https://github.com/m5stack/M5Utility.git"
1212
},
1313
"dependencies": [],
14-
"version": "0.0.5",
14+
"version": "0.0.6",
1515
"frameworks": [
1616
"arduino"
1717
],

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=M5Utility
2-
version=0.0.5
2+
version=0.0.6
33
author=M5Stack
44
maintainer=M5Stack
55
sentence=Library for other M5 libraries and products

src/m5_utility/compatibility_feature.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ IRAM_ATTR unsigned long millis()
2222
{
2323
return static_cast<unsigned long>(esp_timer_get_time() / 1000ULL);
2424
}
25+
2526
IRAM_ATTR unsigned long micros()
2627
{
2728
return static_cast<unsigned long>(esp_timer_get_time());

src/m5_utility/compatibility_feature.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ namespace utility {
2121
/*!
2222
@brief Returns the number of milliseconds passed since the Arduino board began running the current program
2323
*/
24-
IRAM_ATTR unsigned long millis();
24+
unsigned long millis();
2525

2626
/*!
2727
@brief Returns the number of microseconds since the Arduino board began running the current program
2828
*/
29-
IRAM_ATTR unsigned long micros();
29+
unsigned long micros();
3030

3131
/*!
3232
@brief Pauses the program for the amount of time (in milliseconds) specified as parameter
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2025 M5Stack Technology CO LTD
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*/
6+
/*!
7+
@file circular_buffer.cpp
8+
@brief Circular buffer with STL-like interface
9+
*/
10+
#include "circular_buffer.hpp"
11+
#if __cplusplus >= 201703L
12+
#pragma message "Using std::optional"
13+
#else
14+
#pragma message "Using m5::stl::optional"
15+
#endif

src/m5_utility/container/circular_buffer.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
#include <iterator>
1616
#include <cassert>
1717
#if __cplusplus >= 201703L
18-
#pragma message "Using std::optional"
1918
#include <optional>
2019
#else
21-
#pragma message "Using m5::stl::optional"
2220
#include "../stl/optional.hpp"
2321
#endif
2422

0 commit comments

Comments
 (0)