Skip to content

Commit 79c1939

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents 06ade4b + ac5e58d commit 79c1939

114 files changed

Lines changed: 14663 additions & 533 deletions

File tree

Some content is hidden

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

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

Lines changed: 130 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,14 @@ jobs:
5757
platform-url:
5858
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
5959

60+
# Cross design (skill m5-build-ci-matrix §3): the board axis is carried by one
61+
# representative per distinct code path. NFCA (WS1850S over I2C, addI2C) and UHF
62+
# (JRD4035 over UART, addUART) are different units on different transports, so both
63+
# stay on the board axis. NFCB is the same unit, bus and wiring helper as NFCA, so
64+
# one build on the representative board is enough to prove its stack compiles.
6065
nfctype:
6166
- NFCA
62-
- NFCB
67+
# - NFCB # via include (m5stack-core-esp32 only): same unit/bus/wiring as NFCA
6368

6469
sketch:
6570
- Detect
@@ -121,6 +126,23 @@ jobs:
121126
platform-version: 2.0.17
122127
board: m5stack-core-esp32
123128
build-properties: "-DUSING_UNIT_RFID2"
129+
- sketch: PolicyOverride
130+
nfctype: NFCA
131+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
132+
platform: esp32
133+
archi: esp32
134+
platform-version: 2.0.17
135+
board: m5stack-core-esp32
136+
build-properties: "-DUSING_UNIT_RFID2"
137+
# Detect (NFCB, USING_UNIT_RFID2, Core only) - moved off the board axis above
138+
- sketch: Detect
139+
nfctype: NFCB
140+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
141+
platform: esp32
142+
archi: esp32
143+
platform-version: 2.0.17
144+
board: m5stack-core-esp32
145+
build-properties: "-DUSING_UNIT_RFID2"
124146
# JapanIDCard (NFCB, USING_UNIT_RFID2, Core only)
125147
- sketch: JapanIDCard
126148
nfctype: NFCB
@@ -130,6 +152,113 @@ jobs:
130152
platform-version: 2.0.17
131153
board: m5stack-core-esp32
132154
build-properties: "-DUSING_UNIT_RFID2"
155+
# UHF-RFID (UART, single unit, no USING_* define).
156+
# Detect covers the board axis; the rest go on Core for the API axis,
157+
# the same shape the NFC-A / NFC-B families use above.
158+
- sketch: Detect
159+
nfctype: UHF
160+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
161+
platform: esp32
162+
archi: esp32
163+
platform-version: 2.0.17
164+
board: m5stack-core-esp32
165+
build-properties: ""
166+
- sketch: Detect
167+
nfctype: UHF
168+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
169+
platform: esp32
170+
archi: esp32
171+
platform-version: 2.0.17
172+
board: m5stack-cores3
173+
build-properties: ""
174+
- sketch: Dump
175+
nfctype: UHF
176+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
177+
platform: esp32
178+
archi: esp32
179+
platform-version: 2.0.17
180+
board: m5stack-core-esp32
181+
build-properties: ""
182+
- sketch: ReadWrite
183+
nfctype: UHF
184+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
185+
platform: esp32
186+
archi: esp32
187+
platform-version: 2.0.17
188+
board: m5stack-core-esp32
189+
build-properties: ""
190+
- sketch: ReaderSettings
191+
nfctype: UHF
192+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
193+
platform: esp32
194+
archi: esp32
195+
platform-version: 2.0.17
196+
board: m5stack-core-esp32
197+
build-properties: ""
198+
- sketch: Lock
199+
nfctype: UHF
200+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
201+
platform: esp32
202+
archi: esp32
203+
platform-version: 2.0.17
204+
board: m5stack-core-esp32
205+
build-properties: ""
206+
- sketch: Kill
207+
nfctype: UHF
208+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
209+
platform: esp32
210+
archi: esp32
211+
platform-version: 2.0.17
212+
board: m5stack-core-esp32
213+
build-properties: ""
214+
- sketch: WriteEPC
215+
nfctype: UHF
216+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
217+
platform: esp32
218+
archi: esp32
219+
platform-version: 2.0.17
220+
board: m5stack-core-esp32
221+
build-properties: ""
222+
- sketch: SleepIdle
223+
nfctype: UHF
224+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
225+
platform: esp32
226+
archi: esp32
227+
platform-version: 2.0.17
228+
board: m5stack-core-esp32
229+
build-properties: ""
230+
- sketch: MonzaQT
231+
nfctype: UHF
232+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
233+
platform: esp32
234+
archi: esp32
235+
platform-version: 2.0.17
236+
board: m5stack-core-esp32
237+
build-properties: ""
238+
- sketch: PermanentLock
239+
nfctype: UHF
240+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
241+
platform: esp32
242+
archi: esp32
243+
platform-version: 2.0.17
244+
board: m5stack-core-esp32
245+
build-properties: ""
246+
- sketch: NxpG2X
247+
nfctype: UHF
248+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
249+
platform: esp32
250+
archi: esp32
251+
platform-version: 2.0.17
252+
board: m5stack-core-esp32
253+
build-properties: ""
254+
- sketch: NxpReadProtect
255+
nfctype: UHF
256+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
257+
platform: esp32
258+
archi: esp32
259+
platform-version: 2.0.17
260+
board: m5stack-core-esp32
261+
build-properties: ""
133262

134263
steps:
135264
- name: Checkout

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

Lines changed: 146 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,14 @@ jobs:
5757
platform-url:
5858
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
5959

60+
# Cross design (skill m5-build-ci-matrix §3): the board axis is carried by one
61+
# representative per distinct code path. NFCA (WS1850S over I2C, addI2C) and UHF
62+
# (JRD4035 over UART, addUART) are different units on different transports, so both
63+
# stay on the board axis. NFCB is the same unit, bus and wiring helper as NFCA, so
64+
# one build on the representative board is enough to prove its stack compiles.
6065
nfctype:
6166
- NFCA
62-
- NFCB
67+
# - NFCB # via include (m5stack_core only): same unit/bus/wiring as NFCA
6368

6469
sketch:
6570
- Detect
@@ -132,6 +137,14 @@ jobs:
132137
platform-version: 3.3.6
133138
board: m5stack_core
134139
build-properties: "-DUSING_UNIT_RFID2"
140+
- sketch: PolicyOverride
141+
nfctype: NFCA
142+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
143+
platform: esp32
144+
archi: esp32
145+
platform-version: 3.3.6
146+
board: m5stack_core
147+
build-properties: "-DUSING_UNIT_RFID2"
135148
# Detect on M5Dial with builtin WS1850S (NFCA, USING_M5DIAL_BUILTIN_WS1850S)
136149
- sketch: Detect
137150
nfctype: NFCA
@@ -141,6 +154,15 @@ jobs:
141154
platform-version: 3.3.6
142155
board: m5stack_dial
143156
build-properties: "-DUSING_M5DIAL_BUILTIN_WS1850S"
157+
# Detect (NFCB, USING_UNIT_RFID2, Core only) - moved off the board axis above
158+
- sketch: Detect
159+
nfctype: NFCB
160+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
161+
platform: esp32
162+
archi: esp32
163+
platform-version: 3.3.6
164+
board: m5stack_core
165+
build-properties: "-DUSING_UNIT_RFID2"
144166
# JapanIDCard (NFCB, USING_UNIT_RFID2, Core only)
145167
- sketch: JapanIDCard
146168
nfctype: NFCB
@@ -150,6 +172,129 @@ jobs:
150172
platform-version: 3.3.6
151173
board: m5stack_core
152174
build-properties: "-DUSING_UNIT_RFID2"
175+
# UHF-RFID (UART, single unit, no USING_* define).
176+
# Detect covers the board axis; the rest go on Core for the API axis,
177+
# the same shape the NFC-A / NFC-B families use above.
178+
- sketch: Detect
179+
nfctype: UHF
180+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
181+
platform: esp32
182+
archi: esp32
183+
platform-version: 3.3.6
184+
board: m5stack_core
185+
build-properties: ""
186+
- sketch: Detect
187+
nfctype: UHF
188+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
189+
platform: esp32
190+
archi: esp32
191+
platform-version: 3.3.6
192+
board: m5stack_cores3
193+
build-properties: ""
194+
- sketch: Detect
195+
nfctype: UHF
196+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
197+
platform: esp32
198+
archi: esp32
199+
platform-version: 3.3.6
200+
board: m5stack_nanoc6
201+
build-properties: ""
202+
- sketch: Detect
203+
nfctype: UHF
204+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
205+
platform: esp32
206+
archi: esp32
207+
platform-version: 3.3.6
208+
board: m5stack_tab5
209+
build-properties: ""
210+
- sketch: Dump
211+
nfctype: UHF
212+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
213+
platform: esp32
214+
archi: esp32
215+
platform-version: 3.3.6
216+
board: m5stack_core
217+
build-properties: ""
218+
- sketch: ReadWrite
219+
nfctype: UHF
220+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
221+
platform: esp32
222+
archi: esp32
223+
platform-version: 3.3.6
224+
board: m5stack_core
225+
build-properties: ""
226+
- sketch: ReaderSettings
227+
nfctype: UHF
228+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
229+
platform: esp32
230+
archi: esp32
231+
platform-version: 3.3.6
232+
board: m5stack_core
233+
build-properties: ""
234+
- sketch: Lock
235+
nfctype: UHF
236+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
237+
platform: esp32
238+
archi: esp32
239+
platform-version: 3.3.6
240+
board: m5stack_core
241+
build-properties: ""
242+
- sketch: Kill
243+
nfctype: UHF
244+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
245+
platform: esp32
246+
archi: esp32
247+
platform-version: 3.3.6
248+
board: m5stack_core
249+
build-properties: ""
250+
- sketch: WriteEPC
251+
nfctype: UHF
252+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
253+
platform: esp32
254+
archi: esp32
255+
platform-version: 3.3.6
256+
board: m5stack_core
257+
build-properties: ""
258+
- sketch: SleepIdle
259+
nfctype: UHF
260+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
261+
platform: esp32
262+
archi: esp32
263+
platform-version: 3.3.6
264+
board: m5stack_core
265+
build-properties: ""
266+
- sketch: MonzaQT
267+
nfctype: UHF
268+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
269+
platform: esp32
270+
archi: esp32
271+
platform-version: 3.3.6
272+
board: m5stack_core
273+
build-properties: ""
274+
- sketch: PermanentLock
275+
nfctype: UHF
276+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
277+
platform: esp32
278+
archi: esp32
279+
platform-version: 3.3.6
280+
board: m5stack_core
281+
build-properties: ""
282+
- sketch: NxpG2X
283+
nfctype: UHF
284+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
285+
platform: esp32
286+
archi: esp32
287+
platform-version: 3.3.6
288+
board: m5stack_core
289+
build-properties: ""
290+
- sketch: NxpReadProtect
291+
nfctype: UHF
292+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
293+
platform: esp32
294+
archi: esp32
295+
platform-version: 3.3.6
296+
board: m5stack_core
297+
build-properties: ""
153298

154299
steps:
155300
- name: Checkout

0 commit comments

Comments
 (0)