Skip to content

Commit 5253f70

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents f3e8758 + 9730782 commit 5253f70

29 files changed

+5312
-32
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-WEIGHT/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: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
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+
- UnitWeightI2C
64+
# - UnitMiniscale
65+
66+
board:
67+
- m5stack-atom
68+
- m5stack-atoms3
69+
- m5stack-core-esp32
70+
- m5stack-core2
71+
- m5stack-coreink
72+
- m5stack-cores3
73+
- m5stack-fire
74+
75+
platform-version:
76+
- 2.0.17
77+
78+
platform:
79+
- esp32
80+
81+
archi:
82+
- esp32
83+
84+
steps:
85+
- name: Checkout
86+
uses: actions/checkout@v4
87+
with:
88+
ref: ${{ github.event.pull_request.head.sha }}
89+
90+
# Build
91+
- name: Compile examples
92+
uses: ArminJo/arduino-test-compile@master
93+
with:
94+
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
95+
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
96+
platform-url: ${{ matrix.platform-url }}
97+
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
98+
extra-arduino-cli-args: ${{ matrix.cli-args }}
99+
#build-properties: ${{ toJson(matrix.build-properties) }}
100+
sketch-names: ${{ matrix.sketch }}.ino
101+
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
102+
#sketches-exclude: ${{ matrix.sketches-exclude }}

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

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
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+
- UnitWeightI2C
63+
# - UnitMiniscale
64+
65+
board:
66+
- m5stack_atom
67+
- m5stack_atoms3
68+
- m5stack_capsule
69+
# - m5stack_cardputer
70+
- m5stack_core
71+
- m5stack_core2
72+
- m5stack_coreink
73+
- m5stack_cores3
74+
- m5stack_dial
75+
- m5stack_fire
76+
- m5stack_nanoc6
77+
- m5stack_paper
78+
# - m5stack_poe_cam
79+
# - m5stack_stamp_c3
80+
# - m5stack_stamp_pico
81+
- m5stack_stamp_s3
82+
# - m5stack_station
83+
# - m5stack_stickc
84+
- m5stack_stickc_plus
85+
- m5stack_stickc_plus2
86+
# - m5stack_timer_cam
87+
# - m5stack_tough
88+
# - m5stack_unit_cam
89+
# - m5stack_unit_cams3
90+
91+
platform-version:
92+
- 3.0.4
93+
94+
platform:
95+
- esp32
96+
97+
archi:
98+
- esp32
99+
100+
steps:
101+
- name: Checkout
102+
uses: actions/checkout@v4
103+
with:
104+
ref: ${{ github.event.pull_request.head.sha }}
105+
106+
# Build
107+
- name: Compile examples
108+
uses: ArminJo/arduino-test-compile@master
109+
with:
110+
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
111+
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
112+
platform-url: ${{ matrix.platform-url }}
113+
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
114+
extra-arduino-cli-args: ${{ matrix.cli-args }}
115+
#build-properties: ${{ toJson(matrix.build-properties) }}
116+
sketch-names: ${{ matrix.sketch }}.ino
117+
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
118+
#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+
- UnitWeightI2C
64+
# - UnitMiniscale
65+
66+
board:
67+
- m5stack_atom
68+
- m5stack_atoms3
69+
- m5stack_atoms3r
70+
- m5stack_capsule
71+
# - m5stack_cardputer
72+
- m5stack_core
73+
- m5stack_core2
74+
- m5stack_coreink
75+
- m5stack_cores3
76+
- m5stack_dial
77+
- m5stack_dinmeter
78+
- m5stack_fire
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+
- 2.1.2
95+
96+
platform:
97+
- m5stack
98+
99+
archi:
100+
- esp32
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: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ env:
55

66
on:
77
push:
8+
tags-ignore:
9+
- '*.*.*'
10+
- 'v*.*.*'
11+
branches:
12+
- '*'
813
paths:
914
- '**.ino'
1015
- '**.cpp'
@@ -13,14 +18,18 @@ on:
1318
- '**.c'
1419
- '**.inl'
1520
- '**clang-format-check.yml'
16-
pull_request:
21+
- '**.clang-format'
22+
pull_request:
23+
paths:
1724
- '**.ino'
1825
- '**.cpp'
1926
- '**.hpp'
2027
- '**.h'
2128
- '**.c'
2229
- '**.inl'
2330
- '**clang-format-check.yml'
31+
- '**.clang-format'
32+
workflow_dispatch:
2433

2534
jobs:
2635
formatting-check:
@@ -29,9 +38,11 @@ jobs:
2938
strategy:
3039
matrix:
3140
path:
32-
- check: './' # path to include
33-
exclude: '' # path to exclude
34-
#- check: 'src'
41+
#- check: './' # path to include
42+
# exclude: '' # path to exclude
43+
- check: 'src'
44+
- check: 'test'
45+
- check: 'examples'
3546
# exclude: '(Fonts)' # Exclude file paths containing "Fonts"
3647
#- check: 'examples'
3748
# exclude: ''

0 commit comments

Comments
 (0)