add HW v3 config

revert to PN532
restore PN532 submodule and remove C95
2021-11-23 09:03:50 +01:00 · 2021-11-21 18:20:46 +01:00 · 2021-11-18 09:50:41 +01:00 · 2021-11-11 16:43:59 +01:00 · 2021-11-09 21:20:32 +01:00
23 changed files with 11733 additions and 9425 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,12 @@
 [submodule "FW/leo_muziekdoos_esp32/lib/JCButton"]
 	path = FW/leo_muziekdoos_esp32/lib/JCButton
 	url = http://192.168.2.3/Bonobo.Git.Server/JCButton.git
-[submodule "FW/leo_muziekdoos_esp32/lib/rfid_C95HF"]
-	path = FW/leo_muziekdoos_esp32/lib/rfid_C95HF
-	url = http://192.168.2.3/Bonobo.Git.Server/rfid.C95HF.git
+[submodule "FW/leo_muziekdoos_esp32/lib/NDEF"]
+	path = FW/leo_muziekdoos_esp32/lib/NDEF
+	url = http://192.168.2.3/Bonobo.Git.Server/rfid.NDEF.git
+[submodule "FW/leo_muziekdoos_esp32/lib/PN532"]
+	path = FW/leo_muziekdoos_esp32/lib/PN532
+	url = http://192.168.2.3/Bonobo.Git.Server/rfid.PN532.git
+[submodule "FW/leo_muziekdoos_esp32/lib/PN532_SPI"]
+	path = FW/leo_muziekdoos_esp32/lib/PN532_SPI
+	url = http://192.168.2.3/Bonobo.Git.Server/rfid.PN532_SPI.git
--- a/CAD/Leo_muziekdoos_ESP32/CPU.sch
+++ b/CAD/Leo_muziekdoos_ESP32/CPU.sch
@@ -15,7 +15,7 @@ Comment4 ""
 $EndDescr
 Text HLabel 5750 5350 2    50   Output ~ 0
 DAC_DATA
-Text HLabel 9450 5600 0    50   Input ~ 0
+Text HLabel 9450 5700 0    50   Input ~ 0
 ADC1_IN2
 Text Label 5750 6350 2    50   ~ 0
 ESP_TX1
@@ -68,7 +68,7 @@ F 3 "" H 9350 4650 50  0001 C CNN
 $EndComp
 Text Label 10150 4100 2    50   ~ 0
 HALL_OUT
-Text Label 9050 5500 0    50   ~ 0
+Text Label 9050 5800 0    50   ~ 0
 HALL_OUT
 Text HLabel 5750 5450 2    50   Output ~ 0
 DAC_BCLK
@@ -508,7 +508,7 @@ Wire Wire Line
 Wire Wire Line
 	5750 4650 5250 4650
 $Comp
-L Analog_ADC:ADS1114IDGS U6
+L Analog_ADC:ADS1115IDGS U6
 U 1 1 6177DA48
 P 9950 5600
 F 0 "U6" H 10100 6100 50  0000 C CNN
@@ -518,10 +518,6 @@ F 3 "http://www.ti.com/lit/ds/symlink/ads1113.pdf" H 9900 4700 50  0001 C CNN
 	1    9950 5600
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	9050 5500 9550 5500
-Wire Wire Line
-	9450 5600 9550 5600
 $Comp
 L RF_Module:ESP32-S2 U4
 U 1 1 618B98EB
@@ -1143,4 +1139,34 @@ Wire Wire Line
 	1500 5300 2050 5300
 Wire Wire Line
 	2150 5500 2950 5500
+Wire Wire Line
+	9450 5700 9550 5700
+Wire Wire Line
+	9050 5800 9550 5800
+$Comp
+L power:GND #PWR0134
+U 1 1 619DBE35
+P 9400 5600
+F 0 "#PWR0134" H 9400 5350 50  0001 C CNN
+F 1 "GND" V 9405 5472 50  0000 R CNN
+F 2 "" H 9400 5600 50  0001 C CNN
+F 3 "" H 9400 5600 50  0001 C CNN
+	1    9400 5600
+	0    1    1    0   
+$EndComp
+$Comp
+L power:GND #PWR0135
+U 1 1 619DC9CB
+P 9400 5500
+F 0 "#PWR0135" H 9400 5250 50  0001 C CNN
+F 1 "GND" V 9405 5372 50  0000 R CNN
+F 2 "" H 9400 5500 50  0001 C CNN
+F 3 "" H 9400 5500 50  0001 C CNN
+	1    9400 5500
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	9400 5500 9550 5500
+Wire Wire Line
+	9550 5600 9400 5600
 $EndSCHEMATC
--- a/CAD/Leo_muziekdoos_ESP32/CPU.sch-bak
+++ b/CAD/Leo_muziekdoos_ESP32/CPU.sch-bak
@@ -15,7 +15,7 @@ Comment4 ""
 $EndDescr
 Text HLabel 5750 5350 2    50   Output ~ 0
 DAC_DATA
-Text HLabel 9450 5600 0    50   Input ~ 0
+Text HLabel 9450 5700 0    50   Input ~ 0
 ADC1_IN2
 Text Label 5750 6350 2    50   ~ 0
 ESP_TX1
@@ -68,7 +68,7 @@ F 3 "" H 9350 4650 50  0001 C CNN
 $EndComp
 Text Label 10150 4100 2    50   ~ 0
 HALL_OUT
-Text Label 9050 5500 0    50   ~ 0
+Text Label 9050 5800 0    50   ~ 0
 HALL_OUT
 Text HLabel 5750 5450 2    50   Output ~ 0
 DAC_BCLK
@@ -508,7 +508,7 @@ Wire Wire Line
 Wire Wire Line
 	5750 4650 5250 4650
 $Comp
-L Analog_ADC:ADS1114IDGS U6
+L Analog_ADC:ADS1115IDGS U6
 U 1 1 6177DA48
 P 9950 5600
 F 0 "U6" H 10100 6100 50  0000 C CNN
@@ -518,10 +518,6 @@ F 3 "http://www.ti.com/lit/ds/symlink/ads1113.pdf" H 9900 4700 50  0001 C CNN
 	1    9950 5600
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	9050 5500 9550 5500
-Wire Wire Line
-	9450 5600 9550 5600
 $Comp
 L RF_Module:ESP32-S2 U4
 U 1 1 618B98EB
@@ -946,12 +942,12 @@ $Comp
 L Device:Crystal_GND24_Small Y2
 U 1 1 61A5C2D6
 P 2150 5300
-F 0 "Y2" V 2196 5156 50  0000 R CNN
-F 1 "40Mhz_10ppm" V 2105 5156 50  0000 R CNN
+F 0 "Y2" V 2104 5156 50  0000 R CNN
+F 1 "40Mhz_10ppm" V 2195 5156 50  0000 R CNN
 F 2 "Crystal:Crystal_SMD_EuroQuartz_X22-4Pin_2.5x2.0mm" H 2150 5300 50  0001 C CNN
 F 3 "~" H 2150 5300 50  0001 C CNN
 	1    2150 5300
-	0    -1   -1   0   
+	0    -1   1    0   
 $EndComp
 Connection ~ 1500 5300
 Wire Wire Line
@@ -1143,4 +1139,34 @@ Wire Wire Line
 	1500 5300 2050 5300
 Wire Wire Line
 	2150 5500 2950 5500
+Wire Wire Line
+	9450 5700 9550 5700
+Wire Wire Line
+	9050 5800 9550 5800
+$Comp
+L power:GND #PWR0134
+U 1 1 619DBE35
+P 9400 5600
+F 0 "#PWR0134" H 9400 5350 50  0001 C CNN
+F 1 "GND" V 9405 5472 50  0000 R CNN
+F 2 "" H 9400 5600 50  0001 C CNN
+F 3 "" H 9400 5600 50  0001 C CNN
+	1    9400 5600
+	0    1    1    0   
+$EndComp
+$Comp
+L power:GND #PWR0135
+U 1 1 619DC9CB
+P 9400 5500
+F 0 "#PWR0135" H 9400 5250 50  0001 C CNN
+F 1 "GND" V 9405 5372 50  0000 R CNN
+F 2 "" H 9400 5500 50  0001 C CNN
+F 3 "" H 9400 5500 50  0001 C CNN
+	1    9400 5500
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	9400 5500 9550 5500
+Wire Wire Line
+	9550 5600 9400 5600
 $EndSCHEMATC
--- a/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos-cache.lib
+++ b/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos-cache.lib
@@ -1,14 +1,14 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# Analog_ADC_ADS1114IDGS
+# Analog_ADC_ADS1115IDGS
 #
-DEF Analog_ADC_ADS1114IDGS U 0 20 Y Y 1 F N
+DEF Analog_ADC_ADS1115IDGS U 0 20 Y Y 1 F N
 F0 "U" 100 550 50 H V C CNN
-F1 "Analog_ADC_ADS1114IDGS" 300 450 50 H V C CNN
+F1 "Analog_ADC_ADS1115IDGS" 300 450 50 H V C CNN
 F2 "Package_SO:TSSOP-10_3x3mm_P0.5mm" 0 -500 50 H I C CNN
 F3 "" -50 -900 50 H I C CNN
-ALIAS ADS1114IDGS
+ALIAS ADS1115IDGS
 $FPLIST
 TSSOP*3x3mm*P0.5mm*
 $ENDFPLIST
@@ -20,8 +20,8 @@ X ALERT/RDY 2 400 200 100 L 50 50 1 1 O
 X GND 3 0 -400 100 U 50 50 1 1 W
 X AIN0 4 -400 100 100 R 50 50 1 1 I
 X AIN1 5 -400 0 100 R 50 50 1 1 I
-X ~ 6 -300 300 100 R 50 50 1 1 N N
-X ~ 7 -300 200 100 R 50 50 1 1 N N
+X AIN2 6 -400 -100 100 R 50 50 1 1 I
+X AIN3 7 -400 -200 100 R 50 50 1 1 I
 X VDD 8 0 500 100 D 50 50 1 1 W
 X SDA 9 400 -100 100 L 50 50 1 1 B
 ENDDRAW
@@ -142,39 +142,57 @@ X 1 1 0 0 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_USB_B_Micro
+# Connector_USB_C_Receptacle_Molex_USB2.0
 #
-DEF Connector_USB_B_Micro J 0 40 Y Y 1 F N
-F0 "J" -200 450 50 H V L CNN
-F1 "Connector_USB_B_Micro" -200 350 50 H V L CNN
-F2 "" 150 -50 50 H I C CNN
-F3 "" 150 -50 50 H I C CNN
-ALIAS USB_B_Mini
+DEF Connector_USB_C_Receptacle_Molex_USB2.0 J 0 40 Y Y 1 F N
+F0 "J" -400 750 50 H V L CNN
+F1 "Connector_USB_C_Receptacle_Molex_USB2.0" 750 750 50 H V R CNN
+F2 "" 150 0 50 H I C CNN
+F3 "" 150 0 50 H I C CNN
 $FPLIST
- USB*
+ USB*C*Receptacle*
 $ENDFPLIST
 DRAW
-C -150 85 25 0 1 10 F
-C -25 135 15 0 1 10 F
-S -200 -300 200 300 0 1 10 f
-S -5 -300 5 -270 0 1 0 N
-S 10 50 -20 20 0 1 10 F
-S 200 -205 170 -195 0 1 0 N
-S 200 -105 170 -95 0 1 0 N
-S 200 -5 170 5 0 1 0 N
-S 200 195 170 205 0 1 0 N
-P 2 0 1 10 -75 85 25 85 N
-P 4 0 1 10 -125 85 -100 85 -50 135 -25 135 N
-P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
-P 4 0 1 10 25 110 25 60 75 85 25 110 F
-P 5 0 1 0 -170 220 -70 220 -80 190 -160 190 -170 220 F
-P 9 0 1 0 -185 230 -185 220 -175 190 -175 180 -65 180 -65 190 -55 220 -55 230 -185 230 N
-X VBUS 1 300 200 100 L 50 50 1 1 w
-X D- 2 300 -100 100 L 50 50 1 1 B
-X D+ 3 300 0 100 L 50 50 1 1 B
-X ID 4 300 -200 100 L 50 50 1 1 P
-X GND 5 0 -400 100 U 50 50 1 1 w
-X Shield SH -100 -400 100 U 50 50 1 1 P
+A -275 -150 75 -1799 -1 0 1 20 N -350 -150 -200 -150
+A -275 -150 25 -1799 -1 0 1 10 N -300 -150 -250 -150
+A -275 -150 25 -1799 -1 0 1 10 F -300 -150 -250 -150
+A -275 150 25 1 1799 0 1 10 F -250 150 -300 150
+A -275 150 25 1 1799 0 1 10 N -250 150 -300 150
+A -275 150 75 1 1799 0 1 20 N -200 150 -350 150
+C -100 45 25 0 1 10 F
+C 0 -230 50 0 1 0 F
+S -10 -700 10 -660 0 0 0 N
+S 400 -590 360 -610 0 0 0 N
+S 400 -490 360 -510 0 0 0 N
+S 400 -190 360 -210 0 0 0 N
+S 400 -90 360 -110 0 0 0 N
+S 400 10 360 -10 0 0 0 N
+S 400 110 360 90 0 0 0 N
+S 400 310 360 290 0 0 0 N
+S 400 410 360 390 0 0 0 N
+S 400 610 360 590 0 0 0 N
+S -400 700 400 -700 0 1 10 f
+S -300 -150 -250 150 0 1 10 F
+S 75 70 125 120 0 1 10 F
+P 2 0 1 20 -350 -150 -350 150 N
+P 2 0 1 20 -200 150 -200 -150 N
+P 2 0 1 20 0 -230 0 170 N
+P 3 0 1 20 0 -130 -100 -30 -100 20 N
+P 3 0 1 20 0 -80 100 20 100 70 N
+P 4 0 1 10 -50 170 0 270 50 170 -50 170 F
+X GND A1/B12 0 -900 200 U 50 50 1 1 P
+X VBUS A4/B9 600 600 200 L 50 50 1 1 P
+X CC1 A5 600 400 200 L 50 50 1 1 B
+X D+ A6 600 -100 200 L 50 50 1 1 B
+X D- A7 600 100 200 L 50 50 1 1 B
+X SBU1 A8 600 -500 200 L 50 50 1 1 B
+X GND B1/A12 0 -900 200 U 50 50 1 1 P N
+X VBUS B4/A9 600 600 200 L 50 50 1 1 P N
+X CC2 B5 600 300 200 L 50 50 1 1 B
+X D+ B6 600 -200 200 L 50 50 1 1 B
+X D- B7 600 0 200 L 50 50 1 1 B
+X SBU2 B8 600 -600 200 L 50 50 1 1 B
+X SHIELD S1 -300 -900 200 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
--- a/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos-rescue.lib
+++ b/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos-rescue.lib
@@ -89,4 +89,79 @@ X ST_R0 9 1150 -400 300 L 59 59 1 1 U
 ENDDRAW
 ENDDEF
 #
+# ESP32-S2-RF_Module
+#
+DEF ESP32-S2-RF_Module U? 0 10 Y Y 1 F N
+F0 "U?" 1750 700 60 H V C CNN
+F1 "ESP32-S2-RF_Module" 1700 -3700 60 H V C CNN
+F2 "QFN56_ESP32_7X7_EXP" 1700 -3800 60 H I C CNN
+F3 "" -1150 -700 60 H I C CNN
+F4 "ESP32-S2FN4R2" 0 0 50 H I C CNN "ORDERCODE"
+$FPLIST
+ QFN56_ESP32_7X7_EXP
+ QFN56_ESP32_7X7_EXP-M
+ QFN56_ESP32_7X7_EXP-L
+$ENDFPLIST
+DRAW
+S 300 650 1900 -3650 0 1 0 f
+X VDDA 1 750 950 300 D 59 59 1 1 W
+X GPIO5 10 2200 -650 300 L 59 59 1 1 B
+X GPIO6 11 2200 -750 300 L 59 59 1 1 B
+X GPIO7 12 2200 -850 300 L 59 59 1 1 B
+X GPIO8 13 2200 -950 300 L 59 59 1 1 B
+X GPIO9 14 2200 -1050 300 L 59 59 1 1 B
+X GPIO10 15 2200 -1150 300 L 59 59 1 1 B
+X GPIO11 16 2200 -1250 300 L 59 59 1 1 B
+X GPIO12 17 2200 -1350 300 L 59 59 1 1 B
+X GPIO13 18 2200 -1450 300 L 59 59 1 1 B
+X GPIO14 19 2200 -1550 300 L 59 59 1 1 B
+X LNA_IN 2 2200 200 300 L 59 59 1 1 U
+X VDD3P3_RTC 20 1050 950 300 D 59 59 1 1 W
+X 32K_P/GPIO15 21 0 -1700 300 R 59 59 1 1 B
+X 32K_N/GPIO16 22 0 -1800 300 R 59 59 1 1 B
+X DAC1/GPIO17 23 2200 -1850 300 L 59 59 1 1 B
+X DAC_2/GPIO18 24 2200 -1950 300 L 59 59 1 1 B
+X GPIO19/D- 25 0 -400 300 R 59 59 1 1 B
+X GPIO20/D+ 26 0 -300 300 R 59 59 1 1 B
+X VDD3P3_RTC_IO 27 1350 950 300 D 59 59 1 1 W
+X GPIO21 28 2200 -2050 300 L 59 59 1 1 B
+X SPIS1/~PSR_CS 29 0 -850 300 R 59 59 1 1 U
+X VDD3P3 3 1250 950 300 D 59 59 1 1 W
+X VDD_SPI 30 0 -3500 300 R 59 59 1 1 w
+X SPIHD/~HOLD~/SIO3 31 0 -1350 300 R 59 59 1 1 U
+X SPIWP/~WP~/SIO2 32 0 -1250 300 R 59 59 1 1 U
+X SPIS0/~FLASH_CS 33 0 -750 300 R 59 59 1 1 U
+X SPICLK 34 0 -950 300 R 59 59 1 1 U
+X SPIQ/D0/SIO1 35 0 -1150 300 R 59 59 1 1 U
+X SPID/DI/SIO0 36 0 -1050 300 R 59 59 1 1 U
+X GPIO33 37 2200 -2150 300 L 59 59 1 1 B
+X GPIO34 38 2200 -2250 300 L 59 59 1 1 B
+X GPIO35 39 2200 -2350 300 L 59 59 1 1 B
+X VDD3P3 4 1150 950 300 D 59 59 1 1 W
+X GPIO36 40 2200 -2450 300 L 59 59 1 1 B
+X GPIO37 41 2200 -2550 300 L 59 59 1 1 B
+X GPIO38 42 2200 -2650 300 L 59 59 1 1 B
+X MTCK/GPIO39 43 2200 -2750 300 L 59 59 1 1 U
+X MTDO/GPIO40 44 2200 -2850 300 L 59 59 1 1 U
+X VDD3P3_CPU 45 1450 950 300 D 59 59 1 1 W
+X MTDI/GPIO41 46 2200 -2950 300 L 59 59 1 1 U
+X MTMS/GPIO42 47 2200 -3050 300 L 59 59 1 1 U
+X U0TXD/GPIO43 48 2200 -3150 300 L 59 59 1 1 B
+X U0RXD/GPIO44 49 2200 -3250 300 L 59 59 1 1 B
+X BOOT0/GPIO0 5 2200 -150 300 L 59 59 1 1 B
+X VDD_SPI_SEL/GPIO45 50 2200 -3350 300 L 59 59 1 1 B
+X VDDA 51 950 950 300 D 59 59 1 1 W
+X XTAL_N 52 0 -2150 300 R 59 59 1 1 U
+X XTAL_P 53 0 -2050 300 R 59 59 1 1 U
+X VDDA 54 850 950 300 D 59 59 1 1 W
+X BOOT1/GPIO46 55 2200 -3450 300 L 59 59 1 1 B
+X CHIP_PU 56 0 200 300 R 59 59 1 1 U
+X GND 57 1050 -3950 300 U 59 59 1 1 W
+X GPIO1 6 2200 -250 300 L 59 59 1 1 B
+X GPIO2 7 2200 -350 300 L 59 59 1 1 B
+X GPIO3 8 2200 -450 300 L 59 59 1 1 B
+X GPIO4 9 2200 -550 300 L 59 59 1 1 B
+ENDDRAW
+ENDDEF
+#
 #End Library
--- a/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos.kicad_pcb
+++ b/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos.kicad_pcb
--- a/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos.kicad_pcb-bak
+++ b/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos.kicad_pcb-bak
--- a/CAD/Leo_muziekdoos_ESP32/Power.sch
+++ b/CAD/Leo_muziekdoos_ESP32/Power.sch
@@ -487,7 +487,7 @@ AR Path="/6158A412/615B8140" Ref="D?"  Part="1"
 AR Path="/60FE1698/615B8140" Ref="D1"  Part="1" 
 F 0 "D1" H 3293 1295 50  0000 C CNN
 F 1 "LED" H 3293 1386 50  0000 C CNN
-F 2 "LED_SMD:LED_0805_2012Metric" H 3300 1550 50  0001 C CNN
+F 2 "LED_SMD:LED_0603_1608Metric" H 3300 1550 50  0001 C CNN
 F 3 "~" H 3300 1550 50  0001 C CNN
 F 4 "LED_SMD_GREEN_0805_20mA" H 3300 1550 50  0001 C CNN "StockRef"
 F 5 "2290331" H 3300 1550 50  0001 C CNN "ordercode"
@@ -504,7 +504,7 @@ AR Path="/6158A412/615B8147" Ref="D?"  Part="1"
 AR Path="/60FE1698/615B8147" Ref="D2"  Part="1" 
 F 0 "D2" H 3793 1995 50  0000 C CNN
 F 1 "LED" H 3793 2086 50  0000 C CNN
-F 2 "LED_SMD:LED_0805_2012Metric" H 3800 2250 50  0001 C CNN
+F 2 "LED_SMD:LED_0603_1608Metric" H 3800 2250 50  0001 C CNN
 F 3 "~" H 3800 2250 50  0001 C CNN
 F 4 "LED_SMD_RED_0805_20mA" H 3800 2250 50  0001 C CNN "StockRef"
 F 5 "2290331" H 3800 2250 50  0001 C CNN "ordercode"
@@ -728,66 +728,6 @@ Connection ~ 2400 1450
 Wire Wire Line
 	2400 1450 2400 1600
 $Comp
-L Connector:USB_B_Micro J?
-U 1 1 6143D9E0
-P 3850 3800
-AR Path="/613CB1D0/6143D9E0" Ref="J?"  Part="1" 
-AR Path="/60FE1698/6143D9E0" Ref="J2"  Part="1" 
-F 0 "J2" H 3907 4267 50  0000 C CNN
-F 1 "USB_B_Micro" H 3907 4176 50  0000 C CNN
-F 2 "MySymbols:USB_Micro_B_Female" H 4000 3750 50  0001 C CNN
-F 3 "~" H 4000 3750 50  0001 C CNN
-	1    3850 3800
-	1    0    0    -1  
-$EndComp
-Text Label 4600 3600 2    50   ~ 0
-VBUS
-$Comp
-L power:GND #PWR?
-U 1 1 6143D9E9
-P 3850 4350
-AR Path="/613CB1D0/6143D9E9" Ref="#PWR?"  Part="1" 
-AR Path="/60FE1698/6143D9E9" Ref="#PWR0135"  Part="1" 
-F 0 "#PWR0135" H 3850 4100 50  0001 C CNN
-F 1 "GND" H 3855 4177 50  0000 C CNN
-F 2 "" H 3850 4350 50  0001 C CNN
-F 3 "" H 3850 4350 50  0001 C CNN
-	1    3850 4350
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3750 4200 3750 4300
-Wire Wire Line
-	3750 4300 3850 4300
-Wire Wire Line
-	3850 4300 3850 4200
-Wire Wire Line
-	3850 4350 3850 4300
-Connection ~ 3850 4300
-Wire Wire Line
-	4150 4000 4200 4000
-Wire Wire Line
-	4200 4000 4200 4300
-Wire Wire Line
-	4200 4300 3850 4300
-$Comp
-L power:VBUS #PWR?
-U 1 1 6143D9F9
-P 4700 3500
-AR Path="/613CB1D0/6143D9F9" Ref="#PWR?"  Part="1" 
-AR Path="/60FE1698/6143D9F9" Ref="#PWR0139"  Part="1" 
-F 0 "#PWR0139" H 4700 3350 50  0001 C CNN
-F 1 "VBUS" H 4715 3673 50  0000 C CNN
-F 2 "" H 4700 3500 50  0001 C CNN
-F 3 "" H 4700 3500 50  0001 C CNN
-	1    4700 3500
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	4700 3500 4700 3600
-Wire Wire Line
-	4150 3600 4700 3600
-$Comp
 L Switch:SW_Push SW?
 U 1 1 615B2DE1
 P 6200 2400
@@ -806,14 +746,6 @@ F 6 "farnell" H 6200 2400 50  0001 C CNN "supplier"
 $EndComp
 Text Label 2900 1800 1    20   ~ 0
 MCP_STAT
-Text HLabel 4250 3800 2    50   Input ~ 0
-USB_D+
-Text HLabel 4250 3900 2    50   Input ~ 0
-USB_D-
-Wire Wire Line
-	4250 3900 4150 3900
-Wire Wire Line
-	4250 3800 4150 3800
 $Comp
 L Device:Q_Dual_NMOS_S1G1D2S2G2D1 Q2
 U 2 1 614CD58C
@@ -961,29 +893,145 @@ $EndComp
 Wire Wire Line
 	5950 3600 5950 3550
 $Comp
-L Device:C_Polarized C?
-U 1 1 617D88E1
-P 9000 2000
-AR Path="/617D88E1" Ref="C?"  Part="1" 
-AR Path="/6158A412/617D88E1" Ref="C?"  Part="1" 
-AR Path="/60FE1698/617D88E1" Ref="C37"  Part="1" 
-F 0 "C37" H 9118 2046 50  0000 L CNN
-F 1 "10uF" H 9118 1955 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 9038 1850 50  0001 C CNN
-F 3 "~" H 9000 2000 50  0001 C CNN
-F 4 "C010u_0805" H 9000 2000 50  0001 C CNN "StockRef"
-F 5 "2112746" H 9000 2000 50  0001 C CNN "ordercode"
-F 6 "farnell" H 9000 2000 50  0001 C CNN "supplier"
-	1    9000 2000
+L Connector:USB_C_Receptacle_Molex_USB2.0 J5
+U 1 1 618C07E1
+P 4850 5000
+F 0 "J5" H 4957 5867 50  0000 C CNN
+F 1 "USB_C_Receptacle_USB2.0" H 4957 5776 50  0000 C CNN
+F 2 "Connector_USB:USB_C_Receptacle_Molex_217179" H 5000 5000 50  0001 C CNN
+F 3 "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" H 5000 5000 50  0001 C CNN
+	1    4850 5000
+	1    0    0    -1  
+$EndComp
+Text HLabel 5550 5200 2    50   Input ~ 0
+USB_D+
+Text HLabel 5550 5100 2    50   Input ~ 0
+USB_D+
+Text HLabel 5550 5000 2    50   Input ~ 0
+USB_D-
+Text HLabel 5550 4900 2    50   Input ~ 0
+USB_D-
+Text Label 5800 4400 2    50   ~ 0
+VBUS
+$Comp
+L power:VBUS #PWR?
+U 1 1 618C3365
+P 6000 4300
+AR Path="/613CB1D0/618C3365" Ref="#PWR?"  Part="1" 
+AR Path="/60FE1698/618C3365" Ref="#PWR020"  Part="1" 
+F 0 "#PWR020" H 6000 4150 50  0001 C CNN
+F 1 "VBUS" H 6015 4473 50  0000 C CNN
+F 2 "" H 6000 4300 50  0001 C CNN
+F 3 "" H 6000 4300 50  0001 C CNN
+	1    6000 4300
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8500 2700 9000 2700
+	6000 4300 6000 4400
 Wire Wire Line
-	9000 2700 9000 2150
-Connection ~ 8500 2700
+	6000 4400 5450 4400
+$Comp
+L power:GND #PWR?
+U 1 1 618C7EBC
+P 4850 6000
+AR Path="/613CB1D0/618C7EBC" Ref="#PWR?"  Part="1" 
+AR Path="/60FE1698/618C7EBC" Ref="#PWR019"  Part="1" 
+F 0 "#PWR019" H 4850 5750 50  0001 C CNN
+F 1 "GND" H 4855 5827 50  0000 C CNN
+F 2 "" H 4850 6000 50  0001 C CNN
+F 3 "" H 4850 6000 50  0001 C CNN
+	1    4850 6000
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	8500 1450 9000 1450
+	4550 5900 4550 5950
 Wire Wire Line
-	9000 1450 9000 1850
+	4550 5950 4850 5950
+Wire Wire Line
+	4850 5950 4850 5900
+Wire Wire Line
+	4850 6000 4850 5950
+Connection ~ 4850 5950
+Wire Wire Line
+	5550 4900 5450 4900
+Wire Wire Line
+	5450 5000 5550 5000
+Wire Wire Line
+	5550 5100 5450 5100
+Wire Wire Line
+	5450 5200 5550 5200
+$Comp
+L Device:R R?
+U 1 1 61951F6F
+P 6300 4900
+AR Path="/61951F6F" Ref="R?"  Part="1" 
+AR Path="/6158A412/61951F6F" Ref="R?"  Part="1" 
+AR Path="/60FE1698/61951F6F" Ref="R11"  Part="1" 
+F 0 "R11" V 6093 4900 50  0000 C CNN
+F 1 "5K1" V 6184 4900 50  0000 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 6230 4900 50  0001 C CNN
+F 3 "~" H 6300 4900 50  0001 C CNN
+F 4 "R10K_0402" H 6300 4900 50  0001 C CNN "StockRef"
+F 5 "2447096" H 6300 4900 50  0001 C CNN "ordercode"
+F 6 "farnell" H 6300 4900 50  0001 C CNN "supplier"
+	1    6300 4900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 6195270F
+P 6450 4900
+AR Path="/6195270F" Ref="R?"  Part="1" 
+AR Path="/6158A412/6195270F" Ref="R?"  Part="1" 
+AR Path="/60FE1698/6195270F" Ref="R18"  Part="1" 
+F 0 "R18" V 6243 4900 50  0000 C CNN
+F 1 "5K1" V 6334 4900 50  0000 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 6380 4900 50  0001 C CNN
+F 3 "~" H 6450 4900 50  0001 C CNN
+F 4 "R10K_0402" H 6450 4900 50  0001 C CNN "StockRef"
+F 5 "2447096" H 6450 4900 50  0001 C CNN "ordercode"
+F 6 "farnell" H 6450 4900 50  0001 C CNN "supplier"
+	1    6450 4900
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5450 4700 6300 4700
+Wire Wire Line
+	6300 4700 6300 4750
+Wire Wire Line
+	5450 4600 6450 4600
+Wire Wire Line
+	6450 4600 6450 4750
+NoConn ~ 5450 5500
+NoConn ~ 5450 5600
+$Comp
+L power:GND #PWR?
+U 1 1 61964A09
+P 6300 5150
+AR Path="/613CB1D0/61964A09" Ref="#PWR?"  Part="1" 
+AR Path="/60FE1698/61964A09" Ref="#PWR0115"  Part="1" 
+F 0 "#PWR0115" H 6300 4900 50  0001 C CNN
+F 1 "GND" H 6305 4977 50  0000 C CNN
+F 2 "" H 6300 5150 50  0001 C CNN
+F 3 "" H 6300 5150 50  0001 C CNN
+	1    6300 5150
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR?
+U 1 1 61964E35
+P 6450 5150
+AR Path="/613CB1D0/61964E35" Ref="#PWR?"  Part="1" 
+AR Path="/60FE1698/61964E35" Ref="#PWR0126"  Part="1" 
+F 0 "#PWR0126" H 6450 4900 50  0001 C CNN
+F 1 "GND" H 6455 4977 50  0000 C CNN
+F 2 "" H 6450 5150 50  0001 C CNN
+F 3 "" H 6450 5150 50  0001 C CNN
+	1    6450 5150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6450 5150 6450 5050
+Wire Wire Line
+	6300 5050 6300 5150
 $EndSCHEMATC
--- a/CAD/Leo_muziekdoos_ESP32/Power.sch-bak
+++ b/CAD/Leo_muziekdoos_ESP32/Power.sch-bak
@@ -487,7 +487,7 @@ AR Path="/6158A412/615B8140" Ref="D?"  Part="1"
 AR Path="/60FE1698/615B8140" Ref="D1"  Part="1" 
 F 0 "D1" H 3293 1295 50  0000 C CNN
 F 1 "LED" H 3293 1386 50  0000 C CNN
-F 2 "LED_SMD:LED_0805_2012Metric" H 3300 1550 50  0001 C CNN
+F 2 "LED_SMD:LED_0603_1608Metric" H 3300 1550 50  0001 C CNN
 F 3 "~" H 3300 1550 50  0001 C CNN
 F 4 "LED_SMD_GREEN_0805_20mA" H 3300 1550 50  0001 C CNN "StockRef"
 F 5 "2290331" H 3300 1550 50  0001 C CNN "ordercode"
@@ -504,7 +504,7 @@ AR Path="/6158A412/615B8147" Ref="D?"  Part="1"
 AR Path="/60FE1698/615B8147" Ref="D2"  Part="1" 
 F 0 "D2" H 3793 1995 50  0000 C CNN
 F 1 "LED" H 3793 2086 50  0000 C CNN
-F 2 "LED_SMD:LED_0805_2012Metric" H 3800 2250 50  0001 C CNN
+F 2 "LED_SMD:LED_0603_1608Metric" H 3800 2250 50  0001 C CNN
 F 3 "~" H 3800 2250 50  0001 C CNN
 F 4 "LED_SMD_RED_0805_20mA" H 3800 2250 50  0001 C CNN "StockRef"
 F 5 "2290331" H 3800 2250 50  0001 C CNN "ordercode"
@@ -728,66 +728,6 @@ Connection ~ 2400 1450
 Wire Wire Line
 	2400 1450 2400 1600
 $Comp
-L Connector:USB_B_Micro J?
-U 1 1 6143D9E0
-P 3850 3800
-AR Path="/613CB1D0/6143D9E0" Ref="J?"  Part="1" 
-AR Path="/60FE1698/6143D9E0" Ref="J2"  Part="1" 
-F 0 "J2" H 3907 4267 50  0000 C CNN
-F 1 "USB_B_Micro" H 3907 4176 50  0000 C CNN
-F 2 "MySymbols:USB_Micro_B_Female" H 4000 3750 50  0001 C CNN
-F 3 "~" H 4000 3750 50  0001 C CNN
-	1    3850 3800
-	1    0    0    -1  
-$EndComp
-Text Label 4600 3600 2    50   ~ 0
-VBUS
-$Comp
-L power:GND #PWR?
-U 1 1 6143D9E9
-P 3850 4350
-AR Path="/613CB1D0/6143D9E9" Ref="#PWR?"  Part="1" 
-AR Path="/60FE1698/6143D9E9" Ref="#PWR0135"  Part="1" 
-F 0 "#PWR0135" H 3850 4100 50  0001 C CNN
-F 1 "GND" H 3855 4177 50  0000 C CNN
-F 2 "" H 3850 4350 50  0001 C CNN
-F 3 "" H 3850 4350 50  0001 C CNN
-	1    3850 4350
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3750 4200 3750 4300
-Wire Wire Line
-	3750 4300 3850 4300
-Wire Wire Line
-	3850 4300 3850 4200
-Wire Wire Line
-	3850 4350 3850 4300
-Connection ~ 3850 4300
-Wire Wire Line
-	4150 4000 4200 4000
-Wire Wire Line
-	4200 4000 4200 4300
-Wire Wire Line
-	4200 4300 3850 4300
-$Comp
-L power:VBUS #PWR?
-U 1 1 6143D9F9
-P 4700 3500
-AR Path="/613CB1D0/6143D9F9" Ref="#PWR?"  Part="1" 
-AR Path="/60FE1698/6143D9F9" Ref="#PWR0139"  Part="1" 
-F 0 "#PWR0139" H 4700 3350 50  0001 C CNN
-F 1 "VBUS" H 4715 3673 50  0000 C CNN
-F 2 "" H 4700 3500 50  0001 C CNN
-F 3 "" H 4700 3500 50  0001 C CNN
-	1    4700 3500
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	4700 3500 4700 3600
-Wire Wire Line
-	4150 3600 4700 3600
-$Comp
 L Switch:SW_Push SW?
 U 1 1 615B2DE1
 P 6200 2400
@@ -806,14 +746,6 @@ F 6 "farnell" H 6200 2400 50  0001 C CNN "supplier"
 $EndComp
 Text Label 2900 1800 1    20   ~ 0
 MCP_STAT
-Text HLabel 4250 3800 2    50   Input ~ 0
-USB_D+
-Text HLabel 4250 3900 2    50   Input ~ 0
-USB_D-
-Wire Wire Line
-	4250 3900 4150 3900
-Wire Wire Line
-	4250 3800 4150 3800
 $Comp
 L Device:Q_Dual_NMOS_S1G1D2S2G2D1 Q2
 U 2 1 614CD58C
@@ -986,4 +918,146 @@ Wire Wire Line
 	8500 1450 9000 1450
 Wire Wire Line
 	9000 1450 9000 1850
+$Comp
+L Connector:USB_C_Receptacle_Molex_USB2.0 J5
+U 1 1 618C07E1
+P 4850 5000
+F 0 "J5" H 4957 5867 50  0000 C CNN
+F 1 "USB_C_Receptacle_USB2.0" H 4957 5776 50  0000 C CNN
+F 2 "Connector_USB:USB_C_Receptacle_Molex_217179" H 5000 5000 50  0001 C CNN
+F 3 "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" H 5000 5000 50  0001 C CNN
+	1    4850 5000
+	1    0    0    -1  
+$EndComp
+Text HLabel 5550 5200 2    50   Input ~ 0
+USB_D+
+Text HLabel 5550 5100 2    50   Input ~ 0
+USB_D+
+Text HLabel 5550 5000 2    50   Input ~ 0
+USB_D-
+Text HLabel 5550 4900 2    50   Input ~ 0
+USB_D-
+Text Label 5800 4400 2    50   ~ 0
+VBUS
+$Comp
+L power:VBUS #PWR?
+U 1 1 618C3365
+P 6000 4300
+AR Path="/613CB1D0/618C3365" Ref="#PWR?"  Part="1" 
+AR Path="/60FE1698/618C3365" Ref="#PWR020"  Part="1" 
+F 0 "#PWR020" H 6000 4150 50  0001 C CNN
+F 1 "VBUS" H 6015 4473 50  0000 C CNN
+F 2 "" H 6000 4300 50  0001 C CNN
+F 3 "" H 6000 4300 50  0001 C CNN
+	1    6000 4300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6000 4300 6000 4400
+Wire Wire Line
+	6000 4400 5450 4400
+$Comp
+L power:GND #PWR?
+U 1 1 618C7EBC
+P 4850 6000
+AR Path="/613CB1D0/618C7EBC" Ref="#PWR?"  Part="1" 
+AR Path="/60FE1698/618C7EBC" Ref="#PWR019"  Part="1" 
+F 0 "#PWR019" H 4850 5750 50  0001 C CNN
+F 1 "GND" H 4855 5827 50  0000 C CNN
+F 2 "" H 4850 6000 50  0001 C CNN
+F 3 "" H 4850 6000 50  0001 C CNN
+	1    4850 6000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4550 5900 4550 5950
+Wire Wire Line
+	4550 5950 4850 5950
+Wire Wire Line
+	4850 5950 4850 5900
+Wire Wire Line
+	4850 6000 4850 5950
+Connection ~ 4850 5950
+Wire Wire Line
+	5550 4900 5450 4900
+Wire Wire Line
+	5450 5000 5550 5000
+Wire Wire Line
+	5550 5100 5450 5100
+Wire Wire Line
+	5450 5200 5550 5200
+$Comp
+L Device:R R?
+U 1 1 61951F6F
+P 6300 4900
+AR Path="/61951F6F" Ref="R?"  Part="1" 
+AR Path="/6158A412/61951F6F" Ref="R?"  Part="1" 
+AR Path="/60FE1698/61951F6F" Ref="R11"  Part="1" 
+F 0 "R11" V 6093 4900 50  0000 C CNN
+F 1 "5K1" V 6184 4900 50  0000 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 6230 4900 50  0001 C CNN
+F 3 "~" H 6300 4900 50  0001 C CNN
+F 4 "R10K_0402" H 6300 4900 50  0001 C CNN "StockRef"
+F 5 "2447096" H 6300 4900 50  0001 C CNN "ordercode"
+F 6 "farnell" H 6300 4900 50  0001 C CNN "supplier"
+	1    6300 4900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 6195270F
+P 6450 4900
+AR Path="/6195270F" Ref="R?"  Part="1" 
+AR Path="/6158A412/6195270F" Ref="R?"  Part="1" 
+AR Path="/60FE1698/6195270F" Ref="R18"  Part="1" 
+F 0 "R18" V 6243 4900 50  0000 C CNN
+F 1 "5K1" V 6334 4900 50  0000 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 6380 4900 50  0001 C CNN
+F 3 "~" H 6450 4900 50  0001 C CNN
+F 4 "R10K_0402" H 6450 4900 50  0001 C CNN "StockRef"
+F 5 "2447096" H 6450 4900 50  0001 C CNN "ordercode"
+F 6 "farnell" H 6450 4900 50  0001 C CNN "supplier"
+	1    6450 4900
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5450 4700 6300 4700
+Wire Wire Line
+	6300 4700 6300 4750
+Wire Wire Line
+	5450 4600 6450 4600
+Wire Wire Line
+	6450 4600 6450 4750
+NoConn ~ 5450 5500
+NoConn ~ 5450 5600
+$Comp
+L power:GND #PWR?
+U 1 1 61964A09
+P 6300 5150
+AR Path="/613CB1D0/61964A09" Ref="#PWR?"  Part="1" 
+AR Path="/60FE1698/61964A09" Ref="#PWR0115"  Part="1" 
+F 0 "#PWR0115" H 6300 4900 50  0001 C CNN
+F 1 "GND" H 6305 4977 50  0000 C CNN
+F 2 "" H 6300 5150 50  0001 C CNN
+F 3 "" H 6300 5150 50  0001 C CNN
+	1    6300 5150
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR?
+U 1 1 61964E35
+P 6450 5150
+AR Path="/613CB1D0/61964E35" Ref="#PWR?"  Part="1" 
+AR Path="/60FE1698/61964E35" Ref="#PWR0126"  Part="1" 
+F 0 "#PWR0126" H 6450 4900 50  0001 C CNN
+F 1 "GND" H 6455 4977 50  0000 C CNN
+F 2 "" H 6450 5150 50  0001 C CNN
+F 3 "" H 6450 5150 50  0001 C CNN
+	1    6450 5150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6450 5150 6450 5050
+Wire Wire Line
+	6300 5050 6300 5150
 $EndSCHEMATC
--- a/CAD/Leo_muziekdoos_ESP32/fp-info-cache
+++ b/CAD/Leo_muziekdoos_ESP32/fp-info-cache
--- a/FW/leo_muziekdoos_esp32/lib/CR95HF-master/examples/ReadTag/ReadTag.ino
+++ b/FW/leo_muziekdoos_esp32/lib/CR95HF-master/examples/ReadTag/ReadTag.ino
@@ -1,21 +0,0 @@
-#include "CR95HF.h"
-
-CR95HF reader(4, 2, 3, 5);
-
-void setup() {
-
-  Serial.begin(115200);
-  while (!Serial) {}
-  reader.begin();
-  Serial.println(reader.readSerial());
-}
-
-
-void loop() {
-
-  String id = reader.getID();
-  if (id != "") {
-    Serial.println(id);
-  }
-
-}
--- a/FW/leo_muziekdoos_esp32/lib/CR95HF-master/keywords.txt
+++ b/FW/leo_muziekdoos_esp32/lib/CR95HF-master/keywords.txt
@@ -1,20 +0,0 @@
-#######################################
-# Syntax Coloring Map HID
-#######################################
-
-#######################################
-# Datatypes (KEYWORD1)
-#######################################
-
-CR95HF	KEYWORD1
-
-#######################################
-# Methods and Functions (KEYWORD2)
-#######################################
-begin	KEYWORD2
-readSerial	KEYWORD2
-getID	KEYWORD2
-
-#######################################
-# Constants (LITERAL1)
-#######################################
--- a/FW/leo_muziekdoos_esp32/lib/CR95HF-master/library.properties
+++ b/FW/leo_muziekdoos_esp32/lib/CR95HF-master/library.properties
@@ -1,9 +0,0 @@
-name=CR95HF
-version=1.0
-author=Martino Facchin
-maintainer=Martino Facchin <m.facchin@arduino.cc>
-sentence=Library to talk with ST Microelectronics CR95HF RFID/NFC reader
-paragraph=Porting of mikroElektronika RFid click example code. Only SPI bus supported at the moment.
-category=Communication
-url=http://www.github.com/facchinm/CR95HF
-architectures=*
--- a/FW/leo_muziekdoos_esp32/lib/CR95HF-master/src/CR95HF.cpp
+++ b/FW/leo_muziekdoos_esp32/lib/CR95HF-master/src/CR95HF.cpp
@@ -1,448 +0,0 @@
-#include "CR95HF.h"
-#include "SPI.h"
-
-// Write command to the CR95HF
-void CR95HF::writeCmd(unsigned short cmd, unsigned short dataLen)
-{
-  unsigned short i = 0;
-
-  digitalWrite(CS, LOW);
-  SPI.beginTransaction(SETTINGS);
-  SPI.transfer(0x00); // Send cmd to CR95HF
-  SPI.transfer(cmd);
-  SPI.transfer(dataLen);
-  while (dataLen == 0)
-  {
-    digitalWrite(CS, HIGH);
-    break;
-  }
-  for (i = 0; i < dataLen; i++)
-  {
-    SPI.transfer(sdata[i]);
-  }
-  SPI.endTransaction();
-  digitalWrite(CS, HIGH);
-}
-
-// Poll the CR95HF
-void CR95HF::readCmd()
-{
-  unsigned short i = 0;
-
-  while (1)
-  {
-    digitalWrite(CS, LOW);
-    SPI.beginTransaction(SETTINGS);
-    SPI.transfer(0x03);
-    res = SPI.transfer(0);
-    SPI.endTransaction();
-    digitalWrite(CS, HIGH);
-
-    if ((res & 0x08) >> 3)
-    {
-      digitalWrite(CS, LOW);
-      SPI.beginTransaction(SETTINGS);
-      SPI.transfer(0x02);
-      res = SPI.transfer(0);
-      dataNum = SPI.transfer(0);
-      for (i = 0; i < dataNum; i++)
-        rdata[i] = SPI.transfer(0);
-      SPI.endTransaction();
-      digitalWrite(CS, HIGH);
-      break;
-    }
-    SPI.endTransaction();
-    digitalWrite(CS, HIGH);
-    delay(10);
-  }
-}
-
-// Initialize MCU and peripherals
-void CR95HF::begin()
-{
-  // Configure GPIO pins
-  // if (SSI_0 != -1)
-  //   pinMode(SSI_0, OUTPUT);
-  // if (SSI_1 != -1)
-  //   pinMode(SSI_1, OUTPUT);
-  if (IRQ_IN != -1)
-    pinMode(IRQ_IN, OUTPUT);
-
-  pinMode(CS, OUTPUT);
-
-  // Set in SPI mode
-  // if (SSI_0 != -1)
-  //   digitalWrite(SSI_0, HIGH);
-  // if (SSI_1 != -1)
-  //   digitalWrite(SSI_1, LOW);
-  if (IRQ_IN != -1)
-    digitalWrite(IRQ_IN, HIGH);
-  delay(1);
-
-  if (IRQ_IN != -1)
-    digitalWrite(IRQ_IN, LOW);
-  delay(1);
-  if (IRQ_IN != -1)
-    digitalWrite(IRQ_IN, HIGH);
-  delay(1);
-
-  Serial.println("RFID init: init SPI");
-  SPI.begin(SCK, MISO, MOSI);
-
-  Serial.print("RFID init: Wait for response");
-  while (!EchoResponse())
-  { // Until CR95HF is detected
-    if (IRQ_IN != -1)
-      digitalWrite(IRQ_IN, HIGH);
-    delay(10);
-    if (IRQ_IN != -1)
-      digitalWrite(IRQ_IN, LOW);
-    delay(10);
-    Serial.print(".");
-  }
-  Serial.println("ok");
-
-  Serial.printf("RFID init: Serial=%s\n", readSerial());
-  Calibration();
-  IndexMod_Gain();
-  AutoFDet();
-  Select_ISO_IEC_18092_Protocol();
-}
-
-// Get Echo reponse from CR95HF
-char CR95HF::EchoResponse()
-{
-
-  digitalWrite(CS, LOW);
-  SPI.beginTransaction(SETTINGS);
-  SPI.transfer(0x00); // Send cmd to CR95HF
-  SPI.transfer(ECHO);
-  SPI.endTransaction();
-  digitalWrite(CS, HIGH);
-  Serial.println("send echo");
-
-  while (1)
-  {
-    digitalWrite(CS, LOW);
-    SPI.beginTransaction(SETTINGS);
-    SPI.transfer(0x03);
-    tmp = SPI.transfer(0);
-    SPI.endTransaction();
-    digitalWrite(CS, HIGH);
-    Serial.printf("rfid: received %x\n",tmp);
-
-    if ((tmp & 0x08) >> 3)
-    { 
-      digitalWrite(CS, LOW);
-      SPI.beginTransaction(SETTINGS);
-      SPI.transfer(0x02);
-      tmp = SPI.transfer(0);
-      SPI.endTransaction();
-      digitalWrite(CS, HIGH);
-      if (tmp == ECHO)
-      {
-        Serial.println("receive echo");
-        return 1;
-      }
-      Serial.printf("no echo, received %x\n",tmp);
-      return 0;
-    }
-  }
-}
-
-// Calibrate CR95HF device
-void CR95HF::Calibration()
-{
-  sdata[0] = 0x03;
-  sdata[1] = 0xA1;
-  sdata[2] = 0x00;
-  sdata[3] = 0xF8;
-  sdata[4] = 0x01;
-  sdata[5] = 0x18;
-  sdata[6] = 0x00;
-  sdata[7] = 0x20;
-  sdata[8] = 0x60;
-  sdata[9] = 0x60;
-  sdata[10] = 0x00;
-  sdata[11] = 0x00;
-  sdata[12] = 0x3F;
-  sdata[13] = 0x01;
-  writeCmd(Idle, 0x0E);
-  readCmd();
-
-  sdata[0] = 0x03;
-  sdata[1] = 0xA1;
-  sdata[2] = 0x00;
-  sdata[3] = 0xF8;
-  sdata[4] = 0x01;
-  sdata[5] = 0x18;
-  sdata[6] = 0x00;
-  sdata[7] = 0x20;
-  sdata[8] = 0x60;
-  sdata[9] = 0x60;
-  sdata[10] = 0x00;
-  sdata[11] = 0xFC;
-  sdata[12] = 0x3F;
-  sdata[13] = 0x01;
-  writeCmd(Idle, 0x0E);
-  readCmd();
-
-  sdata[0] = 0x03;
-  sdata[1] = 0xA1;
-  sdata[2] = 0x00;
-  sdata[3] = 0xF8;
-  sdata[4] = 0x01;
-  sdata[5] = 0x18;
-  sdata[6] = 0x00;
-  sdata[7] = 0x20;
-  sdata[8] = 0x60;
-  sdata[9] = 0x60;
-  sdata[10] = 0x00;
-  sdata[11] = 0x7C;
-  sdata[12] = 0x3F;
-  sdata[13] = 0x01;
-  writeCmd(Idle, 0x0E);
-  readCmd();
-
-  sdata[0] = 0x03;
-  sdata[1] = 0xA1;
-  sdata[2] = 0x00;
-  sdata[3] = 0xF8;
-  sdata[4] = 0x01;
-  sdata[5] = 0x18;
-  sdata[6] = 0x00;
-  sdata[7] = 0x20;
-  sdata[8] = 0x60;
-  sdata[9] = 0x60;
-  sdata[10] = 0x00;
-  sdata[11] = 0x3C;
-  sdata[12] = 0x3F;
-  sdata[13] = 0x01;
-  writeCmd(Idle, 0x0E);
-  readCmd();
-
-  sdata[0] = 0x03;
-  sdata[1] = 0xA1;
-  sdata[2] = 0x00;
-  sdata[3] = 0xF8;
-  sdata[4] = 0x01;
-  sdata[5] = 0x18;
-  sdata[6] = 0x00;
-  sdata[7] = 0x20;
-  sdata[8] = 0x60;
-  sdata[9] = 0x60;
-  sdata[10] = 0x00;
-  sdata[11] = 0x5C;
-  sdata[12] = 0x3F;
-  sdata[13] = 0x01;
-  writeCmd(Idle, 0x0E);
-  readCmd();
-
-  sdata[0] = 0x03;
-  sdata[1] = 0xA1;
-  sdata[2] = 0x00;
-  sdata[3] = 0xF8;
-  sdata[4] = 0x01;
-  sdata[5] = 0x18;
-  sdata[6] = 0x00;
-  sdata[7] = 0x20;
-  sdata[8] = 0x60;
-  sdata[9] = 0x60;
-  sdata[10] = 0x00;
-  sdata[11] = 0x6C;
-  sdata[12] = 0x3F;
-  sdata[13] = 0x01;
-  writeCmd(Idle, 0x0E);
-  readCmd();
-
-  sdata[0] = 0x03;
-  sdata[1] = 0xA1;
-  sdata[2] = 0x00;
-  sdata[3] = 0xF8;
-  sdata[4] = 0x01;
-  sdata[5] = 0x18;
-  sdata[6] = 0x00;
-  sdata[7] = 0x20;
-  sdata[8] = 0x60;
-  sdata[9] = 0x60;
-  sdata[10] = 0x00;
-  sdata[11] = 0x74;
-  sdata[12] = 0x3F;
-  sdata[13] = 0x01;
-  writeCmd(Idle, 0x0E);
-  readCmd();
-
-  sdata[0] = 0x03;
-  sdata[1] = 0xA1;
-  sdata[2] = 0x00;
-  sdata[3] = 0xF8;
-  sdata[4] = 0x01;
-  sdata[5] = 0x18;
-  sdata[6] = 0x00;
-  sdata[7] = 0x20;
-  sdata[8] = 0x60;
-  sdata[9] = 0x60;
-  sdata[10] = 0x00;
-  sdata[11] = 0x70;
-  sdata[12] = 0x3F;
-  sdata[13] = 0x01;
-  writeCmd(Idle, 0x0E);
-  readCmd();
-}
-
-// Get CR95HF chip ID
-char *CR95HF::readSerial()
-{
-  writeCmd(IDN, 0);
-  readCmd();
-  for (j = 0; j < dataNum; j++)
-  {
-    CR95HF_ID[j] = rdata[j];
-  }
-  return CR95HF_ID;
-}
-
-// Select the RF communication protocol (ISO/IEC 14443-A)
-void CR95HF::Select_ISO_IEC_14443_A_Protocol()
-{
-  sdata[0] = 0x02;
-  sdata[1] = 0x00;
-  writeCmd(ProtocolSelect, 2);
-  readCmd();
-
-  // Clear read and write buffers
-  for (j = 0; j < 18; j++)
-  {
-    rdata[j] = 0;
-    sdata[j] = 0;
-  }
-}
-
-// Select the RF communication protocol (ISO/IEC 18092)
-void CR95HF::Select_ISO_IEC_18092_Protocol()
-{
-  sdata[0] = 0x04;
-  sdata[1] = 0x51;
-  writeCmd(ProtocolSelect, 2);
-  readCmd();
-
-  // Clear read and write buffers
-  for (j = 0; j < 18; j++)
-  {
-    rdata[j] = 0;
-    sdata[j] = 0;
-  }
-}
-
-// Configure IndexMod & Gain
-void CR95HF::IndexMod_Gain()
-{
-  sdata[0] = 0x09;
-  sdata[1] = 0x04;
-  sdata[2] = 0x68;
-  sdata[3] = 0x01;
-  sdata[4] = 0x01;
-  sdata[5] = 0x50;
-  writeCmd(WrReg, 6);
-  readCmd();
-}
-
-// Configure Auto FDet
-void CR95HF::AutoFDet()
-{
-  sdata[0] = 0x09;
-  sdata[1] = 0x04;
-  sdata[2] = 0x0A;
-  sdata[3] = 0x01;
-  sdata[4] = 0x02;
-  sdata[5] = 0xA1;
-  writeCmd(WrReg, 6);
-  readCmd();
-}
-
-// Read the tag ID
-void CR95HF::GetTagID()
-{
-  sdata[0] = 0x26;
-  sdata[1] = 0x07;
-  writeCmd(SendRecv, 2);
-  readCmd();
-
-  sdata[0] = 0x93;
-  sdata[1] = 0x20;
-  sdata[2] = 0x08;
-  writeCmd(SendRecv, 3);
-  readCmd();
-
-  if (res == 0x80)
-  {
-    for (j = 1; j < dataNum - 3; j++)
-    {
-      ID += String(rdata[j], HEX);
-    }
-    TAG_flag = 1;
-  }
-  else
-  {
-    TAG_flag = 0;
-    Select_ISO_IEC_18092_Protocol();
-  }
-}
-
-// Read the NFC Forum tags
-void CR95HF::GetNFCTag()
-{
-  sdata[0] = 0x00;
-  sdata[1] = 0xFF;
-  sdata[2] = 0xFF;
-  sdata[3] = 0x00;
-  sdata[4] = 0x00;
-  writeCmd(SendRecv, 5);
-  readCmd();
-
-  if (res == 0x80)
-  {
-    for (j = 0; j < dataNum; j++)
-    {
-      ID += String(rdata[j], HEX);
-    }
-    NFC_flag = 1;
-  }
-  else
-  {
-    NFC_flag = 0;
-    Select_ISO_IEC_14443_A_Protocol();
-  }
-}
-
-String CR95HF::getID()
-{
-
-  String id = "";
-
-  if (!TAG_flag)
-    GetNFCTag(); // Get NFC ID
-
-  if (!NFC_flag)
-    GetTagID(); // Get Tag ID
-
-  if (ID.c_str()[0] == 0)
-  {         // If there is no tag present
-    flag++; // Increment counter flag
-  }
-  else
-  {           // If tag is present
-    flag = 0; // Reset counter flag
-    id = ID;  // Set current ID as previous ID
-  }
-  ID = ""; // Terminate the ID string
-
-  // Clear read and write buffers
-  for (j = 0; j < 18; j++)
-  {
-    rdata[j] = 0;
-    sdata[j] = 0;
-  }
-
-  return id;
-}
--- a/FW/leo_muziekdoos_esp32/lib/CR95HF-master/src/CR95HF.h
+++ b/FW/leo_muziekdoos_esp32/lib/CR95HF-master/src/CR95HF.h
@@ -1,56 +0,0 @@
-#include "SPI.h"
-#include "Arduino.h"
-
-// CR95HF Commands Definition
-#define IDN 0x01
-#define ProtocolSelect 0x02
-#define SendRecv 0x04
-#define Idle 0x07
-#define RdReg 0x08
-#define WrReg 0x09
-#define BaudRate 0x0A
-#define ECHO 0x55
-
-class  CR95HF
-{
-
-public:
-  CR95HF(int cs, int sck, int mosi, int miso, int irq_in = -1, int ssi_o = -1, int ssi_i = -1) : CS(cs), SCK(sck), MOSI(mosi), MISO(miso), IRQ_IN(irq_in), SSI_0(ssi_o), SSI_1(ssi_i) {}
-  void begin();
-  char *readSerial();
-  String getID();
-
-private:
-  void writeCmd(unsigned short cmd, unsigned short dataLen);
-  void readCmd();
-  char EchoResponse();
-  void Calibration();
-  void GetNFCTag();
-  void GetTagID();
-  void AutoFDet();
-  void IndexMod_Gain();
-  void Select_ISO_IEC_18092_Protocol();
-  void Select_ISO_IEC_14443_A_Protocol();
-
-private:
-  const SPISettings SETTINGS = SPISettings(1000000, MSBFIRST, SPI_MODE0);
-  unsigned short sdata[18];
-  unsigned short rdata[18];
-  unsigned short res = 0, dataNum = 0;
-  unsigned short j = 0, tmp = 0;
-  int x_pos = 0;
-  int x_pos_old = 0;
-  char CR95HF_ID[13];
-  String ID;
-  String ID_old;
-  char flag = 0;
-  unsigned char NFC_flag = 0;
-  unsigned char TAG_flag = 1;
-  const unsigned int CS; 
-  const unsigned int SCK;
-  const unsigned int MOSI;
-  const unsigned int MISO;
-  const unsigned int IRQ_IN; 
-  const unsigned int SSI_0;  
-  const unsigned int SSI_1; 
-};
--- a/FW/leo_muziekdoos_esp32/lib/NDEF
+++ b/FW/leo_muziekdoos_esp32/lib/NDEF
--- a/FW/leo_muziekdoos_esp32/lib/PN532
+++ b/FW/leo_muziekdoos_esp32/lib/PN532
--- a/FW/leo_muziekdoos_esp32/lib/PN532_SPI
+++ b/FW/leo_muziekdoos_esp32/lib/PN532_SPI
--- a/FW/leo_muziekdoos_esp32/lib/rfid_C95HF
+++ b/FW/leo_muziekdoos_esp32/lib/rfid_C95HF
--- a/FW/leo_muziekdoos_esp32/platformio.ini
+++ b/FW/leo_muziekdoos_esp32/platformio.ini
@@ -8,10 +8,26 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html

-[env:esp32-pico]
+
+; [env:esp32-pico]
+; platform = espressif32
+; board = m5stack-atom
+; framework = arduino
+; lib_deps = 
+; 	bblanchon/ArduinoJson@^6.18.5
+; 	joaolopesf/SerialDebug@^0.9.82
+; monitor_speed = 115200
+; lib_ldf_mode = deep+
+; extra_scripts = ./littlefsbuilder.py
+; build_flags = 
+; 	-DHARDWARE=2
+; ;upload_protocol = espota
+; ;upload_port = 192.168.2.254
+
+[env:esp32-S2]
 platform = espressif32
-board = m5stack-atom
 framework = arduino
+board = ESP32S2_DEV
 lib_deps = 
 	bblanchon/ArduinoJson@^6.18.5
 	joaolopesf/SerialDebug@^0.9.82
@@ -19,6 +35,6 @@ monitor_speed = 115200
 lib_ldf_mode = deep+
 extra_scripts = ./littlefsbuilder.py
 build_flags = 
-	-DHARDWARE=1
+	-DHARDWARE=3
 ;upload_protocol = espota
 ;upload_port = 192.168.2.254
--- a/FW/leo_muziekdoos_esp32/src/board.h
+++ b/FW/leo_muziekdoos_esp32/src/board.h
@@ -1,7 +1,27 @@
 #pragma once

-#define HARDWARE 1
+//#define HARDWARE 3

+#if HARDWARE == 3
+#define I2S_BCLK    19
+#define I2S_WCLK    21
+#define I2S_DATA    18
+#define DAC_SDMODE  23
+
+#define NFC_SS      27
+#define NFC_SCK     25
+#define NFC_MOSI    26
+#define NFC_MISO    14
+//#define NFC_RST     22  //not connectedx
+#define NFC_IRQ     13
+
+#define PWR_HOLD     4
+#define PWR_BTN      9
+#define MEAS_EN     10
+#define MEAS_ADC    35  //ADC1_CH7
+
+#define HALL_INPUT  36  //ADC1_CH0
+#endif

 #if HARDWARE == 2
 #define I2S_BCLK    19
--- a/FW/leo_muziekdoos_esp32/src/rfid.cpp
+++ b/FW/leo_muziekdoos_esp32/src/rfid.cpp
@@ -1,44 +1,26 @@
 #include "rfid.h"

-uint8_t cardsToCheck[] = {TRACK_NFCTYPE1,
-                          TRACK_NFCTYPE2,
-                          TRACK_NFCTYPE3,
-                          TRACK_NFCTYPE4A,
-                          TRACK_NFCTYPE4B,
-                          TRACK_NFCTYPE5};

-uint8_t currentCardIdx = 0;
-uint8_t maxCardIdx = sizeof(cardsToCheck);
-
-uint32_t last_rfid_update = 0;
-//CR95HF reader(NFC_SS, NFC_SCK, NFC_MOSI, NFC_MISO, NFC_IRQ);
+PN532_SPI pn532spi(SPI, NFC_SS, NFC_SCK, NFC_MISO, NFC_MOSI);
+NfcAdapter nfc = NfcAdapter(pn532spi);

 //*****************************************************************************************//
 void initRfid()
 {
-  Serial.println(F("rfid init")); //shows in serial that it is ready to read
-
  //int8_t sck=-1, int8_t miso=-1, int8_t mosi=-1, int8_t ss=-1);
-  ConfigManager_HWInit(NFC_SCK, NFC_MISO, NFC_MOSI, NFC_SS, NFC_IRQ);
-  //reader.begin();
+  nfc.begin(true);
  Serial.println(F("rfid init done")); //shows in serial that it is ready to read
 }

 //*****************************************************************************************//
 void handleRfid()
 {
-  uint32_t timeNow = millis();
-
-  if (timeNow - last_rfid_update > RFIDINTERVAL)
+  if (nfc.tagPresent())
  {
-    Serial.printf("rfid: reading card type index %d\n",currentCardIdx);
-    uint8_t TagType = ConfigManager_TagHunting(cardsToCheck[currentCardIdx++]);
-    if(currentCardIdx > maxCardIdx)
-    {
-      currentCardIdx = 0;
-    }
-    Serial.printf("rfid: read card returned %d\n",TagType);
-    last_rfid_update = timeNow;
+    NfcTag tag = nfc.read();
+    String uid = tag.getUidString();
+    Serial.println(uid);
  }
 }
 //*****************************************************************************************//
+
--- a/FW/leo_muziekdoos_esp32/src/rfid.h
+++ b/FW/leo_muziekdoos_esp32/src/rfid.h
@@ -1,24 +1,13 @@
 #pragma once

 #include "board.h"
-#include "Arduino.h"
-#include "SerialDebug.h"
-#include "lib_NDEF_URI.h"
-#include "lib_NDEF_SMS.h"
-#include "lib_NDEF_Text.h"
-#include "lib_NDEF_Email.h"
-#include "lib_NDEF_Geo.h"
-#include "lib_95HFConfigManager.h"
-#include "miscellaneous.h"
-#include "lib_95HFConfigManager.h"
-#include "lib_wrapper.h"
-#include "lib_NDEF_URI.h"
-#include "drv_spi.h"

-//#include "CR95HF.h"
-
-#define RFIDINTERVAL 200
+#include <SPI.h>
+#include "PN532_SPI.h"
+#include "PN532.h"
+#include "NfcAdapter.h"

+#define NDEF_SUPPORT_MIFARE_CLASSIC

 void initRfid(void);
 void handleRfid(void);
Author	SHA1	Message	Date
willem	401d9a8b0a	add HW v3 config	2021-11-23 09:03:50 +01:00
willem	28b1514f0b	revert to PN532	2021-11-21 18:20:46 +01:00
willem	884edd8713	restore PN532 submodule and remove C95	2021-11-18 09:50:41 +01:00
willem	4a6565d55d	updated PCBv3	2021-11-11 16:43:59 +01:00
Willem Oldemans	4927213147	updated schematic v3	2021-11-09 21:20:32 +01:00