Skip to content

Commit 2ae611f

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents c518ea3 + 40f9d46 commit 2ae611f

35 files changed

+2034
-724
lines changed

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
11
name: Arduino Lint Check
22
on:
33
push:
4-
branches: [ master ]
4+
branches: [ master, main ]
55
pull_request:
6-
branches: [ master ]
6+
branches: [ master, main ]
7+
workflow_dispatch:
8+
9+
defaults:
10+
run:
11+
shell: bash
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
717
jobs:
818
lint:
919
name: Lint Check
1020
runs-on: ubuntu-latest
1121
steps:
12-
- uses: actions/checkout@v2
13-
- uses: arduino/arduino-lint-action@v1
22+
- uses: actions/checkout@v4
23+
- uses: arduino/arduino-lint-action@v2
1424
with:
1525
library-manager: update
1626
compliance: strict
17-
project-type: all
27+
project-type: all

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

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ on:
1616
- 'src/unit/**.hpp'
1717
- 'src/unit/**.h'
1818
- 'src/unit/**.c'
19-
- 'test/**.cpp'
20-
- 'test/**.hpp'
21-
- 'test/**.h'
22-
- 'test/**.c'
2319
- 'examples/UnitUnified/**.ino'
2420
- 'examples/UnitUnified/**.cpp'
2521
- 'examples/UnitUnified/**.hpp'
@@ -32,10 +28,6 @@ on:
3228
- 'src/unit/**.hpp'
3329
- 'src/unit/**.h'
3430
- 'src/unit/**.c'
35-
- 'test/**.cpp'
36-
- 'test/**.hpp'
37-
- 'test/**.h'
38-
- 'test/**.c'
3931
- 'examples/UnitUnified/**.ino'
4032
- 'examples/UnitUnified/**.cpp'
4133
- 'examples/UnitUnified/**.hpp'
@@ -44,10 +36,19 @@ on:
4436
- '**arduino-esp-v2-build-check.yml'
4537
workflow_dispatch:
4638

39+
defaults:
40+
run:
41+
shell: bash
42+
43+
concurrency:
44+
group: ${{ github.workflow }}-${{ github.ref }}
45+
cancel-in-progress: true
46+
4747
jobs:
4848
build:
4949
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
5050
runs-on: ubuntu-latest
51+
timeout-minutes: 5
5152

5253
strategy:
5354
fail-fast: false
@@ -63,6 +64,7 @@ jobs:
6364
- UnitAmeter
6465
- UnitVmeter
6566
- UnitKmeterISO
67+
- UnitDualKmeter
6668

6769
board:
6870
- m5stack-atom
@@ -83,13 +85,43 @@ jobs:
8385
- esp32
8486

8587
include:
86-
# Specific sketches for m5stack-core-esp32 only
88+
# Specific sketches
8789
- sketch: GraphicalMeter
8890
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
8991
platform: esp32
9092
archi: esp32
9193
platform-version: 2.0.17
9294
board: m5stack-core-esp32
95+
build-properties: "-DUSING_UNIT_VMETER"
96+
- sketch: GraphicalMeter
97+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
98+
platform: esp32
99+
archi: esp32
100+
platform-version: 2.0.17
101+
board: m5stack-core-esp32
102+
build-properties: "-DUSING_UNIT_AMETER"
103+
- sketch: GraphicalMeter
104+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
105+
platform: esp32
106+
archi: esp32
107+
platform-version: 2.0.17
108+
board: m5stack-core-esp32
109+
build-properties: "-DUSING_UNIT_KMETER_ISO"
110+
- sketch: GraphicalMeter
111+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
112+
platform: esp32
113+
archi: esp32
114+
platform-version: 2.0.17
115+
board: m5stack-core-esp32
116+
build-properties: "-DUSING_UNIT_DUAL_KMETER"
117+
118+
exclude:
119+
- unit: UnitDualMeter
120+
board: m5stack-atom
121+
- unit: UnitDualMeter
122+
board: m5stack-atoms3
123+
- unit: UnitDualMeter
124+
board: m5stack-coreink
93125

94126
steps:
95127
- name: Checkout
@@ -106,7 +138,7 @@ jobs:
106138
platform-url: ${{ matrix.platform-url }}
107139
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
108140
extra-arduino-cli-args: ${{ matrix.cli-args }}
109-
#build-properties: ${{ toJson(matrix.build-properties) }}
141+
build-properties: ${{ matrix.build-properties }}
110142
sketch-names: ${{ matrix.sketch }}.ino
111143
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
112144
#sketches-exclude: ${{ matrix.sketches-exclude }}

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

Lines changed: 56 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ on:
1515
- 'src/unit/**.hpp'
1616
- 'src/unit/**.h'
1717
- 'src/unit/**.c'
18-
- 'test/**.cpp'
19-
- 'test/**.hpp'
20-
- 'test/**.h'
21-
- 'test/**.c'
2218
- 'examples/UnitUnified/**.ino'
2319
- 'examples/UnitUnified/**.cpp'
2420
- 'examples/UnitUnified/**.hpp'
@@ -31,10 +27,6 @@ on:
3127
- 'src/unit/**.hpp'
3228
- 'src/unit/**.h'
3329
- 'src/unit/**.c'
34-
- 'test/**.cpp'
35-
- 'test/**.hpp'
36-
- 'test/**.h'
37-
- 'test/**.c'
3830
- 'examples/UnitUnified/**.ino'
3931
- 'examples/UnitUnified/**.cpp'
4032
- 'examples/UnitUnified/**.hpp'
@@ -43,10 +35,19 @@ on:
4335
- '**arduino-esp-v3-build-check.yml'
4436
workflow_dispatch:
4537

38+
defaults:
39+
run:
40+
shell: bash
41+
42+
concurrency:
43+
group: ${{ github.workflow }}-${{ github.ref }}
44+
cancel-in-progress: true
45+
4646
jobs:
4747
build:
4848
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
4949
runs-on: ubuntu-latest
50+
timeout-minutes: 5
5051

5152
strategy:
5253
fail-fast: false
@@ -62,6 +63,7 @@ jobs:
6263
- UnitAmeter
6364
- UnitVmeter
6465
- UnitKmeterISO
66+
- UnitDualKmeter
6567

6668
board:
6769
- m5stack_atom
@@ -90,7 +92,7 @@ jobs:
9092
# - m5stack_unit_cams3
9193

9294
platform-version:
93-
- 3.0.4
95+
- 3.1.3
9496

9597
platform:
9698
- esp32
@@ -99,13 +101,55 @@ jobs:
99101
- esp32
100102

101103
include:
102-
# Specific sketches for m5stack-core-esp32 only
104+
# Specific sketches
105+
- sketch: GraphicalMeter
106+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
107+
platform-version: 3.1.3
108+
platform: esp32
109+
archi: esp32
110+
board: m5stack_core
111+
build-properties: "-DUSING_UNIT_VMETER"
112+
- sketch: GraphicalMeter
113+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
114+
platform-version: 3.1.3
115+
platform: esp32
116+
archi: esp32
117+
board: m5stack_core
118+
build-properties: "-DUSING_UNIT_AMETER"
103119
- sketch: GraphicalMeter
104120
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
105-
platform-version: 3.0.4
121+
platform-version: 3.1.3
106122
platform: esp32
107123
archi: esp32
108124
board: m5stack_core
125+
build-properties: "-DUSING_UNIT_KMETER_ISO"
126+
- sketch: GraphicalMeter
127+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
128+
platform-version: 3.1.3
129+
platform: esp32
130+
archi: esp32
131+
board: m5stack_core
132+
build-properties: "-DUSING_UNIT_DUAL_KMETER"
133+
134+
exclude:
135+
- unit: UnitDualMeter
136+
board: m5stack_atom
137+
- unit: UnitDualMeter
138+
board: m5stack_atoms3
139+
- unit: UnitDualMeter
140+
board: m5stack_coreink
141+
- unit: UnitDualMeter
142+
board: m5stack_dial
143+
- unit: UnitDualMeter
144+
board: m5stack_nanoc6
145+
- unit: UnitDualMeter
146+
board: m5stack_paper
147+
- unit: UnitDualMeter
148+
board: m5stack_stamp_s3
149+
- unit: UnitDualMeter
150+
board: m5stack_stickc_plus
151+
- unit: UnitDualMeter
152+
board: m5stack_stickc_plus2
109153

110154
steps:
111155
- name: Checkout
@@ -122,7 +166,7 @@ jobs:
122166
platform-url: ${{ matrix.platform-url }}
123167
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
124168
extra-arduino-cli-args: ${{ matrix.cli-args }}
125-
#build-properties: ${{ toJson(matrix.build-properties) }}
169+
build-properties: ${{ matrix.build-properties }}
126170
sketch-names: ${{ matrix.sketch }}.ino
127171
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
128172
#sketches-exclude: ${{ matrix.sketches-exclude }}

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

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,19 @@ on:
4444
- '**arduino-m5-build-check.yml'
4545
workflow_dispatch:
4646

47+
defaults:
48+
run:
49+
shell: bash
50+
51+
concurrency:
52+
group: ${{ github.workflow }}-${{ github.ref }}
53+
cancel-in-progress: true
54+
4755
jobs:
4856
build:
4957
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
5058
runs-on: ubuntu-latest
59+
timeout-minutes: 5
5160

5261
strategy:
5362
fail-fast: false
@@ -63,6 +72,7 @@ jobs:
6372
- UnitAmeter
6473
- UnitVmeter
6574
- UnitKmeterISO
75+
- UnitDualKmeter
6676

6777
board:
6878
- m5stack_atom
@@ -101,13 +111,59 @@ jobs:
101111
- esp32
102112

103113
include:
104-
# Specific sketches for m5stack-core-esp32 only
114+
# Specific sketches
105115
- sketch: GraphicalMeter
106116
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
107117
platform-version: 2.1.2
108118
platform: m5stack
109119
archi: esp32
110120
board: m5stack_core
121+
build-properties: "-DUSING_UNIT_VMETER"
122+
- sketch: GraphicalMeter
123+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
124+
platform-version: 2.1.2
125+
platform: m5stack
126+
archi: esp32
127+
board: m5stack_core
128+
build-properties: "-DUSING_UNIT_AMETER"
129+
- sketch: GraphicalMeter
130+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
131+
platform-version: 2.1.2
132+
platform: m5stack
133+
archi: esp32
134+
board: m5stack_core
135+
build-properties: "-DUSING_UNIT_KMETER_ISO"
136+
- sketch: GraphicalMeter
137+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
138+
platform-version: 2.1.2
139+
platform: m5stack
140+
archi: esp32
141+
board: m5stack_core
142+
build-properties: "-DUSING_UNIT_DUAL_KMETER"
143+
144+
exclude:
145+
- unit: UnitDualMeter
146+
board: m5stack_atom
147+
- unit: UnitDualMeter
148+
board: m5stack_atoms3
149+
- unit: UnitDualMeter
150+
board: m5stack_atoms3e
151+
- unit: UnitDualMeter
152+
board: m5stack_capsule
153+
- unit: UnitDualMeter
154+
board: m5stack_coreink
155+
- unit: UnitDualMeter
156+
board: m5stack_dial
157+
- unit: UnitDualMeter
158+
board: m5stack_dinmeter
159+
- unit: UnitDualMeter
160+
board: m5stack_paper
161+
- unit: UnitDualMeter
162+
board: m5stack_stamp_s3
163+
- unit: UnitDualMeter
164+
board: m5stack_stickc_plus
165+
- unit: UnitDualMeter
166+
board: m5stack_stickc_plus2
111167

112168
steps:
113169
- name: Checkout
@@ -124,7 +180,7 @@ jobs:
124180
platform-url: ${{ matrix.platform-url }}
125181
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
126182
extra-arduino-cli-args: ${{ matrix.cli-args }}
127-
#build-properties: ${{ toJson(matrix.build-properties) }}
183+
build-properties: ${{ matrix.build-properties }}
128184
sketch-names: ${{ matrix.sketch }}.ino
129185
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
130186
#sketches-exclude: ${{ matrix.sketches-exclude }}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ on:
3131
- '**.clang-format'
3232
workflow_dispatch:
3333

34+
defaults:
35+
run:
36+
shell: bash
37+
38+
concurrency:
39+
group: ${{ github.workflow }}-${{ github.ref }}
40+
cancel-in-progress: true
41+
3442
jobs:
3543
formatting-check:
3644
name: Formatting Check

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ on: [release, workflow_dispatch]
33
# branches:
44
# - main
55
# - master
6+
defaults:
7+
run:
8+
shell: bash
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
614
jobs:
715
deploy:
816
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)