Skip to content

Commit 93ba1e4

Browse files
GOB52GOB52
committed
Add UnitFinger2
1 parent 15525b7 commit 93ba1e4

3 files changed

Lines changed: 129 additions & 26 deletions

File tree

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

Lines changed: 50 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ concurrency:
4646

4747
jobs:
4848
build:
49-
name: ${{ matrix.build-properties }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
49+
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
5050
runs-on: ubuntu-latest
5151
timeout-minutes: 5
5252

@@ -60,9 +60,9 @@ jobs:
6060
sketch:
6161
- PlotToSerial
6262

63-
# unit:
64-
# - UnitFinger
65-
# - HatFinger
63+
unit:
64+
- UnitFinger
65+
- UnitFinger2
6666

6767
board:
6868
- m5stack_atom
@@ -99,53 +99,89 @@ jobs:
9999
archi:
100100
- esp32
101101

102-
build-properties:
103-
- "-DUSING_UNIT_FINGER"
104-
105102
include:
106103
# Specific sketches
107104
- sketch: Capture
105+
unit: UnitFinger
108106
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
109107
platform: esp32
110108
archi: esp32
111109
platform-version: 3.1.3
112110
board: m5stack_core
113-
build-properties: "-DUSING_UNIT_FINGER"
114111
- sketch: Characteristic
112+
unit: UnitFinger
115113
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
116114
platform: esp32
117115
archi: esp32
118116
platform-version: 3.1.3
119117
board: m5stack_core
120-
build-properties: "-DUSING_UNIT_FINGER"
121118
- sketch: User
119+
unit: UnitFinger
122120
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
123121
platform: esp32
124122
archi: esp32
125123
platform-version: 3.1.3
126124
board: m5stack_core
127-
build-properties: "-DUSING_UNIT_FINGER"
125+
126+
- sketch: PlotToSerial
127+
unit: HatFinger
128+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
129+
platform: esp32
130+
archi: esp32
131+
platform-version: 3.1.3
132+
board: m5stack_stickc_plus
133+
- sketch: PlotToSerial
134+
unit: HatFinger
135+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
136+
platform: esp32
137+
archi: esp32
138+
platform-version: 3.1.3
139+
board: m5stack_stickc_plus2
128140
- sketch: Capture
141+
unit: HatFinger
129142
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
130143
platform: esp32
131144
archi: esp32
132145
platform-version: 3.1.3
133146
board: m5stack_stickc_plus2
134-
build-properties: "-DUSING_HAT_FINGER"
135147
- sketch: Characteristic
148+
unit: UnitFinger
136149
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
137150
platform: esp32
138151
archi: esp32
139152
platform-version: 3.1.3
140153
board: m5stack_stickc_plus2
141-
build-properties: "-DUSING_HAT_FINGER"
142154
- sketch: User
155+
unit: UnitFinger
143156
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
144157
platform: esp32
145158
archi: esp32
146159
platform-version: 3.1.3
147160
board: m5stack_stickc_plus2
148-
build-properties: "-DUSING_HAT_FINGER"
161+
162+
- sketch: Capture
163+
unit: UnitFinger2
164+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
165+
platform: esp32
166+
archi: esp32
167+
platform-version: 3.1.3
168+
board: m5stack_core
169+
- sketch: Automatic
170+
unit: UnitFinger2
171+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
172+
platform: esp32
173+
archi: esp32
174+
platform-version: 3.1.3
175+
board: m5stack_core
176+
- sketch: User
177+
unit: UnitFinger2
178+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
179+
platform: esp32
180+
archi: esp32
181+
platform-version: 3.1.3
182+
board: m5stack_core
183+
184+
149185

150186
steps:
151187
- name: Checkout
@@ -162,7 +198,7 @@ jobs:
162198
platform-url: ${{ matrix.platform-url }}
163199
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
164200
extra-arduino-cli-args: ${{ matrix.cli-args }}
165-
build-properties: ${{ matrix.build-properties }}
201+
build-properties: ${{ matrix.unit == 'UnitFinger' && '-DUSING_UNIT_FINGER' || (matrix.unit == 'HatFinger' && '-DUSING_HAT_FINGER' || '') }}
166202
sketch-names: ${{ matrix.sketch }}.ino
167203
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
168204
#sketches-exclude: ${{ matrix.sketches-exclude }}

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

Lines changed: 49 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ concurrency:
4646

4747
jobs:
4848
build:
49-
name: ${{ matrix.build-properties }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
49+
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
5050
runs-on: ubuntu-latest
5151
timeout-minutes: 5
5252

@@ -60,9 +60,9 @@ jobs:
6060
sketch:
6161
- PlotToSerial
6262

63-
# unit:
64-
# - UnitFinger
65-
# - HatFinger
63+
unit:
64+
- UnitFinger
65+
- UnitFinger2
6666

6767
board:
6868
- m5stack_atom
@@ -100,54 +100,91 @@ jobs:
100100
archi:
101101
- esp32
102102

103-
build-properties:
104-
- "-DUSING_UNIT_FINGER"
105-
106103
include:
107104
# Specific sketches
108105
- sketch: Capture
106+
unit: UnitFinger
109107
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
110108
platform: esp32
111109
archi: esp32
112110
platform-version: 3.2.1
113111
board: m5stack_core
114-
build-properties: "-DUSING_UNIT_FINGER"
115112
- sketch: Characteristic
113+
unit: UnitFinger
116114
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
117115
platform: esp32
118116
archi: esp32
119117
platform-version: 3.2.1
120118
board: m5stack_core
121-
build-properties: "-DUSING_UNIT_FINGER"
122119
- sketch: User
120+
unit: UnitFinger
123121
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
124122
platform: esp32
125123
archi: esp32
126124
platform-version: 3.2.1
127125
board: m5stack_core
128-
build-properties: "-DUSING_UNIT_FINGER"
126+
127+
- sketch: PlotToSerial
128+
unit: HatFinger
129+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
130+
platform: esp32
131+
archi: esp32
132+
platform-version: 3.2.1
133+
board: m5stack_stickc_plus
134+
- sketch: PlotToSerial
135+
unit: HatFinger
136+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
137+
platform: esp32
138+
archi: esp32
139+
platform-version: 3.2.1
140+
board: m5stack_stickc_plus2
129141
- sketch: Capture
142+
unit: HatFinger
130143
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
131144
platform: esp32
132145
archi: esp32
133146
platform-version: 3.2.1
134147
board: m5stack_stickc_plus2
135-
build-properties: "-DUSING_HAT_FINGER"
136148
- sketch: Characteristic
149+
unit: HatFinger
137150
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
138151
platform: esp32
139152
archi: esp32
140153
platform-version: 3.2.1
141154
board: m5stack_stickc_plus2
142155
build-properties: "-DUSING_HAT_FINGER"
143156
- sketch: User
157+
unit: HatFinger
144158
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
145159
platform: esp32
146160
archi: esp32
147161
platform-version: 3.2.1
148162
board: m5stack_stickc_plus2
149163
build-properties: "-DUSING_HAT_FINGER"
150164

165+
- sketch: Capture
166+
unit: UnitFinge2r
167+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
168+
platform: esp32
169+
archi: esp32
170+
platform-version: 3.2.1
171+
board: m5stack_core
172+
- sketch: Automatic
173+
unit: UnitFinger2
174+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
175+
platform: esp32
176+
archi: esp32
177+
platform-version: 3.2.1
178+
board: m5stack_core
179+
- sketch: User
180+
unit: UnitFinger2
181+
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
182+
platform: esp32
183+
archi: esp32
184+
platform-version: 3.2.1
185+
board: m5stack_core
186+
187+
151188
steps:
152189
- name: Checkout
153190
uses: actions/checkout@v4
@@ -163,7 +200,7 @@ jobs:
163200
platform-url: ${{ matrix.platform-url }}
164201
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
165202
extra-arduino-cli-args: ${{ matrix.cli-args }}
166-
build-properties: ${{ matrix.build-properties }}
203+
build-properties: ${{ matrix.unit == 'UnitFinger' && '-DUSING_UNIT_FINGER' || (matrix.unit == 'HatFinger' && '-DUSING_HAT_FINGER' || '') }}
167204
sketch-names: ${{ matrix.sketch }}.ino
168205
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
169206
#sketches-exclude: ${{ matrix.sketches-exclude }}

‎.github/workflows/platformio-build-check.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858

5959
unit:
6060
- UnitFinger
61+
- UnitFinger2
6162
# - HatFinger
6263

6364
board:
@@ -99,6 +100,17 @@ jobs:
99100
board: Core
100101
framework: Arduino
101102
espressif32: latest
103+
104+
- example: PlotToSerial
105+
unit: HatFinger
106+
board: StickCPlus
107+
framework: Arduino
108+
espressif32: latest
109+
- example: PlotToSerial
110+
unit: HatFinger
111+
board: StickCPlus2
112+
framework: Arduino
113+
espressif32: latest
102114
- example: Capture
103115
unit: HatFinger
104116
board: StickCPlus2
@@ -115,6 +127,24 @@ jobs:
115127
framework: Arduino
116128
espressif32: latest
117129

130+
131+
- example: Capture
132+
unit: UnitFinger2
133+
board: Core
134+
framework: Arduino
135+
espressif32: latest
136+
- example: Automatic
137+
unit: UnitFinger2
138+
board: Core
139+
framework: Arduino
140+
espressif32: latest
141+
- example: User
142+
unit: UnitFinger2
143+
board: Core
144+
framework: Arduino
145+
espressif32: latest
146+
147+
118148
steps:
119149
- name: Checkout
120150
uses: actions/checkout@v4

0 commit comments

Comments
 (0)