updated libraries

libraries/M5Utility/library.json

@@ -11,7 +11,7 @@
         "url": "https://github.com/m5stack/M5Utility.git"
     },
     "dependencies": [],
-    "version": "0.0.2",
+    "version": "0.0.3",
     "frameworks": [
         "arduino"
     ],

libraries/M5Utility/library.properties

@@ -1,5 +1,5 @@
 name=M5Utility
-version=0.0.2
+version=0.0.3
 author=M5Stack
 maintainer=M5Stack
 sentence=Library for other M5 libraries and products

libraries/M5Utility/platformio.ini

@@ -81,7 +81,7 @@ extends = m5base
 board = m5stack-nanoc6
 platform = https://github.com/platformio/platform-espressif32.git
 platform_packages =
-	platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git
+	platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.7
 	platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1
 board_build.partitions = default.csv
 lib_deps = ${env.lib_deps} 

libraries/M5Utility/src/M5Utility.hpp

@@ -30,6 +30,7 @@
 #include "m5_utility/string.hpp"
 #include "m5_utility/conversion.hpp"
 #include "m5_utility/math.hpp"
+#include "m5_utility/button_status.hpp"
 #include "m5_utility/misc.hpp"
 
 /*!

libraries/M5Utility/src/m5_utility/button_status.cpp

@@ -0,0 +1,84 @@
+/*
+ * SPDX-FileCopyrightText: 2025 M5Stack Technology CO LTD
+ *
+ * SPDX-License-Identifier: MIT
+ */
+/*!
+  @file button_status.cpp
+  @brief Button status management
+ */
+
+#include "button_status.hpp"
+
+namespace m5 {
+namespace utility {
+namespace button {
+
+void Status::setState(const uint32_t msec, const button_state_t state)
+{
+    if (_currentState == button_state_t::state_decide_click_count) {
+        _clickCount = 0;
+    }
+
+    _lastMsec        = msec;
+    bool flg_timeout = (msec - _lastClicked > _msecHold);
+    auto new_state   = state;
+    switch (state) {
+        case button_state_t::state_nochange:
+            if (flg_timeout && !_press && _clickCount) {
+                if (_oldPress == 0 && _currentState == button_state_t::state_nochange) {
+                    new_state = button_state_t::state_decide_click_count;
+                } else {
+                    _clickCount = 0;
+                }
+            }
+            break;
+
+        case button_state_t::state_clicked:
+            ++_clickCount;
+            _lastClicked = msec;
+            break;
+
+        default:
+            break;
+    }
+    _currentState = new_state;
+}
+
+void Status::setRawState(const uint32_t msec, const bool press)
+{
+    button_state_t state = button_state_t::state_nochange;
+    bool disable_db      = (msec - _lastMsec) > _msecDebounce;
+    auto oldPress        = _press;
+    _oldPress            = oldPress;
+    if (_raw_press != press) {
+        _raw_press     = press;
+        _lastRawChange = msec;
+    }
+    if (disable_db || msec - _lastRawChange >= _msecDebounce) {
+        if (press != (0 != oldPress)) {
+            _lastChange = msec;
+        }
+
+        if (press) {
+            uint32_t holdPeriod = msec - _lastChange;
+            _lastHoldPeriod     = holdPeriod;
+            if (!oldPress) {
+                _press = 1;
+            } else if (oldPress == 1 && (holdPeriod >= _msecHold)) {
+                _press = 2;
+                state  = button_state_t::state_hold;
+            }
+        } else {
+            _press = 0;
+            if (oldPress == 1) {
+                state = button_state_t::state_clicked;
+            }
+        }
+    }
+    setState(msec, state);
+}
+
+}  // namespace button
+}  // namespace utility
+}  // namespace m5

libraries/M5Utility/src/m5_utility/button_status.hpp

@@ -0,0 +1,182 @@
+/*
+ * SPDX-FileCopyrightText: 2025 M5Stack Technology CO LTD
+ *
+ * SPDX-License-Identifier: MIT
+ */
+/*!
+  @file button_status.hpp
+  @brief Button status management
+ */
+#ifndef M5_UTILITY_BUTTON_STATUS_HPP
+#define M5_UTILITY_BUTTON_STATUS_HPP
+
+#include <cstdint>
+
+namespace m5 {
+namespace utility {
+namespace button {
+
+/*!
+  @class m5::utility::button::Status
+  @brief Button status management
+  @note Class compatible with Button_Class in M5Unified
+ */
+class Status {
+public:
+    /*!
+      @enum button_state_t
+      @brief Button status
+     */
+    enum class button_state_t : uint8_t { state_nochange, state_clicked, state_hold, state_decide_click_count };
+
+    /*!
+      @brief Constructor
+      @param hold_ms Time to be considered hold(ms)
+      @param debounce_ms Debounce time(ms)
+     */
+    Status(const uint16_t hold_ms = 500, const uint16_t debounce_ms = 10)
+        : _msecHold{hold_ms}, _msecDebounce{debounce_ms}
+    {
+    }
+
+    ///@name Settings
+    ///@{
+    //! @brief Set debounce time(ms)
+    inline void setDebounceThreshold(const uint32_t msec)
+    {
+        _msecDebounce = msec;
+    }
+    //! @brief Set time to be considered hold(ms)
+    inline void setHoldThreshold(const uint32_t msec)
+    {
+        _msecHold = msec;
+    }
+    //! @brief Gets the debounce time(ms)
+    inline uint32_t getDebounceThreshold(void) const
+    {
+        return _msecDebounce;
+    }
+    //! @brief Gets the time to be considered hold(ms)
+    inline uint32_t getHoldThreshold(void) const
+    {
+        return _msecHold;
+    }
+    ///@}
+
+    ///@name Button status
+    ///@{
+    //! @brief Is pressed?
+    bool isPressed(void) const
+    {
+        return _press;
+    }
+    //! @brief Is released?
+    bool isReleased(void) const
+    {
+        return !_press;
+    }
+    //! @brief Returns true if the button is currently held pressed
+    bool isHolding(void) const
+    {
+        return _press == 2;
+    }
+    //! @brief Returns true if button was pressed
+    bool wasPressed(void) const
+    {
+        return !_oldPress && _press;
+    }
+    //! @brief Returns true if button was released
+    bool wasReleased(void) const
+    {
+        return _oldPress && !_press;
+    }
+    //! @brief Returns true when the button is pressed briefly and released
+    bool wasClicked(void) const
+    {
+        return _currentState == button_state_t::state_clicked;
+    }
+    //! @brief Returns true when the button has been held pressed for a while
+    bool wasHold(void) const
+    {
+        return _currentState == button_state_t::state_hold;
+    }
+    //! @brief Returns true when some time has passed since the button was single clicked
+    bool wasSingleClicked(void) const
+    {
+        return _currentState == button_state_t::state_decide_click_count && _clickCount == 1;
+    }
+    //! @brief Returns true when some time has passed since the button was double clicked
+    bool wasDoubleClicked(void) const
+    {
+        return _currentState == button_state_t::state_decide_click_count && _clickCount == 2;
+    }
+    //! @brief Returns true when some time has passed since the button was multiple clicked
+    bool wasDecideClickCount(void) const
+    {
+        return _currentState == button_state_t::state_decide_click_count;
+    }
+    //! @brief Gets the number of consecutive button clicks
+    uint8_t getClickCount(void) const
+    {
+        return _clickCount;
+    }
+    //! @brief Has the button press state changed?
+    bool wasChangePressed(void) const
+    {
+        return ((bool)_press) != ((bool)_oldPress);
+    }
+    //! @brief Pressed and released a button for more than the set hold time?
+    bool wasReleasedAfterHold(void) const
+    {
+        return !_press && _oldPress == 2;
+    }
+    //! @brief Was it pressed for more than the specified time?
+    bool wasReleaseFor(const uint32_t ms) const
+    {
+        return _oldPress && !_press && _lastHoldPeriod >= ms;
+    }
+    //! @brief Is pressed for more than the specified time?
+    bool pressedFor(const uint32_t ms) const
+    {
+        return (_press && _lastMsec - _lastChange >= ms);
+    }
+    //! @brief Is released for more than the specified time?
+    bool releasedFor(const uint32_t ms) const
+    {
+        return (!_press && _lastMsec - _lastChange >= ms);
+    }
+    ///@}
+
+    ///@name Status
+    ///@{
+    void setRawState(const uint32_t msec, const bool press);
+    void setState(const uint32_t msec, const button_state_t state);
+    inline button_state_t getState(void) const
+    {
+        return _currentState;
+    }
+    inline uint32_t lastChange(void) const
+    {
+        return _lastChange;
+    }
+    inline uint32_t getUpdateMsec(void) const
+    {
+        return _lastMsec;
+    }
+    ///@}
+
+private:
+    uint16_t _msecHold{500}, _msecDebounce{10};
+    uint32_t _lastMsec{}, _lastChange{}, _lastRawChange{}, _lastClicked{};
+    uint16_t _lastHoldPeriod{};
+    button_state_t _currentState{button_state_t::state_nochange};
+    bool _raw_press{};
+    // 0:release  1:click  2:holding
+    uint8_t _press{}, _oldPress{}, _clickCount{};
+};
+
+}  // namespace button
+}  // namespace utility
+}  // namespace m5
+
+#endif

libraries/M5Utility/src/m5_utility/container/circular_buffer.hpp

@@ -1,5 +1,5 @@
 /*
- * Spdx-FileCopyrightText: 2024 M5Stack Technology CO LTD
+ * SPDX-FileCopyrightText: 2024 M5Stack Technology CO LTD
  *
  * SPDX-License-Identifier: MIT
  */

libraries/M5Utility/src/m5_utility/types.hpp

@@ -1,5 +1,5 @@
 /*
- * Spdx-Filecopyrighttext: 2024 M5Stack Technology CO LTD
+ * SPDX-Filecopyrighttext: 2024 M5Stack Technology CO LTD
  *
  * SPDX-License-Identifier: MIT
  */