update + merge
This commit is contained in:
9
.gitmodules
vendored
9
.gitmodules
vendored
@@ -4,15 +4,6 @@
|
||||
[submodule "FW/leo_muziekdoos_esp32/lib/littleFS_esp32"]
|
||||
path = FW/leo_muziekdoos_esp32/lib/littleFS_esp32
|
||||
url = http://192.168.2.3/Bonobo.Git.Server/LittleFS_esp32.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
|
||||
[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
|
||||
|
||||
@@ -222,11 +222,11 @@ X 4 4 0 -200 50 U 50 50 1 1 P
|
||||
ENDDRAW
|
||||
ENDDEF
|
||||
#
|
||||
# Device_D
|
||||
# Device_D_Schottky
|
||||
#
|
||||
DEF Device_D D 0 40 N N 1 F N
|
||||
DEF Device_D_Schottky D 0 40 N N 1 F N
|
||||
F0 "D" 0 100 50 H V C CNN
|
||||
F1 "Device_D" 0 -100 50 H V C CNN
|
||||
F1 "Device_D_Schottky" 0 -100 50 H V C CNN
|
||||
F2 "" 0 0 50 H I C CNN
|
||||
F3 "" 0 0 50 H I C CNN
|
||||
$FPLIST
|
||||
@@ -236,9 +236,9 @@ $FPLIST
|
||||
D_*
|
||||
$ENDFPLIST
|
||||
DRAW
|
||||
P 2 0 1 10 -50 50 -50 -50 N
|
||||
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
|
||||
ENDDRAW
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -97,23 +97,23 @@ Wire Wire Line
|
||||
$Comp
|
||||
L Device:R R11
|
||||
U 1 1 613D252C
|
||||
P 4800 2850
|
||||
F 0 "R11" H 4870 2896 50 0000 L CNN
|
||||
F 1 "10K" H 4870 2805 50 0000 L CNN
|
||||
F 2 "Resistor_SMD:R_0402_1005Metric" V 4730 2850 50 0001 C CNN
|
||||
F 3 "~" H 4800 2850 50 0001 C CNN
|
||||
F 4 "R10K_0402" H 4800 2850 50 0001 C CNN "StockRef"
|
||||
F 5 "2447096" H 4800 2850 50 0001 C CNN "ordercode"
|
||||
F 6 "farnell" H 4800 2850 50 0001 C CNN "supplier"
|
||||
1 4800 2850
|
||||
P 4650 2850
|
||||
F 0 "R11" H 4720 2896 50 0000 L CNN
|
||||
F 1 "10K" H 4720 2805 50 0000 L CNN
|
||||
F 2 "Resistor_SMD:R_0402_1005Metric" V 4580 2850 50 0001 C CNN
|
||||
F 3 "~" H 4650 2850 50 0001 C CNN
|
||||
F 4 "R10K_0402" H 4650 2850 50 0001 C CNN "StockRef"
|
||||
F 5 "2447096" H 4650 2850 50 0001 C CNN "ordercode"
|
||||
F 6 "farnell" H 4650 2850 50 0001 C CNN "supplier"
|
||||
1 4650 2850
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
Wire Wire Line
|
||||
5200 3150 4800 3150
|
||||
5200 3150 4650 3150
|
||||
Wire Wire Line
|
||||
4800 3150 4800 3000
|
||||
4650 3150 4650 3000
|
||||
Wire Wire Line
|
||||
5200 2650 5600 2650
|
||||
5550 2650 5600 2650
|
||||
Wire Wire Line
|
||||
5600 2650 5600 2950
|
||||
Text Label 6650 3150 2 50 ~ 0
|
||||
@@ -179,7 +179,7 @@ Wire Wire Line
|
||||
5700 2400 5700 2950
|
||||
Wire Wire Line
|
||||
6250 2750 6250 2700
|
||||
Text Label 4250 2650 0 50 ~ 0
|
||||
Text Label 4900 2650 0 50 ~ 0
|
||||
USB_PWR
|
||||
Text Label 4900 3150 0 50 ~ 0
|
||||
CP_RST
|
||||
@@ -188,14 +188,14 @@ Wire Wire Line
|
||||
Text Label 4700 3650 0 50 ~ 0
|
||||
USB_PWR
|
||||
Wire Wire Line
|
||||
5700 2400 4800 2400
|
||||
5700 2400 4650 2400
|
||||
Wire Wire Line
|
||||
4800 2400 4800 2700
|
||||
4650 2400 4650 2700
|
||||
Text Label 5100 2400 0 50 ~ 0
|
||||
PROG_VCC
|
||||
Text HLabel 3900 2400 0 50 Output ~ 0
|
||||
PROG_VCC
|
||||
Connection ~ 4800 2400
|
||||
Connection ~ 4650 2400
|
||||
$Comp
|
||||
L power:GND #PWR0126
|
||||
U 1 1 61638F0C
|
||||
@@ -225,29 +225,22 @@ USB_D-
|
||||
Text HLabel 4700 3650 0 50 Input ~ 0
|
||||
USB_PWR
|
||||
$Comp
|
||||
L Device:Q_Dual_NMOS_S1G1D2S2G2D1 Q3
|
||||
U 1 1 616482EA
|
||||
P 1850 3950
|
||||
F 0 "Q3" H 2054 3996 50 0000 L CNN
|
||||
F 1 "Q_Dual_NMOS_S1G1D2S2G2D1" H 2054 3905 50 0000 L CNN
|
||||
F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 2050 3950 50 0001 C CNN
|
||||
F 3 "~" H 2050 3950 50 0001 C CNN
|
||||
1 1850 3950
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L Device:D D?
|
||||
L Device:D_Schottky D4
|
||||
U 1 1 616BED7E
|
||||
P 5050 2650
|
||||
F 0 "D?" H 5050 2433 50 0000 C CNN
|
||||
F 1 "D" H 5050 2524 50 0000 C CNN
|
||||
F 2 "" H 5050 2650 50 0001 C CNN
|
||||
F 3 "~" H 5050 2650 50 0001 C CNN
|
||||
1 5050 2650
|
||||
P 5400 2650
|
||||
F 0 "D4" H 5400 2433 50 0000 C CNN
|
||||
F 1 "PMEG4005" H 5400 2524 50 0000 C CNN
|
||||
F 2 "Diode_SMD:D_SOD-323" H 5400 2650 50 0001 C CNN
|
||||
F 3 "~" H 5400 2650 50 0001 C CNN
|
||||
F 4 "PMEG4005AEA, 115" H 5400 2650 50 0001 C CNN "MPN"
|
||||
F 5 "NEXPERIA" H 5400 2650 50 0001 C CNN "Manufacturer"
|
||||
F 6 "8738025" H 5400 2650 50 0001 C CNN "ordercode"
|
||||
F 7 "farnell" H 5400 2650 50 0001 C CNN "supplier"
|
||||
1 5400 2650
|
||||
-1 0 0 1
|
||||
$EndComp
|
||||
Wire Wire Line
|
||||
4250 2650 4900 2650
|
||||
4900 2650 5250 2650
|
||||
Wire Wire Line
|
||||
3900 2400 4800 2400
|
||||
3900 2400 4650 2400
|
||||
$EndSCHEMATC
|
||||
|
||||
@@ -179,7 +179,7 @@ Wire Wire Line
|
||||
5700 2400 5700 2950
|
||||
Wire Wire Line
|
||||
6250 2750 6250 2700
|
||||
Text Label 5200 2650 0 50 ~ 0
|
||||
Text Label 4250 2650 0 50 ~ 0
|
||||
USB_PWR
|
||||
Text Label 4900 3150 0 50 ~ 0
|
||||
CP_RST
|
||||
@@ -224,52 +224,30 @@ Text HLabel 4700 3750 0 50 Input ~ 0
|
||||
USB_D-
|
||||
Text HLabel 4700 3650 0 50 Input ~ 0
|
||||
USB_PWR
|
||||
Wire Wire Line
|
||||
4550 2400 4800 2400
|
||||
$Comp
|
||||
L Device:Q_Dual_NMOS_S1G1D2S2G2D1 Q?
|
||||
U 1 1 6164749C
|
||||
P 4350 2500
|
||||
F 0 "Q?" V 4692 2500 50 0000 C CNN
|
||||
F 1 "Q_Dual_NMOS_S1G1D2S2G2D1" V 4601 2500 50 0000 C CNN
|
||||
F 2 "" H 4550 2500 50 0001 C CNN
|
||||
F 3 "~" H 4550 2500 50 0001 C CNN
|
||||
1 4350 2500
|
||||
0 -1 -1 0
|
||||
$EndComp
|
||||
$Comp
|
||||
L Device:Q_Dual_NMOS_S1G1D2S2G2D1 Q?
|
||||
U 2 1 616482EA
|
||||
L Device:Q_Dual_NMOS_S1G1D2S2G2D1 Q3
|
||||
U 1 1 616482EA
|
||||
P 1850 3950
|
||||
F 0 "Q?" H 2054 3996 50 0000 L CNN
|
||||
F 0 "Q3" H 2054 3996 50 0000 L CNN
|
||||
F 1 "Q_Dual_NMOS_S1G1D2S2G2D1" H 2054 3905 50 0000 L CNN
|
||||
F 2 "" H 2050 3950 50 0001 C CNN
|
||||
F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6" H 2050 3950 50 0001 C CNN
|
||||
F 3 "~" H 2050 3950 50 0001 C CNN
|
||||
2 1850 3950
|
||||
1 1850 3950
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
Wire Wire Line
|
||||
4150 2400 3900 2400
|
||||
$Comp
|
||||
L Device:R R?
|
||||
U 1 1 6164BC02
|
||||
P 4100 3000
|
||||
F 0 "R?" H 4170 3046 50 0000 L CNN
|
||||
F 1 "10K" H 4170 2955 50 0000 L CNN
|
||||
F 2 "Resistor_SMD:R_0402_1005Metric" V 4030 3000 50 0001 C CNN
|
||||
F 3 "~" H 4100 3000 50 0001 C CNN
|
||||
F 4 "R10K_0402" H 4100 3000 50 0001 C CNN "StockRef"
|
||||
F 5 "2447096" H 4100 3000 50 0001 C CNN "ordercode"
|
||||
F 6 "farnell" H 4100 3000 50 0001 C CNN "supplier"
|
||||
1 4100 3000
|
||||
0 1 1 0
|
||||
L Device:D D?
|
||||
U 1 1 616BED7E
|
||||
P 5050 2650
|
||||
F 0 "D?" H 5050 2433 50 0000 C CNN
|
||||
F 1 "D" H 5050 2524 50 0000 C CNN
|
||||
F 2 "" H 5050 2650 50 0001 C CNN
|
||||
F 3 "~" H 5050 2650 50 0001 C CNN
|
||||
1 5050 2650
|
||||
-1 0 0 1
|
||||
$EndComp
|
||||
Wire Wire Line
|
||||
4250 3000 4350 3000
|
||||
4250 2650 4900 2650
|
||||
Wire Wire Line
|
||||
4350 3000 4350 2700
|
||||
Text Label 3450 3000 0 50 ~ 0
|
||||
USB_PWR
|
||||
Wire Wire Line
|
||||
3450 3000 3950 3000
|
||||
3900 2400 4800 2400
|
||||
$EndSCHEMATC
|
||||
|
||||
Submodule FW/leo_muziekdoos_esp32/lib/NDEF deleted from 4d119fdce3
Submodule FW/leo_muziekdoos_esp32/lib/PN532 deleted from ae7421a5b3
Submodule FW/leo_muziekdoos_esp32/lib/PN532_SPI deleted from d8ec6bf06a
Reference in New Issue
Block a user