Skip to content

Commit 4dda34e

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents 36e5fe0 + 17103ef commit 4dda34e

46 files changed

Lines changed: 283 additions & 278 deletions

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-v3-build-check.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -228,155 +228,155 @@ jobs:
228228
board: m5stack_core
229229
build-properties: "-DUSING_UNIT_NFC"
230230

231-
# CapHacker on Cardputer
231+
# CapCC1101 on Cardputer
232232
- sketch: Detect
233233
nfc: NFCA
234234
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
235235
platform: esp32
236236
archi: esp32
237237
platform-version: 3.3.6
238238
board: m5stack_cardputer
239-
build-properties: "-DUSING_HACKER_CAP"
239+
build-properties: "-DUSING_CAP_CC1101"
240240
- sketch: Detect
241241
nfc: NFCB
242242
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
243243
platform: esp32
244244
archi: esp32
245245
platform-version: 3.3.6
246246
board: m5stack_cardputer
247-
build-properties: "-DUSING_HACKER_CAP"
247+
build-properties: "-DUSING_CAP_CC1101"
248248
- sketch: Detect
249249
nfc: NFCF
250250
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
251251
platform: esp32
252252
archi: esp32
253253
platform-version: 3.3.6
254254
board: m5stack_cardputer
255-
build-properties: "-DUSING_HACKER_CAP"
255+
build-properties: "-DUSING_CAP_CC1101"
256256
- sketch: Detect
257257
nfc: NFCV
258258
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
259259
platform: esp32
260260
archi: esp32
261261
platform-version: 3.3.6
262262
board: m5stack_cardputer
263-
build-properties: "-DUSING_HACKER_CAP"
264-
# CapHacker NFCA non-Detect sketches
263+
build-properties: "-DUSING_CAP_CC1101"
264+
# CapCC1101 NFCA non-Detect sketches
265265
- sketch: Dump
266266
nfc: NFCA
267267
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
268268
platform: esp32
269269
archi: esp32
270270
platform-version: 3.3.6
271271
board: m5stack_cardputer
272-
build-properties: "-DUSING_HACKER_CAP"
272+
build-properties: "-DUSING_CAP_CC1101"
273273
- sketch: ReadWrite
274274
nfc: NFCA
275275
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
276276
platform: esp32
277277
archi: esp32
278278
platform-version: 3.3.6
279279
board: m5stack_cardputer
280-
build-properties: "-DUSING_HACKER_CAP"
280+
build-properties: "-DUSING_CAP_CC1101"
281281
- sketch: ValueBlock
282282
nfc: NFCA
283283
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
284284
platform: esp32
285285
archi: esp32
286286
platform-version: 3.3.6
287287
board: m5stack_cardputer
288-
build-properties: "-DUSING_HACKER_CAP"
288+
build-properties: "-DUSING_CAP_CC1101"
289289
- sketch: NDEF
290290
nfc: NFCA
291291
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
292292
platform: esp32
293293
archi: esp32
294294
platform-version: 3.3.6
295295
board: m5stack_cardputer
296-
build-properties: "-DUSING_HACKER_CAP"
296+
build-properties: "-DUSING_CAP_CC1101"
297297
- sketch: Emulation
298298
nfc: NFCA
299299
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
300300
platform: esp32
301301
archi: esp32
302302
platform-version: 3.3.6
303303
board: m5stack_cardputer
304-
build-properties: "-DUSING_HACKER_CAP"
305-
# CapHacker NFCB non-Detect sketches
304+
build-properties: "-DUSING_CAP_CC1101"
305+
# CapCC1101 NFCB non-Detect sketches
306306
- sketch: JapanIDCard
307307
nfc: NFCB
308308
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
309309
platform: esp32
310310
archi: esp32
311311
platform-version: 3.3.6
312312
board: m5stack_cardputer
313-
build-properties: "-DUSING_HACKER_CAP"
314-
# CapHacker NFCF non-Detect sketches
313+
build-properties: "-DUSING_CAP_CC1101"
314+
# CapCC1101 NFCF non-Detect sketches
315315
- sketch: Dump
316316
nfc: NFCF
317317
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
318318
platform: esp32
319319
archi: esp32
320320
platform-version: 3.3.6
321321
board: m5stack_cardputer
322-
build-properties: "-DUSING_HACKER_CAP"
322+
build-properties: "-DUSING_CAP_CC1101"
323323
- sketch: NDEF
324324
nfc: NFCF
325325
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
326326
platform: esp32
327327
archi: esp32
328328
platform-version: 3.3.6
329329
board: m5stack_cardputer
330-
build-properties: "-DUSING_HACKER_CAP"
330+
build-properties: "-DUSING_CAP_CC1101"
331331
- sketch: Subtract
332332
nfc: NFCF
333333
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
334334
platform: esp32
335335
archi: esp32
336336
platform-version: 3.3.6
337337
board: m5stack_cardputer
338-
build-properties: "-DUSING_HACKER_CAP"
338+
build-properties: "-DUSING_CAP_CC1101"
339339
- sketch: ReadWriteMAC
340340
nfc: NFCF
341341
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
342342
platform: esp32
343343
archi: esp32
344344
platform-version: 3.3.6
345345
board: m5stack_cardputer
346-
build-properties: "-DUSING_HACKER_CAP"
346+
build-properties: "-DUSING_CAP_CC1101"
347347
- sketch: JapanTransportationICCard
348348
nfc: NFCF
349349
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
350350
platform: esp32
351351
archi: esp32
352352
platform-version: 3.3.6
353353
board: m5stack_cardputer
354-
build-properties: "-DUSING_HACKER_CAP"
354+
build-properties: "-DUSING_CAP_CC1101"
355355
- sketch: Emulation
356356
nfc: NFCF
357357
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
358358
platform: esp32
359359
archi: esp32
360360
platform-version: 3.3.6
361361
board: m5stack_cardputer
362-
build-properties: "-DUSING_HACKER_CAP"
363-
# CapHacker NFCV non-Detect sketches
362+
build-properties: "-DUSING_CAP_CC1101"
363+
# CapCC1101 NFCV non-Detect sketches
364364
- sketch: Dump
365365
nfc: NFCV
366366
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
367367
platform: esp32
368368
archi: esp32
369369
platform-version: 3.3.6
370370
board: m5stack_cardputer
371-
build-properties: "-DUSING_HACKER_CAP"
371+
build-properties: "-DUSING_CAP_CC1101"
372372
- sketch: NDEF
373373
nfc: NFCV
374374
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
375375
platform: esp32
376376
archi: esp32
377377
platform-version: 3.3.6
378378
board: m5stack_cardputer
379-
build-properties: "-DUSING_HACKER_CAP"
379+
build-properties: "-DUSING_CAP_CC1101"
380380

381381
steps:
382382
- name: Checkout

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -239,151 +239,151 @@ jobs:
239239
board: m5stack_core
240240
build-properties: "-DUSING_UNIT_NFC"
241241

242-
# CapHacker on Cardputer
242+
# CapCC1101 on Cardputer
243243
- sketch: Detect
244244
nfc: NFCA
245245
board: m5stack_cardputer
246-
build-properties: "-DUSING_HACKER_CAP"
246+
build-properties: "-DUSING_CAP_CC1101"
247247
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
248248
platform: m5stack
249249
archi: esp32
250250
platform-version: 3.2.5
251251
- sketch: Detect
252252
nfc: NFCB
253253
board: m5stack_cardputer
254-
build-properties: "-DUSING_HACKER_CAP"
254+
build-properties: "-DUSING_CAP_CC1101"
255255
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
256256
platform: m5stack
257257
archi: esp32
258258
platform-version: 3.2.5
259259
- sketch: Detect
260260
nfc: NFCF
261261
board: m5stack_cardputer
262-
build-properties: "-DUSING_HACKER_CAP"
262+
build-properties: "-DUSING_CAP_CC1101"
263263
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
264264
platform: m5stack
265265
archi: esp32
266266
platform-version: 3.2.5
267267
- sketch: Detect
268268
nfc: NFCV
269269
board: m5stack_cardputer
270-
build-properties: "-DUSING_HACKER_CAP"
270+
build-properties: "-DUSING_CAP_CC1101"
271271
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
272272
platform: m5stack
273273
archi: esp32
274274
platform-version: 3.2.5
275-
# CapHacker NFCA non-Detect sketches
275+
# CapCC1101 NFCA non-Detect sketches
276276
- sketch: Dump
277277
nfc: NFCA
278278
board: m5stack_cardputer
279-
build-properties: "-DUSING_HACKER_CAP"
279+
build-properties: "-DUSING_CAP_CC1101"
280280
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
281281
platform: m5stack
282282
archi: esp32
283283
platform-version: 3.2.5
284284
- sketch: ReadWrite
285285
nfc: NFCA
286286
board: m5stack_cardputer
287-
build-properties: "-DUSING_HACKER_CAP"
287+
build-properties: "-DUSING_CAP_CC1101"
288288
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
289289
platform: m5stack
290290
archi: esp32
291291
platform-version: 3.2.5
292292
- sketch: ValueBlock
293293
nfc: NFCA
294294
board: m5stack_cardputer
295-
build-properties: "-DUSING_HACKER_CAP"
295+
build-properties: "-DUSING_CAP_CC1101"
296296
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
297297
platform: m5stack
298298
archi: esp32
299299
platform-version: 3.2.5
300300
- sketch: NDEF
301301
nfc: NFCA
302302
board: m5stack_cardputer
303-
build-properties: "-DUSING_HACKER_CAP"
303+
build-properties: "-DUSING_CAP_CC1101"
304304
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
305305
platform: m5stack
306306
archi: esp32
307307
platform-version: 3.2.5
308308
- sketch: Emulation
309309
nfc: NFCA
310310
board: m5stack_cardputer
311-
build-properties: "-DUSING_HACKER_CAP"
311+
build-properties: "-DUSING_CAP_CC1101"
312312
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
313313
platform: m5stack
314314
archi: esp32
315315
platform-version: 3.2.5
316-
# CapHacker NFCB non-Detect sketches
316+
# CapCC1101 NFCB non-Detect sketches
317317
- sketch: JapanIDCard
318318
nfc: NFCB
319319
board: m5stack_cardputer
320-
build-properties: "-DUSING_HACKER_CAP"
320+
build-properties: "-DUSING_CAP_CC1101"
321321
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
322322
platform: m5stack
323323
archi: esp32
324324
platform-version: 3.2.5
325-
# CapHacker NFCF non-Detect sketches
325+
# CapCC1101 NFCF non-Detect sketches
326326
- sketch: Dump
327327
nfc: NFCF
328328
board: m5stack_cardputer
329-
build-properties: "-DUSING_HACKER_CAP"
329+
build-properties: "-DUSING_CAP_CC1101"
330330
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
331331
platform: m5stack
332332
archi: esp32
333333
platform-version: 3.2.5
334334
- sketch: NDEF
335335
nfc: NFCF
336336
board: m5stack_cardputer
337-
build-properties: "-DUSING_HACKER_CAP"
337+
build-properties: "-DUSING_CAP_CC1101"
338338
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
339339
platform: m5stack
340340
archi: esp32
341341
platform-version: 3.2.5
342342
- sketch: Subtract
343343
nfc: NFCF
344344
board: m5stack_cardputer
345-
build-properties: "-DUSING_HACKER_CAP"
345+
build-properties: "-DUSING_CAP_CC1101"
346346
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
347347
platform: m5stack
348348
archi: esp32
349349
platform-version: 3.2.5
350350
- sketch: ReadWriteMAC
351351
nfc: NFCF
352352
board: m5stack_cardputer
353-
build-properties: "-DUSING_HACKER_CAP"
353+
build-properties: "-DUSING_CAP_CC1101"
354354
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
355355
platform: m5stack
356356
archi: esp32
357357
platform-version: 3.2.5
358358
- sketch: JapanTransportationICCard
359359
nfc: NFCF
360360
board: m5stack_cardputer
361-
build-properties: "-DUSING_HACKER_CAP"
361+
build-properties: "-DUSING_CAP_CC1101"
362362
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
363363
platform: m5stack
364364
archi: esp32
365365
platform-version: 3.2.5
366366
- sketch: Emulation
367367
nfc: NFCF
368368
board: m5stack_cardputer
369-
build-properties: "-DUSING_HACKER_CAP"
369+
build-properties: "-DUSING_CAP_CC1101"
370370
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
371371
platform: m5stack
372372
archi: esp32
373373
platform-version: 3.2.5
374-
# CapHacker NFCV non-Detect sketches
374+
# CapCC1101 NFCV non-Detect sketches
375375
- sketch: Dump
376376
nfc: NFCV
377377
board: m5stack_cardputer
378-
build-properties: "-DUSING_HACKER_CAP"
378+
build-properties: "-DUSING_CAP_CC1101"
379379
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
380380
platform: m5stack
381381
archi: esp32
382382
platform-version: 3.2.5
383383
- sketch: NDEF
384384
nfc: NFCV
385385
board: m5stack_cardputer
386-
build-properties: "-DUSING_HACKER_CAP"
386+
build-properties: "-DUSING_CAP_CC1101"
387387
platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
388388
platform: m5stack
389389
archi: esp32

0 commit comments

Comments
 (0)