Skip to content

Commit d156e67

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents 5658656 + 631c6ac commit d156e67

45 files changed

Lines changed: 11034 additions & 32 deletions

Some content is hidden

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

‎.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-FINGER/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: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
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+
- 'examples/UnitUnified/**.ino'
20+
- 'examples/UnitUnified/**.cpp'
21+
- 'examples/UnitUnified/**.hpp'
22+
- 'examples/UnitUnified/**.h'
23+
- 'examples/UnitUnified/**.c'
24+
- '**arduino-esp-v2-build-check.yml'
25+
pull_request:
26+
paths:
27+
- 'src/unit/**.cpp'
28+
- 'src/unit/**.hpp'
29+
- 'src/unit/**.h'
30+
- 'src/unit/**.c'
31+
- 'examples/UnitUnified/**.ino'
32+
- 'examples/UnitUnified/**.cpp'
33+
- 'examples/UnitUnified/**.hpp'
34+
- 'examples/UnitUnified/**.h'
35+
- 'examples/UnitUnified/**.c'
36+
- '**arduino-esp-v2-build-check.yml'
37+
workflow_dispatch:
38+
39+
defaults:
40+
run:
41+
shell: bash
42+
43+
concurrency:
44+
group: ${{ github.workflow }}-${{ github.ref }}
45+
cancel-in-progress: true
46+
47+
jobs:
48+
build:
49+
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
50+
runs-on: ubuntu-latest
51+
timeout-minutes: 5
52+
53+
strategy:
54+
fail-fast: false
55+
max-parallel: 20
56+
matrix:
57+
platform-url:
58+
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
59+
60+
sketch:
61+
- PlotToSerial
62+
63+
unit:
64+
- UnitFinger
65+
- UnitFinger2
66+
67+
board:
68+
- m5stack-atom
69+
- m5stack-atoms3
70+
- m5stack-core-esp32
71+
- m5stack-core2
72+
- m5stack-coreink
73+
- m5stack-cores3
74+
- m5stack-fire
75+
76+
platform-version:
77+
- 2.0.17
78+
79+
platform:
80+
- esp32
81+
82+
archi:
83+
- esp32
84+
85+
build-properties:
86+
- "-DUSING_UNIT_FINGER"
87+
88+
include:
89+
# Specific sketches
90+
- sketch: Capture
91+
unit: UnitFinger
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: Characteristic
98+
unit: UnitFinger
99+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
100+
platform: esp32
101+
archi: esp32
102+
platform-version: 2.0.17
103+
board: m5stack-core-esp32
104+
- sketch: User
105+
unit: UnitFinger
106+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
107+
platform: esp32
108+
archi: esp32
109+
platform-version: 2.0.17
110+
board: m5stack-core-esp32
111+
112+
- sketch: Capture
113+
unit: UnitFinger2
114+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
115+
platform: esp32
116+
archi: esp32
117+
platform-version: 2.0.17
118+
board: m5stack-core-esp32
119+
- sketch: Automatic
120+
unit: UnitFinger2
121+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
122+
platform: esp32
123+
archi: esp32
124+
platform-version: 2.0.17
125+
board: m5stack-core-esp32
126+
- sketch: User
127+
unit: UnitFinger2
128+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
129+
platform: esp32
130+
archi: esp32
131+
platform-version: 2.0.17
132+
board: m5stack-core-esp32
133+
134+
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' }}
140+
uses: actions/checkout@v4
141+
with:
142+
ref: ${{ github.event.pull_request.head.sha }}
143+
144+
# Build
145+
- name: Compile examples
146+
uses: ArminJo/arduino-test-compile@master
147+
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 }}

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

Lines changed: 209 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,209 @@
1+
name: Build(arduino-esp32:3.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+
- 'examples/UnitUnified/**.ino'
20+
- 'examples/UnitUnified/**.cpp'
21+
- 'examples/UnitUnified/**.hpp'
22+
- 'examples/UnitUnified/**.h'
23+
- 'examples/UnitUnified/**.c'
24+
- '**arduino-esp-v3-build-check.yml'
25+
pull_request:
26+
paths:
27+
- 'src/unit/**.cpp'
28+
- 'src/unit/**.hpp'
29+
- 'src/unit/**.h'
30+
- 'src/unit/**.c'
31+
- 'examples/UnitUnified/**.ino'
32+
- 'examples/UnitUnified/**.cpp'
33+
- 'examples/UnitUnified/**.hpp'
34+
- 'examples/UnitUnified/**.h'
35+
- 'examples/UnitUnified/**.c'
36+
- '**arduino-esp-v3-build-check.yml'
37+
workflow_dispatch:
38+
39+
defaults:
40+
run:
41+
shell: bash
42+
43+
concurrency:
44+
group: ${{ github.workflow }}-${{ github.ref }}
45+
cancel-in-progress: true
46+
47+
jobs:
48+
build:
49+
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
50+
runs-on: ubuntu-latest
51+
timeout-minutes: 5
52+
53+
strategy:
54+
fail-fast: false
55+
max-parallel: 20
56+
matrix:
57+
platform-url:
58+
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
59+
60+
sketch:
61+
- PlotToSerial
62+
63+
unit:
64+
- UnitFinger
65+
- UnitFinger2
66+
67+
board:
68+
- m5stack_atom
69+
- m5stack_atoms3
70+
- m5stack_capsule
71+
# - m5stack_cardputer
72+
- m5stack_core
73+
- m5stack_core2
74+
- m5stack_coreink
75+
- m5stack_cores3
76+
- m5stack_dial
77+
- m5stack_fire
78+
- m5stack_nanoc6
79+
- m5stack_paper
80+
# - m5stack_poe_cam
81+
# - m5stack_stamp_c3
82+
# - m5stack_stamp_pico
83+
- m5stack_stamp_s3
84+
# - m5stack_station
85+
# - m5stack_stickc
86+
- m5stack_stickc_plus
87+
- m5stack_stickc_plus2
88+
# - m5stack_timer_cam
89+
# - m5stack_tough
90+
# - m5stack_unit_cam
91+
# - m5stack_unit_cams3
92+
93+
platform-version:
94+
- 3.1.3
95+
96+
platform:
97+
- esp32
98+
99+
archi:
100+
- esp32
101+
102+
include:
103+
# Specific sketches
104+
- sketch: Capture
105+
unit: UnitFinger
106+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
107+
platform: esp32
108+
archi: esp32
109+
platform-version: 3.1.3
110+
board: m5stack_core
111+
- sketch: Characteristic
112+
unit: UnitFinger
113+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
114+
platform: esp32
115+
archi: esp32
116+
platform-version: 3.1.3
117+
board: m5stack_core
118+
- sketch: User
119+
unit: UnitFinger
120+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
121+
platform: esp32
122+
archi: esp32
123+
platform-version: 3.1.3
124+
board: m5stack_core
125+
126+
- sketch: PlotToSerial
127+
unit: HatFinger
128+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
129+
platform: esp32
130+
archi: esp32
131+
platform-version: 3.1.3
132+
board: m5stack_stickc_plus
133+
- sketch: PlotToSerial
134+
unit: HatFinger
135+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
136+
platform: esp32
137+
archi: esp32
138+
platform-version: 3.1.3
139+
board: m5stack_stickc_plus2
140+
- sketch: Capture
141+
unit: HatFinger
142+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
143+
platform: esp32
144+
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
156+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
157+
platform: esp32
158+
archi: esp32
159+
platform-version: 3.1.3
160+
board: m5stack_stickc_plus2
161+
162+
- sketch: Capture
163+
unit: UnitFinger2
164+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
165+
platform: esp32
166+
archi: esp32
167+
platform-version: 3.1.3
168+
board: m5stack_core
169+
- sketch: Automatic
170+
unit: UnitFinger2
171+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
172+
platform: esp32
173+
archi: esp32
174+
platform-version: 3.1.3
175+
board: m5stack_core
176+
- sketch: User
177+
unit: UnitFinger2
178+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
179+
platform: esp32
180+
archi: esp32
181+
platform-version: 3.1.3
182+
board: m5stack_core
183+
184+
185+
186+
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' }}
192+
uses: actions/checkout@v4
193+
with:
194+
ref: ${{ github.event.pull_request.head.sha }}
195+
196+
# Build
197+
- name: Compile examples
198+
uses: ArminJo/arduino-test-compile@master
199+
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 }}

0 commit comments

Comments
 (0)