More updates to schematic

Nixie_Bottom_Board/nixie_bottom_board-cache.lib

@@ -177,19 +177,6 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# GND
-#
-DEF GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "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
-#
 # GNDREF
 #
 DEF GNDREF #PWR 0 0 Y Y 1 F P
@@ -281,6 +268,25 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# REG_PWR_1
+#
+DEF REG_PWR_1 U 0 40 Y Y 1 F N
+F0 "U" 0 200 60 H V C CNN
+F1 "REG_PWR_1" 0 100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ to92_3
+$ENDFPLIST
+DRAW
+S -250 50 250 -250 0 1 0 N
+X VIN 1 -350 0 100 R 50 50 1 1 I
+X GND 2 0 -350 100 U 50 50 1 1 O
+X VOUT 3 350 0 100 L 50 50 1 1 O
+X GND 4 150 -350 100 U 50 50 1 1 I N
+ENDDRAW
+ENDDEF
+#
 # STM32L432K
 #
 DEF STM32L432K U 0 40 Y Y 1 F N
@@ -342,6 +348,30 @@ X 2 2 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
+# TUSB320
+#
+DEF TUSB320 U 0 40 Y Y 1 F N
+F0 "U" 0 450 60 H V C CNN
+F1 "TUSB320" 0 350 60 H V C CNN
+F2 "" 350 0 60 H I C CNN
+F3 "" 350 0 60 H I C CNN
+DRAW
+S -250 300 250 -300 0 1 0 N
+X CC1 1 -450 250 200 R 50 50 1 1 I
+X CC2 2 -450 150 200 R 50 50 1 1 I
+X PORT 3 -450 50 200 R 50 50 1 1 I
+X VBUS 4 -450 -50 200 R 50 50 1 1 I
+X ADDR 5 -450 -150 200 R 50 50 1 1 I
+X INT_N 6 -450 -250 200 R 50 50 1 1 I
+X SDA 7 450 -250 200 L 50 50 1 1 I
+X SCL 8 450 -150 200 L 50 50 1 1 I
+X ID 9 450 -50 200 L 50 50 1 1 I
+X GND 10 450 50 200 L 50 50 1 1 I
+X EN_N 11 450 150 200 L 50 50 1 1 I
+X VCC 12 450 250 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # USB_C_Receptacle
 #
 DEF USB_C_Receptacle J 0 40 Y Y 1 F N

Nixie_Bottom_Board/nixie_bottom_board.bak

@@ -50,8 +50,8 @@ $EndDescr
 $Sheet
 S 8150 3550 650  400 
 U 5B07197A
-F0 "Power Supply" 60
-F1 "power_supply.sch" 60
+F0 "HV Power Supply" 60
+F1 "hv_power_supply.sch" 60
 F2 "VIN" I L 8150 3650 60 
 F3 "EN" I L 8150 3750 60 
 F4 "GND" I L 8150 3850 60 
@@ -100,7 +100,7 @@ F 1 "C" H 3210 3970 50  0000 L CNN
 F 2 "" H 3200 4050 50  0001 C CNN
 F 3 "" H 3200 4050 50  0001 C CNN
 	1    3200 4050
-	0    1    1    0   
+	0    -1   -1   0   
 $EndComp
 $Comp
 L C_Small C?
@@ -111,7 +111,7 @@ F 1 "C" H 3210 4470 50  0000 L CNN
 F 2 "" H 3200 4550 50  0001 C CNN
 F 3 "" H 3200 4550 50  0001 C CNN
 	1    3200 4550
-	0    1    1    0   
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Conn_02x03_Odd_Even J?
@@ -137,26 +137,26 @@ SWO
 $Comp
 L Battery_Cell BT?
 U 1 1 5B07444B
-P 6950 5400
-F 0 "BT?" H 7050 5500 50  0000 L CNN
-F 1 "Battery_Cell" H 7050 5400 50  0000 L CNN
-F 2 "" V 6950 5460 50  0001 C CNN
-F 3 "" V 6950 5460 50  0001 C CNN
-	1    6950 5400
-	1    0    0    -1  
+P 7250 5150
+F 0 "BT?" H 7350 5250 50  0000 L CNN
+F 1 "BAT" H 7350 5150 50  0000 L CNN
+F 2 "" V 7250 5210 50  0001 C CNN
+F 3 "" V 7250 5210 50  0001 C CNN
+	1    7250 5150
+	0    1    1    0   
 $EndComp
 $Comp
 L D_Schottky D?
 U 1 1 5B074536
-P 7200 5100
-F 0 "D?" H 7200 5200 50  0000 C CNN
-F 1 "D_Schottky" H 7200 5000 50  0000 C CNN
-F 2 "" H 7200 5100 50  0001 C CNN
-F 3 "" H 7200 5100 50  0001 C CNN
-	1    7200 5100
+P 7600 5150
+F 0 "D?" H 7600 5250 50  0000 C CNN
+F 1 "D_Schottky" H 7600 5050 50  0000 C CNN
+F 2 "" H 7600 5150 50  0001 C CNN
+F 3 "" H 7600 5150 50  0001 C CNN
+	1    7600 5150
 	-1   0    0    1   
 $EndComp
-Text Label 7600 4750 0    60   ~ 0
+Text Label 8300 4800 0    60   ~ 0
 VDD
 Text Label 6550 3050 2    60   ~ 0
 VDD
@@ -166,74 +166,19 @@ Text Label 7250 3150 0    60   ~ 0
 SWCLK
 Text Label 6550 3150 2    60   ~ 0
 SWDIO
-Text Label 6950 4750 2    60   ~ 0
+Text Label 7350 4800 2    60   ~ 0
 VREG
 $Comp
 L D_Schottky D?
 U 1 1 5B0760A3
-P 7200 4750
-F 0 "D?" H 7200 4850 50  0000 C CNN
-F 1 "D_Schottky" H 7200 4650 50  0000 C CNN
-F 2 "" H 7200 4750 50  0001 C CNN
-F 3 "" H 7200 4750 50  0001 C CNN
-	1    7200 4750
+P 7600 4800
+F 0 "D?" H 7600 4900 50  0000 C CNN
+F 1 "D_Schottky" H 7600 4700 50  0000 C CNN
+F 2 "" H 7600 4800 50  0001 C CNN
+F 3 "" H 7600 4800 50  0001 C CNN
+	1    7600 4800
 	-1   0    0    1   
 $EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B0768D5
-P 6950 5500
-F 0 "#PWR?" H 6950 5250 50  0001 C CNN
-F 1 "GND" H 6950 5350 50  0000 C CNN
-F 2 "" H 6950 5500 50  0001 C CNN
-F 3 "" H 6950 5500 50  0001 C CNN
-	1    6950 5500
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B076941
-P 5600 4150
-F 0 "#PWR?" H 5600 3900 50  0001 C CNN
-F 1 "GND" H 5600 4000 50  0000 C CNN
-F 2 "" H 5600 4150 50  0001 C CNN
-F 3 "" H 5600 4150 50  0001 C CNN
-	1    5600 4150
-	-1   0    0    1   
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B0769A6
-P 4000 5650
-F 0 "#PWR?" H 4000 5400 50  0001 C CNN
-F 1 "GND" H 4000 5500 50  0000 C CNN
-F 2 "" H 4000 5650 50  0001 C CNN
-F 3 "" H 4000 5650 50  0001 C CNN
-	1    4000 5650
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B076D97
-P 6550 3250
-F 0 "#PWR?" H 6550 3000 50  0001 C CNN
-F 1 "GND" H 6550 3100 50  0000 C CNN
-F 2 "" H 6550 3250 50  0001 C CNN
-F 3 "" H 6550 3250 50  0001 C CNN
-	1    6550 3250
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B076E50
-P 2850 4300
-F 0 "#PWR?" H 2850 4050 50  0001 C CNN
-F 1 "GND" H 2850 4150 50  0000 C CNN
-F 2 "" H 2850 4300 50  0001 C CNN
-F 3 "" H 2850 4300 50  0001 C CNN
-	1    2850 4300
-	1    0    0    -1  
-$EndComp
 Text Label 4000 4450 2    60   ~ 0
 NRST
 Text Label 7250 3250 0    60   ~ 0
@@ -241,12 +186,12 @@ NRST
 $Comp
 L SW_Push SW?
 U 1 1 5B07874F
-P 8500 5750
-F 0 "SW?" H 8550 5850 50  0000 L CNN
-F 1 "SW_Push" H 8500 5690 50  0000 C CNN
-F 2 "" H 8500 5950 50  0001 C CNN
-F 3 "" H 8500 5950 50  0001 C CNN
-	1    8500 5750
+P 9250 5650
+F 0 "SW?" H 9300 5750 50  0000 L CNN
+F 1 "SW_Push" H 9250 5590 50  0000 C CNN
+F 2 "" H 9250 5850 50  0001 C CNN
+F 3 "" H 9250 5850 50  0001 C CNN
+	1    9250 5650
 	1    0    0    -1  
 $EndComp
 Text Label 4000 4650 2    60   ~ 0
@@ -279,81 +224,37 @@ F 3 "" H 6850 2600 50  0001 C CNN
 	1    6850 2600
 	1    0    0    -1  
 $EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B0795BC
-P 6250 2050
-F 0 "#PWR?" H 6250 1800 50  0001 C CNN
-F 1 "GND" H 6250 1900 50  0000 C CNN
-F 2 "" H 6250 2050 50  0001 C CNN
-F 3 "" H 6250 2050 50  0001 C CNN
-	1    6250 2050
-	1    0    0    -1  
-$EndComp
 Text Label 6550 2150 2    60   ~ 0
 nOE
 Text Label 7250 2050 0    60   ~ 0
 SCL
 Text Label 7250 2150 0    60   ~ 0
 SDA
-$Comp
-L GND #PWR?
-U 1 1 5B07972F
-P 7300 1950
-F 0 "#PWR?" H 7300 1700 50  0001 C CNN
-F 1 "GND" H 7300 1800 50  0000 C CNN
-F 2 "" H 7300 1950 50  0001 C CNN
-F 3 "" H 7300 1950 50  0001 C CNN
-	1    7300 1950
-	-1   0    0    1   
-$EndComp
 Text Label 6550 2500 2    60   ~ 0
 HV
 Text Label 6550 2600 2    60   ~ 0
 HV
 Text Label 6550 2700 2    60   ~ 0
 HV
-$Comp
-L GND #PWR?
-U 1 1 5B079C27
-P 7250 2700
-F 0 "#PWR?" H 7250 2450 50  0001 C CNN
-F 1 "GND" H 7250 2550 50  0000 C CNN
-F 2 "" H 7250 2700 50  0001 C CNN
-F 3 "" H 7250 2700 50  0001 C CNN
-	1    7250 2700
-	1    0    0    -1  
-$EndComp
 Text Label 6550 1950 2    60   ~ 0
 DAC
 Text Label 5600 4650 0    60   ~ 0
-TSC_G2_1
+TSC_1
 Text Label 5600 4550 0    60   ~ 0
-TSC_G2_2
+TSC_2
 Text Label 5600 4450 0    60   ~ 0
-TSC_G2_3
+TSC_3
 Text Label 5600 4350 0    60   ~ 0
-TSC_G2_4
+TSC_4
 $Comp
 L C_Small C?
 U 1 1 5B07ACF8
-P 6250 4350
-F 0 "C?" H 6260 4420 50  0000 L CNN
-F 1 "C_Small" H 6260 4270 50  0000 L CNN
-F 2 "" H 6250 4350 50  0001 C CNN
-F 3 "" H 6250 4350 50  0001 C CNN
-	1    6250 4350
-	0    -1   -1   0   
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B07ADE8
-P 6350 4350
-F 0 "#PWR?" H 6350 4100 50  0001 C CNN
-F 1 "GND" H 6350 4200 50  0000 C CNN
-F 2 "" H 6350 4350 50  0001 C CNN
-F 3 "" H 6350 4350 50  0001 C CNN
-	1    6350 4350
+P 8550 1900
+F 0 "C?" H 8560 1970 50  0000 L CNN
+F 1 "C_Small" H 8560 1820 50  0000 L CNN
+F 2 "" H 8550 1900 50  0001 C CNN
+F 3 "" H 8550 1900 50  0001 C CNN
+	1    8550 1900
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -390,17 +291,17 @@ F 3 "" H 8900 2800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Text Label 8300 2800 2    60   ~ 0
-TSC_G2_1
+TSC_1
 Text Label 8300 2500 2    60   ~ 0
-TSC_G2_2
+TSC_2
 Text Label 8300 2200 2    60   ~ 0
-TSC_G2_3
+TSC_3
 $Comp
 L R R?
 U 1 1 5B07B730
 P 8550 2200
 F 0 "R?" V 8630 2200 50  0000 C CNN
-F 1 "R" V 8550 2200 50  0000 C CNN
+F 1 "1k" V 8550 2200 50  0000 C CNN
 F 2 "" V 8480 2200 50  0001 C CNN
 F 3 "" H 8550 2200 50  0001 C CNN
 	1    8550 2200
@@ -411,7 +312,7 @@ L R R?
 U 1 1 5B07B7AC
 P 8550 2500
 F 0 "R?" V 8630 2500 50  0000 C CNN
-F 1 "R" V 8550 2500 50  0000 C CNN
+F 1 "1k" V 8550 2500 50  0000 C CNN
 F 2 "" V 8480 2500 50  0001 C CNN
 F 3 "" H 8550 2500 50  0001 C CNN
 	1    8550 2500
@@ -422,7 +323,7 @@ L R R?
 U 1 1 5B07B818
 P 8550 2800
 F 0 "R?" V 8630 2800 50  0000 C CNN
-F 1 "R" V 8550 2800 50  0000 C CNN
+F 1 "1k" V 8550 2800 50  0000 C CNN
 F 2 "" V 8480 2800 50  0001 C CNN
 F 3 "" H 8550 2800 50  0001 C CNN
 	1    8550 2800
@@ -430,196 +331,256 @@ F 3 "" H 8550 2800 50  0001 C CNN
 $EndComp
 Text Label 5600 5550 0    60   ~ 0
 MCO
-Text Label 8600 1900 2    60   ~ 0
+Text Label 8600 3100 2    60   ~ 0
 MCO
 $Comp
 L Conn_01x01 J?
 U 1 1 5B07BCB9
-P 8900 1900
-F 0 "J?" H 8900 2000 50  0000 C CNN
-F 1 "Conn_01x01" H 8900 1800 50  0000 C CNN
-F 2 "" H 8900 1900 50  0001 C CNN
-F 3 "" H 8900 1900 50  0001 C CNN
-	1    8900 1900
+P 8900 3100
+F 0 "J?" H 8900 3200 50  0000 C CNN
+F 1 "Conn_01x01" H 8900 3000 50  0000 C CNN
+F 2 "" H 8900 3100 50  0001 C CNN
+F 3 "" H 8900 3100 50  0001 C CNN
+	1    8900 3100
 	1    0    0    -1  
 $EndComp
 Text Label 4000 5150 2    60   ~ 0
 DAC
-Text Label 4000 4850 2    60   ~ 0
+Text Label 3650 4850 2    60   ~ 0
 QSPI_CS
-Text Label 4000 4950 2    60   ~ 0
+Text Label 3650 4950 2    60   ~ 0
 QSPI_CLK
-Text Label 4000 5250 2    60   ~ 0
+Text Label 3650 5250 2    60   ~ 0
 QSPI_IO3
-Text Label 4000 5350 2    60   ~ 0
+Text Label 3650 5350 2    60   ~ 0
 QSPI_IO2
-Text Label 4000 5550 2    60   ~ 0
+Text Label 3650 5550 2    60   ~ 0
 QSPI_IO0
-Text Label 4000 5450 2    60   ~ 0
+Text Label 3650 5450 2    60   ~ 0
 QSPI_IO1
-Text Label 6150 4950 0    60   ~ 0
+Text Label 6250 4950 0    60   ~ 0
 SAI_FS
-Text Label 6150 5050 0    60   ~ 0
+Text Label 6250 5050 0    60   ~ 0
 SAI_SD
 Text Label 5600 5450 0    60   ~ 0
 SCL
 Text Label 5600 5350 0    60   ~ 0
 SDA
-Text Label 6150 4650 0    60   ~ 0
+Text Label 6250 4650 0    60   ~ 0
 SAI_MCLK
 Text Label 5600 4850 0    60   ~ 0
-SW_3
+nOE
 Text Label 4000 4750 2    60   ~ 0
 SW_1
 Text Label 4000 5050 2    60   ~ 0
 SW_2
-Text Label 6150 5550 0    60   ~ 0
+Text Label 6250 5550 0    60   ~ 0
 SAI_SCK
 $Comp
 L SW_Push SW?
 U 1 1 5B07F81C
-P 8500 4850
-F 0 "SW?" H 8550 4950 50  0000 L CNN
-F 1 "SW_Push" H 8500 4790 50  0000 C CNN
-F 2 "" H 8500 5050 50  0001 C CNN
-F 3 "" H 8500 5050 50  0001 C CNN
-	1    8500 4850
+P 9250 4750
+F 0 "SW?" H 9300 4850 50  0000 L CNN
+F 1 "SW_Push" H 9250 4690 50  0000 C CNN
+F 2 "" H 9250 4950 50  0001 C CNN
+F 3 "" H 9250 4950 50  0001 C CNN
+	1    9250 4750
 	1    0    0    -1  
 $EndComp
-Text Label 8200 4850 2    60   ~ 0
+Text Label 8950 4750 2    60   ~ 0
 SW_1
-Text Label 8200 5150 2    60   ~ 0
+Text Label 8950 5050 2    60   ~ 0
 SW_2
 $Comp
 L SW_Push SW?
 U 1 1 5B07F979
-P 8500 5150
-F 0 "SW?" H 8550 5250 50  0000 L CNN
-F 1 "SW_Push" H 8500 5090 50  0000 C CNN
-F 2 "" H 8500 5350 50  0001 C CNN
-F 3 "" H 8500 5350 50  0001 C CNN
-	1    8500 5150
+P 9250 5050
+F 0 "SW?" H 9300 5150 50  0000 L CNN
+F 1 "SW_Push" H 9250 4990 50  0000 C CNN
+F 2 "" H 9250 5250 50  0001 C CNN
+F 3 "" H 9250 5250 50  0001 C CNN
+	1    9250 5050
 	1    0    0    -1  
 $EndComp
 $Comp
 L SW_Push SW?
 U 1 1 5B07F9F1
-P 8500 5450
-F 0 "SW?" H 8550 5550 50  0000 L CNN
-F 1 "SW_Push" H 8500 5390 50  0000 C CNN
-F 2 "" H 8500 5650 50  0001 C CNN
-F 3 "" H 8500 5650 50  0001 C CNN
-	1    8500 5450
+P 9250 5350
+F 0 "SW?" H 9300 5450 50  0000 L CNN
+F 1 "SW_Push" H 9250 5290 50  0000 C CNN
+F 2 "" H 9250 5550 50  0001 C CNN
+F 3 "" H 9250 5550 50  0001 C CNN
+	1    9250 5350
 	1    0    0    -1  
 $EndComp
-Text Label 8200 5450 2    60   ~ 0
+Text Label 8950 5350 2    60   ~ 0
 SW_3
+Text Label 8950 5650 2    60   ~ 0
+NRST
+Text Label 8050 3750 2    60   ~ 0
+HV_EN
+Text Label 8300 1900 2    60   ~ 0
+TSC_4
 $Comp
-L GND #PWR?
-U 1 1 5B07FACF
-P 8850 4850
-F 0 "#PWR?" H 8850 4600 50  0001 C CNN
-F 1 "GND" H 8850 4700 50  0000 C CNN
-F 2 "" H 8850 4850 50  0001 C CNN
-F 3 "" H 8850 4850 50  0001 C CNN
-	1    8850 4850
-	1    0    0    -1  
+L R R?
+U 1 1 5B08854F
+P 6150 4250
+F 0 "R?" V 6230 4250 50  0000 C CNN
+F 1 "R" V 6150 4250 50  0000 C CNN
+F 2 "" V 6080 4250 50  0001 C CNN
+F 3 "" H 6150 4250 50  0001 C CNN
+	1    6150 4250
+	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR?
-U 1 1 5B07FB3D
-P 8850 5150
-F 0 "#PWR?" H 8850 4900 50  0001 C CNN
-F 1 "GND" H 8850 5000 50  0000 C CNN
-F 2 "" H 8850 5150 50  0001 C CNN
-F 3 "" H 8850 5150 50  0001 C CNN
-	1    8850 5150
+L REG_PWR_1 U?
+U 1 1 5B088AD3
+P 4950 2950
+F 0 "U?" H 4950 3150 60  0000 C CNN
+F 1 "REG_PWR_1" H 4950 3050 60  0000 C CNN
+F 2 "" H 4950 2950 60  0000 C CNN
+F 3 "" H 4950 2950 60  0000 C CNN
+	1    4950 2950
 	1    0    0    -1  
 $EndComp
+Text Label 5400 2950 0    60   ~ 0
+VREG
+Text Label 8050 3650 2    60   ~ 0
+VIN
+Text Label 8900 3650 0    60   ~ 0
+HV
+Text Notes 3200 5700 0    60   ~ 0
+Rev. B
+Text Notes 6200 5700 0    60   ~ 0
+Rev. B
+Text Label 5600 4250 0    60   ~ 0
+HV_EN
+Text Label 5000 3350 0    60   ~ 0
+GND
+Text Label 6550 2050 2    60   ~ 0
+GND
+Text Label 7250 1950 0    60   ~ 0
+GND
+Text Label 8750 1900 0    60   ~ 0
+GND
+Text Label 8900 3750 0    60   ~ 0
+GND
+Text Label 8050 3850 2    60   ~ 0
+GND
+Text Label 6400 4250 0    60   ~ 0
+GND
+Text Label 7250 2500 0    60   ~ 0
+GND
+Text Label 7250 2600 0    60   ~ 0
+GND
+Text Label 7250 2700 0    60   ~ 0
+GND
+Text Label 6550 3250 2    60   ~ 0
+GND
+Text Label 7150 5150 2    60   ~ 0
+GND
+Text Label 9550 4750 0    60   ~ 0
+GND
+Text Label 9550 5050 0    60   ~ 0
+GND
+Text Label 9550 5350 0    60   ~ 0
+GND
+Text Label 9550 5650 0    60   ~ 0
+GND
+Text Label 5600 4150 0    60   ~ 0
+GND
+Text Label 4000 5650 2    60   ~ 0
+GND
+Text Label 3000 4050 2    60   ~ 0
+GND
+Text Label 3000 4550 2    60   ~ 0
+GND
+Text Label 5900 4750 0    60   ~ 0
+SW_3
 $Comp
-L GND #PWR?
-U 1 1 5B07FBAB
-P 8850 5450
-F 0 "#PWR?" H 8850 5200 50  0001 C CNN
-F 1 "GND" H 8850 5300 50  0000 C CNN
-F 2 "" H 8850 5450 50  0001 C CNN
-F 3 "" H 8850 5450 50  0001 C CNN
-	1    8850 5450
+L C_Small C?
+U 1 1 5B092C6C
+P 8000 5000
+F 0 "C?" H 8010 5070 50  0000 L CNN
+F 1 "C" H 8010 4920 50  0000 L CNN
+F 2 "" H 8000 5000 50  0001 C CNN
+F 3 "" H 8000 5000 50  0001 C CNN
+	1    8000 5000
 	1    0    0    -1  
 $EndComp
+Text Label 8300 5250 0    60   ~ 0
+GND
 $Comp
-L GND #PWR?
-U 1 1 5B080101
-P 8850 5750
-F 0 "#PWR?" H 8850 5500 50  0001 C CNN
-F 1 "GND" H 8850 5600 50  0000 C CNN
-F 2 "" H 8850 5750 50  0001 C CNN
-F 3 "" H 8850 5750 50  0001 C CNN
-	1    8850 5750
+L C_Small C?
+U 1 1 5B0934DB
+P 8200 5000
+F 0 "C?" H 8210 5070 50  0000 L CNN
+F 1 "C" H 8210 4920 50  0000 L CNN
+F 2 "" H 8200 5000 50  0001 C CNN
+F 3 "" H 8200 5000 50  0001 C CNN
+	1    8200 5000
 	1    0    0    -1  
 $EndComp
-Text Label 8200 5750 2    60   ~ 0
-NRST
+Text Label 1600 4600 3    60   ~ 0
+GND
 Wire Wire Line
-	3650 4250 3650 4050
+	3650 4050 3650 4250
 Wire Wire Line
-	4100 4250 3650 4250
+	3650 4250 4100 4250
 Wire Wire Line
-	3650 4350 3650 4550
+	3650 4550 3650 4350
 Wire Wire Line
-	4100 4350 3650 4350
+	3650 4350 4100 4350
 Wire Wire Line
-	3650 4550 3300 4550
+	3300 4550 3650 4550
 Wire Wire Line
-	3650 4050 3300 4050
+	3300 4050 3650 4050
 Wire Wire Line
 	4000 4450 4100 4450
 Wire Wire Line
-	8700 5750 8850 5750
+	9450 5650 9550 5650
 Wire Wire Line
-	8200 5750 8300 5750
+	8950 5650 9050 5650
 Wire Wire Line
-	8200 5450 8300 5450
+	8950 5350 9050 5350
 Wire Wire Line
-	8200 5150 8300 5150
+	8950 5050 9050 5050
 Wire Wire Line
-	8200 4850 8300 4850
+	8950 4750 9050 4750
 Wire Wire Line
-	8850 4850 8700 4850
+	9450 4750 9550 4750
 Wire Wire Line
-	8850 5150 8700 5150
+	9450 5050 9550 5050
 Wire Wire Line
-	8850 5450 8700 5450
+	9450 5350 9550 5350
 Wire Wire Line
-	5600 4750 5500 4750
+	5500 4750 5900 4750
 Wire Wire Line
 	5500 4850 5600 4850
 Wire Wire Line
 	4000 4750 4100 4750
 Wire Wire Line
-	5500 5050 6150 5050
-Wire Wire Line
-	5500 4350 6150 4350
+	5500 5050 6250 5050
 Wire Wire Line
-	4000 5550 4100 5550
+	3650 5550 4100 5550
 Wire Wire Line
-	4000 5450 4100 5450
+	3650 5450 4100 5450
 Wire Wire Line
-	4000 5350 4100 5350
+	3650 5350 4100 5350
 Wire Wire Line
-	4000 5250 4100 5250
+	3650 5250 4100 5250
 Wire Wire Line
-	4000 4950 4100 4950
+	3650 4950 4100 4950
 Wire Wire Line
-	4000 4850 4100 4850
+	3650 4850 4100 4850
 Wire Wire Line
 	4000 4650 4100 4650
 Wire Wire Line
 	4000 5150 4100 5150
 Wire Wire Line
-	8600 1900 8700 1900
+	8600 3100 8700 3100
 Wire Wire Line
-	5500 5550 6150 5550
+	5500 5550 6250 5550
 Wire Wire Line
 	8300 2800 8400 2800
 Wire Wire Line
@@ -627,36 +588,25 @@ Wire Wire Line
 Wire Wire Line
 	8300 2200 8400 2200
 Wire Wire Line
-	5500 4650 6150 4650
+	5500 4650 6250 4650
 Wire Wire Line
 	5600 4550 5500 4550
 Wire Wire Line
 	5600 5450 5500 5450
 Wire Wire Line
 	5600 5350 5500 5350
-Wire Wire Line
-	7150 2700 7250 2700
-Connection ~ 7150 2600
-Wire Wire Line
-	7150 2500 7150 2700
 Wire Wire Line
 	6550 2700 6650 2700
 Wire Wire Line
 	6650 2600 6550 2600
 Wire Wire Line
 	6550 2500 6650 2500
-Wire Wire Line
-	6550 2150 6650 2150
 Wire Wire Line
 	6550 1950 6650 1950
 Wire Wire Line
 	7250 2150 7150 2150
 Wire Wire Line
 	7250 2050 7150 2050
-Wire Wire Line
-	7300 1950 7150 1950
-Wire Wire Line
-	6250 2050 6650 2050
 Wire Wire Line
 	4000 4550 4100 4550
 Wire Wire Line
@@ -667,26 +617,16 @@ Wire Wire Line
 	5600 5250 5500 5250
 Wire Wire Line
 	5500 5150 5600 5150
-Connection ~ 5600 4150
 Wire Wire Line
-	5600 4250 5600 4150
-Wire Wire Line
-	5500 4250 5600 4250
+	5500 4250 6000 4250
 Wire Wire Line
 	7150 3250 7250 3250
 Wire Wire Line
 	7250 3050 7150 3050
 Wire Wire Line
 	6650 3250 6550 3250
-Connection ~ 3000 4300
-Wire Wire Line
-	3000 4550 3000 4050
 Wire Wire Line
-	6950 5100 6950 5200
-Wire Wire Line
-	7050 5100 6950 5100
-Wire Wire Line
-	7500 5100 7350 5100
+	7850 5150 7750 5150
 Connection ~ 3400 4050
 Connection ~ 3400 4550
 Wire Wire Line
@@ -698,9 +638,7 @@ Wire Wire Line
 Wire Wire Line
 	3000 4050 3100 4050
 Wire Wire Line
-	5600 4150 5500 4150
-Wire Wire Line
-	5500 4950 6150 4950
+	5500 4950 6250 4950
 Wire Wire Line
 	5500 5650 5600 5650
 Wire Wire Line
@@ -708,18 +646,207 @@ Wire Wire Line
 Wire Wire Line
 	4000 4150 4100 4150
 Wire Wire Line
-	7050 4750 6950 4750
+	7450 4800 7350 4800
 Wire Wire Line
 	7150 3150 7250 3150
 Wire Wire Line
 	6650 3150 6550 3150
 Wire Wire Line
 	6550 3050 6650 3050
-Connection ~ 7500 4750
+Connection ~ 7850 4800
+Wire Wire Line
+	7850 4800 7850 5150
+Wire Wire Line
+	7750 4800 8300 4800
+Wire Wire Line
+	8650 1900 8750 1900
+Wire Wire Line
+	8450 1900 8300 1900
+Wire Wire Line
+	5600 4350 5500 4350
+Wire Wire Line
+	8150 3850 8050 3850
+Wire Wire Line
+	5400 2950 5300 2950
+Wire Wire Line
+	4500 2950 4600 2950
+Wire Wire Line
+	8050 3650 8150 3650
+Wire Wire Line
+	8900 3650 8800 3650
+Wire Wire Line
+	8900 3750 8800 3750
+Wire Notes Line
+	3700 4700 3700 5600
+Wire Notes Line
+	3700 5600 3200 5600
+Wire Notes Line
+	3200 5600 3200 4700
+Wire Notes Line
+	3200 4700 3700 4700
+Wire Notes Line
+	6200 4500 6700 4500
+Wire Notes Line
+	6700 4500 6700 5600
+Wire Notes Line
+	6700 5600 6200 5600
+Wire Notes Line
+	6200 5600 6200 4500
+Wire Wire Line
+	6550 2150 6650 2150
+Wire Wire Line
+	7250 1950 7150 1950
+Wire Wire Line
+	6650 2050 6550 2050
+Wire Wire Line
+	8050 3750 8150 3750
+Wire Wire Line
+	6300 4250 6400 4250
+Wire Wire Line
+	7150 2500 7250 2500
+Wire Wire Line
+	7250 2600 7150 2600
+Wire Wire Line
+	7150 2700 7250 2700
+Wire Wire Line
+	5600 4150 5500 4150
+Wire Wire Line
+	4950 3300 4950 3350
+Wire Wire Line
+	4950 3350 5000 3350
+Wire Wire Line
+	8000 4900 8000 4800
+Connection ~ 8000 4800
+Wire Wire Line
+	8000 5100 8000 5250
+Wire Wire Line
+	8000 5250 8300 5250
+Wire Wire Line
+	8200 4900 8200 4800
+Connection ~ 8200 4800
+Wire Wire Line
+	8200 5100 8200 5250
+Connection ~ 8200 5250
+Text Label 2600 1700 0    60   ~ 0
+VBUS
+Wire Wire Line
+	2600 1700 2500 1700
+Text Label 2600 1800 0    60   ~ 0
+VBUS
+Text Label 2600 1900 0    60   ~ 0
+VBUS
+Text Label 2600 2000 0    60   ~ 0
+VBUS
+Wire Wire Line
+	2600 1800 2500 1800
+Wire Wire Line
+	2500 1900 2600 1900
+Wire Wire Line
+	2600 2000 2500 2000
+Text Label 2600 2200 0    60   ~ 0
+CC1
+Wire Wire Line
+	2600 2200 2500 2200
+Text Label 2600 2300 0    60   ~ 0
+CC2
+Wire Wire Line
+	2600 2300 2500 2300
+Text Label 2600 2500 0    60   ~ 0
+USB_DM
+Wire Wire Line
+	2600 2500 2500 2500
+Text Label 2600 2700 0    60   ~ 0
+USB_DP
+Wire Wire Line
+	2600 2700 2500 2700
+Wire Wire Line
+	2500 2700 2500 2800
+Wire Wire Line
+	2500 2500 2500 2600
+NoConn ~ 2500 3000
+NoConn ~ 2500 3100
+NoConn ~ 2500 3300
+NoConn ~ 2500 3400
+NoConn ~ 2500 3600
+NoConn ~ 2500 3700
+NoConn ~ 2500 3900
+NoConn ~ 2500 4000
+NoConn ~ 2500 4200
+NoConn ~ 2500 4300
+Text Label 1700 4600 3    60   ~ 0
+GND
+Text Label 1800 4600 3    60   ~ 0
+GND
+Text Label 1900 4600 3    60   ~ 0
+GND
+Text Label 2000 4600 3    60   ~ 0
+GND
+$Comp
+L TUSB320 U?
+U 1 1 5B095CC9
+P 4350 2200
+F 0 "U?" H 4350 2650 60  0000 C CNN
+F 1 "TUSB320" H 4350 2550 60  0000 C CNN
+F 2 "" H 4700 2200 60  0001 C CNN
+F 3 "" H 4700 2200 60  0001 C CNN
+	1    4350 2200
+	1    0    0    -1  
+$EndComp
+Text Label 3800 1950 2    60   ~ 0
+CC1
+Text Label 3800 2050 2    60   ~ 0
+CC2
+$Comp
+L R R?
+U 1 1 5B096154
+P 3500 2250
+F 0 "R?" V 3580 2250 50  0000 C CNN
+F 1 "900k" V 3500 2250 50  0000 C CNN
+F 2 "" V 3430 2250 50  0001 C CNN
+F 3 "" H 3500 2250 50  0001 C CNN
+	1    3500 2250
+	0    -1   -1   0   
+$EndComp
+Text Label 3250 2250 2    60   ~ 0
+VBUS
+Wire Wire Line
+	3250 2250 3350 2250
+Text Label 4500 2950 2    60   ~ 0
+VBUS
+Wire Wire Line
+	3650 2250 3900 2250
+Text Label 3800 2150 2    60   ~ 0
+GND
+Text Label 3800 2350 2    60   ~ 0
+GND
+Text Label 4900 2350 0    60   ~ 0
+SCL
+Text Label 4900 2450 0    60   ~ 0
+SDA
+Text Label 4900 2150 0    60   ~ 0
+GND
+Text Label 4900 2050 0    60   ~ 0
+GND
+Text Label 4900 1950 0    60   ~ 0
+VREG
+NoConn ~ 4800 2250
+NoConn ~ 3900 2450
+Wire Wire Line
+	3800 1950 3900 1950
+Wire Wire Line
+	3900 2050 3800 2050
+Wire Wire Line
+	3800 2150 3900 2150
+Wire Wire Line
+	3800 2350 3900 2350
+Wire Wire Line
+	4800 1950 4900 1950
+Wire Wire Line
+	4900 2050 4800 2050
 Wire Wire Line
-	7500 4750 7500 5100
+	4800 2150 4900 2150
 Wire Wire Line
-	7350 4750 7600 4750
+	4900 2350 4800 2350
 Wire Wire Line
-	2850 4300 3000 4300
+	4800 2450 4900 2450
 $EndSCHEMATC

Nixie_Bottom_Board/nixie_bottom_board.sch

@@ -100,7 +100,7 @@ F 1 "C" H 3210 3970 50  0000 L CNN
 F 2 "" H 3200 4050 50  0001 C CNN
 F 3 "" H 3200 4050 50  0001 C CNN
 	1    3200 4050
-	0    1    1    0   
+	0    -1   -1   0   
 $EndComp
 $Comp
 L C_Small C?
@@ -111,7 +111,7 @@ F 1 "C" H 3210 4470 50  0000 L CNN
 F 2 "" H 3200 4550 50  0001 C CNN
 F 3 "" H 3200 4550 50  0001 C CNN
 	1    3200 4550
-	0    1    1    0   
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Conn_02x03_Odd_Even J?
@@ -137,26 +137,26 @@ SWO
 $Comp
 L Battery_Cell BT?
 U 1 1 5B07444B
-P 6950 5400
-F 0 "BT?" H 7050 5500 50  0000 L CNN
-F 1 "Battery_Cell" H 7050 5400 50  0000 L CNN
-F 2 "" V 6950 5460 50  0001 C CNN
-F 3 "" V 6950 5460 50  0001 C CNN
-	1    6950 5400
-	1    0    0    -1  
+P 7250 5150
+F 0 "BT?" H 7350 5250 50  0000 L CNN
+F 1 "BAT" H 7350 5150 50  0000 L CNN
+F 2 "" V 7250 5210 50  0001 C CNN
+F 3 "" V 7250 5210 50  0001 C CNN
+	1    7250 5150
+	0    1    1    0   
 $EndComp
 $Comp
 L D_Schottky D?
 U 1 1 5B074536
-P 7200 5100
-F 0 "D?" H 7200 5200 50  0000 C CNN
-F 1 "D_Schottky" H 7200 5000 50  0000 C CNN
-F 2 "" H 7200 5100 50  0001 C CNN
-F 3 "" H 7200 5100 50  0001 C CNN
-	1    7200 5100
+P 7600 5150
+F 0 "D?" H 7600 5250 50  0000 C CNN
+F 1 "D_Schottky" H 7600 5050 50  0000 C CNN
+F 2 "" H 7600 5150 50  0001 C CNN
+F 3 "" H 7600 5150 50  0001 C CNN
+	1    7600 5150
 	-1   0    0    1   
 $EndComp
-Text Label 7600 4750 0    60   ~ 0
+Text Label 8300 4800 0    60   ~ 0
 VDD
 Text Label 6550 3050 2    60   ~ 0
 VDD
@@ -166,74 +166,19 @@ Text Label 7250 3150 0    60   ~ 0
 SWCLK
 Text Label 6550 3150 2    60   ~ 0
 SWDIO
-Text Label 6950 4750 2    60   ~ 0
+Text Label 7350 4800 2    60   ~ 0
 VREG
 $Comp
 L D_Schottky D?
 U 1 1 5B0760A3
-P 7200 4750
-F 0 "D?" H 7200 4850 50  0000 C CNN
-F 1 "D_Schottky" H 7200 4650 50  0000 C CNN
-F 2 "" H 7200 4750 50  0001 C CNN
-F 3 "" H 7200 4750 50  0001 C CNN
-	1    7200 4750
+P 7600 4800
+F 0 "D?" H 7600 4900 50  0000 C CNN
+F 1 "D_Schottky" H 7600 4700 50  0000 C CNN
+F 2 "" H 7600 4800 50  0001 C CNN
+F 3 "" H 7600 4800 50  0001 C CNN
+	1    7600 4800
 	-1   0    0    1   
 $EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B0768D5
-P 6950 5500
-F 0 "#PWR?" H 6950 5250 50  0001 C CNN
-F 1 "GND" H 6950 5350 50  0000 C CNN
-F 2 "" H 6950 5500 50  0001 C CNN
-F 3 "" H 6950 5500 50  0001 C CNN
-	1    6950 5500
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B076941
-P 5600 4150
-F 0 "#PWR?" H 5600 3900 50  0001 C CNN
-F 1 "GND" H 5600 4000 50  0000 C CNN
-F 2 "" H 5600 4150 50  0001 C CNN
-F 3 "" H 5600 4150 50  0001 C CNN
-	1    5600 4150
-	-1   0    0    1   
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B0769A6
-P 4000 5650
-F 0 "#PWR?" H 4000 5400 50  0001 C CNN
-F 1 "GND" H 4000 5500 50  0000 C CNN
-F 2 "" H 4000 5650 50  0001 C CNN
-F 3 "" H 4000 5650 50  0001 C CNN
-	1    4000 5650
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B076D97
-P 6550 3250
-F 0 "#PWR?" H 6550 3000 50  0001 C CNN
-F 1 "GND" H 6550 3100 50  0000 C CNN
-F 2 "" H 6550 3250 50  0001 C CNN
-F 3 "" H 6550 3250 50  0001 C CNN
-	1    6550 3250
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B076E50
-P 2850 4300
-F 0 "#PWR?" H 2850 4050 50  0001 C CNN
-F 1 "GND" H 2850 4150 50  0000 C CNN
-F 2 "" H 2850 4300 50  0001 C CNN
-F 3 "" H 2850 4300 50  0001 C CNN
-	1    2850 4300
-	1    0    0    -1  
-$EndComp
 Text Label 4000 4450 2    60   ~ 0
 NRST
 Text Label 7250 3250 0    60   ~ 0
@@ -241,12 +186,12 @@ NRST
 $Comp
 L SW_Push SW?
 U 1 1 5B07874F
-P 8500 5750
-F 0 "SW?" H 8550 5850 50  0000 L CNN
-F 1 "SW_Push" H 8500 5690 50  0000 C CNN
-F 2 "" H 8500 5950 50  0001 C CNN
-F 3 "" H 8500 5950 50  0001 C CNN
-	1    8500 5750
+P 9250 5650
+F 0 "SW?" H 9300 5750 50  0000 L CNN
+F 1 "SW_Push" H 9250 5590 50  0000 C CNN
+F 2 "" H 9250 5850 50  0001 C CNN
+F 3 "" H 9250 5850 50  0001 C CNN
+	1    9250 5650
 	1    0    0    -1  
 $EndComp
 Text Label 4000 4650 2    60   ~ 0
@@ -279,81 +224,37 @@ F 3 "" H 6850 2600 50  0001 C CNN
 	1    6850 2600
 	1    0    0    -1  
 $EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B0795BC
-P 6250 2050
-F 0 "#PWR?" H 6250 1800 50  0001 C CNN
-F 1 "GND" H 6250 1900 50  0000 C CNN
-F 2 "" H 6250 2050 50  0001 C CNN
-F 3 "" H 6250 2050 50  0001 C CNN
-	1    6250 2050
-	1    0    0    -1  
-$EndComp
 Text Label 6550 2150 2    60   ~ 0
 nOE
 Text Label 7250 2050 0    60   ~ 0
 SCL
 Text Label 7250 2150 0    60   ~ 0
 SDA
-$Comp
-L GND #PWR?
-U 1 1 5B07972F
-P 7300 1950
-F 0 "#PWR?" H 7300 1700 50  0001 C CNN
-F 1 "GND" H 7300 1800 50  0000 C CNN
-F 2 "" H 7300 1950 50  0001 C CNN
-F 3 "" H 7300 1950 50  0001 C CNN
-	1    7300 1950
-	-1   0    0    1   
-$EndComp
 Text Label 6550 2500 2    60   ~ 0
 HV
 Text Label 6550 2600 2    60   ~ 0
 HV
 Text Label 6550 2700 2    60   ~ 0
 HV
-$Comp
-L GND #PWR?
-U 1 1 5B079C27
-P 7250 2700
-F 0 "#PWR?" H 7250 2450 50  0001 C CNN
-F 1 "GND" H 7250 2550 50  0000 C CNN
-F 2 "" H 7250 2700 50  0001 C CNN
-F 3 "" H 7250 2700 50  0001 C CNN
-	1    7250 2700
-	1    0    0    -1  
-$EndComp
 Text Label 6550 1950 2    60   ~ 0
 DAC
 Text Label 5600 4650 0    60   ~ 0
-TSC_G2_1
+TSC_1
 Text Label 5600 4550 0    60   ~ 0
-TSC_G2_2
+TSC_2
 Text Label 5600 4450 0    60   ~ 0
-TSC_G2_3
+TSC_3
 Text Label 5600 4350 0    60   ~ 0
-TSC_G2_4
+TSC_4
 $Comp
 L C_Small C?
 U 1 1 5B07ACF8
-P 6250 4350
-F 0 "C?" H 6260 4420 50  0000 L CNN
-F 1 "C_Small" H 6260 4270 50  0000 L CNN
-F 2 "" H 6250 4350 50  0001 C CNN
-F 3 "" H 6250 4350 50  0001 C CNN
-	1    6250 4350
-	0    -1   -1   0   
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5B07ADE8
-P 6350 4350
-F 0 "#PWR?" H 6350 4100 50  0001 C CNN
-F 1 "GND" H 6350 4200 50  0000 C CNN
-F 2 "" H 6350 4350 50  0001 C CNN
-F 3 "" H 6350 4350 50  0001 C CNN
-	1    6350 4350
+P 8550 1900
+F 0 "C?" H 8560 1970 50  0000 L CNN
+F 1 "C_Small" H 8560 1820 50  0000 L CNN
+F 2 "" H 8550 1900 50  0001 C CNN
+F 3 "" H 8550 1900 50  0001 C CNN
+	1    8550 1900
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -390,17 +291,17 @@ F 3 "" H 8900 2800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Text Label 8300 2800 2    60   ~ 0
-TSC_G2_1
+TSC_1
 Text Label 8300 2500 2    60   ~ 0
-TSC_G2_2
+TSC_2
 Text Label 8300 2200 2    60   ~ 0
-TSC_G2_3
+TSC_3
 $Comp
 L R R?
 U 1 1 5B07B730
 P 8550 2200
 F 0 "R?" V 8630 2200 50  0000 C CNN
-F 1 "R" V 8550 2200 50  0000 C CNN
+F 1 "1k" V 8550 2200 50  0000 C CNN
 F 2 "" V 8480 2200 50  0001 C CNN
 F 3 "" H 8550 2200 50  0001 C CNN
 	1    8550 2200
@@ -411,7 +312,7 @@ L R R?
 U 1 1 5B07B7AC
 P 8550 2500
 F 0 "R?" V 8630 2500 50  0000 C CNN
-F 1 "R" V 8550 2500 50  0000 C CNN
+F 1 "1k" V 8550 2500 50  0000 C CNN
 F 2 "" V 8480 2500 50  0001 C CNN
 F 3 "" H 8550 2500 50  0001 C CNN
 	1    8550 2500
@@ -422,7 +323,7 @@ L R R?
 U 1 1 5B07B818
 P 8550 2800
 F 0 "R?" V 8630 2800 50  0000 C CNN
-F 1 "R" V 8550 2800 50  0000 C CNN
+F 1 "1k" V 8550 2800 50  0000 C CNN
 F 2 "" V 8480 2800 50  0001 C CNN
 F 3 "" H 8550 2800 50  0001 C CNN
 	1    8550 2800
@@ -430,196 +331,256 @@ F 3 "" H 8550 2800 50  0001 C CNN
 $EndComp
 Text Label 5600 5550 0    60   ~ 0
 MCO
-Text Label 8600 1900 2    60   ~ 0
+Text Label 8600 3100 2    60   ~ 0
 MCO
 $Comp
 L Conn_01x01 J?
 U 1 1 5B07BCB9
-P 8900 1900
-F 0 "J?" H 8900 2000 50  0000 C CNN
-F 1 "Conn_01x01" H 8900 1800 50  0000 C CNN
-F 2 "" H 8900 1900 50  0001 C CNN
-F 3 "" H 8900 1900 50  0001 C CNN
-	1    8900 1900
+P 8900 3100
+F 0 "J?" H 8900 3200 50  0000 C CNN
+F 1 "Conn_01x01" H 8900 3000 50  0000 C CNN
+F 2 "" H 8900 3100 50  0001 C CNN
+F 3 "" H 8900 3100 50  0001 C CNN
+	1    8900 3100
 	1    0    0    -1  
 $EndComp
 Text Label 4000 5150 2    60   ~ 0
 DAC
-Text Label 4000 4850 2    60   ~ 0
+Text Label 3650 4850 2    60   ~ 0
 QSPI_CS
-Text Label 4000 4950 2    60   ~ 0
+Text Label 3650 4950 2    60   ~ 0
 QSPI_CLK
-Text Label 4000 5250 2    60   ~ 0
+Text Label 3650 5250 2    60   ~ 0
 QSPI_IO3
-Text Label 4000 5350 2    60   ~ 0
+Text Label 3650 5350 2    60   ~ 0
 QSPI_IO2
-Text Label 4000 5550 2    60   ~ 0
+Text Label 3650 5550 2    60   ~ 0
 QSPI_IO0
-Text Label 4000 5450 2    60   ~ 0
+Text Label 3650 5450 2    60   ~ 0
 QSPI_IO1
-Text Label 6150 4950 0    60   ~ 0
+Text Label 6250 4950 0    60   ~ 0
 SAI_FS
-Text Label 6150 5050 0    60   ~ 0
+Text Label 6250 5050 0    60   ~ 0
 SAI_SD
 Text Label 5600 5450 0    60   ~ 0
 SCL
 Text Label 5600 5350 0    60   ~ 0
 SDA
-Text Label 6150 4650 0    60   ~ 0
+Text Label 6250 4650 0    60   ~ 0
 SAI_MCLK
 Text Label 5600 4850 0    60   ~ 0
-SW_3
+nOE
 Text Label 4000 4750 2    60   ~ 0
 SW_1
 Text Label 4000 5050 2    60   ~ 0
 SW_2
-Text Label 6150 5550 0    60   ~ 0
+Text Label 6250 5550 0    60   ~ 0
 SAI_SCK
 $Comp
 L SW_Push SW?
 U 1 1 5B07F81C
-P 8500 4850
-F 0 "SW?" H 8550 4950 50  0000 L CNN
-F 1 "SW_Push" H 8500 4790 50  0000 C CNN
-F 2 "" H 8500 5050 50  0001 C CNN
-F 3 "" H 8500 5050 50  0001 C CNN
-	1    8500 4850
+P 9250 4750
+F 0 "SW?" H 9300 4850 50  0000 L CNN
+F 1 "SW_Push" H 9250 4690 50  0000 C CNN
+F 2 "" H 9250 4950 50  0001 C CNN
+F 3 "" H 9250 4950 50  0001 C CNN
+	1    9250 4750
 	1    0    0    -1  
 $EndComp
-Text Label 8200 4850 2    60   ~ 0
+Text Label 8950 4750 2    60   ~ 0
 SW_1
-Text Label 8200 5150 2    60   ~ 0
+Text Label 8950 5050 2    60   ~ 0
 SW_2
 $Comp
 L SW_Push SW?
 U 1 1 5B07F979
-P 8500 5150
-F 0 "SW?" H 8550 5250 50  0000 L CNN
-F 1 "SW_Push" H 8500 5090 50  0000 C CNN
-F 2 "" H 8500 5350 50  0001 C CNN
-F 3 "" H 8500 5350 50  0001 C CNN
-	1    8500 5150
+P 9250 5050
+F 0 "SW?" H 9300 5150 50  0000 L CNN
+F 1 "SW_Push" H 9250 4990 50  0000 C CNN
+F 2 "" H 9250 5250 50  0001 C CNN
+F 3 "" H 9250 5250 50  0001 C CNN
+	1    9250 5050
 	1    0    0    -1  
 $EndComp
 $Comp
 L SW_Push SW?
 U 1 1 5B07F9F1
-P 8500 5450
-F 0 "SW?" H 8550 5550 50  0000 L CNN
-F 1 "SW_Push" H 8500 5390 50  0000 C CNN
-F 2 "" H 8500 5650 50  0001 C CNN
-F 3 "" H 8500 5650 50  0001 C CNN
-	1    8500 5450
+P 9250 5350
+F 0 "SW?" H 9300 5450 50  0000 L CNN
+F 1 "SW_Push" H 9250 5290 50  0000 C CNN
+F 2 "" H 9250 5550 50  0001 C CNN
+F 3 "" H 9250 5550 50  0001 C CNN
+	1    9250 5350
 	1    0    0    -1  
 $EndComp
-Text Label 8200 5450 2    60   ~ 0
+Text Label 8950 5350 2    60   ~ 0
 SW_3
+Text Label 8950 5650 2    60   ~ 0
+NRST
+Text Label 8050 3750 2    60   ~ 0
+HV_EN
+Text Label 8300 1900 2    60   ~ 0
+TSC_4
 $Comp
-L GND #PWR?
-U 1 1 5B07FACF
-P 8850 4850
-F 0 "#PWR?" H 8850 4600 50  0001 C CNN
-F 1 "GND" H 8850 4700 50  0000 C CNN
-F 2 "" H 8850 4850 50  0001 C CNN
-F 3 "" H 8850 4850 50  0001 C CNN
-	1    8850 4850
-	1    0    0    -1  
+L R R?
+U 1 1 5B08854F
+P 6150 4250
+F 0 "R?" V 6230 4250 50  0000 C CNN
+F 1 "R" V 6150 4250 50  0000 C CNN
+F 2 "" V 6080 4250 50  0001 C CNN
+F 3 "" H 6150 4250 50  0001 C CNN
+	1    6150 4250
+	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR?
-U 1 1 5B07FB3D
-P 8850 5150
-F 0 "#PWR?" H 8850 4900 50  0001 C CNN
-F 1 "GND" H 8850 5000 50  0000 C CNN
-F 2 "" H 8850 5150 50  0001 C CNN
-F 3 "" H 8850 5150 50  0001 C CNN
-	1    8850 5150
+L REG_PWR_1 U?
+U 1 1 5B088AD3
+P 5050 3000
+F 0 "U?" H 5050 3200 60  0000 C CNN
+F 1 "REG_PWR_1" H 5050 3100 60  0000 C CNN
+F 2 "" H 5050 3000 60  0000 C CNN
+F 3 "" H 5050 3000 60  0000 C CNN
+	1    5050 3000
 	1    0    0    -1  
 $EndComp
+Text Label 5500 3000 0    60   ~ 0
+VREG
+Text Label 8050 3650 2    60   ~ 0
+VIN
+Text Label 8900 3650 0    60   ~ 0
+HV
+Text Notes 3200 5700 0    60   ~ 0
+Rev. B
+Text Notes 6200 5700 0    60   ~ 0
+Rev. B
+Text Label 5600 4250 0    60   ~ 0
+HV_EN
+Text Label 5100 3400 0    60   ~ 0
+GND
+Text Label 6550 2050 2    60   ~ 0
+GND
+Text Label 7250 1950 0    60   ~ 0
+GND
+Text Label 8750 1900 0    60   ~ 0
+GND
+Text Label 8900 3750 0    60   ~ 0
+GND
+Text Label 8050 3850 2    60   ~ 0
+GND
+Text Label 6400 4250 0    60   ~ 0
+GND
+Text Label 7250 2500 0    60   ~ 0
+GND
+Text Label 7250 2600 0    60   ~ 0
+GND
+Text Label 7250 2700 0    60   ~ 0
+GND
+Text Label 6550 3250 2    60   ~ 0
+GND
+Text Label 7150 5150 2    60   ~ 0
+GND
+Text Label 9550 4750 0    60   ~ 0
+GND
+Text Label 9550 5050 0    60   ~ 0
+GND
+Text Label 9550 5350 0    60   ~ 0
+GND
+Text Label 9550 5650 0    60   ~ 0
+GND
+Text Label 5600 4150 0    60   ~ 0
+GND
+Text Label 4000 5650 2    60   ~ 0
+GND
+Text Label 3000 4050 2    60   ~ 0
+GND
+Text Label 3000 4550 2    60   ~ 0
+GND
+Text Label 5900 4750 0    60   ~ 0
+SW_3
 $Comp
-L GND #PWR?
-U 1 1 5B07FBAB
-P 8850 5450
-F 0 "#PWR?" H 8850 5200 50  0001 C CNN
-F 1 "GND" H 8850 5300 50  0000 C CNN
-F 2 "" H 8850 5450 50  0001 C CNN
-F 3 "" H 8850 5450 50  0001 C CNN
-	1    8850 5450
+L C_Small C?
+U 1 1 5B092C6C
+P 8000 5000
+F 0 "C?" H 8010 5070 50  0000 L CNN
+F 1 "C" H 8010 4920 50  0000 L CNN
+F 2 "" H 8000 5000 50  0001 C CNN
+F 3 "" H 8000 5000 50  0001 C CNN
+	1    8000 5000
 	1    0    0    -1  
 $EndComp
+Text Label 8300 5250 0    60   ~ 0
+GND
 $Comp
-L GND #PWR?
-U 1 1 5B080101
-P 8850 5750
-F 0 "#PWR?" H 8850 5500 50  0001 C CNN
-F 1 "GND" H 8850 5600 50  0000 C CNN
-F 2 "" H 8850 5750 50  0001 C CNN
-F 3 "" H 8850 5750 50  0001 C CNN
-	1    8850 5750
+L C_Small C?
+U 1 1 5B0934DB
+P 8200 5000
+F 0 "C?" H 8210 5070 50  0000 L CNN
+F 1 "C" H 8210 4920 50  0000 L CNN
+F 2 "" H 8200 5000 50  0001 C CNN
+F 3 "" H 8200 5000 50  0001 C CNN
+	1    8200 5000
 	1    0    0    -1  
 $EndComp
-Text Label 8200 5750 2    60   ~ 0
-NRST
+Text Label 1600 4600 3    60   ~ 0
+GND
 Wire Wire Line
-	3650 4250 3650 4050
+	3650 4050 3650 4250
 Wire Wire Line
-	4100 4250 3650 4250
+	3650 4250 4100 4250
 Wire Wire Line
-	3650 4350 3650 4550
+	3650 4550 3650 4350
 Wire Wire Line
-	4100 4350 3650 4350
+	3650 4350 4100 4350
 Wire Wire Line
-	3650 4550 3300 4550
+	3300 4550 3650 4550
 Wire Wire Line
-	3650 4050 3300 4050
+	3300 4050 3650 4050
 Wire Wire Line
 	4000 4450 4100 4450
 Wire Wire Line
-	8700 5750 8850 5750
+	9450 5650 9550 5650
 Wire Wire Line
-	8200 5750 8300 5750
+	8950 5650 9050 5650
 Wire Wire Line
-	8200 5450 8300 5450
+	8950 5350 9050 5350
 Wire Wire Line
-	8200 5150 8300 5150
+	8950 5050 9050 5050
 Wire Wire Line
-	8200 4850 8300 4850
+	8950 4750 9050 4750
 Wire Wire Line
-	8850 4850 8700 4850
+	9450 4750 9550 4750
 Wire Wire Line
-	8850 5150 8700 5150
+	9450 5050 9550 5050
 Wire Wire Line
-	8850 5450 8700 5450
+	9450 5350 9550 5350
 Wire Wire Line
-	5600 4750 5500 4750
+	5500 4750 5900 4750
 Wire Wire Line
 	5500 4850 5600 4850
 Wire Wire Line
 	4000 4750 4100 4750
 Wire Wire Line
-	5500 5050 6150 5050
-Wire Wire Line
-	5500 4350 6150 4350
+	5500 5050 6250 5050
 Wire Wire Line
-	4000 5550 4100 5550
+	3650 5550 4100 5550
 Wire Wire Line
-	4000 5450 4100 5450
+	3650 5450 4100 5450
 Wire Wire Line
-	4000 5350 4100 5350
+	3650 5350 4100 5350
 Wire Wire Line
-	4000 5250 4100 5250
+	3650 5250 4100 5250
 Wire Wire Line
-	4000 4950 4100 4950
+	3650 4950 4100 4950
 Wire Wire Line
-	4000 4850 4100 4850
+	3650 4850 4100 4850
 Wire Wire Line
 	4000 4650 4100 4650
 Wire Wire Line
 	4000 5150 4100 5150
 Wire Wire Line
-	8600 1900 8700 1900
+	8600 3100 8700 3100
 Wire Wire Line
-	5500 5550 6150 5550
+	5500 5550 6250 5550
 Wire Wire Line
 	8300 2800 8400 2800
 Wire Wire Line
@@ -627,36 +588,25 @@ Wire Wire Line
 Wire Wire Line
 	8300 2200 8400 2200
 Wire Wire Line
-	5500 4650 6150 4650
+	5500 4650 6250 4650
 Wire Wire Line
 	5600 4550 5500 4550
 Wire Wire Line
 	5600 5450 5500 5450
 Wire Wire Line
 	5600 5350 5500 5350
-Wire Wire Line
-	7150 2700 7250 2700
-Connection ~ 7150 2600
-Wire Wire Line
-	7150 2500 7150 2700
 Wire Wire Line
 	6550 2700 6650 2700
 Wire Wire Line
 	6650 2600 6550 2600
 Wire Wire Line
 	6550 2500 6650 2500
-Wire Wire Line
-	6550 2150 6650 2150
 Wire Wire Line
 	6550 1950 6650 1950
 Wire Wire Line
 	7250 2150 7150 2150
 Wire Wire Line
 	7250 2050 7150 2050
-Wire Wire Line
-	7300 1950 7150 1950
-Wire Wire Line
-	6250 2050 6650 2050
 Wire Wire Line
 	4000 4550 4100 4550
 Wire Wire Line
@@ -667,26 +617,16 @@ Wire Wire Line
 	5600 5250 5500 5250
 Wire Wire Line
 	5500 5150 5600 5150
-Connection ~ 5600 4150
 Wire Wire Line
-	5600 4250 5600 4150
-Wire Wire Line
-	5500 4250 5600 4250
+	5500 4250 6000 4250
 Wire Wire Line
 	7150 3250 7250 3250
 Wire Wire Line
 	7250 3050 7150 3050
 Wire Wire Line
 	6650 3250 6550 3250
-Connection ~ 3000 4300
-Wire Wire Line
-	3000 4550 3000 4050
 Wire Wire Line
-	6950 5100 6950 5200
-Wire Wire Line
-	7050 5100 6950 5100
-Wire Wire Line
-	7500 5100 7350 5100
+	7850 5150 7750 5150
 Connection ~ 3400 4050
 Connection ~ 3400 4550
 Wire Wire Line
@@ -698,9 +638,7 @@ Wire Wire Line
 Wire Wire Line
 	3000 4050 3100 4050
 Wire Wire Line
-	5600 4150 5500 4150
-Wire Wire Line
-	5500 4950 6150 4950
+	5500 4950 6250 4950
 Wire Wire Line
 	5500 5650 5600 5650
 Wire Wire Line
@@ -708,18 +646,207 @@ Wire Wire Line
 Wire Wire Line
 	4000 4150 4100 4150
 Wire Wire Line
-	7050 4750 6950 4750
+	7450 4800 7350 4800
 Wire Wire Line
 	7150 3150 7250 3150
 Wire Wire Line
 	6650 3150 6550 3150
 Wire Wire Line
 	6550 3050 6650 3050
-Connection ~ 7500 4750
+Connection ~ 7850 4800
+Wire Wire Line
+	7850 4800 7850 5150
+Wire Wire Line
+	7750 4800 8300 4800
+Wire Wire Line
+	8650 1900 8750 1900
+Wire Wire Line
+	8450 1900 8300 1900
+Wire Wire Line
+	5600 4350 5500 4350
+Wire Wire Line
+	8150 3850 8050 3850
+Wire Wire Line
+	5500 3000 5400 3000
+Wire Wire Line
+	4600 3000 4700 3000
+Wire Wire Line
+	8050 3650 8150 3650
+Wire Wire Line
+	8900 3650 8800 3650
+Wire Wire Line
+	8900 3750 8800 3750
+Wire Notes Line
+	3700 4700 3700 5600
+Wire Notes Line
+	3700 5600 3200 5600
+Wire Notes Line
+	3200 5600 3200 4700
+Wire Notes Line
+	3200 4700 3700 4700
+Wire Notes Line
+	6200 4500 6700 4500
+Wire Notes Line
+	6700 4500 6700 5600
+Wire Notes Line
+	6700 5600 6200 5600
+Wire Notes Line
+	6200 5600 6200 4500
+Wire Wire Line
+	6550 2150 6650 2150
+Wire Wire Line
+	7250 1950 7150 1950
+Wire Wire Line
+	6650 2050 6550 2050
+Wire Wire Line
+	8050 3750 8150 3750
+Wire Wire Line
+	6300 4250 6400 4250
+Wire Wire Line
+	7150 2500 7250 2500
+Wire Wire Line
+	7250 2600 7150 2600
+Wire Wire Line
+	7150 2700 7250 2700
+Wire Wire Line
+	5600 4150 5500 4150
+Wire Wire Line
+	5050 3350 5050 3400
+Wire Wire Line
+	5050 3400 5100 3400
+Wire Wire Line
+	8000 4900 8000 4800
+Connection ~ 8000 4800
+Wire Wire Line
+	8000 5100 8000 5250
+Wire Wire Line
+	8000 5250 8300 5250
+Wire Wire Line
+	8200 4900 8200 4800
+Connection ~ 8200 4800
+Wire Wire Line
+	8200 5100 8200 5250
+Connection ~ 8200 5250
+Text Label 2600 1700 0    60   ~ 0
+VBUS
+Wire Wire Line
+	2600 1700 2500 1700
+Text Label 2600 1800 0    60   ~ 0
+VBUS
+Text Label 2600 1900 0    60   ~ 0
+VBUS
+Text Label 2600 2000 0    60   ~ 0
+VBUS
+Wire Wire Line
+	2600 1800 2500 1800
+Wire Wire Line
+	2500 1900 2600 1900
+Wire Wire Line
+	2600 2000 2500 2000
+Text Label 2600 2200 0    60   ~ 0
+CC1
+Wire Wire Line
+	2600 2200 2500 2200
+Text Label 2600 2300 0    60   ~ 0
+CC2
+Wire Wire Line
+	2600 2300 2500 2300
+Text Label 2600 2500 0    60   ~ 0
+USB_DM
+Wire Wire Line
+	2600 2500 2500 2500
+Text Label 2600 2700 0    60   ~ 0
+USB_DP
+Wire Wire Line
+	2600 2700 2500 2700
+Wire Wire Line
+	2500 2700 2500 2800
+Wire Wire Line
+	2500 2500 2500 2600
+NoConn ~ 2500 3000
+NoConn ~ 2500 3100
+NoConn ~ 2500 3300
+NoConn ~ 2500 3400
+NoConn ~ 2500 3600
+NoConn ~ 2500 3700
+NoConn ~ 2500 3900
+NoConn ~ 2500 4000
+NoConn ~ 2500 4200
+NoConn ~ 2500 4300
+Text Label 1700 4600 3    60   ~ 0
+GND
+Text Label 1800 4600 3    60   ~ 0
+GND
+Text Label 1900 4600 3    60   ~ 0
+GND
+Text Label 2000 4600 3    60   ~ 0
+GND
+$Comp
+L TUSB320 U?
+U 1 1 5B095CC9
+P 4800 2150
+F 0 "U?" H 4800 2600 60  0000 C CNN
+F 1 "TUSB320" H 4800 2500 60  0000 C CNN
+F 2 "" H 5150 2150 60  0001 C CNN
+F 3 "" H 5150 2150 60  0001 C CNN
+	1    4800 2150
+	1    0    0    -1  
+$EndComp
+Text Label 4250 1900 2    60   ~ 0
+CC1
+Text Label 4250 2000 2    60   ~ 0
+CC2
+$Comp
+L R R?
+U 1 1 5B096154
+P 3950 2200
+F 0 "R?" V 4030 2200 50  0000 C CNN
+F 1 "900k" V 3950 2200 50  0000 C CNN
+F 2 "" V 3880 2200 50  0001 C CNN
+F 3 "" H 3950 2200 50  0001 C CNN
+	1    3950 2200
+	0    -1   -1   0   
+$EndComp
+Text Label 3700 2200 2    60   ~ 0
+VBUS
+Wire Wire Line
+	3700 2200 3800 2200
+Text Label 4600 3000 2    60   ~ 0
+VBUS
+Wire Wire Line
+	4100 2200 4350 2200
+Text Label 4250 2100 2    60   ~ 0
+GND
+Text Label 4250 2300 2    60   ~ 0
+GND
+Text Label 5350 2300 0    60   ~ 0
+SCL
+Text Label 5350 2400 0    60   ~ 0
+SDA
+Text Label 5350 2100 0    60   ~ 0
+GND
+Text Label 5350 2000 0    60   ~ 0
+GND
+Text Label 5350 1900 0    60   ~ 0
+VREG
+NoConn ~ 5250 2200
+NoConn ~ 4350 2400
+Wire Wire Line
+	4250 1900 4350 1900
+Wire Wire Line
+	4350 2000 4250 2000
+Wire Wire Line
+	4250 2100 4350 2100
+Wire Wire Line
+	4250 2300 4350 2300
+Wire Wire Line
+	5250 1900 5350 1900
+Wire Wire Line
+	5350 2000 5250 2000
 Wire Wire Line
-	7500 4750 7500 5100
+	5250 2100 5350 2100
 Wire Wire Line
-	7350 4750 7600 4750
+	5350 2300 5250 2300
 Wire Wire Line
-	2850 4300 3000 4300
+	5250 2400 5350 2400
 $EndSCHEMATC