Merge branch 'develop'

Author: GOB52

.github/actions/pio_test_build/action.yml

@@ -59,7 +59,7 @@ runs:
       shell: bash
       run: |
         python -m pip install --upgrade pip
-        pip install --upgrade platformio
+        pip install --upgrade platformio intelhex
     - name: Run PlatformIO
       shell: bash
       run: |

.github/workflows/Arduino-Lint-Check.yml

@@ -18,6 +18,12 @@ jobs:
   lint:
     name: Lint Check
     runs-on: ubuntu-latest
+    timeout-minutes: 12
+    strategy:
+      max-parallel: 20
+      matrix:
+        include:
+          - shard: 1
     steps:
       - uses: actions/checkout@v4
       - uses: arduino/arduino-lint-action@v2

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

@@ -43,7 +43,9 @@ jobs:
   formatting-check:
     name: Formatting Check
     runs-on: ubuntu-latest
+    timeout-minutes: 12
     strategy:
+      max-parallel: 20
       matrix:
         path:
           #- check: './'    # path to include
@@ -59,11 +61,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          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'] }}

.github/workflows/doxygen-gh-pages.yml

@@ -14,6 +14,12 @@ concurrency:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    timeout-minutes: 12
+    strategy:
+      max-parallel: 20
+      matrix:
+        include:
+          - shard: 1
     steps:
       - name: Make document
         uses: m5stack/M5Utility/.github/actions/doxygen@develop

.github/workflows/platformio-build-check.yml

@@ -8,10 +8,10 @@ on:
     branches:
       - '*'
     paths:
-      - 'src/unit/**.cpp'
-      - 'src/unit/**.hpp'
-      - 'src/unit/**.h'
-      - 'src/unit/**.c'
+      - 'src/**.cpp'
+      - 'src/**.hpp'
+      - 'src/**.h'
+      - 'src/**.c'
       - 'test/**.cpp'
       - 'test/**.hpp'
       - 'test/**.h'
@@ -20,10 +20,10 @@ on:
       - '**/platformio.ini'
   pull_request:
     paths:
-      - 'src/unit/**.cpp'
-      - 'src/unit/**.hpp'
-      - 'src/unit/**.h'
-      - 'src/unit/**.c'
+      - 'src/**.cpp'
+      - 'src/**.hpp'
+      - 'src/**.h'
+      - 'src/**.c'
       - 'test/**.cpp'
       - 'test/**.hpp'
       - 'test/**.h'
@@ -42,10 +42,35 @@ concurrency:
 
 
 jobs:
+  native-test:
+    name: Native:Test
+    runs-on: ubuntu-latest
+    timeout-minutes: 12
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+          sudo apt-get update
+          sudo apt-get install -y libsdl2-dev
+
+      - name: Run native tests
+        run: |
+          pio test -e test_native -vv --project-dir ./ --project-conf ./platformio.ini
+
   build:
     name: ${{ matrix.board }}:${{ matrix.framework }}:${{ matrix.espressif32 }}
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 12
 
     strategy:
       fail-fast: false
@@ -59,14 +84,18 @@ jobs:
           - Fire
           - StampS3
           - Dial
-          - AtomMatrix
+          - Atom
           - AtomS3
           - AtomS3R
           - NanoC6
+          - NessoN1
           - StickCPlus
           - StickCPlus2
+          - StickS3
+          - Cardputer
           - Paper
           - CoreInk
+          - M5Tab
 
         framework:
           - Arduino
@@ -109,8 +138,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Build examples
         uses: m5stack/M5Utility/.github/actions/pio_test_build@develop

library.json

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

library.properties

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

platformio.ini

@@ -22,14 +22,10 @@ upload_speed = 1500000
 test_speed = 115200
 test_filter= embedded/*
 test_ignore= native/*
-platform = espressif32 @6.8.1
-framework = arduino
 
 [Core]
 extends = m5base
-board = m5stack-grey
-;m5stack-core-esp32-16M ;;6.8.0 or later
-;m5stack-core-esp32
+board = m5stack-core-esp32-16M
 lib_deps = ${env.lib_deps}
 
 [Core2]
@@ -59,7 +55,7 @@ board = m5stack-stamps3
 lib_deps = ${env.lib_deps}
   m5stack/M5Dial
 
-[AtomMatrix]
+[Atom]
 extends = m5base
 board = m5stack-atom
 lib_deps = ${env.lib_deps}
@@ -79,10 +75,7 @@ lib_deps = ${env.lib_deps}
 [NanoC6]
 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#3.0.7
-	platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1
+; nanoc6_latest
 board_build.partitions = default.csv
 lib_deps = ${env.lib_deps} 
 
@@ -97,6 +90,44 @@ extends = m5base
 board = m5stick-cplus2
 lib_deps = ${env.lib_deps}
 
+[StickS3]
+extends = m5base
+board = esp32-s3-devkitc-1
+board_build.arduino.partitions = default_8MB.csv
+board_build.arduino.memory_type = qio_opi
+build_flags =
+    -DESP32S3
+    -DBOARD_HAS_PSRAM
+    -mfix-esp32-psram-cache-issue
+    -DARDUINO_USB_CDC_ON_BOOT=1
+    -DARDUINO_USB_MODE=1
+lib_deps = ${env.lib_deps}
+
+[Cardputer]
+extends = m5base
+board = esp32-s3-devkitc-1
+build_flags =
+  -DESP32S3
+  -DARDUINO_USB_CDC_ON_BOOT=1
+  -DARDUINO_USB_MODE=1
+lib_deps = ${env.lib_deps}
+
+[M5Tab]
+extends = m5base
+board = esp32-p4-evboard
+board_build.mcu = esp32p4
+board_build.flash_mode = qio
+build_flags =
+    -DBOARD_HAS_PSRAM
+    -DARDUINO_USB_CDC_ON_BOOT=1
+    -DARDUINO_USB_MODE=1
+lib_deps = ${env.lib_deps}
+
+[NessoN1]
+extends = m5base
+board = arduino_nesso_n1
+lib_deps = ${env.lib_deps}
+
 [Paper]
 extends = m5base
 board = m5stack-fire
@@ -107,18 +138,42 @@ extends = m5base
 board = m5stack-coreink
 lib_deps = ${env.lib_deps}
 
-[sdl]
-build_flags = -O3 -xc++ -std=c++14 -lSDL2 
-  -arch arm64                                ; for arm mac
-  -I"/usr/local/include/SDL2"                ; for intel mac homebrew SDL2
-  -L"/usr/local/lib"                         ; for intel mac homebrew SDL2
-  -I"${sysenv.HOMEBREW_PREFIX}/include/SDL2" ; for arm mac homebrew SDL2
-  -L"${sysenv.HOMEBREW_PREFIX}/lib"          ; for arm mac homebrew SDL2
+[sdl_common]
+build_flags = -O3 -xc++ -std=c++14 -lSDL2
 platform = native
 test_filter= native/*
 test_ignore= embedded/*
 lib_deps = ${env.lib_deps}
 
+[sdl]
+extends = sdl_common
+
+[sdl_macos]
+extends = sdl_common
+build_flags = ${sdl_common.build_flags}
+  -arch arm64
+  -I"/usr/local/include/SDL2"
+  -L"/usr/local/lib"
+  -I"${sysenv.HOMEBREW_PREFIX}/include/SDL2"
+  -L"${sysenv.HOMEBREW_PREFIX}/lib"
+
+; --------------------------------
+;Choose framework
+[arduino_latest]
+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
+
 ; --------------------------------
 ;Choose build options
 [option_release]
@@ -159,58 +214,78 @@ build_flags = ${env.build_flags}
 extends = sdl, option_release 
 build_flags = ${sdl.build_flags} ${option_release.build_flags}
 
+[env:test_native_macos]
+extends = sdl_macos, option_release
+build_flags = ${sdl_macos.build_flags} ${option_release.build_flags}
+
 [env:test_Core]
-extends=Core, option_release
+extends=Core, option_release, arduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
 [env:test_Core2]
-extends=Core2, option_release
+extends=Core2, option_release, arduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
 [env:test_CoreS3]
-extends=CoreS3, option_release
+extends=CoreS3, option_release, arduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
 [env:test_Fire]
-extends=Fire, option_release
+extends=Fire, option_release, arduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
 [env:test_StampS3]
-extends=StampS3, option_release
+extends=StampS3, option_release, arduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
 [env:test_Dial]
-extends=Dial, option_release
+extends=Dial, option_release, arduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
-[env:test_AtomMatrix]
-extends=AtomMatrix, option_release
+[env:test_Atom]
+extends=Atom, option_release, arduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
 [env:test_AtomS3]
-extends=AtomS3, option_release
+extends=AtomS3, option_release, arduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
 [env:test_AtomS3R]
-extends=AtomS3R, option_release
+extends=AtomS3R, option_release, arduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
 [env:test_NanoC6]
-extends=NanoC6, option_release
+extends=NanoC6, option_release, nanoc6_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
 [env:test_StickCPlus]
-extends=StickCPlus, option_release
+extends=StickCPlus, option_release, arduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
 [env:test_StickCPlus2]
-extends=StickCPlus2, option_release
+extends=StickCPlus2, option_release, arduino_latest
+build_flags = ${env.build_flags} ${option_release.build_flags}
+
+[env:test_StickS3]
+extends=StickS3, option_release, arduino_latest
+build_flags = ${env.build_flags} ${option_release.build_flags}
+
+[env:test_Cardputer]
+extends=Cardputer, option_release, arduino_latest
+build_flags = ${env.build_flags} ${option_release.build_flags}
+
+[env:test_M5Tab]
+extends=M5Tab, option_release, pioarduino_latest
+build_flags = ${env.build_flags} ${option_release.build_flags}
+
+[env:test_NessoN1]
+extends=NessoN1, option_release, pioarduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
 [env:test_Paper]
-extends=Paper, option_release
+extends=Paper, option_release, arduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}
 
 [env:test_CoreInk]
-extends=CoreInk, option_release
+extends=CoreInk, option_release, arduino_latest
 build_flags = ${env.build_flags} ${option_release.build_flags}