Skip to content

Commit a483db1

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents b8ad444 + 9262fe8 commit a483db1

42 files changed

Lines changed: 3890 additions & 675 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 63 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Build(arduino-esp32:2.x)
33
env:
44
SKETCH_NAMES_FIND_START: ./examples/UnitUnified
55
REQUIRED_LIBRARIES: M5Unified,M5UnitUnified
6+
67
on:
78
push:
89
tags-ignore:
@@ -20,7 +21,7 @@ on:
2021
- 'examples/UnitUnified/**.hpp'
2122
- 'examples/UnitUnified/**.h'
2223
- 'examples/UnitUnified/**.c'
23-
- '**arduino-esp-v2-build-check.yml'
24+
- '.github/workflows/arduino-esp-v2-build-check.yml'
2425
pull_request:
2526
paths:
2627
- 'src/**.cpp'
@@ -32,17 +33,8 @@ on:
3233
- 'examples/UnitUnified/**.hpp'
3334
- 'examples/UnitUnified/**.h'
3435
- 'examples/UnitUnified/**.c'
35-
- '**arduino-esp-v2-build-check.yml'
36+
- '.github/workflows/arduino-esp-v2-build-check.yml'
3637
workflow_dispatch:
37-
inputs:
38-
runner:
39-
description: Select runner
40-
required: true
41-
default: '["self-hosted", "Linux", "X64"]'
42-
type: choice
43-
options:
44-
- '["ubuntu-latest"]'
45-
- '["self-hosted", "Linux", "X64"]'
4638

4739
defaults:
4840
run:
@@ -55,22 +47,18 @@ concurrency:
5547
jobs:
5648
build:
5749
name: ${{ matrix.build-properties }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
58-
runs-on: ${{ fromJSON(github.event.inputs.runner || '["self-hosted", "Linux", "X64"]') }}
59-
timeout-minutes: 5
50+
runs-on: ubuntu-latest
51+
timeout-minutes: 12
6052

6153
strategy:
6254
fail-fast: false
63-
#max-parallel: 1
55+
max-parallel: 20
6456
matrix:
6557
platform-url:
6658
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
6759

6860
sketch:
6961
- PlotToSerial
70-
- SimpleDisplay
71-
72-
# unit:
73-
# -
7462

7563
board:
7664
- m5stack-atom
@@ -92,36 +80,76 @@ jobs:
9280

9381
build-properties:
9482
- "-DUSING_UNIT_CARDKB"
83+
- "-DUSING_UNIT_CARDKB2 -DUSING_I2C_FOR_CARDKB2"
84+
- "-DUSING_UNIT_CARDKB2 -DUSING_UART_FOR_CARDKB2"
9585
- "-DUSING_UNIT_FACES_QWERTY"
9686

9787
exclude:
9888
- board: m5stack-atom
9989
build-properties: "-DUSING_UNIT_FACES_QWERTY"
100-
- board: m5stack-atom
101-
sketch: SimpleDisplay
10290
- board: m5stack-atoms3
10391
build-properties: "-DUSING_UNIT_FACES_QWERTY"
10492
- board: m5stack-coreink
10593
build-properties: "-DUSING_UNIT_FACES_QWERTY"
10694

107-
steps:
108-
- name: Which runner
109-
run: echo "RunsOn=${{ github.event.inputs.runner || 'self-hosted' }}"
95+
include:
96+
# SimpleDisplay: Core only
97+
- sketch: SimpleDisplay
98+
board: m5stack-core-esp32
99+
platform-version: 2.0.17
100+
platform: esp32
101+
archi: esp32
102+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
103+
build-properties: "-DUSING_UNIT_CARDKB"
104+
- sketch: SimpleDisplay
105+
board: m5stack-core-esp32
106+
platform-version: 2.0.17
107+
platform: esp32
108+
archi: esp32
109+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
110+
build-properties: "-DUSING_UNIT_CARDKB2 -DUSING_I2C_FOR_CARDKB2"
111+
- sketch: SimpleDisplay
112+
board: m5stack-core-esp32
113+
platform-version: 2.0.17
114+
platform: esp32
115+
archi: esp32
116+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
117+
build-properties: "-DUSING_UNIT_CARDKB2 -DUSING_UART_FOR_CARDKB2"
118+
- sketch: SimpleDisplay
119+
board: m5stack-core-esp32
120+
platform-version: 2.0.17
121+
platform: esp32
122+
archi: esp32
123+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
124+
build-properties: "-DUSING_UNIT_FACES_QWERTY"
110125

126+
steps:
111127
- name: Checkout
112128
uses: actions/checkout@v4
113-
with:
114-
ref: ${{ github.event.pull_request.head.sha }}
129+
130+
- name: Prepare libraries list
131+
id: libs
132+
run: |
133+
{
134+
echo "yaml<<EOF"
135+
echo "$REQUIRED_LIBRARIES" | tr ',' '\n' | while read -r lib; do
136+
echo "- name: $lib"
137+
done
138+
echo "- source-path: ./"
139+
echo "EOF"
140+
} >> "$GITHUB_OUTPUT"
115141
116142
- name: Compile examples
117-
uses: ArminJo/arduino-test-compile@master
143+
uses: arduino/compile-sketches@v1
118144
with:
119-
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
120-
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
121-
platform-url: ${{ matrix.platform-url }}
122-
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
123-
extra-arduino-cli-args: ${{ matrix.cli-args }}
124-
build-properties: ${{ matrix.build-properties }}
125-
sketch-names: ${{ matrix.sketch }}.ino
126-
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
127-
#sketches-exclude: ${{ matrix.sketches-exclude }}
145+
fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
146+
platforms: |
147+
- name: ${{ matrix.platform }}:${{ matrix.archi }}
148+
source-url: ${{ matrix.platform-url }}
149+
version: ${{ matrix.platform-version }}
150+
libraries: ${{ steps.libs.outputs.yaml }}
151+
sketch-paths: |
152+
- ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.sketch }}
153+
cli-compile-flags: |
154+
- --build-property
155+
- build.extra_flags=${{ matrix.build-properties }}

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

Lines changed: 84 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Build(arduino-esp32:3.x)
33
env:
44
SKETCH_NAMES_FIND_START: ./examples/UnitUnified
55
REQUIRED_LIBRARIES: M5Unified,M5UnitUnified
6+
67
on:
78
push:
89
tags-ignore:
@@ -11,38 +12,29 @@ on:
1112
branches:
1213
- '*'
1314
paths:
14-
- 'src/unit/**.cpp'
15-
- 'src/unit/**.hpp'
16-
- 'src/unit/**.h'
17-
- 'src/unit/**.c'
15+
- 'src/**.cpp'
16+
- 'src/**.hpp'
17+
- 'src/**.h'
18+
- 'src/**.c'
1819
- 'examples/UnitUnified/**.ino'
1920
- 'examples/UnitUnified/**.cpp'
2021
- 'examples/UnitUnified/**.hpp'
2122
- 'examples/UnitUnified/**.h'
2223
- 'examples/UnitUnified/**.c'
23-
- '**arduino-esp-v3-build-check.yml'
24+
- '.github/workflows/arduino-esp-v3-build-check.yml'
2425
pull_request:
2526
paths:
26-
- 'src/unit/**.cpp'
27-
- 'src/unit/**.hpp'
28-
- 'src/unit/**.h'
29-
- 'src/unit/**.c'
27+
- 'src/**.cpp'
28+
- 'src/**.hpp'
29+
- 'src/**.h'
30+
- 'src/**.c'
3031
- 'examples/UnitUnified/**.ino'
3132
- 'examples/UnitUnified/**.cpp'
3233
- 'examples/UnitUnified/**.hpp'
3334
- 'examples/UnitUnified/**.h'
3435
- 'examples/UnitUnified/**.c'
35-
- '**arduino-esp-v3-build-check.yml'
36+
- '.github/workflows/arduino-esp-v3-build-check.yml'
3637
workflow_dispatch:
37-
inputs:
38-
runner:
39-
description: Select runner
40-
required: true
41-
default: '["self-hosted", "Linux", "X64"]'
42-
type: choice
43-
options:
44-
- '["ubuntu-latest"]'
45-
- '["self-hosted", "Linux", "X64"]'
4638

4739
defaults:
4840
run:
@@ -55,51 +47,41 @@ concurrency:
5547
jobs:
5648
build:
5749
name: ${{ matrix.build-properties }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
58-
runs-on: ${{ fromJSON(github.event.inputs.runner || '["self-hosted", "Linux", "X64"]') }}
59-
timeout-minutes: 5
50+
runs-on: ubuntu-latest
51+
timeout-minutes: 12
6052

6153
strategy:
6254
fail-fast: false
63-
#max-parallel: 1
55+
max-parallel: 20
6456
matrix:
6557
platform-url:
6658
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
6759

6860
sketch:
6961
- PlotToSerial
70-
- SimpleDisplay
71-
72-
# unit:
73-
# -
7462

7563
board:
64+
- arduino_nesso_n1
7665
- m5stack_atom
7766
- m5stack_atoms3
7867
- m5stack_capsule
79-
# - m5stack_cardputer
68+
- m5stack_cardputer
8069
- m5stack_core
8170
- m5stack_core2
8271
- m5stack_coreink
8372
- m5stack_cores3
8473
- m5stack_dial
74+
- m5stack_dinmeter
8575
- m5stack_fire
8676
- m5stack_nanoc6
8777
- m5stack_paper
88-
# - m5stack_poe_cam
89-
# - m5stack_stamp_c3
90-
# - m5stack_stamp_pico
9178
- m5stack_stamp_s3
92-
# - m5stack_station
93-
# - m5stack_stickc
9479
- m5stack_stickc_plus
9580
- m5stack_stickc_plus2
96-
# - m5stack_timer_cam
97-
# - m5stack_tough
98-
# - m5stack_unit_cam
99-
# - m5stack_unit_cams3
81+
- m5stack_tab5
10082

10183
platform-version:
102-
- 3.1.3
84+
- 3.3.6
10385

10486
platform:
10587
- esp32
@@ -109,58 +91,98 @@ jobs:
10991

11092
build-properties:
11193
- "-DUSING_UNIT_CARDKB"
94+
- "-DUSING_UNIT_CARDKB2 -DUSING_I2C_FOR_CARDKB2"
95+
- "-DUSING_UNIT_CARDKB2 -DUSING_UART_FOR_CARDKB2"
11296
- "-DUSING_UNIT_FACES_QWERTY"
11397

11498
exclude:
115-
- board: m5stack_atom
116-
sketch: SimpleDisplay
99+
- board: arduino_nesso_n1
100+
build-properties: "-DUSING_UNIT_FACES_QWERTY"
117101
- board: m5stack_atom
118102
build-properties: "-DUSING_UNIT_FACES_QWERTY"
119103
- board: m5stack_atoms3
120104
build-properties: "-DUSING_UNIT_FACES_QWERTY"
121105
- board: m5stack_capsule
122-
sketch: SimpleDisplay
123-
- board: m5stack_capsule
106+
build-properties: "-DUSING_UNIT_FACES_QWERTY"
107+
- board: m5stack_cardputer
124108
build-properties: "-DUSING_UNIT_FACES_QWERTY"
125109
- board: m5stack_coreink
126110
build-properties: "-DUSING_UNIT_FACES_QWERTY"
127111
- board: m5stack_dial
128112
build-properties: "-DUSING_UNIT_FACES_QWERTY"
129-
- board: m5stack_nanoc6
130-
sketch: SimpleDisplay
113+
- board: m5stack_dinmeter
114+
build-properties: "-DUSING_UNIT_FACES_QWERTY"
131115
- board: m5stack_nanoc6
132116
build-properties: "-DUSING_UNIT_FACES_QWERTY"
133117
- board: m5stack_paper
134118
build-properties: "-DUSING_UNIT_FACES_QWERTY"
135-
- board: m5stack_stamp_s3
136-
sketch: SimpleDisplay
137119
- board: m5stack_stamp_s3
138120
build-properties: "-DUSING_UNIT_FACES_QWERTY"
139121
- board: m5stack_stickc_plus
140122
build-properties: "-DUSING_UNIT_FACES_QWERTY"
141123
- board: m5stack_stickc_plus2
142124
build-properties: "-DUSING_UNIT_FACES_QWERTY"
125+
- board: m5stack_tab5
126+
build-properties: "-DUSING_UNIT_FACES_QWERTY"
143127

144-
steps:
145-
- name: Which runner
146-
run: echo "RunsOn=${{ github.event.inputs.runner || 'self-hosted' }}"
128+
include:
129+
# SimpleDisplay: Core only
130+
- sketch: SimpleDisplay
131+
board: m5stack_core
132+
platform-version: 3.3.6
133+
platform: esp32
134+
archi: esp32
135+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
136+
build-properties: "-DUSING_UNIT_CARDKB"
137+
- sketch: SimpleDisplay
138+
board: m5stack_core
139+
platform-version: 3.3.6
140+
platform: esp32
141+
archi: esp32
142+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
143+
build-properties: "-DUSING_UNIT_CARDKB2 -DUSING_I2C_FOR_CARDKB2"
144+
- sketch: SimpleDisplay
145+
board: m5stack_core
146+
platform-version: 3.3.6
147+
platform: esp32
148+
archi: esp32
149+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
150+
build-properties: "-DUSING_UNIT_CARDKB2 -DUSING_UART_FOR_CARDKB2"
151+
- sketch: SimpleDisplay
152+
board: m5stack_core
153+
platform-version: 3.3.6
154+
platform: esp32
155+
archi: esp32
156+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
157+
build-properties: "-DUSING_UNIT_FACES_QWERTY"
147158

159+
steps:
148160
- name: Checkout
149161
uses: actions/checkout@v4
150-
with:
151-
ref: ${{ github.event.pull_request.head.sha }}
152162

153-
# Build
163+
- name: Prepare libraries list
164+
id: libs
165+
run: |
166+
{
167+
echo "yaml<<EOF"
168+
echo "$REQUIRED_LIBRARIES" | tr ',' '\n' | while read -r lib; do
169+
echo "- name: $lib"
170+
done
171+
echo "- source-path: ./"
172+
echo "EOF"
173+
} >> "$GITHUB_OUTPUT"
174+
154175
- name: Compile examples
155-
uses: ArminJo/arduino-test-compile@master
176+
uses: arduino/compile-sketches@v1
156177
with:
157-
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
158-
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
159-
platform-url: ${{ matrix.platform-url }}
160-
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
161-
extra-arduino-cli-args: ${{ matrix.cli-args }}
162-
build-properties: ${{ matrix.build-properties }}
163-
# build-properties: ${{ toJson(matrix.build-properties) }}
164-
sketch-names: ${{ matrix.sketch }}.ino
165-
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
166-
#sketches-exclude: ${{ matrix.sketches-exclude }}
178+
fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
179+
platforms: |
180+
- name: ${{ matrix.platform }}:${{ matrix.archi }}
181+
source-url: ${{ matrix.platform-url }}
182+
version: ${{ matrix.platform-version }}
183+
libraries: ${{ steps.libs.outputs.yaml }}
184+
sketch-paths: |
185+
- ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.sketch }}
186+
cli-compile-flags: |
187+
- --build-property
188+
- build.extra_flags=${{ matrix.build-properties }}

0 commit comments

Comments
 (0)