Skip to content

Commit 29bbdf6

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents 50146b1 + 7d5a0ac commit 29bbdf6

34 files changed

+6174
-39
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ body:
7676
label: Issue checklist
7777
description: Please double-check that you have done each of the following things before submitting the issue.
7878
options:
79-
- label: I searched for previous reports in [the issue tracker](https://github.com/m5stack/M5Stack/issues?q=)
79+
- label: I searched for previous reports in [the issue tracker](https://github.com/m5stack/M5Unit-EXTIO/issues?q=)
8080
required: true
8181
- label: My report contains all necessary details
8282
required: true

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

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
name: Build(arduino-esp32:2.x)
2+
3+
env:
4+
SKETCH_NAMES_FIND_START: ./examples/UnitUnified
5+
REQUIRED_LIBRARIES: M5Unified,M5UnitUnified
6+
7+
on:
8+
push:
9+
tags-ignore:
10+
- '*.*.*'
11+
- 'v*.*.*'
12+
branches:
13+
- '*'
14+
paths:
15+
- 'src/unit/**.cpp'
16+
- 'src/unit/**.hpp'
17+
- 'src/unit/**.h'
18+
- 'src/unit/**.c'
19+
- 'test/**.cpp'
20+
- 'test/**.hpp'
21+
- 'test/**.h'
22+
- 'test/**.c'
23+
- 'examples/UnitUnified/**.ino'
24+
- 'examples/UnitUnified/**.cpp'
25+
- 'examples/UnitUnified/**.hpp'
26+
- 'examples/UnitUnified/**.h'
27+
- 'examples/UnitUnified/**.c'
28+
- '**arduino-esp-v2-build-check.yml'
29+
pull_request:
30+
paths:
31+
- 'src/unit/**.cpp'
32+
- 'src/unit/**.hpp'
33+
- 'src/unit/**.h'
34+
- 'src/unit/**.c'
35+
- 'test/**.cpp'
36+
- 'test/**.hpp'
37+
- 'test/**.h'
38+
- 'test/**.c'
39+
- 'examples/UnitUnified/**.ino'
40+
- 'examples/UnitUnified/**.cpp'
41+
- 'examples/UnitUnified/**.hpp'
42+
- 'examples/UnitUnified/**.h'
43+
- 'examples/UnitUnified/**.c'
44+
- '**arduino-esp-v2-build-check.yml'
45+
workflow_dispatch:
46+
47+
jobs:
48+
build:
49+
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
50+
runs-on: ubuntu-latest
51+
52+
strategy:
53+
fail-fast: false
54+
#max-parallel: 1
55+
matrix:
56+
platform-url:
57+
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
58+
59+
sketch:
60+
- AnaDigInput
61+
62+
unit:
63+
- UnitExtIO2
64+
65+
board:
66+
- m5stack-atom
67+
- m5stack-atoms3
68+
- m5stack-core-esp32
69+
- m5stack-core2
70+
- m5stack-coreink
71+
- m5stack-cores3
72+
- m5stack-fire
73+
74+
platform-version:
75+
- 2.0.17
76+
77+
platform:
78+
- esp32
79+
80+
archi:
81+
- esp32
82+
83+
include:
84+
# Specific sketches for m5stack-core-esp32 only
85+
- sketch: DigOutput
86+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
87+
platform: esp32
88+
archi: esp32
89+
platform-version: 2.0.17
90+
board: m5stack-core-esp32
91+
- sketch: ServoControl
92+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
93+
platform: esp32
94+
archi: esp32
95+
platform-version: 2.0.17
96+
board: m5stack-core-esp32
97+
- sketch: LEDControl
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-core-esp32
103+
104+
steps:
105+
- name: Checkout
106+
uses: actions/checkout@v4
107+
with:
108+
ref: ${{ github.event.pull_request.head.sha }}
109+
110+
# Build
111+
- name: Compile examples
112+
uses: ArminJo/arduino-test-compile@master
113+
with:
114+
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
115+
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
116+
platform-url: ${{ matrix.platform-url }}
117+
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
118+
extra-arduino-cli-args: ${{ matrix.cli-args }}
119+
#build-properties: ${{ toJson(matrix.build-properties) }}
120+
sketch-names: ${{ matrix.sketch }}.ino
121+
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
122+
#sketches-exclude: ${{ matrix.sketches-exclude }}

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

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
name: Build(arduino-esp32:3.x)
2+
3+
env:
4+
SKETCH_NAMES_FIND_START: ./examples/UnitUnified
5+
REQUIRED_LIBRARIES: M5Unified,M5UnitUnified
6+
on:
7+
push:
8+
tags-ignore:
9+
- '*.*.*'
10+
- 'v*.*.*'
11+
branches:
12+
- '*'
13+
paths:
14+
- 'src/unit/**.cpp'
15+
- 'src/unit/**.hpp'
16+
- 'src/unit/**.h'
17+
- 'src/unit/**.c'
18+
- 'test/**.cpp'
19+
- 'test/**.hpp'
20+
- 'test/**.h'
21+
- 'test/**.c'
22+
- 'examples/UnitUnified/**.ino'
23+
- 'examples/UnitUnified/**.cpp'
24+
- 'examples/UnitUnified/**.hpp'
25+
- 'examples/UnitUnified/**.h'
26+
- 'examples/UnitUnified/**.c'
27+
- '**arduino-esp-v3-build-check.yml'
28+
pull_request:
29+
paths:
30+
- 'src/unit/**.cpp'
31+
- 'src/unit/**.hpp'
32+
- 'src/unit/**.h'
33+
- 'src/unit/**.c'
34+
- 'test/**.cpp'
35+
- 'test/**.hpp'
36+
- 'test/**.h'
37+
- 'test/**.c'
38+
- 'examples/UnitUnified/**.ino'
39+
- 'examples/UnitUnified/**.cpp'
40+
- 'examples/UnitUnified/**.hpp'
41+
- 'examples/UnitUnified/**.h'
42+
- 'examples/UnitUnified/**.c'
43+
- '**arduino-esp-v3-build-check.yml'
44+
workflow_dispatch:
45+
46+
jobs:
47+
build:
48+
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
49+
runs-on: ubuntu-latest
50+
51+
strategy:
52+
fail-fast: false
53+
#max-parallel: 1
54+
matrix:
55+
platform-url:
56+
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
57+
58+
sketch:
59+
- AnaDigInput
60+
61+
unit:
62+
- UnitExtIO2
63+
64+
board:
65+
- m5stack_atom
66+
- m5stack_atoms3
67+
- m5stack_capsule
68+
# - m5stack_cardputer
69+
- m5stack_core
70+
- m5stack_core2
71+
- m5stack_coreink
72+
- m5stack_cores3
73+
- m5stack_dial
74+
- m5stack_fire
75+
- m5stack_nanoc6
76+
- m5stack_paper
77+
# - m5stack_poe_cam
78+
# - m5stack_stamp_c3
79+
# - m5stack_stamp_pico
80+
- m5stack_stamp_s3
81+
# - m5stack_station
82+
# - m5stack_stickc
83+
- m5stack_stickc_plus
84+
- m5stack_stickc_plus2
85+
# - m5stack_timer_cam
86+
# - m5stack_tough
87+
# - m5stack_unit_cam
88+
# - m5stack_unit_cams3
89+
90+
platform-version:
91+
- 3.0.4
92+
93+
platform:
94+
- esp32
95+
96+
archi:
97+
- esp32
98+
99+
include:
100+
# Specific sketches for m5stack-core-esp32 only
101+
- sketch: DigOutput
102+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
103+
platform-version: 3.0.4
104+
platform: esp32
105+
archi: esp32
106+
board: m5stack_core
107+
- sketch: ServoControl
108+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
109+
platform-version: 3.0.4
110+
platform: esp32
111+
archi: esp32
112+
board: m5stack_core
113+
- sketch: LEDControl
114+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
115+
platform-version: 3.0.4
116+
platform: esp32
117+
archi: esp32
118+
board: m5stack_core
119+
120+
121+
steps:
122+
- name: Checkout
123+
uses: actions/checkout@v4
124+
with:
125+
ref: ${{ github.event.pull_request.head.sha }}
126+
127+
# Build
128+
- name: Compile examples
129+
uses: ArminJo/arduino-test-compile@master
130+
with:
131+
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
132+
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
133+
platform-url: ${{ matrix.platform-url }}
134+
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
135+
extra-arduino-cli-args: ${{ matrix.cli-args }}
136+
#build-properties: ${{ toJson(matrix.build-properties) }}
137+
sketch-names: ${{ matrix.sketch }}.ino
138+
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
139+
#sketches-exclude: ${{ matrix.sketches-exclude }}

0 commit comments

Comments
 (0)