pcbv3

update V3 PCB and schematic
pn532 head
2021-12-08 17:28:23 +01:00 · 2021-12-02 17:03:27 +01:00 · 2021-11-26 11:14:05 +01:00 · 2021-11-26 11:13:09 +01:00 · 2021-11-26 11:12:46 +01:00 · 2021-11-23 09:03:50 +01:00
69 changed files with 169179 additions and 11768 deletions
@@ -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
@@ -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
 #
@@ -265,25 +283,26 @@ X 4 4 0 -200 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device_D_Schottky
+# Device_Crystal_GND24_Small
 #
-DEF Device_D_Schottky D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "Device_D_Schottky" 0 -100 50 H V C CNN
+DEF Device_Crystal_GND24_Small Y 0 40 Y N 1 F N
+F0 "Y" 50 175 50 H V L CNN
+F1 "Device_Crystal_GND24_Small" 50 100 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
+ Crystal*
 $ENDFPLIST
 DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+S -30 -60 30 60 0 1 0 N
+P 2 0 1 15 -50 -30 -50 30 N
+P 2 0 1 15 50 -30 50 30 N
+P 4 0 1 0 -50 -50 -50 -75 50 -75 50 -50 N
+P 4 0 1 0 -50 50 -50 75 50 75 50 50 N
+X 1 1 -100 0 50 R 30 50 1 1 P
+X 2 2 0 -100 25 U 30 50 1 1 P
+X 3 3 100 0 50 L 30 50 1 1 P
+X 4 4 0 100 25 D 30 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -444,48 +463,79 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Interface_USB_CP2109-InterfaceUSB
+# Jumper_SolderJumper_2_Open
 #
-DEF Interface_USB_CP2109-InterfaceUSB U 0 20 Y Y 1 F N
-F0 "U" -350 1250 50 H V C CNN
-F1 "Interface_USB_CP2109-InterfaceUSB" 500 1250 50 H V C CNN
-F2 "Package_DFN_QFN:QFN-28-1EP_5x5mm_P0.5mm_EP3.35x3.35mm" 50 1800 50 H I C CNN
-F3 "" -300 150 50 H I C CNN
-F4 "CP2109-Axx-xQFN28" 0 0 50 H V C CNN "ordercode"
+DEF Jumper_SolderJumper_2_Open JP 0 0 Y N 1 F N
+F0 "JP" 0 80 50 H V C CNN
+F1 "Jumper_SolderJumper_2_Open" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- QFN*1EP*5x5mm*P0.5mm*
+ SolderJumper*Open*
 $ENDFPLIST
 DRAW
-S -400 1200 400 -100 0 1 10 f
-X ~DCD 1 500 500 100 L 50 50 1 1 I
-X NC 10 -500 0 100 R 50 50 1 1 N N
-X ~SUSPEND 11 500 100 100 L 50 50 1 1 O
-X SUSPEND 12 500 200 100 L 50 50 1 1 O
-X ~ 13 -500 50 100 R 50 50 1 1 N N
-X ~ 14 -500 -50 100 R 50 50 1 1 N N
-X ~ 15 -500 300 100 R 50 50 1 1 N N
-X ~ 16 -500 250 100 R 50 50 1 1 N N
-X ~ 17 -500 100 100 R 50 50 1 1 N N
-X ~ 18 -500 750 100 R 50 50 1 1 N N
-X ~ 19 -500 800 100 R 50 50 1 1 N N
-X ~RI~/CLK 2 500 400 100 L 50 50 1 1 B
-X ~ 20 -500 850 100 R 50 50 1 1 N N
-X ~ 21 -500 200 100 R 50 50 1 1 N N
-X ~ 22 -500 150 100 R 50 50 1 1 N N
-X ~CTS 23 500 800 100 L 50 50 1 1 I
-X ~RTS 24 500 900 100 L 50 50 1 1 O
-X RXD 25 500 1000 100 L 50 50 1 1 I
-X TXD 26 500 1100 100 L 50 50 1 1 O
-X ~DSR 27 500 700 100 L 50 50 1 1 I
-X ~DTR 28 500 600 100 L 50 50 1 1 O
-X GND(Epad) 29 -50 -200 100 U 50 50 1 1 P
-X GND 3 -200 -200 100 U 50 50 1 1 W
-X D+ 4 -500 400 100 R 50 50 1 1 B
-X D- 5 -500 500 100 R 50 50 1 1 B
-X VDD 6 0 1300 100 D 50 50 1 1 W
-X VREGIN 7 -100 1300 100 D 50 50 1 1 W
-X VBUS 8 -500 600 100 R 50 50 1 1 I
-X ~RST 9 -500 1100 100 R 50 50 1 1 I
+A -10 0 40 901 -901 0 1 0 N -10 40 -10 -40
+A -10 0 40 901 -901 0 1 0 F -10 40 -10 -40
+A 10 0 40 -899 899 0 1 0 N 10 -40 10 40
+A 10 0 40 -899 899 0 1 0 F 10 -40 10 40
+P 2 0 1 0 -10 40 -10 -40 N
+P 2 0 1 0 10 40 10 -40 N
+X A 1 -150 0 100 R 50 50 1 1 P
+X B 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Jumper_SolderJumper_3_Open
+#
+DEF Jumper_SolderJumper_3_Open JP 0 0 Y N 1 F N
+F0 "JP" -100 -100 50 H V C CNN
+F1 "Jumper_SolderJumper_3_Open" 0 110 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SolderJumper*Open*
+$ENDFPLIST
+DRAW
+A -40 0 40 901 -901 0 1 0 N -40 40 -40 -40
+A -40 0 40 901 -901 0 1 0 F -40 40 -40 -40
+A 40 0 40 -899 899 0 1 0 N 40 -40 40 40
+A 40 0 40 -899 899 0 1 0 F 40 -40 40 40
+S -20 40 20 -40 0 1 0 F
+P 2 0 1 0 -100 0 -80 0 N
+P 2 0 1 0 -40 40 -40 -40 N
+P 2 0 1 0 0 -50 0 -40 N
+P 2 0 1 0 40 40 40 -40 N
+P 2 0 1 0 100 0 80 0 N
+X A 1 -200 0 100 R 50 50 1 1 P
+X C 2 0 -150 100 U 50 50 1 1 I
+X B 3 200 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED_SK6812MINI
+#
+DEF LED_SK6812MINI D 0 10 Y Y 1 F N
+F0 "D" 200 225 50 H V R BNN
+F1 "LED_SK6812MINI" 50 -225 50 H V L TNN
+F2 "LED_SMD:LED_SK6812MINI_PLCC4_3.5x3.5mm_P1.75mm" 50 -300 50 H I L TNN
+F3 "" 100 -375 50 H I L TNN
+$FPLIST
+ LED*SK6812MINI*PLCC*3.5x3.5mm*P1.75mm*
+$ENDFPLIST
+DRAW
+T 0 90 -165 30 0 0 0 RGB Normal 0 C C
+S 200 200 -200 -200 0 1 10 f
+P 2 0 1 0 50 -140 70 -140 N
+P 2 0 1 0 50 -100 70 -100 N
+P 2 0 1 0 185 -140 105 -140 N
+P 3 0 1 0 90 -100 50 -140 50 -120 N
+P 3 0 1 0 90 -60 50 -100 50 -80 N
+P 3 0 1 0 145 -40 145 -140 145 -160 N
+P 4 0 1 0 185 -60 105 -60 145 -140 185 -60 N
+X DOUT 1 300 0 100 L 50 50 1 1 O
+X VSS 2 0 -300 100 U 50 50 1 1 W
+X DIN 3 -300 0 100 R 50 50 1 1 I
+X VDD 4 0 300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -502,67 +552,78 @@ C 0 0 100 1 0 10 N
 ENDDRAW
 ENDDEF
 #
-# RF_Module_ESP32-PICO-D4_update
+# RF_Module_ESP32-S3
 #
-DEF RF_Module_ESP32-PICO-D4_update U 0 20 Y Y 1 F N
-F0 "U" -700 1550 50 H V L CNN
-F1 "RF_Module_ESP32-PICO-D4_update" 150 1550 50 H V L CNN
-F2 "Package_DFN_QFN:QFN-48-1EP_7x7mm_P0.5mm_EP5.3x5.3mm" 0 -1700 50 H I C CNN
-F3 "" 250 -1000 50 H I C CNN
+DEF RF_Module_ESP32-S3 U? 0 10 Y Y 1 F N
+F0 "U?" 1750 700 60 H V C CNN
+F1 "RF_Module_ESP32-S3" 1800 -4000 60 H V C CNN
+F2 "QFN56_ESP32_7X7_EXP" 1850 -4100 60 H I C CNN
+F3 "" -1150 -700 60 H I C CNN
+F4 "ESP32-S3FN8" 0 0 50 H I C CNN "ORDERCODE"
 $FPLIST
- QFN*1EP*7x7mm*P0.5mm*
+ QFN56_ESP32_7X7_EXP
+ QFN56_ESP32_7X7_EXP-M
+ QFN56_ESP32_7X7_EXP-L
 $ENDFPLIST
 DRAW
-S -700 1500 700 -1500 0 1 10 f
-X VDDA 1 -200 1600 100 D 50 50 0 0 W
-X IO34 10 800 -1000 100 L 50 50 0 0 I
-X IO35 11 800 -1100 100 L 50 50 0 0 I
-X IO32 12 800 -800 100 L 50 50 0 0 B
-X IO33 13 800 -900 100 L 50 50 0 0 B
-X IO25 14 800 -500 100 L 50 50 0 0 B
-X IO26 15 800 -600 100 L 50 50 0 0 B
-X IO27 16 800 -700 100 L 50 50 0 0 B
-X IO14 17 800 200 100 L 50 50 0 0 B
-X IO12 18 800 400 100 L 50 50 0 0 B
-X VDD3P3_RTC 19 0 1600 100 D 50 50 0 0 W
-X LNA_IN 2 800 1400 100 L 50 50 0 0 B
-X IO13 20 800 300 100 L 50 50 0 0 B
-X IO15 21 800 100 100 L 50 50 0 0 B
-X IO2 22 800 1000 100 L 50 50 0 0 B
-X IO0 23 800 1200 100 L 50 50 0 0 B
-X IO4 24 800 800 100 L 50 50 0 0 B
-X IO16 25 -800 0 100 R 50 50 0 0 B
-X VDD_SDIO 26 800 -1300 100 L 50 50 0 0 w
-X IO17 27 -800 -100 100 R 50 50 0 0 B
-X SD2/IO9 28 800 600 100 L 50 50 0 0 B
-X SD3/IO10 29 800 500 100 L 50 50 0 0 B
-X VDDA3P3 3 -100 1600 100 D 50 50 0 0 W
-X CMD 30 -800 -500 100 R 50 50 0 0 B
-X CLK 31 -800 -400 100 R 50 50 0 0 B
-X SD0 32 -800 -200 100 R 50 50 0 0 B
-X SD1 33 -800 -300 100 R 50 50 0 0 B
-X IO5 34 800 700 100 L 50 50 0 0 B
-X IO18 35 800 0 100 L 50 50 0 0 B
-X IO23 36 800 -400 100 L 50 50 0 0 B
-X VDD3P3_CPU 37 100 1600 100 D 50 50 0 0 W
-X IO19 38 800 -100 100 L 50 50 0 0 B
-X IO22 39 800 -300 100 L 50 50 0 0 B
-X VDDA3P3 4 -100 1600 100 D 50 50 0 0 P N
-X U0RXD/IO3 40 800 900 100 L 50 50 0 0 B
-X U0TXD/IO1 41 800 1100 100 L 50 50 0 0 B
-X IO21 42 800 -200 100 L 50 50 0 0 B
-X VDDA 43 -200 1600 100 D 50 50 0 0 P N
-X XTAL_N_NC 44 -700 -1000 100 R 50 50 0 0 N N
-X XTAL_P_NC 45 -700 -1100 100 R 50 50 0 0 N N
-X VDDA 46 -200 1600 100 D 50 50 0 0 P N
-X CAP2_NC 47 -700 -1200 100 R 50 50 0 0 N N
-X CAP1_NC 48 -700 -1300 100 R 50 50 0 0 N N
-X GND 49 0 -1600 100 U 50 50 0 0 W
-X SENSOR_VP 5 -800 1200 100 R 50 50 0 0 I
-X SENSOR_CAPP 6 -800 1100 100 R 50 50 0 0 I
-X SENSOR_CAPN 7 -800 1000 100 R 50 50 0 0 I
-X SENSOR_VN 8 -800 900 100 R 50 50 0 0 I
-X EN 9 -800 1400 100 R 50 50 0 0 I
+S 300 650 1900 -3950 0 1 0 f
+X LNA_IN 1 2200 200 300 L 59 59 1 1 P
+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 VDD3P3 2 1250 950 300 D 59 59 1 1 W
+X VDD3P3_RTC 20 1050 950 300 D 59 59 1 1 W
+X 32K_P/GPIO15 21 2200 -1650 300 L 59 59 1 1 B
+X 32K_N/GPIO16 22 2200 -1750 300 L 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 GPIO21 27 2200 -2050 300 L 59 59 1 1 B
+X SPIS1/~PSR_CS 28 0 -850 300 R 59 59 1 1 O
+X VDD_SPI 29 0 -3500 300 R 59 59 1 1 w
+X VDD3P3 3 1150 950 300 D 59 59 1 1 W
+X SPIHD/~HOLD~/SIO3 30 0 -1350 300 R 59 59 1 1 O
+X SPIWP/~WP~/SIO2 31 0 -1250 300 R 59 59 1 1 O
+X SPIS0/~FLASH_CS 32 0 -750 300 R 59 59 1 1 B
+X SPICLK 33 0 -950 300 R 59 59 1 1 B
+X SPIQ/D0/SIO1 34 0 -1150 300 R 59 59 1 1 B
+X SPID/DI/SIO0 35 0 -1050 300 R 59 59 1 1 B
+X SPICLK_N/GPIO48 36 2200 -3650 300 L 59 59 1 1 O
+X SPICLK_P/GPIO47 37 2200 -3550 300 L 59 59 1 1 O
+X GPIO33 38 2200 -2150 300 L 59 59 1 1 B
+X GPIO34 39 2200 -2250 300 L 59 59 1 1 B
+X CHIP_PU 4 0 200 300 R 59 59 1 1 I
+X GPIO35 40 2200 -2350 300 L 59 59 1 1 B
+X GPIO36 41 2200 -2450 300 L 59 59 1 1 B
+X GPIO37 42 2200 -2550 300 L 59 59 1 1 B
+X GPIO38 43 2200 -2650 300 L 59 59 1 1 B
+X MTCK/GPIO39 44 2200 -2750 300 L 59 59 1 1 B
+X MTDO/GPIO40 45 2200 -2850 300 L 59 59 1 1 B
+X VDD3P3_CPU 46 1450 950 300 D 59 59 1 1 W
+X MTDI/GPIO41 47 2200 -2950 300 L 59 59 1 1 B
+X MTMS/GPIO42 48 2200 -3050 300 L 59 59 1 1 B
+X U0TXD/GPIO43 49 2200 -3150 300 L 59 59 1 1 B
+X BOOT0/GPIO0 5 0 -2500 300 R 59 59 1 1 B
+X U0RXD/GPIO44 50 2200 -3250 300 L 59 59 1 1 B
+X VDD_SPI_SEL/GPIO45 51 0 -2800 300 R 59 59 1 1 B
+X BOOT1/GPIO46 52 0 -2600 300 R 59 59 1 1 B
+X XTAL_N 53 0 -2150 300 R 59 59 1 1 I
+X XTAL_P 54 0 -2050 300 R 59 59 1 1 I
+X VDDA 55 750 950 300 D 59 59 1 1 W
+X VDDA 56 950 950 300 D 59 59 1 1 W
+X GND 57 1050 -4250 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 JTAG_SEL/GPIO3 8 0 -2900 300 R 59 59 1 1 B
+X GPIO4 9 2200 -550 300 L 59 59 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -683,33 +744,6 @@ X 2 2 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# Transistor_BJT_UMH3N
-#
-DEF Transistor_BJT_UMH3N Q 0 20 Y N 2 F N
-F0 "Q" 300 50 50 H V L CNN
-F1 "Transistor_BJT_UMH3N" 300 -50 50 H V L CNN
-F2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" 5 -440 50 H I C CNN
-F3 "" 150 0 50 H I C CNN
-$FPLIST
- SOT?363*
-$ENDFPLIST
-DRAW
-C 150 0 111 0 1 10 N
-S 10 20 -100 -20 0 1 10 N
-P 2 0 1 0 125 0 10 0 N
-P 2 0 1 0 125 25 200 100 N
-P 2 0 1 20 125 60 125 -60 N
-P 3 0 1 0 125 -25 200 -100 200 -100 N
-P 5 0 1 0 150 -70 170 -50 190 -90 150 -70 150 -70 F
-X E1 1 200 -200 100 U 50 50 1 1 P
-X B1 2 -200 0 100 R 50 50 1 1 I
-X C1 6 200 200 100 D 50 50 1 1 P
-X C2 3 200 200 100 D 50 50 2 1 P
-X E2 4 200 -200 100 U 50 50 2 1 P
-X B2 5 -200 0 100 R 50 50 2 1 I
-ENDDRAW
-ENDDEF
-#
 # power_+3.3V
 #
 DEF power_+3.3V #PWR 0 0 Y Y 1 F P
@@ -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
@@ -1,40 +1,40 @@
-Reference Type, Quantity, Reference, Value, Footprint, Datasheet, StockRef, ordercode, supplier, MPN, Manufacturer, Field4, partnr, Category, DK_Datasheet_Link, DK_Detail_Page, Description, Digi-Key_PN, Family, Status
-"ANT","1","ANT1,","2450AT18A100E","MySymbols:wifi antenna","https://www.johansontechnology.com/datasheets/2450AT18A100/2450AT18A100.pdf","","https://www.ebay.nl/itm/164779252093","ebay","2450AT18A100E","Johanson Technology Inc.","","","RF/IF and RFID","https://www.johansontechnology.com/datasheets/2450AT18A100/2450AT18A100.pdf","/product-detail/en/johanson-technology-inc/2450AT18A100E/712-1005-1-ND/1560834","RF ANT 2.4GHZ CHIP SOLDER SMD","712-1005-1-ND","RF Antennas","Active"
-"C","2","C16,C17,","C","Capacitor_SMD:C_0402_1005Metric","~","","","","","","DNP","","","","","","","",""
-"C","1","C15,","1nF","Capacitor_SMD:C_0402_1005Metric","~","","2320774","farnell","","","","","","","","","","",""
-"C","5","C10,C12,C6,C7,C32,","10nF","Capacitor_SMD:C_0402_1005Metric","~","","3013347","farnell","","","","","","","","","","",""
-"C","10","C2,C4,C8,C14,C21,C18,C26,C19,C33,C29,","100nF","Capacitor_SMD:C_0402_1005Metric","~","C100n_0603","2524678","farnell","","","","","","","","","","",""
-"C","1","C27,","1.5pF","Capacitor_SMD:C_0402_1005Metric","~","","2812055","farnell","","","","","","","","","","",""
-"C","1","C25,","15pF","Capacitor_SMD:C_0402_1005Metric","~","","2627389","farnell","","","","","","","","","","",""
-"C","2","C20,C23,","150pF","Capacitor_SMD:C_0402_1005Metric","~","","2812303","farnell","","","","","","","","","","",""
-"C","3","C24,C34,C35,","220pF","Capacitor_SMD:C_0402_1005Metric","~","","2812289","farnell","","","","","","","","","","",""
-"C","3","C3,C1,C9,","4u7","Capacitor_SMD:C_0603_1608Metric","~","C04u7_0603","2112745","farnell","","","","","","","","","","",""
-"C","1","C13,","1uF","Capacitor_SMD:C_0402_1005Metric","~","","3013381","farnell","","","","","","","","","","",""
-"C","1","C5,","10uF","Capacitor_SMD:C_0805_2012Metric","~","C010u_0805","2112746","farnell","","","","","","","","","","",""
-"D","2","D1,D2,","LED","LED_SMD:LED_0805_2012Metric","~","LED_SMD_GREEN_0805_20mA","2290331","farnell","","","","","","","","","","",""
-"D","1","D3,","1SS355","Diode_SMD:D_SOD-323","https://assets.nexperia.com/documents/data-sheet/BAS16_SER.pdf","DIODE_BAS316","1525435","farnell","1SS355TE-17","ROHM","","","","","","","","",""
+Reference Type, Quantity, Reference, Value, Footprint, Datasheet, StockRef, ordercode, supplier, MPN, Manufacturer, Field4, partnr, Category, DK_Datasheet_Link, DK_Detail_Page, Description, Digi-Key_PN, Family, Status, DNP
+"ANT","1","ANT1,","2450AT14A100E","MySymbols:wifi antenna","https://www.johansontechnology.com/datasheets/2450AT18A100/2450AT18A100.pdf","","https://www.ebay.nl/itm/164779252093","ebay","2450AT18A100E","Johanson Technology Inc.","","","RF/IF and RFID","https://www.johansontechnology.com/datasheets/2450AT18A100/2450AT18A100.pdf","/product-detail/en/johanson-technology-inc/2450AT18A100E/712-1005-1-ND/1560834","RF ANT 2.4GHZ CHIP SOLDER SMD","712-1005-1-ND","RF Antennas","Active",""
+"C","1","C15,","1nF","Capacitor_SMD:C_0402_1005Metric","~","","2320774","farnell","","","","","","","","","","","",""
+"C","3","C6,C7,C32,","10nF","Capacitor_SMD:C_0402_1005Metric","~","","3013347","farnell","","","","","","","","","","","",""
+"C","18","C2,C4,C36,C10,C8,C14,C12,C31,C30,C21,C26,C19,C11,C18,C22,C28,C33,C29,","100nF","Capacitor_SMD:C_0402_1005Metric","~","C100n_0603","2524678","farnell","","","","","","","","","","","",""
+"C","1","C27,","1.5pF","Capacitor_SMD:C_0402_1005Metric","~","","2812055","farnell","","","","","","","","","","","",""
+"C","2","C20,C23,","22pF","Capacitor_SMD:C_0402_1005Metric","~","","2812303","farnell","","","","","","","","","","","",""
+"C","2","C24,C25,","200pF","Capacitor_SMD:C_0402_1005Metric","~","","2812289","farnell","","","","","","","","","","","",""
+"C","4","C16,C17,C34,C35,","220pF","Capacitor_SMD:C_0402_1005Metric","~","","","","","","DNP","","","","","","","","",""
+"C","3","C3,C1,C9,","4u7","Capacitor_SMD:C_0603_1608Metric","~","C04u7_0603","2112745","farnell","","","","","","","","","","","",""
+"C","3","C5,C37,C13,","10uF","Capacitor_SMD:C_0805_2012Metric","~","C010u_0805","2112746","farnell","","","","","","","","","","","",""
+"D","2","D1,D2,","LED","LED_SMD:LED_0805_2012Metric","~","LED_SMD_GREEN_0805_20mA","2290331","farnell","","","","","","","","","","","",""
+"D","1","D4,","PMEG4005","Diode_SMD:D_SOD-323","~","","8738025","farnell","PMEG4005AEA, 115","NEXPERIA","","","","","","","","","",""
+"D","1","D3,","1SS355","Diode_SMD:D_SOD-323","https://assets.nexperia.com/documents/data-sheet/BAS16_SER.pdf","DIODE_BAS316","1525435","farnell","1SS355TE-17","ROHM","","","","","","","","","",""
 "J","1","J9,","Conn_01x01","MySymbols:AntennaTrace","~"
 "J","3","J3,J1,J4,","Conn_01x02","Connector_PinHeader_1.27mm:PinHeader_1x02_P1.27mm_Vertical_small_CrtYd","~"
 "J","1","J2,","USB_B_Micro","MySymbols:USB_Micro_B_Female","~"
-"L","1","L4,","1.8nH","Inductor_SMD:L_0402_1005Metric","~","","1865820","farnell","","","","","","","","","","",""
-"L","2","L2,L1,","560nH","Inductor_SMD:L_0402_1005Metric","~","","3471481","farnell","","","","","","","","","","",""
+"L","1","L4,","1.8nH","Inductor_SMD:L_0402_1005Metric","~","","1865820","farnell","","","","","","","","","","","",""
+"L","2","L2,L1,","560nH","Inductor_SMD:L_0402_1005Metric","~","","3471481","farnell","","","","","","","","","","","",""
 "M","2","M1,M2,","MOUNTINGHOLE3.0","MountingHole:MountingHole_3mm",""
-"Q","1","Q2,","Dual_NMOS_2N7002PS","Package_TO_SOT_SMD:SOT-363_SC-70-6","","2N7002PS","1758102","farnell","","","","","","","","","","",""
-"Q","1","Q1,","Dual_PMOS_BSS84AKS,115","Package_TO_SOT_SMD:SOT-363_SC-70-6","","BSS84AKS,115","1972665","farnell","","","","","","","","","","",""
-"Q","1","Q5,","UMH3N","Package_TO_SOT_SMD:SOT-363_SC-70-6","http://rohmfs.rohm.com/en/products/databook/datasheet/discrete/transistor/digital/emh3t2r-e.pdf","UMH3N","1680404","farnell","","","","","","","","","","",""
-"R","2","R19,R18,","330E","Resistor_SMD:R_0402_1005Metric","~","R330E_0402","2447159","farnell","","","","","","","","","","",""
-"R","2","R6,R5,","470E","Resistor_SMD:R_0402_1005Metric","~","R470E_0402","2447178","farnell","","","","","","","","","","",""
-"R","15","R4,R2,R7,R8,R9,R10,R15,R12,R14,R21,R22,R23,R27,R28,R11,","10K","Resistor_SMD:R_0402_1005Metric","~","R10K_0402","2447096","farnell","","","","","","","","","","",""
-"R","2","R1,R17,","3K3","Resistor_SMD:R_0402_1005Metric","~","R03K3_0402","2447170","farnell","","","","","","","","","","",""
-"R","1","R20,","1M","Resistor_SMD:R_0402_1005Metric","~","","","farnell","","","DNP","","","","","","","",""
-"R","1","R3,","4k7","Resistor_SMD:R_0402_1005Metric","~","R4K7_0402","2073069","farnell","","","","","","","","","","",""
-"SW","1","SW1,","SW_Push","Button_Switch_SMD:SW_SPST_B3U-3000P","~","SW_PUSH_SPST_V_6x6x5,4","1333656","farnell","","","","","","","","","","",""
-"U","1","U10,","CP2109-InterfaceUSB","Package_DFN_QFN:QFN-28-1EP_5x5mm_P0.5mm_EP3.35x3.35mm","","","2930584","farnell","CP2109-A01-GM","Silabs","","","","","","","","",""
-"U","1","U3,","CR95HF-VMD5T","Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.6x3.6mm_ThermalVias","","","2807107","farnell","","ST","","","","","","","","",""
-"U","1","U8,","DRV5055A3xDBZxQ1","Package_TO_SOT_SMD:SOT-23","https://www.ti.com/lit/ds/symlink/drv5055-q1.pdf","","3008999","farnell","DRV5055","TI","","","","","","","","",""
-"U","1","U5,","MAX98357A","Package_DFN_QFN:QFN-16-1EP_3x3mm_P0.5mm_EP1.7x1.7mm_ThermalVias","","","2949165","farnell","MAX98357AETE+T","Maxim IC","","","","","","","","",""
-"U","1","U1,","MCP73831-2-OT","Package_DFN_QFN:DFN-8-1EP_3x2mm_P0.5mm_EP1.75x1.45mm","http://ww1.microchip.com/downloads/en/DeviceDoc/20001984g.pdf","","2709764","farnell","","Microchip","","","","","","","","",""
-"U","1","U4,","RF_Module_ESP32-PICO-D4","Package_DFN_QFN:QFN-48-1EP_7x7mm_P0.5mm_EP5.3x5.3mm","","","","","","Espressive","","","","","","","","",""
-"U","1","U6,","W25Q256","Package_SO:SOIC-8_5.23x5.23mm_P1.27mm","http://www.winbond.com/resource-files/w25q32jv%20revg%2003272018%20plus.pdf"
-"U","1","U2,","XCL214B333DR","Package_DFN_QFN:USP-9B01","https://www.torexsemi.com/file/xcl214/XCL213-XCL214.pdf","","3535992","farnell","","Torex","","","","","","","","",""
-"Y","1","Y1,","27,12Mhz","Crystal:Crystal_SMD_EuroQuartz_X22-4Pin_2.5x2.0mm","~","","2853901","farnell","MCSJK-7E-27.12-10-30-60-B-30","mComp pro","","NX2016SA","","","","","","",""
+"Q","1","Q2,","Dual_NMOS_2N7002PS","Package_TO_SOT_SMD:SOT-363_SC-70-6","","2N7002PS","1758102","farnell","","","","","","","","","","","",""
+"Q","1","Q1,","Dual_PMOS_BSS84AKS,115","Package_TO_SOT_SMD:SOT-363_SC-70-6","","BSS84AKS,115","1972665","farnell","","","","","","","","","","","",""
+"Q","1","Q5,","UMH3N","Package_TO_SOT_SMD:SOT-363_SC-70-6","http://rohmfs.rohm.com/en/products/databook/datasheet/discrete/transistor/digital/emh3t2r-e.pdf","UMH3N","1680404","farnell","","","","","","","","","","","",""
+"R","2","R6,R5,","470E","Resistor_SMD:R_0402_1005Metric","~","R470E_0402","2447178","farnell","","","","","","","","","","","",""
+"R","1","R17,","1K","Resistor_SMD:R_0402_1005Metric","~","R03K3_0402","2447170","farnell","","","","","","","","","","","",""
+"R","16","R4,R2,R7,R8,R9,R10,R12,R14,R21,R22,R23,R13,R16,R27,R28,R11,","10K","Resistor_SMD:R_0402_1005Metric","~","R10K_0402","2447096","farnell","","","","","","","","","","","",""
+"R","1","R15,","1K6","Resistor_SMD:R_0402_1005Metric","~","R10K_0402","2447096","farnell","","","","","","","","","","","",""
+"R","1","R1,","3K3","Resistor_SMD:R_0402_1005Metric","~","R03K3_0402","2447170","farnell","","","","","","","","","","","",""
+"R","1","R3,","4k7","Resistor_SMD:R_0402_1005Metric","~","R4K7_0402","2073069","farnell","","","","","","","","","","","",""
+"SW","1","SW1,","SW_Push","Button_Switch_SMD:SW_SPST_B3U-3000P-B","~","SW_PUSH_SPST_V_6x6x5,4","1333656","farnell","","","","","","","","","","","",""
+"TP","1","TP1,","TestPoint","TestPoint:TestPoint_Pad_D1.0mm","~"
+"U","1","U6,","ADS1114IDGS","Package_SO:TSSOP-10_3x3mm_P0.5mm","http://www.ti.com/lit/ds/symlink/ads1113.pdf"
+"U","1","U10,","CP2109-InterfaceUSB","Package_DFN_QFN:QFN-28-1EP_5x5mm_P0.5mm_EP3.35x3.35mm","","","2930584","farnell","CP2109-A01-GM","Silabs","","","","","","","","","",""
+"U","1","U8,","DRV5055A3xDBZxQ1","Package_TO_SOT_SMD:SOT-23","https://www.ti.com/lit/ds/symlink/drv5055-q1.pdf","","3008999","farnell","DRV5055","TI","","","","","","","","","",""
+"U","1","U5,","MAX98357A","Package_DFN_QFN:QFN-16-1EP_3x3mm_P0.5mm_EP1.7x1.7mm_ThermalVias","","","2949165","farnell","MAX98357AETE+T","Maxim IC","","","","","","","","","",""
+"U","1","U1,","MCP73831-2-OT","Package_DFN_QFN:DFN-8-1EP_3x2mm_P0.5mm_EP1.75x1.45mm","http://ww1.microchip.com/downloads/en/DeviceDoc/20001984g.pdf","","2709764","farnell","","Microchip","","","","","","","","","",""
+"U","1","U3,","PN5321A3HN_C1xx","Package_DFN_QFN:QFN-40-1EP_6x6mm_P0.5mm_EP4.6x4.6mm_ThermalVias","https://www.nxp.com/docs/en/nxp/data-sheets/PN532_C1.pdf"
+"U","1","U4,","RF_Module_ESP32-PICO-D4","Package_DFN_QFN:QFN-48-1EP_7x7mm_P0.5mm_EP5.3x5.3mm","","","","","","Espressive","","","","","","","","","",""
+"U","1","U2,","XCL214B333DR","Package_DFN_QFN:USP-9B01","https://www.torexsemi.com/file/xcl214/XCL213-XCL214.pdf","","3535992","farnell","","Torex","","","","","","","","","",""
+"Y","1","Y1,","27,12Mhz","Crystal:Crystal_SMD_EuroQuartz_X22-4Pin_2.5x2.0mm","~","","2853901","farnell","MCSJK-7E-27.12-10-30-60-B-30","mComp pro","","NX2016SA","","","","","","","",""
@@ -1,4 +1,4 @@
-update=2021 September 22, Wednesday 12:07:19
+update=2021 October 28, Thursday 20:11:28
 version=1
 last_client=kicad
 [general]
@@ -12,6 +12,16 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
+[schematic_editor]
+version=1
+PageLayoutDescrFile=empty.kicad_wks
+PlotDirectoryName=
+SubpartIdSeparator=0
+SubpartFirstId=65
+NetFmtName=Pcbnew
+SpiceAjustPassiveValues=0
+LabSize=50
+ERC_TestSimilarLabels=1
 [pcbnew]
 version=1
 PageLayoutDescrFile=
@@ -31,6 +41,7 @@ MinHoleToHole=0.1524
 TrackWidth1=0.1524
 TrackWidth2=0.1524
 TrackWidth3=0.2032
+TrackWidth4=0.254
 ViaDiameter1=0.5
 ViaDrill1=0.3
 ViaDiameter2=0.5
@@ -240,13 +251,3 @@ uViaDrill=0.1
 dPairWidth=0.2
 dPairGap=0.25
 dPairViaGap=0.25
-[schematic_editor]
-version=1
-PageLayoutDescrFile=empty.kicad_wks
-PlotDirectoryName=
-SubpartIdSeparator=0
-SubpartFirstId=65
-NetFmtName=Pcbnew
-SpiceAjustPassiveValues=0
-LabSize=50
-ERC_TestSimilarLabels=1
@@ -20,10 +20,8 @@ F0 "Power" 50
 F1 "Power.sch" 50
 F2 "BTN_PWR" O R 3450 1700 50 
 F3 "PW_HOLD" I R 3450 1800 50 
-F4 "MEAS_VBATT" O R 3450 2100 50 
-F5 "MEAS_EN" I R 3450 2200 50 
-F6 "USB_D+" I L 2000 2250 50 
-F7 "USB_D-" I L 2000 2350 50 
+F4 "USB_D+" I L 2000 2250 50 
+F5 "USB_D-" I L 2000 2350 50 
 $EndSheet
 $Sheet
 S 8150 3750 1450 1900
@@ -35,6 +33,7 @@ F3 "SPI_SCK" I L 8150 4400 50
 F4 "NFC_SPI_CS" I L 8150 4600 50 
 F5 "SPI_MISO" I L 8150 4500 50 
 F6 "~NFC_RST" I L 8150 4850 50 
+F7 "NFC_INT0" O L 8150 4700 50 
 $EndSheet
 $Sheet
 S 4800 1400 2450 4300
@@ -44,20 +43,22 @@ F1 "CPU.sch" 50
 F2 "DAC_LRCK" O R 7250 1800 50 
 F3 "DAC_BCLK" O R 7250 1700 50 
 F4 "DAC_DATA" O R 7250 1900 50 
-F5 "ADC1_IN2" I L 4800 2100 50 
-F6 "BTN_PWR" I L 4800 1700 50 
-F7 "MEAS_EN" O L 4800 2200 50 
-F8 "PW_HOLD" O L 4800 1800 50 
-F9 "NFC_SPI_CS" O R 7250 4600 50 
-F10 "NFC_SPI_SCK" O R 7250 4400 50 
-F11 "NFC_SPI_MOSI" O R 7250 4300 50 
-F12 "~DAC_SDMODE" O R 7250 2250 50 
-F13 "ESP_TX" O L 4800 4250 50 
-F14 "ESP_RX" O L 4800 4150 50 
-F15 "ESP_GPIO0" I L 4800 4450 50 
-F16 "ESP_RST" I L 4800 4350 50 
-F17 "NFC_SPI_MISO" I R 7250 4500 50 
-F18 "~NFC_RST" O R 7250 4850 50 
+F5 "BTN_PWR" I L 4800 1700 50 
+F6 "MEAS_EN" O L 4800 5350 50 
+F7 "PW_HOLD" O L 4800 1800 50 
+F8 "NFC_SPI_CS" O R 7250 4600 50 
+F9 "NFC_SPI_SCK" O R 7250 4400 50 
+F10 "NFC_SPI_MOSI" O R 7250 4300 50 
+F11 "~DAC_SDMODE" O R 7250 2250 50 
+F12 "ESP_GPIO0" I L 4800 4450 50 
+F13 "ESP_RST" I L 4800 4350 50 
+F14 "NFC_SPI_MISO" I R 7250 4500 50 
+F15 "~NFC_RST" O R 7250 4850 50 
+F16 "USB_D+" I L 4800 4250 50 
+F17 "USB_D-" I L 4800 4150 50 
+F18 "NFC_INT" I R 7250 4700 50 
+F19 "I2C_SDA" B L 4800 4950 50 
+F20 "I2C_SCL" O L 4800 5050 50 
 $EndSheet
 $Sheet
 S 8150 1400 1450 1700
@@ -89,10 +90,6 @@ Wire Wire Line
 	3450 1700 4800 1700
 Wire Wire Line
 	3450 1800 4800 1800
-Wire Wire Line
-	3450 2100 4800 2100
-Wire Wire Line
-	4800 2200 3450 2200
 Wire Wire Line
 	7250 2250 8150 2250
 $Comp
@@ -132,70 +129,36 @@ F 3 "" H 8400 6550 50  0001 C CNN
 	1    8400 6550
 	1    0    0    -1  
 $EndComp
-$Sheet
-S 2000 3750 1450 1900
-U 613CB1D0
-F0 "programmer" 50
-F1 "programmer.sch" 50
-F2 "PROG_TX" O R 3450 4150 50 
-F3 "PROG_RX" I R 3450 4250 50 
-F4 "PROG_RST" O R 3450 4350 50 
-F5 "PROG_EN" O R 3450 4450 50 
-F6 "PROG_VCC" O R 3450 4050 50 
-F7 "USB_D+" I L 2000 4350 50 
-F8 "USB_D-" I L 2000 4250 50 
-F9 "USB_PWR" I L 2000 4500 50 
-$EndSheet
-$Comp
-L power:+3.3V #PWR0140
-U 1 1 61491319
-P 3800 3750
-F 0 "#PWR0140" H 3800 3600 50  0001 C CNN
-F 1 "+3.3V" H 3815 3923 50  0000 C CNN
-F 2 "" H 3800 3750 50  0001 C CNN
-F 3 "" H 3800 3750 50  0001 C CNN
-	1    3800 3750
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3450 4050 3800 4050
-Wire Wire Line
-	3450 4150 4800 4150
-Wire Wire Line
-	3450 4250 4800 4250
-Wire Wire Line
-	3450 4350 4800 4350
-Wire Wire Line
-	3450 4450 4800 4450
 Wire Wire Line
 	2000 2350 1750 2350
 Wire Wire Line
-	1750 2350 1750 4250
-Wire Wire Line
-	1750 4250 2000 4250
-Wire Wire Line
-	2000 4350 1650 4350
-Wire Wire Line
-	1650 4350 1650 2250
+	1750 2350 1750 4150
 Wire Wire Line
 	1650 2250 2000 2250
-$Comp
-L power:VBUS #PWR0115
-U 1 1 61646C76
-P 1400 4350
-F 0 "#PWR0115" H 1400 4200 50  0001 C CNN
-F 1 "VBUS" H 1415 4523 50  0000 C CNN
-F 2 "" H 1400 4350 50  0001 C CNN
-F 3 "" H 1400 4350 50  0001 C CNN
-	1    1400 4350
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	1400 4350 1400 4500
-Wire Wire Line
-	1400 4500 2000 4500
-Wire Wire Line
-	3800 3750 3800 4050
 Wire Wire Line
 	8150 4850 7250 4850
+Wire Wire Line
+	1750 4150 4800 4150
+Wire Wire Line
+	1650 4250 4800 4250
+Wire Wire Line
+	1650 4250 1650 2250
+Wire Wire Line
+	7250 4700 8150 4700
+$Sheet
+S 2000 4550 1450 1150
+U 61B5E734
+F0 "sensors" 50
+F1 "sensors.sch" 50
+F2 "I2C_SDA" B R 3450 4950 50 
+F3 "I2C_SCL" I R 3450 5050 50 
+F4 "ADS_RDY" I R 3450 5150 50 
+F5 "MEAS_EN" I R 3450 5350 50 
+$EndSheet
+Wire Wire Line
+	4800 4950 3450 4950
+Wire Wire Line
+	3450 5050 4800 5050
+Wire Wire Line
+	3450 5350 4800 5350
 $EndSCHEMATC
@@ -20,10 +20,8 @@ F0 "Power" 50
 F1 "Power.sch" 50
 F2 "BTN_PWR" O R 3450 1700 50 
 F3 "PW_HOLD" I R 3450 1800 50 
-F4 "MEAS_VBATT" O R 3450 2100 50 
-F5 "MEAS_EN" I R 3450 2200 50 
-F6 "USB_D+" I L 2000 2250 50 
-F7 "USB_D-" I L 2000 2350 50 
+F4 "USB_D+" I L 2000 2250 50 
+F5 "USB_D-" I L 2000 2350 50 
 $EndSheet
 $Sheet
 S 8150 3750 1450 1900
@@ -34,7 +32,8 @@ F2 "SPI_MOSI" I L 8150 4300 50
 F3 "SPI_SCK" I L 8150 4400 50 
 F4 "NFC_SPI_CS" I L 8150 4600 50 
 F5 "SPI_MISO" I L 8150 4500 50 
-F6 "NFC_RST" I L 8150 4850 50 
+F6 "~NFC_RST" I L 8150 4850 50 
+F7 "NFC_INT0" O L 8150 4700 50 
 $EndSheet
 $Sheet
 S 4800 1400 2450 4300
@@ -44,20 +43,22 @@ F1 "CPU.sch" 50
 F2 "DAC_LRCK" O R 7250 1800 50 
 F3 "DAC_BCLK" O R 7250 1700 50 
 F4 "DAC_DATA" O R 7250 1900 50 
-F5 "ADC1_IN2" I L 4800 2100 50 
-F6 "BTN_PWR" I L 4800 1700 50 
-F7 "MEAS_EN" O L 4800 2200 50 
-F8 "PW_HOLD" O L 4800 1800 50 
-F9 "NFC_SPI_CS" O R 7250 4600 50 
-F10 "NFC_SPI_SCK" O R 7250 4400 50 
-F11 "NFC_SPI_MOSI" O R 7250 4300 50 
-F12 "~DAC_SDMODE" O R 7250 2250 50 
-F13 "ESP_TX" O L 4800 4250 50 
-F14 "ESP_RX" O L 4800 4150 50 
-F15 "ESP_GPIO0" I L 4800 4450 50 
-F16 "ESP_RST" I L 4800 4350 50 
-F17 "NFC_SPI_MISO" I R 7250 4500 50 
-F18 "~NFC_RST" O R 7250 4850 50 
+F5 "BTN_PWR" I L 4800 1700 50 
+F6 "MEAS_EN" O L 4800 5350 50 
+F7 "PW_HOLD" O L 4800 1800 50 
+F8 "NFC_SPI_CS" O R 7250 4600 50 
+F9 "NFC_SPI_SCK" O R 7250 4400 50 
+F10 "NFC_SPI_MOSI" O R 7250 4300 50 
+F11 "~DAC_SDMODE" O R 7250 2250 50 
+F12 "ESP_GPIO0" I L 4800 4450 50 
+F13 "ESP_RST" I L 4800 4350 50 
+F14 "NFC_SPI_MISO" I R 7250 4500 50 
+F15 "~NFC_RST" O R 7250 4850 50 
+F16 "USB_D+" I L 4800 4250 50 
+F17 "USB_D-" I L 4800 4150 50 
+F18 "NFC_INT" I R 7250 4700 50 
+F19 "I2C_SDA" B L 4800 4950 50 
+F20 "I2C_SCL" O L 4800 5050 50 
 $EndSheet
 $Sheet
 S 8150 1400 1450 1700
@@ -89,10 +90,6 @@ Wire Wire Line
 	3450 1700 4800 1700
 Wire Wire Line
 	3450 1800 4800 1800
-Wire Wire Line
-	3450 2100 4800 2100
-Wire Wire Line
-	4800 2200 3450 2200
 Wire Wire Line
 	7250 2250 8150 2250
 $Comp
@@ -132,70 +129,36 @@ F 3 "" H 8400 6550 50  0001 C CNN
 	1    8400 6550
 	1    0    0    -1  
 $EndComp
-$Sheet
-S 2000 3750 1450 1900
-U 613CB1D0
-F0 "programmer" 50
-F1 "programmer.sch" 50
-F2 "PROG_TX" O R 3450 4150 50 
-F3 "PROG_RX" I R 3450 4250 50 
-F4 "PROG_RST" O R 3450 4350 50 
-F5 "PROG_EN" O R 3450 4450 50 
-F6 "PROG_VCC" O R 3450 4050 50 
-F7 "USB_D+" I L 2000 4350 50 
-F8 "USB_D-" I L 2000 4250 50 
-F9 "USB_PWR" I L 2000 4500 50 
-$EndSheet
-$Comp
-L power:+3.3V #PWR0140
-U 1 1 61491319
-P 3800 3750
-F 0 "#PWR0140" H 3800 3600 50  0001 C CNN
-F 1 "+3.3V" H 3815 3923 50  0000 C CNN
-F 2 "" H 3800 3750 50  0001 C CNN
-F 3 "" H 3800 3750 50  0001 C CNN
-	1    3800 3750
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3450 4050 3800 4050
-Wire Wire Line
-	3450 4150 4800 4150
-Wire Wire Line
-	3450 4250 4800 4250
-Wire Wire Line
-	3450 4350 4800 4350
-Wire Wire Line
-	3450 4450 4800 4450
 Wire Wire Line
 	2000 2350 1750 2350
 Wire Wire Line
-	1750 2350 1750 4250
-Wire Wire Line
-	1750 4250 2000 4250
-Wire Wire Line
-	2000 4350 1650 4350
-Wire Wire Line
-	1650 4350 1650 2250
+	1750 2350 1750 4150
 Wire Wire Line
 	1650 2250 2000 2250
-$Comp
-L power:VBUS #PWR0115
-U 1 1 61646C76
-P 1400 4350
-F 0 "#PWR0115" H 1400 4200 50  0001 C CNN
-F 1 "VBUS" H 1415 4523 50  0000 C CNN
-F 2 "" H 1400 4350 50  0001 C CNN
-F 3 "" H 1400 4350 50  0001 C CNN
-	1    1400 4350
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	1400 4350 1400 4500
-Wire Wire Line
-	1400 4500 2000 4500
-Wire Wire Line
-	3800 3750 3800 4050
 Wire Wire Line
 	8150 4850 7250 4850
+Wire Wire Line
+	1750 4150 4800 4150
+Wire Wire Line
+	1650 4250 4800 4250
+Wire Wire Line
+	1650 4250 1650 2250
+Wire Wire Line
+	7250 4700 8150 4700
+$Sheet
+S 2000 4550 1450 1150
+U 61B5E734
+F0 "sensors" 50
+F1 "sensors.sch" 50
+F2 "I2C_SDA" B R 3450 4950 50 
+F3 "I2C_SCL" I R 3450 5050 50 
+F4 "ADS_RDY" I R 3450 5150 50 
+F5 "MEAS_EN" I R 3450 5350 50 
+$EndSheet
+Wire Wire Line
+	4800 4950 3450 4950
+Wire Wire Line
+	3450 5050 4800 5050
+Wire Wire Line
+	3450 5350 4800 5350
 $EndSCHEMATC
@@ -208,7 +208,7 @@ U 1 1 614DFE71
 P 5750 2050
 F 0 "C13" H 5868 2096 50  0000 L CNN
 F 1 "10uF" H 5868 2005 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 5788 1900 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5788 1900 50  0001 C CNN
 F 3 "~" H 5750 2050 50  0001 C CNN
 F 4 "3013381" H 5750 2050 50  0001 C CNN "ordercode"
 F 5 "farnell" H 5750 2050 50  0001 C CNN "supplier"
@@ -381,7 +381,7 @@ Text HLabel 3700 3450 0    50   Input ~ 0
 SPI_MOSI
 Text HLabel 3700 3650 0    50   Input ~ 0
 SPI_SCK
-Text HLabel 3700 3550 0    50   Input ~ 0
+Text HLabel 3700 3550 0    50   Output ~ 0
 SPI_MISO
 Text HLabel 3700 3350 0    50   Input ~ 0
 NFC_SPI_CS
@@ -441,17 +441,6 @@ F 5 "farnell" H 5900 2900 50  0001 C CNN "supplier"
 $EndComp
 Connection ~ 4700 5350
 $Comp
-L RF_NFC:PN5321A3HN_C1xx U3
-U 1 1 617AC9C8
-P 4700 3850
-F 0 "U3" H 5150 5100 50  0000 C CNN
-F 1 "PN5321A3HN_C1xx" H 5400 2550 50  0000 C CNN
-F 2 "Package_DFN_QFN:QFN-40-1EP_6x6mm_P0.5mm_EP4.6x4.6mm_ThermalVias" H 6200 2600 50  0001 C CNN
-F 3 "https://www.nxp.com/docs/en/nxp/data-sheets/PN532_C1.pdf" H 4700 4050 50  0001 C CNN
-	1    4700 3850
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:R R15
 U 1 1 614DFEB7
 P 6550 3650
@@ -504,7 +493,7 @@ Wire Wire Line
 Wire Wire Line
 	1850 7300 1850 7400
 Text Notes 800  7350 0    50   ~ 0
-SEL0  0     0       1\nSEL1  0     1       0\n      UA.  SPI.     I2C
+SEL0  0     0*       1\nSEL1  0     1*       0\n      UA.  SPI.     I2C
 Wire Wire Line
 	3700 3650 3900 3650
 Wire Wire Line
@@ -604,7 +593,6 @@ NoConn ~ 5500 4550
 NoConn ~ 5500 4650
 NoConn ~ 3900 3850
 NoConn ~ 3900 3950
-NoConn ~ 3900 4050
 NoConn ~ 3900 4150
 NoConn ~ 3900 4250
 Wire Wire Line
@@ -811,7 +799,6 @@ $EndComp
 Wire Wire Line
 	2750 2350 2750 2450
 NoConn ~ 3900 3050
-NoConn ~ 3900 3150
 Text Label 3150 2950 0    50   ~ 0
 NFC_RST
 Text Label 3200 4450 0    50   ~ 0
@@ -853,4 +840,20 @@ Text HLabel 2600 2950 0    50   Input ~ 0
 Wire Wire Line
 	2600 2950 2750 2950
 Connection ~ 2750 2950
+Text HLabel 3700 3150 0    50   Output ~ 0
+NFC_INT0
+$Comp
+L RF_NFC:PN5321A3HN_C1xx U3
+U 1 1 617AC9C8
+P 4700 3850
+F 0 "U3" H 5150 5100 50  0000 C CNN
+F 1 "PN5321A3HN_C1xx" H 5400 2550 50  0000 C CNN
+F 2 "Package_DFN_QFN:QFN-40-1EP_6x6mm_P0.5mm_EP4.6x4.6mm_ThermalVias" H 6200 2600 50  0001 C CNN
+F 3 "https://www.nxp.com/docs/en/nxp/data-sheets/PN532_C1.pdf" H 4700 4050 50  0001 C CNN
+	1    4700 3850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3900 3150 3700 3150
+NoConn ~ 3900 4050
 $EndSCHEMATC
@@ -208,7 +208,7 @@ U 1 1 614DFE71
 P 5750 2050
 F 0 "C13" H 5868 2096 50  0000 L CNN
 F 1 "10uF" H 5868 2005 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 5788 1900 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5788 1900 50  0001 C CNN
 F 3 "~" H 5750 2050 50  0001 C CNN
 F 4 "3013381" H 5750 2050 50  0001 C CNN "ordercode"
 F 5 "farnell" H 5750 2050 50  0001 C CNN "supplier"
@@ -381,7 +381,7 @@ Text HLabel 3700 3450 0    50   Input ~ 0
 SPI_MOSI
 Text HLabel 3700 3650 0    50   Input ~ 0
 SPI_SCK
-Text HLabel 3700 3550 0    50   Input ~ 0
+Text HLabel 3700 3550 0    50   Output ~ 0
 SPI_MISO
 Text HLabel 3700 3350 0    50   Input ~ 0
 NFC_SPI_CS
@@ -441,17 +441,6 @@ F 5 "farnell" H 5900 2900 50  0001 C CNN "supplier"
 $EndComp
 Connection ~ 4700 5350
 $Comp
-L RF_NFC:PN5321A3HN_C1xx U3
-U 1 1 617AC9C8
-P 4700 3850
-F 0 "U3" H 5150 5100 50  0000 C CNN
-F 1 "PN5321A3HN_C1xx" H 5400 2550 50  0000 C CNN
-F 2 "Package_DFN_QFN:QFN-40-1EP_6x6mm_P0.5mm_EP4.6x4.6mm_ThermalVias" H 6200 2600 50  0001 C CNN
-F 3 "https://www.nxp.com/docs/en/nxp/data-sheets/PN532_C1.pdf" H 4700 4050 50  0001 C CNN
-	1    4700 3850
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:R R15
 U 1 1 614DFEB7
 P 6550 3650
@@ -504,7 +493,7 @@ Wire Wire Line
 Wire Wire Line
 	1850 7300 1850 7400
 Text Notes 800  7350 0    50   ~ 0
-SEL0  0     0       1\nSEL1  0     1       0\n      UA.  SPI.     I2C
+SEL0  0     0*       1\nSEL1  0     1*       0\n      UA.  SPI.     I2C
 Wire Wire Line
 	3700 3650 3900 3650
 Wire Wire Line
@@ -604,7 +593,6 @@ NoConn ~ 5500 4550
 NoConn ~ 5500 4650
 NoConn ~ 3900 3850
 NoConn ~ 3900 3950
-NoConn ~ 3900 4050
 NoConn ~ 3900 4150
 NoConn ~ 3900 4250
 Wire Wire Line
@@ -811,7 +799,6 @@ $EndComp
 Wire Wire Line
 	2750 2350 2750 2450
 NoConn ~ 3900 3050
-NoConn ~ 3900 3150
 Text Label 3150 2950 0    50   ~ 0
 NFC_RST
 Text Label 3200 4450 0    50   ~ 0
@@ -853,4 +840,20 @@ Text HLabel 2600 2950 0    50   Input ~ 0
 Wire Wire Line
 	2600 2950 2750 2950
 Connection ~ 2750 2950
+Text HLabel 3700 3150 0    50   Output ~ 0
+NFC_INT0
+$Comp
+L RF_NFC:PN5321A3HN_C1xx U3
+U 1 1 617AC9C8
+P 4700 3850
+F 0 "U3" H 5150 5100 50  0000 C CNN
+F 1 "PN5321A3HN_C1xx" H 5400 2550 50  0000 C CNN
+F 2 "Package_DFN_QFN:QFN-40-1EP_6x6mm_P0.5mm_EP4.6x4.6mm_ThermalVias" H 6200 2600 50  0001 C CNN
+F 3 "https://www.nxp.com/docs/en/nxp/data-sheets/PN532_C1.pdf" H 4700 4050 50  0001 C CNN
+	1    4700 3850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3900 3150 3700 3150
+NoConn ~ 3900 4050
 $EndSCHEMATC
@@ -0,0 +1,70 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(5.1.9-0-10_14)*%
+%TF.CreationDate,2021-10-29T13:13:03+02:00*%
+%TF.ProjectId,Leo_muziekdoos,4c656f5f-6d75-47a6-9965-6b646f6f732e,rev?*%
+%TF.SameCoordinates,Original*%
+%TF.FileFunction,Soldermask,Bot*%
+%TF.FilePolarity,Negative*%
+%FSLAX46Y46*%
+G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
+G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-10-29 13:13:03*
+%MOMM*%
+%LPD*%
+G01*
+G04 APERTURE LIST*
+%ADD10C,0.800000*%
+%ADD11C,1.000000*%
+%ADD12O,1.000000X1.000000*%
+%ADD13R,1.000000X1.000000*%
+%ADD14C,3.000000*%
+%ADD15R,1.800000X2.000000*%
+%ADD16O,2.150000X1.300000*%
+%ADD17C,0.550000*%
+G04 APERTURE END LIST*
+D10*
+%TO.C,SW1*%
+X55890000Y-65836800D03*
+%TD*%
+D11*
+%TO.C,TP1*%
+X79629000Y-72796400D03*
+%TD*%
+D12*
+%TO.C,J3*%
+X77762100Y-66548000D03*
+D13*
+X79032100Y-66548000D03*
+%TD*%
+D12*
+%TO.C,J1*%
+X73952100Y-89928700D03*
+D13*
+X73952100Y-88658700D03*
+%TD*%
+D14*
+%TO.C,M2*%
+X82397600Y-88696800D03*
+%TD*%
+D12*
+%TO.C,J4*%
+X52311300Y-65074800D03*
+D13*
+X52311300Y-66344800D03*
+%TD*%
+D15*
+%TO.C,J2*%
+X78704200Y-84495800D03*
+D16*
+X81864200Y-84295800D03*
+D15*
+X78704200Y-76895800D03*
+D16*
+X81864200Y-77095800D03*
+D17*
+X79714200Y-82695800D03*
+X79714200Y-78695800D03*
+%TD*%
+D14*
+%TO.C,M1*%
+X69450000Y-65370000D03*
+%TD*%
+M02*
@@ -0,0 +1,15 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(5.1.9-0-10_14)*%
+%TF.CreationDate,2021-10-29T13:13:03+02:00*%
+%TF.ProjectId,Leo_muziekdoos,4c656f5f-6d75-47a6-9965-6b646f6f732e,rev?*%
+%TF.SameCoordinates,Original*%
+%TF.FileFunction,Paste,Bot*%
+%TF.FilePolarity,Positive*%
+%FSLAX46Y46*%
+G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
+G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-10-29 13:13:03*
+%MOMM*%
+%LPD*%
+G01*
+G04 APERTURE LIST*
+G04 APERTURE END LIST*
+M02*
@@ -0,0 +1,526 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(5.1.9-0-10_14)*%
+%TF.CreationDate,2021-10-29T13:13:03+02:00*%
+%TF.ProjectId,Leo_muziekdoos,4c656f5f-6d75-47a6-9965-6b646f6f732e,rev?*%
+%TF.SameCoordinates,Original*%
+%TF.FileFunction,Legend,Bot*%
+%TF.FilePolarity,Positive*%
+%FSLAX46Y46*%
+G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
+G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-10-29 13:13:03*
+%MOMM*%
+%LPD*%
+G01*
+G04 APERTURE LIST*
+%ADD10C,0.127000*%
+%ADD11C,0.101600*%
+%ADD12C,0.120000*%
+%ADD13C,0.150000*%
+%ADD14C,0.800000*%
+%ADD15C,1.000000*%
+%ADD16O,1.000000X1.000000*%
+%ADD17R,1.000000X1.000000*%
+%ADD18C,3.000000*%
+%ADD19R,1.800000X2.000000*%
+%ADD20O,2.150000X1.300000*%
+%ADD21C,0.550000*%
+G04 APERTURE END LIST*
+D10*
+X75869195Y-87546542D02*
+X75778480Y-87576780D01*
+X75748242Y-87607019D01*
+X75718004Y-87667495D01*
+X75718004Y-87758209D01*
+X75748242Y-87818685D01*
+X75778480Y-87848923D01*
+X75838957Y-87879161D01*
+X76080861Y-87879161D01*
+X76080861Y-87244161D01*
+X75869195Y-87244161D01*
+X75808719Y-87274400D01*
+X75778480Y-87304638D01*
+X75748242Y-87365114D01*
+X75748242Y-87425590D01*
+X75778480Y-87486066D01*
+X75808719Y-87516304D01*
+X75869195Y-87546542D01*
+X76080861Y-87546542D01*
+X75476100Y-87697733D02*
+X75173719Y-87697733D01*
+X75536576Y-87879161D02*
+X75324909Y-87244161D01*
+X75113242Y-87879161D01*
+X74992290Y-87244161D02*
+X74629433Y-87244161D01*
+X74810861Y-87879161D02*
+X74810861Y-87244161D01*
+X74508480Y-87244161D02*
+X74145623Y-87244161D01*
+X74327052Y-87879161D02*
+X74327052Y-87244161D01*
+X75400504Y-88716757D02*
+X74916695Y-88716757D01*
+X75158600Y-88958661D02*
+X75158600Y-88474852D01*
+X75400504Y-89796257D02*
+X74916695Y-89796257D01*
+D11*
+X61658531Y-71570971D02*
+X61549674Y-71607257D01*
+X61513388Y-71643542D01*
+X61477102Y-71716114D01*
+X61477102Y-71824971D01*
+X61513388Y-71897542D01*
+X61549674Y-71933828D01*
+X61622245Y-71970114D01*
+X61912531Y-71970114D01*
+X61912531Y-71208114D01*
+X61658531Y-71208114D01*
+X61585960Y-71244400D01*
+X61549674Y-71280685D01*
+X61513388Y-71353257D01*
+X61513388Y-71425828D01*
+X61549674Y-71498400D01*
+X61585960Y-71534685D01*
+X61658531Y-71570971D01*
+X61912531Y-71570971D01*
+X61041674Y-71970114D02*
+X61114245Y-71933828D01*
+X61150531Y-71861257D01*
+X61150531Y-71208114D01*
+X60751388Y-71970114D02*
+X60751388Y-71462114D01*
+X60751388Y-71208114D02*
+X60787674Y-71244400D01*
+X60751388Y-71280685D01*
+X60715102Y-71244400D01*
+X60751388Y-71208114D01*
+X60751388Y-71280685D01*
+X60388531Y-71970114D02*
+X60388531Y-71208114D01*
+X60315960Y-71679828D02*
+X60098245Y-71970114D01*
+X60098245Y-71462114D02*
+X60388531Y-71752400D01*
+X59771674Y-71679828D02*
+X59191102Y-71679828D01*
+X58828245Y-71970114D02*
+X58828245Y-71462114D01*
+X58828245Y-71208114D02*
+X58864531Y-71244400D01*
+X58828245Y-71280685D01*
+X58791960Y-71244400D01*
+X58828245Y-71208114D01*
+X58828245Y-71280685D01*
+X58574245Y-71462114D02*
+X58283960Y-71462114D01*
+X58465388Y-71208114D02*
+X58465388Y-71861257D01*
+X58429102Y-71933828D01*
+X58356531Y-71970114D01*
+X58283960Y-71970114D01*
+X61912531Y-73214714D02*
+X61912531Y-72452714D01*
+X61658531Y-72997000D01*
+X61404531Y-72452714D01*
+X61404531Y-73214714D01*
+X60715102Y-72706714D02*
+X60715102Y-73214714D01*
+X61041674Y-72706714D02*
+X61041674Y-73105857D01*
+X61005388Y-73178428D01*
+X60932817Y-73214714D01*
+X60823959Y-73214714D01*
+X60751388Y-73178428D01*
+X60715102Y-73142142D01*
+X60424817Y-72706714D02*
+X60025674Y-72706714D01*
+X60424817Y-73214714D01*
+X60025674Y-73214714D01*
+X59735388Y-73214714D02*
+X59735388Y-72706714D01*
+X59735388Y-72452714D02*
+X59771674Y-72489000D01*
+X59735388Y-72525285D01*
+X59699102Y-72489000D01*
+X59735388Y-72452714D01*
+X59735388Y-72525285D01*
+X59082245Y-73178428D02*
+X59154817Y-73214714D01*
+X59299960Y-73214714D01*
+X59372531Y-73178428D01*
+X59408817Y-73105857D01*
+X59408817Y-72815571D01*
+X59372531Y-72743000D01*
+X59299960Y-72706714D01*
+X59154817Y-72706714D01*
+X59082245Y-72743000D01*
+X59045960Y-72815571D01*
+X59045960Y-72888142D01*
+X59408817Y-72960714D01*
+X58719388Y-73214714D02*
+X58719388Y-72452714D01*
+X58646817Y-72924428D02*
+X58429102Y-73214714D01*
+X58429102Y-72706714D02*
+X58719388Y-72997000D01*
+X57775960Y-73214714D02*
+X57775960Y-72452714D01*
+X57775960Y-73178428D02*
+X57848531Y-73214714D01*
+X57993674Y-73214714D01*
+X58066245Y-73178428D01*
+X58102531Y-73142142D01*
+X58138817Y-73069571D01*
+X58138817Y-72851857D01*
+X58102531Y-72779285D01*
+X58066245Y-72743000D01*
+X57993674Y-72706714D01*
+X57848531Y-72706714D01*
+X57775960Y-72743000D01*
+X57304245Y-73214714D02*
+X57376817Y-73178428D01*
+X57413102Y-73142142D01*
+X57449388Y-73069571D01*
+X57449388Y-72851857D01*
+X57413102Y-72779285D01*
+X57376817Y-72743000D01*
+X57304245Y-72706714D01*
+X57195388Y-72706714D01*
+X57122817Y-72743000D01*
+X57086531Y-72779285D01*
+X57050245Y-72851857D01*
+X57050245Y-73069571D01*
+X57086531Y-73142142D01*
+X57122817Y-73178428D01*
+X57195388Y-73214714D01*
+X57304245Y-73214714D01*
+X56614817Y-73214714D02*
+X56687388Y-73178428D01*
+X56723674Y-73142142D01*
+X56759960Y-73069571D01*
+X56759960Y-72851857D01*
+X56723674Y-72779285D01*
+X56687388Y-72743000D01*
+X56614817Y-72706714D01*
+X56505960Y-72706714D01*
+X56433388Y-72743000D01*
+X56397102Y-72779285D01*
+X56360817Y-72851857D01*
+X56360817Y-73069571D01*
+X56397102Y-73142142D01*
+X56433388Y-73178428D01*
+X56505960Y-73214714D01*
+X56614817Y-73214714D01*
+X56070531Y-73178428D02*
+X55997960Y-73214714D01*
+X55852817Y-73214714D01*
+X55780245Y-73178428D01*
+X55743960Y-73105857D01*
+X55743960Y-73069571D01*
+X55780245Y-72997000D01*
+X55852817Y-72960714D01*
+X55961674Y-72960714D01*
+X56034245Y-72924428D01*
+X56070531Y-72851857D01*
+X56070531Y-72815571D01*
+X56034245Y-72743000D01*
+X55961674Y-72706714D01*
+X55852817Y-72706714D01*
+X55780245Y-72743000D01*
+X54909388Y-72706714D02*
+X54727960Y-73214714D01*
+X54546531Y-72706714D01*
+X54292531Y-72525285D02*
+X54256245Y-72489000D01*
+X54183674Y-72452714D01*
+X54002245Y-72452714D01*
+X53929674Y-72489000D01*
+X53893388Y-72525285D01*
+X53857102Y-72597857D01*
+X53857102Y-72670428D01*
+X53893388Y-72779285D01*
+X54328817Y-73214714D01*
+X53857102Y-73214714D01*
+X53530531Y-73142142D02*
+X53494245Y-73178428D01*
+X53530531Y-73214714D01*
+X53566817Y-73178428D01*
+X53530531Y-73142142D01*
+X53530531Y-73214714D01*
+X53022531Y-72452714D02*
+X52949960Y-72452714D01*
+X52877388Y-72489000D01*
+X52841102Y-72525285D01*
+X52804817Y-72597857D01*
+X52768531Y-72743000D01*
+X52768531Y-72924428D01*
+X52804817Y-73069571D01*
+X52841102Y-73142142D01*
+X52877388Y-73178428D01*
+X52949960Y-73214714D01*
+X53022531Y-73214714D01*
+X53095102Y-73178428D01*
+X53131388Y-73142142D01*
+X53167674Y-73069571D01*
+X53203960Y-72924428D01*
+X53203960Y-72743000D01*
+X53167674Y-72597857D01*
+X53131388Y-72525285D01*
+X53095102Y-72489000D01*
+X53022531Y-72452714D01*
+X61912531Y-74459314D02*
+X61912531Y-73697314D01*
+X61731102Y-73697314D01*
+X61622245Y-73733600D01*
+X61549674Y-73806171D01*
+X61513388Y-73878742D01*
+X61477102Y-74023885D01*
+X61477102Y-74132742D01*
+X61513388Y-74277885D01*
+X61549674Y-74350457D01*
+X61622245Y-74423028D01*
+X61731102Y-74459314D01*
+X61912531Y-74459314D01*
+X60860245Y-74423028D02*
+X60932817Y-74459314D01*
+X61077960Y-74459314D01*
+X61150531Y-74423028D01*
+X61186817Y-74350457D01*
+X61186817Y-74060171D01*
+X61150531Y-73987600D01*
+X61077960Y-73951314D01*
+X60932817Y-73951314D01*
+X60860245Y-73987600D01*
+X60823960Y-74060171D01*
+X60823960Y-74132742D01*
+X61186817Y-74205314D01*
+X60533674Y-74423028D02*
+X60461102Y-74459314D01*
+X60315960Y-74459314D01*
+X60243388Y-74423028D01*
+X60207102Y-74350457D01*
+X60207102Y-74314171D01*
+X60243388Y-74241600D01*
+X60315960Y-74205314D01*
+X60424817Y-74205314D01*
+X60497388Y-74169028D01*
+X60533674Y-74096457D01*
+X60533674Y-74060171D01*
+X60497388Y-73987600D01*
+X60424817Y-73951314D01*
+X60315960Y-73951314D01*
+X60243388Y-73987600D01*
+X59880531Y-74459314D02*
+X59880531Y-73951314D01*
+X59880531Y-73697314D02*
+X59916817Y-73733600D01*
+X59880531Y-73769885D01*
+X59844245Y-73733600D01*
+X59880531Y-73697314D01*
+X59880531Y-73769885D01*
+X59191102Y-73951314D02*
+X59191102Y-74568171D01*
+X59227388Y-74640742D01*
+X59263674Y-74677028D01*
+X59336245Y-74713314D01*
+X59445102Y-74713314D01*
+X59517674Y-74677028D01*
+X59191102Y-74423028D02*
+X59263674Y-74459314D01*
+X59408817Y-74459314D01*
+X59481388Y-74423028D01*
+X59517674Y-74386742D01*
+X59553960Y-74314171D01*
+X59553960Y-74096457D01*
+X59517674Y-74023885D01*
+X59481388Y-73987600D01*
+X59408817Y-73951314D01*
+X59263674Y-73951314D01*
+X59191102Y-73987600D01*
+X58828245Y-73951314D02*
+X58828245Y-74459314D01*
+X58828245Y-74023885D02*
+X58791960Y-73987600D01*
+X58719388Y-73951314D01*
+X58610531Y-73951314D01*
+X58537960Y-73987600D01*
+X58501674Y-74060171D01*
+X58501674Y-74459314D01*
+X57848531Y-74423028D02*
+X57921102Y-74459314D01*
+X58066245Y-74459314D01*
+X58138817Y-74423028D01*
+X58175102Y-74350457D01*
+X58175102Y-74060171D01*
+X58138817Y-73987600D01*
+X58066245Y-73951314D01*
+X57921102Y-73951314D01*
+X57848531Y-73987600D01*
+X57812245Y-74060171D01*
+X57812245Y-74132742D01*
+X58175102Y-74205314D01*
+X57159102Y-74459314D02*
+X57159102Y-73697314D01*
+X57159102Y-74423028D02*
+X57231674Y-74459314D01*
+X57376817Y-74459314D01*
+X57449388Y-74423028D01*
+X57485674Y-74386742D01*
+X57521960Y-74314171D01*
+X57521960Y-74096457D01*
+X57485674Y-74023885D01*
+X57449388Y-73987600D01*
+X57376817Y-73951314D01*
+X57231674Y-73951314D01*
+X57159102Y-73987600D01*
+X56215674Y-74459314D02*
+X56215674Y-73697314D01*
+X56215674Y-73987600D02*
+X56143102Y-73951314D01*
+X55997960Y-73951314D01*
+X55925388Y-73987600D01*
+X55889102Y-74023885D01*
+X55852817Y-74096457D01*
+X55852817Y-74314171D01*
+X55889102Y-74386742D01*
+X55925388Y-74423028D01*
+X55997960Y-74459314D01*
+X56143102Y-74459314D01*
+X56215674Y-74423028D01*
+X55598817Y-73951314D02*
+X55417388Y-74459314D01*
+X55235960Y-73951314D02*
+X55417388Y-74459314D01*
+X55489960Y-74640742D01*
+X55526245Y-74677028D01*
+X55598817Y-74713314D01*
+X54437674Y-73697314D02*
+X54256245Y-74459314D01*
+X54111102Y-73915028D01*
+X53965960Y-74459314D01*
+X53784531Y-73697314D01*
+X53494245Y-74459314D02*
+X53494245Y-73951314D01*
+X53494245Y-73697314D02*
+X53530531Y-73733600D01*
+X53494245Y-73769885D01*
+X53457960Y-73733600D01*
+X53494245Y-73697314D01*
+X53494245Y-73769885D01*
+X53022531Y-74459314D02*
+X53095102Y-74423028D01*
+X53131388Y-74350457D01*
+X53131388Y-73697314D01*
+X52623388Y-74459314D02*
+X52695960Y-74423028D01*
+X52732245Y-74350457D01*
+X52732245Y-73697314D01*
+X52042817Y-74423028D02*
+X52115388Y-74459314D01*
+X52260531Y-74459314D01*
+X52333102Y-74423028D01*
+X52369388Y-74350457D01*
+X52369388Y-74060171D01*
+X52333102Y-73987600D01*
+X52260531Y-73951314D01*
+X52115388Y-73951314D01*
+X52042817Y-73987600D01*
+X52006531Y-74060171D01*
+X52006531Y-74132742D01*
+X52369388Y-74205314D01*
+X51679960Y-74459314D02*
+X51679960Y-73951314D01*
+X51679960Y-74023885D02*
+X51643674Y-73987600D01*
+X51571102Y-73951314D01*
+X51462245Y-73951314D01*
+X51389674Y-73987600D01*
+X51353388Y-74060171D01*
+X51353388Y-74459314D01*
+X51353388Y-74060171D02*
+X51317102Y-73987600D01*
+X51244531Y-73951314D01*
+X51135674Y-73951314D01*
+X51063102Y-73987600D01*
+X51026817Y-74060171D01*
+X51026817Y-74459314D01*
+D12*
+%TO.C,TP1*%
+X80329000Y-72796400D02*
+G75*
+G03*
+X80329000Y-72796400I-700000J0D01*
+G01*
+D13*
+X78858904Y-71613780D02*
+X78287476Y-71613780D01*
+X78573190Y-72613780D02*
+X78573190Y-71613780D01*
+X77954142Y-72613780D02*
+X77954142Y-71613780D01*
+X77573190Y-71613780D01*
+X77477952Y-71661400D01*
+X77430333Y-71709019D01*
+X77382714Y-71804257D01*
+X77382714Y-71947114D01*
+X77430333Y-72042352D01*
+X77477952Y-72089971D01*
+X77573190Y-72137590D01*
+X77954142Y-72137590D01*
+X76430333Y-72613780D02*
+X77001761Y-72613780D01*
+X76716047Y-72613780D02*
+X76716047Y-71613780D01*
+X76811285Y-71756638D01*
+X76906523Y-71851876D01*
+X77001761Y-71899495D01*
+%TD*%
+%LPC*%
+D14*
+%TO.C,SW1*%
+X55890000Y-65836800D03*
+%TD*%
+D15*
+%TO.C,TP1*%
+X79629000Y-72796400D03*
+%TD*%
+D16*
+%TO.C,J3*%
+X77762100Y-66548000D03*
+D17*
+X79032100Y-66548000D03*
+%TD*%
+D16*
+%TO.C,J1*%
+X73952100Y-89928700D03*
+D17*
+X73952100Y-88658700D03*
+%TD*%
+D18*
+%TO.C,M2*%
+X82397600Y-88696800D03*
+%TD*%
+D16*
+%TO.C,J4*%
+X52311300Y-65074800D03*
+D17*
+X52311300Y-66344800D03*
+%TD*%
+D19*
+%TO.C,J2*%
+X78704200Y-84495800D03*
+D20*
+X81864200Y-84295800D03*
+D19*
+X78704200Y-76895800D03*
+D20*
+X81864200Y-77095800D03*
+D21*
+X79714200Y-82695800D03*
+X79714200Y-78695800D03*
+%TD*%
+D18*
+%TO.C,M1*%
+X69450000Y-65370000D03*
+%TD*%
+M02*
@@ -0,0 +1,44 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(5.1.9-0-10_14)*%
+%TF.CreationDate,2021-10-29T13:13:03+02:00*%
+%TF.ProjectId,Leo_muziekdoos,4c656f5f-6d75-47a6-9965-6b646f6f732e,rev?*%
+%TF.SameCoordinates,Original*%
+%TF.FileFunction,Profile,NP*%
+%FSLAX46Y46*%
+G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
+G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-10-29 13:13:03*
+%MOMM*%
+%LPD*%
+G01*
+G04 APERTURE LIST*
+%TA.AperFunction,Profile*%
+%ADD10C,0.200000*%
+%TD*%
+G04 APERTURE END LIST*
+D10*
+X41167565Y-69831020D02*
+G75*
+G02*
+X47040565Y-63958020I5873000J0D01*
+G01*
+X72669999Y-80277773D02*
+X72669398Y-92377773D01*
+X62069398Y-78427773D02*
+X62069398Y-80277773D01*
+X41169399Y-78427773D02*
+X62069398Y-78427773D01*
+X41167565Y-69831020D02*
+X41169399Y-78427773D01*
+X72669398Y-92377773D02*
+X83669398Y-92377773D01*
+X62069398Y-80277773D02*
+X72669999Y-80277773D01*
+X74669398Y-63958020D02*
+X47040565Y-63958020D01*
+X74669398Y-63958020D02*
+G75*
+G02*
+X83669398Y-72958020I0J-9000000D01*
+G01*
+X83669398Y-92377773D02*
+X83669398Y-72958020D01*
+M02*
@@ -0,0 +1,24 @@
+M48
+; DRILL file {KiCad (5.1.9-0-10_14)} date Friday, October 29, 2021 at 01:13:06 PM
+; FORMAT={-:-/ absolute / inch / decimal}
+; #@! TF.CreationDate,2021-10-29T13:13:06+02:00
+; #@! TF.GenerationSoftware,Kicad,Pcbnew,(5.1.9-0-10_14)
+; #@! TF.FileFunction,NonPlated,1,4,NPTH
+FMAT,2
+INCH
+T1C0.0217
+T2C0.0315
+T3C0.1181
+%
+G90
+G05
+T1
+X3.1384Y-3.0983
+X3.1384Y-3.2557
+T2
+X2.2004Y-2.592
+T3
+X2.7343Y-2.5736
+X3.244Y-3.492
+T0
+M30
@@ -0,0 +1,331 @@
+M48
+; DRILL file {KiCad (5.1.9-0-10_14)} date Friday, October 29, 2021 at 01:13:06 PM
+; FORMAT={-:-/ absolute / inch / decimal}
+; #@! TF.CreationDate,2021-10-29T13:13:06+02:00
+; #@! TF.GenerationSoftware,Kicad,Pcbnew,(5.1.9-0-10_14)
+; #@! TF.FileFunction,Plated,1,4,PTH
+FMAT,2
+INCH
+T1C0.0079
+T2C0.0118
+T3C0.0256
+T4C0.0276
+%
+G90
+G05
+T1
+X1.7473Y-2.7423
+X1.7473Y-2.7826
+X1.7473Y-2.823
+X1.7473Y-2.8634
+X1.7473Y-2.9037
+X1.7876Y-2.7423
+X1.7876Y-2.7826
+X1.7876Y-2.823
+X1.7876Y-2.8634
+X1.7876Y-2.9037
+X1.828Y-2.7423
+X1.828Y-2.7826
+X1.828Y-2.823
+X1.828Y-2.8634
+X1.828Y-2.9037
+X1.8684Y-2.7423
+X1.8684Y-2.7826
+X1.8684Y-2.823
+X1.8684Y-2.8634
+X1.8684Y-2.9037
+X1.9087Y-2.7423
+X1.9087Y-2.7826
+X1.9087Y-2.823
+X1.9087Y-2.8634
+X1.9087Y-2.9037
+T2
+X1.6408Y-2.7398
+X1.6415Y-2.7915
+X1.65Y-2.971
+X1.6505Y-2.999
+X1.6808Y-2.8814
+X1.6895Y-2.8525
+X1.697Y-2.728
+X1.698Y-2.936
+X1.707Y-2.9975
+X1.717Y-2.95
+X1.7222Y-2.6796
+X1.7788Y-2.6792
+X1.814Y-3.053
+X1.8209Y-2.5929
+X1.838Y-2.68
+X1.8509Y-3.0018
+X1.8707Y-2.9854
+X1.8964Y-2.984
+X1.9219Y-2.9792
+X1.929Y-3.067
+X1.9336Y-2.6764
+X1.945Y-2.936
+X1.9455Y-2.964
+X1.97Y-2.69
+X1.974Y-2.754
+X1.9901Y-2.6519
+X1.9904Y-2.5406
+X1.9999Y-2.8901
+X2.0086Y-2.8594
+X2.0131Y-2.9444
+X2.0334Y-2.7666
+X2.058Y-2.722
+X2.0665Y-3.041
+X2.0885Y-2.8905
+X2.0995Y-3.041
+X2.1Y-2.73
+X2.1131Y-2.8694
+X2.1366Y-2.6457
+X2.14Y-3.06
+X2.1465Y-2.8985
+X2.1589Y-2.8321
+X2.17Y-3.06
+X2.18Y-2.69
+X2.18Y-2.72
+X2.18Y-2.75
+X2.188Y-2.936
+X2.2Y-3.06
+X2.2066Y-2.816
+X2.21Y-2.69
+X2.21Y-2.72
+X2.21Y-2.75
+X2.223Y-2.936
+X2.23Y-3.06
+X2.26Y-2.55
+X2.26Y-2.58
+X2.26Y-2.61
+X2.26Y-2.64
+X2.26Y-3.06
+X2.2805Y-2.7561
+X2.2807Y-2.7253
+X2.287Y-2.828
+X2.29Y-2.55
+X2.29Y-2.58
+X2.29Y-2.61
+X2.29Y-2.64
+X2.29Y-3.06
+X2.32Y-2.5492
+X2.32Y-2.58
+X2.32Y-2.61
+X2.32Y-2.64
+X2.33Y-2.66
+X2.3304Y-2.7228
+X2.3308Y-2.7456
+X2.332Y-2.9333
+X2.3323Y-2.8798
+X2.338Y-3.045
+X2.3512Y-2.7346
+X2.36Y-2.66
+X2.3723Y-3.0547
+X2.39Y-2.66
+X2.4Y-2.79
+X2.403Y-3.056
+X2.42Y-2.86
+X2.42Y-2.9
+X2.42Y-2.94
+X2.42Y-2.98
+X2.4304Y-3.0436
+X2.4588Y-3.0555
+X2.46Y-2.66
+X2.46Y-2.8
+X2.46Y-2.86
+X2.46Y-2.9
+X2.46Y-2.94
+X2.46Y-2.98
+X2.4601Y-2.7169
+X2.473Y-3.134
+X2.4877Y-3.0539
+X2.49Y-2.66
+X2.5Y-2.8
+X2.5Y-2.86
+X2.5Y-2.9
+X2.5Y-2.94
+X2.5Y-2.98
+X2.5074Y-2.7064
+X2.5113Y-3.0428
+X2.52Y-2.66
+X2.5276Y-3.0653
+X2.5312Y-2.7162
+X2.55Y-2.66
+X2.56Y-2.718
+X2.56Y-2.8
+X2.56Y-2.86
+X2.56Y-2.9
+X2.56Y-2.94
+X2.5689Y-2.5492
+X2.5689Y-2.58
+X2.5689Y-2.61
+X2.5689Y-2.64
+X2.5892Y-2.719
+X2.5976Y-2.8
+X2.6Y-2.86
+X2.6Y-2.9
+X2.6Y-2.94
+X2.604Y-3.0663
+X2.61Y-2.55
+X2.61Y-2.58
+X2.61Y-2.61
+X2.61Y-2.64
+X2.613Y-3.123
+X2.634Y-2.753
+X2.65Y-2.55
+X2.65Y-2.58
+X2.65Y-2.61
+X2.65Y-2.64
+X2.6658Y-2.7738
+X2.6698Y-2.9389
+X2.6701Y-2.9132
+X2.6735Y-2.8844
+X2.68Y-3.03
+X2.68Y-3.05
+X2.68Y-3.07
+X2.68Y-3.1
+X2.68Y-3.12
+X2.68Y-3.14
+X2.6825Y-2.8601
+X2.686Y-2.7962
+X2.712Y-2.756
+X2.713Y-2.782
+X2.7233Y-2.9353
+X2.7424Y-2.7738
+X2.7552Y-3.0025
+X2.76Y-3.03
+X2.76Y-3.05
+X2.76Y-3.07
+X2.76Y-3.1
+X2.76Y-3.12
+X2.76Y-3.14
+X2.77Y-2.902
+X2.77Y-2.961
+X2.7818Y-3.0025
+X2.7892Y-2.758
+X2.79Y-3.04
+X2.7922Y-2.8818
+X2.8092Y-3.1112
+X2.8092Y-3.1404
+X2.817Y-2.757
+X2.8189Y-2.883
+X2.865Y-2.935
+X2.865Y-2.965
+X2.865Y-2.995
+X2.865Y-3.025
+X2.8662Y-2.7609
+X2.883Y-3.153
+X2.89Y-3.28
+X2.89Y-3.3
+X2.89Y-3.32
+X2.8939Y-2.8387
+X2.8948Y-3.2489
+X2.8948Y-3.2231
+X2.8948Y-3.1981
+X2.895Y-2.935
+X2.895Y-2.965
+X2.895Y-2.995
+X2.895Y-3.025
+X2.8978Y-2.7549
+X2.9061Y-3.4247
+X2.9122Y-2.795
+X2.925Y-2.935
+X2.925Y-2.965
+X2.925Y-2.995
+X2.925Y-3.025
+X2.9307Y-3.3732
+X2.9331Y-2.622
+X2.934Y-3.406
+X2.9495Y-3.1115
+X2.9504Y-3.3866
+X2.952Y-3.426
+X2.955Y-2.935
+X2.955Y-2.965
+X2.955Y-2.995
+X2.955Y-3.025
+X2.965Y-3.226
+X2.965Y-3.25
+X2.9709Y-3.5931
+X2.9713Y-3.3736
+X2.9717Y-3.4015
+X2.9816Y-2.6775
+X2.9855Y-3.5155
+X2.9855Y-3.5525
+X3.0115Y-3.5155
+X3.0115Y-3.5525
+X3.02Y-3.252
+X3.0219Y-2.7492
+X3.024Y-2.7232
+X3.025Y-2.853
+X3.025Y-3.147
+X3.036Y-2.556
+X3.0438Y-2.7982
+X3.0443Y-2.8306
+X3.048Y-2.6725
+X3.054Y-3.466
+X3.054Y-3.488
+X3.0543Y-2.8776
+X3.0559Y-3.5917
+X3.0663Y-2.8106
+X3.074Y-3.263
+X3.0825Y-2.8789
+X3.09Y-2.9107
+X3.0928Y-2.7143
+X3.0928Y-2.736
+X3.0928Y-2.7577
+X3.108Y-2.9722
+X3.1145Y-2.7143
+X3.1145Y-2.736
+X3.1145Y-2.7577
+X3.13Y-3.519
+X3.13Y-3.54
+X3.13Y-3.6
+X3.1362Y-2.7143
+X3.1362Y-2.736
+X3.1362Y-2.7577
+X3.15Y-3.47
+X3.165Y-2.793
+X3.165Y-3.227
+X3.17Y-3.56
+X3.1933Y-3.175
+X3.1933Y-3.2046
+X3.2Y-3.6
+X3.2095Y-2.6787
+X3.21Y-3.1
+X3.21Y-3.24
+X3.21Y-3.4
+X3.218Y-2.9375
+X3.2205Y-2.8935
+X3.2496Y-2.7706
+X3.2633Y-3.1767
+X3.27Y-2.99
+X3.27Y-3.39
+X3.27Y-3.6
+T3
+X2.0595Y-2.562
+X2.0595Y-2.612
+X2.9115Y-3.4905
+X2.9115Y-3.5405
+X3.0615Y-2.62
+X3.1115Y-2.62
+T4
+G00X3.1104Y-3.0353
+M15
+G01X3.0868Y-3.0353
+M16
+G05
+G00X3.0868Y-3.3187
+M15
+G01X3.1104Y-3.3187
+M16
+G05
+G00X3.2112Y-3.0353
+M15
+G01X3.2348Y-3.0353
+M16
+G05
+G00X3.2112Y-3.3187
+M15
+G01X3.2348Y-3.3187
+M16
+G05
+T0
+M30
@@ -0,0 +1,165 @@
+{
+  "Header":
+  {
+    "GenerationSoftware":
+    {
+      "Vendor":      "KiCad",
+      "Application": "Pcbnew",
+      "Version":     "(5.1.9-0-10_14)"
+    },
+    "CreationDate":  "2021-10-29T13:13:03+02:00"
+  },
+  "GeneralSpecs":
+  {
+    "ProjectId":
+    {
+      "Name": "Leo_muziekdoos",
+      "GUID": "4c656f5f-6d75-47a6-9965-6b646f6f732e",
+      "Revision": "rev?"
+    },
+    "Size":
+    {
+      "X": 42.702,
+      "Y": 28.620
+    },
+    "LayerNumber": 4,
+    "BoardThickness":  1.600
+  },
+  "DesignRules":
+  [
+    {
+      "Layers": "Outer",
+      "PadToPad":  0.025,
+      "PadToTrack":  0.025,
+      "TrackToTrack":  0.152,
+      "MinLineWidth":  0.152,
+      "TrackToRegion":  0.152,
+      "RegionToRegion":  0.152
+    },
+    {
+      "Layers": "Inner",
+      "PadToPad":  0.152,
+      "PadToTrack":  0.152,
+      "TrackToTrack":  0.152,
+      "MinLineWidth":  0.152,
+      "TrackToRegion":  0.152,
+      "RegionToRegion":  0.152
+    }
+  ],
+  "FilesAttributes":
+  [
+    {
+      "Path":  "Leo_muziekdoos-F_Cu.gbr",
+      "FileFunction":  "Copper,L1,Top",
+      "FilePolarity":  "Positive"
+    },
+    {
+      "Path":  "Leo_muziekdoos-In1_Cu.gbr",
+      "FileFunction":  "Copper,L2,Inr",
+      "FilePolarity":  "Positive"
+    },
+    {
+      "Path":  "Leo_muziekdoos-In2_Cu.gbr",
+      "FileFunction":  "Copper,L3,Inr",
+      "FilePolarity":  "Positive"
+    },
+    {
+      "Path":  "Leo_muziekdoos-B_Cu.gbr",
+      "FileFunction":  "Copper,L4,Bot",
+      "FilePolarity":  "Positive"
+    },
+    {
+      "Path":  "Leo_muziekdoos-F_Paste.gbr",
+      "FileFunction":  "SolderPaste,Top",
+      "FilePolarity":  "Positive"
+    },
+    {
+      "Path":  "Leo_muziekdoos-B_Paste.gbr",
+      "FileFunction":  "SolderPaste,Bot",
+      "FilePolarity":  "Positive"
+    },
+    {
+      "Path":  "Leo_muziekdoos-F_SilkS.gbr",
+      "FileFunction":  "Legend,Top",
+      "FilePolarity":  "Positive"
+    },
+    {
+      "Path":  "Leo_muziekdoos-B_SilkS.gbr",
+      "FileFunction":  "Legend,Bot",
+      "FilePolarity":  "Positive"
+    },
+    {
+      "Path":  "Leo_muziekdoos-F_Mask.gbr",
+      "FileFunction":  "SolderMask,Top",
+      "FilePolarity":  "Negative"
+    },
+    {
+      "Path":  "Leo_muziekdoos-B_Mask.gbr",
+      "FileFunction":  "SolderMask,Bot",
+      "FilePolarity":  "Negative"
+    },
+    {
+      "Path":  "Leo_muziekdoos-Edge_Cuts.gbr",
+      "FileFunction":  "Profile",
+      "FilePolarity":  "Positive"
+    }
+  ],
+  "MaterialStackup":
+  [
+    {
+      "Type":  "Legend",
+      "Notes":  "Layer F.SilkS"
+    },
+    {
+      "Type":  "SolderPaste",
+      "Notes":  "Layer F.Paste"
+    },
+    {
+      "Type":  "SolderMask",
+      "Notes":  "Layer F.Mask"
+    },
+    {
+      "Type":  "Copper",
+      "Notes":  "Layer F.Cu"
+    },
+    {
+      "Type":  "Dielectric",
+      "Material":  "FR4",
+      "Notes":  "Layers L1/L2"
+    },
+    {
+      "Type":  "Copper",
+      "Notes":  "Layer In1.Cu"
+    },
+    {
+      "Type":  "Dielectric",
+      "Material":  "FR4",
+      "Notes":  "Layers L2/L3"
+    },
+    {
+      "Type":  "Copper",
+      "Notes":  "Layer In2.Cu"
+    },
+    {
+      "Type":  "Dielectric",
+      "Material":  "FR4",
+      "Notes":  "Layers L3/L4"
+    },
+    {
+      "Type":  "Copper",
+      "Notes":  "Layer B.Cu"
+    },
+    {
+      "Type":  "SolderMask",
+      "Notes":  "Layer B.Mask"
+    },
+    {
+      "Type":  "SolderPaste",
+      "Notes":  "Layer B.Paste"
+    },
+    {
+      "Type":  "Legend",
+      "Notes":  "Layer B.SilkS"
+    }
+  ]
+}
@@ -13,135 +13,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
-L Device:R R?
-U 1 1 6159E865
-P 2400 6650
-AR Path="/6159E865" Ref="R?"  Part="1" 
-AR Path="/6158A412/6159E865" Ref="R?"  Part="1" 
-AR Path="/60FE1698/6159E865" Ref="R4"  Part="1" 
-F 0 "R4" H 2470 6696 50  0000 L CNN
-F 1 "10K" H 2470 6605 50  0000 L CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 2330 6650 50  0001 C CNN
-F 3 "~" H 2400 6650 50  0001 C CNN
-F 4 "R10K_0402" H 2400 6650 50  0001 C CNN "StockRef"
-F 5 "2447096" H 2400 6650 50  0001 C CNN "ordercode"
-F 6 "farnell" H 2400 6650 50  0001 C CNN "supplier"
-	1    2400 6650
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R?
-U 1 1 6159E86C
-P 2400 6250
-AR Path="/6159E86C" Ref="R?"  Part="1" 
-AR Path="/6158A412/6159E86C" Ref="R?"  Part="1" 
-AR Path="/60FE1698/6159E86C" Ref="R3"  Part="1" 
-F 0 "R3" H 2470 6296 50  0000 L CNN
-F 1 "4k7" H 2470 6205 50  0000 L CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 2330 6250 50  0001 C CNN
-F 3 "~" H 2400 6250 50  0001 C CNN
-F 4 "R4K7_0402" H 2400 6250 50  0001 C CNN "StockRef"
-F 5 "2073069" H 2400 6250 50  0001 C CNN "ordercode"
-F 6 "farnell" H 2400 6250 50  0001 C CNN "supplier"
-	1    2400 6250
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2100 6450 2150 6450
-Wire Wire Line
-	2400 6450 2400 6400
-Wire Wire Line
-	2400 6500 2400 6450
-Connection ~ 2400 6450
-$Comp
-L power:+BATT #PWR?
-U 1 1 6159E877
-P 2400 5450
-AR Path="/6159E877" Ref="#PWR?"  Part="1" 
-AR Path="/6158A412/6159E877" Ref="#PWR?"  Part="1" 
-AR Path="/60FE1698/6159E877" Ref="#PWR0101"  Part="1" 
-F 0 "#PWR0101" H 2400 5300 50  0001 C CNN
-F 1 "+BATT" H 2415 5623 50  0000 C CNN
-F 2 "" H 2400 5450 50  0001 C CNN
-F 3 "" H 2400 5450 50  0001 C CNN
-	1    2400 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GND #PWR?
-U 1 1 6159E87E
-P 2400 6900
-AR Path="/6159E87E" Ref="#PWR?"  Part="1" 
-AR Path="/6158A412/6159E87E" Ref="#PWR?"  Part="1" 
-AR Path="/60FE1698/6159E87E" Ref="#PWR0102"  Part="1" 
-F 0 "#PWR0102" H 2400 6650 50  0001 C CNN
-F 1 "GND" H 2405 6727 50  0000 C CNN
-F 2 "" H 2400 6900 50  0001 C CNN
-F 3 "" H 2400 6900 50  0001 C CNN
-	1    2400 6900
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2400 6900 2400 6850
-Wire Wire Line
-	2400 5450 2400 5500
-Connection ~ 2400 5500
-Wire Wire Line
-	2400 5500 2400 5600
-$Comp
-L Device:C C?
-U 1 1 6159E892
-P 2150 6650
-AR Path="/6159E892" Ref="C?"  Part="1" 
-AR Path="/6158A412/6159E892" Ref="C?"  Part="1" 
-AR Path="/60FE1698/6159E892" Ref="C2"  Part="1" 
-F 0 "C2" H 2265 6696 50  0000 L CNN
-F 1 "100nF" H 2265 6605 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 2188 6500 50  0001 C CNN
-F 3 "~" H 2150 6650 50  0001 C CNN
-F 4 "C100n_0603" H 2150 6650 50  0001 C CNN "StockRef"
-F 5 "2524678" H 2150 6650 50  0001 C CNN "ordercode"
-F 6 "farnell" H 2150 6650 50  0001 C CNN "supplier"
-	1    2150 6650
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	2150 6500 2150 6450
-Wire Wire Line
-	2150 6800 2150 6850
-Wire Wire Line
-	2150 6850 2400 6850
-Connection ~ 2400 6850
-Wire Wire Line
-	2400 6850 2400 6800
-Wire Wire Line
-	2100 5800 2050 5800
-$Comp
-L Device:R R?
-U 1 1 6159E8AC
-P 2050 5650
-AR Path="/6159E8AC" Ref="R?"  Part="1" 
-AR Path="/6158A412/6159E8AC" Ref="R?"  Part="1" 
-AR Path="/60FE1698/6159E8AC" Ref="R2"  Part="1" 
-F 0 "R2" H 2120 5696 50  0000 L CNN
-F 1 "10K" H 2120 5605 50  0000 L CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 1980 5650 50  0001 C CNN
-F 3 "~" H 2050 5650 50  0001 C CNN
-F 4 "R10K_0402" H 2050 5650 50  0001 C CNN "StockRef"
-F 5 "2447096" H 2050 5650 50  0001 C CNN "ordercode"
-F 6 "farnell" H 2050 5650 50  0001 C CNN "supplier"
-	1    2050 5650
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	2050 5500 2400 5500
-Connection ~ 2050 5800
-Wire Wire Line
-	2000 5800 2050 5800
-Connection ~ 2150 6450
-Wire Wire Line
-	2150 6450 2400 6450
 Text Label 6200 2150 1    24   ~ 0
 PSU_BTN_RAW
 Text Label 6500 1650 0    24   ~ 0
@@ -487,10 +358,10 @@ 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"
+F 4 "LED_SMD_RED_0805_20mA" H 3300 1550 50  0001 C CNN "StockRef"
+F 5 "" H 3300 1550 50  0001 C CNN "ordercode"
 F 6 "farnell" H 3300 1550 50  0001 C CNN "supplier"
 	1    3300 1550
 	0    -1   -1   0   
@@ -504,10 +375,10 @@ 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"
+F 5 "" H 3800 2250 50  0001 C CNN "ordercode"
 F 6 "farnell" H 3800 2250 50  0001 C CNN "supplier"
 	1    3800 2250
 	0    -1   -1   0   
@@ -671,10 +542,6 @@ Wire Wire Line
 	1800 4000 1650 4000
 Wire Wire Line
 	1650 4000 1650 3750
-Text HLabel 2100 6450 0    50   Input ~ 0
-MEAS_VBATT
-Text HLabel 2000 5800 0    50   Input ~ 0
-MEAS_EN
 Wire Wire Line
 	6200 1150 6200 1300
 $Comp
@@ -688,8 +555,6 @@ F 3 "~" H 2000 4000 50  0001 C CNN
 	1    2000 4000
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2400 6000 2400 6100
 $Comp
 L Battery_Management:MCP73831-2-OT_copy U1
 U 1 1 610E217F
@@ -728,66 +593,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
@@ -804,44 +609,34 @@ F 6 "farnell" H 6200 2400 50  0001 C CNN "supplier"
 	1    6200 2400
 	0    1    1    0   
 $EndComp
-Wire Wire Line
-	7250 1150 7250 1300
 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
-P 6800 2150
-F 0 "Q2" H 6600 2250 50  0000 L CNN
-F 1 "Dual_NMOS_2N7002PS" H 6050 1950 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 7000 2150 50  0001 C CNN
-F 3 "~" H 7000 2150 50  0001 C CNN
-F 4 "farnell" H 6800 2150 50  0001 C CNN "supplier"
-F 5 "1758102" H 6800 2150 50  0001 C CNN "ordercode"
-F 6 "2N7002PS" H 6800 2150 50  0001 C CNN "StockRef"
-	2    6800 2150
+P 5500 2100
+F 0 "Q2" H 5300 2200 50  0000 L CNN
+F 1 "2N7002PS (N)" H 4900 1950 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 5700 2100 50  0001 C CNN
+F 3 "~" H 5700 2100 50  0001 C CNN
+F 4 "farnell" H 5500 2100 50  0001 C CNN "supplier"
+F 5 "1758102" H 5500 2100 50  0001 C CNN "ordercode"
+F 6 "2N7002PS" H 5500 2100 50  0001 C CNN "StockRef"
+	2    5500 2100
 	-1   0    0    -1  
 $EndComp
 $Comp
 L Device:Q_Dual_NMOS_S1G1D2S2G2D1 Q2
 U 1 1 614CEBF8
-P 5500 2100
-F 0 "Q2" H 5705 2146 50  0000 L CNN
-F 1 "Dual_NMOS_2N7002PS" H 5705 2055 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 5700 2100 50  0001 C CNN
-F 3 "~" H 5700 2100 50  0001 C CNN
-F 4 "1758102" H 5500 2100 50  0001 C CNN "ordercode"
-F 5 "farnell" H 5500 2100 50  0001 C CNN "supplier"
-F 6 "2N7002PS" H 5500 2100 50  0001 C CNN "StockRef"
-	1    5500 2100
+P 6800 2150
+F 0 "Q2" H 7005 2196 50  0000 L CNN
+F 1 "2N7002PS (N)" H 7005 2105 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 7000 2150 50  0001 C CNN
+F 3 "~" H 7000 2150 50  0001 C CNN
+F 4 "1758102" H 6800 2150 50  0001 C CNN "ordercode"
+F 5 "farnell" H 6800 2150 50  0001 C CNN "supplier"
+F 6 "2N7002PS" H 6800 2150 50  0001 C CNN "StockRef"
+	1    6800 2150
 	-1   0    0    -1  
 $EndComp
 $Comp
@@ -849,7 +644,7 @@ L Device:Q_Dual_PMOS_S1G1D2S2G2D1 Q1
 U 2 1 614E105B
 P 7150 1650
 F 0 "Q1" H 7355 1604 50  0000 L CNN
-F 1 "Dual_PMOS_BSS84AKS,115" H 6450 1500 50  0000 L CNN
+F 1 "BSS84AKS,115 (P)" H 6450 1500 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 7200 1650 50  0001 C CNN
 F 3 "~" H 7200 1650 50  0001 C CNN
 F 4 "BSS84AKS,115" H 7150 1650 50  0001 C CNN "StockRef"
@@ -859,20 +654,6 @@ F 6 "farnell" H 7150 1650 50  0001 C CNN "supplier"
 	1    0    0    1   
 $EndComp
 $Comp
-L Device:Q_Dual_PMOS_S1G1D2S2G2D1 Q1
-U 1 1 614E2589
-P 2300 5800
-F 0 "Q1" H 2505 5754 50  0000 L CNN
-F 1 "Dual_PMOS_BSS84AKS,115" H 2505 5845 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 2350 5800 50  0001 C CNN
-F 3 "~" H 2350 5800 50  0001 C CNN
-F 4 "BSS84AKS,115" H 2300 5800 50  0001 C CNN "StockRef"
-F 5 "1972665" H 2300 5800 50  0001 C CNN "ordercode"
-F 6 "farnell" H 2300 5800 50  0001 C CNN "supplier"
-	1    2300 5800
-	1    0    0    1   
-$EndComp
-$Comp
 L Regulator_Switching:XCL214B333DR U2
 U 1 1 6148D543
 P 8050 1300
@@ -921,8 +702,6 @@ Wire Wire Line
 	8050 1950 8100 1950
 Text Label 8050 950  0    50   ~ 0
 Lx_L1
-Text Label 2400 6100 0    50   ~ 0
-BATT_MEAS
 Text Label 6050 3200 0    24   ~ 0
 PSU_BTN_RAW
 $Comp
@@ -962,4 +741,146 @@ F 3 "" H 5950 3600 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	5950 3600 5950 3550
+$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
@@ -13,135 +13,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
-L Device:R R?
-U 1 1 6159E865
-P 2400 6650
-AR Path="/6159E865" Ref="R?"  Part="1" 
-AR Path="/6158A412/6159E865" Ref="R?"  Part="1" 
-AR Path="/60FE1698/6159E865" Ref="R4"  Part="1" 
-F 0 "R4" H 2470 6696 50  0000 L CNN
-F 1 "10K" H 2470 6605 50  0000 L CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 2330 6650 50  0001 C CNN
-F 3 "~" H 2400 6650 50  0001 C CNN
-F 4 "R10K_0402" H 2400 6650 50  0001 C CNN "StockRef"
-F 5 "2447096" H 2400 6650 50  0001 C CNN "ordercode"
-F 6 "farnell" H 2400 6650 50  0001 C CNN "supplier"
-	1    2400 6650
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R?
-U 1 1 6159E86C
-P 2400 6250
-AR Path="/6159E86C" Ref="R?"  Part="1" 
-AR Path="/6158A412/6159E86C" Ref="R?"  Part="1" 
-AR Path="/60FE1698/6159E86C" Ref="R3"  Part="1" 
-F 0 "R3" H 2470 6296 50  0000 L CNN
-F 1 "4k7" H 2470 6205 50  0000 L CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 2330 6250 50  0001 C CNN
-F 3 "~" H 2400 6250 50  0001 C CNN
-F 4 "R4K7_0402" H 2400 6250 50  0001 C CNN "StockRef"
-F 5 "2073069" H 2400 6250 50  0001 C CNN "ordercode"
-F 6 "farnell" H 2400 6250 50  0001 C CNN "supplier"
-	1    2400 6250
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2100 6450 2150 6450
-Wire Wire Line
-	2400 6450 2400 6400
-Wire Wire Line
-	2400 6500 2400 6450
-Connection ~ 2400 6450
-$Comp
-L power:+BATT #PWR?
-U 1 1 6159E877
-P 2400 5450
-AR Path="/6159E877" Ref="#PWR?"  Part="1" 
-AR Path="/6158A412/6159E877" Ref="#PWR?"  Part="1" 
-AR Path="/60FE1698/6159E877" Ref="#PWR0101"  Part="1" 
-F 0 "#PWR0101" H 2400 5300 50  0001 C CNN
-F 1 "+BATT" H 2415 5623 50  0000 C CNN
-F 2 "" H 2400 5450 50  0001 C CNN
-F 3 "" H 2400 5450 50  0001 C CNN
-	1    2400 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GND #PWR?
-U 1 1 6159E87E
-P 2400 6900
-AR Path="/6159E87E" Ref="#PWR?"  Part="1" 
-AR Path="/6158A412/6159E87E" Ref="#PWR?"  Part="1" 
-AR Path="/60FE1698/6159E87E" Ref="#PWR0102"  Part="1" 
-F 0 "#PWR0102" H 2400 6650 50  0001 C CNN
-F 1 "GND" H 2405 6727 50  0000 C CNN
-F 2 "" H 2400 6900 50  0001 C CNN
-F 3 "" H 2400 6900 50  0001 C CNN
-	1    2400 6900
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2400 6900 2400 6850
-Wire Wire Line
-	2400 5450 2400 5500
-Connection ~ 2400 5500
-Wire Wire Line
-	2400 5500 2400 5600
-$Comp
-L Device:C C?
-U 1 1 6159E892
-P 2150 6650
-AR Path="/6159E892" Ref="C?"  Part="1" 
-AR Path="/6158A412/6159E892" Ref="C?"  Part="1" 
-AR Path="/60FE1698/6159E892" Ref="C2"  Part="1" 
-F 0 "C2" H 2265 6696 50  0000 L CNN
-F 1 "100nF" H 2265 6605 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 2188 6500 50  0001 C CNN
-F 3 "~" H 2150 6650 50  0001 C CNN
-F 4 "C100n_0603" H 2150 6650 50  0001 C CNN "StockRef"
-F 5 "2524678" H 2150 6650 50  0001 C CNN "ordercode"
-F 6 "farnell" H 2150 6650 50  0001 C CNN "supplier"
-	1    2150 6650
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	2150 6500 2150 6450
-Wire Wire Line
-	2150 6800 2150 6850
-Wire Wire Line
-	2150 6850 2400 6850
-Connection ~ 2400 6850
-Wire Wire Line
-	2400 6850 2400 6800
-Wire Wire Line
-	2100 5800 2050 5800
-$Comp
-L Device:R R?
-U 1 1 6159E8AC
-P 2050 5650
-AR Path="/6159E8AC" Ref="R?"  Part="1" 
-AR Path="/6158A412/6159E8AC" Ref="R?"  Part="1" 
-AR Path="/60FE1698/6159E8AC" Ref="R2"  Part="1" 
-F 0 "R2" H 2120 5696 50  0000 L CNN
-F 1 "10K" H 2120 5605 50  0000 L CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 1980 5650 50  0001 C CNN
-F 3 "~" H 2050 5650 50  0001 C CNN
-F 4 "R10K_0402" H 2050 5650 50  0001 C CNN "StockRef"
-F 5 "2447096" H 2050 5650 50  0001 C CNN "ordercode"
-F 6 "farnell" H 2050 5650 50  0001 C CNN "supplier"
-	1    2050 5650
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	2050 5500 2400 5500
-Connection ~ 2050 5800
-Wire Wire Line
-	2000 5800 2050 5800
-Connection ~ 2150 6450
-Wire Wire Line
-	2150 6450 2400 6450
 Text Label 6200 2150 1    24   ~ 0
 PSU_BTN_RAW
 Text Label 6500 1650 0    24   ~ 0
@@ -487,10 +358,10 @@ 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"
+F 4 "LED_SMD_RED_0805_20mA" H 3300 1550 50  0001 C CNN "StockRef"
+F 5 "" H 3300 1550 50  0001 C CNN "ordercode"
 F 6 "farnell" H 3300 1550 50  0001 C CNN "supplier"
 	1    3300 1550
 	0    -1   -1   0   
@@ -504,10 +375,10 @@ 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"
+F 5 "" H 3800 2250 50  0001 C CNN "ordercode"
 F 6 "farnell" H 3800 2250 50  0001 C CNN "supplier"
 	1    3800 2250
 	0    -1   -1   0   
@@ -671,10 +542,6 @@ Wire Wire Line
 	1800 4000 1650 4000
 Wire Wire Line
 	1650 4000 1650 3750
-Text HLabel 2100 6450 0    50   Input ~ 0
-MEAS_VBATT
-Text HLabel 2000 5800 0    50   Input ~ 0
-MEAS_EN
 Wire Wire Line
 	6200 1150 6200 1300
 $Comp
@@ -688,8 +555,6 @@ F 3 "~" H 2000 4000 50  0001 C CNN
 	1    2000 4000
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2400 6000 2400 6100
 $Comp
 L Battery_Management:MCP73831-2-OT_copy U1
 U 1 1 610E217F
@@ -728,66 +593,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
@@ -804,44 +609,34 @@ F 6 "farnell" H 6200 2400 50  0001 C CNN "supplier"
 	1    6200 2400
 	0    1    1    0   
 $EndComp
-Wire Wire Line
-	7250 1150 7250 1300
 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
-P 6800 2150
-F 0 "Q2" H 6600 2250 50  0000 L CNN
-F 1 "Dual_NMOS_2N7002PS" H 6050 1950 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 7000 2150 50  0001 C CNN
-F 3 "~" H 7000 2150 50  0001 C CNN
-F 4 "farnell" H 6800 2150 50  0001 C CNN "supplier"
-F 5 "1758102" H 6800 2150 50  0001 C CNN "ordercode"
-F 6 "2N7002PS" H 6800 2150 50  0001 C CNN "StockRef"
-	2    6800 2150
+P 5500 2100
+F 0 "Q2" H 5300 2200 50  0000 L CNN
+F 1 "2N7002PS (N)" H 4900 1950 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 5700 2100 50  0001 C CNN
+F 3 "~" H 5700 2100 50  0001 C CNN
+F 4 "farnell" H 5500 2100 50  0001 C CNN "supplier"
+F 5 "1758102" H 5500 2100 50  0001 C CNN "ordercode"
+F 6 "2N7002PS" H 5500 2100 50  0001 C CNN "StockRef"
+	2    5500 2100
 	-1   0    0    -1  
 $EndComp
 $Comp
 L Device:Q_Dual_NMOS_S1G1D2S2G2D1 Q2
 U 1 1 614CEBF8
-P 5500 2100
-F 0 "Q2" H 5705 2146 50  0000 L CNN
-F 1 "Dual_NMOS_2N7002PS" H 5705 2055 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 5700 2100 50  0001 C CNN
-F 3 "~" H 5700 2100 50  0001 C CNN
-F 4 "1758102" H 5500 2100 50  0001 C CNN "ordercode"
-F 5 "farnell" H 5500 2100 50  0001 C CNN "supplier"
-F 6 "2N7002PS" H 5500 2100 50  0001 C CNN "StockRef"
-	1    5500 2100
+P 6800 2150
+F 0 "Q2" H 7005 2196 50  0000 L CNN
+F 1 "2N7002PS (N)" H 7005 2105 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 7000 2150 50  0001 C CNN
+F 3 "~" H 7000 2150 50  0001 C CNN
+F 4 "1758102" H 6800 2150 50  0001 C CNN "ordercode"
+F 5 "farnell" H 6800 2150 50  0001 C CNN "supplier"
+F 6 "2N7002PS" H 6800 2150 50  0001 C CNN "StockRef"
+	1    6800 2150
 	-1   0    0    -1  
 $EndComp
 $Comp
@@ -849,7 +644,7 @@ L Device:Q_Dual_PMOS_S1G1D2S2G2D1 Q1
 U 2 1 614E105B
 P 7150 1650
 F 0 "Q1" H 7355 1604 50  0000 L CNN
-F 1 "Dual_PMOS_BSS84AKS,115" H 6450 1500 50  0000 L CNN
+F 1 "BSS84AKS,115 (P)" H 6450 1500 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 7200 1650 50  0001 C CNN
 F 3 "~" H 7200 1650 50  0001 C CNN
 F 4 "BSS84AKS,115" H 7150 1650 50  0001 C CNN "StockRef"
@@ -859,20 +654,6 @@ F 6 "farnell" H 7150 1650 50  0001 C CNN "supplier"
 	1    0    0    1   
 $EndComp
 $Comp
-L Device:Q_Dual_PMOS_S1G1D2S2G2D1 Q1
-U 1 1 614E2589
-P 2300 5800
-F 0 "Q1" H 2505 5754 50  0000 L CNN
-F 1 "Dual_PMOS_BSS84AKS,115" H 2505 5845 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 2350 5800 50  0001 C CNN
-F 3 "~" H 2350 5800 50  0001 C CNN
-F 4 "BSS84AKS,115" H 2300 5800 50  0001 C CNN "StockRef"
-F 5 "1972665" H 2300 5800 50  0001 C CNN "ordercode"
-F 6 "farnell" H 2300 5800 50  0001 C CNN "supplier"
-	1    2300 5800
-	1    0    0    1   
-$EndComp
-$Comp
 L Regulator_Switching:XCL214B333DR U2
 U 1 1 6148D543
 P 8050 1300
@@ -921,8 +702,6 @@ Wire Wire Line
 	8050 1950 8100 1950
 Text Label 8050 950  0    50   ~ 0
 Lx_L1
-Text Label 2400 6100 0    50   ~ 0
-BATT_MEAS
 Text Label 6050 3200 0    24   ~ 0
 PSU_BTN_RAW
 $Comp
@@ -962,4 +741,146 @@ F 3 "" H 5950 3600 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	5950 3600 5950 3550
+$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
@@ -0,0 +1,524 @@
+EESchema Schematic File Version 4
+EELAYER 30 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 6 6
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L Sensor_Magnetic:DRV5055A3xDBZxQ1 U?
+U 1 1 61B6475A
+P 5400 1700
+AR Path="/60FFCEAC/61B6475A" Ref="U?"  Part="1" 
+AR Path="/61B5E734/61B6475A" Ref="U8"  Part="1" 
+F 0 "U8" H 5500 2050 50  0000 R CNN
+F 1 "DRV5055A3xDBZxQ1" H 6150 1350 50  0000 R CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 5400 1700 50  0001 C CNN
+F 3 "https://www.ti.com/lit/ds/symlink/drv5055-q1.pdf" H 5400 1700 50  0001 C CNN
+F 4 "DRV5055" H 5400 1700 50  0001 C CNN "MPN"
+F 5 "TI" H 5400 1700 50  0001 C CNN "Manufacturer"
+F 6 "3008999" H 5400 1700 50  0001 C CNN "ordercode"
+F 7 "farnell" H 5400 1700 50  0001 C CNN "supplier"
+	1    5400 1700
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3V3 #PWR?
+U 1 1 61B64760
+P 5300 1150
+AR Path="/60FFCEAC/61B64760" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B64760" Ref="#PWR0101"  Part="1" 
+F 0 "#PWR0101" H 5300 1000 50  0001 C CNN
+F 1 "+3V3" H 5315 1323 50  0000 C CNN
+F 2 "" H 5300 1150 50  0001 C CNN
+F 3 "" H 5300 1150 50  0001 C CNN
+	1    5300 1150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5300 1150 5300 1250
+$Comp
+L power:GND #PWR?
+U 1 1 61B64767
+P 5300 2250
+AR Path="/60FFCEAC/61B64767" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B64767" Ref="#PWR0102"  Part="1" 
+F 0 "#PWR0102" H 5300 2000 50  0001 C CNN
+F 1 "GND" H 5305 2077 50  0000 C CNN
+F 2 "" H 5300 2250 50  0001 C CNN
+F 3 "" H 5300 2250 50  0001 C CNN
+	1    5300 2250
+	1    0    0    -1  
+$EndComp
+Text Label 6100 1700 2    50   ~ 0
+HALL_OUT
+Text Label 7400 4850 0    50   ~ 0
+HALL_OUT
+$Comp
+L power:+3V3 #PWR?
+U 1 1 61B6476F
+P 8300 4050
+AR Path="/60FFCEAC/61B6476F" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B6476F" Ref="#PWR0134"  Part="1" 
+F 0 "#PWR0134" H 8300 3900 50  0001 C CNN
+F 1 "+3V3" H 8315 4223 50  0000 C CNN
+F 2 "" H 8300 4050 50  0001 C CNN
+F 3 "" H 8300 4050 50  0001 C CNN
+	1    8300 4050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8300 4050 8300 4150
+Text Label 9100 4650 2    50   ~ 0
+ADS_SCL
+Text Label 9100 4750 2    50   ~ 0
+ADS_SDA
+Text Label 9100 4450 2    50   ~ 0
+ADS_RDY
+$Comp
+L power:GND #PWR?
+U 1 1 61B6477C
+P 8300 5150
+AR Path="/60FFCEAC/61B6477C" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B6477C" Ref="#PWR0135"  Part="1" 
+F 0 "#PWR0135" H 8300 4900 50  0001 C CNN
+F 1 "GND" V 8305 5022 50  0000 R CNN
+F 2 "" H 8300 5150 50  0001 C CNN
+F 3 "" H 8300 5150 50  0001 C CNN
+	1    8300 5150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8300 5150 8300 5050
+$Comp
+L power:GND #PWR?
+U 1 1 61B64783
+P 9000 5150
+AR Path="/60FFCEAC/61B64783" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B64783" Ref="#PWR0137"  Part="1" 
+F 0 "#PWR0137" H 9000 4900 50  0001 C CNN
+F 1 "GND" V 9005 5022 50  0000 R CNN
+F 2 "" H 9000 5150 50  0001 C CNN
+F 3 "" H 9000 5150 50  0001 C CNN
+	1    9000 5150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9000 5150 9000 4850
+Wire Wire Line
+	9000 4850 8700 4850
+Text Notes 7800 5550 0    50   ~ 0
+default  i2c address = 0x48
+$Comp
+L Device:C C?
+U 1 1 61B6478E
+P 6850 4650
+AR Path="/60FFCEAC/61B6478E" Ref="C?"  Part="1" 
+AR Path="/61B5E734/61B6478E" Ref="C18"  Part="1" 
+F 0 "C18" H 6965 4696 50  0000 L CNN
+F 1 "100nF" H 6965 4605 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 6888 4500 50  0001 C CNN
+F 3 "~" H 6850 4650 50  0001 C CNN
+F 4 "2524678" H 6850 4650 50  0001 C CNN "ordercode"
+F 5 "farnell" H 6850 4650 50  0001 C CNN "supplier"
+	1    6850 4650
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3V3 #PWR?
+U 1 1 61B64794
+P 6850 4050
+AR Path="/60FFCEAC/61B64794" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B64794" Ref="#PWR0138"  Part="1" 
+F 0 "#PWR0138" H 6850 3900 50  0001 C CNN
+F 1 "+3V3" H 6865 4223 50  0000 C CNN
+F 2 "" H 6850 4050 50  0001 C CNN
+F 3 "" H 6850 4050 50  0001 C CNN
+	1    6850 4050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6850 4050 6850 4500
+$Comp
+L power:GND #PWR?
+U 1 1 61B6479B
+P 6850 5150
+AR Path="/60FFCEAC/61B6479B" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B6479B" Ref="#PWR0139"  Part="1" 
+F 0 "#PWR0139" H 6850 4900 50  0001 C CNN
+F 1 "GND" V 6855 5022 50  0000 R CNN
+F 2 "" H 6850 5150 50  0001 C CNN
+F 3 "" H 6850 5150 50  0001 C CNN
+	1    6850 5150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6850 5150 6850 4800
+$Comp
+L Device:C C?
+U 1 1 61B647A4
+P 4800 1700
+AR Path="/60FFCEAC/61B647A4" Ref="C?"  Part="1" 
+AR Path="/61B5E734/61B647A4" Ref="C22"  Part="1" 
+F 0 "C22" H 4915 1746 50  0000 L CNN
+F 1 "100nF" H 4915 1655 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4838 1550 50  0001 C CNN
+F 3 "~" H 4800 1700 50  0001 C CNN
+F 4 "2524678" H 4800 1700 50  0001 C CNN "ordercode"
+F 5 "farnell" H 4800 1700 50  0001 C CNN "supplier"
+	1    4800 1700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5300 1250 4800 1250
+Wire Wire Line
+	4800 1250 4800 1550
+Connection ~ 5300 1250
+Wire Wire Line
+	5300 1250 5300 1300
+Wire Wire Line
+	5300 2100 5300 2150
+Wire Wire Line
+	4800 1850 4800 2150
+Wire Wire Line
+	4800 2150 5300 2150
+Connection ~ 5300 2150
+Wire Wire Line
+	5300 2150 5300 2250
+$Comp
+L Device:C C?
+U 1 1 61B647B5
+P 6500 2000
+AR Path="/60FFCEAC/61B647B5" Ref="C?"  Part="1" 
+AR Path="/61B5E734/61B647B5" Ref="C28"  Part="1" 
+F 0 "C28" H 6615 2046 50  0000 L CNN
+F 1 "100nF" H 6615 1955 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 6538 1850 50  0001 C CNN
+F 3 "~" H 6500 2000 50  0001 C CNN
+F 4 "2524678" H 6500 2000 50  0001 C CNN "ordercode"
+F 5 "farnell" H 6500 2000 50  0001 C CNN "supplier"
+	1    6500 2000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6500 1850 6500 1700
+Wire Wire Line
+	5700 1700 6500 1700
+$Comp
+L power:GND #PWR?
+U 1 1 61B647BD
+P 6500 2250
+AR Path="/60FFCEAC/61B647BD" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B647BD" Ref="#PWR0140"  Part="1" 
+F 0 "#PWR0140" H 6500 2000 50  0001 C CNN
+F 1 "GND" H 6505 2077 50  0000 C CNN
+F 2 "" H 6500 2250 50  0001 C CNN
+F 3 "" H 6500 2250 50  0001 C CNN
+	1    6500 2250
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6500 2250 6500 2150
+$Comp
+L Device:R R?
+U 1 1 61B647C7
+P 5700 4350
+AR Path="/60FFCEAC/61B647C7" Ref="R?"  Part="1" 
+AR Path="/61B5E734/61B647C7" Ref="R13"  Part="1" 
+F 0 "R13" H 5770 4396 50  0000 L CNN
+F 1 "10K" H 5770 4305 50  0000 L CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 5630 4350 50  0001 C CNN
+F 3 "~" H 5700 4350 50  0001 C CNN
+F 4 "R10K_0402" H 5700 4350 50  0001 C CNN "StockRef"
+F 5 "2447096" H 5700 4350 50  0001 C CNN "ordercode"
+F 6 "farnell" H 5700 4350 50  0001 C CNN "supplier"
+	1    5700 4350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 61B647D0
+P 6000 4350
+AR Path="/60FFCEAC/61B647D0" Ref="R?"  Part="1" 
+AR Path="/61B5E734/61B647D0" Ref="R16"  Part="1" 
+F 0 "R16" H 6070 4396 50  0000 L CNN
+F 1 "10K" H 6070 4305 50  0000 L CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 5930 4350 50  0001 C CNN
+F 3 "~" H 6000 4350 50  0001 C CNN
+F 4 "R10K_0402" H 6000 4350 50  0001 C CNN "StockRef"
+F 5 "2447096" H 6000 4350 50  0001 C CNN "ordercode"
+F 6 "farnell" H 6000 4350 50  0001 C CNN "supplier"
+	1    6000 4350
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3V3 #PWR?
+U 1 1 61B647D6
+P 5700 4100
+AR Path="/60FFCEAC/61B647D6" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B647D6" Ref="#PWR0147"  Part="1" 
+F 0 "#PWR0147" H 5700 3950 50  0001 C CNN
+F 1 "+3V3" H 5715 4273 50  0000 C CNN
+F 2 "" H 5700 4100 50  0001 C CNN
+F 3 "" H 5700 4100 50  0001 C CNN
+	1    5700 4100
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3V3 #PWR?
+U 1 1 61B647DC
+P 6000 4100
+AR Path="/60FFCEAC/61B647DC" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B647DC" Ref="#PWR0148"  Part="1" 
+F 0 "#PWR0148" H 6000 3950 50  0001 C CNN
+F 1 "+3V3" H 6015 4273 50  0000 C CNN
+F 2 "" H 6000 4100 50  0001 C CNN
+F 3 "" H 6000 4100 50  0001 C CNN
+	1    6000 4100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6000 4100 6000 4200
+Wire Wire Line
+	5700 4100 5700 4200
+Text Label 6450 4650 2    50   ~ 0
+ADS_SCL
+Text Label 6450 4750 2    50   ~ 0
+ADS_SDA
+Wire Wire Line
+	6450 4750 5700 4750
+Wire Wire Line
+	5700 4750 5700 4500
+Wire Wire Line
+	6450 4650 6000 4650
+Wire Wire Line
+	6000 4650 6000 4500
+$Comp
+L Analog_ADC:ADS1115IDGS U?
+U 1 1 61B647EA
+P 8300 4650
+AR Path="/60FFCEAC/61B647EA" Ref="U?"  Part="1" 
+AR Path="/61B5E734/61B647EA" Ref="U6"  Part="1" 
+F 0 "U6" H 8450 5150 50  0000 C CNN
+F 1 "ADS1114IDGS" H 8600 4300 50  0000 C CNN
+F 2 "Package_SO:TSSOP-10_3x3mm_P0.5mm" H 8300 4150 50  0001 C CNN
+F 3 "http://www.ti.com/lit/ds/symlink/ads1113.pdf" H 8250 3750 50  0001 C CNN
+	1    8300 4650
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7400 4850 7900 4850
+$Comp
+L power:GND #PWR?
+U 1 1 61B647F2
+P 7750 4650
+AR Path="/60FFCEAC/61B647F2" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B647F2" Ref="#PWR0155"  Part="1" 
+F 0 "#PWR0155" H 7750 4400 50  0001 C CNN
+F 1 "GND" V 7755 4522 50  0000 R CNN
+F 2 "" H 7750 4650 50  0001 C CNN
+F 3 "" H 7750 4650 50  0001 C CNN
+	1    7750 4650
+	0    1    1    0   
+$EndComp
+$Comp
+L power:GND #PWR?
+U 1 1 61B647F8
+P 7750 4550
+AR Path="/60FFCEAC/61B647F8" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B647F8" Ref="#PWR0158"  Part="1" 
+F 0 "#PWR0158" H 7750 4300 50  0001 C CNN
+F 1 "GND" V 7755 4422 50  0000 R CNN
+F 2 "" H 7750 4550 50  0001 C CNN
+F 3 "" H 7750 4550 50  0001 C CNN
+	1    7750 4550
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	7750 4550 7900 4550
+Wire Wire Line
+	7900 4650 7750 4650
+Text HLabel 9250 4750 2    50   BiDi ~ 0
+I2C_SDA
+Text HLabel 9250 4650 2    50   Input ~ 0
+I2C_SCL
+Wire Wire Line
+	8700 4650 9250 4650
+Wire Wire Line
+	8700 4750 9250 4750
+Text HLabel 9250 4450 2    50   Input ~ 0
+ADS_RDY
+Wire Wire Line
+	8700 4450 9250 4450
+$Comp
+L Device:R R?
+U 1 1 61B725CE
+P 2450 2350
+AR Path="/61B725CE" Ref="R?"  Part="1" 
+AR Path="/6158A412/61B725CE" Ref="R?"  Part="1" 
+AR Path="/60FE1698/61B725CE" Ref="R?"  Part="1" 
+AR Path="/61B5E734/61B725CE" Ref="R4"  Part="1" 
+F 0 "R4" H 2520 2396 50  0000 L CNN
+F 1 "10K" H 2520 2305 50  0000 L CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 2380 2350 50  0001 C CNN
+F 3 "~" H 2450 2350 50  0001 C CNN
+F 4 "R10K_0402" H 2450 2350 50  0001 C CNN "StockRef"
+F 5 "2447096" H 2450 2350 50  0001 C CNN "ordercode"
+F 6 "farnell" H 2450 2350 50  0001 C CNN "supplier"
+	1    2450 2350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 61B725D7
+P 2450 1950
+AR Path="/61B725D7" Ref="R?"  Part="1" 
+AR Path="/6158A412/61B725D7" Ref="R?"  Part="1" 
+AR Path="/60FE1698/61B725D7" Ref="R?"  Part="1" 
+AR Path="/61B5E734/61B725D7" Ref="R3"  Part="1" 
+F 0 "R3" H 2520 1996 50  0000 L CNN
+F 1 "4k7" H 2520 1905 50  0000 L CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 2380 1950 50  0001 C CNN
+F 3 "~" H 2450 1950 50  0001 C CNN
+F 4 "R4K7_0402" H 2450 1950 50  0001 C CNN "StockRef"
+F 5 "2073069" H 2450 1950 50  0001 C CNN "ordercode"
+F 6 "farnell" H 2450 1950 50  0001 C CNN "supplier"
+	1    2450 1950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2450 2150 2450 2100
+Wire Wire Line
+	2450 2200 2450 2150
+Connection ~ 2450 2150
+$Comp
+L power:+BATT #PWR?
+U 1 1 61B725E1
+P 2450 1150
+AR Path="/61B725E1" Ref="#PWR?"  Part="1" 
+AR Path="/6158A412/61B725E1" Ref="#PWR?"  Part="1" 
+AR Path="/60FE1698/61B725E1" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B725E1" Ref="#PWR0159"  Part="1" 
+F 0 "#PWR0159" H 2450 1000 50  0001 C CNN
+F 1 "+BATT" H 2465 1323 50  0000 C CNN
+F 2 "" H 2450 1150 50  0001 C CNN
+F 3 "" H 2450 1150 50  0001 C CNN
+	1    2450 1150
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR?
+U 1 1 61B725E7
+P 2450 2600
+AR Path="/61B725E7" Ref="#PWR?"  Part="1" 
+AR Path="/6158A412/61B725E7" Ref="#PWR?"  Part="1" 
+AR Path="/60FE1698/61B725E7" Ref="#PWR?"  Part="1" 
+AR Path="/61B5E734/61B725E7" Ref="#PWR0160"  Part="1" 
+F 0 "#PWR0160" H 2450 2350 50  0001 C CNN
+F 1 "GND" H 2455 2427 50  0000 C CNN
+F 2 "" H 2450 2600 50  0001 C CNN
+F 3 "" H 2450 2600 50  0001 C CNN
+	1    2450 2600
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2450 2600 2450 2550
+Wire Wire Line
+	2450 1150 2450 1200
+Connection ~ 2450 1200
+Wire Wire Line
+	2450 1200 2450 1300
+$Comp
+L Device:C C?
+U 1 1 61B725F4
+P 2200 2350
+AR Path="/61B725F4" Ref="C?"  Part="1" 
+AR Path="/6158A412/61B725F4" Ref="C?"  Part="1" 
+AR Path="/60FE1698/61B725F4" Ref="C?"  Part="1" 
+AR Path="/61B5E734/61B725F4" Ref="C2"  Part="1" 
+F 0 "C2" H 2315 2396 50  0000 L CNN
+F 1 "100nF" H 2315 2305 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 2238 2200 50  0001 C CNN
+F 3 "~" H 2200 2350 50  0001 C CNN
+F 4 "C100n_0603" H 2200 2350 50  0001 C CNN "StockRef"
+F 5 "2524678" H 2200 2350 50  0001 C CNN "ordercode"
+F 6 "farnell" H 2200 2350 50  0001 C CNN "supplier"
+	1    2200 2350
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	2200 2200 2200 2150
+Wire Wire Line
+	2200 2500 2200 2550
+Wire Wire Line
+	2200 2550 2450 2550
+Connection ~ 2450 2550
+Wire Wire Line
+	2450 2550 2450 2500
+Wire Wire Line
+	2150 1500 2100 1500
+$Comp
+L Device:R R?
+U 1 1 61B72603
+P 2100 1350
+AR Path="/61B72603" Ref="R?"  Part="1" 
+AR Path="/6158A412/61B72603" Ref="R?"  Part="1" 
+AR Path="/60FE1698/61B72603" Ref="R?"  Part="1" 
+AR Path="/61B5E734/61B72603" Ref="R2"  Part="1" 
+F 0 "R2" H 2170 1396 50  0000 L CNN
+F 1 "10K" H 2170 1305 50  0000 L CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 2030 1350 50  0001 C CNN
+F 3 "~" H 2100 1350 50  0001 C CNN
+F 4 "R10K_0402" H 2100 1350 50  0001 C CNN "StockRef"
+F 5 "2447096" H 2100 1350 50  0001 C CNN "ordercode"
+F 6 "farnell" H 2100 1350 50  0001 C CNN "supplier"
+	1    2100 1350
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	2100 1200 2450 1200
+Connection ~ 2100 1500
+Wire Wire Line
+	2050 1500 2100 1500
+Connection ~ 2200 2150
+Wire Wire Line
+	2200 2150 2450 2150
+Text HLabel 2050 1500 0    50   Input ~ 0
+MEAS_EN
+Wire Wire Line
+	2450 1700 2450 1800
+$Comp
+L Device:Q_Dual_PMOS_S1G1D2S2G2D1 Q?
+U 1 1 61B72614
+P 2350 1500
+AR Path="/60FE1698/61B72614" Ref="Q?"  Part="1" 
+AR Path="/61B5E734/61B72614" Ref="Q1"  Part="1" 
+F 0 "Q1" H 2555 1454 50  0000 L CNN
+F 1 "BSS84AKS,115 (P)" H 2555 1545 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 2400 1500 50  0001 C CNN
+F 3 "~" H 2400 1500 50  0001 C CNN
+F 4 "BSS84AKS,115" H 2350 1500 50  0001 C CNN "StockRef"
+F 5 "1972665" H 2350 1500 50  0001 C CNN "ordercode"
+F 6 "farnell" H 2350 1500 50  0001 C CNN "supplier"
+	1    2350 1500
+	1    0    0    1   
+$EndComp
+Text Label 2450 1800 0    50   ~ 0
+BATT_MEAS
+Text Label 1750 2150 0    50   ~ 0
+Meas_vbatt
+Wire Wire Line
+	1750 2150 2200 2150
+Text Label 7350 4750 0    50   ~ 0
+Meas_vbatt
+Wire Wire Line
+	7350 4750 7900 4750
+$EndSCHEMATC
@@ -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);
-  }
-
-}
@@ -1,20 +0,0 @@
-#######################################
-# Syntax Coloring Map HID
-#######################################
-
-#######################################
-# Datatypes (KEYWORD1)
-#######################################
-
-CR95HF	KEYWORD1
-
-#######################################
-# Methods and Functions (KEYWORD2)
-#######################################
-begin	KEYWORD2
-readSerial	KEYWORD2
-getID	KEYWORD2
-
-#######################################
-# Constants (LITERAL1)
-#######################################
@@ -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=*
@@ -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;
-}
@@ -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; 
-};
@@ -8,10 +8,26 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html

-[env:esp32-pico]
-platform = espressif32
-board = m5stack-atom
+
+; [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 = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
 framework = arduino
+board = esp32-s2-saola-1
 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
@@ -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
@@ -1,7 +1,7 @@
 #include "config.h"
 #include <vector>
 #include "FS.h"
-#include "LITTLEFS.h"
+#include "littleFS.h"
 #include "ArduinoJson.h"

 const char *tagConfigfile = "/tagconfig.json";
@@ -16,7 +16,7 @@ std::vector<tagConfig> tags;
 void loadConfig(const char *fname)
 {
  Serial.println("config: load");
-  File file = LITTLEFS.open(fname);
+  File file = LittleFS.open(fname);
  StaticJsonDocument<512> doc;
  DeserializationError error = deserializeJson(doc, file);
  if (error)
@@ -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);
  }
 }
 //*****************************************************************************************//
+
@@ -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);
@@ -3,7 +3,7 @@

 #include <Arduino.h>
 #include "FS.h"
-#include <LITTLEFS.h>
+#include <LittleFS.h>

 #ifndef CONFIG_LITTLEFS_FOR_IDF_3_2
 #include <time.h>
@@ -89,12 +89,12 @@ void readFile(fs::FS &fs, const char *path)

 void initStorage()
 {
-  if (!LITTLEFS.begin(FORMAT_LITTLEFS_IF_FAILED))
+  if (!LittleFS.begin(FORMAT_LITTLEFS_IF_FAILED))
  {
    Serial.println("LITTLEFS Mount Failed");
    return;
  }
-  listDir(LITTLEFS, "/", 0);
+  listDir(LittleFS, "/", 0);
 }

 void handleStorage()
@@ -0,0 +1,5 @@
+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.16.0)
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(leo_muziekdoos_esp32S2)
@@ -0,0 +1,39 @@
+
+This directory is intended for project header files.
+
+A header file is a file containing C declarations and macro definitions
+to be shared between several project source files. You request the use of a
+header file in your project source file (C, C++, etc) located in `src` folder
+by including it, with the C preprocessing directive `#include'.
+
+```src/main.c
+
+#include "header.h"
+
+int main (void)
+{
+ ...
+}
+```
+
+Including a header file produces the same results as copying the header file
+into each source file that needs it. Such copying would be time-consuming
+and error-prone. With a header file, the related declarations appear
+in only one place. If they need to be changed, they can be changed in one
+place, and programs that include the header file will automatically use the
+new version when next recompiled. The header file eliminates the labor of
+finding and changing all the copies as well as the risk that a failure to
+find one copy will result in inconsistencies within a program.
+
+In C, the usual convention is to give header files names that end with `.h'.
+It is most portable to use only letters, digits, dashes, and underscores in
+header file names, and at most one dot.
+
+Read more about using header files in official GCC documentation:
+
+* Include Syntax
+* Include Operation
+* Once-Only Headers
+* Computed Includes
+
+https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
@@ -0,0 +1,46 @@
+
+This directory is intended for project specific (private) libraries.
+PlatformIO will compile them to static libraries and link into executable file.
+
+The source code of each library should be placed in a an own separate directory
+("lib/your_library_name/[here are source files]").
+
+For example, see a structure of the following two libraries `Foo` and `Bar`:
+
+|--lib
+|  |
+|  |--Bar
+|  |  |--docs
+|  |  |--examples
+|  |  |--src
+|  |     |- Bar.c
+|  |     |- Bar.h
+|  |  |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
+|  |
+|  |--Foo
+|  |  |- Foo.c
+|  |  |- Foo.h
+|  |
+|  |- README --> THIS FILE
+|
+|- platformio.ini
+|--src
+   |- main.c
+
+and a contents of `src/main.c`:
+```
+#include <Foo.h>
+#include <Bar.h>
+
+int main (void)
+{
+  ...
+}
+
+```
+
+PlatformIO Library Dependency Finder will find automatically dependent
+libraries scanning project source files.
+
+More information about PlatformIO Library Dependency Finder
+- https://docs.platformio.org/page/librarymanager/ldf.html
@@ -0,0 +1,15 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
+[env:esp32-s2-saola-1]
+platform = espressif32
+board = esp32-s2-saola-1
+framework = espidf
+upload_protocol = esptool
@@ -0,0 +1,6 @@
+# This file was automatically generated for projects
+# without default 'CMakeLists.txt' file.
+
+FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/src/*.*)
+
+idf_component_register(SRCS ${app_sources})
@@ -0,0 +1,74 @@
+/* USB Example
+
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+
+// DESCRIPTION:
+// This example contains minimal code to make ESP32-S2 based device
+// recognizable by USB-host devices as a USB Serial Device.
+
+#include <stdint.h>
+#include "esp_log.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "tinyusb.h"
+#include "tusb_cdc_acm.h"
+#include "sdkconfig.h"
+
+static const char *TAG = "example";
+static uint8_t buf[CONFIG_TINYUSB_CDC_RX_BUFSIZE + 1];
+
+void tinyusb_cdc_rx_callback(int itf, cdcacm_event_t *event)
+{
+    /* initialization */
+    size_t rx_size = 0;
+
+    /* read */
+    esp_err_t ret = tinyusb_cdcacm_read(itf, buf, CONFIG_TINYUSB_CDC_RX_BUFSIZE, &rx_size);
+    if (ret == ESP_OK) {
+        buf[rx_size] = '\0';
+        ESP_LOGI(TAG, "Got data (%d bytes): %s", rx_size, buf);
+    } else {
+        ESP_LOGE(TAG, "Read error");
+    }
+
+    /* write back */
+    tinyusb_cdcacm_write_queue(itf, buf, rx_size);
+    tinyusb_cdcacm_write_flush(itf, 0);
+}
+
+void tinyusb_cdc_line_state_changed_callback(int itf, cdcacm_event_t *event)
+{
+    int dtr = event->line_state_changed_data.dtr;
+    int rst = event->line_state_changed_data.rts;
+    ESP_LOGI(TAG, "Line state changed! dtr:%d, rst:%d", dtr, rst);
+}
+
+void app_main(void)
+{
+    ESP_LOGI(TAG, "USB initialization");
+    tinyusb_config_t tusb_cfg = {}; // the configuration using default values
+    ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
+
+    tinyusb_config_cdcacm_t amc_cfg = {
+        .usb_dev = TINYUSB_USBDEV_0,
+        .cdc_port = TINYUSB_CDC_ACM_0,
+        .rx_unread_buf_sz = 64,
+        .callback_rx = &tinyusb_cdc_rx_callback, // the first way to register a callback
+        .callback_rx_wanted_char = NULL,
+        .callback_line_state_changed = NULL,
+        .callback_line_coding_changed = NULL
+    };
+
+    ESP_ERROR_CHECK(tusb_cdc_acm_init(&amc_cfg));
+    /* the second way to register a callback */
+    ESP_ERROR_CHECK(tinyusb_cdcacm_register_callback(
+                        TINYUSB_CDC_ACM_0,
+                        CDC_EVENT_LINE_STATE_CHANGED,
+                        &tinyusb_cdc_line_state_changed_callback));
+    ESP_LOGI(TAG, "USB initialization DONE");
+}
@@ -0,0 +1,11 @@
+
+This directory is intended for PlatformIO Unit Testing and project tests.
+
+Unit Testing is a software testing method by which individual units of
+source code, sets of one or more MCU program modules together with associated
+control data, usage procedures, and operating procedures, are tested to
+determine whether they are fit for use. Unit testing finds problems early
+in the development cycle.
+
+More information about PlatformIO Unit Testing:
+- https://docs.platformio.org/page/plus/unit-testing.html
Author	SHA1	Message	Date
willem	174e79efcd	pcbv3	2021-12-08 17:28:23 +01:00
willem	4e7c2dae94	update V3 PCB and schematic	2021-12-02 17:03:27 +01:00
willem	dd50d8fb5e	pn532 head	2021-11-26 11:14:05 +01:00
willem	164671c43c	prep v3 firmware	2021-11-26 11:13:09 +01:00
willem	272e25088f	prep v3 firmware	2021-11-26 11:12:46 +01:00
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	4927213147	updated schematic v3	2021-11-09 21:20:32 +01:00
willem	c0a0550cb5	update cache	2021-11-08 17:00:33 +01:00
willem	007e8c291e	added ref schematic	2021-11-08 16:59:32 +01:00
willem	463b2a865a	update pcb and sch	2021-11-08 16:58:06 +01:00
willem	072414354d	introduce ESP32-S2	2021-11-08 16:25:57 +01:00
willem	731f82a602	updated PCB for ordering	2021-10-29 13:55:42 +02:00
willem	33a19e6475	improved pcb	2021-10-28 20:34:31 +02:00