Skip to content

Commit fcc352d

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents f2ac214 + 60c4727 commit fcc352d

40 files changed

+9750
-40
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-CRYPTO/issues?q=)
8080
required: true
8181
- label: My report contains all necessary details
8282
required: true

‎.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: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
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: 1
56+
matrix:
57+
platform-url:
58+
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
59+
60+
sketch:
61+
- PlotToSerial
62+
- Blinky-Hello-World
63+
64+
unit:
65+
- UnitID
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+
steps:
86+
- name: Checkout
87+
uses: actions/checkout@v4
88+
with:
89+
ref: ${{ github.event.pull_request.head.sha }}
90+
91+
# Build
92+
- name: Compile examples
93+
uses: ArminJo/arduino-test-compile@master
94+
with:
95+
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
96+
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
97+
platform-url: ${{ matrix.platform-url }}
98+
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
99+
extra-arduino-cli-args: ${{ matrix.cli-args }}
100+
#build-properties: ${{ toJson(matrix.build-properties) }}
101+
sketch-names: ${{ matrix.sketch }}.ino
102+
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
103+
#sketches-exclude: ${{ matrix.sketches-exclude }}

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

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
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+
- 'examples/UnitUnified/**.ino'
19+
- 'examples/UnitUnified/**.cpp'
20+
- 'examples/UnitUnified/**.hpp'
21+
- 'examples/UnitUnified/**.h'
22+
- 'examples/UnitUnified/**.c'
23+
- '**arduino-esp-v3-build-check.yml'
24+
pull_request:
25+
paths:
26+
- 'src/unit/**.cpp'
27+
- 'src/unit/**.hpp'
28+
- 'src/unit/**.h'
29+
- 'src/unit/**.c'
30+
- 'examples/UnitUnified/**.ino'
31+
- 'examples/UnitUnified/**.cpp'
32+
- 'examples/UnitUnified/**.hpp'
33+
- 'examples/UnitUnified/**.h'
34+
- 'examples/UnitUnified/**.c'
35+
- '**arduino-esp-v3-build-check.yml'
36+
workflow_dispatch:
37+
38+
defaults:
39+
run:
40+
shell: bash
41+
42+
concurrency:
43+
group: ${{ github.workflow }}-${{ github.ref }}
44+
cancel-in-progress: true
45+
46+
jobs:
47+
build:
48+
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
49+
runs-on: ubuntu-latest
50+
timeout-minutes: 5
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+
- PlotToSerial
61+
- Blinky-Hello-World
62+
63+
unit:
64+
- UnitID
65+
66+
board:
67+
- m5stack_atom
68+
- m5stack_atoms3
69+
- m5stack_capsule
70+
# - m5stack_cardputer
71+
- m5stack_core
72+
- m5stack_core2
73+
- m5stack_coreink
74+
- m5stack_cores3
75+
- m5stack_dial
76+
- m5stack_fire
77+
- m5stack_nanoc6
78+
- m5stack_paper
79+
# - m5stack_poe_cam
80+
# - m5stack_stamp_c3
81+
# - m5stack_stamp_pico
82+
- m5stack_stamp_s3
83+
# - m5stack_station
84+
# - m5stack_stickc
85+
- m5stack_stickc_plus
86+
- m5stack_stickc_plus2
87+
# - m5stack_timer_cam
88+
# - m5stack_tough
89+
# - m5stack_unit_cam
90+
# - m5stack_unit_cams3
91+
92+
platform-version:
93+
- 3.0.4
94+
95+
platform:
96+
- esp32
97+
98+
archi:
99+
- esp32
100+
101+
steps:
102+
- name: Checkout
103+
uses: actions/checkout@v4
104+
with:
105+
ref: ${{ github.event.pull_request.head.sha }}
106+
107+
# Build
108+
- name: Compile examples
109+
uses: ArminJo/arduino-test-compile@master
110+
with:
111+
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
112+
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
113+
platform-url: ${{ matrix.platform-url }}
114+
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
115+
extra-arduino-cli-args: ${{ matrix.cli-args }}
116+
#build-properties: ${{ toJson(matrix.build-properties) }}
117+
sketch-names: ${{ matrix.sketch }}.ino
118+
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
119+
#sketches-exclude: ${{ matrix.sketches-exclude }}

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

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
name: Build(arduino-m5stack)
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-m5-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-m5-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: 1
56+
matrix:
57+
platform-url:
58+
- https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
59+
60+
sketch:
61+
- PlotToSerial
62+
- Blinky-Hello-World
63+
64+
unit:
65+
- UnitID
66+
67+
board:
68+
- m5stack_atom
69+
- m5stack_atoms3
70+
- m5stack_atoms3r
71+
- m5stack_capsule
72+
# - m5stack_cardputer
73+
- m5stack_core
74+
- m5stack_core2
75+
- m5stack_coreink
76+
- m5stack_cores3
77+
- m5stack_dial
78+
- m5stack_dinmeter
79+
- m5stack_fire
80+
- m5stack_paper
81+
# - m5stack_poe_cam
82+
# - m5stack_stamp_c3
83+
# - m5stack_stamp_pico
84+
- m5stack_stamp_s3
85+
# - m5stack_station
86+
# - m5stack_stickc
87+
- m5stack_stickc_plus
88+
- m5stack_stickc_plus2
89+
# - m5stack_timer_cam
90+
# - m5stack_tough
91+
# - m5stack_unit_cam
92+
# - m5stack_unit_cams3
93+
94+
platform-version:
95+
- 2.1.2
96+
97+
platform:
98+
- m5stack
99+
100+
archi:
101+
- esp32
102+
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 }}
123+

0 commit comments

Comments
 (0)