production files generated

.gitignore

@@ -3,5 +3,5 @@
 .vscode/c_cpp_properties.json
 .vscode/launch.json
 .vscode/ipch
-**/.DS_Store
+.DS_Store
 manufacturing.zip

flash.sh

@@ -1 +0,0 @@
-st-flash write firmware20210720.bin 0x8000000

manufacturing/CAD/ledTruck/jackplugs-cache.lib

@@ -1,118 +0,0 @@
-EESchema-LIBRARY Version 2.4
-#encoding utf-8
-#
-# Audio_AudioJack_3_PS000175
-#
-DEF Audio_AudioJack_3_PS000175 CON 0 2 Y Y 1 F N
-F0 "CON" -300 250 60 H V L CNN
-F1 "Audio_AudioJack_3_PS000175" -50 -250 60 H V C CNN
-F2 "MySymbols:3,5mm_straight_square" 200 200 60 H I L CNN
-F3 "" 200 300 60 H I L CNN
-F4 "Multicomp Pro" 200 1100 60 H I L CNN "Manufacturer"
-F5 "PS000175" 0 -350 50 H V C CNN "mfr PN"
-DRAW
-S 200 200 -300 -200 0 1 0 f
-P 4 0 1 0 200 0 100 0 50 -50 0 0 N
-P 4 0 1 0 200 100 0 100 -50 50 -100 100 N
-P 6 0 1 0 200 -100 -150 -100 -150 100 -200 100 -200 -50 -150 -50 N
-X S 1 400 -100 200 L 50 50 1 1 P
-X R 2 400 100 200 L 50 50 1 1 P
-X T 5 400 0 200 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Connector_AudioPlug3
-#
-DEF Connector_AudioPlug3 J 0 20 Y Y 1 F N
-F0 "J" 50 250 50 H V C CNN
-F1 "Connector_AudioPlug3" 50 -250 50 H V C CNN
-F2 "" 100 -50 50 H I C CNN
-F3 "" 100 -50 50 H I C CNN
-$FPLIST
- Plug*
-$ENDFPLIST
-DRAW
-T 900 -100 0 50 0 0 0 R Normal 0 C C
-T 0 150 0 50 0 1 0 S Normal 0 C C
-T 0 -350 0 50 0 1 0 T Normal 0 C C
-S -150 150 -50 -150 0 1 10 N
-S -50 -50 -50 -50 0 1 0 N
-S -150 150 350 -150 1 1 10 f
-S 500 200 350 -200 1 1 10 f
-P 11 1 1 10 -150 150 -200 150 -250 100 -400 150 -500 50 -500 -50 -400 -150 -250 -100 -200 -150 -150 -150 -150 150 f
-X ~ R 600 0 100 L 50 50 1 1 P
-X ~ S 600 100 100 L 50 50 1 1 P
-X ~ T 600 -100 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Device_LED
-#
-DEF Device_LED D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "Device_LED" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$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 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
-P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 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
-ENDDEF
-#
-# Device_R
-#
-DEF Device_R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "Device_R" 0 0 50 V V C CNN
-F2 "" -70 0 50 V I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- R_*
-$ENDFPLIST
-DRAW
-S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# power_+3V3
-#
-DEF power_+3V3 #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "power_+3V3" 0 140 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-ALIAS +3.3V
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +3V3 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# power_GND
-#
-DEF power_GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "power_GND" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
-X GND 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-#End Library

manufacturing/CAD/ledTruck/jackplugs.pro

@@ -1,33 +0,0 @@
-update=22/05/2015 07:44:53
-version=1
-last_client=kicad
-[general]
-version=1
-RootSch=
-BoardNm=
-[pcbnew]
-version=1
-LastNetListRead=
-UseCmpFile=1
-PadDrill=0.600000000000
-PadDrillOvalY=0.600000000000
-PadSizeH=1.500000000000
-PadSizeV=1.500000000000
-PcbTextSizeV=1.500000000000
-PcbTextSizeH=1.500000000000
-PcbTextThickness=0.300000000000
-ModuleTextSizeV=1.000000000000
-ModuleTextSizeH=1.000000000000
-ModuleTextSizeThickness=0.150000000000
-SolderMaskClearance=0.000000000000
-SolderMaskMinWidth=0.000000000000
-DrawSegmentWidth=0.200000000000
-BoardOutlineThickness=0.100000000000
-ModuleOutlineThickness=0.150000000000
-[cvpcb]
-version=1
-NetIExt=net
-[eeschema]
-version=1
-LibDir=
-[eeschema/libraries]

manufacturing/CAD/ledTruck/jackplugs.sch

@@ -1,424 +0,0 @@
-EESchema Schematic File Version 4
-EELAYER 30 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title "Leo-Led-truck"
-Date "2021-03-26"
-Rev "v1.1"
-Comp "hollandtricks.com"
-Comment1 "designed by Willem"
-Comment2 "www.electronicareparaties.nl"
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L Device:R R1
-U 1 1 6024F4D7
-P 3450 2000
-F 0 "R1" V 3550 2000 50  0000 C CNN
-F 1 "105E" V 3450 2000 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 3380 2000 50  0001 C CNN
-F 3 "~" H 3450 2000 50  0001 C CNN
-F 4 "R105E_0603" H 3450 2000 50  0001 C CNN "StockRef"
-	1    3450 2000
-	0    1    -1   0   
-$EndComp
-$Comp
-L Device:R R3
-U 1 1 6024FF14
-P 3450 4600
-F 0 "R3" V 3350 4600 50  0000 C CNN
-F 1 "105E" V 3450 4600 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 3380 4600 50  0001 C CNN
-F 3 "~" H 3450 4600 50  0001 C CNN
-F 4 "R105E_0603" H 3450 4600 50  0001 C CNN "StockRef"
-	1    3450 4600
-	0    1    1    0   
-$EndComp
-Text GLabel 3250 3250 0    50   Input ~ 0
-LED2
-Wire Wire Line
-	3250 2000 3300 2000
-$Comp
-L Device:R R4
-U 1 1 6025E6DF
-P 2850 1950
-F 0 "R4" V 2750 1950 50  0000 C CNN
-F 1 "10K" V 2850 1950 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2780 1950 50  0001 C CNN
-F 3 "~" H 2850 1950 50  0001 C CNN
-F 4 "R010K_0603" H 2850 1950 50  0001 C CNN "StockRef"
-	1    2850 1950
-	-1   0    0    1   
-$EndComp
-Text GLabel 2750 3350 0    50   Input ~ 0
-DET2
-$Comp
-L power:GND #PWR0106
-U 1 1 605D3FAF
-P 3400 4950
-F 0 "#PWR0106" H 3400 4700 50  0001 C CNN
-F 1 "GND" H 3405 4777 50  0000 C CNN
-F 2 "" H 3400 4950 50  0001 C CNN
-F 3 "" H 3400 4950 50  0001 C CNN
-	1    3400 4950
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3400 4950 3400 4800
-Wire Wire Line
-	3400 4800 3650 4800
-$Comp
-L power:GND #PWR0107
-U 1 1 605DD17D
-P 3400 3650
-F 0 "#PWR0107" H 3400 3400 50  0001 C CNN
-F 1 "GND" H 3405 3477 50  0000 C CNN
-F 2 "" H 3400 3650 50  0001 C CNN
-F 3 "" H 3400 3650 50  0001 C CNN
-	1    3400 3650
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R5
-U 1 1 6025DA85
-P 2850 3200
-F 0 "R5" V 2750 3200 50  0000 C CNN
-F 1 "10K" V 2850 3200 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2780 3200 50  0001 C CNN
-F 3 "~" H 2850 3200 50  0001 C CNN
-F 4 "R010K_0603" H 2850 3200 50  0001 C CNN "StockRef"
-	1    2850 3200
-	-1   0    0    1   
-$EndComp
-$Comp
-L Audio:AudioJack_3_PS000175 CON2
-U 1 1 6021DB86
-P 4050 3350
-F 0 "CON2" H 3722 3403 60  0000 R CNN
-F 1 "PS000175" H 3722 3297 60  0000 R CNN
-F 2 "MySymbols:3,5mm_straight_square" H 4250 3550 60  0001 L CNN
-F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 4250 3650 60  0001 L CNN
-F 4 "PS000175" H 4250 3850 60  0001 L CNN "MPN"
-F 5 "CONN JACK STEREO 3.5MM R/A" H 4250 4350 60  0001 L CNN "Description"
-F 6 "Multicomp" H 4250 4450 60  0001 L CNN "Manufacturer"
-F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 4050 3350 50  0001 C CNN "StockRef"
-	1    4050 3350
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	3300 4600 3250 4600
-Wire Wire Line
-	3600 4600 3650 4600
-$Comp
-L power:+3V3 #PWR0108
-U 1 1 607146CD
-P 2850 4350
-F 0 "#PWR0108" H 2850 4200 50  0001 C CNN
-F 1 "+3V3" H 2865 4523 50  0000 C CNN
-F 2 "" H 2850 4350 50  0001 C CNN
-F 3 "" H 2850 4350 50  0001 C CNN
-	1    2850 4350
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2750 3350 2850 3350
-Connection ~ 2850 3350
-Wire Wire Line
-	3400 3650 3400 3450
-Wire Wire Line
-	3400 3450 3650 3450
-$Comp
-L power:+3V3 #PWR0126
-U 1 1 607760D9
-P 2850 3000
-F 0 "#PWR0126" H 2850 2850 50  0001 C CNN
-F 1 "+3V3" H 2865 3173 50  0000 C CNN
-F 2 "" H 2850 3000 50  0001 C CNN
-F 3 "" H 2850 3000 50  0001 C CNN
-	1    2850 3000
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2850 3000 2850 3050
-$Comp
-L power:GND #PWR0127
-U 1 1 605DD95C
-P 3400 2350
-F 0 "#PWR0127" H 3400 2100 50  0001 C CNN
-F 1 "GND" H 3405 2177 50  0000 C CNN
-F 2 "" H 3400 2350 50  0001 C CNN
-F 3 "" H 3400 2350 50  0001 C CNN
-	1    3400 2350
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3650 2000 3600 2000
-Wire Wire Line
-	3650 2200 3400 2200
-Wire Wire Line
-	3400 2200 3400 2350
-Wire Wire Line
-	2850 2100 2750 2100
-Connection ~ 2850 2100
-$Comp
-L power:+3V3 #PWR0128
-U 1 1 607BF2C6
-P 2850 1750
-F 0 "#PWR0128" H 2850 1600 50  0001 C CNN
-F 1 "+3V3" H 2865 1923 50  0000 C CNN
-F 2 "" H 2850 1750 50  0001 C CNN
-F 3 "" H 2850 1750 50  0001 C CNN
-	1    2850 1750
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2850 1750 2850 1800
-$Comp
-L Audio:AudioJack_3_PS000175 CON1
-U 1 1 6021CA8A
-P 4050 2100
-F 0 "CON1" H 3722 2153 60  0000 R CNN
-F 1 "PS000175" H 3722 2047 60  0000 R CNN
-F 2 "MySymbols:3,5mm_straight_square" H 4250 2300 60  0001 L CNN
-F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 4250 2400 60  0001 L CNN
-F 4 "PS000175" H 4250 2600 60  0001 L CNN "MPN"
-F 5 "CONN JACK STEREO 3.5MM R/A" H 4250 3100 60  0001 L CNN "Description"
-F 6 "Multicomp" H 4250 3200 60  0001 L CNN "Manufacturer"
-F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 4050 2100 50  0001 C CNN "StockRef"
-	1    4050 2100
-	-1   0    0    -1  
-$EndComp
-$Comp
-L Audio:AudioJack_3_PS000175 CON3
-U 1 1 6021F7DC
-P 4050 4700
-F 0 "CON3" H 3722 4753 60  0000 R CNN
-F 1 "PS000175" H 3722 4647 60  0000 R CNN
-F 2 "MySymbols:3,5mm_straight_square" H 4250 4900 60  0001 L CNN
-F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 4250 5000 60  0001 L CNN
-F 4 "PS000175" H 4250 5200 60  0001 L CNN "MPN"
-F 5 "CONN JACK STEREO 3.5MM R/A" H 4250 5700 60  0001 L CNN "Description"
-F 6 "Multicomp" H 4250 5800 60  0001 L CNN "Manufacturer"
-F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 4050 4700 50  0001 C CNN "StockRef"
-	1    4050 4700
-	-1   0    0    -1  
-$EndComp
-Text GLabel 3250 4600 0    50   Input ~ 0
-LED3
-Text GLabel 2750 4700 0    50   Input ~ 0
-DET3
-Text GLabel 3250 2000 0    50   Input ~ 0
-LED1
-Text GLabel 2750 2100 0    50   Input ~ 0
-DET1
-Wire Wire Line
-	2850 4350 2850 4400
-Connection ~ 2850 4700
-Wire Wire Line
-	2850 4700 2750 4700
-Wire Wire Line
-	2850 4700 3650 4700
-$Comp
-L Device:R R6
-U 1 1 6025CE8E
-P 2850 4550
-F 0 "R6" V 2750 4550 50  0000 C CNN
-F 1 "10K" V 2850 4550 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2780 4550 50  0001 C CNN
-F 3 "~" H 2850 4550 50  0001 C CNN
-F 4 "R010K_0603" H 2850 4550 50  0001 C CNN "StockRef"
-	1    2850 4550
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	3600 3250 3650 3250
-Wire Wire Line
-	3300 3250 3250 3250
-$Comp
-L Device:R R2
-U 1 1 6024E7D0
-P 3450 3250
-F 0 "R2" V 3550 3250 50  0000 C CNN
-F 1 "105E" V 3450 3250 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 3380 3250 50  0001 C CNN
-F 3 "~" H 3450 3250 50  0001 C CNN
-F 4 "R105E_0603" H 3450 3250 50  0001 C CNN "StockRef"
-	1    3450 3250
-	0    -1   -1   0   
-$EndComp
-Wire Wire Line
-	2850 3350 3650 3350
-Wire Wire Line
-	2850 2100 3650 2100
-$Comp
-L Connector:AudioPlug3 J2
-U 1 1 60B526A8
-P 5700 3350
-F 0 "J2" H 5757 3717 50  0000 C CNN
-F 1 "AudioPlug3" H 5757 3626 50  0000 C CNN
-F 2 "" H 5800 3300 50  0001 C CNN
-F 3 "~" H 5800 3300 50  0001 C CNN
-	1    5700 3350
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:LED D2
-U 1 1 60B52ECB
-P 6650 3250
-F 0 "D2" H 6643 2995 50  0000 C CNN
-F 1 "LED_RED" H 6643 3086 50  0000 C CNN
-F 2 "LED_THT:LED_D5.0mm" H 6650 3250 50  0001 C CNN
-F 3 "~" H 6650 3250 50  0001 C CNN
-F 4 "LED_PTH_RED_5MM_10MA" H 6650 3250 50  0001 C CNN "StockRef"
-	1    6650 3250
-	1    0    0    1   
-$EndComp
-Wire Wire Line
-	6500 3250 6300 3250
-Wire Wire Line
-	6800 3250 7000 3250
-Wire Wire Line
-	7000 3250 7000 3350
-Wire Wire Line
-	7000 3350 6300 3350
-$Comp
-L Device:R R8
-U 1 1 60B6D7F6
-P 7300 3250
-F 0 "R8" V 7200 3250 50  0000 C CNN
-F 1 "10K" V 7300 3250 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7230 3250 50  0001 C CNN
-F 3 "~" H 7300 3250 50  0001 C CNN
-F 4 "R010K_0603" H 7300 3250 50  0001 C CNN "StockRef"
-	1    7300 3250
-	0    -1   -1   0   
-$EndComp
-Wire Wire Line
-	7150 3250 7000 3250
-Connection ~ 7000 3250
-Wire Wire Line
-	7450 3250 7550 3250
-Wire Wire Line
-	7550 3250 7550 3450
-Wire Wire Line
-	7550 3450 6300 3450
-$Comp
-L Connector:AudioPlug3 J3
-U 1 1 609CD2A7
-P 5750 4700
-F 0 "J3" H 5807 5067 50  0000 C CNN
-F 1 "AudioPlug3" H 5807 4976 50  0000 C CNN
-F 2 "" H 5850 4650 50  0001 C CNN
-F 3 "~" H 5850 4650 50  0001 C CNN
-	1    5750 4700
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:LED D3
-U 1 1 609CD2AE
-P 6700 4600
-F 0 "D3" H 6693 4345 50  0000 C CNN
-F 1 "LED_YELLOW" H 6693 4436 50  0000 C CNN
-F 2 "LED_THT:LED_D5.0mm" H 6700 4600 50  0001 C CNN
-F 3 "~" H 6700 4600 50  0001 C CNN
-F 4 "LED_PTH_YELLOW_5MM_10MA" H 6700 4600 50  0001 C CNN "StockRef"
-	1    6700 4600
-	1    0    0    1   
-$EndComp
-Wire Wire Line
-	6550 4600 6350 4600
-Wire Wire Line
-	6850 4600 7050 4600
-Wire Wire Line
-	7050 4600 7050 4700
-Wire Wire Line
-	7050 4700 6350 4700
-$Comp
-L Device:R R9
-U 1 1 609CD2B9
-P 7350 4600
-F 0 "R9" V 7250 4600 50  0000 C CNN
-F 1 "4K7" V 7350 4600 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7280 4600 50  0001 C CNN
-F 3 "~" H 7350 4600 50  0001 C CNN
-F 4 "R4K7_0603" H 7350 4600 50  0001 C CNN "StockRef"
-	1    7350 4600
-	0    -1   -1   0   
-$EndComp
-Wire Wire Line
-	7200 4600 7050 4600
-Connection ~ 7050 4600
-Wire Wire Line
-	7500 4600 7600 4600
-Wire Wire Line
-	7600 4600 7600 4800
-Wire Wire Line
-	7600 4800 6350 4800
-$Comp
-L Connector:AudioPlug3 J1
-U 1 1 609D3989
-P 5700 2100
-F 0 "J1" H 5757 2467 50  0000 C CNN
-F 1 "AudioPlug3" H 5757 2376 50  0000 C CNN
-F 2 "" H 5800 2050 50  0001 C CNN
-F 3 "~" H 5800 2050 50  0001 C CNN
-	1    5700 2100
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R7
-U 1 1 609D399B
-P 7450 1950
-F 0 "R7" H 7350 1950 50  0000 C CNN
-F 1 "1K" H 7350 1850 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7380 1950 50  0001 C CNN
-F 3 "~" H 7450 1950 50  0001 C CNN
-F 4 "R001K_0603" H 7450 1950 50  0001 C CNN "StockRef"
-	1    7450 1950
-	-1   0    0    1   
-$EndComp
-Wire Notes Line
-	2350 1250 5000 1250
-Wire Notes Line
-	2350 1250 2350 5300
-Wire Notes Line
-	2350 5300 5000 5300
-Wire Notes Line
-	5000 1250 5000 5300
-Text Notes 3050 1350 0    50   ~ 0
-copy from main PCB, DNP
-$Comp
-L Device:LED D1
-U 1 1 609D3990
-P 6850 1950
-F 0 "D1" V 6850 1800 50  0000 C CNN
-F 1 "LED_GREEN" V 6950 1700 50  0000 C CNN
-F 2 "LED_THT:LED_D5.0mm" H 6850 1950 50  0001 C CNN
-F 3 "~" H 6850 1950 50  0001 C CNN
-F 4 "LED_PTH_GREEN_5MM_10MA" H 6850 1950 50  0001 C CNN "StockRef"
-	1    6850 1950
-	0    -1   1    0   
-$EndComp
-Wire Wire Line
-	6300 2200 7450 2200
-Wire Wire Line
-	7450 2200 7450 2100
-Wire Wire Line
-	6300 2100 6850 2100
-Wire Wire Line
-	6300 2000 6500 2000
-Wire Wire Line
-	6500 2000 6500 1650
-Wire Wire Line
-	6500 1650 6850 1650
-Wire Wire Line
-	6850 1650 6850 1800
-Wire Wire Line
-	6850 1650 7450 1650
-Wire Wire Line
-	7450 1650 7450 1800
-Connection ~ 6850 1650
-$EndSCHEMATC

manufacturing/CAD/ledTruck/ledTruck-cache.lib

@@ -1,51 +1,6 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# Audio_AudioJack_3_PS000175
-#
-DEF Audio_AudioJack_3_PS000175 CON 0 2 Y Y 1 F N
-F0 "CON" -300 250 60 H V L CNN
-F1 "Audio_AudioJack_3_PS000175" -50 -250 60 H V C CNN
-F2 "MySymbols:3,5mm_straight_square" 200 200 60 H I L CNN
-F3 "" 200 300 60 H I L CNN
-F4 "Multicomp Pro" 200 1100 60 H I L CNN "Manufacturer"
-F5 "PS000175" 0 -350 50 H V C CNN "mfr PN"
-DRAW
-S 200 200 -300 -200 0 1 0 f
-P 4 0 1 0 200 0 100 0 50 -50 0 0 N
-P 4 0 1 0 200 100 0 100 -50 50 -100 100 N
-P 6 0 1 0 200 -100 -150 -100 -150 100 -200 100 -200 -50 -150 -50 N
-X S 1 400 -100 200 L 50 50 1 1 P
-X R 2 400 100 200 L 50 50 1 1 P
-X T 5 400 0 200 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Battery_Management_MCP73832-2-MC
-#
-DEF Battery_Management_MCP73832-2-MC U 0 40 Y Y 1 F N
-F0 "U" 200 250 50 H V L CNN
-F1 "Battery_Management_MCP73832-2-MC" 100 -350 50 H V L CNN
-F2 "Package_DFN_QFN:DFN-8-1EP_3x2mm_P0.5mm_EP1.75x1.45mm" 150 -450 50 H I L CIN
-F3 "" -150 -50 50 H I C CNN
-ALIAS MCP73832-5-OT_copy MCP73832-4-OT_copy MCP73832-3-OT_copy MCP73831-2-OT_copy MCP73831-5-OT_copy MCP73831-4-OT_copy MCP73831-3-OT_copy
-$FPLIST
- SOT?23*
-$ENDFPLIST
-DRAW
-S -300 200 300 -300 0 1 10 f
-X VDD 2 -150 300 100 D 50 50 0 0 W
-X VBAT 4 400 -150 100 L 50 50 0 0 w
-X NC 7 -400 -250 100 R 50 50 0 0 N N
-X VSS 9 -100 -400 100 U 50 50 0 0 W
-X VDD 1 -50 300 100 D 50 50 1 1 W
-X VBAT 3 400 -50 100 L 50 50 1 1 w
-X STAT 5 400 100 100 L 50 50 1 1 O
-X VSS 6 0 -400 100 U 50 50 1 1 W
-X PROG 8 -400 -50 100 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
 # Connector_Conn_01x02_Male
 #
 DEF Connector_Conn_01x02_Male J 0 40 Y N 1 F N
@@ -66,30 +21,26 @@ X Pin_2 2 200 -100 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_Generic_SWD_DEBUG
+# Connector_Generic_Conn_01x04
 #
-DEF Connector_Generic_SWD_DEBUG J 0 40 Y N 1 F N
+DEF Connector_Generic_Conn_01x04 J 0 40 Y N 1 F N
 F0 "J" 0 200 50 H V C CNN
-F1 "Connector_Generic_SWD_DEBUG" 0 -300 50 H V C CNN
-F2 "MySymbols:SWD_Programming_pads" 0 0 50 H I C CNN
+F1 "Connector_Generic_Conn_01x04" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  Connector*:*_1x??_*
 $ENDFPLIST
 DRAW
-T 0 100 0 50 0 0 0 C Normal 0 C C
-T 0 100 -100 50 0 0 0 D Normal 0 C C
-T 0 100 -200 50 0 0 0 G Normal 0 C C
-T 0 100 100 50 0 0 0 V Normal 0 C C
 S -50 -195 0 -205 1 1 6 N
 S -50 -95 0 -105 1 1 6 N
 S -50 5 0 -5 1 1 6 N
 S -50 105 0 95 1 1 6 N
 S -50 150 50 -250 1 1 10 f
-X VCC 1 -200 100 150 R 50 50 1 1 P
-X SWC 2 -200 0 150 R 50 50 1 1 P
-X SWD 3 -200 -100 150 R 50 50 1 1 P
-X VSS 4 -200 -200 150 R 50 50 1 1 P
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 -200 0 150 R 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+X Pin_4 4 -200 -200 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -408,6 +359,59 @@ X D 3 100 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# dk_Barrel-Audio-Connectors_SJ1-3523N
+#
+DEF dk_Barrel-Audio-Connectors_SJ1-3523N CON 0 2 Y Y 1 F N
+F0 "CON" -300 250 60 H V L CNN
+F1 "dk_Barrel-Audio-Connectors_SJ1-3523N" -50 -250 60 H V C CNN
+F2 "digikey-footprints:Headphone_Jack_3.5mm_SJ1-3523N" 200 200 60 H I L CNN
+F3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" 200 300 60 H I L CNN
+F4 "CP1-3523N-ND" 200 400 60 H I L CNN "Digi-Key_PN"
+F5 "SJ1-3523N" 200 500 60 H I L CNN "MPN"
+F6 "Connectors, Interconnects" 200 600 60 H I L CNN "Category"
+F7 "Barrel - Audio Connectors" 200 700 60 H I L CNN "Family"
+F8 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" 200 800 60 H I L CNN "DK_Datasheet_Link"
+F9 "/product-detail/en/cui-inc/SJ1-3523N/CP1-3523N-ND/738689" 200 900 60 H I L CNN "DK_Detail_Page"
+F10 "CONN JACK STEREO 3.5MM R/A" 200 1000 60 H I L CNN "Description"
+F11 "CUI Inc." 200 1100 60 H I L CNN "Manufacturer"
+F12 "Active" 200 1200 60 H I L CNN "Status"
+DRAW
+S 200 200 -300 -200 0 1 0 f
+P 4 0 1 0 200 0 100 0 50 -50 0 0 N
+P 4 0 1 0 200 100 0 100 -50 50 -100 100 N
+P 6 0 1 0 200 -100 -150 -100 -150 100 -200 100 -200 -50 -150 -50 N
+X S 1 400 -100 200 L 50 50 1 1 P
+X T 2 400 0 200 L 50 50 1 1 P
+X R 3 400 100 200 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# dk_PMIC-Battery-Chargers_MCP73832T-2ACI_OT
+#
+DEF dk_PMIC-Battery-Chargers_MCP73832T-2ACI_OT U 0 40 Y Y 1 F N
+F0 "U" -200 40 60 H V R CNN
+F1 "dk_PMIC-Battery-Chargers_MCP73832T-2ACI_OT" 10 -450 60 H V L CNN
+F2 "digikey-footprints:SOT-753" 200 200 60 H I L CNN
+F3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20001984g.pdf" 200 300 60 H I L CNN
+F4 "MCP73832T-2ACI/OTCT-ND" 200 400 60 H I L CNN "Digi-Key_PN"
+F5 "MCP73832T-2ACI/OT" 200 500 60 H I L CNN "MPN"
+F6 "Integrated Circuits (ICs)" 200 600 60 H I L CNN "Category"
+F7 "PMIC - Battery Chargers" 200 700 60 H I L CNN "Family"
+F8 "http://ww1.microchip.com/downloads/en/DeviceDoc/20001984g.pdf" 200 800 60 H I L CNN "DK_Datasheet_Link"
+F9 "/product-detail/en/microchip-technology/MCP73832T-2ACI-OT/MCP73832T-2ACI-OTCT-ND/1979805" 200 900 60 H I L CNN "DK_Detail_Page"
+F10 "IC LI-ION/LI-POLY CTRLR SOT23-5" 200 1000 60 H I L CNN "Description"
+F11 "Microchip Technology" 200 1100 60 H I L CNN "Manufacturer"
+F12 "Active" 200 1200 60 H I L CNN "Status"
+DRAW
+S -300 0 300 -400 0 1 0 f
+X STAT 1 400 -100 100 L 50 50 1 1 O
+X VSS 2 0 -500 100 U 50 50 1 1 W
+X VBAT 3 400 -200 100 L 50 50 1 1 w
+X VDD 4 0 100 100 D 50 50 1 1 W
+X PROG 5 -400 -200 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # ledTruck-rescue_STM32L031K6Ux-MCU_ST_STM32L0
 #
 DEF ledTruck-rescue_STM32L031K6Ux-MCU_ST_STM32L0 U 0 20 Y Y 1 F N

manufacturing/CAD/ledTruck/ledTruck-rescue.bck

@@ -1,3 +0,0 @@
-EESchema-DOCLIB  Version 2.0
-#
-#End Doc Library

manufacturing/CAD/ledTruck/ledTruck-rescue.lib

@@ -29,59 +29,6 @@ X SH 4 200 -300 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# MCP73832T-2ACI_OT-dk_PMIC-Battery-Chargers
-#
-DEF MCP73832T-2ACI_OT-dk_PMIC-Battery-Chargers U 0 40 Y Y 1 F N
-F0 "U" -200 40 60 H V R CNN
-F1 "MCP73832T-2ACI_OT-dk_PMIC-Battery-Chargers" 10 -450 60 H V L CNN
-F2 "digikey-footprints:SOT-753" 200 200 60 H I L CNN
-F3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20001984g.pdf" 200 300 60 H I L CNN
-F4 "MCP73832T-2ACI/OTCT-ND" 200 400 60 H I L CNN "Digi-Key_PN"
-F5 "MCP73832T-2ACI/OT" 200 500 60 H I L CNN "MPN"
-F6 "Integrated Circuits (ICs)" 200 600 60 H I L CNN "Category"
-F7 "PMIC - Battery Chargers" 200 700 60 H I L CNN "Family"
-F8 "http://ww1.microchip.com/downloads/en/DeviceDoc/20001984g.pdf" 200 800 60 H I L CNN "DK_Datasheet_Link"
-F9 "/product-detail/en/microchip-technology/MCP73832T-2ACI-OT/MCP73832T-2ACI-OTCT-ND/1979805" 200 900 60 H I L CNN "DK_Detail_Page"
-F10 "IC LI-ION/LI-POLY CTRLR SOT23-5" 200 1000 60 H I L CNN "Description"
-F11 "Microchip Technology" 200 1100 60 H I L CNN "Manufacturer"
-F12 "Active" 200 1200 60 H I L CNN "Status"
-DRAW
-S -300 0 300 -400 0 1 0 f
-X STAT 1 400 -100 100 L 50 50 1 1 O
-X VSS 2 0 -500 100 U 50 50 1 1 W
-X VBAT 3 400 -200 100 L 50 50 1 1 w
-X VDD 4 0 100 100 D 50 50 1 1 W
-X PROG 5 -400 -200 100 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# SJ1-3523N-dk_Barrel-Audio-Connectors
-#
-DEF SJ1-3523N-dk_Barrel-Audio-Connectors CON 0 2 Y Y 1 F N
-F0 "CON" -300 250 60 H V L CNN
-F1 "SJ1-3523N-dk_Barrel-Audio-Connectors" -50 -250 60 H V C CNN
-F2 "digikey-footprints:Headphone_Jack_3.5mm_SJ1-3523N" 200 200 60 H I L CNN
-F3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" 200 300 60 H I L CNN
-F4 "CP1-3523N-ND" 200 400 60 H I L CNN "Digi-Key_PN"
-F5 "SJ1-3523N" 200 500 60 H I L CNN "MPN"
-F6 "Connectors, Interconnects" 200 600 60 H I L CNN "Category"
-F7 "Barrel - Audio Connectors" 200 700 60 H I L CNN "Family"
-F8 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" 200 800 60 H I L CNN "DK_Datasheet_Link"
-F9 "/product-detail/en/cui-inc/SJ1-3523N/CP1-3523N-ND/738689" 200 900 60 H I L CNN "DK_Detail_Page"
-F10 "CONN JACK STEREO 3.5MM R/A" 200 1000 60 H I L CNN "Description"
-F11 "CUI Inc." 200 1100 60 H I L CNN "Manufacturer"
-F12 "Active" 200 1200 60 H I L CNN "Status"
-DRAW
-S 200 200 -300 -200 0 1 0 f
-P 4 0 1 0 200 0 100 0 50 -50 0 0 N
-P 4 0 1 0 200 100 0 100 -50 50 -100 100 N
-P 6 0 1 0 200 -100 -150 -100 -150 100 -200 100 -200 -50 -150 -50 N
-X S 1 400 -100 200 L 50 50 1 1 P
-X T 2 400 0 200 L 50 50 1 1 P
-X R 3 400 100 200 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # STM32L031K6Ux-MCU_ST_STM32L0
 #
 DEF STM32L031K6Ux-MCU_ST_STM32L0 U 0 20 Y Y 1 F N

manufacturing/CAD/ledTruck/ledTruck.pro

@@ -1,4 +1,4 @@
-update=2021 May 11, Tuesday 14:13:25
+update=2021 April 17, Saturday 14:47:28
 version=1
 last_client=kicad
 [general]
@@ -42,10 +42,6 @@ TrackWidth1=0.254
 TrackWidth2=0.3048
 ViaDiameter1=0.8128
 ViaDrill1=0.4064
-ViaDiameter2=0.6
-ViaDrill2=0.3
-ViaDiameter3=0.8
-ViaDrill3=0.4
 dPairWidth1=0.2032
 dPairGap1=0.254
 dPairViaGap1=0.25

manufacturing/CAD/ledTruck/ledTruck.sch

@@ -14,6 +14,20 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
+L dk_PMIC-Battery-Chargers:MCP73832T-2ACI_OT U2
+U 1 1 60220E3E
+P 2600 4300
+F 0 "U2" H 2850 4350 60  0000 C CNN
+F 1 "MCP73832T-2ACI_OT" H 2050 4350 60  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23-5" H 2800 4500 60  0001 L CNN
+F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20001984g.pdf" H 2800 4600 60  0001 L CNN
+F 4 "IC LI-ION/LI-POLY CTRLR SOT23-5" H 2800 5300 60  0001 L CNN "Description"
+F 5 "Microchip Technology" H 2800 5400 60  0001 L CNN "Manufacturer"
+F 6 "REG_MCP73832T" H 2600 4300 50  0001 C CNN "StockRef"
+	1    2600 4300
+	1    0    0    -1  
+$EndComp
+$Comp
 L power:+3.3V #PWR0101
 U 1 1 6022AA1E
 P 4600 750
@@ -27,52 +41,65 @@ $EndComp
 $Comp
 L Connector:Conn_01x02_Male J1
 U 1 1 60232097
-P 1100 6950
-F 0 "J1" H 1072 6924 50  0000 R CNN
-F 1 "JST_PH_S2B" H 1072 6833 50  0000 R CNN
-F 2 "Connector_JST:JST_PH_S2B-PH-K_1x02_P2.00mm_Horizontal" H 1100 6950 50  0001 C CNN
-F 3 "~" H 1100 6950 50  0001 C CNN
-F 4 "CON_PIN_01x02xPH_JST" H 1100 6950 50  0001 C CNN "StockRef"
-	1    1100 6950
+P 2550 6050
+F 0 "J1" H 2522 6024 50  0000 R CNN
+F 1 "JST_PH_S2B" H 2522 5933 50  0000 R CNN
+F 2 "Connector_JST:JST_PH_S2B-PH-K_1x02_P2.00mm_Horizontal" H 2550 6050 50  0001 C CNN
+F 3 "~" H 2550 6050 50  0001 C CNN
+F 4 "CON_PIN_01x02xPH_JST" H 2550 6050 50  0001 C CNN "StockRef"
+	1    2550 6050
 	-1   0    0    -1  
 $EndComp
 $Comp
 L power:+BATT #PWR0102
 U 1 1 602364A3
-P 750 6700
-F 0 "#PWR0102" H 750 6550 50  0001 C CNN
-F 1 "+BATT" H 765 6873 50  0000 C CNN
-F 2 "" H 750 6700 50  0001 C CNN
-F 3 "" H 750 6700 50  0001 C CNN
-	1    750  6700
+P 2200 5800
+F 0 "#PWR0102" H 2200 5650 50  0001 C CNN
+F 1 "+BATT" H 2215 5973 50  0000 C CNN
+F 2 "" H 2200 5800 50  0001 C CNN
+F 3 "" H 2200 5800 50  0001 C CNN
+	1    2200 5800
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0103
 U 1 1 602383EE
-P 750 7350
-F 0 "#PWR0103" H 750 7100 50  0001 C CNN
-F 1 "GND" H 755 7177 50  0000 C CNN
-F 2 "" H 750 7350 50  0001 C CNN
-F 3 "" H 750 7350 50  0001 C CNN
-	1    750  7350
+P 2200 6450
+F 0 "#PWR0103" H 2200 6200 50  0001 C CNN
+F 1 "GND" H 2205 6277 50  0000 C CNN
+F 2 "" H 2200 6450 50  0001 C CNN
+F 3 "" H 2200 6450 50  0001 C CNN
+	1    2200 6450
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	900  7050 750  7050
+	2350 6150 2200 6150
 Wire Wire Line
-	750  7050 750  7350
+	2200 6150 2200 6450
 Wire Wire Line
-	900  6950 750  6950
+	2350 6050 2200 6050
 Wire Wire Line
-	750  6950 750  6700
+	2200 6050 2200 5800
 $Comp
-L Connector_Generic:SWD_DEBUG J3
+L power:+BATT #PWR0104
+U 1 1 6023A855
+P 3400 4500
+F 0 "#PWR0104" H 3400 4350 50  0001 C CNN
+F 1 "+BATT" V 3400 4750 50  0000 C CNN
+F 2 "" H 3400 4500 50  0001 C CNN
+F 3 "" H 3400 4500 50  0001 C CNN
+	1    3400 4500
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3000 4500 3100 4500
+$Comp
+L Connector_Generic:Conn_01x04 J3
 U 1 1 6023E390
 P 750 6000
 F 0 "J3" H 668 6317 50  0000 C CNN
 F 1 "Conn_01x04" H 668 6226 50  0000 C CNN
-F 2 "MySymbols:SWD_Programming_pads" H 750 6000 50  0001 C CNN
+F 2 "digikey-footprints:PinHeader_1x4_P2.54mm_Drill1.02mm" H 750 6000 50  0001 C CNN
 F 3 "~" H 750 6000 50  0001 C CNN
 F 4 "DNP" H 750 6000 50  0001 C CNN "DNP"
 	1    750  6000
@@ -93,44 +120,56 @@ $EndComp
 $Comp
 L Device:R R1
 U 1 1 6024F4D7
-P 9700 1100
-F 0 "R1" V 9800 1100 50  0000 C CNN
-F 1 "105E" V 9700 1100 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9630 1100 50  0001 C CNN
-F 3 "~" H 9700 1100 50  0001 C CNN
-F 4 "R105E_0603" H 9700 1100 50  0001 C CNN "StockRef"
-	1    9700 1100
+P 9450 1200
+F 0 "R1" V 9450 1200 50  0000 C CNN
+F 1 "105E" V 9350 1200 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9380 1200 50  0001 C CNN
+F 3 "~" H 9450 1200 50  0001 C CNN
+F 4 "R105E_0603" H 9450 1200 50  0001 C CNN "StockRef"
+	1    9450 1200
 	0    1    -1   0   
 $EndComp
 $Comp
 L Device:R R3
 U 1 1 6024FF14
-P 9700 3700
-F 0 "R3" V 9600 3700 50  0000 C CNN
-F 1 "105E" V 9700 3700 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9630 3700 50  0001 C CNN
-F 3 "~" H 9700 3700 50  0001 C CNN
-F 4 "R105E_0603" H 9700 3700 50  0001 C CNN "StockRef"
-	1    9700 3700
+P 9450 3800
+F 0 "R3" V 9450 3800 50  0000 C CNN
+F 1 "105E" V 9550 3800 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9380 3800 50  0001 C CNN
+F 3 "~" H 9450 3800 50  0001 C CNN
+F 4 "R105E_0603" H 9450 3800 50  0001 C CNN "StockRef"
+	1    9450 3800
 	0    1    1    0   
 $EndComp
-Text GLabel 9500 2350 0    50   Input ~ 0
+Text GLabel 9000 2450 0    50   Input ~ 0
 LED2
 Wire Wire Line
-	9500 1100 9550 1100
+	9000 1200 9300 1200
+$Comp
+L Device:R R6
+U 1 1 6025CE8E
+P 9650 3550
+F 0 "R6" V 9443 3550 50  0000 C CNN
+F 1 "10K" V 9534 3550 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9580 3550 50  0001 C CNN
+F 3 "~" H 9650 3550 50  0001 C CNN
+F 4 "R010K_0603" H 9650 3550 50  0001 C CNN "StockRef"
+	1    9650 3550
+	-1   0    0    1   
+$EndComp
 $Comp
 L Device:R R4
 U 1 1 6025E6DF
-P 9100 1050
-F 0 "R4" V 9000 1050 50  0000 C CNN
-F 1 "10K" V 9100 1050 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9030 1050 50  0001 C CNN
-F 3 "~" H 9100 1050 50  0001 C CNN
-F 4 "R010K_0603" H 9100 1050 50  0001 C CNN "StockRef"
-	1    9100 1050
+P 9650 950
+F 0 "R4" V 9443 950 50  0000 C CNN
+F 1 "10K" V 9534 950 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9580 950 50  0001 C CNN
+F 3 "~" H 9650 950 50  0001 C CNN
+F 4 "R010K_0603" H 9650 950 50  0001 C CNN "StockRef"
+	1    9650 950 
 	-1   0    0    1   
 $EndComp
-Text GLabel 9000 2450 0    50   Input ~ 0
+Text GLabel 9000 2350 0    50   Input ~ 0
 DET2
 Text GLabel 5500 1750 2    50   Input ~ 0
 DET3
@@ -232,37 +271,53 @@ Wire Wire Line
 	1350 4900 1350 5200
 Wire Wire Line
 	1350 5200 950  5200
+$Comp
+L Device:R R7
+U 1 1 60299759
+P 2100 4850
+F 0 "R7" H 2170 4896 50  0000 L CNN
+F 1 "3K3" H 2170 4805 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 2030 4850 50  0001 C CNN
+F 3 "~" H 2100 4850 50  0001 C CNN
+F 4 "R03K3_0603" H 2100 4850 50  0001 C CNN "StockRef"
+	1    2100 4850
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
 	2200 4500 2100 4500
 Wire Wire Line
-	2100 5350 2600 5350
+	2100 4500 2100 4700
 Wire Wire Line
-	2600 5350 2600 4950
+	2100 5000 2100 5200
+Wire Wire Line
+	2100 5200 2600 5200
+Wire Wire Line
+	2600 5200 2600 4800
 $Comp
 L power:VBUS #PWR0111
 U 1 1 6029E990
-P 2550 3850
-F 0 "#PWR0111" H 2550 3700 50  0001 C CNN
-F 1 "VBUS" H 2565 4023 50  0000 C CNN
-F 2 "" H 2550 3850 50  0001 C CNN
-F 3 "" H 2550 3850 50  0001 C CNN
-	1    2550 3850
+P 2600 3850
+F 0 "#PWR0111" H 2600 3700 50  0001 C CNN
+F 1 "VBUS" H 2615 4023 50  0000 C CNN
+F 2 "" H 2600 3850 50  0001 C CNN
+F 3 "" H 2600 3850 50  0001 C CNN
+	1    2600 3850
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0112
 U 1 1 602A1ACC
-P 2600 5400
-F 0 "#PWR0112" H 2600 5150 50  0001 C CNN
-F 1 "GND" H 2605 5227 50  0000 C CNN
-F 2 "" H 2600 5400 50  0001 C CNN
-F 3 "" H 2600 5400 50  0001 C CNN
-	1    2600 5400
+P 2600 5250
+F 0 "#PWR0112" H 2600 5000 50  0001 C CNN
+F 1 "GND" H 2605 5077 50  0000 C CNN
+F 2 "" H 2600 5250 50  0001 C CNN
+F 3 "" H 2600 5250 50  0001 C CNN
+	1    2600 5250
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2600 5400 2600 5350
-Connection ~ 2600 5350
+	2600 5250 2600 5200
+Connection ~ 2600 5200
 $Comp
 L Device:LED D2
 U 1 1 602A475E
@@ -288,7 +343,7 @@ F 4 "LED_SMD_RED_0805_20mA" H 3950 4850 50  0001 C CNN "StockRef"
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	2550 3850 2550 3900
+	2600 3850 2600 3900
 $Comp
 L Device:R R10
 U 1 1 602AE2E0
@@ -301,9 +356,9 @@ F 4 "R470E_0603" H 3950 4150 50  0001 C CNN "StockRef"
 	1    3950 4150
 	-1   0    0    1   
 $EndComp
-Connection ~ 2550 3900
+Connection ~ 2600 3900
 Wire Wire Line
-	2550 3900 2550 4100
+	2600 3900 2600 4200
 Text GLabel 5500 2650 2    50   Input ~ 0
 SWDIO
 Text GLabel 5500 2750 2    50   Input ~ 0
@@ -640,14 +695,47 @@ Text GLabel 5500 1350 2    50   Input ~ 0
 MEAS_VBATT
 Wire Wire Line
 	5500 1350 5300 1350
-Connection ~ 3100 5350
+$Comp
+L Device:C_Polarized C7
+U 1 1 6043A641
+P 3100 4850
+F 0 "C7" H 3218 4896 50  0000 L CNN
+F 1 "4,7uF" H 3218 4805 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 3138 4700 50  0001 C CNN
+F 3 "~" H 3100 4850 50  0001 C CNN
+F 4 "C04u7_0805" H 3100 4850 50  0001 C CNN "StockRef"
+	1    3100 4850
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	3100 5350 2600 5350
+	3100 4700 3100 4500
+Connection ~ 3100 4500
 Wire Wire Line
-	1850 3900 2550 3900
+	3100 4500 3400 4500
 Wire Wire Line
-	1850 5350 2100 5350
-Connection ~ 2100 5350
+	3100 5000 3100 5200
+Connection ~ 3100 5200
+Wire Wire Line
+	3100 5200 2600 5200
+$Comp
+L Device:C_Polarized C1
+U 1 1 60446C89
+P 1850 5000
+F 0 "C1" H 1968 5046 50  0000 L CNN
+F 1 "4,7uF" H 1968 4955 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 1888 4850 50  0001 C CNN
+F 3 "~" H 1850 5000 50  0001 C CNN
+F 4 "C04u7_0805" H 1850 5000 50  0001 C CNN "StockRef"
+	1    1850 5000
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	1850 3900 2600 3900
+Wire Wire Line
+	1850 5150 1850 5200
+Wire Wire Line
+	1850 5200 2100 5200
+Connection ~ 2100 5200
 Text GLabel 1100 6000 2    50   Input ~ 0
 SWDIO
 Text GLabel 1100 6100 2    50   Input ~ 0
@@ -728,9 +816,9 @@ Wire Wire Line
 Wire Wire Line
 	3450 3900 3450 4000
 Wire Wire Line
-	2550 3900 3450 3900
+	2600 3900 3450 3900
 Wire Wire Line
-	3450 4300 3450 4350
+	3450 4300 3450 4400
 Wire Wire Line
 	3450 3900 3950 3900
 Wire Wire Line
@@ -739,9 +827,9 @@ Connection ~ 3450 3900
 Wire Wire Line
 	3950 4300 3950 4700
 Wire Wire Line
-	3950 5000 3950 5350
+	3950 5000 3950 5200
 Wire Wire Line
-	3950 5350 3100 5350
+	3950 5200 3100 5200
 Text Notes 1900 4150 0    50   ~ 0
 R7 \n3k3 = 220mA\n2k = 500mA
 Text GLabel 3350 800  2    50   Input ~ 0
@@ -792,6 +880,8 @@ Wire Wire Line
 Wire Wire Line
 	1250 4500 1850 4500
 Connection ~ 1850 4500
+Wire Wire Line
+	1850 4500 1850 4850
 Wire Wire Line
 	3900 2300 4100 2300
 Wire Wire Line
@@ -814,7 +904,7 @@ $EndComp
 Wire Wire Line
 	9650 4050 9650 3900
 Wire Wire Line
-	9650 3900 9900 3900
+	9650 3900 9800 3900
 $Comp
 L power:GND #PWR0107
 U 1 1 605DD17D
@@ -829,65 +919,90 @@ $EndComp
 $Comp
 L Device:R R5
 U 1 1 6025DA85
-P 9100 2300
-F 0 "R5" V 9000 2300 50  0000 C CNN
-F 1 "10K" V 9100 2300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9030 2300 50  0001 C CNN
-F 3 "~" H 9100 2300 50  0001 C CNN
-F 4 "R010K_0603" H 9100 2300 50  0001 C CNN "StockRef"
-	1    9100 2300
+P 9650 2200
+F 0 "R5" V 9443 2200 50  0000 C CNN
+F 1 "10K" V 9534 2200 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9580 2200 50  0001 C CNN
+F 3 "~" H 9650 2200 50  0001 C CNN
+F 4 "R010K_0603" H 9650 2200 50  0001 C CNN "StockRef"
+	1    9650 2200
 	-1   0    0    1   
 $EndComp
 $Comp
-L Audio:AudioJack_3_PS000175 CON2
+L Device:R R2
+U 1 1 6024E7D0
+P 9450 2450
+F 0 "R2" V 9450 2450 50  0000 C CNN
+F 1 "105E" V 9350 2450 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9380 2450 50  0001 C CNN
+F 3 "~" H 9450 2450 50  0001 C CNN
+F 4 "R105E_0603" H 9450 2450 50  0001 C CNN "StockRef"
+	1    9450 2450
+	0    -1   -1   0   
+$EndComp
+$Comp
+L dk_Barrel-Audio-Connectors:SJ1-3523N CON2
 U 1 1 6021DB86
-P 10300 2450
-F 0 "CON2" H 9972 2503 60  0000 R CNN
-F 1 "PS000175" H 9972 2397 60  0000 R CNN
-F 2 "MySymbols:3,5mm_straight_square" H 10500 2650 60  0001 L CNN
-F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 10500 2750 60  0001 L CNN
-F 4 "PS000175" H 10500 2950 60  0001 L CNN "MPN"
-F 5 "CONN JACK STEREO 3.5MM R/A" H 10500 3450 60  0001 L CNN "Description"
-F 6 "Multicomp" H 10500 3550 60  0001 L CNN "Manufacturer"
-F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 10300 2450 50  0001 C CNN "StockRef"
-	1    10300 2450
+P 10200 2450
+F 0 "CON2" H 9872 2503 60  0000 R CNN
+F 1 "PS000175" H 9872 2397 60  0000 R CNN
+F 2 "MySymbols:3,5mm_straight_square" H 10400 2650 60  0001 L CNN
+F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 10400 2750 60  0001 L CNN
+F 4 "PS000175" H 10400 2950 60  0001 L CNN "MPN"
+F 5 "CONN JACK STEREO 3.5MM R/A" H 10400 3450 60  0001 L CNN "Description"
+F 6 "Multicomp" H 10400 3550 60  0001 L CNN "Manufacturer"
+F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 10200 2450 50  0001 C CNN "StockRef"
+	1    10200 2450
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	9550 3700 9500 3700
+	9300 3800 9000 3800
 Wire Wire Line
-	9850 3700 9900 3700
+	9600 3800 9800 3800
+Wire Wire Line
+	9650 3700 9800 3700
 $Comp
 L power:+3V3 #PWR0108
 U 1 1 607146CD
-P 9100 3450
-F 0 "#PWR0108" H 9100 3300 50  0001 C CNN
-F 1 "+3V3" H 9115 3623 50  0000 C CNN
-F 2 "" H 9100 3450 50  0001 C CNN
-F 3 "" H 9100 3450 50  0001 C CNN
-	1    9100 3450
+P 9650 3350
+F 0 "#PWR0108" H 9650 3200 50  0001 C CNN
+F 1 "+3V3" H 9665 3523 50  0000 C CNN
+F 2 "" H 9650 3350 50  0001 C CNN
+F 3 "" H 9650 3350 50  0001 C CNN
+	1    9650 3350
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9000 2450 9100 2450
-Connection ~ 9100 2450
+	9650 3350 9650 3400
+Wire Wire Line
+	9650 3700 9000 3700
+Connection ~ 9650 3700
+Wire Wire Line
+	9600 2450 9800 2450
+Wire Wire Line
+	9800 2350 9650 2350
+Wire Wire Line
+	9000 2350 9650 2350
+Connection ~ 9650 2350
+Wire Wire Line
+	9300 2450 9000 2450
 Wire Wire Line
 	9650 2750 9650 2550
 Wire Wire Line
-	9650 2550 9900 2550
+	9650 2550 9800 2550
 $Comp
 L power:+3V3 #PWR0126
 U 1 1 607760D9
-P 9100 2100
-F 0 "#PWR0126" H 9100 1950 50  0001 C CNN
-F 1 "+3V3" H 9115 2273 50  0000 C CNN
-F 2 "" H 9100 2100 50  0001 C CNN
-F 3 "" H 9100 2100 50  0001 C CNN
-	1    9100 2100
+P 9650 2000
+F 0 "#PWR0126" H 9650 1850 50  0001 C CNN
+F 1 "+3V3" H 9665 2173 50  0000 C CNN
+F 2 "" H 9650 2000 50  0001 C CNN
+F 3 "" H 9650 2000 50  0001 C CNN
+	1    9650 2000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9100 2100 9100 2150
+	9650 2000 9650 2050
 $Comp
 L power:GND #PWR0127
 U 1 1 605DD95C
@@ -900,27 +1015,29 @@ F 3 "" H 9650 1450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9900 1100 9850 1100
+	9800 1200 9600 1200
 Wire Wire Line
-	9900 1300 9650 1300
+	9800 1300 9650 1300
 Wire Wire Line
 	9650 1300 9650 1450
 Wire Wire Line
-	9100 1200 9000 1200
-Connection ~ 9100 1200
+	9800 1100 9650 1100
+Wire Wire Line
+	9650 1100 9000 1100
+Connection ~ 9650 1100
 $Comp
 L power:+3V3 #PWR0128
 U 1 1 607BF2C6
-P 9100 850
-F 0 "#PWR0128" H 9100 700 50  0001 C CNN
-F 1 "+3V3" H 9115 1023 50  0000 C CNN
-F 2 "" H 9100 850 50  0001 C CNN
-F 3 "" H 9100 850 50  0001 C CNN
-	1    9100 850 
+P 9650 750
+F 0 "#PWR0128" H 9650 600 50  0001 C CNN
+F 1 "+3V3" H 9665 923 50  0000 C CNN
+F 2 "" H 9650 750 50  0001 C CNN
+F 3 "" H 9650 750 50  0001 C CNN
+	1    9650 750 
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9100 850  9100 900 
+	9650 750  9650 800 
 $Comp
 L Switch:SW_SPDT_MSM SW3
 U 1 1 6024E1D7
@@ -962,46 +1079,46 @@ SWITCH12
 Text GLabel 1650 950  2    50   Input ~ 0
 SWITCH1
 $Comp
-L Audio:AudioJack_3_PS000175 CON1
+L dk_Barrel-Audio-Connectors:SJ1-3523N CON1
 U 1 1 6021CA8A
-P 10300 1200
-F 0 "CON1" H 9972 1253 60  0000 R CNN
-F 1 "PS000175" H 9972 1147 60  0000 R CNN
-F 2 "MySymbols:3,5mm_straight_square" H 10500 1400 60  0001 L CNN
-F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 10500 1500 60  0001 L CNN
-F 4 "PS000175" H 10500 1700 60  0001 L CNN "MPN"
-F 5 "CONN JACK STEREO 3.5MM R/A" H 10500 2200 60  0001 L CNN "Description"
-F 6 "Multicomp" H 10500 2300 60  0001 L CNN "Manufacturer"
-F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 10300 1200 50  0001 C CNN "StockRef"
-	1    10300 1200
+P 10200 1200
+F 0 "CON1" H 9872 1253 60  0000 R CNN
+F 1 "PS000175" H 9872 1147 60  0000 R CNN
+F 2 "MySymbols:3,5mm_straight_square" H 10400 1400 60  0001 L CNN
+F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 10400 1500 60  0001 L CNN
+F 4 "PS000175" H 10400 1700 60  0001 L CNN "MPN"
+F 5 "CONN JACK STEREO 3.5MM R/A" H 10400 2200 60  0001 L CNN "Description"
+F 6 "Multicomp" H 10400 2300 60  0001 L CNN "Manufacturer"
+F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 10200 1200 50  0001 C CNN "StockRef"
+	1    10200 1200
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Audio:AudioJack_3_PS000175 CON3
+L dk_Barrel-Audio-Connectors:SJ1-3523N CON3
 U 1 1 6021F7DC
-P 10300 3800
-F 0 "CON3" H 9972 3853 60  0000 R CNN
-F 1 "PS000175" H 9972 3747 60  0000 R CNN
-F 2 "MySymbols:3,5mm_straight_square" H 10500 4000 60  0001 L CNN
-F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 10500 4100 60  0001 L CNN
-F 4 "PS000175" H 10500 4300 60  0001 L CNN "MPN"
-F 5 "CONN JACK STEREO 3.5MM R/A" H 10500 4800 60  0001 L CNN "Description"
-F 6 "Multicomp" H 10500 4900 60  0001 L CNN "Manufacturer"
-F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 10300 3800 50  0001 C CNN "StockRef"
-	1    10300 3800
+P 10200 3800
+F 0 "CON3" H 9872 3853 60  0000 R CNN
+F 1 "PS000175" H 9872 3747 60  0000 R CNN
+F 2 "MySymbols:3,5mm_straight_square" H 10400 4000 60  0001 L CNN
+F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 10400 4100 60  0001 L CNN
+F 4 "PS000175" H 10400 4300 60  0001 L CNN "MPN"
+F 5 "CONN JACK STEREO 3.5MM R/A" H 10400 4800 60  0001 L CNN "Description"
+F 6 "Multicomp" H 10400 4900 60  0001 L CNN "Manufacturer"
+F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 10200 3800 50  0001 C CNN "StockRef"
+	1    10200 3800
 	-1   0    0    -1  
 $EndComp
 Text GLabel 3900 2300 0    50   Input ~ 0
 LED1
 Text GLabel 3950 2650 0    50   Input ~ 0
 LED3
-Text GLabel 9500 3700 0    50   Input ~ 0
-LED3
 Text GLabel 9000 3800 0    50   Input ~ 0
+LED3
+Text GLabel 9000 3700 0    50   Input ~ 0
 DET3
-Text GLabel 9500 1100 0    50   Input ~ 0
-LED1
 Text GLabel 9000 1200 0    50   Input ~ 0
+LED1
+Text GLabel 9000 1100 0    50   Input ~ 0
 DET1
 $Comp
 L Transistor_FET:BSS84 Q1
@@ -1094,19 +1211,19 @@ Connection ~ 6750 1750
 Wire Wire Line
 	6750 1750 7000 1750
 Wire Wire Line
-	3000 4350 3050 4350
+	3000 4400 3050 4400
 Wire Wire Line
-	3450 4350 3350 4350
+	3450 4400 3350 4400
 $Comp
 L Device:R R11
 U 1 1 602AF25A
-P 3200 4350
-F 0 "R11" V 2993 4350 50  0000 C CNN
-F 1 "470E" V 3084 4350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 3130 4350 50  0001 C CNN
-F 3 "~" H 3200 4350 50  0001 C CNN
-F 4 "R470E_0603" H 3200 4350 50  0001 C CNN "StockRef"
-	1    3200 4350
+P 3200 4400
+F 0 "R11" V 2993 4400 50  0000 C CNN
+F 1 "470E" V 3084 4400 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 3130 4400 50  0001 C CNN
+F 3 "~" H 3200 4400 50  0001 C CNN
+F 4 "R470E_0603" H 3200 4400 50  0001 C CNN "StockRef"
+	1    3200 4400
 	0    1    1    0   
 $EndComp
 Text GLabel 5500 1550 2    50   Input ~ 0
@@ -1117,7 +1234,7 @@ Wire Wire Line
 	5500 2450 5300 2450
 Wire Wire Line
 	5500 2550 5300 2550
-Text Label 3450 4350 0    24   ~ 0
+Text Label 3450 4400 0    24   ~ 0
 CHG_STAT_LED
 Text Label 3950 4550 1    24   ~ 0
 CHG_5V_LED
@@ -1126,15 +1243,16 @@ CHG_PROG
 $Comp
 L Connector:TestPoint TP5
 U 1 1 61292A00
-P 7400 1750
-F 0 "TP5" V 7500 2000 50  0000 C CNN
-F 1 "TestPoint" V 7400 2100 50  0000 C CNN
-F 2 "MySymbols:TestPoint_SMD_R" H 7600 1750 50  0001 C CNN
-F 3 "~" H 7600 1750 50  0001 C CNN
-F 4 "DNP" H 7400 1750 50  0001 C CNN "DNP"
-	1    7400 1750
+P 7400 1350
+F 0 "TP5" V 7500 1600 50  0000 C CNN
+F 1 "TestPoint" V 7400 1700 50  0000 C CNN
+F 2 "MySymbols:TestPoint_SMD_R" H 7600 1350 50  0001 C CNN
+F 3 "~" H 7600 1350 50  0001 C CNN
+F 4 "DNP" H 7400 1350 50  0001 C CNN "DNP"
+	1    7400 1350
 	0    1    1    0   
 $EndComp
+Connection ~ 7400 1350
 Text Label 5750 550  0    50   ~ 0
 RST
 Text GLabel 1300 4700 2    50   Input ~ 0
@@ -1157,6 +1275,19 @@ Text GLabel 5850 3200 0    50   Input ~ 0
 USB_D+
 Text GLabel 5850 3300 0    50   Input ~ 0
 USB_D-
+$Comp
+L Device:R R20
+U 1 1 60865A0A
+P 6150 3200
+F 0 "R20" H 6220 3246 50  0000 L CNN
+F 1 "22R" H 6220 3155 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 6080 3200 50  0001 C CNN
+F 3 "~" H 6150 3200 50  0001 C CNN
+F 4 "DNP" H 6150 3200 50  0001 C CNN "DNP"
+F 5 "R022E_0603" H 6150 3200 50  0001 C CNN "StockRef"
+	1    6150 3200
+	0    -1   -1   0   
+$EndComp
 Wire Wire Line
 	6350 3200 6300 3200
 Wire Wire Line
@@ -1173,7 +1304,7 @@ F 0 "R21" H 6220 3346 50  0000 L CNN
 F 1 "22R" H 6220 3255 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 6080 3300 50  0001 C CNN
 F 3 "~" H 6150 3300 50  0001 C CNN
-F 4 "DNP" V 6150 3300 50  0000 C CNN "DNP"
+F 4 "DNP" H 6150 3300 50  0001 C CNN "DNP"
 F 5 "R022E_0603" H 6150 3300 50  0001 C CNN "StockRef"
 	1    6150 3300
 	0    1    1    0   
@@ -1547,152 +1678,4 @@ F 3 "" H 8400 4150 50  0001 C CNN
 	1    8400 4150
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	9100 3450 9100 3500
-Connection ~ 9100 3800
-Wire Wire Line
-	9100 3800 9000 3800
-Wire Wire Line
-	9100 3800 9900 3800
-$Comp
-L Device:R R6
-U 1 1 6025CE8E
-P 9100 3650
-F 0 "R6" V 9000 3650 50  0000 C CNN
-F 1 "10K" V 9100 3650 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9030 3650 50  0001 C CNN
-F 3 "~" H 9100 3650 50  0001 C CNN
-F 4 "R010K_0603" H 9100 3650 50  0001 C CNN "StockRef"
-	1    9100 3650
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	9850 2350 9900 2350
-Wire Wire Line
-	9550 2350 9500 2350
-$Comp
-L Device:R R2
-U 1 1 6024E7D0
-P 9700 2350
-F 0 "R2" V 9800 2350 50  0000 C CNN
-F 1 "105E" V 9700 2350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9630 2350 50  0001 C CNN
-F 3 "~" H 9700 2350 50  0001 C CNN
-F 4 "R105E_0603" H 9700 2350 50  0001 C CNN "StockRef"
-	1    9700 2350
-	0    -1   -1   0   
-$EndComp
-Wire Wire Line
-	9100 2450 9900 2450
-Wire Wire Line
-	9100 1200 9900 1200
-$Comp
-L power:+BATT #PWR0104
-U 1 1 6023A855
-P 3400 4500
-F 0 "#PWR0104" H 3400 4350 50  0001 C CNN
-F 1 "+BATT" V 3400 4750 50  0000 C CNN
-F 2 "" H 3400 4500 50  0001 C CNN
-F 3 "" H 3400 4500 50  0001 C CNN
-	1    3400 4500
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3100 4500 3400 4500
-Connection ~ 3100 4500
-Wire Wire Line
-	3000 4500 3100 4500
-Wire Wire Line
-	2100 5000 2100 5350
-Wire Wire Line
-	2100 4500 2100 4700
-$Comp
-L Device:R R7
-U 1 1 60299759
-P 2100 4850
-F 0 "R7" H 2170 4896 50  0000 L CNN
-F 1 "3K3" H 2170 4805 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2030 4850 50  0001 C CNN
-F 3 "~" H 2100 4850 50  0001 C CNN
-F 4 "R03K3_0603" H 2100 4850 50  0001 C CNN "StockRef"
-	1    2100 4850
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3100 5250 3100 5350
-Wire Wire Line
-	3100 4950 3100 4600
-$Comp
-L Device:C_Polarized C7
-U 1 1 6043A641
-P 3100 5100
-F 0 "C7" H 3218 5146 50  0000 L CNN
-F 1 "4,7uF" H 3218 5055 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 3138 4950 50  0001 C CNN
-F 3 "~" H 3100 5100 50  0001 C CNN
-F 4 "C04u7_0805" H 3100 5100 50  0001 C CNN "StockRef"
-	1    3100 5100
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	1850 5150 1850 5350
-Wire Wire Line
-	1850 4500 1850 4850
-$Comp
-L Device:C_Polarized C1
-U 1 1 60446C89
-P 1850 5000
-F 0 "C1" H 1968 5046 50  0000 L CNN
-F 1 "4,7uF" H 1968 4955 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 1888 4850 50  0001 C CNN
-F 3 "~" H 1850 5000 50  0001 C CNN
-F 4 "C04u7_0805" H 1850 5000 50  0001 C CNN "StockRef"
-	1    1850 5000
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	3000 4600 3100 4600
-Connection ~ 3100 4600
-Wire Wire Line
-	3100 4600 3100 4500
-Wire Wire Line
-	2450 4150 2450 4100
-Wire Wire Line
-	2450 4100 2550 4100
-Connection ~ 2550 4100
-Wire Wire Line
-	2550 4100 2550 4150
-Wire Wire Line
-	2500 4850 2500 4950
-Wire Wire Line
-	2500 4950 2600 4950
-Connection ~ 2600 4950
-Wire Wire Line
-	2600 4950 2600 4850
-$Comp
-L Battery_Management:MCP73832-2-MC U2
-U 1 1 60BBF61B
-P 2600 4450
-F 0 "U2" H 2900 4700 50  0000 R CNN
-F 1 "MCP73832-2-MC" H 3350 4100 50  0000 R CNN
-F 2 "Package_DFN_QFN:DFN-8-1EP_3x2mm_P0.5mm_EP1.75x1.45mm" H 2750 4000 50  0001 L CIN
-F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20001984g.pdf" H 2450 4400 50  0001 C CNN
-	1    2600 4450
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	7400 1750 7000 1750
-$Comp
-L Device:R R20
-U 1 1 60865A0A
-P 6150 3200
-F 0 "R20" H 6220 3246 50  0000 L CNN
-F 1 "22R" H 6220 3155 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 6080 3200 50  0001 C CNN
-F 3 "~" H 6150 3200 50  0001 C CNN
-F 4 "DNP" V 6150 3200 50  0000 C CNN "DNP"
-F 5 "R022E_0603" H 6150 3200 50  0001 C CNN "StockRef"
-	1    6150 3200
-	0    -1   -1   0   
-$EndComp
 $EndSCHEMATC

manufacturing/CAD/ledTruck/ledTruck.sch-bak

@@ -14,6 +14,20 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
+L dk_PMIC-Battery-Chargers:MCP73832T-2ACI_OT U2
+U 1 1 60220E3E
+P 2600 4300
+F 0 "U2" H 2850 4350 60  0000 C CNN
+F 1 "MCP73832T-2ACI_OT" H 2050 4350 60  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23-5" H 2800 4500 60  0001 L CNN
+F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20001984g.pdf" H 2800 4600 60  0001 L CNN
+F 4 "IC LI-ION/LI-POLY CTRLR SOT23-5" H 2800 5300 60  0001 L CNN "Description"
+F 5 "Microchip Technology" H 2800 5400 60  0001 L CNN "Manufacturer"
+F 6 "REG_MCP73832T" H 2600 4300 50  0001 C CNN "StockRef"
+	1    2600 4300
+	1    0    0    -1  
+$EndComp
+$Comp
 L power:+3.3V #PWR0101
 U 1 1 6022AA1E
 P 4600 750
@@ -27,45 +41,58 @@ $EndComp
 $Comp
 L Connector:Conn_01x02_Male J1
 U 1 1 60232097
-P 1100 6950
-F 0 "J1" H 1072 6924 50  0000 R CNN
-F 1 "JST_PH_S2B" H 1072 6833 50  0000 R CNN
-F 2 "Connector_JST:JST_PH_S2B-PH-K_1x02_P2.00mm_Horizontal" H 1100 6950 50  0001 C CNN
-F 3 "~" H 1100 6950 50  0001 C CNN
-F 4 "CON_PIN_01x02xPH_JST" H 1100 6950 50  0001 C CNN "StockRef"
-	1    1100 6950
+P 2550 6050
+F 0 "J1" H 2522 6024 50  0000 R CNN
+F 1 "JST_PH_S2B" H 2522 5933 50  0000 R CNN
+F 2 "Connector_JST:JST_PH_S2B-PH-K_1x02_P2.00mm_Horizontal" H 2550 6050 50  0001 C CNN
+F 3 "~" H 2550 6050 50  0001 C CNN
+F 4 "CON_PIN_01x02xPH_JST" H 2550 6050 50  0001 C CNN "StockRef"
+	1    2550 6050
 	-1   0    0    -1  
 $EndComp
 $Comp
 L power:+BATT #PWR0102
 U 1 1 602364A3
-P 750 6700
-F 0 "#PWR0102" H 750 6550 50  0001 C CNN
-F 1 "+BATT" H 765 6873 50  0000 C CNN
-F 2 "" H 750 6700 50  0001 C CNN
-F 3 "" H 750 6700 50  0001 C CNN
-	1    750  6700
+P 2200 5800
+F 0 "#PWR0102" H 2200 5650 50  0001 C CNN
+F 1 "+BATT" H 2215 5973 50  0000 C CNN
+F 2 "" H 2200 5800 50  0001 C CNN
+F 3 "" H 2200 5800 50  0001 C CNN
+	1    2200 5800
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0103
 U 1 1 602383EE
-P 750 7350
-F 0 "#PWR0103" H 750 7100 50  0001 C CNN
-F 1 "GND" H 755 7177 50  0000 C CNN
-F 2 "" H 750 7350 50  0001 C CNN
-F 3 "" H 750 7350 50  0001 C CNN
-	1    750  7350
+P 2200 6450
+F 0 "#PWR0103" H 2200 6200 50  0001 C CNN
+F 1 "GND" H 2205 6277 50  0000 C CNN
+F 2 "" H 2200 6450 50  0001 C CNN
+F 3 "" H 2200 6450 50  0001 C CNN
+	1    2200 6450
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	900  7050 750  7050
+	2350 6150 2200 6150
 Wire Wire Line
-	750  7050 750  7350
+	2200 6150 2200 6450
 Wire Wire Line
-	900  6950 750  6950
+	2350 6050 2200 6050
 Wire Wire Line
-	750  6950 750  6700
+	2200 6050 2200 5800
+$Comp
+L power:+BATT #PWR0104
+U 1 1 6023A855
+P 3400 4500
+F 0 "#PWR0104" H 3400 4350 50  0001 C CNN
+F 1 "+BATT" V 3400 4750 50  0000 C CNN
+F 2 "" H 3400 4500 50  0001 C CNN
+F 3 "" H 3400 4500 50  0001 C CNN
+	1    3400 4500
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3000 4500 3100 4500
 $Comp
 L Connector_Generic:Conn_01x04 J3
 U 1 1 6023E390
@@ -93,44 +120,56 @@ $EndComp
 $Comp
 L Device:R R1
 U 1 1 6024F4D7
-P 9700 1100
-F 0 "R1" V 9800 1100 50  0000 C CNN
-F 1 "105E" V 9700 1100 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9630 1100 50  0001 C CNN
-F 3 "~" H 9700 1100 50  0001 C CNN
-F 4 "R105E_0603" H 9700 1100 50  0001 C CNN "StockRef"
-	1    9700 1100
+P 9450 1200
+F 0 "R1" V 9450 1200 50  0000 C CNN
+F 1 "105E" V 9350 1200 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9380 1200 50  0001 C CNN
+F 3 "~" H 9450 1200 50  0001 C CNN
+F 4 "R105E_0603" H 9450 1200 50  0001 C CNN "StockRef"
+	1    9450 1200
 	0    1    -1   0   
 $EndComp
 $Comp
 L Device:R R3
 U 1 1 6024FF14
-P 9700 3700
-F 0 "R3" V 9600 3700 50  0000 C CNN
-F 1 "105E" V 9700 3700 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9630 3700 50  0001 C CNN
-F 3 "~" H 9700 3700 50  0001 C CNN
-F 4 "R105E_0603" H 9700 3700 50  0001 C CNN "StockRef"
-	1    9700 3700
+P 9450 3800
+F 0 "R3" V 9450 3800 50  0000 C CNN
+F 1 "105E" V 9550 3800 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9380 3800 50  0001 C CNN
+F 3 "~" H 9450 3800 50  0001 C CNN
+F 4 "R105E_0603" H 9450 3800 50  0001 C CNN "StockRef"
+	1    9450 3800
 	0    1    1    0   
 $EndComp
-Text GLabel 9500 2350 0    50   Input ~ 0
+Text GLabel 9000 2450 0    50   Input ~ 0
 LED2
 Wire Wire Line
-	9500 1100 9550 1100
+	9000 1200 9300 1200
+$Comp
+L Device:R R6
+U 1 1 6025CE8E
+P 9650 3550
+F 0 "R6" V 9443 3550 50  0000 C CNN
+F 1 "10K" V 9534 3550 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9580 3550 50  0001 C CNN
+F 3 "~" H 9650 3550 50  0001 C CNN
+F 4 "R010K_0603" H 9650 3550 50  0001 C CNN "StockRef"
+	1    9650 3550
+	-1   0    0    1   
+$EndComp
 $Comp
 L Device:R R4
 U 1 1 6025E6DF
-P 9100 1050
-F 0 "R4" V 9000 1050 50  0000 C CNN
-F 1 "10K" V 9100 1050 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9030 1050 50  0001 C CNN
-F 3 "~" H 9100 1050 50  0001 C CNN
-F 4 "R010K_0603" H 9100 1050 50  0001 C CNN "StockRef"
-	1    9100 1050
+P 9650 950
+F 0 "R4" V 9443 950 50  0000 C CNN
+F 1 "10K" V 9534 950 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9580 950 50  0001 C CNN
+F 3 "~" H 9650 950 50  0001 C CNN
+F 4 "R010K_0603" H 9650 950 50  0001 C CNN "StockRef"
+	1    9650 950 
 	-1   0    0    1   
 $EndComp
-Text GLabel 9000 2450 0    50   Input ~ 0
+Text GLabel 9000 2350 0    50   Input ~ 0
 DET2
 Text GLabel 5500 1750 2    50   Input ~ 0
 DET3
@@ -232,37 +271,53 @@ Wire Wire Line
 	1350 4900 1350 5200
 Wire Wire Line
 	1350 5200 950  5200
+$Comp
+L Device:R R7
+U 1 1 60299759
+P 2100 4850
+F 0 "R7" H 2170 4896 50  0000 L CNN
+F 1 "3K3" H 2170 4805 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 2030 4850 50  0001 C CNN
+F 3 "~" H 2100 4850 50  0001 C CNN
+F 4 "R03K3_0603" H 2100 4850 50  0001 C CNN "StockRef"
+	1    2100 4850
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
 	2200 4500 2100 4500
 Wire Wire Line
-	2100 5350 2600 5350
+	2100 4500 2100 4700
 Wire Wire Line
-	2600 5350 2600 4950
+	2100 5000 2100 5200
+Wire Wire Line
+	2100 5200 2600 5200
+Wire Wire Line
+	2600 5200 2600 4800
 $Comp
 L power:VBUS #PWR0111
 U 1 1 6029E990
-P 2550 3850
-F 0 "#PWR0111" H 2550 3700 50  0001 C CNN
-F 1 "VBUS" H 2565 4023 50  0000 C CNN
-F 2 "" H 2550 3850 50  0001 C CNN
-F 3 "" H 2550 3850 50  0001 C CNN
-	1    2550 3850
+P 2600 3850
+F 0 "#PWR0111" H 2600 3700 50  0001 C CNN
+F 1 "VBUS" H 2615 4023 50  0000 C CNN
+F 2 "" H 2600 3850 50  0001 C CNN
+F 3 "" H 2600 3850 50  0001 C CNN
+	1    2600 3850
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0112
 U 1 1 602A1ACC
-P 2600 5400
-F 0 "#PWR0112" H 2600 5150 50  0001 C CNN
-F 1 "GND" H 2605 5227 50  0000 C CNN
-F 2 "" H 2600 5400 50  0001 C CNN
-F 3 "" H 2600 5400 50  0001 C CNN
-	1    2600 5400
+P 2600 5250
+F 0 "#PWR0112" H 2600 5000 50  0001 C CNN
+F 1 "GND" H 2605 5077 50  0000 C CNN
+F 2 "" H 2600 5250 50  0001 C CNN
+F 3 "" H 2600 5250 50  0001 C CNN
+	1    2600 5250
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2600 5400 2600 5350
-Connection ~ 2600 5350
+	2600 5250 2600 5200
+Connection ~ 2600 5200
 $Comp
 L Device:LED D2
 U 1 1 602A475E
@@ -288,7 +343,7 @@ F 4 "LED_SMD_RED_0805_20mA" H 3950 4850 50  0001 C CNN "StockRef"
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	2550 3850 2550 3900
+	2600 3850 2600 3900
 $Comp
 L Device:R R10
 U 1 1 602AE2E0
@@ -301,9 +356,9 @@ F 4 "R470E_0603" H 3950 4150 50  0001 C CNN "StockRef"
 	1    3950 4150
 	-1   0    0    1   
 $EndComp
-Connection ~ 2550 3900
+Connection ~ 2600 3900
 Wire Wire Line
-	2550 3900 2550 4100
+	2600 3900 2600 4200
 Text GLabel 5500 2650 2    50   Input ~ 0
 SWDIO
 Text GLabel 5500 2750 2    50   Input ~ 0
@@ -640,14 +695,47 @@ Text GLabel 5500 1350 2    50   Input ~ 0
 MEAS_VBATT
 Wire Wire Line
 	5500 1350 5300 1350
-Connection ~ 3100 5350
+$Comp
+L Device:C_Polarized C7
+U 1 1 6043A641
+P 3100 4850
+F 0 "C7" H 3218 4896 50  0000 L CNN
+F 1 "4,7uF" H 3218 4805 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 3138 4700 50  0001 C CNN
+F 3 "~" H 3100 4850 50  0001 C CNN
+F 4 "C04u7_0805" H 3100 4850 50  0001 C CNN "StockRef"
+	1    3100 4850
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	3100 5350 2600 5350
+	3100 4700 3100 4500
+Connection ~ 3100 4500
 Wire Wire Line
-	1850 3900 2550 3900
+	3100 4500 3400 4500
 Wire Wire Line
-	1850 5350 2100 5350
-Connection ~ 2100 5350
+	3100 5000 3100 5200
+Connection ~ 3100 5200
+Wire Wire Line
+	3100 5200 2600 5200
+$Comp
+L Device:C_Polarized C1
+U 1 1 60446C89
+P 1850 5000
+F 0 "C1" H 1968 5046 50  0000 L CNN
+F 1 "4,7uF" H 1968 4955 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 1888 4850 50  0001 C CNN
+F 3 "~" H 1850 5000 50  0001 C CNN
+F 4 "C04u7_0805" H 1850 5000 50  0001 C CNN "StockRef"
+	1    1850 5000
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	1850 3900 2600 3900
+Wire Wire Line
+	1850 5150 1850 5200
+Wire Wire Line
+	1850 5200 2100 5200
+Connection ~ 2100 5200
 Text GLabel 1100 6000 2    50   Input ~ 0
 SWDIO
 Text GLabel 1100 6100 2    50   Input ~ 0
@@ -728,9 +816,9 @@ Wire Wire Line
 Wire Wire Line
 	3450 3900 3450 4000
 Wire Wire Line
-	2550 3900 3450 3900
+	2600 3900 3450 3900
 Wire Wire Line
-	3450 4300 3450 4350
+	3450 4300 3450 4400
 Wire Wire Line
 	3450 3900 3950 3900
 Wire Wire Line
@@ -739,9 +827,9 @@ Connection ~ 3450 3900
 Wire Wire Line
 	3950 4300 3950 4700
 Wire Wire Line
-	3950 5000 3950 5350
+	3950 5000 3950 5200
 Wire Wire Line
-	3950 5350 3100 5350
+	3950 5200 3100 5200
 Text Notes 1900 4150 0    50   ~ 0
 R7 \n3k3 = 220mA\n2k = 500mA
 Text GLabel 3350 800  2    50   Input ~ 0
@@ -792,6 +880,8 @@ Wire Wire Line
 Wire Wire Line
 	1250 4500 1850 4500
 Connection ~ 1850 4500
+Wire Wire Line
+	1850 4500 1850 4850
 Wire Wire Line
 	3900 2300 4100 2300
 Wire Wire Line
@@ -814,7 +904,7 @@ $EndComp
 Wire Wire Line
 	9650 4050 9650 3900
 Wire Wire Line
-	9650 3900 9900 3900
+	9650 3900 9800 3900
 $Comp
 L power:GND #PWR0107
 U 1 1 605DD17D
@@ -829,65 +919,90 @@ $EndComp
 $Comp
 L Device:R R5
 U 1 1 6025DA85
-P 9100 2300
-F 0 "R5" V 9000 2300 50  0000 C CNN
-F 1 "10K" V 9100 2300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9030 2300 50  0001 C CNN
-F 3 "~" H 9100 2300 50  0001 C CNN
-F 4 "R010K_0603" H 9100 2300 50  0001 C CNN "StockRef"
-	1    9100 2300
+P 9650 2200
+F 0 "R5" V 9443 2200 50  0000 C CNN
+F 1 "10K" V 9534 2200 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9580 2200 50  0001 C CNN
+F 3 "~" H 9650 2200 50  0001 C CNN
+F 4 "R010K_0603" H 9650 2200 50  0001 C CNN "StockRef"
+	1    9650 2200
 	-1   0    0    1   
 $EndComp
 $Comp
-L Audio:AudioJack_3_PS000175 CON2
+L Device:R R2
+U 1 1 6024E7D0
+P 9450 2450
+F 0 "R2" V 9450 2450 50  0000 C CNN
+F 1 "105E" V 9350 2450 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9380 2450 50  0001 C CNN
+F 3 "~" H 9450 2450 50  0001 C CNN
+F 4 "R105E_0603" H 9450 2450 50  0001 C CNN "StockRef"
+	1    9450 2450
+	0    -1   -1   0   
+$EndComp
+$Comp
+L dk_Barrel-Audio-Connectors:SJ1-3523N CON2
 U 1 1 6021DB86
-P 10300 2450
-F 0 "CON2" H 9972 2503 60  0000 R CNN
-F 1 "PS000175" H 9972 2397 60  0000 R CNN
-F 2 "MySymbols:3,5mm_straight_square" H 10500 2650 60  0001 L CNN
-F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 10500 2750 60  0001 L CNN
-F 4 "PS000175" H 10500 2950 60  0001 L CNN "MPN"
-F 5 "CONN JACK STEREO 3.5MM R/A" H 10500 3450 60  0001 L CNN "Description"
-F 6 "Multicomp" H 10500 3550 60  0001 L CNN "Manufacturer"
-F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 10300 2450 50  0001 C CNN "StockRef"
-	1    10300 2450
+P 10200 2450
+F 0 "CON2" H 9872 2503 60  0000 R CNN
+F 1 "PS000175" H 9872 2397 60  0000 R CNN
+F 2 "MySymbols:3,5mm_straight_square" H 10400 2650 60  0001 L CNN
+F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 10400 2750 60  0001 L CNN
+F 4 "PS000175" H 10400 2950 60  0001 L CNN "MPN"
+F 5 "CONN JACK STEREO 3.5MM R/A" H 10400 3450 60  0001 L CNN "Description"
+F 6 "Multicomp" H 10400 3550 60  0001 L CNN "Manufacturer"
+F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 10200 2450 50  0001 C CNN "StockRef"
+	1    10200 2450
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	9550 3700 9500 3700
+	9300 3800 9000 3800
 Wire Wire Line
-	9850 3700 9900 3700
+	9600 3800 9800 3800
+Wire Wire Line
+	9650 3700 9800 3700
 $Comp
 L power:+3V3 #PWR0108
 U 1 1 607146CD
-P 9100 3450
-F 0 "#PWR0108" H 9100 3300 50  0001 C CNN
-F 1 "+3V3" H 9115 3623 50  0000 C CNN
-F 2 "" H 9100 3450 50  0001 C CNN
-F 3 "" H 9100 3450 50  0001 C CNN
-	1    9100 3450
+P 9650 3350
+F 0 "#PWR0108" H 9650 3200 50  0001 C CNN
+F 1 "+3V3" H 9665 3523 50  0000 C CNN
+F 2 "" H 9650 3350 50  0001 C CNN
+F 3 "" H 9650 3350 50  0001 C CNN
+	1    9650 3350
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9000 2450 9100 2450
-Connection ~ 9100 2450
+	9650 3350 9650 3400
+Wire Wire Line
+	9650 3700 9000 3700
+Connection ~ 9650 3700
+Wire Wire Line
+	9600 2450 9800 2450
+Wire Wire Line
+	9800 2350 9650 2350
+Wire Wire Line
+	9000 2350 9650 2350
+Connection ~ 9650 2350
+Wire Wire Line
+	9300 2450 9000 2450
 Wire Wire Line
 	9650 2750 9650 2550
 Wire Wire Line
-	9650 2550 9900 2550
+	9650 2550 9800 2550
 $Comp
 L power:+3V3 #PWR0126
 U 1 1 607760D9
-P 9100 2100
-F 0 "#PWR0126" H 9100 1950 50  0001 C CNN
-F 1 "+3V3" H 9115 2273 50  0000 C CNN
-F 2 "" H 9100 2100 50  0001 C CNN
-F 3 "" H 9100 2100 50  0001 C CNN
-	1    9100 2100
+P 9650 2000
+F 0 "#PWR0126" H 9650 1850 50  0001 C CNN
+F 1 "+3V3" H 9665 2173 50  0000 C CNN
+F 2 "" H 9650 2000 50  0001 C CNN
+F 3 "" H 9650 2000 50  0001 C CNN
+	1    9650 2000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9100 2100 9100 2150
+	9650 2000 9650 2050
 $Comp
 L power:GND #PWR0127
 U 1 1 605DD95C
@@ -900,27 +1015,29 @@ F 3 "" H 9650 1450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9900 1100 9850 1100
+	9800 1200 9600 1200
 Wire Wire Line
-	9900 1300 9650 1300
+	9800 1300 9650 1300
 Wire Wire Line
 	9650 1300 9650 1450
 Wire Wire Line
-	9100 1200 9000 1200
-Connection ~ 9100 1200
+	9800 1100 9650 1100
+Wire Wire Line
+	9650 1100 9000 1100
+Connection ~ 9650 1100
 $Comp
 L power:+3V3 #PWR0128
 U 1 1 607BF2C6
-P 9100 850
-F 0 "#PWR0128" H 9100 700 50  0001 C CNN
-F 1 "+3V3" H 9115 1023 50  0000 C CNN
-F 2 "" H 9100 850 50  0001 C CNN
-F 3 "" H 9100 850 50  0001 C CNN
-	1    9100 850 
+P 9650 750
+F 0 "#PWR0128" H 9650 600 50  0001 C CNN
+F 1 "+3V3" H 9665 923 50  0000 C CNN
+F 2 "" H 9650 750 50  0001 C CNN
+F 3 "" H 9650 750 50  0001 C CNN
+	1    9650 750 
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9100 850  9100 900 
+	9650 750  9650 800 
 $Comp
 L Switch:SW_SPDT_MSM SW3
 U 1 1 6024E1D7
@@ -945,7 +1062,7 @@ F 4 "SW_TOG_SPDT_MSM" H 1200 1050 50  0001 C CNN "StockRef"
 	1    1200 1050
 	1    0    0    -1  
 $EndComp
-Text GLabel 5500 2250 2    50   Input ~ 0
+Text GLabel 5500 1550 2    50   Input ~ 0
 SWITCH12
 Text GLabel 5500 2050 2    50   Input ~ 0
 SWITCH1
@@ -962,46 +1079,46 @@ SWITCH12
 Text GLabel 1650 950  2    50   Input ~ 0
 SWITCH1
 $Comp
-L Audio:AudioJack_3_PS000175 CON1
+L dk_Barrel-Audio-Connectors:SJ1-3523N CON1
 U 1 1 6021CA8A
-P 10300 1200
-F 0 "CON1" H 9972 1253 60  0000 R CNN
-F 1 "PS000175" H 9972 1147 60  0000 R CNN
-F 2 "MySymbols:3,5mm_straight_square" H 10500 1400 60  0001 L CNN
-F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 10500 1500 60  0001 L CNN
-F 4 "PS000175" H 10500 1700 60  0001 L CNN "MPN"
-F 5 "CONN JACK STEREO 3.5MM R/A" H 10500 2200 60  0001 L CNN "Description"
-F 6 "Multicomp" H 10500 2300 60  0001 L CNN "Manufacturer"
-F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 10300 1200 50  0001 C CNN "StockRef"
-	1    10300 1200
+P 10200 1200
+F 0 "CON1" H 9872 1253 60  0000 R CNN
+F 1 "PS000175" H 9872 1147 60  0000 R CNN
+F 2 "MySymbols:3,5mm_straight_square" H 10400 1400 60  0001 L CNN
+F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 10400 1500 60  0001 L CNN
+F 4 "PS000175" H 10400 1700 60  0001 L CNN "MPN"
+F 5 "CONN JACK STEREO 3.5MM R/A" H 10400 2200 60  0001 L CNN "Description"
+F 6 "Multicomp" H 10400 2300 60  0001 L CNN "Manufacturer"
+F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 10200 1200 50  0001 C CNN "StockRef"
+	1    10200 1200
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Audio:AudioJack_3_PS000175 CON3
+L dk_Barrel-Audio-Connectors:SJ1-3523N CON3
 U 1 1 6021F7DC
-P 10300 3800
-F 0 "CON3" H 9972 3853 60  0000 R CNN
-F 1 "PS000175" H 9972 3747 60  0000 R CNN
-F 2 "MySymbols:3,5mm_straight_square" H 10500 4000 60  0001 L CNN
-F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 10500 4100 60  0001 L CNN
-F 4 "PS000175" H 10500 4300 60  0001 L CNN "MPN"
-F 5 "CONN JACK STEREO 3.5MM R/A" H 10500 4800 60  0001 L CNN "Description"
-F 6 "Multicomp" H 10500 4900 60  0001 L CNN "Manufacturer"
-F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 10300 3800 50  0001 C CNN "StockRef"
-	1    10300 3800
+P 10200 3800
+F 0 "CON3" H 9872 3853 60  0000 R CNN
+F 1 "PS000175" H 9872 3747 60  0000 R CNN
+F 2 "MySymbols:3,5mm_straight_square" H 10400 4000 60  0001 L CNN
+F 3 "https://www.cui.com/product/resource/digikeypdf/sj1-352xn_series.pdf" H 10400 4100 60  0001 L CNN
+F 4 "PS000175" H 10400 4300 60  0001 L CNN "MPN"
+F 5 "CONN JACK STEREO 3.5MM R/A" H 10400 4800 60  0001 L CNN "Description"
+F 6 "Multicomp" H 10400 4900 60  0001 L CNN "Manufacturer"
+F 7 "CON_3PJACK_F_STR_PTH_PS000175" H 10200 3800 50  0001 C CNN "StockRef"
+	1    10200 3800
 	-1   0    0    -1  
 $EndComp
 Text GLabel 3900 2300 0    50   Input ~ 0
 LED1
 Text GLabel 3950 2650 0    50   Input ~ 0
 LED3
-Text GLabel 9500 3700 0    50   Input ~ 0
-LED3
 Text GLabel 9000 3800 0    50   Input ~ 0
+LED3
+Text GLabel 9000 3700 0    50   Input ~ 0
 DET3
-Text GLabel 9500 1100 0    50   Input ~ 0
-LED1
 Text GLabel 9000 1200 0    50   Input ~ 0
+LED1
+Text GLabel 9000 1100 0    50   Input ~ 0
 DET1
 $Comp
 L Transistor_FET:BSS84 Q1
@@ -1094,22 +1211,22 @@ Connection ~ 6750 1750
 Wire Wire Line
 	6750 1750 7000 1750
 Wire Wire Line
-	3000 4350 3050 4350
+	3000 4400 3050 4400
 Wire Wire Line
-	3450 4350 3350 4350
+	3450 4400 3350 4400
 $Comp
 L Device:R R11
 U 1 1 602AF25A
-P 3200 4350
-F 0 "R11" V 2993 4350 50  0000 C CNN
-F 1 "470E" V 3084 4350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 3130 4350 50  0001 C CNN
-F 3 "~" H 3200 4350 50  0001 C CNN
-F 4 "R470E_0603" H 3200 4350 50  0001 C CNN "StockRef"
-	1    3200 4350
+P 3200 4400
+F 0 "R11" V 2993 4400 50  0000 C CNN
+F 1 "470E" V 3084 4400 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 3130 4400 50  0001 C CNN
+F 3 "~" H 3200 4400 50  0001 C CNN
+F 4 "R470E_0603" H 3200 4400 50  0001 C CNN "StockRef"
+	1    3200 4400
 	0    1    1    0   
 $EndComp
-Text GLabel 5500 1550 2    50   Input ~ 0
+Text GLabel 5500 2250 2    50   Output ~ 0
 BTN_PWR
 Text GLabel 5500 2350 2    50   Input ~ 0
 PW_HOLD
@@ -1117,7 +1234,7 @@ Wire Wire Line
 	5500 2450 5300 2450
 Wire Wire Line
 	5500 2550 5300 2550
-Text Label 3450 4350 0    24   ~ 0
+Text Label 3450 4400 0    24   ~ 0
 CHG_STAT_LED
 Text Label 3950 4550 1    24   ~ 0
 CHG_5V_LED
@@ -1126,15 +1243,16 @@ CHG_PROG
 $Comp
 L Connector:TestPoint TP5
 U 1 1 61292A00
-P 7400 1750
-F 0 "TP5" V 7500 2000 50  0000 C CNN
-F 1 "TestPoint" V 7400 2100 50  0000 C CNN
-F 2 "MySymbols:TestPoint_SMD_R" H 7600 1750 50  0001 C CNN
-F 3 "~" H 7600 1750 50  0001 C CNN
-F 4 "DNP" H 7400 1750 50  0001 C CNN "DNP"
-	1    7400 1750
+P 7400 1350
+F 0 "TP5" V 7500 1600 50  0000 C CNN
+F 1 "TestPoint" V 7400 1700 50  0000 C CNN
+F 2 "MySymbols:TestPoint_SMD_R" H 7600 1350 50  0001 C CNN
+F 3 "~" H 7600 1350 50  0001 C CNN
+F 4 "DNP" H 7400 1350 50  0001 C CNN "DNP"
+	1    7400 1350
 	0    1    1    0   
 $EndComp
+Connection ~ 7400 1350
 Text Label 5750 550  0    50   ~ 0
 RST
 Text GLabel 1300 4700 2    50   Input ~ 0
@@ -1157,6 +1275,19 @@ Text GLabel 5850 3200 0    50   Input ~ 0
 USB_D+
 Text GLabel 5850 3300 0    50   Input ~ 0
 USB_D-
+$Comp
+L Device:R R20
+U 1 1 60865A0A
+P 6150 3200
+F 0 "R20" H 6220 3246 50  0000 L CNN
+F 1 "22R" H 6220 3155 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 6080 3200 50  0001 C CNN
+F 3 "~" H 6150 3200 50  0001 C CNN
+F 4 "DNP" H 6150 3200 50  0001 C CNN "DNP"
+F 5 "R022E_0603" H 6150 3200 50  0001 C CNN "StockRef"
+	1    6150 3200
+	0    -1   -1   0   
+$EndComp
 Wire Wire Line
 	6350 3200 6300 3200
 Wire Wire Line
@@ -1173,7 +1304,7 @@ F 0 "R21" H 6220 3346 50  0000 L CNN
 F 1 "22R" H 6220 3255 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 6080 3300 50  0001 C CNN
 F 3 "~" H 6150 3300 50  0001 C CNN
-F 4 "DNP" V 6150 3300 50  0000 C CNN "DNP"
+F 4 "DNP" H 6150 3300 50  0001 C CNN "DNP"
 F 5 "R022E_0603" H 6150 3300 50  0001 C CNN "StockRef"
 	1    6150 3300
 	0    1    1    0   
@@ -1547,152 +1678,4 @@ F 3 "" H 8400 4150 50  0001 C CNN
 	1    8400 4150
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	9100 3450 9100 3500
-Connection ~ 9100 3800
-Wire Wire Line
-	9100 3800 9000 3800
-Wire Wire Line
-	9100 3800 9900 3800
-$Comp
-L Device:R R6
-U 1 1 6025CE8E
-P 9100 3650
-F 0 "R6" V 9000 3650 50  0000 C CNN
-F 1 "10K" V 9100 3650 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9030 3650 50  0001 C CNN
-F 3 "~" H 9100 3650 50  0001 C CNN
-F 4 "R010K_0603" H 9100 3650 50  0001 C CNN "StockRef"
-	1    9100 3650
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	9850 2350 9900 2350
-Wire Wire Line
-	9550 2350 9500 2350
-$Comp
-L Device:R R2
-U 1 1 6024E7D0
-P 9700 2350
-F 0 "R2" V 9800 2350 50  0000 C CNN
-F 1 "105E" V 9700 2350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9630 2350 50  0001 C CNN
-F 3 "~" H 9700 2350 50  0001 C CNN
-F 4 "R105E_0603" H 9700 2350 50  0001 C CNN "StockRef"
-	1    9700 2350
-	0    -1   -1   0   
-$EndComp
-Wire Wire Line
-	9100 2450 9900 2450
-Wire Wire Line
-	9100 1200 9900 1200
-$Comp
-L power:+BATT #PWR0104
-U 1 1 6023A855
-P 3400 4500
-F 0 "#PWR0104" H 3400 4350 50  0001 C CNN
-F 1 "+BATT" V 3400 4750 50  0000 C CNN
-F 2 "" H 3400 4500 50  0001 C CNN
-F 3 "" H 3400 4500 50  0001 C CNN
-	1    3400 4500
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3100 4500 3400 4500
-Connection ~ 3100 4500
-Wire Wire Line
-	3000 4500 3100 4500
-Wire Wire Line
-	2100 5000 2100 5350
-Wire Wire Line
-	2100 4500 2100 4700
-$Comp
-L Device:R R7
-U 1 1 60299759
-P 2100 4850
-F 0 "R7" H 2170 4896 50  0000 L CNN
-F 1 "3K3" H 2170 4805 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2030 4850 50  0001 C CNN
-F 3 "~" H 2100 4850 50  0001 C CNN
-F 4 "R03K3_0603" H 2100 4850 50  0001 C CNN "StockRef"
-	1    2100 4850
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3100 5250 3100 5350
-Wire Wire Line
-	3100 4950 3100 4600
-$Comp
-L Device:C_Polarized C7
-U 1 1 6043A641
-P 3100 5100
-F 0 "C7" H 3218 5146 50  0000 L CNN
-F 1 "4,7uF" H 3218 5055 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 3138 4950 50  0001 C CNN
-F 3 "~" H 3100 5100 50  0001 C CNN
-F 4 "C04u7_0805" H 3100 5100 50  0001 C CNN "StockRef"
-	1    3100 5100
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	1850 5150 1850 5350
-Wire Wire Line
-	1850 4500 1850 4850
-$Comp
-L Device:C_Polarized C1
-U 1 1 60446C89
-P 1850 5000
-F 0 "C1" H 1968 5046 50  0000 L CNN
-F 1 "4,7uF" H 1968 4955 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 1888 4850 50  0001 C CNN
-F 3 "~" H 1850 5000 50  0001 C CNN
-F 4 "C04u7_0805" H 1850 5000 50  0001 C CNN "StockRef"
-	1    1850 5000
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	3000 4600 3100 4600
-Connection ~ 3100 4600
-Wire Wire Line
-	3100 4600 3100 4500
-Wire Wire Line
-	2450 4150 2450 4100
-Wire Wire Line
-	2450 4100 2550 4100
-Connection ~ 2550 4100
-Wire Wire Line
-	2550 4100 2550 4150
-Wire Wire Line
-	2500 4850 2500 4950
-Wire Wire Line
-	2500 4950 2600 4950
-Connection ~ 2600 4950
-Wire Wire Line
-	2600 4950 2600 4850
-$Comp
-L Battery_Management:MCP73832-2-MC U2
-U 1 1 60BBF61B
-P 2600 4450
-F 0 "U2" H 2900 4700 50  0000 R CNN
-F 1 "MCP73832-2-MC" H 3350 4100 50  0000 R CNN
-F 2 "Package_DFN_QFN:DFN-8-1EP_3x2mm_P0.5mm_EP1.75x1.45mm" H 2750 4000 50  0001 L CIN
-F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20001984g.pdf" H 2450 4400 50  0001 C CNN
-	1    2600 4450
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	7400 1750 7000 1750
-$Comp
-L Device:R R20
-U 1 1 60865A0A
-P 6150 3200
-F 0 "R20" H 6220 3246 50  0000 L CNN
-F 1 "22R" H 6220 3155 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 6080 3200 50  0001 C CNN
-F 3 "~" H 6150 3200 50  0001 C CNN
-F 4 "DNP" V 6150 3200 50  0000 C CNN "DNP"
-F 5 "R022E_0603" H 6150 3200 50  0001 C CNN "StockRef"
-	1    6150 3200
-	0    -1   -1   0   
-$EndComp
 $EndSCHEMATC

manufacturing/programming/en.stm32cubeprg-mac_v2-8-0_v2.8.0/SetupSTM32CubeProgrammer-2.8.0.app/Contents/Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-<key>CFBundleExecutable</key>
-<string>SetupSTM32CubeProgrammer-2_8_0_macos</string>
-<key>CFBundleGetInfoString</key>
-<string>SetupSTM32CubeProgrammer 2.8.0</string>
-<key>CFBundleIdentifier</key>
-<string>com.st.stm32cubeprogrammer</string>
-<key>CFBundleName</key>
-<string>SetupSTM32CubeProgrammer</string>
-<key>CFBundlePackageType</key>
-<string>APPL</string>
-<key>CFBundleShortVersionString</key>
-<string>2.8.0</string>
-<key>CFBundleSignature</key>
-<string>????</string>
-<key>CFBundleVersion</key>
-<string>2.8.0</string>
-<key>CFBundleIconFile</key>
-<string>stm32cubeprogrammer</string>
-</dict>
-</plist>

manufacturing/programming/en.stm32cubeprg-mac_v2-8-0_v2.8.0/jre/ASSEMBLY_EXCEPTION

@@ -1,27 +0,0 @@
-
-OPENJDK ASSEMBLY EXCEPTION
-
-The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
-openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
-General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
-only ("GPL2"), with the following clarification and special exception.
-
-    Linking this OpenJDK Code statically or dynamically with other code
-    is making a combined work based on this library.  Thus, the terms
-    and conditions of GPL2 cover the whole combination.
-
-    As a special exception, Oracle gives you permission to link this
-    OpenJDK Code with certain code licensed by Oracle as indicated at
-    http://openjdk.java.net/legal/exception-modules-2007-05-08.html
-    ("Designated Exception Modules") to produce an executable,
-    regardless of the license terms of the Designated Exception Modules,
-    and to copy and distribute the resulting executable under GPL2,
-    provided that the Designated Exception Modules continue to be
-    governed by the licenses under which they were offered by Oracle.
-
-As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code
-to build an executable that includes those portions of necessary code that
-Oracle could not provide under GPL2 (or that Oracle has provided under GPL2
-with the Classpath exception).  If you modify or add to the OpenJDK code,
-that new GPL2 code may still be combined with Designated Exception Modules
-if the new code is made subject to this exception by its copyright holder.

manufacturing/programming/en.stm32cubeprg-mac_v2-8-0_v2.8.0/jre/LICENSE

@@ -1,347 +0,0 @@
-The GNU General Public License (GPL)
-
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share
-and change it.  By contrast, the GNU General Public License is intended to
-guarantee your freedom to share and change free software--to make sure the
-software is free for all its users.  This General Public License applies to
-most of the Free Software Foundation's software and to any other program whose
-authors commit to using it.  (Some other Free Software Foundation software is
-covered by the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not price.  Our
-General Public Licenses are designed to make sure that you have the freedom to
-distribute copies of free software (and charge for this service if you wish),
-that you receive source code or can get it if you want it, that you can change
-the software or use pieces of it in new free programs; and that you know you
-can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny
-you these rights or to ask you to surrender the rights.  These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for
-a fee, you must give the recipients all the rights that you have.  You must
-make sure that they, too, receive or can get the source code.  And you must
-show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute
-and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software.  If the
-software is modified by someone else and passed on, we want its recipients to
-know that what they have is not the original, so that any problems introduced
-by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents.  We
-wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program proprietary.
-To prevent this, we have made it clear that any patent must be licensed for
-everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms of
-this General Public License.  The "Program", below, refers to any such program
-or work, and a "work based on the Program" means either the Program or any
-derivative work under copyright law: that is to say, a work containing the
-Program or a portion of it, either verbatim or with modifications and/or
-translated into another language.  (Hereinafter, translation is included
-without limitation in the term "modification".) Each licensee is addressed as
-"you".
-
-Activities other than copying, distribution and modification are not covered by
-this License; they are outside its scope.  The act of running the Program is
-not restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made by
-running the Program).  Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as
-you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the
-Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may
-at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus
-forming a work based on the Program, and copy and distribute such modifications
-or work under the terms of Section 1 above, provided that you also meet all of
-these conditions:
-
-    a) You must cause the modified files to carry prominent notices stating
-    that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in whole or
-    in part contains or is derived from the Program or any part thereof, to be
-    licensed as a whole at no charge to all third parties under the terms of
-    this License.
-
-    c) If the modified program normally reads commands interactively when run,
-    you must cause it, when started running for such interactive use in the
-    most ordinary way, to print or display an announcement including an
-    appropriate copyright notice and a notice that there is no warranty (or
-    else, saying that you provide a warranty) and that users may redistribute
-    the program under these conditions, and telling the user how to view a copy
-    of this License.  (Exception: if the Program itself is interactive but does
-    not normally print such an announcement, your work based on the Program is
-    not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If identifiable
-sections of that work are not derived from the Program, and can be reasonably
-considered independent and separate works in themselves, then this License, and
-its terms, do not apply to those sections when you distribute them as separate
-works.  But when you distribute the same sections as part of a whole which is a
-work based on the Program, the distribution of the whole must be on the terms
-of this License, whose permissions for other licensees extend to the entire
-whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise the
-right to control the distribution of derivative or collective works based on
-the Program.
-
-In addition, mere aggregation of another work not based on the Program with the
-Program (or with a work based on the Program) on a volume of a storage or
-distribution medium does not bring the other work under the scope of this
-License.
-
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1 and
-2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable source
-    code, which must be distributed under the terms of Sections 1 and 2 above
-    on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three years, to
-    give any third party, for a charge no more than your cost of physically
-    performing source distribution, a complete machine-readable copy of the
-    corresponding source code, to be distributed under the terms of Sections 1
-    and 2 above on a medium customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer to
-    distribute corresponding source code.  (This alternative is allowed only
-    for noncommercial distribution and only if you received the program in
-    object code or executable form with such an offer, in accord with
-    Subsection b above.)
-
-The source code for a work means the preferred form of the work for making
-modifications to it.  For an executable work, complete source code means all
-the source code for all modules it contains, plus any associated interface
-definition files, plus the scripts used to control compilation and installation
-of the executable.  However, as a special exception, the source code
-distributed need not include anything that is normally distributed (in either
-source or binary form) with the major components (compiler, kernel, and so on)
-of the operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the source
-code from the same place counts as distribution of the source code, even though
-third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License.  Any attempt otherwise to copy, modify,
-sublicense or distribute the Program is void, and will automatically terminate
-your rights under this License.  However, parties who have received copies, or
-rights, from you under this License will not have their licenses terminated so
-long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the Program
-or its derivative works.  These actions are prohibited by law if you do not
-accept this License.  Therefore, by modifying or distributing the Program (or
-any work based on the Program), you indicate your acceptance of this License to
-do so, and all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program),
-the recipient automatically receives a license from the original licensor to
-copy, distribute or modify the Program subject to these terms and conditions.
-You may not impose any further restrictions on the recipients' exercise of the
-rights granted herein.  You are not responsible for enforcing compliance by
-third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues), conditions
-are imposed on you (whether by court order, agreement or otherwise) that
-contradict the conditions of this License, they do not excuse you from the
-conditions of this License.  If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Program at all.
-For example, if a patent license would not permit royalty-free redistribution
-of the Program by all those who receive copies directly or indirectly through
-you, then the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and
-the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system, which is implemented by public license practices.  Many
-people have made generous contributions to the wide range of software
-distributed through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing to
-distribute software through any other system and a licensee cannot impose that
-choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original
-copyright holder who places the Program under this License may add an explicit
-geographical distribution limitation excluding those countries, so that
-distribution is permitted only in or among countries not thus excluded.  In
-such case, this License incorporates the limitation as if written in the body
-of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the
-General Public License from time to time.  Such new versions will be similar in
-spirit to the present version, but may differ in detail to address new problems
-or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any later
-version", you have the option of following the terms and conditions either of
-that version or of any later version published by the Free Software Foundation.
-If the Program does not specify a version number of this License, you may
-choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, write to the author to ask for
-permission.  For software which is copyrighted by the Free Software Foundation,
-write to the Free Software Foundation; we sometimes make exceptions for this.
-Our decision will be guided by the two goals of preserving the free status of
-all derivatives of our free software and of promoting the sharing and reuse of
-software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
-THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
-PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE,
-YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
-ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
-PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
-INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
-BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
-OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest possible
-use to the public, the best way to achieve this is to make it free software
-which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program.  It is safest to attach
-them to the start of each source file to most effectively convey the exclusion
-of warranty; and each file should have at least the "copyright" line and a
-pointer to where the full notice is found.
-
-    One line to give the program's name and a brief idea of what it does.
-
-    Copyright (C) <year> <name of author>
-
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the Free
-    Software Foundation; either version 2 of the License, or (at your option)
-    any later version.
-
-    This program is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-    more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this when it
-starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
-    with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free
-    software, and you are welcome to redistribute it under certain conditions;
-    type 'show c' for details.
-
-The hypothetical commands 'show w' and 'show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may be
-called something other than 'show w' and 'show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
-is a sample; alter the names:
-
-    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-    'Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-    signature of Ty Coon, 1 April 1989
-
-    Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General Public
-License instead of this License.
-
-
-"CLASSPATH" EXCEPTION TO THE GPL
-
-Certain source files distributed by Oracle America and/or its affiliates are
-subject to the following clarification and special exception to the GPL, but
-only where Oracle has expressly included in the particular source file's header
-the words "Oracle designates this particular file as subject to the "Classpath"
-exception as provided by Oracle in the LICENSE file that accompanied this code."
-
-    Linking this library statically or dynamically with other modules is making
-    a combined work based on this library.  Thus, the terms and conditions of
-    the GNU General Public License cover the whole combination.
-
-    As a special exception, the copyright holders of this library give you
-    permission to link this library with independent modules to produce an
-    executable, regardless of the license terms of these independent modules,
-    and to copy and distribute the resulting executable under terms of your
-    choice, provided that you also meet, for each linked independent module,
-    the terms and conditions of the license of that module.  An independent
-    module is a module which is not derived from or based on this library.  If
-    you modify this library, you may extend this exception to your version of
-    the library, but you are not obligated to do so.  If you do not wish to do
-    so, delete this exception statement from your version.