Skip to content

Commit db58503

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents 3791855 + 823e13e commit db58503

29 files changed

+5898
-37
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-COLOR/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: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
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+
- PlotToSerial
61+
62+
unit:
63+
- UnitColor
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+
steps:
84+
- name: Checkout
85+
uses: actions/checkout@v4
86+
with:
87+
ref: ${{ github.event.pull_request.head.sha }}
88+
89+
# Build
90+
- name: Compile examples
91+
uses: ArminJo/arduino-test-compile@master
92+
with:
93+
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
94+
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
95+
platform-url: ${{ matrix.platform-url }}
96+
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
97+
extra-arduino-cli-args: ${{ matrix.cli-args }}
98+
#build-properties: ${{ toJson(matrix.build-properties) }}
99+
sketch-names: ${{ matrix.sketch }}.ino
100+
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
101+
#sketches-exclude: ${{ matrix.sketches-exclude }}

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

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
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+
- PlotToSerial
60+
61+
unit:
62+
- UnitColor
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+
steps:
100+
- name: Checkout
101+
uses: actions/checkout@v4
102+
with:
103+
ref: ${{ github.event.pull_request.head.sha }}
104+
105+
# Build
106+
- name: Compile examples
107+
uses: ArminJo/arduino-test-compile@master
108+
with:
109+
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
110+
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
111+
platform-url: ${{ matrix.platform-url }}
112+
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
113+
extra-arduino-cli-args: ${{ matrix.cli-args }}
114+
#build-properties: ${{ toJson(matrix.build-properties) }}
115+
sketch-names: ${{ matrix.sketch }}.ino
116+
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
117+
#sketches-exclude: ${{ matrix.sketches-exclude }}

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

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
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+
- '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-m5-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-m5-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://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
58+
59+
sketch:
60+
- PlotToSerial
61+
62+
unit:
63+
- UnitColor
64+
65+
board:
66+
- m5stack_atom
67+
- m5stack_atoms3
68+
- m5stack_atoms3r
69+
- m5stack_capsule
70+
# - m5stack_cardputer
71+
- m5stack_core
72+
- m5stack_core2
73+
- m5stack_coreink
74+
- m5stack_cores3
75+
- m5stack_dial
76+
- m5stack_dinmeter
77+
- m5stack_fire
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+
- 2.1.2
94+
95+
platform:
96+
- m5stack
97+
98+
archi:
99+
- esp32
100+
101+
102+
steps:
103+
- name: Checkout
104+
uses: actions/checkout@v4
105+
with:
106+
ref: ${{ github.event.pull_request.head.sha }}
107+
108+
# Build
109+
- name: Compile examples
110+
uses: ArminJo/arduino-test-compile@master
111+
with:
112+
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
113+
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
114+
platform-url: ${{ matrix.platform-url }}
115+
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
116+
extra-arduino-cli-args: ${{ matrix.cli-args }}
117+
#build-properties: ${{ toJson(matrix.build-properties) }}
118+
sketch-names: ${{ matrix.sketch }}.ino
119+
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
120+
#sketches-exclude: ${{ matrix.sketches-exclude }}
121+

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
branches:
1212
- '*'
1313
paths:
14-
- '*'
1514
- '**.ino'
1615
- '**.cpp'
1716
- '**.hpp'
@@ -39,13 +38,12 @@ jobs:
3938
strategy:
4039
matrix:
4140
path:
42-
- check: './' # path to include
43-
exclude: '' # path to exclude
44-
#- check: 'src'
45-
# exclude: '(Fonts)' # Exclude file paths containing "Fonts"
46-
#- check: 'examples'
47-
# exclude: ''
48-
41+
- check: 'src'
42+
exclude: ''
43+
- check: 'test'
44+
exclude: ''
45+
- check: 'examples'
46+
exclude: ''
4947
steps:
5048
- name: Checkout
5149
uses: actions/checkout@v4

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Deploy Doxygen docuemnt on GitHub Pages
2+
on: [release, workflow_dispatch]
3+
branches:
4+
- main
5+
# - master
6+
jobs:
7+
deploy:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Make document
11+
uses: m5stack/M5Utility/.github/actions/doxygen@develop
12+
with:
13+
doxygen_version: 1.11.0
14+
github_token: ${{ secrets.GITHUB_TOKEN }}
15+
branch: gh-pages
16+
folder: docs/html
17+
config_file: docs/Doxyfile

0 commit comments

Comments
 (0)