Cleaned up project files

Nixie_Bottom_Board/hv_power_supply.sch

@@ -2,14 +2,14 @@ EESchema Schematic File Version 4
 LIBS:nixie_bottom_board-cache
 EELAYER 26 0
 EELAYER END
-$Descr A4 11693 8268
+$Descr USLetter 11000 8500
 encoding utf-8
 Sheet 2 2
-Title ""
+Title "Bottom PCB"
 Date ""
-Rev ""
-Comp ""
-Comment1 ""
+Rev "A"
+Comp "Nixie Tube Clock"
+Comment1 "https://0x7d.com/2017/nixie-tube-clock"
 Comment2 ""
 Comment3 ""
 Comment4 ""
@@ -17,347 +17,347 @@ $EndDescr
 $Comp
 L Custom_Parts:Wurth_Transformer_10.16x13.36mm T1
 U 1 1 5A6B88EA
-P 7100 3000
-F 0 "T1" H 7100 3325 60  0000 C CNN
-F 1 "Wurth_Transformer_10.16x13.36mm" H 7100 3425 60  0000 C CNN
-F 2 "Custom Parts:Wurth_WE-FB_10.18x13.36mm_Reverse" H 7100 3425 60  0001 C CNN
-F 3 "" H 7100 3425 60  0001 C CNN
-	1    7100 3000
+P 6450 3150
+F 0 "T1" H 6450 3475 60  0000 C CNN
+F 1 "Wurth_Transformer_10.16x13.36mm" H 6450 3575 60  0000 C CNN
+F 2 "Custom Parts:Wurth_WE-FB_10.18x13.36mm_Reverse" H 6450 3575 60  0001 C CNN
+F 3 "" H 6450 3575 60  0001 C CNN
+	1    6450 3150
 	-1   0    0    -1  
 $EndComp
 $Comp
 L Device:R R7
 U 1 1 5A6B8978
-P 4300 3850
-F 0 "R7" V 4380 3850 50  0000 C CNN
-F 1 "R_VC" V 4200 3850 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 4230 3850 50  0001 C CNN
-F 3 "" H 4300 3850 50  0001 C CNN
-	1    4300 3850
+P 3650 4000
+F 0 "R7" V 3730 4000 50  0000 C CNN
+F 1 "R_VC" V 3550 4000 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 3580 4000 50  0001 C CNN
+F 3 "" H 3650 4000 50  0001 C CNN
+	1    3650 4000
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:C C5
 U 1 1 5A6B89DB
-P 3750 4150
-F 0 "C5" H 3775 4250 50  0000 L CNN
-F 1 "C_VC" H 3775 4050 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 3788 4000 50  0001 C CNN
-F 3 "" H 3750 4150 50  0001 C CNN
-	1    3750 4150
+P 3100 4300
+F 0 "C5" H 3125 4400 50  0000 L CNN
+F 1 "C_VC" H 3125 4200 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 3138 4150 50  0001 C CNN
+F 3 "" H 3100 4300 50  0001 C CNN
+	1    3100 4300
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:Q_NMOS_DGS Q1
 U 1 1 5A6B8B05
-P 6600 3600
-F 0 "Q1" H 6800 3650 50  0000 L CNN
-F 1 "Q_SWITCH" H 6800 3550 50  0000 L CNN
-F 2 "Custom Parts:SOT-669_LFPAK" H 6800 3700 50  0001 C CNN
-F 3 "" H 6600 3600 50  0001 C CNN
-	1    6600 3600
+P 5950 3750
+F 0 "Q1" H 6150 3800 50  0000 L CNN
+F 1 "Q_SWITCH" H 6150 3700 50  0000 L CNN
+F 2 "Custom Parts:SOT-669_LFPAK" H 6150 3850 50  0001 C CNN
+F 3 "" H 5950 3750 50  0001 C CNN
+	1    5950 3750
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R11
 U 1 1 5A6B8B69
-P 7450 3850
-F 0 "R11" V 7530 3850 50  0000 C CNN
-F 1 "R_SENSE" V 7350 3850 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 7380 3850 50  0001 C CNN
-F 3 "" H 7450 3850 50  0001 C CNN
-	1    7450 3850
+P 6800 4000
+F 0 "R11" V 6880 4000 50  0000 C CNN
+F 1 "R_SENSE" V 6700 4000 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 6730 4000 50  0001 C CNN
+F 3 "" H 6800 4000 50  0001 C CNN
+	1    6800 4000
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:D D4
 U 1 1 5A6B91C6
-P 7750 3200
-F 0 "D4" H 7750 3300 50  0000 C CNN
-F 1 "D_RECT" H 7750 3100 50  0000 C CNN
-F 2 "Custom Parts:SOD-123W" H 7750 3200 50  0001 C CNN
-F 3 "" H 7750 3200 50  0001 C CNN
-	1    7750 3200
+P 7100 3350
+F 0 "D4" H 7100 3450 50  0000 C CNN
+F 1 "D_RECT" H 7100 3250 50  0000 C CNN
+F 2 "Custom Parts:SOD-123W" H 7100 3350 50  0001 C CNN
+F 3 "" H 7100 3350 50  0001 C CNN
+	1    7100 3350
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C C8
 U 1 1 5A6B92D0
-P 8050 3000
-F 0 "C8" H 8075 3100 50  0000 L CNN
-F 1 "C_OUT" H 8075 2900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_2220" H 8088 2850 50  0001 C CNN
-F 3 "" H 8050 3000 50  0001 C CNN
-	1    8050 3000
+P 7400 3150
+F 0 "C8" H 7425 3250 50  0000 L CNN
+F 1 "C_OUT" H 7425 3050 50  0000 L CNN
+F 2 "Capacitors_SMD:C_2220" H 7438 3000 50  0001 C CNN
+F 3 "" H 7400 3150 50  0001 C CNN
+	1    7400 3150
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C9
 U 1 1 5A6B93C6
-P 8350 3000
-F 0 "C9" H 8375 3100 50  0000 L CNN
-F 1 "C_OUT" H 8375 2900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1812" H 8388 2850 50  0001 C CNN
-F 3 "" H 8350 3000 50  0001 C CNN
-	1    8350 3000
+P 7700 3150
+F 0 "C9" H 7725 3250 50  0000 L CNN
+F 1 "C_OUT" H 7725 3050 50  0000 L CNN
+F 2 "Capacitors_SMD:C_1812" H 7738 3000 50  0001 C CNN
+F 3 "" H 7700 3150 50  0001 C CNN
+	1    7700 3150
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R10
 U 1 1 5A6B9F37
-P 7150 4150
-F 0 "R10" V 7230 4150 50  0000 C CNN
-F 1 "R_FB" V 7050 4150 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 7080 4150 50  0001 C CNN
-F 3 "" H 7150 4150 50  0001 C CNN
-	1    7150 4150
+P 6500 4300
+F 0 "R10" V 6580 4300 50  0000 C CNN
+F 1 "R_FB" V 6400 4300 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 6430 4300 50  0001 C CNN
+F 3 "" H 6500 4300 50  0001 C CNN
+	1    6500 4300
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R R9
 U 1 1 5A6B9FBA
-P 6800 4550
-F 0 "R9" V 6880 4550 50  0000 C CNN
-F 1 "R_BIAS" V 6700 4550 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 6730 4550 50  0001 C CNN
-F 3 "" H 6800 4550 50  0001 C CNN
-	1    6800 4550
+P 6150 4700
+F 0 "R9" V 6230 4700 50  0000 C CNN
+F 1 "R_BIAS" V 6050 4700 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 6080 4700 50  0001 C CNN
+F 3 "" H 6150 4700 50  0001 C CNN
+	1    6150 4700
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C C7
 U 1 1 5A6BA4CA
-P 6350 4550
-F 0 "C7" H 6375 4650 50  0000 L CNN
-F 1 "C_BP" H 6375 4450 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 6388 4400 50  0001 C CNN
-F 3 "" H 6350 4550 50  0001 C CNN
-	1    6350 4550
+P 5700 4700
+F 0 "C7" H 5725 4800 50  0000 L CNN
+F 1 "C_BP" H 5725 4600 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 5738 4550 50  0001 C CNN
+F 3 "" H 5700 4700 50  0001 C CNN
+	1    5700 4700
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R6
 U 1 1 5A6BAAF4
-P 4100 4350
-F 0 "R6" V 4180 4350 50  0000 C CNN
-F 1 "R_FREQ" V 4000 4350 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 4030 4350 50  0001 C CNN
-F 3 "" H 4100 4350 50  0001 C CNN
-	1    4100 4350
+P 3450 4500
+F 0 "R6" V 3530 4500 50  0000 C CNN
+F 1 "R_FREQ" V 3350 4500 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 3380 4500 50  0001 C CNN
+F 3 "" H 3450 4500 50  0001 C CNN
+	1    3450 4500
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C C4
 U 1 1 5A6C0FBE
-P 4650 3000
-F 0 "C4" H 4675 3100 50  0000 L CNN
-F 1 "C_IN" H 4675 2900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805" H 4688 2850 50  0001 C CNN
-F 3 "" H 4650 3000 50  0001 C CNN
-	1    4650 3000
+P 4000 3150
+F 0 "C4" H 4025 3250 50  0000 L CNN
+F 1 "C_IN" H 4025 3050 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 4038 3000 50  0001 C CNN
+F 3 "" H 4000 3150 50  0001 C CNN
+	1    4000 3150
 	-1   0    0    1   
 $EndComp
-NoConn ~ 7500 3000
+NoConn ~ 6850 3150
 $Comp
 L Device:C C6
 U 1 1 5A6C6769
-P 4350 4550
-F 0 "C6" H 4375 4650 50  0000 L CNN
-F 1 "C_SS" H 4375 4450 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 4388 4400 50  0001 C CNN
-F 3 "" H 4350 4550 50  0001 C CNN
-	1    4350 4550
+P 3700 4700
+F 0 "C6" H 3725 4800 50  0000 L CNN
+F 1 "C_SS" H 3725 4600 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 3738 4550 50  0001 C CNN
+F 3 "" H 3700 4700 50  0001 C CNN
+	1    3700 4700
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R8
 U 1 1 5A8E442D
-P 6250 3600
-F 0 "R8" V 6330 3600 50  0000 C CNN
-F 1 "R_GATE" V 6150 3600 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 6180 3600 50  0001 C CNN
-F 3 "" H 6250 3600 50  0001 C CNN
-	1    6250 3600
+P 5600 3750
+F 0 "R8" V 5680 3750 50  0000 C CNN
+F 1 "R_GATE" V 5500 3750 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 5530 3750 50  0001 C CNN
+F 3 "" H 5600 3750 50  0001 C CNN
+	1    5600 3750
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	7600 3850 7700 3850
-Connection ~ 6800 4150
+	6950 4000 7050 4000
+Connection ~ 6150 4300
 Wire Wire Line
-	6800 4150 6800 4400
+	6150 4300 6150 4550
 Wire Wire Line
-	6100 4150 6800 4150
+	5450 4300 6150 4300
 Wire Wire Line
-	6800 4800 6800 4700
-Connection ~ 4500 3400
+	6150 4950 6150 4850
+Connection ~ 3850 3550
 Wire Wire Line
-	4500 3400 4600 3400
+	3850 3550 3950 3550
 Wire Wire Line
-	4500 3550 4600 3550
+	3850 3700 3950 3700
 Wire Wire Line
-	4600 3700 3700 3700
-Connection ~ 3750 4800
-Connection ~ 4100 4800
+	3950 3850 3050 3850
+Connection ~ 3100 4950
+Connection ~ 3450 4950
 Wire Wire Line
-	3750 4800 3750 4300
+	3100 4950 3100 4450
 Wire Wire Line
-	3750 3850 3750 4000
+	3100 4000 3100 4150
 Wire Wire Line
-	4150 3850 3750 3850
+	3500 4000 3100 4000
 Wire Wire Line
-	4600 3850 4450 3850
+	3950 4000 3800 4000
 Wire Wire Line
-	4100 4000 4600 4000
+	3450 4150 3950 4150
 Wire Wire Line
-	4100 4200 4100 4000
-Connection ~ 4350 4800
+	3450 4350 3450 4150
+Connection ~ 3700 4950
 Wire Wire Line
-	4100 4800 4100 4500
-Connection ~ 4600 4800
+	3450 4950 3450 4650
+Connection ~ 3950 4950
 Wire Wire Line
-	4350 4800 4350 4700
+	3700 4950 3700 4850
 Wire Wire Line
-	4350 4150 4600 4150
+	3700 4300 3950 4300
 Wire Wire Line
-	4350 4400 4350 4150
-Connection ~ 6350 4800
+	3700 4550 3700 4300
+Connection ~ 5700 4950
 Wire Wire Line
-	4600 4800 4600 4300
+	3950 4950 3950 4450
 Wire Wire Line
-	6350 4700 6350 4800
+	5700 4850 5700 4950
 Wire Wire Line
-	3700 4800 3750 4800
+	3050 4950 3100 4950
 Wire Wire Line
-	6350 4300 6350 4400
+	5700 4450 5700 4550
 Wire Wire Line
-	8050 4150 7300 4150
-Connection ~ 5300 2800
-Connection ~ 5450 2800
+	7400 4300 6650 4300
+Connection ~ 4650 2950
+Connection ~ 4800 2950
 Wire Wire Line
-	5300 2800 5300 3000
+	4650 2950 4650 3150
 Wire Wire Line
-	5450 2800 5450 3000
-Connection ~ 6700 3850
+	4800 2950 4800 3150
+Connection ~ 6050 4000
 Wire Wire Line
-	6100 3850 6700 3850
+	5450 4000 6050 4000
 Wire Wire Line
-	6700 3800 6700 3850
-Connection ~ 8350 3200
-Connection ~ 8050 3200
+	6050 3950 6050 4000
+Connection ~ 7700 3350
+Connection ~ 7400 3350
 Wire Wire Line
-	8350 3200 8350 3150
+	7700 3350 7700 3300
 Wire Wire Line
-	8050 3150 8050 3200
+	7400 3300 7400 3350
 Wire Wire Line
-	7900 3200 8050 3200
+	7250 3350 7400 3350
 Wire Wire Line
-	7500 3200 7600 3200
-Connection ~ 8050 2800
+	6850 3350 6950 3350
+Connection ~ 7400 2950
 Wire Wire Line
-	8050 2800 8050 2850
-Connection ~ 8350 2800
+	7400 2950 7400 3000
+Connection ~ 7700 2950
 Wire Wire Line
-	8350 2800 8350 2850
+	7700 2950 7700 3000
 Wire Wire Line
-	6700 3200 6700 3400
+	6050 3350 6050 3550
 Wire Wire Line
-	6350 4300 6100 4300
+	5700 4450 5450 4450
 $Comp
 L Custom_Parts:LTC3759 U6
 U 1 1 5A6BF1D9
-P 5350 3850
-F 0 "U6" H 5350 3850 60  0000 C CNN
-F 1 "LTC3759" H 5350 3750 60  0000 C CNN
-F 2 "Housings_SSOP:MSOP-12-1EP_3x4mm_Pitch0.65mm" H 5350 3950 60  0001 C CNN
-F 3 "" H 5350 3950 60  0001 C CNN
-	1    5350 3850
+P 4700 4000
+F 0 "U6" H 4700 4000 60  0000 C CNN
+F 1 "LTC3759" H 4700 3900 60  0000 C CNN
+F 2 "Housings_SSOP:MSOP-12-1EP_3x4mm_Pitch0.65mm" H 4700 4100 60  0001 C CNN
+F 3 "" H 4700 4100 60  0001 C CNN
+	1    4700 4000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4650 2850 4650 2800
-Connection ~ 4650 2800
+	4000 3000 4000 2950
+Connection ~ 4000 2950
 Wire Wire Line
-	4650 3200 4650 3150
-Text HLabel 3700 2800 0    60   Input ~ 0
+	4000 3350 4000 3300
+Text HLabel 3050 2950 0    60   Input ~ 0
 VIN
-Text HLabel 3700 3700 0    60   Input ~ 0
+Text HLabel 3050 3850 0    60   Input ~ 0
 EN
-Text HLabel 3700 4800 0    60   Input ~ 0
+Text HLabel 3050 4950 0    60   Input ~ 0
 GND
-Text HLabel 8850 2800 2    60   Input ~ 0
+Text HLabel 8200 2950 2    60   Input ~ 0
 GND
-Text HLabel 8850 3200 2    60   Input ~ 0
+Text HLabel 8200 3350 2    60   Input ~ 0
 VOUT
 Wire Wire Line
-	6800 4150 7000 4150
+	6150 4300 6350 4300
 Wire Wire Line
-	4500 3400 4500 3550
+	3850 3550 3850 3700
 Wire Wire Line
-	4500 3200 4500 3400
+	3850 3350 3850 3550
 Wire Wire Line
-	3750 4800 4100 4800
+	3100 4950 3450 4950
 Wire Wire Line
-	4100 4800 4350 4800
+	3450 4950 3700 4950
 Wire Wire Line
-	4350 4800 4600 4800
+	3700 4950 3950 4950
 Wire Wire Line
-	4600 4800 6350 4800
+	3950 4950 5700 4950
 Wire Wire Line
-	6350 4800 6800 4800
+	5700 4950 6150 4950
 Wire Wire Line
-	5300 2800 5450 2800
+	4650 2950 4800 2950
 Wire Wire Line
-	5450 2800 6700 2800
+	4800 2950 6050 2950
 Wire Wire Line
-	6700 3850 7300 3850
+	6050 4000 6650 4000
 Wire Wire Line
-	8350 3200 8650 3200
+	7700 3350 8000 3350
 Wire Wire Line
-	8050 3200 8050 4150
+	7400 3350 7400 4300
 Wire Wire Line
-	8050 3200 8350 3200
+	7400 3350 7700 3350
 Wire Wire Line
-	8050 2800 8350 2800
+	7400 2950 7700 2950
 Wire Wire Line
-	8350 2800 8650 2800
+	7700 2950 8000 2950
 Wire Wire Line
-	4650 2800 5300 2800
+	4000 2950 4650 2950
 $Comp
 L Device:C C10
 U 1 1 5B6DF384
-P 8650 3000
-F 0 "C10" H 8675 3100 50  0000 L CNN
-F 1 "C_OUT" H 8675 2900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_2220" H 8688 2850 50  0001 C CNN
-F 3 "" H 8650 3000 50  0001 C CNN
-	1    8650 3000
+P 8000 3150
+F 0 "C10" H 8025 3250 50  0000 L CNN
+F 1 "C_OUT" H 8025 3050 50  0000 L CNN
+F 2 "Capacitors_SMD:C_2220" H 8038 3000 50  0001 C CNN
+F 3 "" H 8000 3150 50  0001 C CNN
+	1    8000 3150
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8650 2850 8650 2800
-Connection ~ 8650 2800
+	8000 3000 8000 2950
+Connection ~ 8000 2950
 Wire Wire Line
-	8650 2800 8850 2800
+	8000 2950 8200 2950
 Wire Wire Line
-	8650 3150 8650 3200
-Connection ~ 8650 3200
+	8000 3300 8000 3350
+Connection ~ 8000 3350
 Wire Wire Line
-	8650 3200 8850 3200
-Text Label 4400 3200 2    60   ~ 0
+	8000 3350 8200 3350
+Text Label 3750 3350 2    60   ~ 0
 GND
-Text Label 6300 4800 2    60   ~ 0
+Text Label 5650 4950 2    60   ~ 0
 GND
 Wire Wire Line
-	7500 2800 8050 2800
-Text Label 8100 2800 0    60   ~ 0
+	6850 2950 7400 2950
+Text Label 7450 2950 0    60   ~ 0
 GND
 Wire Wire Line
-	3700 2800 4650 2800
+	3050 2950 4000 2950
 Wire Wire Line
-	4500 3200 4650 3200
-Connection ~ 4500 3200
+	3850 3350 4000 3350
+Connection ~ 3850 3350
 Wire Wire Line
-	4400 3200 4500 3200
-Text Label 7700 3850 0    60   ~ 0
+	3750 3350 3850 3350
+Text Label 7050 4000 0    60   ~ 0
 GND
 $EndSCHEMATC

Nixie_Bottom_Board/nixie_bottom_board.bak

@@ -208,7 +208,7 @@ L Connector_Generic:Conn_02x03_Odd_Even J2
 U 1 1 5B693D84
 P 3850 4300
 F 0 "J2" H 3900 4617 50  0000 C CNN
-F 1 "Tag Connect" H 3900 4526 50  0000 C CNN
+F 1 "SWD" H 3900 4526 50  0000 C CNN
 F 2 "Tag Connect:TC2030-MCP-NL" H 3850 4300 50  0001 C CNN
 F 3 "~" H 3850 4300 50  0001 C CNN
 	1    3850 4300

Nixie_Bottom_Board/nixie_bottom_board.net

@@ -1,27 +1,27 @@
 (export (version D)
   (design
     (source C:\Users\Kevin\Documents\Projects\NixieTubeClock\Nixie_Bottom_Board\nixie_bottom_board.sch)
-    (date "9/27/2018 10:33:13 AM")
+    (date "9/28/2018 8:26:54 PM")
     (tool "Eeschema (5.0.0)")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
-        (title)
-        (company)
-        (rev)
+        (title "Bottom PCB")
+        (company "Nixie Tube Clock")
+        (rev A)
         (date)
         (source nixie_bottom_board.sch)
-        (comment (number 1) (value ""))
+        (comment (number 1) (value https://0x7d.com/2017/nixie-tube-clock))
         (comment (number 2) (value ""))
         (comment (number 3) (value ""))
         (comment (number 4) (value ""))))
     (sheet (number 2) (name "/HV Power Supply/") (tstamps /5B07197A/)
       (title_block
-        (title)
-        (company)
-        (rev)
+        (title "Bottom PCB")
+        (company "Nixie Tube Clock")
+        (rev A)
         (date)
         (source hv_power_supply.sch)
-        (comment (number 1) (value ""))
+        (comment (number 1) (value https://0x7d.com/2017/nixie-tube-clock))
         (comment (number 2) (value ""))
         (comment (number 3) (value ""))
         (comment (number 4) (value "")))))
@@ -76,7 +76,7 @@
       (sheetpath (names /) (tstamps /))
       (tstamp 5B64A44F))
     (comp (ref J2)
-      (value "Tag Connect")
+      (value SWD)
       (footprint "Tag Connect:TC2030-MCP-NL")
       (datasheet ~)
       (libsource (lib Connector_Generic) (part Conn_02x03_Odd_Even) (description "Generic connector, double row, 02x03, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)"))
@@ -291,13 +291,6 @@
       (libsource (lib Custom_Parts) (part TUSB322) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5BAF8A3A))
-    (comp (ref JP1)
-      (value ILM)
-      (footprint "Custom Parts:Jumper_0603")
-      (datasheet ~)
-      (libsource (lib Device) (part Jumper_NO_Small) (description "Jumper, normally open"))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5BB1D0C7))
     (comp (ref C15)
       (value 0.1uF)
       (footprint Capacitors_SMD:C_0603)
@@ -415,6 +408,20 @@
       (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5BADE6EA))
+    (comp (ref C17)
+      (value SLEW)
+      (footprint Capacitors_SMD:C_0603)
+      (datasheet ~)
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5BAFD7B9))
+    (comp (ref J17)
+      (value SWO)
+      (footprint Measurement_Points:Measurement_Point_Round-SMD-Pad_Small)
+      (datasheet ~)
+      (libsource (lib Connector) (part Conn_01x01_Female) (description "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5BAE0437))
     (comp (ref T1)
       (value Wurth_Transformer_10.16x13.36mm)
       (footprint "Custom Parts:Wurth_WE-FB_10.18x13.36mm_Reverse")
@@ -766,15 +773,6 @@
       (pins
         (pin (num 1) (name K) (type passive))
         (pin (num 2) (name A) (type passive))))
-    (libpart (lib Device) (part Jumper_NO_Small)
-      (description "Jumper, normally open")
-      (docs ~)
-      (fields
-        (field (name Reference) JP)
-        (field (name Value) Jumper_NO_Small))
-      (pins
-        (pin (num 1) (name 1) (type passive))
-        (pin (num 2) (name 2) (type passive))))
     (libpart (lib Device) (part LED)
       (description "LED generic")
       (docs ~)
@@ -857,330 +855,331 @@
   (nets
     (net (code 1) (name "Net-(R16-Pad1)")
       (node (ref U3) (pin 11))
-      (node (ref R17) (pin 2))
-      (node (ref R16) (pin 1)))
+      (node (ref R16) (pin 1))
+      (node (ref R17) (pin 2)))
     (net (code 2) (name /GND)
-      (node (ref C6) (pin 2))
-      (node (ref C7) (pin 2))
-      (node (ref C9) (pin 1))
-      (node (ref R9) (pin 1))
-      (node (ref R2) (pin 1))
-      (node (ref C8) (pin 1))
-      (node (ref R6) (pin 1))
-      (node (ref SW1) (pin 1))
-      (node (ref C4) (pin 1))
-      (node (ref C5) (pin 2))
-      (node (ref T1) (pin 1))
-      (node (ref J2) (pin 5))
-      (node (ref R11) (pin 1))
-      (node (ref J3) (pin 2))
-      (node (ref J1) (pin B8))
-      (node (ref J4) (pin 3))
-      (node (ref C15) (pin 1))
-      (node (ref R13) (pin 2))
-      (node (ref J4) (pin 2))
-      (node (ref D2) (pin 1))
-      (node (ref J3) (pin 4))
-      (node (ref U2) (pin 16))
-      (node (ref J3) (pin 6))
-      (node (ref U2) (pin 32))
       (node (ref U1) (pin 10))
       (node (ref U1) (pin 11))
-      (node (ref U1) (pin 5))
-      (node (ref R14) (pin 2))
-      (node (ref D3) (pin 1))
-      (node (ref BT1) (pin 2))
-      (node (ref C10) (pin 1))
-      (node (ref U6) (pin 6))
-      (node (ref U6) (pin 5))
-      (node (ref U6) (pin 13))
-      (node (ref U7) (pin 9))
-      (node (ref U7) (pin 8))
-      (node (ref J1) (pin B2))
-      (node (ref J1) (pin B3))
-      (node (ref J1) (pin B12))
-      (node (ref J1) (pin A12))
       (node (ref U4) (pin 13))
+      (node (ref BT1) (pin 2))
+      (node (ref R13) (pin 2))
+      (node (ref J1) (pin A11))
       (node (ref J1) (pin A1))
       (node (ref J1) (pin A10))
-      (node (ref J1) (pin A11))
+      (node (ref C17) (pin 2))
+      (node (ref J1) (pin A12))
       (node (ref J1) (pin A2))
       (node (ref J1) (pin A3))
       (node (ref J1) (pin A8))
+      (node (ref D3) (pin 1))
       (node (ref J1) (pin B1))
       (node (ref J1) (pin B10))
       (node (ref J1) (pin B11))
-      (node (ref C3) (pin 2))
-      (node (ref MH3) (pin 1))
-      (node (ref MH2) (pin 1))
-      (node (ref MH1) (pin 1))
-      (node (ref J1) (pin S1))
-      (node (ref U3) (pin 2))
-      (node (ref C14) (pin 1))
-      (node (ref C2) (pin 2))
-      (node (ref C1) (pin 1))
+      (node (ref C10) (pin 1))
+      (node (ref U6) (pin 6))
+      (node (ref U6) (pin 5))
+      (node (ref U6) (pin 13))
+      (node (ref R14) (pin 2))
+      (node (ref U7) (pin 9))
+      (node (ref U7) (pin 8))
       (node (ref C16) (pin 2))
+      (node (ref C14) (pin 1))
+      (node (ref J1) (pin B3))
+      (node (ref J1) (pin S1))
+      (node (ref U2) (pin 32))
+      (node (ref U2) (pin 16))
+      (node (ref D2) (pin 1))
+      (node (ref R2) (pin 1))
+      (node (ref SW1) (pin 1))
+      (node (ref J4) (pin 3))
+      (node (ref J4) (pin 2))
+      (node (ref J2) (pin 3))
+      (node (ref J3) (pin 6))
+      (node (ref J3) (pin 2))
+      (node (ref J3) (pin 4))
+      (node (ref J1) (pin B2))
+      (node (ref R12) (pin 2))
+      (node (ref J1) (pin B8))
+      (node (ref C15) (pin 1))
+      (node (ref J1) (pin B12))
+      (node (ref U1) (pin 5))
+      (node (ref R9) (pin 1))
+      (node (ref C6) (pin 2))
+      (node (ref C4) (pin 1))
+      (node (ref R6) (pin 1))
       (node (ref U3) (pin 9))
-      (node (ref C13) (pin 2))
+      (node (ref C1) (pin 1))
+      (node (ref C8) (pin 1))
+      (node (ref U3) (pin 2))
+      (node (ref C9) (pin 1))
+      (node (ref MH1) (pin 1))
+      (node (ref MH2) (pin 1))
+      (node (ref C7) (pin 2))
       (node (ref U3) (pin 10))
-      (node (ref U5) (pin 2))
-      (node (ref C11) (pin 1))
+      (node (ref MH3) (pin 1))
       (node (ref MH4) (pin 1))
-      (node (ref R17) (pin 1))
       (node (ref MH5) (pin 1))
+      (node (ref MH6) (pin 1))
+      (node (ref R11) (pin 1))
+      (node (ref T1) (pin 1))
+      (node (ref C5) (pin 2))
       (node (ref C12) (pin 2))
-      (node (ref R12) (pin 2))
-      (node (ref MH6) (pin 1)))
-    (net (code 3) (name /AMP_EN)
-      (node (ref U5) (pin 5))
+      (node (ref C11) (pin 1))
+      (node (ref U5) (pin 2))
+      (node (ref R17) (pin 1))
+      (node (ref C3) (pin 2))
+      (node (ref C2) (pin 2)))
+    (net (code 3) (name "Net-(C13-Pad2)")
+      (node (ref C13) (pin 2)))
+    (net (code 4) (name /AMP_EN)
+      (node (ref U2) (pin 15))
       (node (ref J9) (pin 1))
-      (node (ref U2) (pin 15)))
-    (net (code 4) (name "Net-(U2-Pad3)")
+      (node (ref U5) (pin 5)))
+    (net (code 5) (name "Net-(U2-Pad3)")
       (node (ref U2) (pin 3)))
-    (net (code 5) (name "Net-(R2-Pad2)")
-      (node (ref U2) (pin 31))
+    (net (code 6) (name "Net-(R2-Pad2)")
       (node (ref R2) (pin 2))
-      (node (ref SW2) (pin 1)))
-    (net (code 6) (name /VDD)
-      (node (ref R15) (pin 1))
-      (node (ref C16) (pin 1))
-      (node (ref U3) (pin 14))
-      (node (ref U4) (pin 2))
-      (node (ref C13) (pin 1))
-      (node (ref U2) (pin 1))
-      (node (ref SW2) (pin 2))
-      (node (ref J2) (pin 1))
-      (node (ref C11) (pin 2))
-      (node (ref U3) (pin 13))
-      (node (ref U3) (pin 12))
-      (node (ref U2) (pin 17))
-      (node (ref C14) (pin 2))
-      (node (ref R18) (pin 1))
-      (node (ref R19) (pin 2))
-      (node (ref C12) (pin 1))
-      (node (ref U2) (pin 5))
-      (node (ref J14) (pin 1))
-      (node (ref R4) (pin 2))
-      (node (ref U1) (pin 12))
-      (node (ref C15) (pin 2))
-      (node (ref R3) (pin 1))
-      (node (ref U5) (pin 6))
-      (node (ref R5) (pin 2))
-      (node (ref R16) (pin 2)))
-    (net (code 7) (name "Net-(U4-Pad5)")
+      (node (ref SW2) (pin 1))
+      (node (ref U2) (pin 31)))
+    (net (code 7) (name "Net-(U4-Pad7)")
+      (node (ref U4) (pin 7)))
+    (net (code 8) (name "Net-(U4-Pad6)")
+      (node (ref U4) (pin 6)))
+    (net (code 9) (name "Net-(U4-Pad5)")
       (node (ref U4) (pin 5)))
-    (net (code 8) (name "Net-(L1-Pad2)")
-      (node (ref L1) (pin 2))
-      (node (ref U3) (pin 1)))
-    (net (code 9) (name /VBUS)
-      (node (ref C2) (pin 1))
-      (node (ref U3) (pin 7))
+    (net (code 10) (name "Net-(U4-Pad8)")
+      (node (ref U4) (pin 8)))
+    (net (code 11) (name "Net-(L1-Pad2)")
+      (node (ref U3) (pin 1))
+      (node (ref L1) (pin 2)))
+    (net (code 12) (name /VBUS)
       (node (ref R1) (pin 1))
-      (node (ref U3) (pin 6))
-      (node (ref U3) (pin 5))
-      (node (ref U3) (pin 4))
-      (node (ref C3) (pin 1))
-      (node (ref U3) (pin 8))
-      (node (ref J16) (pin 1))
       (node (ref U7) (pin 4))
-      (node (ref U7) (pin 3))
       (node (ref D1) (pin 1))
+      (node (ref J16) (pin 1))
+      (node (ref C3) (pin 1))
+      (node (ref C2) (pin 1))
+      (node (ref U7) (pin 3))
       (node (ref J1) (pin A4))
+      (node (ref U3) (pin 6))
+      (node (ref U3) (pin 7))
+      (node (ref U3) (pin 8))
+      (node (ref U3) (pin 5))
       (node (ref J1) (pin A9))
-      (node (ref J1) (pin B9))
-      (node (ref J1) (pin B4)))
-    (net (code 10) (name "Net-(U7-Pad1)")
-      (node (ref U7) (pin 1)))
-    (net (code 11) (name "Net-(U4-Pad12)")
+      (node (ref J1) (pin B4))
+      (node (ref U3) (pin 4))
+      (node (ref J1) (pin B9)))
+    (net (code 13) (name /FAULT)
+      (node (ref U7) (pin 6))
+      (node (ref R15) (pin 2))
+      (node (ref U2) (pin 9)))
+    (net (code 14) (name "Net-(U4-Pad12)")
       (node (ref U4) (pin 12)))
-    (net (code 12) (name "Net-(U4-Pad11)")
+    (net (code 15) (name "Net-(U4-Pad11)")
       (node (ref U4) (pin 11)))
-    (net (code 13) (name "Net-(U4-Pad10)")
+    (net (code 16) (name "Net-(U4-Pad10)")
       (node (ref U4) (pin 10)))
-    (net (code 14) (name "Net-(U4-Pad9)")
+    (net (code 17) (name "Net-(U4-Pad9)")
       (node (ref U4) (pin 9)))
-    (net (code 15) (name "Net-(U4-Pad8)")
-      (node (ref U4) (pin 8)))
-    (net (code 16) (name "Net-(U4-Pad7)")
-      (node (ref U4) (pin 7)))
-    (net (code 17) (name "Net-(U4-Pad6)")
-      (node (ref U4) (pin 6)))
-    (net (code 18) (name "Net-(JP1-Pad1)")
-      (node (ref R14) (pin 1))
-      (node (ref JP1) (pin 1))
-      (node (ref U7) (pin 7)))
-    (net (code 19) (name /HV_OUT)
+    (net (code 18) (name /SDA)
+      (node (ref R4) (pin 1))
+      (node (ref U4) (pin 15))
+      (node (ref J12) (pin 1))
+      (node (ref U2) (pin 20))
+      (node (ref J4) (pin 6))
+      (node (ref U1) (pin 7)))
+    (net (code 19) (name /SCL)
+      (node (ref U1) (pin 8))
+      (node (ref U4) (pin 16))
+      (node (ref J11) (pin 1))
+      (node (ref R5) (pin 1))
+      (node (ref J4) (pin 4))
+      (node (ref U2) (pin 19)))
+    (net (code 20) (name /HV_OUT)
+      (node (ref J8) (pin 1))
+      (node (ref J3) (pin 5))
       (node (ref C10) (pin 2))
+      (node (ref D4) (pin 1))
       (node (ref R10) (pin 1))
+      (node (ref J3) (pin 1))
       (node (ref C9) (pin 2))
       (node (ref C8) (pin 2))
-      (node (ref J8) (pin 1))
-      (node (ref J3) (pin 5))
-      (node (ref J3) (pin 3))
-      (node (ref J3) (pin 1))
-      (node (ref D4) (pin 1)))
-    (net (code 20) (name /DAC)
+      (node (ref J3) (pin 3)))
+    (net (code 21) (name /DAC)
+      (node (ref U2) (pin 11))
       (node (ref U5) (pin 3))
-      (node (ref J13) (pin 1))
-      (node (ref U2) (pin 11)))
-    (net (code 21) (name /HV_EN)
-      (node (ref U7) (pin 2))
-      (node (ref U6) (pin 12))
+      (node (ref J13) (pin 1)))
+    (net (code 22) (name /HV_EN)
       (node (ref U2) (pin 8))
-      (node (ref R12) (pin 1))
-      (node (ref J7) (pin 1)))
-    (net (code 22) (name /VNIXIE)
-      (node (ref U5) (pin 1))
-      (node (ref J15) (pin 1))
-      (node (ref J4) (pin 1))
-      (node (ref U5) (pin 4)))
+      (node (ref U6) (pin 12))
+      (node (ref J7) (pin 1))
+      (node (ref U7) (pin 2))
+      (node (ref R12) (pin 1)))
     (net (code 23) (name /LED)
-      (node (ref U2) (pin 6))
-      (node (ref D5) (pin 2)))
-    (net (code 24) (name "Net-(D5-Pad1)")
-      (node (ref D5) (pin 1))
-      (node (ref R13) (pin 1)))
-    (net (code 25) (name /32kHz)
+      (node (ref D5) (pin 2))
+      (node (ref U2) (pin 6)))
+    (net (code 24) (name /SWO)
+      (node (ref J17) (pin 1))
+      (node (ref J2) (pin 6))
+      (node (ref U2) (pin 26)))
+    (net (code 25) (name "Net-(C17-Pad1)")
+      (node (ref C17) (pin 1))
+      (node (ref U7) (pin 1)))
+    (net (code 26) (name "Net-(D5-Pad1)")
+      (node (ref R13) (pin 1))
+      (node (ref D5) (pin 1)))
+    (net (code 27) (name /VNIXIE)
+      (node (ref J4) (pin 1))
+      (node (ref U5) (pin 4))
+      (node (ref U5) (pin 1))
+      (node (ref J15) (pin 1)))
+    (net (code 28) (name /32kHz)
+      (node (ref U4) (pin 1))
       (node (ref R18) (pin 2))
-      (node (ref U2) (pin 2))
       (node (ref J10) (pin 1))
-      (node (ref U4) (pin 1)))
-    (net (code 26) (name /SDA)
-      (node (ref U1) (pin 7))
-      (node (ref U4) (pin 15))
-      (node (ref J12) (pin 1))
-      (node (ref U2) (pin 20))
-      (node (ref R4) (pin 1))
-      (node (ref J4) (pin 6)))
-    (net (code 27) (name /SCL)
-      (node (ref J4) (pin 4))
-      (node (ref R5) (pin 1))
-      (node (ref U1) (pin 8))
-      (node (ref U4) (pin 16))
-      (node (ref J11) (pin 1))
-      (node (ref U2) (pin 19)))
-    (net (code 28) (name "Net-(BT1-Pad1)")
-      (node (ref BT1) (pin 1))
-      (node (ref U4) (pin 14)))
-    (net (code 29) (name "Net-(U1-Pad4)")
-      (node (ref U1) (pin 4)))
+      (node (ref U2) (pin 2)))
+    (net (code 29) (name "Net-(BT1-Pad1)")
+      (node (ref U4) (pin 14))
+      (node (ref BT1) (pin 1)))
     (net (code 30) (name "Net-(U1-Pad9)")
       (node (ref U1) (pin 9)))
-    (net (code 31) (name "Net-(R1-Pad2)")
+    (net (code 31) (name "Net-(U1-Pad4)")
+      (node (ref U1) (pin 4)))
+    (net (code 32) (name "Net-(R1-Pad2)")
       (node (ref R1) (pin 2))
       (node (ref U1) (pin 3)))
-    (net (code 32) (name /ILM)
-      (node (ref JP1) (pin 2))
+    (net (code 33) (name /ILM)
+      (node (ref R14) (pin 1))
       (node (ref J6) (pin 1))
+      (node (ref U7) (pin 7))
       (node (ref U2) (pin 7)))
-    (net (code 33) (name "Net-(U2-Pad30)")
+    (net (code 34) (name "Net-(U2-Pad30)")
       (node (ref U2) (pin 30)))
-    (net (code 34) (name /USB)
+    (net (code 35) (name /USB)
       (node (ref U2) (pin 29))
-      (node (ref R3) (pin 2))
-      (node (ref U1) (pin 6)))
-    (net (code 35) (name /RTC)
+      (node (ref U1) (pin 6))
+      (node (ref R3) (pin 2)))
+    (net (code 36) (name /RTC)
       (node (ref R19) (pin 1))
       (node (ref U4) (pin 3))
       (node (ref U2) (pin 28)))
-    (net (code 36) (name "Net-(U2-Pad27)")
+    (net (code 37) (name "Net-(U2-Pad27)")
       (node (ref U2) (pin 27)))
-    (net (code 37) (name "Net-(U2-Pad25)")
+    (net (code 38) (name "Net-(U2-Pad25)")
       (node (ref U2) (pin 25)))
-    (net (code 38) (name /USB_P)
-      (node (ref J1) (pin B6))
-      (node (ref J1) (pin A6))
-      (node (ref D3) (pin 2))
-      (node (ref U2) (pin 22)))
     (net (code 39) (name "Net-(U2-Pad14)")
       (node (ref U2) (pin 14)))
-    (net (code 40) (name "Net-(U2-Pad12)")
+    (net (code 40) (name /NIXIE_EN)
+      (node (ref J4) (pin 5))
+      (node (ref U2) (pin 13)))
+    (net (code 41) (name "Net-(U2-Pad12)")
       (node (ref U2) (pin 12)))
-    (net (code 41) (name "Net-(U2-Pad10)")
-      (node (ref U2) (pin 10)))
-    (net (code 42) (name /CC1)
+    (net (code 42) (name /CC2)
+      (node (ref D2) (pin 3))
+      (node (ref J1) (pin B5))
+      (node (ref U1) (pin 1)))
+    (net (code 43) (name /CC1)
       (node (ref U1) (pin 2))
       (node (ref D2) (pin 2))
       (node (ref J1) (pin A5)))
-    (net (code 43) (name /CC2)
-      (node (ref J1) (pin B5))
-      (node (ref U1) (pin 1))
-      (node (ref D2) (pin 3)))
-    (net (code 44) (name /NIXIE_EN)
-      (node (ref U2) (pin 13))
-      (node (ref J4) (pin 5)))
-    (net (code 45) (name /SWCLK)
-      (node (ref J2) (pin 4))
-      (node (ref U2) (pin 24)))
-    (net (code 46) (name /SWDIO)
+    (net (code 44) (name "Net-(U2-Pad10)")
+      (node (ref U2) (pin 10)))
+    (net (code 45) (name /SWDIO)
       (node (ref U2) (pin 23))
-      (node (ref J2) (pin 3)))
-    (net (code 47) (name /SWO)
+      (node (ref J2) (pin 4)))
+    (net (code 46) (name /SWCLK)
       (node (ref J2) (pin 2))
-      (node (ref U2) (pin 26)))
-    (net (code 48) (name /MCO)
+      (node (ref U2) (pin 24)))
+    (net (code 47) (name /MCO)
       (node (ref U2) (pin 18))
       (node (ref J5) (pin 1)))
-    (net (code 49) (name /FAULT)
-      (node (ref U7) (pin 6))
-      (node (ref R15) (pin 2))
-      (node (ref U2) (pin 9)))
-    (net (code 50) (name /HV_IN)
+    (net (code 48) (name /HV_IN)
       (node (ref U6) (pin 11))
+      (node (ref U6) (pin 10))
       (node (ref T1) (pin 6))
       (node (ref C4) (pin 2))
-      (node (ref U6) (pin 10))
-      (node (ref C1) (pin 2))
-      (node (ref U7) (pin 5)))
-    (net (code 51) (name "Net-(L1-Pad1)")
-      (node (ref U3) (pin 3))
-      (node (ref L1) (pin 1)))
+      (node (ref U7) (pin 5))
+      (node (ref C1) (pin 2)))
+    (net (code 49) (name "Net-(L1-Pad1)")
+      (node (ref L1) (pin 1))
+      (node (ref U3) (pin 3)))
+    (net (code 50) (name /VDD)
+      (node (ref J14) (pin 1))
+      (node (ref R15) (pin 1))
+      (node (ref U1) (pin 12))
+      (node (ref R3) (pin 1))
+      (node (ref U4) (pin 2))
+      (node (ref C11) (pin 2))
+      (node (ref U3) (pin 13))
+      (node (ref U3) (pin 14))
+      (node (ref SW2) (pin 2))
+      (node (ref U5) (pin 6))
+      (node (ref U3) (pin 12))
+      (node (ref J2) (pin 1))
+      (node (ref C12) (pin 1))
+      (node (ref C13) (pin 1))
+      (node (ref U2) (pin 1))
+      (node (ref R18) (pin 1))
+      (node (ref R19) (pin 2))
+      (node (ref C15) (pin 2))
+      (node (ref U2) (pin 5))
+      (node (ref R16) (pin 2))
+      (node (ref C16) (pin 1))
+      (node (ref C14) (pin 2))
+      (node (ref R4) (pin 2))
+      (node (ref R5) (pin 2))
+      (node (ref U2) (pin 17)))
+    (net (code 51) (name /USB_P)
+      (node (ref J1) (pin B6))
+      (node (ref D3) (pin 2))
+      (node (ref J1) (pin A6))
+      (node (ref U2) (pin 22)))
     (net (code 52) (name /USB_N)
-      (node (ref D3) (pin 3))
-      (node (ref U2) (pin 21))
       (node (ref J1) (pin A7))
-      (node (ref J1) (pin B7)))
+      (node (ref J1) (pin B7))
+      (node (ref D3) (pin 3))
+      (node (ref U2) (pin 21)))
     (net (code 53) (name /NRST)
+      (node (ref J2) (pin 5))
       (node (ref SW1) (pin 2))
-      (node (ref J2) (pin 6))
       (node (ref U2) (pin 4))
       (node (ref U4) (pin 4)))
     (net (code 54) (name "Net-(D1-Pad2)")
       (node (ref D1) (pin 2)))
     (net (code 55) (name "Net-(C6-Pad1)")
-      (node (ref U6) (pin 3))
-      (node (ref C6) (pin 1)))
+      (node (ref C6) (pin 1))
+      (node (ref U6) (pin 3)))
     (net (code 56) (name "Net-(Q1-Pad3)")
       (node (ref U6) (pin 7))
       (node (ref Q1) (pin 3))
       (node (ref R11) (pin 2)))
     (net (code 57) (name "Net-(R8-Pad2)")
-      (node (ref R8) (pin 2))
-      (node (ref U6) (pin 8)))
+      (node (ref U6) (pin 8))
+      (node (ref R8) (pin 2)))
     (net (code 58) (name "Net-(D4-Pad2)")
-      (node (ref T1) (pin 3))
-      (node (ref D4) (pin 2)))
+      (node (ref D4) (pin 2))
+      (node (ref T1) (pin 3)))
     (net (code 59) (name "Net-(Q1-Pad1)")
       (node (ref Q1) (pin 1))
       (node (ref T1) (pin 4)))
     (net (code 60) (name "Net-(R10-Pad2)")
-      (node (ref U6) (pin 2))
       (node (ref R10) (pin 2))
+      (node (ref U6) (pin 2))
       (node (ref R9) (pin 2)))
     (net (code 61) (name "Net-(C7-Pad1)")
       (node (ref C7) (pin 1))
       (node (ref U6) (pin 9)))
     (net (code 62) (name "Net-(R6-Pad2)")
-      (node (ref U6) (pin 4))
-      (node (ref R6) (pin 2)))
+      (node (ref R6) (pin 2))
+      (node (ref U6) (pin 4)))
     (net (code 63) (name "Net-(T1-Pad2)")
       (node (ref T1) (pin 2)))
     (net (code 64) (name "Net-(Q1-Pad2)")
-      (node (ref Q1) (pin 2))
-      (node (ref R8) (pin 1)))
+      (node (ref R8) (pin 1))
+      (node (ref Q1) (pin 2)))
     (net (code 65) (name "Net-(R7-Pad1)")
-      (node (ref U6) (pin 1))
-      (node (ref R7) (pin 1)))
+      (node (ref R7) (pin 1))
+      (node (ref U6) (pin 1)))
     (net (code 66) (name "Net-(C5-Pad1)")
-      (node (ref C5) (pin 1))
-      (node (ref R7) (pin 2)))))
+      (node (ref R7) (pin 2))
+      (node (ref C5) (pin 1)))))

Nixie_Bottom_Board/nixie_bottom_board.sch

@@ -2,1173 +2,1176 @@ EESchema Schematic File Version 4
 LIBS:nixie_bottom_board-cache
 EELAYER 26 0
 EELAYER END
-$Descr A4 11693 8268
+$Descr USLetter 11000 8500
 encoding utf-8
 Sheet 1 2
-Title ""
+Title "Bottom PCB"
 Date ""
-Rev ""
-Comp ""
-Comment1 ""
+Rev "A"
+Comp "Nixie Tube Clock"
+Comment1 "https://0x7d.com/2017/nixie-tube-clock"
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
 $Sheet
-S 8550 1650 650  400 
+S 8200 1550 650  400 
 U 5B07197A
 F0 "HV Power Supply" 60
 F1 "hv_power_supply.sch" 60
-F2 "VIN" I L 8550 1750 60 
-F3 "EN" I L 8550 1850 60 
-F4 "GND" I L 8550 1950 60 
-F5 "VOUT" I R 9200 1750 60 
-F6 "GND" I R 9200 1850 60 
+F2 "VIN" I L 8200 1650 60 
+F3 "EN" I L 8200 1750 60 
+F4 "GND" I L 8200 1850 60 
+F5 "VOUT" I R 8850 1650 60 
+F6 "GND" I R 8850 1750 60 
 $EndSheet
-Text Label 7150 5800 0    60   ~ 0
+Text Label 6800 5850 0    60   ~ 0
 VDD
-Text Label 7150 5200 0    60   ~ 0
+Text Label 6800 5250 0    60   ~ 0
 SWDIO
-Text Label 7150 5100 0    60   ~ 0
+Text Label 6800 5150 0    60   ~ 0
 SWCLK
-Text Label 7150 4900 0    60   ~ 0
+Text Label 6800 4950 0    60   ~ 0
 SWO
-Text Label 4150 4400 0    60   ~ 0
+Text Label 3850 4450 0    60   ~ 0
 SWO
-Text Label 4150 4200 0    60   ~ 0
+Text Label 3850 4250 0    60   ~ 0
 SWCLK
-Text Label 4150 4300 0    60   ~ 0
+Text Label 3850 4350 0    60   ~ 0
 SWDIO
-Text Label 3650 4400 2    60   ~ 0
+Text Label 3350 4450 2    60   ~ 0
 NRST
-Text Label 7150 5400 0    60   ~ 0
+Text Label 6800 5450 0    60   ~ 0
 USB_N
-Text Label 7150 5300 0    60   ~ 0
+Text Label 6800 5350 0    60   ~ 0
 USB_P
-Text Label 4150 5600 0    60   ~ 0
+Text Label 3850 5650 0    60   ~ 0
 SCL
-Text Label 4150 5700 0    60   ~ 0
+Text Label 3850 5750 0    60   ~ 0
 SDA
-Text Label 3650 4850 2    60   ~ 0
+Text Label 3350 4900 2    60   ~ 0
 HV_OUT
-Text Label 3650 5500 2    60   ~ 0
+Text Label 3350 5550 2    60   ~ 0
 VNIXIE
-Text Label 5750 5300 2    60   ~ 0
+Text Label 5400 5350 2    60   ~ 0
 DAC
-Text Label 7150 5600 0    60   ~ 0
+Text Label 6800 5650 0    60   ~ 0
 SCL
-Text Label 7150 5500 0    60   ~ 0
+Text Label 6800 5550 0    60   ~ 0
 SDA
-Text Label 8450 1850 2    60   ~ 0
+Text Label 8100 1750 2    60   ~ 0
 HV_EN
 $Comp
 L Device:R R2
 U 1 1 5B08854F
-P 7450 4600
-F 0 "R2" V 7530 4600 50  0000 C CNN
-F 1 "1M" V 7350 4600 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 7380 4600 50  0001 C CNN
-F 3 "" H 7450 4600 50  0001 C CNN
-	1    7450 4600
+P 7100 4650
+F 0 "R2" V 7180 4650 50  0000 C CNN
+F 1 "1M" V 7000 4650 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 7030 4650 50  0001 C CNN
+F 3 "" H 7100 4650 50  0001 C CNN
+	1    7100 4650
 	-1   0    0    1   
 $EndComp
-Text Label 9300 1750 0    60   ~ 0
+Text Label 8950 1650 0    60   ~ 0
 HV_OUT
-Text Label 5750 5000 2    60   ~ 0
+Text Label 5400 5050 2    60   ~ 0
 HV_EN
-Text Label 2600 1800 0    60   ~ 0
+Text Label 2300 1850 0    60   ~ 0
 CC1
-Text Label 2600 1900 0    60   ~ 0
+Text Label 2300 1950 0    60   ~ 0
 CC2
-Text Label 2600 2100 0    60   ~ 0
+Text Label 2300 2150 0    60   ~ 0
 USB_N
-Text Label 2600 2400 0    60   ~ 0
+Text Label 2300 2450 0    60   ~ 0
 USB_P
 $Comp
 L Device:R R1
 U 1 1 5B096154
-P 3450 3200
-F 0 "R1" V 3530 3200 50  0000 C CNN
-F 1 "900k" V 3350 3200 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 3380 3200 50  0001 C CNN
-F 3 "" H 3450 3200 50  0001 C CNN
-	1    3450 3200
+P 3150 3250
+F 0 "R1" V 3230 3250 50  0000 C CNN
+F 1 "900k" V 3050 3250 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 3080 3250 50  0001 C CNN
+F 3 "" H 3150 3250 50  0001 C CNN
+	1    3150 3250
 	-1   0    0    1   
 $EndComp
-Text Label 3400 3400 2    60   ~ 0
+Text Label 3100 3450 2    60   ~ 0
 VBUS
-Text Label 4700 3250 0    60   ~ 0
+Text Label 4400 3300 0    60   ~ 0
 SCL
-Text Label 4700 3350 0    60   ~ 0
+Text Label 4400 3400 0    60   ~ 0
 SDA
 $Comp
 L Device:R R4
 U 1 1 5B0B7874
-P 7650 5300
-F 0 "R4" V 7730 5300 50  0000 C CNN
-F 1 "10k" V 7550 5300 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 7580 5300 50  0001 C CNN
-F 3 "" H 7650 5300 50  0001 C CNN
-	1    7650 5300
+P 7300 5350
+F 0 "R4" V 7380 5350 50  0000 C CNN
+F 1 "10k" V 7200 5350 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 7230 5350 50  0001 C CNN
+F 3 "" H 7300 5350 50  0001 C CNN
+	1    7300 5350
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:R R5
 U 1 1 5B0B79AE
-P 7950 5300
-F 0 "R5" V 8030 5300 50  0000 C CNN
-F 1 "10k" V 7850 5300 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 7880 5300 50  0001 C CNN
-F 3 "" H 7950 5300 50  0001 C CNN
-	1    7950 5300
+P 7600 5350
+F 0 "R5" V 7680 5350 50  0000 C CNN
+F 1 "10k" V 7500 5350 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 7530 5350 50  0001 C CNN
+F 3 "" H 7600 5350 50  0001 C CNN
+	1    7600 5350
 	-1   0    0    1   
 $EndComp
-Text Notes 4000 3500 0    60   ~ 0
+Text Notes 3700 3550 0    60   ~ 0
 ADDR: 0x47
-Text Label 2600 1300 0    60   ~ 0
+Text Label 2300 1350 0    60   ~ 0
 VBUS
-Text Notes 3500 6000 0    60   ~ 0
+Text Notes 3200 6050 0    60   ~ 0
 ADDR: 0x70-0x73
-Text Label 5750 4300 2    60   ~ 0
+Text Label 5400 4350 2    60   ~ 0
 VDD
-Text Label 5750 4700 2    60   ~ 0
+Text Label 5400 4750 2    60   ~ 0
 VDD
-Text Label 4700 2850 0    60   ~ 0
+Text Label 4400 2900 0    60   ~ 0
 VDD
-Text Label 3650 4200 2    60   ~ 0
+Text Label 3350 4250 2    60   ~ 0
 VDD
-Text Label 6800 2650 0    60   ~ 0
+Text Label 6500 2700 0    60   ~ 0
 VDD
 $Comp
 L Device:L_Small L1
 U 1 1 5B16755A
-P 5650 2750
-F 0 "L1" H 5680 2790 50  0000 L CNN
-F 1 "1uH" H 5680 2710 50  0000 L CNN
-F 2 "Inductors_SMD:L_Taiyo-Yuden_NR-40xx" H 5650 2750 50  0001 C CNN
-F 3 "" H 5650 2750 50  0001 C CNN
-	1    5650 2750
+P 5350 2800
+F 0 "L1" H 5380 2840 50  0000 L CNN
+F 1 "1uH" H 5380 2760 50  0000 L CNN
+F 2 "Inductors_SMD:L_Taiyo-Yuden_NR-40xx" H 5350 2800 50  0001 C CNN
+F 3 "" H 5350 2800 50  0001 C CNN
+	1    5350 2800
 	-1   0    0    1   
 $EndComp
-Text Label 9800 4100 0    60   ~ 0
+Text Label 9100 4050 0    60   ~ 0
 VDD
-Text Label 9000 4300 2    60   ~ 0
+Text Label 8300 4250 2    60   ~ 0
 DAC
-Text Label 9000 4100 2    60   ~ 0
+Text Label 8300 4050 2    60   ~ 0
 VNIXIE
-Text Label 9800 4300 0    60   ~ 0
+Text Label 9100 4250 0    60   ~ 0
 VNIXIE
 Wire Wire Line
-	3800 2950 3700 2950
+	3500 3000 3400 3000
 Wire Wire Line
-	3700 2850 3800 2850
+	3400 2900 3500 2900
 Wire Wire Line
-	9300 1850 9200 1850
+	8950 1750 8850 1750
 Wire Wire Line
-	8550 1950 8450 1950
+	8200 1850 8100 1850
 Wire Wire Line
-	5900 2650 5650 2650
+	5600 2700 5350 2700
 Wire Wire Line
-	8450 1850 8550 1850
+	8100 1750 8200 1750
 $Comp
 L Custom_Parts:STM32L432K U2
 U 1 1 5B622DF7
-P 6450 5050
-F 0 "U2" H 6450 6047 60  0000 C CNN
-F 1 "STM32L432K" H 6450 5941 60  0000 C CNN
-F 2 "Housings_DFN_QFN:QFN-32-1EP_5x5mm_Pitch0.5mm" H 6450 5500 60  0001 C CNN
-F 3 "" H 6450 5500 60  0001 C CNN
-	1    6450 5050
+P 6100 5100
+F 0 "U2" H 6100 6097 60  0000 C CNN
+F 1 "STM32L432K" H 6100 5991 60  0000 C CNN
+F 2 "Housings_DFN_QFN:QFN-32-1EP_5x5mm_Pitch0.5mm" H 6100 5550 60  0001 C CNN
+F 3 "" H 6100 5550 60  0001 C CNN
+	1    6100 5100
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector:Conn_01x01_Female J5
 U 1 1 5B649686
-P 9150 4900
-F 0 "J5" H 9177 4926 50  0000 L CNN
-F 1 "MCO" H 9177 4835 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9150 4900 50  0001 C CNN
-F 3 "~" H 9150 4900 50  0001 C CNN
-	1    9150 4900
+P 8600 4750
+F 0 "J5" H 8627 4776 50  0000 L CNN
+F 1 "MCO" H 8627 4685 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 8600 4750 50  0001 C CNN
+F 3 "~" H 8600 4750 50  0001 C CNN
+	1    8600 4750
 	1    0    0    -1  
 $EndComp
 $Comp
 L Switch:SW_Push SW1
 U 1 1 5B64A44F
-P 5250 4700
-F 0 "SW1" H 5250 4985 50  0000 C CNN
-F 1 "NRST" H 5250 4894 50  0000 C CNN
-F 2 "Custom Parts:EVQP2" H 5250 4900 50  0001 C CNN
-F 3 "" H 5250 4900 50  0001 C CNN
-	1    5250 4700
+P 4900 4750
+F 0 "SW1" H 4900 5035 50  0000 C CNN
+F 1 "NRST" H 4900 4944 50  0000 C CNN
+F 2 "Custom Parts:EVQP2" H 4900 4950 50  0001 C CNN
+F 3 "" H 4900 4950 50  0001 C CNN
+	1    4900 4750
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector_Generic:Conn_02x03_Odd_Even J2
 U 1 1 5B693D84
-P 3850 4300
-F 0 "J2" H 3900 4617 50  0000 C CNN
-F 1 "SWD" H 3900 4526 50  0000 C CNN
-F 2 "Tag Connect:TC2030-MCP-NL" H 3850 4300 50  0001 C CNN
-F 3 "~" H 3850 4300 50  0001 C CNN
-	1    3850 4300
+P 3550 4350
+F 0 "J2" H 3600 4667 50  0000 C CNN
+F 1 "SWD" H 3600 4576 50  0000 C CNN
+F 2 "Tag Connect:TC2030-MCP-NL" H 3550 4350 50  0001 C CNN
+F 3 "~" H 3550 4350 50  0001 C CNN
+	1    3550 4350
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector_Generic:Conn_02x03_Odd_Even J3
 U 1 1 5B6941D3
-P 3850 4950
-F 0 "J3" H 3900 5267 50  0000 C CNN
-F 1 "Nixie_HV" H 3900 5176 50  0000 C CNN
-F 2 "Custom Parts:Pin_Header_Harwin_2x03_Pitch2.00mm" H 3850 4950 50  0001 C CNN
-F 3 "~" H 3850 4950 50  0001 C CNN
-	1    3850 4950
+P 3550 5000
+F 0 "J3" H 3600 5317 50  0000 C CNN
+F 1 "Nixie_HV" H 3600 5226 50  0000 C CNN
+F 2 "Custom Parts:Pin_Header_Harwin_2x03_Pitch2.00mm" H 3550 5000 50  0001 C CNN
+F 3 "~" H 3550 5000 50  0001 C CNN
+	1    3550 5000
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector_Generic:Conn_02x03_Odd_Even J4
 U 1 1 5B694500
-P 3850 5600
-F 0 "J4" H 3900 5917 50  0000 C CNN
-F 1 "Nixie_CTRL" H 3900 5826 50  0000 C CNN
-F 2 "Custom Parts:Pin_Header_Harwin_2x03_Pitch2.00mm" H 3850 5600 50  0001 C CNN
-F 3 "~" H 3850 5600 50  0001 C CNN
-	1    3850 5600
+P 3550 5650
+F 0 "J4" H 3600 5967 50  0000 C CNN
+F 1 "Nixie_CTRL" H 3600 5876 50  0000 C CNN
+F 2 "Custom Parts:Pin_Header_Harwin_2x03_Pitch2.00mm" H 3550 5650 50  0001 C CNN
+F 3 "~" H 3550 5650 50  0001 C CNN
+	1    3550 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L Custom_Parts:ESD122 D2
 U 1 1 5B916041
-P 4350 1550
-F 0 "D2" H 4350 1915 50  0000 C CNN
-F 1 "ESD122" H 4350 1824 50  0000 C CNN
-F 2 "Custom Parts:DMX0003A" H 4350 1550 50  0001 C CNN
-F 3 "" H 4350 1550 50  0001 C CNN
-	1    4350 1550
+P 4050 1600
+F 0 "D2" H 4050 1965 50  0000 C CNN
+F 1 "ESD122" H 4050 1874 50  0000 C CNN
+F 2 "Custom Parts:DMX0003A" H 4050 1600 50  0001 C CNN
+F 3 "" H 4050 1600 50  0001 C CNN
+	1    4050 1600
 	1    0    0    -1  
 $EndComp
-Text Label 3700 2950 2    60   ~ 0
+Text Label 3400 3000 2    60   ~ 0
 CC1
-Text Label 3700 2850 2    60   ~ 0
+Text Label 3400 2900 2    60   ~ 0
 CC2
-Text Label 4000 1650 2    60   ~ 0
+Text Label 3700 1700 2    60   ~ 0
 CC2
-Text Label 4000 1450 2    60   ~ 0
+Text Label 3700 1500 2    60   ~ 0
 CC1
 Wire Wire Line
-	8450 1750 8550 1750
+	8100 1650 8200 1650
 $Comp
 L Custom_Parts:ESD122 D3
 U 1 1 5BA1CDBE
-P 4350 2250
-F 0 "D3" H 4350 2615 50  0000 C CNN
-F 1 "ESD122" H 4350 2524 50  0000 C CNN
-F 2 "Custom Parts:DMX0003A" H 4350 2250 50  0001 C CNN
-F 3 "" H 4350 2250 50  0001 C CNN
-	1    4350 2250
+P 4050 2300
+F 0 "D3" H 4050 2665 50  0000 C CNN
+F 1 "ESD122" H 4050 2574 50  0000 C CNN
+F 2 "Custom Parts:DMX0003A" H 4050 2300 50  0001 C CNN
+F 3 "" H 4050 2300 50  0001 C CNN
+	1    4050 2300
 	1    0    0    -1  
 $EndComp
-Text Label 4000 2350 2    60   ~ 0
+Text Label 3700 2400 2    60   ~ 0
 USB_N
-Text Label 4000 2150 2    60   ~ 0
+Text Label 3700 2200 2    60   ~ 0
 USB_P
 $Comp
 L Device:D D1
 U 1 1 5B902F50
-P 3150 1600
-F 0 "D1" H 3150 1816 50  0000 C CNN
-F 1 "D_VBUS" H 3150 1725 50  0000 C CNN
-F 2 "Custom Parts:X1SON" H 3150 1600 50  0001 C CNN
-F 3 "~" H 3150 1600 50  0001 C CNN
-	1    3150 1600
+P 2850 1650
+F 0 "D1" H 2850 1866 50  0000 C CNN
+F 1 "D_VBUS" H 2850 1775 50  0000 C CNN
+F 2 "Custom Parts:X1SON" H 2850 1650 50  0001 C CNN
+F 3 "~" H 2850 1650 50  0001 C CNN
+	1    2850 1650
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:Battery_Cell BT1
 U 1 1 5BA7F4A1
-P 9750 3100
-F 0 "BT1" H 9868 3196 50  0000 L CNN
-F 1 "CR1620" H 9868 3105 50  0000 L CNN
-F 2 "Custom Parts:CR1220_Holder" V 9750 3160 50  0001 C CNN
-F 3 "~" V 9750 3160 50  0001 C CNN
-	1    9750 3100
+P 9450 3050
+F 0 "BT1" H 9568 3146 50  0000 L CNN
+F 1 "CR1620" H 9568 3055 50  0000 L CNN
+F 2 "Custom Parts:CR1220_Holder" V 9450 3110 50  0001 C CNN
+F 3 "~" V 9450 3110 50  0001 C CNN
+	1    9450 3050
 	1    0    0    -1  
 $EndComp
 $Comp
 L Custom_Parts:DS3231 U4
 U 1 1 5BAADC28
-P 9000 3050
-F 0 "U4" H 9000 3625 50  0000 C CNN
-F 1 "DS3231" H 9000 3534 50  0000 C CNN
-F 2 "Housings_SOIC:SOIC-16W_7.5x10.3mm_Pitch1.27mm" H 9000 3050 50  0001 C CNN
-F 3 "" H 9000 3050 50  0001 C CNN
-	1    9000 3050
+P 8700 3000
+F 0 "U4" H 8700 3575 50  0000 C CNN
+F 1 "DS3231" H 8700 3484 50  0000 C CNN
+F 2 "Housings_SOIC:SOIC-16W_7.5x10.3mm_Pitch1.27mm" H 8700 3000 50  0001 C CNN
+F 3 "" H 8700 3000 50  0001 C CNN
+	1    8700 3000
 	1    0    0    -1  
 $EndComp
-Text Label 9450 2800 0    60   ~ 0
+Text Label 9150 2750 0    60   ~ 0
 SDA
-Text Label 9450 2700 0    60   ~ 0
+Text Label 9150 2650 0    60   ~ 0
 SCL
-Text Label 8550 2800 2    60   ~ 0
+Text Label 8250 2750 2    60   ~ 0
 VDD
-Text Label 6800 3250 0    60   ~ 0
+Text Label 6500 3300 0    60   ~ 0
 VBUS
-Text Label 8450 1750 2    60   ~ 0
+Text Label 8100 1650 2    60   ~ 0
 HV_IN
 $Comp
 L Custom_Parts:TPS2595x0 U7
 U 1 1 5BA21006
-P 6400 1750
-F 0 "U7" H 6400 2125 50  0000 C CNN
-F 1 "TPS2595x0" H 6400 2034 50  0000 C CNN
-F 2 "Housings_SON:WSON-8_1EP_2x2mm_Pitch0.5mm" H 6400 1750 50  0001 C CNN
-F 3 "" H 6400 1750 50  0001 C CNN
-	1    6400 1750
+P 6100 1800
+F 0 "U7" H 6100 2175 50  0000 C CNN
+F 1 "TPS2595x0" H 6100 2084 50  0000 C CNN
+F 2 "Housings_SON:WSON-8_1EP_2x2mm_Pitch0.5mm" H 6100 1800 50  0001 C CNN
+F 3 "" H 6100 1800 50  0001 C CNN
+	1    6100 1800
 	1    0    0    -1  
 $EndComp
-Text Label 6850 1900 0    60   ~ 0
+Text Label 6550 1950 0    60   ~ 0
 HV_IN
 $Comp
 L Device:R R14
 U 1 1 5BA6BB6E
-P 7200 1550
-F 0 "R14" V 7280 1550 50  0000 C CNN
-F 1 "680" V 7100 1550 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 7130 1550 50  0001 C CNN
-F 3 "" H 7200 1550 50  0001 C CNN
-	1    7200 1550
+P 6900 1600
+F 0 "R14" V 6980 1600 50  0000 C CNN
+F 1 "680" V 6800 1600 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 6830 1600 50  0001 C CNN
+F 3 "" H 6900 1600 50  0001 C CNN
+	1    6900 1600
 	-1   0    0    1   
 $EndComp
-Text Label 6850 1800 0    60   ~ 0
+Text Label 6550 1850 0    60   ~ 0
 FAULT
-Text Label 5750 5100 2    60   ~ 0
+Text Label 5400 5150 2    60   ~ 0
 FAULT
-Text Label 8550 2900 2    60   ~ 0
+Text Label 8250 2850 2    60   ~ 0
 RTC
-Text Label 7150 4700 0    60   ~ 0
+Text Label 6800 4750 0    60   ~ 0
 RTC
-Text Label 8550 2700 2    60   ~ 0
+Text Label 8250 2650 2    60   ~ 0
 32kHz
-Text Label 5750 4400 2    60   ~ 0
+Text Label 5400 4450 2    60   ~ 0
 32kHz
-Text Label 3800 3350 2    60   ~ 0
+Text Label 3500 3400 2    60   ~ 0
 USB
-Text Label 5750 4600 2    60   ~ 0
+Text Label 5400 4650 2    60   ~ 0
 NRST
-Text Label 2600 2600 0    60   ~ 0
+Text Label 2300 2650 0    60   ~ 0
 GND
-Text Label 4700 1550 0    60   ~ 0
+Text Label 4400 1600 0    60   ~ 0
 GND
-Text Label 4700 2250 0    60   ~ 0
+Text Label 4400 2300 0    60   ~ 0
 GND
-Text Label 4700 2950 0    60   ~ 0
+Text Label 4400 3000 0    60   ~ 0
 GND
-Text Label 4700 3050 0    60   ~ 0
+Text Label 4400 3100 0    60   ~ 0
 GND
-Text Label 6000 2250 0    60   ~ 0
+Text Label 5700 2300 0    60   ~ 0
 GND
-Text Label 6850 1600 0    60   ~ 0
+Text Label 6550 1650 0    60   ~ 0
 GND
-Text Label 7200 1400 0    60   ~ 0
+Text Label 6900 1450 0    60   ~ 0
 GND
-Text Label 8450 1950 2    60   ~ 0
+Text Label 8100 1850 2    60   ~ 0
 GND
-Text Label 9300 1850 0    60   ~ 0
+Text Label 8950 1750 0    60   ~ 0
 GND
-Text Label 9000 4200 2    60   ~ 0
+Text Label 8300 4150 2    60   ~ 0
 GND
-Text Label 6800 3050 0    60   ~ 0
+Text Label 6500 3100 0    60   ~ 0
 GND
-Text Label 5900 2750 2    60   ~ 0
+Text Label 5600 2800 2    60   ~ 0
 GND
 Wire Wire Line
-	5650 2850 5900 2850
-Text Label 7150 4300 0    60   ~ 0
+	5350 2900 5600 2900
+Text Label 6800 4350 0    60   ~ 0
 GND
-Text Label 7500 4800 0    60   ~ 0
+Text Label 7150 4850 0    60   ~ 0
 GND
-Text Label 5750 5800 2    60   ~ 0
+Text Label 5400 5850 2    60   ~ 0
 GND
-Text Label 3650 4300 2    60   ~ 0
+Text Label 3350 4350 2    60   ~ 0
 GND
-Text Label 3650 4950 2    60   ~ 0
+Text Label 3350 5000 2    60   ~ 0
 HV_OUT
-Text Label 3650 5050 2    60   ~ 0
+Text Label 3350 5100 2    60   ~ 0
 HV_OUT
-Text Label 4150 4950 0    60   ~ 0
+Text Label 3850 5000 0    60   ~ 0
 GND
-Text Label 4150 4850 0    60   ~ 0
+Text Label 3850 4900 0    60   ~ 0
 GND
-Text Label 4150 5050 0    60   ~ 0
+Text Label 3850 5100 0    60   ~ 0
 GND
-Text Label 4150 5500 0    60   ~ 0
+Text Label 3850 5550 0    60   ~ 0
 GND
-Text Label 3650 5600 2    60   ~ 0
+Text Label 3350 5650 2    60   ~ 0
 GND
-Text Label 2600 2700 0    60   ~ 0
+Text Label 2300 2750 0    60   ~ 0
 GND
-Text Label 2600 2900 0    60   ~ 0
+Text Label 2300 2950 0    60   ~ 0
 GND
-Text Label 2600 3000 0    60   ~ 0
+Text Label 2300 3050 0    60   ~ 0
 GND
-Text Label 2600 3200 0    60   ~ 0
+Text Label 2300 3250 0    60   ~ 0
 GND
-Text Label 2600 3300 0    60   ~ 0
+Text Label 2300 3350 0    60   ~ 0
 GND
-Text Label 2600 3500 0    60   ~ 0
+Text Label 2300 3550 0    60   ~ 0
 GND
-Text Label 2600 3600 0    60   ~ 0
+Text Label 2300 3650 0    60   ~ 0
 GND
-Text Label 2600 3800 0    60   ~ 0
+Text Label 2300 3850 0    60   ~ 0
 GND
-Text Label 2600 3900 0    60   ~ 0
+Text Label 2300 3950 0    60   ~ 0
 GND
-Text Label 2100 4200 3    60   ~ 0
+Text Label 1800 4250 3    60   ~ 0
 GND
-Text Label 2000 4200 3    60   ~ 0
+Text Label 1700 4250 3    60   ~ 0
 GND
-Text Label 1900 4200 3    60   ~ 0
+Text Label 1600 4250 3    60   ~ 0
 GND
-Text Label 1800 4200 3    60   ~ 0
+Text Label 1500 4250 3    60   ~ 0
 GND
-Text Label 1700 4200 3    60   ~ 0
+Text Label 1400 4250 3    60   ~ 0
 GND
-Text Label 2600 2200 0    60   ~ 0
+Text Label 2300 2250 0    60   ~ 0
 USB_N
-Text Label 2600 2300 0    60   ~ 0
+Text Label 2300 2350 0    60   ~ 0
 USB_P
 $Comp
 L Connector:USB_C_Receptacle J1
 U 1 1 5B6238BC
-P 2000 2600
-F 0 "J1" H 2105 4167 50  0000 C CNN
-F 1 "USB_C_Receptacle" H 2105 4076 50  0000 C CNN
-F 2 "Custom Parts:USB_C_Receptacle_Circular_Holes" H 2150 2600 50  0001 C CNN
-F 3 "http://www.usb.org/developers/docs/usb_31_033017.zip" H 2150 2600 50  0001 C CNN
-	1    2000 2600
+P 1700 2650
+F 0 "J1" H 1805 4217 50  0000 C CNN
+F 1 "USB_C_Receptacle" H 1805 4126 50  0000 C CNN
+F 2 "Custom Parts:USB_C_Receptacle_Circular_Holes" H 1850 2650 50  0001 C CNN
+F 3 "http://www.usb.org/developers/docs/usb_31_033017.zip" H 1850 2650 50  0001 C CNN
+	1    1700 2650
 	1    0    0    -1  
 $EndComp
-Text Label 2600 1400 0    60   ~ 0
+Text Label 2300 1450 0    60   ~ 0
 VBUS
-Text Label 2600 1500 0    60   ~ 0
+Text Label 2300 1550 0    60   ~ 0
 VBUS
-Text Label 2600 1600 0    60   ~ 0
+Text Label 2300 1650 0    60   ~ 0
 VBUS
-Text Label 5900 3250 2    60   ~ 0
+Text Label 5600 3300 2    60   ~ 0
 VBUS
-Text Label 5900 3150 2    60   ~ 0
+Text Label 5600 3200 2    60   ~ 0
 VBUS
-Text Label 5900 3050 2    60   ~ 0
+Text Label 5600 3100 2    60   ~ 0
 VBUS
-Text Label 5900 2950 2    60   ~ 0
+Text Label 5600 3000 2    60   ~ 0
 VBUS
 $Comp
 L Custom_Parts:TPS63025X U3
 U 1 1 5B1672A1
-P 6350 2850
-F 0 "U3" H 6350 3250 60  0000 C CNN
-F 1 "TPS63025X" H 6350 3150 60  0000 C CNN
-F 2 "Custom Parts:VQFN-14_2.5x3mm_Pitch0.5mm" H 6350 2850 50  0001 C CNN
-F 3 "" H 6350 2850 60  0001 C CNN
-	1    6350 2850
+P 6050 2900
+F 0 "U3" H 6050 3300 60  0000 C CNN
+F 1 "TPS63025X" H 6050 3200 60  0000 C CNN
+F 2 "Custom Parts:VQFN-14_2.5x3mm_Pitch0.5mm" H 6050 2900 50  0001 C CNN
+F 3 "" H 6050 2900 60  0001 C CNN
+	1    6050 2900
 	1    0    0    -1  
 $EndComp
-Text Label 6800 2750 0    60   ~ 0
+Text Label 6500 2800 0    60   ~ 0
 VDD
-Text Label 6800 2850 0    60   ~ 0
+Text Label 6500 2900 0    60   ~ 0
 VDD
-Text Label 7250 2650 0    60   ~ 0
+Text Label 6950 2700 0    60   ~ 0
 VDD
-Text Label 6800 3150 0    60   ~ 0
+Text Label 6500 3200 0    60   ~ 0
 GND
-Text Label 5950 1800 2    60   ~ 0
+Text Label 5650 1850 2    60   ~ 0
 VBUS
-Text Label 5950 1900 2    60   ~ 0
+Text Label 5650 1950 2    60   ~ 0
 VBUS
-NoConn ~ 8550 3100
-NoConn ~ 8550 3200
-NoConn ~ 8550 3300
-NoConn ~ 8550 3400
-NoConn ~ 9450 3400
-NoConn ~ 9450 3300
-NoConn ~ 9450 3200
-NoConn ~ 9450 3100
+NoConn ~ 8250 3050
+NoConn ~ 8250 3150
+NoConn ~ 8250 3250
+NoConn ~ 8250 3350
+NoConn ~ 9150 3350
+NoConn ~ 9150 3250
+NoConn ~ 9150 3150
+NoConn ~ 9150 3050
 $Comp
 L Device:R R15
 U 1 1 5BB93CD7
-P 7300 1950
-F 0 "R15" V 7380 1950 50  0000 C CNN
-F 1 "20k" V 7200 1950 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 7230 1950 50  0001 C CNN
-F 3 "" H 7300 1950 50  0001 C CNN
-	1    7300 1950
+P 7000 2000
+F 0 "R15" V 7080 2000 50  0000 C CNN
+F 1 "20k" V 6900 2000 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 6930 2000 50  0001 C CNN
+F 3 "" H 7000 2000 50  0001 C CNN
+	1    7000 2000
 	-1   0    0    1   
 $EndComp
-Text Label 7400 1700 0    60   ~ 0
+Text Label 7100 1750 0    60   ~ 0
 ILM
-Text Label 5750 4900 2    60   ~ 0
+Text Label 5400 4950 2    60   ~ 0
 ILM
-Text Label 7150 4600 0    60   ~ 0
+Text Label 6800 4650 0    60   ~ 0
 USB
 $Comp
 L Device:R R3
 U 1 1 5BB9C8D3
-P 3550 3500
-F 0 "R3" V 3630 3500 50  0000 C CNN
-F 1 "20k" V 3450 3500 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 3480 3500 50  0001 C CNN
-F 3 "" H 3550 3500 50  0001 C CNN
-	1    3550 3500
+P 3250 3550
+F 0 "R3" V 3330 3550 50  0000 C CNN
+F 1 "20k" V 3150 3550 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 3180 3550 50  0001 C CNN
+F 3 "" H 3250 3550 50  0001 C CNN
+	1    3250 3550
 	-1   0    0    1   
 $EndComp
-Text Label 3600 3700 0    60   ~ 0
+Text Label 3300 3750 0    60   ~ 0
 VDD
 $Comp
 L Device:C C2
 U 1 1 5BB9F4F9
-P 5950 2050
-F 0 "C2" H 5835 2004 50  0000 R CNN
-F 1 "0.1uF" H 5835 2095 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 5988 1900 50  0001 C CNN
-F 3 "~" H 5950 2050 50  0001 C CNN
-	1    5950 2050
+P 5650 2100
+F 0 "C2" H 5535 2054 50  0000 R CNN
+F 1 "0.1uF" H 5535 2145 50  0000 R CNN
+F 2 "Capacitors_SMD:C_0603" H 5688 1950 50  0001 C CNN
+F 3 "~" H 5650 2100 50  0001 C CNN
+	1    5650 2100
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C3
 U 1 1 5BBA0E2E
-P 5900 3400
-F 0 "C3" H 5785 3354 50  0000 R CNN
-F 1 "10uF" H 5785 3445 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 5938 3250 50  0001 C CNN
-F 3 "~" H 5900 3400 50  0001 C CNN
-	1    5900 3400
+P 5600 3450
+F 0 "C3" H 5485 3404 50  0000 R CNN
+F 1 "10uF" H 5485 3495 50  0000 R CNN
+F 2 "Capacitors_SMD:C_0603" H 5638 3300 50  0001 C CNN
+F 3 "~" H 5600 3450 50  0001 C CNN
+	1    5600 3450
 	1    0    0    -1  
 $EndComp
-Text Label 9450 3000 0    60   ~ 0
+Text Label 9150 2950 0    60   ~ 0
 GND
-Text Label 9800 3250 0    60   ~ 0
+Text Label 9500 3200 0    60   ~ 0
 GND
 $Comp
 L Device:C C11
 U 1 1 5BBA5067
-P 7500 2950
-F 0 "C11" H 7385 2904 50  0000 R CNN
-F 1 "330uF" H 7385 2995 50  0000 R CNN
-F 2 "Capacitors_Tantalum_SMD:CP_Tantalum_Case-B_EIA-3528-21_Reflow" H 7538 2800 50  0001 C CNN
-F 3 "~" H 7500 2950 50  0001 C CNN
-	1    7500 2950
+P 7200 3000
+F 0 "C11" H 7085 2954 50  0000 R CNN
+F 1 "330uF" H 7085 3045 50  0000 R CNN
+F 2 "Capacitors_Tantalum_SMD:CP_Tantalum_Case-B_EIA-3528-21_Reflow" H 7238 2850 50  0001 C CNN
+F 3 "~" H 7200 3000 50  0001 C CNN
+	1    7200 3000
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C C13
 U 1 1 5BBA50C7
-P 5000 4150
-F 0 "C13" H 4885 4104 50  0000 R CNN
-F 1 "4.7uF" H 4885 4195 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 5038 4000 50  0001 C CNN
-F 3 "~" H 5000 4150 50  0001 C CNN
-	1    5000 4150
+P 4650 4200
+F 0 "C13" H 4535 4154 50  0000 R CNN
+F 1 "4.7uF" H 4535 4245 50  0000 R CNN
+F 2 "Capacitors_SMD:C_0603" H 4688 4050 50  0001 C CNN
+F 3 "~" H 4650 4200 50  0001 C CNN
+	1    4650 4200
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C C12
 U 1 1 5BBA51A2
-P 5400 4000
-F 0 "C12" H 5285 3954 50  0000 R CNN
-F 1 "0.1uF" H 5285 4045 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 5438 3850 50  0001 C CNN
-F 3 "~" H 5400 4000 50  0001 C CNN
-	1    5400 4000
+P 5050 4050
+F 0 "C12" H 4935 4004 50  0000 R CNN
+F 1 "0.1uF" H 4935 4095 50  0000 R CNN
+F 2 "Capacitors_SMD:C_0603" H 5088 3900 50  0001 C CNN
+F 3 "~" H 5050 4050 50  0001 C CNN
+	1    5050 4050
 	-1   0    0    1   
 $EndComp
 $Comp
 L Custom_Parts:AD8591 U5
 U 1 1 5BBE6227
-P 9400 4200
-F 0 "U5" H 9400 4525 50  0000 C CNN
-F 1 "AD8591" H 9400 4434 50  0000 C CNN
-F 2 "TO_SOT_Packages_SMD:SOT-23-6" H 9400 4200 50  0001 C CNN
-F 3 "" H 9400 4200 50  0001 C CNN
-	1    9400 4200
+P 8700 4150
+F 0 "U5" H 8700 4475 50  0000 C CNN
+F 1 "AD8591" H 8700 4384 50  0000 C CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-6" H 8700 4150 50  0001 C CNN
+F 3 "" H 8700 4150 50  0001 C CNN
+	1    8700 4150
 	1    0    0    -1  
 $EndComp
-Text Label 9800 4200 0    60   ~ 0
+Text Label 9100 4150 0    60   ~ 0
 AMP_EN
 $Comp
 L Device:C C1
 U 1 1 5BA4D5A1
-P 6850 2050
-F 0 "C1" H 6735 2004 50  0000 R CNN
-F 1 "330uF" H 6735 2095 50  0000 R CNN
-F 2 "Capacitors_Tantalum_SMD:CP_Tantalum_Case-X_EIA-7343-43_Reflow" H 6888 1900 50  0001 C CNN
-F 3 "~" H 6850 2050 50  0001 C CNN
-	1    6850 2050
+P 6550 2100
+F 0 "C1" H 6435 2054 50  0000 R CNN
+F 1 "330uF" H 6435 2145 50  0000 R CNN
+F 2 "Capacitors_Tantalum_SMD:CP_Tantalum_Case-X_EIA-7343-43_Reflow" H 6588 1950 50  0001 C CNN
+F 3 "~" H 6550 2100 50  0001 C CNN
+	1    6550 2100
 	-1   0    0    1   
 $EndComp
 $Comp
 L Mechanical:MountingHole_Pad MH1
 U 1 1 5BA440F1
-P 1950 4900
-F 0 "MH1" V 1904 5050 50  0000 L CNN
-F 1 "MountingHole_Pad" V 1995 5050 50  0000 L CNN
-F 2 "Custom Parts:MountingHole_2.5mm_Pad_Via" H 1950 4900 50  0001 C CNN
-F 3 "~" H 1950 4900 50  0001 C CNN
-	1    1950 4900
+P 1750 4900
+F 0 "MH1" V 1704 5050 50  0000 L CNN
+F 1 "MountingHole_Pad" V 1795 5050 50  0000 L CNN
+F 2 "Custom Parts:MountingHole_2.5mm_Pad_Via" H 1750 4900 50  0001 C CNN
+F 3 "~" H 1750 4900 50  0001 C CNN
+	1    1750 4900
 	0    1    1    0   
 $EndComp
 $Comp
 L Mechanical:MountingHole_Pad MH2
 U 1 1 5BA441AA
-P 1950 5100
-F 0 "MH2" V 1904 5250 50  0000 L CNN
-F 1 "MountingHole_Pad" V 1995 5250 50  0000 L CNN
-F 2 "Custom Parts:MountingHole_2.5mm_Pad_Via" H 1950 5100 50  0001 C CNN
-F 3 "~" H 1950 5100 50  0001 C CNN
-	1    1950 5100
+P 1750 5100
+F 0 "MH2" V 1704 5250 50  0000 L CNN
+F 1 "MountingHole_Pad" V 1795 5250 50  0000 L CNN
+F 2 "Custom Parts:MountingHole_2.5mm_Pad_Via" H 1750 5100 50  0001 C CNN
+F 3 "~" H 1750 5100 50  0001 C CNN
+	1    1750 5100
 	0    1    1    0   
 $EndComp
 $Comp
 L Mechanical:MountingHole_Pad MH3
 U 1 1 5BA44208
-P 1950 5300
-F 0 "MH3" V 1904 5450 50  0000 L CNN
-F 1 "MountingHole_Pad" V 1995 5450 50  0000 L CNN
-F 2 "Custom Parts:MountingHole_2.5mm_Pad_Via" H 1950 5300 50  0001 C CNN
-F 3 "~" H 1950 5300 50  0001 C CNN
-	1    1950 5300
+P 1750 5300
+F 0 "MH3" V 1704 5450 50  0000 L CNN
+F 1 "MountingHole_Pad" V 1795 5450 50  0000 L CNN
+F 2 "Custom Parts:MountingHole_2.5mm_Pad_Via" H 1750 5300 50  0001 C CNN
+F 3 "~" H 1750 5300 50  0001 C CNN
+	1    1750 5300
 	0    1    1    0   
 $EndComp
 $Comp
 L Mechanical:MountingHole_Pad MH4
 U 1 1 5BA44262
-P 1950 5500
-F 0 "MH4" V 1904 5650 50  0000 L CNN
-F 1 "MountingHole_Pad" V 1995 5650 50  0000 L CNN
-F 2 "Custom Parts:MountingHole_2.5mm_Pad_Via" H 1950 5500 50  0001 C CNN
-F 3 "~" H 1950 5500 50  0001 C CNN
-	1    1950 5500
+P 1750 5500
+F 0 "MH4" V 1704 5650 50  0000 L CNN
+F 1 "MountingHole_Pad" V 1795 5650 50  0000 L CNN
+F 2 "Custom Parts:MountingHole_2.5mm_Pad_Via" H 1750 5500 50  0001 C CNN
+F 3 "~" H 1750 5500 50  0001 C CNN
+	1    1750 5500
 	0    1    1    0   
 $EndComp
 $Comp
 L Mechanical:MountingHole_Pad MH5
 U 1 1 5BA442D8
-P 1950 5700
-F 0 "MH5" V 1904 5850 50  0000 L CNN
-F 1 "MountingHole_Pad" V 1995 5850 50  0000 L CNN
-F 2 "Mounting_Holes:MountingHole_2.5mm_Pad_Via" H 1950 5700 50  0001 C CNN
-F 3 "~" H 1950 5700 50  0001 C CNN
-	1    1950 5700
+P 1750 5700
+F 0 "MH5" V 1704 5850 50  0000 L CNN
+F 1 "MountingHole_Pad" V 1795 5850 50  0000 L CNN
+F 2 "Mounting_Holes:MountingHole_2.5mm_Pad_Via" H 1750 5700 50  0001 C CNN
+F 3 "~" H 1750 5700 50  0001 C CNN
+	1    1750 5700
 	0    1    1    0   
 $EndComp
 $Comp
 L Mechanical:MountingHole_Pad MH6
 U 1 1 5BA44348
-P 1950 5900
-F 0 "MH6" V 1904 6050 50  0000 L CNN
-F 1 "MountingHole_Pad" V 1995 6050 50  0000 L CNN
-F 2 "Mounting_Holes:MountingHole_2.5mm_Pad_Via" H 1950 5900 50  0001 C CNN
-F 3 "~" H 1950 5900 50  0001 C CNN
-	1    1950 5900
+P 1750 5900
+F 0 "MH6" V 1704 6050 50  0000 L CNN
+F 1 "MountingHole_Pad" V 1795 6050 50  0000 L CNN
+F 2 "Mounting_Holes:MountingHole_2.5mm_Pad_Via" H 1750 5900 50  0001 C CNN
+F 3 "~" H 1750 5900 50  0001 C CNN
+	1    1750 5900
 	0    1    1    0   
 $EndComp
-Text Label 1850 4900 2    60   ~ 0
+Text Label 1650 4900 2    60   ~ 0
 GND
-Text Label 1850 5100 2    60   ~ 0
+Text Label 1650 5100 2    60   ~ 0
 GND
-Text Label 1850 5300 2    60   ~ 0
+Text Label 1650 5300 2    60   ~ 0
 GND
-Text Label 1850 5500 2    60   ~ 0
+Text Label 1650 5500 2    60   ~ 0
 GND
-Text Label 1850 5700 2    60   ~ 0
+Text Label 1650 5700 2    60   ~ 0
 GND
-Text Label 1850 5900 2    60   ~ 0
+Text Label 1650 5900 2    60   ~ 0
 GND
 $Comp
 L Device:R R16
 U 1 1 5BA5D464
-P 7200 2800
-F 0 "R16" V 7280 2800 50  0000 C CNN
-F 1 "560k" V 7100 2800 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 7130 2800 50  0001 C CNN
-F 3 "" H 7200 2800 50  0001 C CNN
-	1    7200 2800
+P 6900 2850
+F 0 "R16" V 6980 2850 50  0000 C CNN
+F 1 "560k" V 6800 2850 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 6830 2850 50  0001 C CNN
+F 3 "" H 6900 2850 50  0001 C CNN
+	1    6900 2850
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:R R17
 U 1 1 5BA5D560
-P 7200 3100
-F 0 "R17" V 7280 3100 50  0000 C CNN
-F 1 "180k" V 7100 3100 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 7130 3100 50  0001 C CNN
-F 3 "" H 7200 3100 50  0001 C CNN
-	1    7200 3100
+P 6900 3150
+F 0 "R17" V 6980 3150 50  0000 C CNN
+F 1 "180k" V 6800 3150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 6830 3150 50  0001 C CNN
+F 3 "" H 6900 3150 50  0001 C CNN
+	1    6900 3150
 	-1   0    0    1   
 $EndComp
-Text Label 7250 3300 0    60   ~ 0
+Text Label 6950 3350 0    60   ~ 0
 GND
 Wire Wire Line
-	7200 3250 7200 3300
+	6900 3300 6900 3350
 Wire Wire Line
-	7200 2950 6800 2950
-Connection ~ 7200 2950
-Text Label 3650 5700 2    60   ~ 0
+	6900 3000 6500 3000
+Connection ~ 6900 3000
+Text Label 3350 5750 2    60   ~ 0
 NIXIE_EN
-Text Label 5750 5500 2    60   ~ 0
+Text Label 5400 5550 2    60   ~ 0
 NIXIE_EN
 $Comp
 L Switch:SW_Push SW2
 U 1 1 5BA5FF24
-P 7700 4400
-F 0 "SW2" H 7700 4685 50  0000 C CNN
-F 1 "DFU" H 7700 4594 50  0000 C CNN
-F 2 "Custom Parts:EVQP2" H 7700 4600 50  0001 C CNN
-F 3 "" H 7700 4600 50  0001 C CNN
-	1    7700 4400
+P 7350 4450
+F 0 "SW2" H 7350 4735 50  0000 C CNN
+F 1 "DFU" H 7350 4644 50  0000 C CNN
+F 2 "Custom Parts:EVQP2" H 7350 4650 50  0001 C CNN
+F 3 "" H 7350 4650 50  0001 C CNN
+	1    7350 4450
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	7450 4750 7450 4800
+	7100 4800 7100 4850
 Wire Wire Line
-	7450 4800 7500 4800
+	7100 4850 7150 4850
 Wire Wire Line
-	7500 4400 7450 4400
+	7150 4450 7100 4450
 Wire Wire Line
-	7450 4400 7450 4450
+	7100 4450 7100 4500
 Wire Wire Line
-	7450 4400 7150 4400
-Connection ~ 7450 4400
-Text Label 7900 4400 0    60   ~ 0
+	7100 4450 6800 4450
+Connection ~ 7100 4450
+Text Label 7550 4450 0    60   ~ 0
 VDD
-Text Label 5050 3850 0    60   ~ 0
+Text Label 4750 3900 0    60   ~ 0
 GND
-NoConn ~ 5750 4500
+NoConn ~ 5400 4550
 Wire Wire Line
-	2600 1600 3000 1600
-Text Label 6800 2250 2    60   ~ 0
+	2300 1650 2700 1650
+Text Label 6500 2300 2    60   ~ 0
 GND
 Wire Wire Line
-	7200 2650 7500 2650
+	6900 2700 7200 2700
 Wire Wire Line
-	7500 2650 7500 2800
+	7200 2700 7200 2850
 Wire Wire Line
-	7500 3100 7500 3300
+	7200 3150 7200 3350
 Wire Wire Line
-	7200 3300 7500 3300
+	6900 3350 7200 3350
 Wire Wire Line
-	5000 4300 5400 4300
+	4650 4350 5050 4350
 Wire Wire Line
-	5400 4150 5400 4300
-Connection ~ 5400 4300
+	5050 4200 5050 4350
+Connection ~ 5050 4350
 Wire Wire Line
-	5400 4300 5750 4300
+	5050 4350 5400 4350
 Wire Wire Line
-	5400 3850 5000 3850
+	5100 3900 5050 3900
 Wire Wire Line
-	5000 3850 5000 4000
+	4650 3900 4650 4050
 Wire Wire Line
-	5900 3550 5900 3600
+	5600 3600 5600 3650
 Wire Wire Line
-	5900 3600 5950 3600
-Text Label 5950 3600 0    60   ~ 0
+	5600 3650 5650 3650
+Text Label 5650 3650 0    60   ~ 0
 GND
 Wire Wire Line
-	7150 5500 7650 5500
+	6800 5550 7300 5550
 Wire Wire Line
-	7650 5500 7650 5450
+	7300 5550 7300 5500
 Wire Wire Line
-	7150 5600 7950 5600
+	6800 5650 7600 5650
 Wire Wire Line
-	7950 5600 7950 5450
-Text Label 7650 5150 0    60   ~ 0
+	7600 5650 7600 5500
+Text Label 7300 5200 0    60   ~ 0
 VDD
-Text Label 7950 5150 0    60   ~ 0
+Text Label 7600 5200 0    60   ~ 0
 VDD
 Wire Wire Line
-	6850 1700 7200 1700
+	6550 1750 6900 1750
 Wire Wire Line
-	6850 1800 7300 1800
+	6550 1850 7000 1850
 Wire Wire Line
-	7300 2100 7300 2150
+	7000 2150 7000 2200
 Wire Wire Line
-	7300 2150 7350 2150
-Text Label 7350 2150 0    60   ~ 0
+	7000 2200 7050 2200
+Text Label 7050 2200 0    60   ~ 0
 VDD
 Wire Wire Line
-	3800 3350 3550 3350
+	3500 3400 3250 3400
 Wire Wire Line
-	3550 3650 3550 3700
+	3250 3700 3250 3750
 Wire Wire Line
-	3550 3700 3600 3700
-Text Label 3350 1600 0    60   ~ 0
+	3250 3750 3300 3750
+Text Label 3050 1650 0    60   ~ 0
 GND
 Wire Wire Line
-	9450 2900 9750 2900
+	9150 2850 9450 2850
 Wire Wire Line
-	9750 3200 9750 3250
+	9450 3150 9450 3200
 Wire Wire Line
-	9750 3250 9800 3250
-Text Label 5050 4700 2    60   ~ 0
+	9450 3200 9500 3200
+Text Label 4700 4750 2    60   ~ 0
 GND
 $Comp
 L Device:R R18
 U 1 1 5BAE3A6C
-P 8100 2650
-F 0 "R18" V 8180 2650 50  0000 C CNN
-F 1 "10k" V 8000 2650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 8030 2650 50  0001 C CNN
-F 3 "" H 8100 2650 50  0001 C CNN
-	1    8100 2650
+P 7800 2600
+F 0 "R18" V 7880 2600 50  0000 C CNN
+F 1 "10k" V 7700 2600 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 7730 2600 50  0001 C CNN
+F 3 "" H 7800 2600 50  0001 C CNN
+	1    7800 2600
 	-1   0    0    1   
 $EndComp
-Text Label 8550 3000 2    60   ~ 0
+Text Label 8250 2950 2    60   ~ 0
 NRST
 $Comp
 L Device:R R19
 U 1 1 5BAE5355
-P 8100 2950
-F 0 "R19" V 8180 2950 50  0000 C CNN
-F 1 "20k" V 8000 2950 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 8030 2950 50  0001 C CNN
-F 3 "" H 8100 2950 50  0001 C CNN
-	1    8100 2950
+P 7800 2900
+F 0 "R19" V 7880 2900 50  0000 C CNN
+F 1 "20k" V 7700 2900 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 7730 2900 50  0001 C CNN
+F 3 "" H 7800 2900 50  0001 C CNN
+	1    7800 2900
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	8550 2700 8250 2700
+	8250 2650 7950 2650
 Wire Wire Line
-	8250 2700 8250 2500
+	7950 2650 7950 2450
 Wire Wire Line
-	8250 2500 8100 2500
+	7950 2450 7800 2450
 Wire Wire Line
-	8550 2900 8250 2900
+	8250 2850 7950 2850
 Wire Wire Line
-	8250 2900 8250 3100
+	7950 2850 7950 3050
 Wire Wire Line
-	8250 3100 8100 3100
+	7950 3050 7800 3050
 Wire Wire Line
-	8550 2800 8100 2800
-Connection ~ 8100 2800
+	8250 2750 7800 2750
+Connection ~ 7800 2750
 $Comp
 L Custom_Parts:TUSB322 U1
 U 1 1 5BAF8A3A
-P 4250 2950
-F 0 "U1" H 4250 3275 50  0000 C CNN
-F 1 "TUSB322" H 4250 3184 50  0000 C CNN
-F 2 "Custom Parts:X2QFN-12_1.6x1.6mm_Pitch0.4mm" H 4250 2950 50  0001 C CNN
-F 3 "" H 4250 2950 50  0001 C CNN
-	1    4250 2950
+P 3950 3000
+F 0 "U1" H 3950 3325 50  0000 C CNN
+F 1 "TUSB322" H 3950 3234 50  0000 C CNN
+F 2 "Custom Parts:X2QFN-12_1.6x1.6mm_Pitch0.4mm" H 3950 3000 50  0001 C CNN
+F 3 "" H 3950 3000 50  0001 C CNN
+	1    3950 3000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3800 3050 3450 3050
-NoConn ~ 3800 3150
-Text Label 3800 3250 2    60   ~ 0
+	3500 3100 3150 3100
+NoConn ~ 3500 3200
+Text Label 3500 3300 2    60   ~ 0
 GND
-NoConn ~ 4700 3150
+NoConn ~ 4400 3200
 Wire Wire Line
-	3450 3350 3450 3400
+	3150 3400 3150 3450
 Wire Wire Line
-	3450 3400 3400 3400
-Connection ~ 7200 1700
-Text Label 5750 5700 2    60   ~ 0
+	3150 3450 3100 3450
+Connection ~ 6900 1750
+Text Label 5400 5750 2    60   ~ 0
 AMP_EN
 $Comp
 L Device:C C15
 U 1 1 5BB2A736
-P 7400 5950
-F 0 "C15" H 7285 5904 50  0000 R CNN
-F 1 "0.1uF" H 7285 5995 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 7438 5800 50  0001 C CNN
-F 3 "~" H 7400 5950 50  0001 C CNN
-	1    7400 5950
+P 7050 6000
+F 0 "C15" H 6935 5954 50  0000 R CNN
+F 1 "0.1uF" H 6935 6045 50  0000 R CNN
+F 2 "Capacitors_SMD:C_0603" H 7088 5850 50  0001 C CNN
+F 3 "~" H 7050 6000 50  0001 C CNN
+	1    7050 6000
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	7400 5800 7150 5800
+	7050 5850 6800 5850
 Wire Wire Line
-	7400 6100 7400 6150
+	7050 6150 7050 6200
 Wire Wire Line
-	7400 6150 7350 6150
-Text Label 7350 6150 2    60   ~ 0
+	7050 6200 7000 6200
+Text Label 7000 6200 2    60   ~ 0
 GND
-Text Label 5950 1700 2    60   ~ 0
+Text Label 5650 1750 2    60   ~ 0
 HV_EN
 $Comp
 L Device:R R12
 U 1 1 5BB3910C
-P 5550 1550
-F 0 "R12" V 5630 1550 50  0000 C CNN
-F 1 "20k" V 5450 1550 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5480 1550 50  0001 C CNN
-F 3 "" H 5550 1550 50  0001 C CNN
-	1    5550 1550
+P 5250 1600
+F 0 "R12" V 5330 1600 50  0000 C CNN
+F 1 "20k" V 5150 1600 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 5180 1600 50  0001 C CNN
+F 3 "" H 5250 1600 50  0001 C CNN
+	1    5250 1600
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	5950 2200 5950 2250
+	5650 2250 5650 2300
 Wire Wire Line
-	5950 2250 6000 2250
-Text Label 5550 1400 2    60   ~ 0
+	5650 2300 5700 2300
+Text Label 5250 1450 2    60   ~ 0
 GND
 Wire Wire Line
-	6850 2200 6850 2250
+	6550 2250 6550 2300
 Wire Wire Line
-	6850 2250 6800 2250
-Text Label 5100 3200 0    60   ~ 0
+	6550 2300 6500 2300
+Text Label 4800 3250 0    60   ~ 0
 GND
 Wire Wire Line
-	5050 3200 5100 3200
+	4750 3250 4800 3250
 Wire Wire Line
-	5050 3150 5050 3200
+	4750 3200 4750 3250
 Wire Wire Line
-	4700 2850 5050 2850
+	4400 2900 4750 2900
 $Comp
 L Device:C C14
 U 1 1 5BAF2024
-P 5050 3000
-F 0 "C14" H 4935 2954 50  0000 R CNN
-F 1 "0.1uF" H 4935 3045 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 5088 2850 50  0001 C CNN
-F 3 "~" H 5050 3000 50  0001 C CNN
-	1    5050 3000
+P 4750 3050
+F 0 "C14" H 4635 3004 50  0000 R CNN
+F 1 "0.1uF" H 4635 3095 50  0000 R CNN
+F 2 "Capacitors_SMD:C_0603" H 4788 2900 50  0001 C CNN
+F 3 "~" H 4750 3050 50  0001 C CNN
+	1    4750 3050
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C C16
 U 1 1 5BA9CB71
-P 10050 3900
-F 0 "C16" H 9935 3854 50  0000 R CNN
-F 1 "1uF" H 9935 3945 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 10088 3750 50  0001 C CNN
-F 3 "~" H 10050 3900 50  0001 C CNN
-	1    10050 3900
+P 9350 3850
+F 0 "C16" H 9235 3804 50  0000 R CNN
+F 1 "1uF" H 9235 3895 50  0000 R CNN
+F 2 "Capacitors_SMD:C_0603" H 9388 3700 50  0001 C CNN
+F 3 "~" H 9350 3850 50  0001 C CNN
+	1    9350 3850
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	10050 4050 10050 4100
+	9350 4000 9350 4050
 Wire Wire Line
-	10050 4100 9800 4100
-Text Label 10050 3750 0    60   ~ 0
+	9350 4050 9100 4050
+Text Label 9350 3700 0    60   ~ 0
 GND
 $Comp
 L Connector:Conn_01x01_Female J7
 U 1 1 5BA9F87B
-P 9150 5300
-F 0 "J7" H 9177 5326 50  0000 L CNN
-F 1 "HV_EN" H 9177 5235 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9150 5300 50  0001 C CNN
-F 3 "~" H 9150 5300 50  0001 C CNN
-	1    9150 5300
+P 8600 5150
+F 0 "J7" H 8627 5176 50  0000 L CNN
+F 1 "HV_EN" H 8627 5085 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 8600 5150 50  0001 C CNN
+F 3 "~" H 8600 5150 50  0001 C CNN
+	1    8600 5150
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector:Conn_01x01_Female J6
 U 1 1 5BAA5791
-P 9150 5100
-F 0 "J6" H 9177 5126 50  0000 L CNN
-F 1 "ILM" H 9177 5035 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9150 5100 50  0001 C CNN
-F 3 "~" H 9150 5100 50  0001 C CNN
-	1    9150 5100
+P 8600 4950
+F 0 "J6" H 8627 4976 50  0000 L CNN
+F 1 "ILM" H 8627 4885 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 8600 4950 50  0001 C CNN
+F 3 "~" H 8600 4950 50  0001 C CNN
+	1    8600 4950
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector:Conn_01x01_Female J13
 U 1 1 5BAB0421
-P 9950 5300
-F 0 "J13" H 9977 5326 50  0000 L CNN
-F 1 "DAC" H 9977 5235 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9950 5300 50  0001 C CNN
-F 3 "~" H 9950 5300 50  0001 C CNN
-	1    9950 5300
+P 9400 5150
+F 0 "J13" H 9427 5176 50  0000 L CNN
+F 1 "DAC" H 9427 5085 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9400 5150 50  0001 C CNN
+F 3 "~" H 9400 5150 50  0001 C CNN
+	1    9400 5150
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector:Conn_01x01_Female J14
 U 1 1 5BAB2A61
-P 9950 5500
-F 0 "J14" H 9977 5526 50  0000 L CNN
-F 1 "VDD" H 9977 5435 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9950 5500 50  0001 C CNN
-F 3 "~" H 9950 5500 50  0001 C CNN
-	1    9950 5500
+P 9400 5350
+F 0 "J14" H 9427 5376 50  0000 L CNN
+F 1 "VDD" H 9427 5285 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9400 5350 50  0001 C CNN
+F 3 "~" H 9400 5350 50  0001 C CNN
+	1    9400 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector:Conn_01x01_Female J8
 U 1 1 5BAB35ED
-P 9150 5500
-F 0 "J8" H 9177 5526 50  0000 L CNN
-F 1 "HV_OUT" H 9177 5435 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9150 5500 50  0001 C CNN
-F 3 "~" H 9150 5500 50  0001 C CNN
-	1    9150 5500
+P 8600 5350
+F 0 "J8" H 8627 5376 50  0000 L CNN
+F 1 "HV_OUT" H 8627 5285 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 8600 5350 50  0001 C CNN
+F 3 "~" H 8600 5350 50  0001 C CNN
+	1    8600 5350
 	1    0    0    -1  
 $EndComp
-Text Label 8950 5100 2    60   ~ 0
+Text Label 8400 4950 2    60   ~ 0
 ILM
 Wire Wire Line
-	7200 1700 7400 1700
+	6900 1750 7100 1750
 Wire Wire Line
-	9300 1750 9200 1750
-Text Label 8950 5300 2    60   ~ 0
+	8950 1650 8850 1650
+Text Label 8400 5150 2    60   ~ 0
 HV_EN
 Wire Wire Line
-	5550 1700 5950 1700
-Text Label 9750 5500 2    60   ~ 0
+	5250 1750 5650 1750
+Text Label 9200 5350 2    60   ~ 0
 VDD
-Text Label 9750 5300 2    60   ~ 0
+Text Label 9200 5150 2    60   ~ 0
 DAC
-Text Label 7150 5700 0    60   ~ 0
+Text Label 6800 5750 0    60   ~ 0
 MCO
-Text Label 8950 4900 2    60   ~ 0
+Text Label 8400 4750 2    60   ~ 0
 MCO
-Text Label 8950 5500 2    60   ~ 0
+Text Label 8400 5350 2    60   ~ 0
 HV_OUT
 $Comp
 L Connector:Conn_01x01_Female J11
 U 1 1 5BAC8048
-P 9950 4900
-F 0 "J11" H 9977 4926 50  0000 L CNN
-F 1 "SCL" H 9977 4835 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9950 4900 50  0001 C CNN
-F 3 "~" H 9950 4900 50  0001 C CNN
-	1    9950 4900
+P 9400 4750
+F 0 "J11" H 9427 4776 50  0000 L CNN
+F 1 "SCL" H 9427 4685 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9400 4750 50  0001 C CNN
+F 3 "~" H 9400 4750 50  0001 C CNN
+	1    9400 4750
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector:Conn_01x01_Female J12
 U 1 1 5BAC80D4
-P 9950 5100
-F 0 "J12" H 9977 5126 50  0000 L CNN
-F 1 "SDA" H 9977 5035 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9950 5100 50  0001 C CNN
-F 3 "~" H 9950 5100 50  0001 C CNN
-	1    9950 5100
+P 9400 4950
+F 0 "J12" H 9427 4976 50  0000 L CNN
+F 1 "SDA" H 9427 4885 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9400 4950 50  0001 C CNN
+F 3 "~" H 9400 4950 50  0001 C CNN
+	1    9400 4950
 	1    0    0    -1  
 $EndComp
-Text Label 9750 4900 2    60   ~ 0
+Text Label 9200 4750 2    60   ~ 0
 SCL
-Text Label 9750 5100 2    60   ~ 0
+Text Label 9200 4950 2    60   ~ 0
 SDA
 $Comp
 L Connector:Conn_01x01_Female J9
 U 1 1 5BAC83B4
-P 9150 5700
-F 0 "J9" H 9177 5726 50  0000 L CNN
-F 1 "AMP_EN" H 9177 5635 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9150 5700 50  0001 C CNN
-F 3 "~" H 9150 5700 50  0001 C CNN
-	1    9150 5700
+P 8600 5550
+F 0 "J9" H 8627 5576 50  0000 L CNN
+F 1 "AMP_EN" H 8627 5485 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 8600 5550 50  0001 C CNN
+F 3 "~" H 8600 5550 50  0001 C CNN
+	1    8600 5550
 	1    0    0    -1  
 $EndComp
-Text Label 8950 5700 2    60   ~ 0
+Text Label 8400 5550 2    60   ~ 0
 AMP_EN
 $Comp
 L Connector:Conn_01x01_Female J10
 U 1 1 5BAC8BC2
-P 9150 5900
-F 0 "J10" H 9177 5926 50  0000 L CNN
-F 1 "32kHz" H 9177 5835 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9150 5900 50  0001 C CNN
-F 3 "~" H 9150 5900 50  0001 C CNN
-	1    9150 5900
+P 8600 5750
+F 0 "J10" H 8627 5776 50  0000 L CNN
+F 1 "32kHz" H 8627 5685 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 8600 5750 50  0001 C CNN
+F 3 "~" H 8600 5750 50  0001 C CNN
+	1    8600 5750
 	1    0    0    -1  
 $EndComp
-Text Label 8950 5900 2    60   ~ 0
+Text Label 8400 5750 2    60   ~ 0
 32kHz
-Text Label 9750 5700 2    60   ~ 0
+Text Label 9200 5550 2    60   ~ 0
 VNIXIE
 $Comp
 L Connector:Conn_01x01_Female J15
 U 1 1 5BAF3226
-P 9950 5700
-F 0 "J15" H 9977 5726 50  0000 L CNN
-F 1 "VNIXIE" H 9977 5635 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9950 5700 50  0001 C CNN
-F 3 "~" H 9950 5700 50  0001 C CNN
-	1    9950 5700
+P 9400 5550
+F 0 "J15" H 9427 5576 50  0000 L CNN
+F 1 "VNIXIE" H 9427 5485 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9400 5550 50  0001 C CNN
+F 3 "~" H 9400 5550 50  0001 C CNN
+	1    9400 5550
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector:Conn_01x01_Female J16
 U 1 1 5BAD1FCF
-P 9950 5900
-F 0 "J16" H 9977 5926 50  0000 L CNN
-F 1 "VBUS" H 9977 5835 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9950 5900 50  0001 C CNN
-F 3 "~" H 9950 5900 50  0001 C CNN
-	1    9950 5900
+P 9400 5750
+F 0 "J16" H 9427 5776 50  0000 L CNN
+F 1 "VBUS" H 9427 5685 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9400 5750 50  0001 C CNN
+F 3 "~" H 9400 5750 50  0001 C CNN
+	1    9400 5750
 	1    0    0    -1  
 $EndComp
-Text Label 9750 5900 2    60   ~ 0
+Text Label 9200 5750 2    60   ~ 0
 VBUS
 $Comp
 L Device:LED D5
 U 1 1 5BADCAA0
-P 5200 4950
-F 0 "D5" H 5191 5166 50  0000 C CNN
-F 1 "LED" H 5191 5075 50  0000 C CNN
-F 2 "LEDs:LED_0603" H 5200 4950 50  0001 C CNN
-F 3 "~" H 5200 4950 50  0001 C CNN
-	1    5200 4950
+P 4850 5000
+F 0 "D5" H 4841 5216 50  0000 C CNN
+F 1 "LED" H 4841 5125 50  0000 C CNN
+F 2 "LEDs:LED_0603" H 4850 5000 50  0001 C CNN
+F 3 "~" H 4850 5000 50  0001 C CNN
+	1    4850 5000
 	0    -1   -1   0   
 $EndComp
 $Comp
 L Device:R R13
 U 1 1 5BADE6EA
-P 5200 5250
-F 0 "R13" V 5280 5250 50  0000 C CNN
-F 1 "10k" V 5100 5250 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5130 5250 50  0001 C CNN
-F 3 "" H 5200 5250 50  0001 C CNN
-	1    5200 5250
+P 4850 5300
+F 0 "R13" V 4930 5300 50  0000 C CNN
+F 1 "10k" V 4750 5300 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 4780 5300 50  0001 C CNN
+F 3 "" H 4850 5300 50  0001 C CNN
+	1    4850 5300
 	1    0    0    -1  
 $EndComp
-Text Label 5150 5450 2    60   ~ 0
+Text Label 4800 5500 2    60   ~ 0
 GND
-Text Label 5750 4800 2    60   ~ 0
+Text Label 5400 4850 2    60   ~ 0
 LED
 Wire Wire Line
-	5200 5400 5200 5450
+	4850 5450 4850 5500
 Wire Wire Line
-	5200 5450 5150 5450
+	4850 5500 4800 5500
 Wire Wire Line
-	5750 4600 5500 4600
+	5400 4650 5150 4650
 Wire Wire Line
-	5500 4600 5500 4700
+	5150 4650 5150 4750
 Wire Wire Line
-	5500 4700 5450 4700
+	5150 4750 5100 4750
 Wire Wire Line
-	5200 4800 5750 4800
+	4850 4850 5400 4850
 $Comp
 L Device:C C17
 U 1 1 5BAFD7B9
-P 5800 1450
-F 0 "C17" H 5685 1404 50  0000 R CNN
-F 1 "SLEW" H 5685 1495 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 5838 1300 50  0001 C CNN
-F 3 "~" H 5800 1450 50  0001 C CNN
-	1    5800 1450
+P 5500 1500
+F 0 "C17" H 5385 1454 50  0000 R CNN
+F 1 "SLEW" H 5385 1545 50  0000 R CNN
+F 2 "Capacitors_SMD:C_0603" H 5538 1350 50  0001 C CNN
+F 3 "~" H 5500 1500 50  0001 C CNN
+	1    5500 1500
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	5950 1600 5800 1600
-Text Label 5800 1300 2    60   ~ 0
+	5650 1650 5500 1650
+Text Label 5500 1350 2    60   ~ 0
 GND
-Text Label 9750 6100 2    60   ~ 0
+Text Label 9200 5950 2    60   ~ 0
 SWO
 $Comp
 L Connector:Conn_01x01_Female J17
 U 1 1 5BAE0437
-P 9950 6100
-F 0 "J17" H 9977 6126 50  0000 L CNN
-F 1 "SWO" H 9977 6035 50  0000 L CNN
-F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9950 6100 50  0001 C CNN
-F 3 "~" H 9950 6100 50  0001 C CNN
-	1    9950 6100
+P 9400 5950
+F 0 "J17" H 9427 5976 50  0000 L CNN
+F 1 "SWO" H 9427 5885 50  0000 L CNN
+F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 9400 5950 50  0001 C CNN
+F 3 "~" H 9400 5950 50  0001 C CNN
+	1    9400 5950
 	1    0    0    -1  
 $EndComp
+Connection ~ 5050 3900
+Wire Wire Line
+	5050 3900 4700 3900
 $EndSCHEMATC