Skip to content

Commit 01d9d0e

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents 8a68666 + 35991d2 commit 01d9d0e

24 files changed

+5675
-39
lines changed

‎.clang-format‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Language: Cpp
33
BasedOnStyle: Google
4-
AccessModifierOffset: -1
4+
AccessModifierOffset: -4
55
AlignAfterOpenBracket: Align
66
AlignConsecutiveMacros: true
77
AlignConsecutiveAssignments: true
@@ -29,7 +29,7 @@ BraceWrapping:
2929
AfterClass: false
3030
AfterControlStatement: false
3131
AfterEnum: false
32-
AfterFunction: false
32+
AfterFunction: true
3333
AfterNamespace: false
3434
AfterObjCDeclaration: false
3535
AfterStruct: false
@@ -42,7 +42,7 @@ BraceWrapping:
4242
SplitEmptyRecord: true
4343
SplitEmptyNamespace: true
4444
BreakBeforeBinaryOperators: None
45-
BreakBeforeBraces: Attach
45+
BreakBeforeBraces: Custom
4646
BreakBeforeInheritanceComma: false
4747
BreakInheritanceList: BeforeColon
4848
BreakBeforeTernaryOperators: true

‎.github/workflows/ArduinoBuild_2.yml‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
name: ArduinoBuild(platform-version 2.x)
2+
3+
env:
4+
SKETCH_NAMES_FIND_START: ./examples/UnitUnified
5+
REQUIRED_LIBRARIES: M5Unified
6+
# M5UNITUNIFIED_BRANCH: main
7+
M5UNITUNIFIED_BRANCH: develop
8+
9+
on:
10+
push:
11+
paths:
12+
- '**.ino'
13+
- '**.cpp'
14+
- '**.hpp'
15+
- '**.h'
16+
- '**.c'
17+
- '**ArduinoBuild_2.yml'
18+
pull_request:
19+
paths:
20+
- '**.ino'
21+
- '**.cpp'
22+
- '**.hpp'
23+
- '**.h'
24+
- '**.c'
25+
- '**ArduinoBuild_2.yml'
26+
workflow_dispatch:
27+
28+
jobs:
29+
build:
30+
name: ${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
31+
runs-on: ubuntu-latest
32+
33+
strategy:
34+
fail-fast: false
35+
#max-parallel: 1
36+
matrix:
37+
platform-url:
38+
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
39+
40+
sketch:
41+
- PlotToSerial
42+
43+
board:
44+
- m5stack-core-esp32
45+
- m5stack-core2
46+
- m5stack-atoms3
47+
- m5stack-cores3
48+
49+
platform-version:
50+
#- 2.0.15
51+
#- 2.0.16
52+
- 2.0.17
53+
54+
platform:
55+
- esp32
56+
57+
archi:
58+
- esp32
59+
60+
steps:
61+
62+
- name: Running on GitHub Actions
63+
if: env.ACT != 'true'
64+
run: echo "This is running on GitHub Actions."
65+
66+
- name: Running locally with act
67+
if: env.ACT == 'true'
68+
run: echo "This is running locally with act."
69+
70+
- name: Checkout
71+
uses: actions/checkout@v4
72+
with:
73+
ref: ${{ github.event.pull_request.head.sha }}
74+
75+
# Checkout library from specific URL and branch
76+
# Note that dependent libraries are not automatically installed.
77+
78+
# - name: Configure git for authentication (Until each repository is published)
79+
# run: |
80+
# git config --global url."https://${{ secrets.TOKEN_M5UNITUNIFIED }}@github.com/".insteadOf "https://github.com/"
81+
82+
- name: Checkout M5Utility
83+
uses: actions/checkout@v3
84+
with:
85+
repository: m5stack/M5Utility
86+
ref: ${{ env.M5UNITUNIFIED_BRANCH }}
87+
path: CustomLibrary_M5Utility # must contain string "Custom"
88+
token: ${{ secrets.TOKEN_M5UNITUNIFIED }} # Only required during development in private repo
89+
90+
- name: Checkout M5HAL
91+
uses: actions/checkout@v3
92+
with:
93+
repository: m5stack/M5HAL
94+
ref: ${{ env.M5UNITUNIFIED_BRANCH }}
95+
path: CustomLibrary_M5HAL # must contain string "Custom"
96+
token: ${{ secrets.TOKEN_M5UNITUNIFIED }} # Only required during development in private repo
97+
98+
- name: Checkout M5UnitUnified
99+
uses: actions/checkout@v3
100+
with:
101+
repository: m5stack/M5UnitUnified
102+
ref: ${{ env.M5UNITUNIFIED_BRANCH }}
103+
path: CustomLibrary_M5UnitUnified
104+
token: ${{ secrets.TOKEN_M5UNITUNIFIED }} # Only required during development in private repo
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 }}
118+
#sketches-exclude: ${{ matrix.sketches-exclude }}

‎.github/workflows/ArduinoBuild_3.yml‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
name: ArduinoBuild(platform-version 3.x)
2+
3+
env:
4+
SKETCH_NAMES_FIND_START: ./examples/UnitUnified
5+
REQUIRED_LIBRARIES: M5Unified
6+
# M5UNITUNIFIED_BRANCH: main
7+
M5UNITUNIFIED_BRANCH: develop
8+
9+
on:
10+
push:
11+
paths:
12+
- '**.ino'
13+
- '**.cpp'
14+
- '**.hpp'
15+
- '**.h'
16+
- '**.c'
17+
- '**ArduinoBuild_3.yml'
18+
pull_request:
19+
paths:
20+
- '**.ino'
21+
- '**.cpp'
22+
- '**.hpp'
23+
- '**.h'
24+
- '**.c'
25+
- '**ArduinoBuild_3.yml'
26+
workflow_dispatch:
27+
28+
jobs:
29+
build:
30+
name: ${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
31+
runs-on: ubuntu-latest
32+
33+
strategy:
34+
fail-fast: false
35+
#max-parallel: 1
36+
matrix:
37+
platform-url:
38+
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
39+
40+
sketch:
41+
- PlotToSerial
42+
43+
board:
44+
- m5stack_core
45+
- m5stack_core2
46+
- m5stack_atoms3
47+
- m5stack_cores3
48+
- m5stack_dial
49+
- m5stack_nanoc6
50+
- m5stack_paper
51+
- m5stack_stickc_plus
52+
53+
platform-version:
54+
#- 3.0.0
55+
#- 3.0.1
56+
#- 3.0.2
57+
#- 3.0.3
58+
- 3.0.4
59+
60+
platform:
61+
- esp32
62+
63+
archi:
64+
- esp32
65+
66+
steps:
67+
68+
- name: Running on GitHub Actions
69+
if: env.ACT != 'true'
70+
run: echo "This is running on GitHub Actions."
71+
72+
- name: Running locally with act
73+
if: env.ACT == 'true'
74+
run: echo "This is running locally with act."
75+
76+
- name: Checkout
77+
uses: actions/checkout@v4
78+
with:
79+
ref: ${{ github.event.pull_request.head.sha }}
80+
81+
# Checkout library from specific URL and branch
82+
# Note that dependent libraries are not automatically installed.
83+
84+
# - name: Configure git for authentication (Until each repository is published)
85+
# run: |
86+
# git config --global url."https://${{ secrets.TOKEN_M5UNITUNIFIED }}@github.com/".insteadOf "https://github.com/"
87+
88+
- name: Checkout M5Utility
89+
uses: actions/checkout@v3
90+
with:
91+
repository: m5stack/M5Utility
92+
ref: ${{ env.M5UNITUNIFIED_BRANCH }}
93+
path: CustomLibrary_M5Utility # must contain string "Custom"
94+
token: ${{ secrets.TOKEN_M5UNITUNIFIED }} # Only required during development in private repo
95+
96+
- name: Checkout M5HAL
97+
uses: actions/checkout@v3
98+
with:
99+
repository: m5stack/M5HAL
100+
ref: ${{ env.M5UNITUNIFIED_BRANCH }}
101+
path: CustomLibrary_M5HAL # must contain string "Custom"
102+
token: ${{ secrets.TOKEN_M5UNITUNIFIED }} # Only required during development in private repo
103+
104+
- name: Checkout M5UnitUnified
105+
uses: actions/checkout@v3
106+
with:
107+
repository: m5stack/M5UnitUnified
108+
ref: ${{ env.M5UNITUNIFIED_BRANCH }}
109+
path: CustomLibrary_M5UnitUnified
110+
token: ${{ secrets.TOKEN_M5UNITUNIFIED }} # Only required during development in private repo
111+
112+
# Build
113+
- name: Compile examples
114+
uses: ArminJo/arduino-test-compile@master
115+
with:
116+
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
117+
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
118+
platform-url: ${{ matrix.platform-url }}
119+
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
120+
extra-arduino-cli-args: ${{ matrix.cli-args }}
121+
#build-properties: ${{ toJson(matrix.build-properties) }}
122+
sketch-names: ${{ matrix.sketch }}.ino
123+
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}
124+
#sketches-exclude: ${{ matrix.sketches-exclude }}

‎.github/workflows/PlatformioBuild.yml‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
name: PlatformIOBuild
2+
3+
on:
4+
push:
5+
paths:
6+
- '**.ino'
7+
- '**.cpp'
8+
- '**.hpp'
9+
- '**.h'
10+
- '**.c'
11+
- '**PlatformioBuild.yml'
12+
- '**platformio.ini'
13+
pull_request:
14+
paths:
15+
- '**.ino'
16+
- '**.cpp'
17+
- '**.hpp'
18+
- '**.h'
19+
- '**.c'
20+
- '**PlatformioBuild.yml'
21+
- '**platformio.ini'
22+
workflow_dispatch:
23+
24+
jobs:
25+
build:
26+
name: ${{ matrix.example }}@${{ matrix.board }}:${{ matrix.framework }}:${{ matrix.espressif32 }}
27+
28+
runs-on: ubuntu-latest
29+
30+
strategy:
31+
fail-fast: false
32+
#max-parallel: 1
33+
34+
matrix:
35+
example:
36+
- PlotToSerial
37+
38+
board:
39+
- Core
40+
- Core2
41+
- CoreS3
42+
- StampS3
43+
- AtomS3
44+
- Dial
45+
- NanoC6
46+
- StickCPlus
47+
- Paper
48+
- Fire
49+
50+
framework:
51+
- Arduino
52+
53+
espressif32:
54+
- latest
55+
- '5_4_0'
56+
- '4_4_0'
57+
58+
exclude:
59+
- board: CoreS3
60+
espressif32: '5_4_0'
61+
- board: CoreS3
62+
espressif32: '4_4_0'
63+
- board: StampS3
64+
espressif32: '5_4_0'
65+
- board: StampS3
66+
espressif32: '4_4_0'
67+
- board: AtomS3
68+
espressif32: '5_4_0'
69+
- board: AtomS3
70+
espressif32: '4_4_0'
71+
- board: Dial
72+
espressif32: '5_4_0'
73+
- board: Dial
74+
espressif32: '4_4_0'
75+
- board: NanoC6
76+
espressif32: '5_4_0'
77+
- board: NanoC6
78+
espressif32: '4_4_0'
79+
- board: StickCPlus
80+
espressif32: '5_4_0'
81+
- board: StickCPlus
82+
espressif32: '4_4_0'
83+
- board: Paper
84+
espressif32: '5_4_0'
85+
- board: Paper
86+
espressif32: '4_4_0'
87+
88+
steps:
89+
- name: Checkout
90+
uses: actions/checkout@v4
91+
with:
92+
ref: ${{ github.event.pull_request.head.sha }}
93+
94+
- name: Configure git for authentication (Until each repository is published)
95+
run: |
96+
git config --global url."https://${{ secrets.TOKEN_M5UNITUNIFIED }}@github.com/".insteadOf "https://github.com/"
97+
98+
- name: Build examples
99+
uses: karniv00l/platformio-run-action@v1
100+
with:
101+
environments: ${{ matrix.example }}_${{ matrix.board }}_${{ matrix.framework }}_${{ matrix.espressif32 }}
102+
#targets:
103+
project-dir: "./"
104+
project-conf: "./platformio.ini"
105+
#jobs: 6
106+
#silent: false
107+
#verbose: truee
108+
#disable-auto-clean: false

0 commit comments

Comments
 (0)