Skip to content

Commit dd46118

Browse files
GOB52GOB52
committed
Bumps M5UnitUnified to 0.4.6 and M5Unit-NFC to 0.0.3 and reorganizes env list
1 parent 4c1c4f3 commit dd46118

2 files changed

Lines changed: 221 additions & 58 deletions

File tree

‎library.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"url": "https://github.com/m5stack/M5Unit-RFID.git"
1212
},
1313
"dependencies": {
14-
"m5stack/M5UnitUnified": ">=0.4.4",
15-
"m5stack/M5Unit-NFC": "*"
14+
"m5stack/M5UnitUnified": ">=0.4.6",
15+
"m5stack/M5Unit-NFC": ">=0.0.3"
1616
},
1717
"version": "0.0.1",
1818
"frameworks": [

‎platformio.ini‎

Lines changed: 219 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ lib_ldf_mode = deep
1010
test_framework = googletest
1111
test_build_src = true
1212
lib_deps=m5stack/M5Unified
13-
m5stack/M5UnitUnified@>=0.4.4
14-
m5stack/M5Unit-NFC
13+
m5stack/M5UnitUnified@>=0.4.6
14+
m5stack/M5Unit-NFC@>=0.0.3
1515

1616
; --------------------------------
1717
[m5base]
@@ -337,6 +337,8 @@ lib_deps = ${NessoN1.lib_deps}
337337
${test_fw.lib_deps}
338338
test_filter= embedded/test_ws1850s
339339

340+
[env:-----------------------------------------------separator0]
341+
340342
; --------------------------------
341343
;Examples by M5UnitUnified
342344
; --------------------------------
@@ -402,7 +404,6 @@ build_flags = ${option_release.build_flags}
402404
extends=Dial, option_release, arduino_latest
403405
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/Detect>
404406
build_flags = ${option_release.build_flags}
405-
-D USING_UNIT_RFID2
406407
-D USING_M5DIAL_BUILTIN_WS1850S
407408

408409
[env:NFCA_Detect_NanoC6_Arduino_latest]
@@ -496,105 +497,267 @@ build_flags = ${option_release.build_flags}
496497

497498

498499
;;;
499-
[env:NFCA_Dump_Dial_Builtin_Arduino_latest]
500-
extends=Dial, option_release, arduino_latest
501-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/Dump>
500+
; [env:NFCA_NDEF_Dial_Arduino_latest]
501+
; extends=Dial, option_release, arduino_latest
502+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/NDEF>
503+
; build_flags = ${option_release.build_flags}
504+
; -D USING_UNIT_RFID2
505+
506+
507+
; [env:NFCA_Dump_Dial_Builtin_Arduino_latest]
508+
; extends=Dial, option_release, arduino_latest
509+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/Dump>
510+
; build_flags = ${option_release.build_flags}
511+
; -D USING_M5DIAL_BUILTIN_WS1850S
512+
513+
; [env:NFCA_ValueBlock_Dial_Builtin_Arduino_latest]
514+
; extends=Dial, option_release, arduino_latest
515+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ValueBlock>
516+
; build_flags = ${option_release.build_flags}
517+
; -D USING_M5DIAL_BUILTIN_WS1850S
518+
519+
; [env:NFCA_ReadWrite_Dial_Builtin_Arduino_latest]
520+
; extends=Dial, option_release, arduino_latest
521+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ReadWrite>
522+
; build_flags = ${option_release.build_flags}
523+
; -D USING_M5DIAL_BUILTIN_WS1850S
524+
525+
; [env:NFCA_NDEF_Dial_Builtin_Arduino_latest]
526+
; extends=Dial, option_release, arduino_latest
527+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/NDEF>
528+
; build_flags = ${option_release.build_flags}
529+
; -D USING_M5DIAL_BUILTIN_WS1850S
530+
531+
; [env:NFCA_Dump_StickS3_Arduino_latest]
532+
; extends=StickS3, option_release, arduino_latest
533+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/Dump>
534+
; build_flags = ${option_release.build_flags}
535+
; -D USING_UNIT_RFID2
536+
537+
; [env:NFCA_ValueBlock_StickS3_Arduino_latest]
538+
; extends=StickS3, option_release, arduino_latest
539+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ValueBlock>
540+
; build_flags = ${option_release.build_flags}
541+
; -D USING_UNIT_RFID2
542+
543+
; [env:NFCA_ReadWrite_StickS3_Arduino_latest]
544+
; extends=StickS3, option_release, arduino_latest
545+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ReadWrite>
546+
; build_flags = ${option_release.build_flags}
547+
; -D USING_UNIT_RFID2
548+
549+
; [env:NFCA_NDEF_StickS3_Arduino_latest]
550+
; extends=StickS3, option_release, arduino_latest
551+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/NDEF>
552+
; build_flags = ${option_release.build_flags}
553+
; -D USING_UNIT_RFID2
554+
555+
556+
[env:-----------------------------------------------separator1]
557+
558+
; --------------------------------
559+
; Examples by M5UnitUnified (NFC-B)
560+
; --------------------------------
561+
;Detect
562+
[env:NFCB_Detect_Core_Arduino_latest]
563+
extends=Core, option_release, arduino_latest
564+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
502565
build_flags = ${option_release.build_flags}
503566
-D USING_UNIT_RFID2
504-
-D USING_M5DIAL_BUILTIN_WS1850S
505567

506-
[env:NFCA_ValueBlock_Dial_Builtin_Arduino_latest]
507-
extends=Dial, option_release, arduino_latest
508-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ValueBlock>
568+
569+
[env:NFCB_Detect_Core2_Arduino_latest]
570+
extends=Core2, option_release, arduino_latest
571+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
509572
build_flags = ${option_release.build_flags}
510573
-D USING_UNIT_RFID2
511-
-D USING_M5DIAL_BUILTIN_WS1850S
512574

513-
[env:NFCA_ReadWrite_Dial_Builtin_Arduino_latest]
514-
extends=Dial, option_release, arduino_latest
515-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ReadWrite>
575+
576+
[env:NFCB_Detect_CoreS3_Arduino_latest]
577+
extends=CoreS3, option_release, arduino_latest
578+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
516579
build_flags = ${option_release.build_flags}
517580
-D USING_UNIT_RFID2
518-
-D USING_M5DIAL_BUILTIN_WS1850S
519581

520-
[env:NFCA_NDEF_Dial_Builtin_Arduino_latest]
521-
extends=Dial, option_release, arduino_latest
522-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/NDEF>
582+
[env:NFCB_Detect_Fire_Arduino_latest]
583+
extends=Fire, option_release, arduino_latest
584+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
523585
build_flags = ${option_release.build_flags}
524586
-D USING_UNIT_RFID2
525-
-D USING_M5DIAL_BUILTIN_WS1850S
526587

527-
[env:NFCA_Dump_StickS3_Arduino_latest]
528-
extends=StickS3, option_release, arduino_latest
529-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/Dump>
588+
589+
[env:NFCB_Detect_StampS3_Arduino_latest]
590+
extends=StampS3, option_release, arduino_latest
591+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
530592
build_flags = ${option_release.build_flags}
531593
-D USING_UNIT_RFID2
532594

533-
[env:NFCA_ValueBlock_StickS3_Arduino_latest]
534-
extends=StickS3, option_release, arduino_latest
535-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ValueBlock>
595+
[env:NFCB_Detect_Atom_Arduino_latest]
596+
extends=Atom, option_release, arduino_latest
597+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
536598
build_flags = ${option_release.build_flags}
537599
-D USING_UNIT_RFID2
538600

539-
[env:NFCA_ReadWrite_StickS3_Arduino_latest]
540-
extends=StickS3, option_release, arduino_latest
541-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ReadWrite>
601+
[env:NFCB_Detect_AtomS3_Arduino_latest]
602+
extends=AtomS3, option_release, arduino_latest
603+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
542604
build_flags = ${option_release.build_flags}
543605
-D USING_UNIT_RFID2
544606

545-
[env:NFCA_NDEF_StickS3_Arduino_latest]
546-
extends=StickS3, option_release, arduino_latest
547-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/NDEF>
607+
[env:NFCB_Detect_AtomS3R_Arduino_latest]
608+
extends=AtomS3R, option_release, arduino_latest
609+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
548610
build_flags = ${option_release.build_flags}
549611
-D USING_UNIT_RFID2
550612

551-
552-
[env:NFCA_Dump_NanoC6_Arduino_latest]
553-
extends=NanoC6, option_release, nanoc6_latest
554-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/Dump>
613+
[env:NFCB_Detect_Dial_Arduino_latest]
614+
extends=Dial, option_release, arduino_latest
615+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
555616
build_flags = ${option_release.build_flags}
556617
-D USING_UNIT_RFID2
557618

558-
[env:NFCA_ValueBlock_NanoC6_Arduino_latest]
619+
[env:NFCB_Detect_NanoC6_Arduino_latest]
559620
extends=NanoC6, option_release, nanoc6_latest
560-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ValueBlock>
621+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
561622
build_flags = ${option_release.build_flags}
562623
-D USING_UNIT_RFID2
563624

564-
[env:NFCA_ReadWrite_NanoC6_Arduino_latest]
565-
extends=NanoC6, option_release, nanoc6_latest
566-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ReadWrite>
625+
[env:NFCB_Detect_StickCPlus_Arduino_latest]
626+
extends=StickCPlus, option_release, arduino_latest
627+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
567628
build_flags = ${option_release.build_flags}
568629
-D USING_UNIT_RFID2
569630

570-
[env:NFCA_NDEF_NanoC6_Arduino_latest]
571-
extends=NanoC6, option_release, nanoc6_latest
572-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/NDEF>
631+
[env:NFCB_Detect_StickCPlus2_Arduino_latest]
632+
extends=StickCPlus2, option_release, arduino_latest
633+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
573634
build_flags = ${option_release.build_flags}
574635
-D USING_UNIT_RFID2
575636

576-
[env:NFCA_Dump_NessoN1_Arduino_latest]
577-
extends=NessoN1, option_release, pioarduino_latest
578-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/Dump>
637+
[env:NFCB_Detect_Paper_Arduino_latest]
638+
extends=Paper, option_release, arduino_latest
639+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
579640
build_flags = ${option_release.build_flags}
580641
-D USING_UNIT_RFID2
581642

582-
[env:NFCA_ValueBlock_NessoN1_Arduino_latest]
583-
extends=NessoN1, option_release, pioarduino_latest
584-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ValueBlock>
643+
[env:NFCB_Detect_CoreInk_Arduino_latest]
644+
extends=CoreInk, option_release, arduino_latest
645+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
585646
build_flags = ${option_release.build_flags}
586647
-D USING_UNIT_RFID2
587648

588-
[env:NFCA_ReadWrite_NessoN1_Arduino_latest]
589-
extends=NessoN1, option_release, pioarduino_latest
590-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ReadWrite>
591-
build_flags = ${option_release.build_flags}
649+
[env:NFCB_Detect_StickS3_Arduino_latest]
650+
extends=StickS3, option_release, arduino_latest
651+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
652+
build_flags = ${StickS3.build_flags}
653+
${option_release.build_flags}
654+
-D USING_UNIT_RFID2
655+
656+
[env:NFCB_Detect_Cardputer_Arduino_latest]
657+
extends=Cardputer, option_release, arduino_latest
658+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
659+
build_flags = ${Cardputer.build_flags}
660+
${option_release.build_flags}
592661
-D USING_UNIT_RFID2
593662

594-
[env:NFCA_NDEF_NessoN1_Arduino_latest]
663+
[env:NFCB_Detect_Tab5_Arduino_latest]
664+
extends=Tab5, option_release, pioarduino_latest
665+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
666+
build_flags = ${Tab5.build_flags}
667+
${option_release.build_flags}
668+
-D USING_UNIT_RFID2
669+
670+
[env:NFCB_Detect_NessoN1_Arduino_latest]
595671
extends=NessoN1, option_release, pioarduino_latest
596-
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/NDEF>
672+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/Detect>
597673
build_flags = ${option_release.build_flags}
598674
-D USING_UNIT_RFID2
599675

600-
676+
;
677+
; For the following samples, please refer to Detect to create ENVs for your own environment
678+
; 以下のサンプルは、Detect を参考にして、自分の環境にあったENVを作成してください
679+
;
680+
;JapanIDCard
681+
[env:NFCB_JapanIDCard_Core_Arduino_latest]
682+
extends=Core, option_release, arduino_latest
683+
build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/JapanIDCard>
684+
build_flags = ${option_release.build_flags}
685+
-D USING_UNIT_RFID2
686+
687+
; [env:NFCB_JapanIDCard_Dial_Arduino_latest]
688+
; extends=Dial, option_release, arduino_latest
689+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/JapanIDCard>
690+
; build_flags = ${option_release.build_flags}
691+
; -D USING_UNIT_RFID2
692+
693+
; [env:NFCB_JapanIDCard_StickS3_Arduino_latest]
694+
; extends=StickS3, option_release, arduino_latest
695+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/JapanIDCard>
696+
; build_flags = ${StickS3.build_flags}
697+
; ${option_release.build_flags}
698+
; -D USING_UNIT_RFID2
699+
700+
701+
; [env:--NanoC6---------------------------------------------nanoc6]
702+
; [env:NFCA_Dump_NanoC6_Arduino_latest]
703+
; extends=NanoC6, option_release, nanoc6_latest
704+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/Dump>
705+
; build_flags = ${option_release.build_flags}
706+
; -D USING_UNIT_RFID2
707+
708+
; [env:NFCA_ValueBlock_NanoC6_Arduino_latest]
709+
; extends=NanoC6, option_release, nanoc6_latest
710+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ValueBlock>
711+
; build_flags = ${option_release.build_flags}
712+
; -D USING_UNIT_RFID2
713+
714+
; [env:NFCA_ReadWrite_NanoC6_Arduino_latest]
715+
; extends=NanoC6, option_release, nanoc6_latest
716+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ReadWrite>
717+
; build_flags = ${option_release.build_flags}
718+
; -D USING_UNIT_RFID2
719+
720+
; [env:NFCA_NDEF_NanoC6_Arduino_latest]
721+
; extends=NanoC6, option_release, nanoc6_latest
722+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/NDEF>
723+
; build_flags = ${option_release.build_flags}
724+
; -D USING_UNIT_RFID2
725+
726+
; [env:NFCB_JapanIDCard_NanoC6_Arduino_latest]
727+
; extends=NanoC6, option_release, nanoc6_latest
728+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/JapanIDCard>
729+
; build_flags = ${option_release.build_flags}
730+
; -D USING_UNIT_RFID2
731+
732+
733+
; [env:--NessoN1---------------------------------------------nesson1]
734+
; [env:NFCA_Dump_NessoN1_Arduino_latest]
735+
; extends=NessoN1, option_release, pioarduino_latest
736+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/Dump>
737+
; build_flags = ${option_release.build_flags}
738+
; -D USING_UNIT_RFID2
739+
740+
; [env:NFCA_ValueBlock_NessoN1_Arduino_latest]
741+
; extends=NessoN1, option_release, pioarduino_latest
742+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ValueBlock>
743+
; build_flags = ${option_release.build_flags}
744+
; -D USING_UNIT_RFID2
745+
746+
; [env:NFCA_ReadWrite_NessoN1_Arduino_latest]
747+
; extends=NessoN1, option_release, pioarduino_latest
748+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/ReadWrite>
749+
; build_flags = ${option_release.build_flags}
750+
; -D USING_UNIT_RFID2
751+
752+
; [env:NFCA_NDEF_NessoN1_Arduino_latest]
753+
; extends=NessoN1, option_release, pioarduino_latest
754+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCA/NDEF>
755+
; build_flags = ${option_release.build_flags}
756+
; -D USING_UNIT_RFID2
757+
758+
759+
; [env:NFCB_JapanIDCard_NessoN1_Arduino_latest]
760+
; extends=NessoN1, option_release, pioarduino_latest
761+
; build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/NFCB/JapanIDCard>
762+
; build_flags = ${option_release.build_flags}
763+
; -D USING_UNIT_RFID2

0 commit comments

Comments
 (0)