Merge branch 'develop'

m5stack · Feb 27, 2025 · d9853ac · d9853ac
2 parents 9cacc00 + 4e9c63e
commit d9853ac
Show file tree

Hide file tree

Showing 28 changed files with 868 additions and 467 deletions.
diff --git a/.github/workflows/Arduino-Lint-Check.yml b/.github/workflows/Arduino-Lint-Check.yml
@@ -1,9 +1,19 @@
 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
@@ -14,4 +24,4 @@ jobs:
         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}}
+    name: ${{ matrix.build-properties }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
     runs-on: ubuntu-latest
+    timeout-minutes: 5
 
     strategy:
       fail-fast: false
@@ -58,10 +59,11 @@ jobs:
 
         sketch:
           - PlotToSerial
+          - SimpleDisplay
 
-        unit:
-          - UnitToF
-          - UnitToF4M
+#        unit:
+#          - UnitToF
+#          - UnitToF4M
 
         board:
           - m5stack-atom
@@ -81,22 +83,15 @@ jobs:
         archi:
           - esp32
 
-        include:
-          # Specific sketches for m5stack-core-esp32 only
-          - sketch: SimpleDisplay
-            platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-            platform: esp32
-            archi: esp32
-            platform-version: 2.0.17
-            board: m5stack-core-esp32
-            unit: UnitToF
-          - sketch: SimpleDisplay
-            platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-            platform: esp32
-            archi: esp32
-            platform-version: 2.0.17
-            board: m5stack-core-esp32
-            unit: UnitToF4M
+        build-properties:
+          - "-DUSING_UNIT_TOF"
+          - "-DUSING_UNIT_TOF4M"
+#          - "-DUSING_HAT_TOF"
+
+
+        exclude:
+          - board: m5stack-atom
+            sketch: SimpleDisplay
 
     steps:
       - name: Checkout
@@ -113,7 +108,7 @@ jobs:
           platform-url: ${{ matrix.platform-url }}
           required-libraries: ${{ env.REQUIRED_LIBRARIES }}
           extra-arduino-cli-args: ${{ matrix.cli-args }}
-          #build-properties: ${{ toJson(matrix.build-properties) }}
+          build-properties: ${{ matrix.build-properties }}
           sketch-names: ${{ matrix.sketch }}.ino
           sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
           #sketches-exclude: ${{ matrix.sketches-exclude }}
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}}
+    name: ${{ matrix.build-properties }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
     runs-on: ubuntu-latest
+    timeout-minutes: 5
 
     strategy:
       fail-fast: false
@@ -57,10 +58,12 @@ jobs:
 
         sketch:
           - PlotToSerial
+          - SimpleDisplay
 
-        unit:
-          - UnitToF
-          - UnitToF4M
+#        unit:
+#          - UnitToF
+#          - UnitToF4M
+#          - HatToF
 
         board:
           - m5stack_atom
@@ -89,31 +92,71 @@ jobs:
 #          - m5stack_unit_cams3
 
         platform-version:
-          - 3.0.4
+          - 3.1.3
 
         platform:
           - esp32
 
         archi:
           - esp32
 
+        build-properties:
+          - "-DUSING_UNIT_TOF"
+          - "-DUSING_UNIT_TOF4M"
+#          - "-DUSING_HAT_TOF"
+
+        exclude:
+          - board: m5stack_atom
+            sketch: SimpleDisplay
+          - board: m5stack_capsule
+            sketch: SimpleDisplay
+          - board: m5stack_nanoc6
+            sketch: SimpleDisplay
+          - board: m5stack_stamp_s3
+            sketch: SimpleDisplay
+
         include:
-          # Specific sketches for m5stack-core-esp32 only
+          # Specific sketches
+          - sketch: PlotToSerial
+            platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+            platform-version: 3.1.3
+            platform: esp32
+            archi: esp32
+            board: m5stack_stickc_plus
+            build-properties: "-DUSING_HAT_TOF"
+          - sketch: PlotToSerial
+            platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+            platform-version: 3.1.3
+            platform: esp32
+            archi: esp32
+            board: m5stack_stickc_plus2
+            build-properties: "-DUSING_HAT_TOF"
           - sketch: SimpleDisplay
             platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-            platform-version: 3.0.4
+            platform-version: 3.1.3
             platform: esp32
             archi: esp32
-            board: m5stack_core
-            unit: UnitToF
+            board: m5stack_stickc_plus
+            build-properties: "-DUSING_HAT_TOF"
           - sketch: SimpleDisplay
             platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-            platform-version: 3.0.4
+            platform-version: 3.1.3
             platform: esp32
             archi: esp32
-            board: m5stack_core
-            unit: UnitToF4M
-
+            board: m5stack_stickc_plus2
+            build-properties: "-DUSING_HAT_TOF"
+          - sketch: DualSensor
+            platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+            platform-version: 3.1.3
+            platform: esp32
+            archi: esp32
+            board: m5stack_stickc_plus
+          - sketch: DualSensor
+            platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+            platform-version: 3.1.3
+            platform: esp32
+            archi: esp32
+            board: m5stack_stickc_plus2
 
     steps:
       - name: Checkout
@@ -130,7 +173,7 @@ jobs:
           platform-url: ${{ matrix.platform-url }}
           required-libraries: ${{ env.REQUIRED_LIBRARIES }}
           extra-arduino-cli-args: ${{ matrix.cli-args }}
-          #build-properties: ${{ toJson(matrix.build-properties) }}
+          build-properties: ${{ matrix.build-properties }}
           sketch-names: ${{ matrix.sketch }}.ino
           sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
           #sketches-exclude: ${{ matrix.sketches-exclude }}