Merge branch 'develop'

Author: GOB52

boards/m5stack-nanoc6.json

@@ -2,7 +2,7 @@
     "build": {
 	"core": "esp32",
         "extra_flags": [
-            "-DARDUINO_M5STACK_NANOC6"
+            "-DARDUINO_M5STACK_NANO_C6"
         ],
 	"f_cpu": "160000000L",
 	"f_flash": "80000000L",
@@ -24,7 +24,7 @@
     "upload": {
 	"flash_size": "4MB",
 	"maximum_ram_size": 327680,
-	"maximum_size": 4194384,
+	"maximum_size": 4194304,
 	"require_upload_port": true,
 	"speed": 460800
     },

boards/m5stack-nanoh2.json

@@ -0,0 +1,34 @@
+{
+    "build": {
+        "core": "esp32",
+        "extra_flags": [
+            "-DARDUINO_M5STACK_NANO_H2"
+        ],
+        "f_cpu": "96000000L",
+        "f_flash": "16000000L",
+        "flash_mode": "qio",
+        "mcu": "esp32h2",
+        "variant": "esp32h2"
+    },
+    "connectivity": [
+        "bluetooth",
+        "zigbee"
+    ],
+    "debug": {
+        "openocd_target": "esp32h2.cfg"
+    },
+    "frameworks": [
+        "arduino",
+        "espidf"
+    ],
+    "name": "M5Stack NanoH2",
+    "upload": {
+        "flash_size": "4MB",
+        "maximum_ram_size": 327680,
+        "maximum_size": 4194304,
+        "require_upload_port": true,
+        "speed": 460800
+    },
+    "url": "https://docs.m5stack.com/en/core/NanoH2",
+    "vendor": "M5Stack"
+}

library.json

@@ -14,7 +14,7 @@
         "m5stack/M5Utility": ">=0.0.10",
         "m5stack/M5HAL": "*"
     },
-    "version": "0.4.6",
+    "version": "0.4.7",
     "frameworks": [
         "arduino"
     ],

library.properties

@@ -1,5 +1,5 @@
 name=M5UnitUnified
-version=0.4.6
+version=0.4.7
 author=M5Stack
 maintainer=M5Stack
 sentence=M5UnitUnified is a library for unified handling of various M5 units products.

platformio.ini

@@ -4,11 +4,9 @@
 [platformio]
 
 [env]
-build_flags = -Wall -Wextra -Wreturn-local-addr -Werror=format -Werror=return-local-addr
-
+build_flags = -Wall -Wextra -Wreturn-local-addr -Werror=format -Werror=return-local-addr -Wl,--allow-multiple-definition
 test_framework = googletest
 test_build_src = true
-
 lib_ldf_mode = deep
 lib_deps=m5stack/M5Unified
   m5stack/M5Utility
@@ -80,7 +78,18 @@ lib_deps = ${env.lib_deps}
 [NanoC6]
 extends = m5base
 board = m5stack-nanoc6
-board_build.partitions = default.csv
+build_flags =
+    -DARDUINO_USB_CDC_ON_BOOT=1
+    -DARDUINO_USB_MODE=1
+lib_deps = ${env.lib_deps}
+
+; Using ./boards/m5stack-nanoh2.json
+[NanoH2]
+extends = m5base
+board = m5stack-nanoh2
+build_flags =
+    -DARDUINO_USB_CDC_ON_BOOT=1
+    -DARDUINO_USB_MODE=1
 lib_deps = ${env.lib_deps}
 
 [StickCPlus]
@@ -131,6 +140,9 @@ extends = m5base
 board = esp32-p4-evboard
 board_build.mcu = esp32p4
 board_build.flash_mode = qio
+board_build.partitions = default_16MB.csv
+;monitor_dtr = 0
+;monitor_rts = 0
 build_flags =
     -DBOARD_HAS_PSRAM
     -DARDUINO_USB_CDC_ON_BOOT=1
@@ -161,13 +173,6 @@ lib_deps = ${env.lib_deps}
 platform = espressif32 @ 6.12.0
 framework = arduino
 
-[nanoc6_latest]
-platform = espressif32 @ 6.12.0
-platform_packages =
-	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
-framework = arduino
-
 [pioarduino_latest]
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.36/platform-espressif32.zip
 framework = arduino
@@ -218,12 +223,12 @@ lib_deps = google/googletest@1.12.1
 ; M5HAL, M5Utility, M5Unit-* are resolved via symlinks in lib/
 ; M5Unified via lib_deps (depends on M5GFX etc.)
 lib_extra_dirs = lib
-  .
-lib_deps = m5stack/M5Unified
+ .
+lib_deps = ${env.lib_deps}
   ${test_fw.lib_deps}
-; Temporarily broken libs (uncomment to skip)
-;lib_ignore = M5Unit-RFID
-;  M5Unit-CRYPTO
+lib_ignore = M5UnitUnified
+test_filter = embedded/test_update
+test_ignore = embedded/test_readme
 
 [env:test_Core]
 extends=Core, option_release, test_base, arduino_latest
@@ -253,8 +258,18 @@ extends=AtomS3, option_release, test_base, arduino_latest
 extends=AtomS3R, option_release, test_base, arduino_latest
 
 [env:test_NanoC6]
-extends=NanoC6, option_release, test_base, nanoc6_latest
-lib_ignore = bsec2
+extends=NanoC6, option_release, test_base, pioarduino_latest
+build_flags = ${NanoC6.build_flags}
+  ${option_release.build_flags}
+lib_ignore = ${test_base.lib_ignore}
+  bsec2
+
+[env:test_NanoH2]
+extends=NanoH2, option_release, test_base, pioarduino_latest
+build_flags = ${NanoH2.build_flags}
+  ${option_release.build_flags}
+lib_ignore = ${test_base.lib_ignore}
+  bsec2
 
 [env:test_StickCPlus]
 extends=StickCPlus, option_release, test_base, arduino_latest
@@ -282,6 +297,8 @@ build_flags = ${Cardputer.build_flags}
 extends=Tab5, option_release, test_base, pioarduino_latest
 build_flags = ${Tab5.build_flags}
   ${option_release.build_flags}
+lib_ignore = ${test_base.lib_ignore}
+  bsec2
 
 [env:test_NessoN1]
 extends=NessoN1, option_release, test_base, pioarduino_latest
@@ -292,10 +309,11 @@ extends=NessoN1, option_release, test_base, pioarduino_latest
 ; Works in CI without lib/ symlinks
 ; --------------------------------
 [readme_base]
-lib_deps = m5stack/M5Unified
-  m5stack/M5Utility
-  m5stack/M5HAL
+lib_extra_dirs = lib
+ .
+lib_deps = ${env.lib_deps}
   ${test_fw.lib_deps}
+lib_ignore = M5UnitUnified
 test_filter = embedded/test_readme
 test_ignore = embedded/test_update
 build_flags = ${option_release.build_flags}
@@ -329,7 +347,14 @@ extends=AtomS3, readme_base, arduino_latest
 extends=AtomS3R, readme_base, arduino_latest
 
 [env:test_readme_NanoC6]
-extends=NanoC6, readme_base, nanoc6_latest
+extends=NanoC6, readme_base, pioarduino_latest
+build_flags = ${NanoC6.build_flags}
+  ${option_release.build_flags}
+
+[env:test_readme_NanoH2]
+extends=NanoH2, readme_base, pioarduino_latest
+build_flags = ${NanoH2.build_flags}
+  ${option_release.build_flags}
 
 [env:test_readme_StickCPlus]
 extends=StickCPlus, readme_base, arduino_latest
@@ -357,6 +382,8 @@ build_flags = ${Cardputer.build_flags}
 extends=Tab5, readme_base, pioarduino_latest
 build_flags = ${Tab5.build_flags}
   ${readme_base.build_flags}
+lib_ignore = ${test_base.lib_ignore}
+  bsec2
 
 [env:test_readme_NessoN1]
 extends=NessoN1, readme_base, pioarduino_latest

src/M5UnitComponent.cpp

@@ -135,10 +135,35 @@ Component* Component::child(const uint8_t ch) const
 
 bool Component::assign(m5::hal::bus::Bus* bus)
 {
-    if (_addr) {
-        _adapter = std::make_shared<AdapterI2C>(bus, _addr, _component_cfg.clock);
+    if (!bus) {
+        return false;
+    }
+
+    // Bus type and unit access capability must agree
+    switch (bus->getBusType()) {
+        case m5::hal::types::BusType::I2C:
+            if (!canAccessI2C() || !_addr) return false;
+            _adapter = std::make_shared<AdapterI2C>(bus, _addr, _component_cfg.clock);
+            return static_cast<bool>(_adapter);
+
+        case m5::hal::types::BusType::SPI:
+            if (!canAccessSPI()) return false;
+            M5_LIB_LOGE("M5HAL SPI bus assign is not yet implemented");
+            return false;
+
+        case m5::hal::types::BusType::UART:
+            if (!canAccessUART()) return false;
+            M5_LIB_LOGE("M5HAL UART bus assign is not yet implemented");
+            return false;
+
+        case m5::hal::types::BusType::GPIO:
+            if (!canAccessGPIO()) return false;
+            M5_LIB_LOGE("M5HAL GPIO bus assign is not yet implemented");
+            return false;
+
+        default:
+            return false;
     }
-    return static_cast<bool>(_adapter);
 }
 
 bool Component::assign(TwoWire& wire)