Add supported cores

m5stack · Oct 21, 2024 · 75a4a3c · 75a4a3c
1 parent 8cb83b1
commit 75a4a3c
Show file tree

Hide file tree

Showing 9 changed files with 288 additions and 72 deletions.
diff --git a/.github/workflows/arduino-esp-v2-build-check.yml b/.github/workflows/arduino-esp-v2-build-check.yml
@@ -8,6 +8,7 @@ on:
   push:
     tags-ignore:
       - '*.*.*'
+      - 'v*.*.*'
     branches:
       - '*'
     paths:
@@ -68,13 +69,9 @@ jobs:
           - m5stack-atoms3
           - m5stack-core-esp32
           - m5stack-core2
-#          - m5stack-coreink
+          - m5stack-coreink
           - m5stack-cores3
           - m5stack-fire
-#          - m5stack-station
-#          - m5stack-timer-cam
-#          - m5stamp-pico
-#          - m5stick-c
 
         platform-version:
           - 2.0.17

diff --git a/.github/workflows/arduino-esp-v3-build-check.yml b/.github/workflows/arduino-esp-v3-build-check.yml
@@ -3,11 +3,11 @@ name: Build(arduino-esp32:3.x)
 env:
   SKETCH_NAMES_FIND_START: ./examples/UnitUnified
   REQUIRED_LIBRARIES: M5Unified,M5UnitUnified
-
 on:
   push:
     tags-ignore:
       - '*.*.*'
+      - 'v*.*.*'
     branches:
       - '*'
     paths:
@@ -70,10 +70,9 @@ jobs:
 #          - m5stack_cardputer
           - m5stack_core
           - m5stack_core2
-#          - m5stack_coreink
+          - m5stack_coreink
           - m5stack_cores3
           - m5stack_dial
-#          - m5stack_dinmeter
           - m5stack_fire
           - m5stack_nanoc6
           - m5stack_paper

diff --git a/.github/workflows/arduino-m5-build-check.yml b/.github/workflows/arduino-m5-build-check.yml
@@ -8,6 +8,7 @@ on:
   push:
     tags-ignore:
       - '*.*.*'
+      - 'v*.*.*'
     branches:
       - '*'
     paths:
@@ -59,9 +60,10 @@ jobs:
           - PlotToSerial
 
         unit:
-          - UnitAmeter
-          - UnitVmeter
-          - UnitKmeterISO
+          - UnitCO2
+          - UnitENVIII
+          - UnitTVOC
+          - UnitENVPro
 
         board:
           - m5stack_atom
@@ -71,10 +73,10 @@ jobs:
 #          - m5stack_cardputer
           - m5stack_core
           - m5stack_core2
-#          - m5stack_coreink
+          - m5stack_coreink
           - m5stack_cores3
           - m5stack_dial
-#          - m5stack_dinmeter
+          - m5stack_dinmeter
           - m5stack_fire
           - m5stack_paper
 #          - m5stack_poe_cam

diff --git a/.github/workflows/PlatformioBuild.yml → .github/workflows/platformio-build-check.yml b/.github/workflows/PlatformioBuild.yml → .github/workflows/platformio-build-check.yml
@@ -1,9 +1,10 @@
-name: PlatformIOBuild
+name: Build(platformio)
 
 on:
   push:
     tags-ignore:
       - '*.*.*'
+      - 'v*.*.*'
     branches:
       - '*'
     paths:
@@ -43,71 +44,76 @@ on:
 
 jobs:
   build:
-    name: ${{ matrix.unit }}:${{ matrix.example }}:${{ matrix.board }}:${{ matrix.framework }}@${{ matrix.espressif32 }}
+    name: ${{ matrix.unit }}:${{ matrix.example }}@${{ matrix.board }}:${{ matrix.framework }}:${{ matrix.espressif32 }}
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       #max-parallel: 1
 
       matrix:
-        unit:
-          - UnitAmeter
-          - UnitVmeter
-          - UnitKmeterISO
-
         example:
           - PlotToSerial
 
+        unit:
+          - UnitCO2
+          - UnitENVIII
+          - UnitTVOC
+          - UnitENVPro
+
         board:
           - Core
           - Core2
           - CoreS3
+          - Fire
           - StampS3
-          - AtomS3
           - Dial
+          - AtomMatrix
+          - AtomS3
+          - AtomS3R
           - NanoC6
           - StickCPlus
+          - StickCPlus2
           - Paper
-          - Fire
+          - Corelink
 
         framework:
           - Arduino
 
         espressif32:
           - latest
-          - '5_4_0'
-          - '4_4_0'
+#          - '5_4_0'
+#          - '4_4_0'
 
-        exclude:
-          - board: CoreS3
-            espressif32: '5_4_0'
-          - board: CoreS3
-            espressif32: '4_4_0'
-          - board: StampS3
-            espressif32: '5_4_0'
-          - board: StampS3
-            espressif32: '4_4_0'
-          - board: AtomS3
-            espressif32: '5_4_0'
-          - board: AtomS3
-            espressif32: '4_4_0'
-          - board: Dial
-            espressif32: '5_4_0'
-          - board: Dial
-            espressif32: '4_4_0'
-          - board: NanoC6
-            espressif32: '5_4_0'
-          - board: NanoC6
-            espressif32: '4_4_0'
-          - board: StickCPlus
-            espressif32: '5_4_0'
-          - board: StickCPlus
-            espressif32: '4_4_0'
-          - board: Paper
-            espressif32: '5_4_0'
-          - board: Paper
-            espressif32: '4_4_0'
+#        exclude:
+#          - board: CoreS3
+#            espressif32: '5_4_0'
+#          - board: CoreS3
+#            espressif32: '4_4_0'
+#          - board: StampS3
+#            espressif32: '5_4_0'
+#          - board: StampS3
+#            espressif32: '4_4_0'
+#          - board: AtomS3
+#            espressif32: '5_4_0'
+#          - board: AtomS3
+#            espressif32: '4_4_0'
+#          - board: Dial
+#            espressif32: '5_4_0'
+#          - board: Dial
+#            espressif32: '4_4_0'
+#          - board: NanoC6
+#            espressif32: '5_4_0'
+#          - board: NanoC6
+#            espressif32: '4_4_0'
+#          - board: StickCPlus
+#            espressif32: '5_4_0'
+#          - board: StickCPlus
+#            espressif32: '4_4_0'
+#          - board: Paper
+#            espressif32: '5_4_0'
+#          - board: Paper
+#            espressif32: '4_4_0'
 
     steps:
       - name: Checkout
@@ -118,11 +124,11 @@ jobs:
       - name: Build examples
         uses: karniv00l/platformio-run-action@v1
         with:
-          environments: ${{ matrix.unit }}_${{ matrix.example }}_${{ matrix.board }}_${{ matrix.framework }}_${{ matrix.espressif32 }}
-          #targets:
+          environments: ${{ matrix.unit != '' && format('{0}_{1}_{2}_{3}_{4}', matrix.unit, matrix.example, matrix.board, matrix.framework, matrix.espressif32) || format('{0}_{1}_{2}_{3}', matrix.example, matrix.board, matrix.framework, matrix.espressif32) }}
+#         targets:
           project-dir: "./"
           project-conf: "./platformio.ini"
-          #jobs: 6
-          #silent: false
-          #verbose: true
-          #disable-auto-clean: false
+#          jobs: 6
+#          silent: false
+#          verbose: true
+#          disable-auto-clean: false
diff --git a/boards/m5stack-atoms3r.json b/boards/m5stack-atoms3r.json
@@ -0,0 +1,41 @@
+{
+    "build": {
+        "arduino": {
+            "memory_type": "qio_opi",
+            "ldscript": "esp32s3_out.ld",
+            "partitions": "default_8MB.csv"
+        },
+        "core": "esp32",
+        "extra_flags": [
+            "-DARDUINO_M5Stack_ATOMS3R",
+            "-DBOARD_HAS_PSRAM",
+            "-DARDUINO_USB_MODE=1",
+            "-DARDUINO_USB_CDC_ON_BOOT=1",
+            "-DARDUINO_RUNNING_CORE=1",
+            "-DARDUINO_EVENT_RUNNING_CORE=1"
+        ],
+        "f_cpu": "240000000L",
+        "f_flash": "80000000L",
+        "flash_mode": "dio",
+        "mcu": "esp32s3",
+        "variant": "m5stack_atoms3"
+    },
+    "connectivity": [
+        "bluetooth",
+        "wifi"
+    ],
+    "frameworks": [
+        "arduino",
+        "espidf"
+    ],
+    "name": "M5Stack AtomS3R",
+    "upload": {
+        "flash_size": "8MB",
+        "maximum_ram_size": 327680,
+        "maximum_size": 8388608,
+        "require_upload_port": true,
+        "speed": 460800
+    },
+    "url": "https://docs.m5stack.com/en/core/AtomS3R",
+    "vendor": "M5Stack"
+}
diff --git a/boards/m5stick-cplus2.json b/boards/m5stick-cplus2.json
@@ -0,0 +1,40 @@
+{
+    "build": {
+	"arduino":{
+	    "ldscript": "esp32_out.ld",
+	    "partitions": "default_8MB.csv"
+	},
+	"core": "esp32",
+	"extra_flags": [
+	    "-DM5STACK_M5Stick_CPlus2",
+	    "-DBOARD_HAS_PSRAM",
+	    "-mfix-esp32-psram-cache-issue",
+	    "-mfix-esp32-psram-cache-strategy=memw",
+	    "-DARDUINO_RUNNING_CORE=1",
+	    "-DARDUINO_EVENT_RUNNING_CORE=1"
+	],
+	"f_cpu": "240000000L",
+	"f_flash": "80000000L",
+	"flash_mode": "dio",
+	"mcu": "esp32",
+	"variant": "m5stick_c"
+    },
+    "connectivity": [
+	"wifi",
+	"bluetooth"
+    ],
+    "frameworks": [
+	"arduino",
+	"espidf"
+    ],
+    "name": "M5Stick-CPlus2",
+    "upload": {
+	"flash_size": "8MB",
+	"maximum_ram_size": 327680,
+	"maximum_size": 8388608,
+	"require_upload_port": true,
+	"speed": 1500000
+    },
+    "url": "https://docs.m5stack.com/en/core/M5StickC%20PLUS2",
+    "vendor": "M5Stack"
+}
diff --git a/examples/UnitUnified/UnitKmeterISO/PlotToSerial/main/PlotToSerial.cpp b/examples/UnitUnified/UnitKmeterISO/PlotToSerial/main/PlotToSerial.cpp
@@ -51,13 +51,6 @@ void setup()
 #pragma message "Using Wire"
     // Using TwoWire
     Wire.begin(pin_num_sda, pin_num_scl, 100000U);
-    for (int i = 0; i < 10; ++i) {
-        Wire.beginTransmission(unit.address());
-        auto wret = Wire.endTransmission();
-        M5_LOGW(">>%d", wret);
-        delay(10);
-    }
-
     if (!Units.add(unit, Wire) || !Units.begin()) {
         M5_LOGE("Failed to begin");
         lcd.clear(TFT_RED);