Skip to content

Commit 9f22200

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents 46fe0d9 + 6988c25 commit 9f22200

29 files changed

Lines changed: 1533 additions & 731 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
jobs:
1818
lint:
1919
name: Lint Check
20-
runs-on: [self-hosted, Linux, X64]
20+
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v4
2323
- uses: arduino/arduino-lint-action@v2

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

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,28 @@ on:
1212
branches:
1313
- '*'
1414
paths:
15-
- 'src/unit/**.cpp'
16-
- 'src/unit/**.hpp'
17-
- 'src/unit/**.h'
18-
- 'src/unit/**.c'
15+
- 'src/**.cpp'
16+
- 'src/**.hpp'
17+
- 'src/**.h'
18+
- 'src/**.c'
1919
- 'examples/UnitUnified/**.ino'
2020
- 'examples/UnitUnified/**.cpp'
2121
- 'examples/UnitUnified/**.hpp'
2222
- 'examples/UnitUnified/**.h'
2323
- 'examples/UnitUnified/**.c'
24-
- '**arduino-esp-v2-build-check.yml'
24+
- '.github/workflows/arduino-esp-v2-build-check.yml'
2525
pull_request:
2626
paths:
27-
- 'src/unit/**.cpp'
28-
- 'src/unit/**.hpp'
29-
- 'src/unit/**.h'
30-
- 'src/unit/**.c'
27+
- 'src/**.cpp'
28+
- 'src/**.hpp'
29+
- 'src/**.h'
30+
- 'src/**.c'
3131
- 'examples/UnitUnified/**.ino'
3232
- 'examples/UnitUnified/**.cpp'
3333
- 'examples/UnitUnified/**.hpp'
3434
- 'examples/UnitUnified/**.h'
3535
- 'examples/UnitUnified/**.c'
36-
- '**arduino-esp-v2-build-check.yml'
36+
- '.github/workflows/arduino-esp-v2-build-check.yml'
3737
workflow_dispatch:
3838

3939
defaults:
@@ -48,7 +48,7 @@ jobs:
4848
build:
4949
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
5050
runs-on: ubuntu-latest
51-
timeout-minutes: 5
51+
timeout-minutes: 12
5252

5353
strategy:
5454
fail-fast: false
@@ -82,9 +82,6 @@ jobs:
8282
archi:
8383
- esp32
8484

85-
build-properties:
86-
- "-DUSING_UNIT_FINGER"
87-
8885
include:
8986
# Specific sketches
9087
- sketch: Capture
@@ -109,6 +106,15 @@ jobs:
109106
platform-version: 2.0.17
110107
board: m5stack-core-esp32
111108

109+
# HatFinger
110+
- sketch: PlotToSerial
111+
unit: HatFinger
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-coreink
117+
112118
- sketch: Capture
113119
unit: UnitFinger2
114120
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
@@ -132,25 +138,32 @@ jobs:
132138
board: m5stack-core-esp32
133139

134140
steps:
135-
- name: Checkout (push)
136-
if: ${{ github.event_name != 'pull_request' }}
137-
uses: actions/checkout@v4
138-
- name: Checkout (PR, pin to head)
139-
if: ${{ github.event_name == 'pull_request' }}
141+
- name: Checkout
140142
uses: actions/checkout@v4
141-
with:
142-
ref: ${{ github.event.pull_request.head.sha }}
143143

144-
# Build
144+
- name: Prepare libraries list
145+
id: libs
146+
run: |
147+
{
148+
echo "yaml<<EOF"
149+
echo "$REQUIRED_LIBRARIES" | tr ',' '\n' | while read -r lib; do
150+
echo "- name: $lib"
151+
done
152+
echo "- source-path: ./"
153+
echo "EOF"
154+
} >> "$GITHUB_OUTPUT"
155+
145156
- name: Compile examples
146-
uses: ArminJo/arduino-test-compile@master
157+
uses: arduino/compile-sketches@v1
147158
with:
148-
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
149-
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
150-
platform-url: ${{ matrix.platform-url }}
151-
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
152-
extra-arduino-cli-args: ${{ matrix.cli-args }}
153-
build-properties: ${{ matrix.unit == 'UnitFinger' && '-DUSING_UNIT_FINGER' || '' }}
154-
sketch-names: ${{ matrix.sketch }}.ino
155-
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
156-
#sketches-exclude: ${{ matrix.sketches-exclude }}
159+
fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
160+
platforms: |
161+
- name: ${{ matrix.platform }}:${{ matrix.archi }}
162+
source-url: ${{ matrix.platform-url }}
163+
version: ${{ matrix.platform-version }}
164+
libraries: ${{ steps.libs.outputs.yaml }}
165+
sketch-paths: |
166+
- ${{ env.SKETCH_NAMES_FIND_START }}/${{ (matrix.unit == 'HatFinger') && 'UnitFinger' || matrix.unit }}/${{ matrix.sketch }}
167+
cli-compile-flags: |
168+
- --build-property
169+
- build.extra_flags=${{ matrix.unit == 'HatFinger' && '-DUSING_HAT_FINGER' || (matrix.unit == 'UnitFinger' && '-DUSING_UNIT_FINGER' || '') }}

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

Lines changed: 57 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,28 @@ on:
1212
branches:
1313
- '*'
1414
paths:
15-
- 'src/unit/**.cpp'
16-
- 'src/unit/**.hpp'
17-
- 'src/unit/**.h'
18-
- 'src/unit/**.c'
15+
- 'src/**.cpp'
16+
- 'src/**.hpp'
17+
- 'src/**.h'
18+
- 'src/**.c'
1919
- 'examples/UnitUnified/**.ino'
2020
- 'examples/UnitUnified/**.cpp'
2121
- 'examples/UnitUnified/**.hpp'
2222
- 'examples/UnitUnified/**.h'
2323
- 'examples/UnitUnified/**.c'
24-
- '**arduino-esp-v3-build-check.yml'
24+
- '.github/workflows/arduino-esp-v3-build-check.yml'
2525
pull_request:
2626
paths:
27-
- 'src/unit/**.cpp'
28-
- 'src/unit/**.hpp'
29-
- 'src/unit/**.h'
30-
- 'src/unit/**.c'
27+
- 'src/**.cpp'
28+
- 'src/**.hpp'
29+
- 'src/**.h'
30+
- 'src/**.c'
3131
- 'examples/UnitUnified/**.ino'
3232
- 'examples/UnitUnified/**.cpp'
3333
- 'examples/UnitUnified/**.hpp'
3434
- 'examples/UnitUnified/**.h'
3535
- 'examples/UnitUnified/**.c'
36-
- '**arduino-esp-v3-build-check.yml'
36+
- '.github/workflows/arduino-esp-v3-build-check.yml'
3737
workflow_dispatch:
3838

3939
defaults:
@@ -48,7 +48,7 @@ jobs:
4848
build:
4949
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
5050
runs-on: ubuntu-latest
51-
timeout-minutes: 5
51+
timeout-minutes: 12
5252

5353
strategy:
5454
fail-fast: false
@@ -65,33 +65,27 @@ jobs:
6565
- UnitFinger2
6666

6767
board:
68+
- arduino_nesso_n1
6869
- m5stack_atom
6970
- m5stack_atoms3
7071
- m5stack_capsule
71-
# - m5stack_cardputer
72+
- m5stack_cardputer
7273
- m5stack_core
7374
- m5stack_core2
7475
- m5stack_coreink
7576
- m5stack_cores3
7677
- m5stack_dial
78+
- m5stack_dinmeter
7779
- m5stack_fire
7880
- m5stack_nanoc6
7981
- m5stack_paper
80-
# - m5stack_poe_cam
81-
# - m5stack_stamp_c3
82-
# - m5stack_stamp_pico
8382
- m5stack_stamp_s3
84-
# - m5stack_station
85-
# - m5stack_stickc
8683
- m5stack_stickc_plus
8784
- m5stack_stickc_plus2
88-
# - m5stack_timer_cam
89-
# - m5stack_tough
90-
# - m5stack_unit_cam
91-
# - m5stack_unit_cams3
85+
- m5stack_tab5
9286

9387
platform-version:
94-
- 3.1.3
88+
- 3.3.6
9589

9690
platform:
9791
- esp32
@@ -106,104 +100,103 @@ jobs:
106100
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
107101
platform: esp32
108102
archi: esp32
109-
platform-version: 3.1.3
103+
platform-version: 3.3.6
110104
board: m5stack_core
111105
- sketch: Characteristic
112106
unit: UnitFinger
113107
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
114108
platform: esp32
115109
archi: esp32
116-
platform-version: 3.1.3
110+
platform-version: 3.3.6
117111
board: m5stack_core
118112
- sketch: User
119113
unit: UnitFinger
120114
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
121115
platform: esp32
122116
archi: esp32
123-
platform-version: 3.1.3
117+
platform-version: 3.3.6
124118
board: m5stack_core
125119

120+
# HatFinger
126121
- sketch: PlotToSerial
127122
unit: HatFinger
128123
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
129124
platform: esp32
130125
archi: esp32
131-
platform-version: 3.1.3
126+
platform-version: 3.3.6
132127
board: m5stack_stickc_plus
133128
- sketch: PlotToSerial
134129
unit: HatFinger
135130
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
136131
platform: esp32
137132
archi: esp32
138-
platform-version: 3.1.3
133+
platform-version: 3.3.6
139134
board: m5stack_stickc_plus2
140-
- sketch: Capture
135+
- sketch: PlotToSerial
141136
unit: HatFinger
142137
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
143138
platform: esp32
144139
archi: esp32
145-
platform-version: 3.1.3
146-
board: m5stack_stickc_plus2
147-
- sketch: Characteristic
148-
unit: UnitFinger
149-
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
150-
platform: esp32
151-
archi: esp32
152-
platform-version: 3.1.3
153-
board: m5stack_stickc_plus2
154-
- sketch: User
155-
unit: UnitFinger
140+
platform-version: 3.3.6
141+
board: m5stack_coreink
142+
- sketch: Capture
143+
unit: HatFinger
156144
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
157145
platform: esp32
158146
archi: esp32
159-
platform-version: 3.1.3
147+
platform-version: 3.3.6
160148
board: m5stack_stickc_plus2
161149

150+
# UnitFinger2 extra sketches
162151
- sketch: Capture
163152
unit: UnitFinger2
164153
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
165154
platform: esp32
166155
archi: esp32
167-
platform-version: 3.1.3
156+
platform-version: 3.3.6
168157
board: m5stack_core
169158
- sketch: Automatic
170159
unit: UnitFinger2
171160
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
172161
platform: esp32
173162
archi: esp32
174-
platform-version: 3.1.3
163+
platform-version: 3.3.6
175164
board: m5stack_core
176165
- sketch: User
177166
unit: UnitFinger2
178167
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
179168
platform: esp32
180169
archi: esp32
181-
platform-version: 3.1.3
170+
platform-version: 3.3.6
182171
board: m5stack_core
183172

184-
185-
186173
steps:
187-
- name: Checkout (push)
188-
if: ${{ github.event_name != 'pull_request' }}
189-
uses: actions/checkout@v4
190-
- name: Checkout (PR, pin to head)
191-
if: ${{ github.event_name == 'pull_request' }}
174+
- name: Checkout
192175
uses: actions/checkout@v4
193-
with:
194-
ref: ${{ github.event.pull_request.head.sha }}
195176

196-
# Build
177+
- name: Prepare libraries list
178+
id: libs
179+
run: |
180+
{
181+
echo "yaml<<EOF"
182+
echo "$REQUIRED_LIBRARIES" | tr ',' '\n' | while read -r lib; do
183+
echo "- name: $lib"
184+
done
185+
echo "- source-path: ./"
186+
echo "EOF"
187+
} >> "$GITHUB_OUTPUT"
188+
197189
- name: Compile examples
198-
uses: ArminJo/arduino-test-compile@master
190+
uses: arduino/compile-sketches@v1
199191
with:
200-
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
201-
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
202-
platform-url: ${{ matrix.platform-url }}
203-
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
204-
extra-arduino-cli-args: ${{ matrix.cli-args }}
205-
build-properties: ${{ matrix.unit == 'UnitFinger' && '-DUSING_UNIT_FINGER' || (matrix.unit == 'HatFinger' && '-DUSING_HAT_FINGER' || '') }}
206-
sketch-names: ${{ matrix.sketch }}.ino
207-
#sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
208-
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ (matrix.unit == 'HatFinger') && 'UnitFinger' || matrix.unit }}
209-
#sketches-exclude: ${{ matrix.sketches-exclude }}
192+
fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
193+
platforms: |
194+
- name: ${{ matrix.platform }}:${{ matrix.archi }}
195+
source-url: ${{ matrix.platform-url }}
196+
version: ${{ matrix.platform-version }}
197+
libraries: ${{ steps.libs.outputs.yaml }}
198+
sketch-paths: |
199+
- ${{ env.SKETCH_NAMES_FIND_START }}/${{ (matrix.unit == 'HatFinger') && 'UnitFinger' || matrix.unit }}/${{ matrix.sketch }}
200+
cli-compile-flags: |
201+
- --build-property
202+
- build.extra_flags=${{ matrix.unit == 'HatFinger' && '-DUSING_HAT_FINGER' || (matrix.unit == 'UnitFinger' && '-DUSING_UNIT_FINGER' || '') }}

0 commit comments

Comments
 (0)