Skip to content

Commit 3e7190f

Browse files
GOB52GOB52
committed
Resolve conflict
2 parents 5d29465 + 249a9fe commit 3e7190f

48 files changed

Lines changed: 9707 additions & 43 deletions

Some content is hidden

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

‎.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/arduino-esp-v2-build-check.yml‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
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+
- DetectDevices
61+
62+
board:
63+
- m5stack-atom
64+
- m5stack-atoms3
65+
- m5stack-core-esp32
66+
- m5stack-core2
67+
- m5stack-coreink
68+
- m5stack-cores3
69+
- m5stack-fire
70+
71+
include:
72+
# Specific sketches for m5stack-core-esp32 only
73+
- sketch: Dump
74+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
75+
platform: esp32
76+
archi: esp32
77+
platform-version: 2.0.17
78+
board: m5stack-core-esp32
79+
- sketch: ValueBlock
80+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
81+
platform: esp32
82+
archi: esp32
83+
platform-version: 2.0.17
84+
board: m5stack-core-esp32
85+
- sketch: ReadWrite
86+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
87+
platform: esp32
88+
archi: esp32
89+
platform-version: 2.0.17
90+
board: m5stack-core-esp32
91+
92+
unit:
93+
- ''
94+
95+
platform-version:
96+
- 2.0.17
97+
98+
platform:
99+
- esp32
100+
101+
archi:
102+
- esp32
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 }}

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

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
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+
- '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-v3-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-v3-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+
- DetectDevices
61+
62+
unit:
63+
- ''
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+
92+
include:
93+
# Specific sketches for m5stack-core-esp32 only
94+
- sketch: Dump
95+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
96+
platform-version: 3.0.4
97+
platform: esp32
98+
archi: esp32
99+
board: m5stack_core
100+
- sketch: ValueBlock
101+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
102+
platform-version: 3.0.4
103+
platform: esp32
104+
archi: esp32
105+
board: m5stack_core
106+
- sketch: ReadWrite
107+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
108+
platform-version: 3.0.4
109+
platform: esp32
110+
archi: esp32
111+
board: m5stack_core
112+
113+
platform-version:
114+
- 3.0.4
115+
116+
platform:
117+
- esp32
118+
119+
archi:
120+
- esp32
121+
122+
steps:
123+
- name: Checkout
124+
uses: actions/checkout@v4
125+
with:
126+
ref: ${{ github.event.pull_request.head.sha }}
127+
128+
# Build
129+
- name: Compile examples
130+
uses: ArminJo/arduino-test-compile@master
131+
with:
132+
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
133+
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
134+
platform-url: ${{ matrix.platform-url }}
135+
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
136+
extra-arduino-cli-args: ${{ matrix.cli-args }}
137+
#build-properties: ${{ toJson(matrix.build-properties) }}
138+
sketch-names: ${{ matrix.sketch }}.ino
139+
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
140+
#sketches-exclude: ${{ matrix.sketches-exclude }}

0 commit comments

Comments
 (0)