Merge branch 'develop'

GOB52 · GOB52 · commit 960ec9798964 · 2025-06-04T16:57:40.000+09:00
diff --git a/.github/workflows/Arduino-Lint-Check.yml b/.github/workflows/Arduino-Lint-Check.yml
@@ -1,17 +1,27 @@
 name: Arduino Lint Check
 on:
   push:
-    branches: [ master ]
+    branches: [ master, main ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, main ]
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: bash
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     name: Lint Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: arduino/arduino-lint-action@v1
+      - uses: actions/checkout@v4
+      - uses: arduino/arduino-lint-action@v2
         with:
           library-manager: update
           compliance: strict
-          project-type: all
+          project-type: all
diff --git a/.github/workflows/arduino-esp-v2-build-check.yml b/.github/workflows/arduino-esp-v2-build-check.yml
@@ -16,10 +16,6 @@ on:
       - 'src/unit/**.hpp'
       - 'src/unit/**.h'
       - 'src/unit/**.c'
-      - 'test/**.cpp'
-      - 'test/**.hpp'
-      - 'test/**.h'
-      - 'test/**.c'
       - 'examples/UnitUnified/**.ino'
       - 'examples/UnitUnified/**.cpp'
       - 'examples/UnitUnified/**.hpp'
@@ -32,10 +28,6 @@ on:
       - 'src/unit/**.hpp'
       - 'src/unit/**.h'
       - 'src/unit/**.c'
-      - 'test/**.cpp'
-      - 'test/**.hpp'
-      - 'test/**.h'
-      - 'test/**.c'
       - 'examples/UnitUnified/**.ino'
       - 'examples/UnitUnified/**.cpp'
       - 'examples/UnitUnified/**.hpp'
@@ -44,10 +36,19 @@ on:
       - '**arduino-esp-v2-build-check.yml'
   workflow_dispatch:
 
+defaults:
+  run:
+    shell: bash
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
     runs-on: ubuntu-latest
+    timeout-minutes: 5
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/arduino-esp-v3-build-check.yml b/.github/workflows/arduino-esp-v3-build-check.yml
@@ -15,10 +15,6 @@ on:
       - 'src/unit/**.hpp'
       - 'src/unit/**.h'
       - 'src/unit/**.c'
-      - 'test/**.cpp'
-      - 'test/**.hpp'
-      - 'test/**.h'
-      - 'test/**.c'
       - 'examples/UnitUnified/**.ino'
       - 'examples/UnitUnified/**.cpp'
       - 'examples/UnitUnified/**.hpp'
@@ -31,10 +27,6 @@ on:
       - 'src/unit/**.hpp'
       - 'src/unit/**.h'
       - 'src/unit/**.c'
-      - 'test/**.cpp'
-      - 'test/**.hpp'
-      - 'test/**.h'
-      - 'test/**.c'
       - 'examples/UnitUnified/**.ino'
       - 'examples/UnitUnified/**.cpp'
       - 'examples/UnitUnified/**.hpp'
@@ -43,10 +35,19 @@ on:
       - '**arduino-esp-v3-build-check.yml'
   workflow_dispatch:
 
+defaults:
+  run:
+    shell: bash
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
     runs-on: ubuntu-latest
+    timeout-minutes: 5
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/arduino-m5-build-check.yml b/.github/workflows/arduino-m5-build-check.yml
@@ -16,10 +16,6 @@ on:
       - 'src/unit/**.hpp'
       - 'src/unit/**.h'
       - 'src/unit/**.c'
-      - 'test/**.cpp'
-      - 'test/**.hpp'
-      - 'test/**.h'
-      - 'test/**.c'
       - 'examples/UnitUnified/**.ino'
       - 'examples/UnitUnified/**.cpp'
       - 'examples/UnitUnified/**.hpp'
@@ -32,10 +28,6 @@ on:
       - 'src/unit/**.hpp'
       - 'src/unit/**.h'
       - 'src/unit/**.c'
-      - 'test/**.cpp'
-      - 'test/**.hpp'
-      - 'test/**.h'
-      - 'test/**.c'
       - 'examples/UnitUnified/**.ino'
       - 'examples/UnitUnified/**.cpp'
       - 'examples/UnitUnified/**.hpp'
@@ -44,10 +36,19 @@ on:
       - '**arduino-m5-build-check.yml'
   workflow_dispatch:
 
+defaults:
+  run:
+    shell: bash
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
     runs-on: ubuntu-latest
+    timeout-minutes: 5
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
@@ -31,6 +31,14 @@ on:
       - '**.clang-format'
   workflow_dispatch:
 
+defaults:
+  run:
+    shell: bash
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   formatting-check:
     name: Formatting Check
diff --git a/.github/workflows/doxygen-gh-pages.yml b/.github/workflows/doxygen-gh-pages.yml
@@ -1,8 +1,16 @@
 name: Deploy Doxygen docuemnt on GitHub Pages
 on: [release, workflow_dispatch]
-branches:
+#branches:
 #  - main
 # - master
+defaults:
+  run:
+    shell: bash
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/platformio-build-check.yml b/.github/workflows/platformio-build-check.yml
@@ -12,10 +12,6 @@ on:
       - 'src/unit/**.hpp'
       - 'src/unit/**.h'
       - 'src/unit/**.c'
-      - 'test/**.cpp'
-      - 'test/**.hpp'
-      - 'test/**.h'
-      - 'test/**.c'
       - 'examples/UnitUnified/**.ino'
       - 'examples/UnitUnified/**.cpp'
       - 'examples/UnitUnified/**.hpp'
@@ -29,10 +25,6 @@ on:
       - 'src/unit/**.hpp'
       - 'src/unit/**.h'
       - 'src/unit/**.c'
-      - 'test/**.cpp'
-      - 'test/**.hpp'
-      - 'test/**.h'
-      - 'test/**.c'
       - 'examples/UnitUnified/**.ino'
       - 'examples/UnitUnified/**.cpp'
       - 'examples/UnitUnified/**.hpp'
@@ -42,10 +34,19 @@ on:
       - '**platformio.ini'
   workflow_dispatch:
 
+defaults:
+  run:
+    shell: bash
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: ${{ matrix.unit }}:${{ matrix.example }}@${{ matrix.board }}:${{ matrix.framework }}:${{ matrix.espressif32 }}
     runs-on: ubuntu-latest
+    timeout-minutes: 5
 
     strategy:
       fail-fast: false
diff --git a/examples/UnitUnified/UnitColor/PlotToSerial/main/PlotToSerial.cpp b/examples/UnitUnified/UnitColor/PlotToSerial/main/PlotToSerial.cpp
@@ -184,17 +184,17 @@ void loop()
             M5_LOGW("Detect saturation");
             lux = ct = cratio = 0;
         }
-        M5_LOGI("RGB(%3u,%3u,%3u) RGBC:%04X,%04X,%04X,%04X Sat?:%u IR:%d Lux:%.2f CTemp:%.2f CRATIO:%.2f", unit.R8(),
-                unit.G8(), unit.B8(), oldest.R16(), oldest.G16(), oldest.B16(), oldest.C16(),
-                (oldest.C16() >= saturation), oldest.IR(), lux, ct, cratio);
+        M5.Log.printf("RGB(%3u,%3u,%3u) RGBC:%04X,%04X,%04X,%04X Sat?:%u IR:%d Lux:%.2f CTemp:%.2f CRATIO:%.2f\n",
+                      unit.R8(), unit.G8(), unit.B8(), oldest.R16(), oldest.G16(), oldest.B16(), oldest.C16(),
+                      (oldest.C16() >= saturation), oldest.IR(), lux, ct, cratio);
     }
 
     // Single shot
     if (M5.BtnA.wasClicked() || touch.wasClicked()) {
         Data d{};
         if (unit.stopPeriodicMeasurement() && unit.measureSingleshot(d)) {
-            M5_LOGI("\tSingle: RGB(%3u,%3u,%3u) RGBC:%04X,%04X,%04X,%04X", d.R8(), d.G8(), d.B8(), d.R16(), d.G16(),
-                    d.B16(), d.C16());
+            M5.Log.printf("\tSingle: RGB(%3u,%3u,%3u) RGBC:%04X,%04X,%04X,%04X\n", d.R8(), d.G8(), d.B8(), d.R16(),
+                          d.G16(), d.B16(), d.C16());
             unit.startPeriodicMeasurement();
         }
     }
diff --git a/library.json b/library.json
@@ -11,9 +11,9 @@
         "url": "https://github.com/m5stack/M5Unit-COLOR.git"
     },
     "dependencies": {
-        "M5UnitUnified": "https://github.com/m5stack/M5UnitUnified.git"
+        "m5stack/M5UnitUnified": ">=0.1.0"
     },
-    "version": "0.0.1",
+    "version": "0.1.0",
     "frameworks": [
         "arduino"
     ],
@@ -27,4 +27,4 @@
             "docs/html"
         ]
     }
-}
+}
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=M5Unit-COLOR
-version=0.0.1
+version=0.1.0
 author=M5Stack
 maintainer=M5Stack
 sentence=Library for M5Stack UNIT COLOR using M5UnitUnified
diff --git a/platformio.ini b/platformio.ini
@@ -10,7 +10,7 @@ lib_ldf_mode = deep
 test_framework = googletest
 test_build_src = true
 lib_deps=m5stack/M5Unified
-  m5stack/M5UnitUnified
+  m5stack/M5UnitUnified@>=0.1.0
 
 ; --------------------------------
 [m5base]
@@ -76,7 +76,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#idf-release/v5.1
+	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} 
diff --git a/src/unit/unit_TCS3472x.cpp b/src/unit/unit_TCS3472x.cpp
@@ -104,7 +104,7 @@ namespace unit {
 // class UnitTCS3472x
 const char UnitTCS3472x::name[] = "UnitTCS3472x";
 const types::uid_t UnitTCS3472x::uid{"UnitTCS3472x"_mmh3};
-const types::uid_t UnitTCS3472x::attr{0};
+const types::attr_t UnitTCS3472x::attr{attribute::AccessI2C};
 
 bool UnitTCS3472x::begin()
 {

Original file line number	Diff line number	Diff line change
`@@ -184,17 +184,17 @@ void loop()`
`184`	`184`	`M5_LOGW("Detect saturation");`
`185`	`185`	`lux = ct = cratio = 0;`
`186`	`186`	`}`
`187`		`- M5_LOGI("RGB(%3u,%3u,%3u) RGBC:%04X,%04X,%04X,%04X Sat?:%u IR:%d Lux:%.2f CTemp:%.2f CRATIO:%.2f", unit.R8(),`
`188`		`- unit.G8(), unit.B8(), oldest.R16(), oldest.G16(), oldest.B16(), oldest.C16(),`
`189`		`- (oldest.C16() >= saturation), oldest.IR(), lux, ct, cratio);`
	`187`	`+ M5.Log.printf("RGB(%3u,%3u,%3u) RGBC:%04X,%04X,%04X,%04X Sat?:%u IR:%d Lux:%.2f CTemp:%.2f CRATIO:%.2f\n",`
	`188`	`+ unit.R8(), unit.G8(), unit.B8(), oldest.R16(), oldest.G16(), oldest.B16(), oldest.C16(),`
	`189`	`+ (oldest.C16() >= saturation), oldest.IR(), lux, ct, cratio);`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`// Single shot`
`193`	`193`	`if (M5.BtnA.wasClicked() \|\| touch.wasClicked()) {`
`194`	`194`	`Data d{};`
`195`	`195`	`if (unit.stopPeriodicMeasurement() && unit.measureSingleshot(d)) {`
`196`		`- M5_LOGI("\tSingle: RGB(%3u,%3u,%3u) RGBC:%04X,%04X,%04X,%04X", d.R8(), d.G8(), d.B8(), d.R16(), d.G16(),`
`197`		`- d.B16(), d.C16());`
	`196`	`+ M5.Log.printf("\tSingle: RGB(%3u,%3u,%3u) RGBC:%04X,%04X,%04X,%04X\n", d.R8(), d.G8(), d.B8(), d.R16(),`
	`197`	`+ d.G16(), d.B16(), d.C16());`
`198`	`198`	`unit.startPeriodicMeasurement();`
`199`	`199`	`}`
`200`	`200`	`}`