Merge branch 'develop'

Author: GOB52

.github/workflows/clang-format-check.yml

@@ -60,7 +60,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Run clang-format style check for C/C++/Protobuf programs.
-        uses: jidicula/clang-format-action@v4.10.2 # Using include-regex 10.x or later
+        uses: jidicula/clang-format-action@v4.16.0 # Using include-regex 10.x or later
         with:
           clang-format-version: '13'
           check-path: ${{ matrix.path['check'] }}

library.json

@@ -14,7 +14,7 @@
         "m5stack/M5Utility": ">=0.0.9",
         "m5stack/M5HAL": "*"
     },
-    "version": "0.3.0",
+    "version": "0.3.1",
     "frameworks": [
         "arduino"
     ],

library.properties

@@ -1,5 +1,5 @@
 name=M5UnitUnified
-version=0.3.0
+version=0.3.1
 author=M5Stack
 maintainer=M5Stack
 sentence=M5UnitUnified is a library for unified handling of various M5 units products. (Alpha version)

src/M5UnitUnified.cpp

@@ -114,28 +114,35 @@ bool UnitUnified::add(Component& u, SPIClass& spi, const SPISettings& settings)
     return false;
 }
 
-// Add children if exists
+// Add children if exists (iterative to avoid stack overflow)
 bool UnitUnified::add_children(Component& u)
 {
-    auto it = u.childBegin();
-    while (it != u.childEnd()) {
-        auto ch = it->channel();
-
-        M5_LIB_LOGV("%s child:%s channel:%u", u.deviceName(), it->deviceName(), ch);
-        if (it->isRegistered()) {
-            M5_LIB_LOGE("Already registered %s", it->deviceName());
-            return false;
+    std::vector<Component*> stack;
+    stack.reserve(8);
+    stack.push_back(&u);
+
+    while (!stack.empty()) {
+        Component* parent = stack.back();
+        stack.pop_back();
+
+        for (auto it = parent->childBegin(); it != parent->childEnd(); ++it) {
+            auto ch = it->channel();
+
+            M5_LIB_LOGV("%s child:%s channel:%u", parent->deviceName(), it->deviceName(), ch);
+            if (it->isRegistered()) {
+                M5_LIB_LOGE("Already registered %s", it->deviceName());
+                return false;
+            }
+            it->_manager = this;
+            it->_adapter = parent->ensure_adapter(ch);
+            M5_LIB_LOGD("  Shared:%u %u", parent->_adapter.use_count(), it->_adapter.use_count());
+            it->_order = ++_registerCount;
+            _units.emplace_back(&*it);
+
+            if (it->hasChildren()) {
+                stack.push_back(&*it);
+            }
         }
-        it->_manager = this;
-        it->_adapter = u.ensure_adapter(ch);
-        M5_LIB_LOGD("  Shared:%u %u", u._adapter.use_count(), it->_adapter.use_count());
-        it->_order = ++_registerCount;
-        _units.emplace_back(&*it);
-
-        if (!add_children(*it)) {
-            return false;
-        }
-        ++it;
     }
     return true;
 }
@@ -175,13 +182,33 @@ std::string UnitUnified::debugInfo() const
 
 std::string UnitUnified::make_unit_info(const Component* u, const uint8_t indent) const
 {
-    std::string s = m5::utility::formatString("%*c%s\n", indent * 4, ' ', u->debugInfo().c_str());
-
-    if (u->hasChildren()) {
-        s += make_unit_info(u->_child, indent + 1);
+    std::string s;
+    s.reserve(256);
+
+    struct StackEntry {
+        const Component* node;
+        uint8_t indent;
+    };
+    std::vector<StackEntry> stack;
+    stack.reserve(16);
+    stack.push_back({u, indent});
+
+    while (!stack.empty()) {
+        auto entry = stack.back();
+        stack.pop_back();
+
+        s += m5::utility::formatString("%*c%s\n", entry.indent * 4, ' ', entry.node->debugInfo().c_str());
+
+        // Push sibling first (processed later = output later)
+        if (entry.node->_next) {
+            stack.push_back({entry.node->_next, entry.indent});
+        }
+        // Push child second (processed first = output first)
+        if (entry.node->hasChildren()) {
+            stack.push_back({entry.node->_child, static_cast<uint8_t>(entry.indent + 1)});
+        }
     }
-    u = u->_next;
-    return u ? s += make_unit_info(u, indent) : s;
+    return s;
 }
 
 }  // namespace unit

src/m5_unit_component/adapter_gpio.cpp

@@ -10,6 +10,7 @@
 */
 #include "adapter_gpio.hpp"
 #include <driver/gpio.h>
+#include <esp_idf_version.h>
 
 #if defined(M5_UNIT_UNIFIED_USING_RMT_V2)
 #pragma message "Using RMT v2,Oneshot"
@@ -19,6 +20,16 @@
 #include <driver/adc.h>
 #endif
 
+// ADC_ATTEN_DB_12 was introduced in ESP-IDF v4.4.7 / v5.1.3
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 3) \
+ || (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 7) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0))
+#pragma message "Exists ADC_ATTEN_DB_12"
+constexpr auto M5_ADC_ATTEN_DB = ADC_ATTEN_DB_12;
+#else
+#pragma message "Not exists ADC_ATTEN_DB_12"
+constexpr auto M5_ADC_ATTEN_DB = ADC_ATTEN_DB_11;
+#endif
+
 #if defined(SOC_DAC_SUPPORTED) && SOC_DAC_SUPPORTED
 #pragma message "DAC supported"
 
@@ -422,7 +433,7 @@ m5::hal::error::error_t AdapterGPIOBase::GPIOImpl::read_analog(uint16_t& value,
     }
 
     adc_oneshot_chan_cfg_t chan_config = {
-        .atten    = ADC_ATTEN_DB_12,      // 0~3.3V
+        .atten    = M5_ADC_ATTEN_DB,      // 0~3.3V
         .bitwidth = ADC_BITWIDTH_DEFAULT  // 12bit
     };
 
@@ -454,7 +465,7 @@ m5::hal::error::error_t AdapterGPIOBase::GPIOImpl::read_analog(uint16_t& value,
     // ADC1
     adc1_channel_t channel = static_cast<adc1_channel_t>(ch);
     adc1_config_width(ADC_WIDTH_BIT_12);
-    adc1_config_channel_atten(channel, ADC_ATTEN_DB_12);
+    adc1_config_channel_atten(channel, M5_ADC_ATTEN_DB);
     value = static_cast<uint16_t>(adc1_get_raw(channel));
     return m5::hal::error::error_t::OK;
 #endif

src/m5_unit_component/adapter_i2c.cpp

@@ -192,7 +192,7 @@ m5::hal::error::error_t AdapterI2C::BusImpl::readWithTransaction(uint8_t* data,
         if (acc) {
             auto trans  = acc.value();
             auto result = trans->startRead().and_then([&trans, &data, &len]() {
-                return trans->read(data, len).and_then([&trans](size_t&&) { return trans->stop(); });
+                return trans->readLastNack(data, len).and_then([&trans](size_t&&) { return trans->stop(); });
             });
             // Clean-up must be called
             auto eresult = this->_bus->endAccess(std::move(trans));

src/m5_unit_component/adapter_uart.cpp

@@ -34,7 +34,7 @@ void AdapterUART::SerialImpl::flush()
 void AdapterUART::SerialImpl::flushRX()
 {
     while (_serial->available()) {
-        _serial->read();  // Discard
+        (void)_serial->read();  // Discard
     }
 }