Skip to content

Commit 2044122

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents cb3063c + a6da006 commit 2044122

File tree

18 files changed

+815
-131
lines changed

18 files changed

+815
-131
lines changed

‎.github/workflows/arduino-esp-v2-build-check.yml‎

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@ concurrency:
4646

4747
jobs:
4848
build:
49-
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
49+
name: ${{ matrix.build-properties }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
5050
runs-on: ubuntu-latest
5151
timeout-minutes: 5
5252

5353
strategy:
5454
fail-fast: false
55-
#max-parallel: 1
55+
max-parallel: 20
5656
matrix:
5757
platform-url:
5858
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
5959

60+
unit:
61+
- UnitUltraSonic
62+
6063
sketch:
6164
- PlotToSerial
6265

63-
unit:
64-
- UnitUltraSonicI2C
65-
6666
board:
6767
- m5stack-atom
6868
- m5stack-atoms3
@@ -81,6 +81,41 @@ jobs:
8181
archi:
8282
- esp32
8383

84+
build-properties:
85+
- "-DCONNECT_VIA_I2C"
86+
- "-DCONNECT_VIA_GPIO"
87+
88+
include:
89+
# Specific sketches
90+
- sketch: DualSensor
91+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
92+
platform: esp32
93+
archi: esp32
94+
platform-version: 2.0.17
95+
board: m5stack-core-esp32
96+
build-properties: ""
97+
- sketch: DualSensor
98+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
99+
platform: esp32
100+
archi: esp32
101+
platform-version: 2.0.17
102+
board: m5stack-core2
103+
build-properties: ""
104+
- sketch: DualSensor
105+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
106+
platform: esp32
107+
archi: esp32
108+
platform-version: 2.0.17
109+
board: m5stack-cores3
110+
build-properties: ""
111+
- sketch: DualSensor
112+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
113+
platform: esp32
114+
archi: esp32
115+
platform-version: 2.0.17
116+
board: m5stack-fire
117+
build-properties: ""
118+
84119
steps:
85120
- name: Checkout
86121
uses: actions/checkout@v4
@@ -96,7 +131,7 @@ jobs:
96131
platform-url: ${{ matrix.platform-url }}
97132
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
98133
extra-arduino-cli-args: ${{ matrix.cli-args }}
99-
#build-properties: ${{ toJson(matrix.build-properties) }}
134+
build-properties: ${{ matrix.build-properties }}
100135
sketch-names: ${{ matrix.sketch }}.ino
101136
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
102137
#sketches-exclude: ${{ matrix.sketches-exclude }}

‎.github/workflows/arduino-esp-v3-build-check.yml‎

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,23 @@ concurrency:
4545

4646
jobs:
4747
build:
48-
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
48+
name: ${{ matrix.build-properties }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
4949
runs-on: ubuntu-latest
5050
timeout-minutes: 5
5151

5252
strategy:
5353
fail-fast: false
54-
#max-parallel: 1
54+
max-parallel: 20
5555
matrix:
5656
platform-url:
5757
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
5858

59+
unit:
60+
- UnitUltraSonic
61+
5962
sketch:
6063
- PlotToSerial
6164

62-
unit:
63-
- UnitUltraSonicI2C
64-
6565
board:
6666
- m5stack_atom
6767
- m5stack_atoms3
@@ -89,14 +89,56 @@ jobs:
8989
# - m5stack_unit_cams3
9090

9191
platform-version:
92-
- 3.0.4
92+
- 3.1.3
9393

9494
platform:
9595
- esp32
9696

9797
archi:
9898
- esp32
9999

100+
build-properties:
101+
- "-DCONNECT_VIA_I2C"
102+
- "-DCONNECT_VIA_GPIO"
103+
104+
include:
105+
# Specific sketches
106+
- sketch: DualSensor
107+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
108+
platform-version: 3.1.3
109+
platform: esp32
110+
archi: esp32
111+
board: m5stack_core
112+
build-properties: ""
113+
- sketch: DualSensor
114+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
115+
platform-version: 3.1.3
116+
platform: esp32
117+
archi: esp32
118+
board: m5stack_core2
119+
build-properties: ""
120+
- sketch: DualSensor
121+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
122+
platform-version: 3.1.3
123+
platform: esp32
124+
archi: esp32
125+
board: m5stack_cores3
126+
build-properties: ""
127+
- sketch: DualSensor
128+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
129+
platform-version: 3.1.3
130+
platform: esp32
131+
archi: esp32
132+
board: m5stack_fire
133+
build-properties: ""
134+
- sketch: DualSensor
135+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
136+
platform-version: 3.1.3
137+
platform: esp32
138+
archi: esp32
139+
board: m5stack_paper
140+
build-properties: ""
141+
100142
steps:
101143
- name: Checkout
102144
uses: actions/checkout@v4
@@ -112,7 +154,7 @@ jobs:
112154
platform-url: ${{ matrix.platform-url }}
113155
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
114156
extra-arduino-cli-args: ${{ matrix.cli-args }}
115-
#build-properties: ${{ toJson(matrix.build-properties) }}
157+
build-properties: ${{ matrix.build-properties }}
116158
sketch-names: ${{ matrix.sketch }}.ino
117159
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
118160
#sketches-exclude: ${{ matrix.sketches-exclude }}

‎.github/workflows/arduino-m5-build-check.yml‎

Lines changed: 48 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@ concurrency:
4646

4747
jobs:
4848
build:
49-
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
49+
name: ${{ matrix.build-properties }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
5050
runs-on: ubuntu-latest
5151
timeout-minutes: 5
5252

5353
strategy:
5454
fail-fast: false
55-
# max-parallel: 1
55+
max-parallel: 20
5656
matrix:
5757
platform-url:
5858
- https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
5959

60+
unit:
61+
- UnitUltraSonic
62+
6063
sketch:
6164
- PlotToSerial
6265

63-
unit:
64-
- UnitUltraSonicI2C
65-
6666
board:
6767
- m5stack_atom
6868
- m5stack_atoms3
@@ -91,14 +91,55 @@ jobs:
9191
# - m5stack_unit_cams3
9292

9393
platform-version:
94-
- 2.1.2
94+
- 3.2.1
9595

9696
platform:
9797
- m5stack
9898

9999
archi:
100100
- esp32
101101

102+
build-properties:
103+
- "-DCONNECT_VIA_I2C"
104+
- "-DCONNECT_VIA_GPIO"
105+
106+
include:
107+
# Specific sketches
108+
- sketch: DualSensor
109+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
110+
platform-version: 3.2.1
111+
platform: m5stack
112+
archi: esp32
113+
board: m5stack_core
114+
build-properties: ""
115+
- sketch: DualSensor
116+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
117+
platform-version: 3.2.1
118+
platform: m5stack
119+
archi: esp32
120+
board: m5stack_core2
121+
build-properties: ""
122+
- sketch: DualSensor
123+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
124+
platform-version: 3.2.1
125+
platform: m5stack
126+
archi: esp32
127+
board: m5stack_cores3
128+
build-properties: ""
129+
- sketch: DualSensor
130+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
131+
platform-version: 3.2.1
132+
platform: m5stack
133+
archi: esp32
134+
board: m5stack_fire
135+
build-properties: ""
136+
- sketch: DualSensor
137+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
138+
platform-version: 3.2.1
139+
platform: m5stack
140+
archi: esp32
141+
board: m5stack_paper
142+
build-properties: ""
102143

103144
steps:
104145
- name: Checkout
@@ -115,7 +156,7 @@ jobs:
115156
platform-url: ${{ matrix.platform-url }}
116157
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
117158
extra-arduino-cli-args: ${{ matrix.cli-args }}
118-
#build-properties: ${{ toJson(matrix.build-properties) }}
159+
build-properties: ${{ matrix.build-properties }}
119160
sketch-names: ${{ matrix.sketch }}.ino
120161
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
121162
#sketches-exclude: ${{ matrix.sketches-exclude }}

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

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
- 'examples/UnitUnified/**.hpp'
2222
- 'examples/UnitUnified/**.h'
2323
- 'examples/UnitUnified/**.c'
24-
- '/platformio-build-check.yml'
24+
- '**/platformio-build-check.yml'
2525
- '**platformio.ini'
2626
pull_request:
2727
paths:
@@ -58,14 +58,15 @@ jobs:
5858

5959
strategy:
6060
fail-fast: false
61-
#max-parallel: 1
61+
max-parallel: 20
6262

6363
matrix:
6464
example:
6565
- PlotToSerial
6666

6767
unit:
6868
- UnitUltraSonicI2C
69+
- UnitUltraSonicIO
6970

7071
board:
7172
- Core
@@ -88,39 +89,34 @@ jobs:
8889

8990
espressif32:
9091
- latest
91-
# - '5_4_0'
92-
# - '4_4_0'
93-
94-
# exclude:
95-
# - board: CoreS3
96-
# espressif32: '5_4_0'
97-
# - board: CoreS3
98-
# espressif32: '4_4_0'
99-
# - board: StampS3
100-
# espressif32: '5_4_0'
101-
# - board: StampS3
102-
# espressif32: '4_4_0'
103-
# - board: AtomS3
104-
# espressif32: '5_4_0'
105-
# - board: AtomS3
106-
# espressif32: '4_4_0'
107-
# - board: Dial
108-
# espressif32: '5_4_0'
109-
# - board: Dial
110-
# espressif32: '4_4_0'
111-
# - board: NanoC6
112-
# espressif32: '5_4_0'
113-
# - board: NanoC6
114-
# espressif32: '4_4_0'
115-
# - board: StickCPlus
116-
# espressif32: '5_4_0'
117-
# - board: StickCPlus
118-
# espressif32: '4_4_0'
119-
# - board: Paper
120-
# espressif32: '5_4_0'
121-
# - board: Paper
122-
# espressif32: '4_4_0'
12392

93+
include:
94+
# Specific sketches
95+
- example: DualSensor
96+
unit: UnitUltraSonic
97+
board: Core
98+
framework: Arduino
99+
espressif32: latest
100+
- example: DualSensor
101+
unit: UnitUltraSonic
102+
board: Core2
103+
framework: Arduino
104+
espressif32: latest
105+
- example: DualSensor
106+
unit: UnitUltraSonic
107+
board: CoreS3
108+
framework: Arduino
109+
espressif32: latest
110+
- example: DualSensor
111+
unit: UnitUltraSonic
112+
board: Fire
113+
framework: Arduino
114+
espressif32: latest
115+
- example: DualSensor
116+
unit: UnitUltraSonic
117+
board: Paper
118+
framework: Arduino
119+
espressif32: latest
124120

125121
steps:
126122
- name: Checkout
@@ -139,3 +135,4 @@ jobs:
139135
# silent: false
140136
# verbose: true
141137
# disable-auto-clean: false
138+

0 commit comments

Comments
 (0)