Removed extraneous parts for rev. A

Nixie_Bottom_Board/nixie_bottom_board-cache.lib

@@ -18,25 +18,6 @@ X Pin_1 1 -200 0 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector:TestPoint_2Pole
-#
-DEF Connector:TestPoint_2Pole TP 0 30 Y N 1 F N
-F0 "TP" 0 60 50 H V C CNN
-F1 "Connector:TestPoint_2Pole" 0 -70 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Pin*
- Test*
-$ENDFPLIST
-DRAW
-C -70 0 30 0 1 0 N
-C 70 0 30 0 1 0 N
-X 1 1 -200 0 100 R 50 50 0 1 P
-X 2 2 200 0 100 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
 # Connector:USB_C_Receptacle
 #
 DEF Connector:USB_C_Receptacle J 0 40 Y Y 1 F N
@@ -144,40 +125,31 @@ X Pin_6 6 300 -100 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Custom_Parts:BQ25890
+# Custom_Parts:DS3231
 #
-DEF Custom_Parts:BQ25890 U 0 40 Y Y 1 F N
-F0 "U" 0 750 60 H V C CNN
-F1 "Custom_Parts:BQ25890" 0 650 60 H V C CNN
-F2 "" 0 150 60 H I C CNN
-F3 "" 0 150 60 H I C CNN
+DEF Custom_Parts:DS3231 U 0 40 Y Y 1 F N
+F0 "U" 0 -450 50 H V C CNN
+F1 "Custom_Parts:DS3231" 0 450 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-S -300 600 300 -600 0 1 0 N
-X VBUS 1 -500 550 200 R 50 50 1 1 I
-X ILIM 10 -500 -350 200 R 50 50 1 1 I
-X TS 11 -500 -450 200 R 50 50 1 1 I
-X nQON 12 -500 -550 200 R 50 50 1 1 I
-X BAT 13 500 -550 200 L 50 50 1 1 I
-X BAT 14 500 -450 200 L 50 50 1 1 I
-X SYS 15 500 -350 200 L 50 50 1 1 I
-X SYS 16 500 -250 200 L 50 50 1 1 I
-X PGND 17 500 -150 200 L 50 50 1 1 I
-X PGND 18 500 -50 200 L 50 50 1 1 I
-X SW 19 500 50 200 L 50 50 1 1 I
-X D+ 2 -500 450 200 R 50 50 1 1 I
-X SW 20 500 150 200 L 50 50 1 1 I
-X BTST 21 500 250 200 L 50 50 1 1 I
-X REGN 22 500 350 200 L 50 50 1 1 I
-X PMID 23 500 450 200 L 50 50 1 1 I
-X DSEL 24 500 550 200 L 50 50 1 1 I
-X EP 25 0 -800 200 U 50 50 1 1 I N
-X D- 3 -500 350 200 R 50 50 1 1 I
-X STAT 4 -500 250 200 R 50 50 1 1 I
-X SCL 5 -500 150 200 R 50 50 1 1 I
-X SDA 6 -500 50 200 R 50 50 1 1 I
-X INT 7 -500 -50 200 R 50 50 1 1 I
-X OTG 8 -500 -150 200 R 50 50 1 1 I
-X nCE 9 -500 -250 200 R 50 50 1 1 I
+S -250 400 250 -400 0 1 0 N
+X 32kHz 1 -450 350 200 R 50 50 1 1 I
+X NC 10 450 -250 200 L 50 50 1 1 I
+X NC 11 450 -150 200 L 50 50 1 1 I
+X NC 12 450 -50 200 L 50 50 1 1 I
+X GND 13 450 50 200 L 50 50 1 1 I
+X VBAT 14 450 150 200 L 50 50 1 1 I
+X SDA 15 450 250 200 L 50 50 1 1 I
+X SCL 16 450 350 200 L 50 50 1 1 I
+X VCC 2 -450 250 200 R 50 50 1 1 I
+X nINT 3 -450 150 200 R 50 50 1 1 I
+X nRST 4 -450 50 200 R 50 50 1 1 I
+X NC 5 -450 -50 200 R 50 50 1 1 I
+X NC 6 -450 -150 200 R 50 50 1 1 I
+X NC 7 -450 -250 200 R 50 50 1 1 I
+X NC 8 -450 -350 200 R 50 50 1 1 I
+X NC 9 450 -350 200 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
@@ -426,27 +398,6 @@ X ~ 2 0 -100 80 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device:Crystal
-#
-DEF Device:Crystal Y 0 40 N N 1 F N
-F0 "Y" 0 150 50 H V C CNN
-F1 "Device:Crystal" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Crystal*
-$ENDFPLIST
-DRAW
-S -45 100 45 -100 0 1 12 N
-P 2 0 1 0 -100 0 -75 0 N
-P 2 0 1 20 -75 -50 -75 50 N
-P 2 0 1 20 75 -50 75 50 N
-P 2 0 1 0 100 0 75 0 N
-X 1 1 -150 0 50 R 50 50 1 1 P
-X 2 2 150 0 50 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Device:D
 #
 DEF Device:D D 0 40 N N 1 F N
@@ -469,45 +420,6 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device:Jumper_NC_Small
-#
-DEF Device:Jumper_NC_Small JP 0 30 N N 1 F N
-F0 "JP" 0 80 50 H V C CNN
-F1 "Device:Jumper_NC_Small" 10 -60 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-A 0 -10 57 450 1350 0 1 0 N 40 30 -40 30
-C -40 0 20 0 1 0 N
-C 40 0 20 0 1 0 N
-X 1 1 -100 0 40 R 50 50 0 1 P
-X 2 2 100 0 40 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# Device:LED
-#
-DEF Device:LED D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "Device:LED" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$ENDFPLIST
-DRAW
-P 2 0 1 8 -50 -50 -50 50 N
-P 2 0 1 0 -50 0 50 0 N
-P 4 0 1 8 50 -50 50 50 -50 0 50 -50 N
-P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
-P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Device:L_Small
 #
 DEF Device:L_Small L 0 10 N N 1 F N
@@ -580,24 +492,6 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device:Thermistor
-#
-DEF Device:Thermistor TH 0 0 N Y 1 F N
-F0 "TH" 100 50 50 V V C CNN
-F1 "Device:Thermistor" -100 0 50 V V C BNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- R_*
-$ENDFPLIST
-DRAW
-S -40 100 40 -100 0 1 8 N
-P 5 0 1 10 -75 125 -75 75 75 -75 75 -125 75 -125 N
-X ~ 1 0 200 100 D 50 50 1 1 P
-X ~ 2 0 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Switch:SW_Push
 #
 DEF Switch:SW_Push SW 0 40 N N 1 F N

Nixie_Bottom_Board/nixie_bottom_board.bak

@@ -15,213 +15,75 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Sheet
-S 3400 3650 650  400 
+S 5650 1500 650  400 
 U 5B07197A
 F0 "HV Power Supply" 60
 F1 "hv_power_supply.sch" 60
-F2 "VIN" I L 3400 3750 60 
-F3 "EN" I L 3400 3850 60 
-F4 "GND" I L 3400 3950 60 
-F5 "VOUT" I R 4050 3750 60 
-F6 "GND" I R 4050 3850 60 
+F2 "VIN" I L 5650 1600 60 
+F3 "EN" I L 5650 1700 60 
+F4 "GND" I L 5650 1800 60 
+F5 "VOUT" I R 6300 1600 60 
+F6 "GND" I R 6300 1700 60 
 $EndSheet
-$Comp
-L Device:Crystal Y1
-U 1 1 5B073DBF
-P 3200 5050
-F 0 "Y1" H 3200 5200 50  0000 C CNN
-F 1 "32.78k" H 3200 4900 50  0000 C CNN
-F 2 "Crystals:Crystal_SMD_2520-4pin_2.5x2.0mm" H 3200 5050 50  0001 C CNN
-F 3 "" H 3200 5050 50  0001 C CNN
-	1    3200 5050
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C26
-U 1 1 5B073E81
-P 3450 4850
-F 0 "C26" H 3460 4920 50  0000 L CNN
-F 1 "10pF" H 3460 4770 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 3450 4850 50  0001 C CNN
-F 3 "" H 3450 4850 50  0001 C CNN
-	1    3450 4850
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C25
-U 1 1 5B073EE2
-P 2900 4850
-F 0 "C25" H 2910 4920 50  0000 L CNN
-F 1 "10pF" H 2910 4770 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 2900 4850 50  0001 C CNN
-F 3 "" H 2900 4850 50  0001 C CNN
-	1    2900 4850
-	1    0    0    -1  
-$EndComp
-Text Label 5350 6600 0    60   ~ 0
+Text Label 5900 6250 0    60   ~ 0
 VDD
-Text Label 5350 6000 0    60   ~ 0
+Text Label 5900 5650 0    60   ~ 0
 SWDIO
-Text Label 5350 5900 0    60   ~ 0
+Text Label 5900 5550 0    60   ~ 0
 SWCLK
-Text Label 5350 5700 0    60   ~ 0
+Text Label 5900 5350 0    60   ~ 0
 SWO
-$Comp
-L Device:Battery_Cell BT1
-U 1 1 5B07444B
-P 8050 2550
-F 0 "BT1" H 8150 2650 50  0000 L CNN
-F 1 "BAT" H 8150 2550 50  0000 L CNN
-F 2 "Connectors_JST:JST_PH_S2B-PH-SM4-TB_02x2.00mm_Angled" V 8050 2610 50  0001 C CNN
-F 3 "" V 8050 2610 50  0001 C CNN
-	1    8050 2550
-	1    0    0    -1  
-$EndComp
 Text Label 2050 4700 0    60   ~ 0
 SWO
 Text Label 2050 4800 0    60   ~ 0
 SWCLK
 Text Label 1350 4800 2    60   ~ 0
 SWDIO
-Text Label 3950 5400 2    60   ~ 0
+Text Label 4500 5050 2    60   ~ 0
 NRST
 Text Label 2050 4900 0    60   ~ 0
 NRST
-Text Label 5350 6200 0    60   ~ 0
+Text Label 5900 5850 0    60   ~ 0
 USB_N
-Text Label 5350 6100 0    60   ~ 0
+Text Label 5900 5750 0    60   ~ 0
 USB_P
-Text Label 1350 6000 2    60   ~ 0
-SCL
 Text Label 1350 6100 2    60   ~ 0
+SCL
+Text Label 1350 6200 2    60   ~ 0
 SDA
-Text Label 2150 5400 0    60   ~ 0
+Text Label 2150 5450 0    60   ~ 0
 HV_OUT
-Text Label 2050 5900 0    60   ~ 0
+Text Label 2050 6000 0    60   ~ 0
 VNIXIE
-Text Label 5350 5600 0    60   ~ 0
-TSC_1
-Text Label 5350 5500 0    60   ~ 0
-TSC_2
-Text Label 5350 5400 0    60   ~ 0
-TSC_3
-$Comp
-L Device:C_Small C28
-U 1 1 5B07ACF8
-P 10000 5100
-F 0 "C28" H 10010 5170 50  0000 L CNN
-F 1 "C" H 10010 5020 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 10000 5100 50  0001 C CNN
-F 3 "" H 10000 5100 50  0001 C CNN
-	1    10000 5100
-	0    -1   -1   0   
-$EndComp
-Text Label 9750 6000 2    60   ~ 0
-TSC_1
-Text Label 9750 5700 2    60   ~ 0
-TSC_2
-Text Label 9750 5400 2    60   ~ 0
-TSC_3
-$Comp
-L Device:R R17
-U 1 1 5B07B730
-P 10000 5400
-F 0 "R17" V 10080 5400 50  0000 C CNN
-F 1 "1k" V 9900 5400 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 9930 5400 50  0001 C CNN
-F 3 "" H 10000 5400 50  0001 C CNN
-	1    10000 5400
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:R R18
-U 1 1 5B07B7AC
-P 10000 5700
-F 0 "R18" V 10080 5700 50  0000 C CNN
-F 1 "1k" V 9900 5700 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 9930 5700 50  0001 C CNN
-F 3 "" H 10000 5700 50  0001 C CNN
-	1    10000 5700
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:R R19
-U 1 1 5B07B818
-P 10000 6000
-F 0 "R19" V 10080 6000 50  0000 C CNN
-F 1 "1k" V 9900 6000 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 9930 6000 50  0001 C CNN
-F 3 "" H 10000 6000 50  0001 C CNN
-	1    10000 6000
-	0    -1   -1   0   
-$EndComp
-Text Label 5350 6500 0    60   ~ 0
+Text Label 5900 6150 0    60   ~ 0
 MCO
-Text Label 8500 4700 2    60   ~ 0
+Text Label 8000 4100 2    60   ~ 0
 MCO
-Text Label 3950 6100 2    60   ~ 0
+Text Label 4500 5750 2    60   ~ 0
 DAC
-Text Label 3600 5800 2    60   ~ 0
-QSPI_CS
-Text Label 3600 5900 2    60   ~ 0
-QSPI_CLK
-Text Label 3600 6200 2    60   ~ 0
-QSPI_IO3
-Text Label 3600 6300 2    60   ~ 0
-QSPI_IO2
-Text Label 3600 6500 2    60   ~ 0
-QSPI_IO0
-Text Label 3600 6400 2    60   ~ 0
-QSPI_IO1
-Text Label 6000 5900 0    60   ~ 0
-SAI_FS
-Text Label 6000 6000 0    60   ~ 0
-SAI_SD
-Text Label 5350 6400 0    60   ~ 0
+Text Label 5900 6050 0    60   ~ 0
 SCL
-Text Label 5350 6300 0    60   ~ 0
+Text Label 5900 5950 0    60   ~ 0
 SDA
-Text Label 6000 5600 0    60   ~ 0
-SAI_MCLK
-Text Label 3950 5700 2    60   ~ 0
-SW_1
-Text Label 3950 6000 2    60   ~ 0
-SW_2
-Text Label 6000 6500 0    60   ~ 0
-SAI_SCK
-Text Label 8350 5100 2    60   ~ 0
-SW_1
-Text Label 8350 5450 2    60   ~ 0
-SW_2
-Text Label 8350 5800 2    60   ~ 0
-SW_3
-Text Label 8350 6150 2    60   ~ 0
+Text Label 7900 4600 2    60   ~ 0
 NRST
-Text Label 3300 3850 2    60   ~ 0
+Text Label 5550 1700 2    60   ~ 0
 HV_EN
-Text Label 9750 5100 2    60   ~ 0
-TSC_4
 $Comp
 L Device:R R16
 U 1 1 5B08854F
-P 5850 5200
-F 0 "R16" V 5930 5200 50  0000 C CNN
-F 1 "1M" V 5750 5200 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5780 5200 50  0001 C CNN
-F 3 "" H 5850 5200 50  0001 C CNN
-	1    5850 5200
+P 6400 4850
+F 0 "R16" V 6480 4850 50  0000 C CNN
+F 1 "1M" V 6300 4850 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 6330 4850 50  0001 C CNN
+F 3 "" H 6400 4850 50  0001 C CNN
+	1    6400 4850
 	0    -1   -1   0   
 $EndComp
-Text Label 4150 3750 0    60   ~ 0
+Text Label 6400 1600 0    60   ~ 0
 HV_OUT
-Text Notes 3150 6650 0    60   ~ 0
-Rev. B
-Text Notes 5950 6650 0    60   ~ 0
-Rev. B
-Text Label 5350 5200 0    60   ~ 0
+Text Label 5900 4850 0    60   ~ 0
 HV_EN
-Text Label 5650 5700 0    60   ~ 0
-SW_3
 Text Label 2050 1550 0    60   ~ 0
 CC1
 Text Label 2050 1650 0    60   ~ 0
@@ -233,408 +95,111 @@ USB_P
 $Comp
 L Device:R R9
 U 1 1 5B096154
-P 3150 2950
-F 0 "R9" V 3230 2950 50  0000 C CNN
-F 1 "900k" V 3050 2950 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 3080 2950 50  0001 C CNN
-F 3 "" H 3150 2950 50  0001 C CNN
-	1    3150 2950
+P 3150 3450
+F 0 "R9" V 3230 3450 50  0000 C CNN
+F 1 "900k" V 3050 3450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 3080 3450 50  0001 C CNN
+F 3 "" H 3150 3450 50  0001 C CNN
+	1    3150 3450
 	0    -1   -1   0   
 $EndComp
-Text Label 3000 2950 2    60   ~ 0
+Text Label 3000 3450 2    60   ~ 0
 VBUS
-Text Label 4200 3050 0    60   ~ 0
+Text Label 4200 3550 0    60   ~ 0
 SCL
-Text Label 4200 3150 0    60   ~ 0
+Text Label 4200 3650 0    60   ~ 0
 SDA
 $Comp
 L Device:R R14
 U 1 1 5B0B7874
-P 10000 4450
-F 0 "R14" V 10080 4450 50  0000 C CNN
-F 1 "10k" V 9900 4450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 9930 4450 50  0001 C CNN
-F 3 "" H 10000 4450 50  0001 C CNN
-	1    10000 4450
+P 9400 4400
+F 0 "R14" V 9480 4400 50  0000 C CNN
+F 1 "10k" V 9300 4400 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 9330 4400 50  0001 C CNN
+F 3 "" H 9400 4400 50  0001 C CNN
+	1    9400 4400
 	0    -1   -1   0   
 $EndComp
 $Comp
 L Device:R R15
 U 1 1 5B0B79AE
-P 10000 4750
-F 0 "R15" V 10080 4750 50  0000 C CNN
-F 1 "10k" V 9900 4750 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 9930 4750 50  0001 C CNN
-F 3 "" H 10000 4750 50  0001 C CNN
-	1    10000 4750
+P 9400 4700
+F 0 "R15" V 9480 4700 50  0000 C CNN
+F 1 "10k" V 9300 4700 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 9330 4700 50  0001 C CNN
+F 3 "" H 9400 4700 50  0001 C CNN
+	1    9400 4700
 	0    -1   -1   0   
 $EndComp
-Text Label 10150 4450 0    60   ~ 0
-SCL
-Text Label 10150 4750 0    60   ~ 0
-SDA
-Text Label 6150 1250 2    60   ~ 0
-VBUS
-Text Label 6150 1350 2    60   ~ 0
-USB_P
-Text Label 6150 1450 2    60   ~ 0
-USB_N
-Text Label 6150 1650 2    60   ~ 0
+Text Label 9550 4400 0    60   ~ 0
 SCL
-Text Label 6150 1750 2    60   ~ 0
+Text Label 9550 4700 0    60   ~ 0
 SDA
-$Comp
-L Device:C_Small C13
-U 1 1 5B0C2749
-P 7550 1650
-F 0 "C13" H 7560 1720 50  0000 L CNN
-F 1 "47nF" H 7560 1570 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 7550 1650 50  0001 C CNN
-F 3 "" H 7550 1650 50  0001 C CNN
-	1    7550 1650
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C12
-U 1 1 5B0C2BAC
-P 7800 1550
-F 0 "C12" H 7810 1620 50  0000 L CNN
-F 1 "4.7uF" H 7810 1470 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 7800 1550 50  0001 C CNN
-F 3 "" H 7800 1550 50  0001 C CNN
-	1    7800 1550
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C9
-U 1 1 5B0C33A4
-P 5750 1250
-F 0 "C9" H 5760 1320 50  0000 L CNN
-F 1 "1uF" H 5760 1170 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 5750 1250 50  0001 C CNN
-F 3 "" H 5750 1250 50  0001 C CNN
-	1    5750 1250
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:LED D3
-U 1 1 5B0C55EE
-P 5400 1550
-F 0 "D3" H 5400 1650 50  0000 C CNN
-F 1 "LED" H 5400 1450 50  0000 C CNN
-F 2 "LEDs:LED_0603" H 5400 1550 50  0001 C CNN
-F 3 "" H 5400 1550 50  0001 C CNN
-	1    5400 1550
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:R R7
-U 1 1 5B0C5697
-P 5700 1550
-F 0 "R7" V 5780 1550 50  0000 C CNN
-F 1 "2.2k" V 5600 1550 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5630 1550 50  0001 C CNN
-F 3 "" H 5700 1550 50  0001 C CNN
-	1    5700 1550
-	0    -1   -1   0   
-$EndComp
-Text Label 5250 1550 2    60   ~ 0
-REGN
-$Comp
-L Device:R R8
-U 1 1 5B0C68E7
-P 5450 2150
-F 0 "R8" V 5530 2150 50  0000 C CNN
-F 1 "260" V 5350 2150 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5380 2150 50  0001 C CNN
-F 3 "" H 5450 2150 50  0001 C CNN
-	1    5450 2150
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:Thermistor TH1
-U 1 1 5B0C6F00
-P 5850 2750
-F 0 "TH1" V 5950 2800 50  0000 C CNN
-F 1 "103AT" V 5750 2750 50  0000 C BNN
-F 2 "Connectors_JST:JST_PH_S2B-PH-SM4-TB_02x2.00mm_Angled" H 5850 2750 50  0001 C CNN
-F 3 "" H 5850 2750 50  0001 C CNN
-	1    5850 2750
-	0    -1   -1   0   
-$EndComp
-Text Label 7150 1450 0    60   ~ 0
-REGN
-$Comp
-L Device:R R11
-U 1 1 5B0C76F2
-P 5850 2450
-F 0 "R11" V 5930 2450 50  0000 C CNN
-F 1 "30.31k" V 5750 2450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5780 2450 50  0001 C CNN
-F 3 "" H 5850 2450 50  0001 C CNN
-	1    5850 2450
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:R R10
-U 1 1 5B0C7966
-P 5450 2450
-F 0 "R10" V 5530 2450 50  0000 C CNN
-F 1 "5.24k" V 5350 2450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5380 2450 50  0001 C CNN
-F 3 "" H 5450 2450 50  0001 C CNN
-	1    5450 2450
-	0    -1   -1   0   
-$EndComp
-Text Label 5250 2450 2    60   ~ 0
-REGN
-$Comp
-L Device:C_Small C11
-U 1 1 5B0CC3F6
-P 8050 1450
-F 0 "C11" H 8060 1520 50  0000 L CNN
-F 1 "10uF" H 8060 1370 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 8050 1450 50  0001 C CNN
-F 3 "" H 8050 1450 50  0001 C CNN
-	1    8050 1450
-	1    0    0    -1  
-$EndComp
-NoConn ~ 3300 2850
-Text Notes 3500 3300 0    60   ~ 0
+NoConn ~ 3300 3350
+Text Notes 3500 3800 0    60   ~ 0
 ADDR: 0x60
-$Comp
-L Device:C_Small C10
-U 1 1 5B0CEA4D
-P 8300 1350
-F 0 "C10" H 8310 1420 50  0000 L CNN
-F 1 "47nF" H 8310 1270 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 8300 1350 50  0001 C CNN
-F 3 "" H 8300 1350 50  0001 C CNN
-	1    8300 1350
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:L_Small L1
-U 1 1 5B0DB40F
-P 7550 1950
-F 0 "L1" H 7580 1990 50  0000 L CNN
-F 1 "1uH" H 7580 1910 50  0000 L CNN
-F 2 "Inductors_SMD:L_Taiyo-Yuden_NR-40xx" H 7550 1950 50  0001 C CNN
-F 3 "" H 7550 1950 50  0001 C CNN
-	1    7550 1950
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C15
-U 1 1 5B0DC42A
-P 7800 2000
-F 0 "C15" H 7810 2070 50  0000 L CNN
-F 1 "10uF" H 7810 1920 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 7800 2000 50  0001 C CNN
-F 3 "" H 7800 2000 50  0001 C CNN
-	1    7800 2000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C16
-U 1 1 5B0DC519
-P 8050 2000
-F 0 "C16" H 8060 2070 50  0000 L CNN
-F 1 "10uF" H 8060 1920 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 8050 2000 50  0001 C CNN
-F 3 "" H 8050 2000 50  0001 C CNN
-	1    8050 2000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C19
-U 1 1 5B0DFFED
-P 7250 2500
-F 0 "C19" H 7260 2570 50  0000 L CNN
-F 1 "10uF" H 7260 2420 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 7250 2500 50  0001 C CNN
-F 3 "" H 7250 2500 50  0001 C CNN
-	1    7250 2500
-	1    0    0    -1  
-$EndComp
-NoConn ~ 6150 2350
 Text Label 2150 1050 0    60   ~ 0
 VBUS
-Text Notes 6400 2500 0    60   ~ 0
-ADDR: 0x6A
-Text Notes 1300 6400 0    60   ~ 0
+Text Notes 1300 6500 0    60   ~ 0
 ADDR: 0x70-0x73
-Text Label 8450 2150 0    60   ~ 0
-VSYS
-Text Label 6150 1950 2    60   ~ 0
-VSYS
-Text Label 6150 1850 2    60   ~ 0
-USB_INT
-Text Label 3950 5600 2    60   ~ 0
+Text Label 4500 5250 2    60   ~ 0
 USB_INT
-Text Label 5350 5300 0    60   ~ 0
-TSC_4
-Text Label 3950 5100 2    60   ~ 0
+Text Label 4500 4750 2    60   ~ 0
 VDD
-Text Label 3950 5500 2    60   ~ 0
+Text Label 4500 5150 2    60   ~ 0
 VDD
-Text Label 4200 2650 0    60   ~ 0
+Text Label 4200 3150 0    60   ~ 0
 VDD
-Text Label 9850 4450 2    60   ~ 0
+Text Label 9250 4400 2    60   ~ 0
 VDD
-Text Label 9850 4750 2    60   ~ 0
+Text Label 9250 4700 2    60   ~ 0
 VDD
 Text Label 1350 4700 2    60   ~ 0
 VDD
 $Comp
 L Device:C_Small C20
 U 1 1 5B1737BD
-P 7050 3750
-F 0 "C20" H 7060 3820 50  0000 L CNN
-F 1 "10uF" H 7060 3670 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 7050 3750 50  0001 C CNN
-F 3 "" H 7050 3750 50  0001 C CNN
-	1    7050 3750
+P 6900 2650
+F 0 "C20" H 6910 2720 50  0000 L CNN
+F 1 "10uF" H 6910 2570 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 6900 2650 50  0001 C CNN
+F 3 "" H 6900 2650 50  0001 C CNN
+	1    6900 2650
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C24
 U 1 1 5B1732A3
-P 6800 3850
-F 0 "C24" H 6810 3920 50  0000 L CNN
-F 1 "10uF" H 6810 3770 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 6800 3850 50  0001 C CNN
-F 3 "" H 6800 3850 50  0001 C CNN
-	1    6800 3850
+P 6650 2750
+F 0 "C24" H 6660 2820 50  0000 L CNN
+F 1 "10uF" H 6660 2670 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 6650 2750 50  0001 C CNN
+F 3 "" H 6650 2750 50  0001 C CNN
+	1    6650 2750
 	1    0    0    -1  
 $EndComp
-Text Label 7050 3550 2    60   ~ 0
+Text Label 6900 2450 2    60   ~ 0
 VDD
-Text Label 5650 4300 2    60   ~ 0
-VSYS
 $Comp
 L Device:L_Small L2
 U 1 1 5B16755A
-P 5250 3700
-F 0 "L2" H 5280 3740 50  0000 L CNN
-F 1 "1uH" H 5280 3660 50  0000 L CNN
-F 2 "Inductors_SMD:L_Taiyo-Yuden_NR-40xx" H 5250 3700 50  0001 C CNN
-F 3 "" H 5250 3700 50  0001 C CNN
-	1    5250 3700
+P 5100 2600
+F 0 "L2" H 5130 2640 50  0000 L CNN
+F 1 "1uH" H 5130 2560 50  0000 L CNN
+F 2 "Inductors_SMD:L_Taiyo-Yuden_NR-40xx" H 5100 2600 50  0001 C CNN
+F 3 "" H 5100 2600 50  0001 C CNN
+	1    5100 2600
 	-1   0    0    1   
 $EndComp
 $Comp
 L Custom_Parts:TPS63025X U5
 U 1 1 5B1672A1
-P 6200 3750
-F 0 "U5" H 6200 4150 60  0000 C CNN
-F 1 "TPS63025X" H 6200 4050 60  0000 C CNN
-F 2 "Custom Parts:VQFN-14_2.5x3mm_Pitch0.5mm" H 6200 3750 60  0001 C CNN
-F 3 "" H 6200 3750 60  0001 C CNN
-	1    6200 3750
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C17
-U 1 1 5B15DD3E
-P 8300 2000
-F 0 "C17" H 8310 2070 50  0000 L CNN
-F 1 "1uF" H 8310 1920 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 8300 2000 50  0001 C CNN
-F 3 "" H 8300 2000 50  0001 C CNN
-	1    8300 2000
-	1    0    0    -1  
-$EndComp
-Text Label 6150 2050 2    60   ~ 0
-USB_CE
-Text Label 5350 5800 0    60   ~ 0
-USB_CE
-$Comp
-L Device:Jumper_NC_Small JP1
-U 1 1 5B0F1B1A
-P 7700 2650
-F 0 "JP1" H 7700 2730 50  0000 C CNN
-F 1 "Jumper_5V" H 7710 2590 50  0000 C CNN
-F 2 "Custom Parts:Jumper_0603" H 7700 2650 50  0001 C CNN
-F 3 "" H 7700 2650 50  0001 C CNN
-	1    7700 2650
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDREF #PWR01
-U 1 1 5B0F40EF
-P 7350 1850
-F 0 "#PWR01" H 7350 1600 50  0001 C CNN
-F 1 "GNDREF" H 7350 1700 50  0000 C CNN
-F 2 "" H 7350 1850 50  0001 C CNN
-F 3 "" H 7350 1850 50  0001 C CNN
-	1    7350 1850
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDREF #PWR02
-U 1 1 5B0F4F3F
-P 8400 1800
-F 0 "#PWR02" H 8400 1550 50  0001 C CNN
-F 1 "GNDREF" H 8400 1650 50  0000 C CNN
-F 2 "" H 8400 1800 50  0001 C CNN
-F 3 "" H 8400 1800 50  0001 C CNN
-	1    8400 1800
-	0    -1   -1   0   
-$EndComp
-$Comp
-L power:GNDREF #PWR03
-U 1 1 5B0F5B5A
-P 5650 1250
-F 0 "#PWR03" H 5650 1000 50  0001 C CNN
-F 1 "GNDREF" H 5650 1100 50  0000 C CNN
-F 2 "" H 5650 1250 50  0001 C CNN
-F 3 "" H 5650 1250 50  0001 C CNN
-	1    5650 1250
-	0    1    1    0   
-$EndComp
-$Comp
-L power:GNDREF #PWR05
-U 1 1 5B0F610A
-P 5300 2150
-F 0 "#PWR05" H 5300 1900 50  0001 C CNN
-F 1 "GNDREF" H 5300 2000 50  0000 C CNN
-F 2 "" H 5300 2150 50  0001 C CNN
-F 3 "" H 5300 2150 50  0001 C CNN
-	1    5300 2150
-	0    1    1    0   
-$EndComp
-$Comp
-L power:GNDREF #PWR06
-U 1 1 5B0F6B8D
-P 6050 2750
-F 0 "#PWR06" H 6050 2500 50  0001 C CNN
-F 1 "GNDREF" H 6050 2600 50  0000 C CNN
-F 2 "" H 6050 2750 50  0001 C CNN
-F 3 "" H 6050 2750 50  0001 C CNN
-	1    6050 2750
-	0    -1   -1   0   
-$EndComp
-$Comp
-L power:GNDREF #PWR07
-U 1 1 5B0F743C
-P 7250 2600
-F 0 "#PWR07" H 7250 2350 50  0001 C CNN
-F 1 "GNDREF" H 7250 2450 50  0000 C CNN
-F 2 "" H 7250 2600 50  0001 C CNN
-F 3 "" H 7250 2600 50  0001 C CNN
-	1    7250 2600
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDREF #PWR08
-U 1 1 5B0F751C
-P 8050 2650
-F 0 "#PWR08" H 8050 2400 50  0001 C CNN
-F 1 "GNDREF" H 8050 2500 50  0000 C CNN
-F 2 "" H 8050 2650 50  0001 C CNN
-F 3 "" H 8050 2650 50  0001 C CNN
-	1    8050 2650
+P 6050 2650
+F 0 "U5" H 6050 3050 60  0000 C CNN
+F 1 "TPS63025X" H 6050 2950 60  0000 C CNN
+F 2 "Custom Parts:VQFN-14_2.5x3mm_Pitch0.5mm" H 6050 2650 60  0001 C CNN
+F 3 "" H 6050 2650 60  0001 C CNN
+	1    6050 2650
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -651,195 +216,162 @@ $EndComp
 $Comp
 L power:GNDREF #PWR010
 U 1 1 5B0F887D
-P 3200 3950
-F 0 "#PWR010" H 3200 3700 50  0001 C CNN
-F 1 "GNDREF" H 3200 3800 50  0000 C CNN
-F 2 "" H 3200 3950 50  0001 C CNN
-F 3 "" H 3200 3950 50  0001 C CNN
-	1    3200 3950
+P 5450 1800
+F 0 "#PWR010" H 5450 1550 50  0001 C CNN
+F 1 "GNDREF" H 5450 1650 50  0000 C CNN
+F 2 "" H 5450 1800 50  0001 C CNN
+F 3 "" H 5450 1800 50  0001 C CNN
+	1    5450 1800
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDREF #PWR011
 U 1 1 5B0F899A
-P 4250 3850
-F 0 "#PWR011" H 4250 3600 50  0001 C CNN
-F 1 "GNDREF" H 4250 3700 50  0000 C CNN
-F 2 "" H 4250 3850 50  0001 C CNN
-F 3 "" H 4250 3850 50  0001 C CNN
-	1    4250 3850
+P 6500 1700
+F 0 "#PWR011" H 6500 1450 50  0001 C CNN
+F 1 "GNDREF" H 6500 1550 50  0000 C CNN
+F 2 "" H 6500 1700 50  0001 C CNN
+F 3 "" H 6500 1700 50  0001 C CNN
+	1    6500 1700
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDREF #PWR012
 U 1 1 5B0F9A68
-P 7050 4050
-F 0 "#PWR012" H 7050 3800 50  0001 C CNN
-F 1 "GNDREF" H 7050 3900 50  0000 C CNN
-F 2 "" H 7050 4050 50  0001 C CNN
-F 3 "" H 7050 4050 50  0001 C CNN
-	1    7050 4050
+P 6900 2950
+F 0 "#PWR012" H 6900 2700 50  0001 C CNN
+F 1 "GNDREF" H 6900 2800 50  0000 C CNN
+F 2 "" H 6900 2950 50  0001 C CNN
+F 3 "" H 6900 2950 50  0001 C CNN
+	1    6900 2950
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDREF #PWR013
 U 1 1 5B0FA54E
-P 5450 3650
-F 0 "#PWR013" H 5450 3400 50  0001 C CNN
-F 1 "GNDREF" H 5450 3500 50  0000 C CNN
-F 2 "" H 5450 3650 50  0001 C CNN
-F 3 "" H 5450 3650 50  0001 C CNN
-	1    5450 3650
-	1    0    0    -1  
-$EndComp
-$Comp
-L Custom_Parts:BQ25890 U2
-U 1 1 5B0BF1F9
-P 6650 1800
-F 0 "U2" H 6650 2550 60  0000 C CNN
-F 1 "BQ25890" H 6650 2450 60  0000 C CNN
-F 2 "Housings_DFN_QFN:QFN-24-1EP_4x4mm_Pitch0.5mm" H 6650 1950 60  0001 C CNN
-F 3 "" H 6650 1950 60  0001 C CNN
-	1    6650 1800
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDREF #PWR018
-U 1 1 5B109387
-P 3300 3150
-F 0 "#PWR018" H 3300 2900 50  0001 C CNN
-F 1 "GNDREF" H 3300 3000 50  0000 C CNN
-F 2 "" H 3300 3150 50  0001 C CNN
-F 3 "" H 3300 3150 50  0001 C CNN
-	1    3300 3150
+P 5300 2550
+F 0 "#PWR013" H 5300 2300 50  0001 C CNN
+F 1 "GNDREF" H 5300 2400 50  0000 C CNN
+F 2 "" H 5300 2550 50  0001 C CNN
+F 3 "" H 5300 2550 50  0001 C CNN
+	1    5300 2550
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDREF #PWR019
 U 1 1 5B1097EC
-P 4400 2750
-F 0 "#PWR019" H 4400 2500 50  0001 C CNN
-F 1 "GNDREF" H 4400 2600 50  0000 C CNN
-F 2 "" H 4400 2750 50  0001 C CNN
-F 3 "" H 4400 2750 50  0001 C CNN
-	1    4400 2750
+P 4400 3250
+F 0 "#PWR019" H 4400 3000 50  0001 C CNN
+F 1 "GNDREF" H 4400 3100 50  0000 C CNN
+F 2 "" H 4400 3250 50  0001 C CNN
+F 3 "" H 4400 3250 50  0001 C CNN
+	1    4400 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDREF #PWR023
 U 1 1 5B11A43E
-P 5400 5100
-F 0 "#PWR023" H 5400 4850 50  0001 C CNN
-F 1 "GNDREF" H 5400 4950 50  0000 C CNN
-F 2 "" H 5400 5100 50  0001 C CNN
-F 3 "" H 5400 5100 50  0001 C CNN
-	1    5400 5100
+P 5950 4750
+F 0 "#PWR023" H 5950 4500 50  0001 C CNN
+F 1 "GNDREF" H 5950 4600 50  0000 C CNN
+F 2 "" H 5950 4750 50  0001 C CNN
+F 3 "" H 5950 4750 50  0001 C CNN
+	1    5950 4750
 	-1   0    0    1   
 $EndComp
 $Comp
 L power:GNDREF #PWR024
 U 1 1 5B11AD2A
-P 3900 6600
-F 0 "#PWR024" H 3900 6350 50  0001 C CNN
-F 1 "GNDREF" H 3900 6450 50  0000 C CNN
-F 2 "" H 3900 6600 50  0001 C CNN
-F 3 "" H 3900 6600 50  0001 C CNN
-	1    3900 6600
+P 4450 6250
+F 0 "#PWR024" H 4450 6000 50  0001 C CNN
+F 1 "GNDREF" H 4450 6100 50  0000 C CNN
+F 2 "" H 4450 6250 50  0001 C CNN
+F 3 "" H 4450 6250 50  0001 C CNN
+	1    4450 6250
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDREF #PWR025
 U 1 1 5B11DE34
-P 4050 4700
-F 0 "#PWR025" H 4050 4450 50  0001 C CNN
-F 1 "GNDREF" H 4050 4550 50  0000 C CNN
-F 2 "" H 4050 4700 50  0001 C CNN
-F 3 "" H 4050 4700 50  0001 C CNN
-	1    4050 4700
+P 4600 4350
+F 0 "#PWR025" H 4600 4100 50  0001 C CNN
+F 1 "GNDREF" H 4600 4200 50  0000 C CNN
+F 2 "" H 4600 4350 50  0001 C CNN
+F 3 "" H 4600 4350 50  0001 C CNN
+	1    4600 4350
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C27
 U 1 1 5B143B7A
-P 3700 4850
-F 0 "C27" H 3710 4920 50  0000 L CNN
-F 1 "1uF" H 3710 4770 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 3700 4850 50  0001 C CNN
-F 3 "" H 3700 4850 50  0001 C CNN
-	1    3700 4850
+P 4250 4500
+F 0 "C27" H 4260 4570 50  0000 L CNN
+F 1 "1uF" H 4260 4420 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 4250 4500 50  0001 C CNN
+F 3 "" H 4250 4500 50  0001 C CNN
+	1    4250 4500
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R13
 U 1 1 5B1468ED
-P 10000 4150
-F 0 "R13" V 10080 4150 50  0000 C CNN
-F 1 "10k" V 9900 4150 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 9930 4150 50  0001 C CNN
-F 3 "" H 10000 4150 50  0001 C CNN
-	1    10000 4150
+P 9400 4100
+F 0 "R13" V 9480 4100 50  0000 C CNN
+F 1 "10k" V 9300 4100 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 9330 4100 50  0001 C CNN
+F 3 "" H 9400 4100 50  0001 C CNN
+	1    9400 4100
 	0    -1   -1   0   
 $EndComp
-Text Label 9850 4150 2    60   ~ 0
+Text Label 9250 4100 2    60   ~ 0
 VDD
-Text Label 10150 4150 0    60   ~ 0
+Text Label 9550 4100 0    60   ~ 0
 USB_INT
-Text Label 8500 3400 2    60   ~ 0
+Text Label 8550 2650 2    60   ~ 0
 VDD
 $Comp
 L power:GNDREF #PWR026
 U 1 1 5B2B81FD
-P 8500 4000
-F 0 "#PWR026" H 8500 3750 50  0001 C CNN
-F 1 "GNDREF" H 8500 3850 50  0000 C CNN
-F 2 "" H 8500 4000 50  0001 C CNN
-F 3 "" H 8500 4000 50  0001 C CNN
-	1    8500 4000
+P 8550 3250
+F 0 "#PWR026" H 8550 3000 50  0001 C CNN
+F 1 "GNDREF" H 8550 3100 50  0000 C CNN
+F 2 "" H 8550 3250 50  0001 C CNN
+F 3 "" H 8550 3250 50  0001 C CNN
+	1    8550 3250
 	1    0    0    -1  
 $EndComp
-Text Label 8250 3600 2    60   ~ 0
+Text Label 8300 2850 2    60   ~ 0
 DAC
-Text Label 8900 3700 0    60   ~ 0
+Text Label 8950 2950 0    60   ~ 0
 VNIXIE
-Text Label 8250 3800 2    60   ~ 0
+Text Label 8300 3050 2    60   ~ 0
 VNIXIE
 Wire Wire Line
-	7900 2650 7900 2350
-Wire Wire Line
-	7800 2650 7900 2650
-Wire Wire Line
-	7500 2650 7600 2650
+	6900 2950 6900 2750
 Wire Wire Line
-	7900 2350 8050 2350
+	6500 2850 6500 2950
 Wire Wire Line
-	7050 4050 7050 3850
+	6500 2450 6650 2450
 Wire Wire Line
-	6650 3950 6650 4050
+	6500 2450 6500 2550
+Connection ~ 6500 2450
+Connection ~ 6500 2550
 Wire Wire Line
-	6650 3550 6800 3550
+	6650 2450 6650 2650
 Wire Wire Line
-	6650 3550 6650 3650
-Connection ~ 6650 3550
-Connection ~ 6650 3650
+	6900 2450 6900 2550
+Connection ~ 6650 2450
 Wire Wire Line
-	6800 3550 6800 3750
+	6650 2950 6650 2850
+Connection ~ 6500 2950
+Connection ~ 6650 2950
+Connection ~ 6500 2650
+Connection ~ 2050 5450
 Wire Wire Line
-	7050 3550 7050 3650
-Connection ~ 6800 3550
+	2050 5350 2050 5450
+Connection ~ 1350 5450
 Wire Wire Line
-	6800 4050 6800 3950
-Connection ~ 6650 4050
-Connection ~ 6800 4050
-Connection ~ 6650 3750
-Wire Wire Line
-	7150 2350 7250 2350
-Connection ~ 8050 2150
-Connection ~ 2050 5400
-Wire Wire Line
-	2050 5300 2050 5400
-Connection ~ 1350 5400
-Wire Wire Line
-	1350 5300 1350 5400
+	1350 5350 1350 5450
 Connection ~ 2050 1050
 Connection ~ 2050 1150
 Connection ~ 2050 1250
@@ -856,61 +388,6 @@ Connection ~ 2050 2650
 Connection ~ 2050 2450
 Wire Wire Line
 	2050 4050 2050 3650
-Wire Wire Line
-	7150 1850 7150 1950
-Wire Wire Line
-	8300 1450 8300 1800
-Connection ~ 8050 1800
-Connection ~ 7800 1800
-Wire Wire Line
-	8050 1550 8050 1800
-Wire Wire Line
-	7800 1650 7800 1800
-Connection ~ 7800 2150
-Wire Wire Line
-	7800 2150 7800 2100
-Wire Wire Line
-	8050 2150 8050 2100
-Wire Wire Line
-	7150 1250 8300 1250
-Wire Wire Line
-	7150 1350 8050 1350
-Wire Wire Line
-	7150 1450 7800 1450
-Connection ~ 7550 2150
-Wire Wire Line
-	7150 2150 7550 2150
-Connection ~ 7150 2150
-Wire Wire Line
-	7150 2050 7150 2150
-Wire Wire Line
-	7550 2150 7550 2050
-Connection ~ 7150 1750
-Wire Wire Line
-	7150 1650 7150 1750
-Wire Wire Line
-	7550 1750 7550 1850
-Wire Wire Line
-	7150 1750 7550 1750
-Wire Wire Line
-	6050 2450 6050 2750
-Wire Wire Line
-	6000 2450 6050 2450
-Wire Wire Line
-	7150 1850 7350 1850
-Connection ~ 5650 2450
-Wire Wire Line
-	5650 2250 6150 2250
-Wire Wire Line
-	5650 2250 5650 2450
-Wire Wire Line
-	5250 2450 5300 2450
-Wire Wire Line
-	5600 2450 5650 2450
-Wire Wire Line
-	5850 1550 6150 1550
-Wire Wire Line
-	7150 1550 7550 1550
 Wire Wire Line
 	2050 3650 1950 3650
 Wire Wire Line
@@ -948,9 +425,9 @@ Wire Wire Line
 Wire Wire Line
 	1450 4050 1450 3950
 Wire Wire Line
-	3300 2750 3200 2750
+	3300 3250 3200 3250
 Wire Wire Line
-	3200 2650 3300 2650
+	3200 3150 3300 3150
 Wire Wire Line
 	2050 2050 1950 2050
 Wire Wire Line
@@ -968,41 +445,21 @@ Wire Wire Line
 Wire Wire Line
 	1950 1050 2050 1050
 Wire Wire Line
-	5350 5100 5400 5100
-Wire Wire Line
-	2050 5500 1950 5500
+	5900 4750 5950 4750
 Wire Wire Line
-	1950 5400 2050 5400
+	2050 5550 1950 5550
 Wire Wire Line
-	1950 5300 2050 5300
+	1950 5450 2050 5450
 Wire Wire Line
-	1450 6000 1350 6000
+	1950 5350 2050 5350
 Wire Wire Line
-	2050 5900 1950 5900
+	1450 6100 1350 6100
 Wire Wire Line
-	1350 6100 1450 6100
-Wire Notes Line
-	5950 6550 5950 5450
-Wire Notes Line
-	6450 6550 5950 6550
-Wire Notes Line
-	6450 5450 6450 6550
-Wire Notes Line
-	5950 5450 6450 5450
-Wire Notes Line
-	3150 5650 3650 5650
-Wire Notes Line
-	3150 6550 3150 5650
-Wire Notes Line
-	3650 6550 3150 6550
-Wire Notes Line
-	3650 5650 3650 6550
-Wire Wire Line
-	4150 3750 4050 3750
+	2050 6000 1950 6000
 Wire Wire Line
-	9900 5100 9750 5100
+	1350 6200 1450 6200
 Wire Wire Line
-	10100 5100 10200 5100
+	6400 1600 6300 1600
 Wire Wire Line
 	1350 4700 1450 4700
 Wire Wire Line
@@ -1010,9 +467,7 @@ Wire Wire Line
 Wire Wire Line
 	1950 4800 2050 4800
 Wire Wire Line
-	3700 5100 3950 5100
-Wire Wire Line
-	5350 5900 6000 5900
+	4250 4750 4500 4750
 Wire Wire Line
 	1450 4900 1350 4900
 Wire Wire Line
@@ -1020,161 +475,91 @@ Wire Wire Line
 Wire Wire Line
 	1950 4900 2050 4900
 Wire Wire Line
-	5350 5200 5700 5200
-Wire Wire Line
-	2050 6000 1950 6000
+	5900 4850 6250 4850
 Wire Wire Line
 	2050 6100 1950 6100
 Wire Wire Line
-	1350 5900 1450 5900
-Wire Wire Line
-	1350 5300 1450 5300
-Wire Wire Line
-	1350 5500 1450 5500
-Wire Wire Line
-	5350 5600 6000 5600
-Wire Wire Line
-	9750 5400 9850 5400
+	2050 6200 1950 6200
 Wire Wire Line
-	9750 5700 9850 5700
+	1350 6000 1450 6000
 Wire Wire Line
-	9750 6000 9850 6000
+	1350 5350 1450 5350
 Wire Wire Line
-	5350 6500 6000 6500
+	1350 5550 1450 5550
 Wire Wire Line
-	8500 4700 8600 4700
+	8000 4100 8100 4100
 Wire Wire Line
-	3600 5800 3950 5800
+	4150 5850 4500 5850
 Wire Wire Line
-	3600 5900 3950 5900
+	4150 5950 4500 5950
 Wire Wire Line
-	3600 6200 3950 6200
+	4150 6050 4500 6050
 Wire Wire Line
-	3600 6300 3950 6300
+	4150 6150 4500 6150
 Wire Wire Line
-	3600 6400 3950 6400
+	7900 4600 8000 4600
 Wire Wire Line
-	3600 6500 3950 6500
+	8400 4600 8500 4600
 Wire Wire Line
-	5350 6000 6000 6000
+	6500 1700 6300 1700
 Wire Wire Line
-	5350 5700 5650 5700
+	5650 1800 5450 1800
 Wire Wire Line
-	8850 5800 8950 5800
+	6500 2950 6650 2950
 Wire Wire Line
-	8850 5450 8950 5450
+	5600 2750 5600 2850
+Connection ~ 5600 2850
+Connection ~ 5600 2950
 Wire Wire Line
-	8850 5100 8950 5100
+	5600 2650 5500 2650
 Wire Wire Line
-	8350 5100 8450 5100
+	5500 2650 5500 2800
 Wire Wire Line
-	8350 5450 8450 5450
+	5500 2800 5100 2800
 Wire Wire Line
-	8350 5800 8450 5800
+	5100 2800 5100 2700
 Wire Wire Line
-	8350 6150 8450 6150
+	5600 2450 5100 2450
 Wire Wire Line
-	8850 6150 8950 6150
-Connection ~ 7150 1850
+	5100 2450 5100 2500
 Wire Wire Line
-	7800 1800 8050 1800
+	5600 2550 5300 2550
 Wire Wire Line
-	4250 3850 4050 3850
+	6500 3200 6500 3050
 Wire Wire Line
-	3400 3950 3200 3950
+	5500 3200 5600 3200
+Connection ~ 5600 3050
 Wire Wire Line
-	6650 4050 6800 4050
+	4200 3250 4400 3250
 Wire Wire Line
-	5750 3850 5750 3950
-Connection ~ 5750 3950
-Connection ~ 5750 4050
+	5550 1700 5650 1700
 Wire Wire Line
-	5750 3750 5650 3750
+	4450 6250 4500 6250
+Connection ~ 5600 3200
 Wire Wire Line
-	5650 3750 5650 3900
+	4250 4600 4250 4750
 Wire Wire Line
-	5650 3900 5250 3900
+	4250 4350 4250 4400
 Wire Wire Line
-	5250 3900 5250 3800
+	8300 2850 8350 2850
 Wire Wire Line
-	5750 3550 5250 3550
+	8300 3050 8350 3050
 Wire Wire Line
-	5250 3550 5250 3600
+	6500 2550 6500 2650
 Wire Wire Line
-	5750 3650 5450 3650
+	6650 2450 6900 2450
 Wire Wire Line
-	6650 4300 6650 4150
+	6650 2950 6900 2950
 Wire Wire Line
-	5650 4300 5750 4300
-Connection ~ 5750 4150
+	6500 2650 6500 2750
 Wire Wire Line
-	7250 2350 7250 2400
+	2050 5450 2050 5550
 Wire Wire Line
-	7500 2350 7500 2650
-Connection ~ 7250 2350
+	2050 5450 2150 5450
 Wire Wire Line
-	7150 2250 7150 2350
+	1350 5450 1350 5550
 Wire Wire Line
-	4200 2750 4400 2750
-Wire Wire Line
-	3300 3850 3400 3850
-Wire Wire Line
-	3900 6600 3950 6600
-Wire Wire Line
-	2900 4950 2900 5050
-Wire Wire Line
-	3450 4950 3450 5050
-Wire Wire Line
-	2900 5300 3950 5300
-Connection ~ 2900 5050
-Wire Wire Line
-	3450 5200 3950 5200
-Connection ~ 3450 5050
-Connection ~ 8300 1800
-Wire Wire Line
-	8300 2100 8300 2150
-Connection ~ 8300 2150
-Wire Wire Line
-	3450 5050 3350 5050
-Wire Wire Line
-	3050 5050 2900 5050
-Connection ~ 5750 4300
-Wire Wire Line
-	3700 4950 3700 5100
-Wire Wire Line
-	2900 4700 3450 4700
-Wire Wire Line
-	3700 4700 3700 4750
-Wire Wire Line
-	3450 4700 3450 4750
-Connection ~ 3700 4700
-Wire Wire Line
-	2900 4700 2900 4750
-Connection ~ 3450 4700
-Wire Wire Line
-	5600 2150 6150 2150
-Wire Wire Line
-	8250 3600 8300 3600
-Wire Wire Line
-	8250 3800 8300 3800
-Wire Wire Line
-	6650 3650 6650 3750
-Wire Wire Line
-	6800 3550 7050 3550
-Wire Wire Line
-	6800 4050 7050 4050
-Wire Wire Line
-	6650 3750 6650 3850
-Wire Wire Line
-	8050 2150 8300 2150
-Wire Wire Line
-	2050 5400 2050 5500
-Wire Wire Line
-	2050 5400 2150 5400
-Wire Wire Line
-	1350 5400 1350 5500
-Wire Wire Line
-	1350 5400 1450 5400
+	1350 5450 1450 5450
 Wire Wire Line
 	2050 1050 2150 1050
 Wire Wire Line
@@ -1199,20 +584,6 @@ Wire Wire Line
 	2050 2650 2050 2450
 Wire Wire Line
 	2050 2450 2050 2350
-Wire Wire Line
-	5850 1250 6150 1250
-Wire Wire Line
-	8050 1800 8050 1900
-Wire Wire Line
-	8050 1800 8300 1800
-Wire Wire Line
-	7800 1800 7800 1900
-Wire Wire Line
-	7800 2150 8050 2150
-Wire Wire Line
-	5650 2450 5650 2750
-Wire Wire Line
-	5650 2450 5700 2450
 Wire Wire Line
 	1150 4050 1250 4050
 Wire Wire Line
@@ -1222,52 +593,38 @@ Wire Wire Line
 Wire Wire Line
 	1450 4050 2050 4050
 Wire Wire Line
-	5750 3950 5750 4050
-Wire Wire Line
-	5750 4050 5750 4150
-Wire Wire Line
-	5750 4150 5750 4300
-Wire Wire Line
-	7250 2350 7500 2350
-Wire Wire Line
-	2900 5050 2900 5300
-Wire Wire Line
-	3450 5050 3450 5200
+	5600 2850 5600 2950
 Wire Wire Line
-	8300 1800 8300 1900
+	5600 2950 5600 3050
 Wire Wire Line
-	8300 1800 8400 1800
+	5600 3050 5600 3200
 Wire Wire Line
-	8300 2150 8450 2150
+	5600 3200 6500 3200
 Wire Wire Line
-	5750 4300 6650 4300
+	4250 4350 4600 4350
 Wire Wire Line
-	3700 4700 4050 4700
-Wire Wire Line
-	3450 4700 3700 4700
-Wire Wire Line
-	4200 2750 4200 2850
+	4200 3250 4200 3350
 $Comp
-L Custom_Parts:TUSB320 U4
+L Custom_Parts:TUSB320 U3
 U 1 1 5B5B1CD3
-P 3750 2900
-F 0 "U4" H 3750 3397 60  0000 C CNN
-F 1 "TUSB320" H 3750 3291 60  0000 C CNN
-F 2 "Custom Parts:X2QFN-12_1.6x1.6mm_Pitch0.4mm" H 4100 2900 60  0001 C CNN
-F 3 "" H 4100 2900 60  0001 C CNN
-	1    3750 2900
+P 3750 3400
+F 0 "U3" H 3750 3897 60  0000 C CNN
+F 1 "TUSB320" H 3750 3791 60  0000 C CNN
+F 2 "Custom Parts:X2QFN-12_1.6x1.6mm_Pitch0.4mm" H 4100 3400 60  0001 C CNN
+F 3 "" H 4100 3400 60  0001 C CNN
+	1    3750 3400
 	1    0    0    -1  
 $EndComp
-Connection ~ 4200 2750
+Connection ~ 4200 3250
 $Comp
 L Custom_Parts:STM32L432K U7
 U 1 1 5B622DF7
-P 4650 5850
-F 0 "U7" H 4650 6847 60  0000 C CNN
-F 1 "STM32L432K" H 4650 6741 60  0000 C CNN
-F 2 "Housings_DFN_QFN:QFN-32-1EP_5x5mm_Pitch0.5mm" H 4650 6300 60  0001 C CNN
-F 3 "" H 4650 6300 60  0001 C CNN
-	1    4650 5850
+P 5200 5500
+F 0 "U7" H 5200 6497 60  0000 C CNN
+F 1 "STM32L432K" H 5200 6391 60  0000 C CNN
+F 2 "Housings_DFN_QFN:QFN-32-1EP_5x5mm_Pitch0.5mm" H 5200 5950 60  0001 C CNN
+F 3 "" H 5200 5950 60  0001 C CNN
+	1    5200 5500
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1292,100 +649,34 @@ Wire Wire Line
 $Comp
 L pspice:OPAMP U8
 U 1 1 5B648E46
-P 8600 3700
-F 0 "U8" H 8600 3700 50  0000 L CNN
-F 1 "OPAMP" H 8941 3655 50  0000 L CNN
-F 2 "TO_SOT_Packages_SMD:SOT-23-6" H 8600 3700 50  0001 C CNN
-F 3 "" H 8600 3700 50  0001 C CNN
-	1    8600 3700
+P 8650 2950
+F 0 "U8" H 8650 2950 50  0000 L CNN
+F 1 "OPAMP" H 8991 2905 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-6" H 8650 2950 50  0001 C CNN
+F 3 "" H 8650 2950 50  0001 C CNN
+	1    8650 2950
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector:Conn_01x01_Female J8
 U 1 1 5B649686
-P 8800 4700
-F 0 "J8" H 8827 4726 50  0000 L CNN
-F 1 "Conn_01x01_Female" H 8827 4635 50  0000 L CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm" H 8800 4700 50  0001 C CNN
-F 3 "~" H 8800 4700 50  0001 C CNN
-	1    8800 4700
-	1    0    0    -1  
-$EndComp
-$Comp
-L Connector:Conn_01x01_Female J5
-U 1 1 5B64998B
-P 10350 5400
-F 0 "J5" H 10377 5426 50  0000 L CNN
-F 1 "Conn_01x01_Female" H 10377 5335 50  0000 L CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm" H 10350 5400 50  0001 C CNN
-F 3 "~" H 10350 5400 50  0001 C CNN
-	1    10350 5400
-	1    0    0    -1  
-$EndComp
-$Comp
-L Connector:Conn_01x01_Female J6
-U 1 1 5B649A31
-P 10350 5700
-F 0 "J6" H 10377 5726 50  0000 L CNN
-F 1 "Conn_01x01_Female" H 10377 5635 50  0000 L CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm" H 10350 5700 50  0001 C CNN
-F 3 "~" H 10350 5700 50  0001 C CNN
-	1    10350 5700
-	1    0    0    -1  
-$EndComp
-$Comp
-L Connector:Conn_01x01_Female J7
-U 1 1 5B649AD1
-P 10350 6000
-F 0 "J7" H 10377 6026 50  0000 L CNN
-F 1 "Conn_01x01_Female" H 10377 5935 50  0000 L CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm" H 10350 6000 50  0001 C CNN
-F 3 "~" H 10350 6000 50  0001 C CNN
-	1    10350 6000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push SW1
-U 1 1 5B64A153
-P 8650 5100
-F 0 "SW1" H 8650 5385 50  0000 C CNN
-F 1 "SW_Push" H 8650 5294 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_EVQP7A" H 8650 5300 50  0001 C CNN
-F 3 "" H 8650 5300 50  0001 C CNN
-	1    8650 5100
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push SW2
-U 1 1 5B64A319
-P 8650 5450
-F 0 "SW2" H 8650 5735 50  0000 C CNN
-F 1 "SW_Push" H 8650 5644 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_EVQP7A" H 8650 5650 50  0001 C CNN
-F 3 "" H 8650 5650 50  0001 C CNN
-	1    8650 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push SW3
-U 1 1 5B64A3B3
-P 8650 5800
-F 0 "SW3" H 8650 6085 50  0000 C CNN
-F 1 "SW_Push" H 8650 5994 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_EVQP7A" H 8650 6000 50  0001 C CNN
-F 3 "" H 8650 6000 50  0001 C CNN
-	1    8650 5800
+P 8300 4100
+F 0 "J8" H 8327 4126 50  0000 L CNN
+F 1 "Conn_01x01_Female" H 8327 4035 50  0000 L CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm" H 8300 4100 50  0001 C CNN
+F 3 "~" H 8300 4100 50  0001 C CNN
+	1    8300 4100
 	1    0    0    -1  
 $EndComp
 $Comp
 L Switch:SW_Push SW4
 U 1 1 5B64A44F
-P 8650 6150
-F 0 "SW4" H 8650 6435 50  0000 C CNN
-F 1 "SW_Push" H 8650 6344 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_EVQP7A" H 8650 6350 50  0001 C CNN
-F 3 "" H 8650 6350 50  0001 C CNN
-	1    8650 6150
+P 8200 4600
+F 0 "SW4" H 8200 4885 50  0000 C CNN
+F 1 "SW_Push" H 8200 4794 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_EVQP7A" H 8200 4800 50  0001 C CNN
+F 3 "" H 8200 4800 50  0001 C CNN
+	1    8200 4600
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1402,40 +693,25 @@ $EndComp
 $Comp
 L Connector_Generic:Conn_02x03_Odd_Even J4
 U 1 1 5B6941D3
-P 1650 5400
-F 0 "J4" H 1700 5717 50  0000 C CNN
-F 1 "Nixie_HV" H 1700 5626 50  0000 C CNN
-F 2 "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm" H 1650 5400 50  0001 C CNN
-F 3 "~" H 1650 5400 50  0001 C CNN
-	1    1650 5400
+P 1650 5450
+F 0 "J4" H 1700 5767 50  0000 C CNN
+F 1 "Nixie_HV" H 1700 5676 50  0000 C CNN
+F 2 "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm" H 1650 5450 50  0001 C CNN
+F 3 "~" H 1650 5450 50  0001 C CNN
+	1    1650 5450
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector_Generic:Conn_02x03_Odd_Even J2
 U 1 1 5B694500
-P 1650 6000
-F 0 "J2" H 1700 6317 50  0000 C CNN
-F 1 "Nixie_CTRL" H 1700 6226 50  0000 C CNN
-F 2 "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm" H 1650 6000 50  0001 C CNN
-F 3 "~" H 1650 6000 50  0001 C CNN
-	1    1650 6000
+P 1650 6100
+F 0 "J2" H 1700 6417 50  0000 C CNN
+F 1 "Nixie_CTRL" H 1700 6326 50  0000 C CNN
+F 2 "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm" H 1650 6100 50  0001 C CNN
+F 3 "~" H 1650 6100 50  0001 C CNN
+	1    1650 6100
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	7550 2150 7800 2150
-$Comp
-L Connector:TestPoint_2Pole TP1
-U 1 1 5B695245
-P 7700 2350
-F 0 "TP1" H 7700 2250 50  0000 C CNN
-F 1 "TEST_BAT" H 7700 2454 50  0000 C CNN
-F 2 "Measurement_Points:Test_Point_2Pads" H 7700 2350 50  0001 C CNN
-F 3 "~" H 7700 2350 50  0001 C CNN
-	1    7700 2350
-	1    0    0    -1  
-$EndComp
-Connection ~ 7500 2350
-Connection ~ 7900 2350
 $Comp
 L Custom_Parts:ESD122 D4
 U 1 1 5B916041
@@ -1447,19 +723,17 @@ F 3 "" H 3750 1350 50  0001 C CNN
 	1    3750 1350
 	1    0    0    -1  
 $EndComp
-Text Label 3200 2750 2    60   ~ 0
+Text Label 3200 3250 2    60   ~ 0
 CC1
-Text Label 3200 2650 2    60   ~ 0
+Text Label 3200 3150 2    60   ~ 0
 CC2
 Text Label 3400 1450 2    60   ~ 0
 CC2
 Text Label 3400 1250 2    60   ~ 0
 CC1
-Connection ~ 7050 4050
-Text Label 3300 3750 2    60   ~ 0
-VSYS
+Connection ~ 6900 2950
 Wire Wire Line
-	3300 3750 3400 3750
+	5550 1600 5650 1600
 $Comp
 L Custom_Parts:ESD122 D5
 U 1 1 5BA1CDBE
@@ -1500,25 +774,25 @@ $EndComp
 $Comp
 L Device:D D6
 U 1 1 5B902F50
-P 10000 3800
-F 0 "D6" H 10000 4016 50  0000 C CNN
-F 1 "D" H 10000 3925 50  0000 C CNN
-F 2 "Custom Parts:X1SON" H 10000 3800 50  0001 C CNN
-F 3 "~" H 10000 3800 50  0001 C CNN
-	1    10000 3800
+P 3650 2650
+F 0 "D6" H 3650 2866 50  0000 C CNN
+F 1 "D" H 3650 2775 50  0000 C CNN
+F 2 "Custom Parts:X1SON" H 3650 2650 50  0001 C CNN
+F 3 "~" H 3650 2650 50  0001 C CNN
+	1    3650 2650
 	1    0    0    -1  
 $EndComp
-Text Label 9850 3800 2    60   ~ 0
+Text Label 3500 2650 2    60   ~ 0
 VBUS
 $Comp
 L power:GNDREF #PWR0103
 U 1 1 5B903362
-P 10150 3800
-F 0 "#PWR0103" H 10150 3550 50  0001 C CNN
-F 1 "GNDREF" H 10150 3650 50  0000 C CNN
-F 2 "" H 10150 3800 50  0001 C CNN
-F 3 "" H 10150 3800 50  0001 C CNN
-	1    10150 3800
+P 3800 2650
+F 0 "#PWR0103" H 3800 2400 50  0001 C CNN
+F 1 "GNDREF" H 3800 2500 50  0000 C CNN
+F 2 "" H 3800 2650 50  0001 C CNN
+F 3 "" H 3800 2650 50  0001 C CNN
+	1    3800 2650
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -1535,108 +809,122 @@ $EndComp
 $Comp
 L power:GNDREF #PWR0105
 U 1 1 5B91DEBE
-P 1350 5500
-F 0 "#PWR0105" H 1350 5250 50  0001 C CNN
-F 1 "GNDREF" H 1350 5350 50  0000 C CNN
-F 2 "" H 1350 5500 50  0001 C CNN
-F 3 "" H 1350 5500 50  0001 C CNN
-	1    1350 5500
+P 1350 5550
+F 0 "#PWR0105" H 1350 5300 50  0001 C CNN
+F 1 "GNDREF" H 1350 5400 50  0000 C CNN
+F 2 "" H 1350 5550 50  0001 C CNN
+F 3 "" H 1350 5550 50  0001 C CNN
+	1    1350 5550
 	1    0    0    -1  
 $EndComp
-Connection ~ 1350 5500
+Connection ~ 1350 5550
 $Comp
 L power:GNDREF #PWR0106
 U 1 1 5B91DFA9
-P 2050 6100
-F 0 "#PWR0106" H 2050 5850 50  0001 C CNN
-F 1 "GNDREF" H 2050 5950 50  0000 C CNN
-F 2 "" H 2050 6100 50  0001 C CNN
-F 3 "" H 2050 6100 50  0001 C CNN
-	1    2050 6100
+P 2050 6200
+F 0 "#PWR0106" H 2050 5950 50  0001 C CNN
+F 1 "GNDREF" H 2050 6050 50  0000 C CNN
+F 2 "" H 2050 6200 50  0001 C CNN
+F 3 "" H 2050 6200 50  0001 C CNN
+	1    2050 6200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2050 6000 2050 6100
-Connection ~ 2050 6100
+	2050 6100 2050 6200
+Connection ~ 2050 6200
 $Comp
 L power:GNDREF #PWR0107
 U 1 1 5B92A060
-P 1350 5900
-F 0 "#PWR0107" H 1350 5650 50  0001 C CNN
-F 1 "GNDREF" H 1350 5750 50  0000 C CNN
-F 2 "" H 1350 5900 50  0001 C CNN
-F 3 "" H 1350 5900 50  0001 C CNN
-	1    1350 5900
+P 1350 6000
+F 0 "#PWR0107" H 1350 5750 50  0001 C CNN
+F 1 "GNDREF" H 1350 5850 50  0000 C CNN
+F 2 "" H 1350 6000 50  0001 C CNN
+F 3 "" H 1350 6000 50  0001 C CNN
+	1    1350 6000
 	-1   0    0    1   
 $EndComp
 $Comp
 L power:GNDREF #PWR0108
 U 1 1 5B94360C
-P 6100 5150
-F 0 "#PWR0108" H 6100 4900 50  0001 C CNN
-F 1 "GNDREF" H 6100 5000 50  0000 C CNN
-F 2 "" H 6100 5150 50  0001 C CNN
-F 3 "" H 6100 5150 50  0001 C CNN
-	1    6100 5150
+P 6650 4800
+F 0 "#PWR0108" H 6650 4550 50  0001 C CNN
+F 1 "GNDREF" H 6650 4650 50  0000 C CNN
+F 2 "" H 6650 4800 50  0001 C CNN
+F 3 "" H 6650 4800 50  0001 C CNN
+	1    6650 4800
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	6000 5200 6100 5200
+	6550 4850 6650 4850
 Wire Wire Line
-	6100 5200 6100 5150
-$Comp
-L power:GNDREF #PWR0109
-U 1 1 5B94FE11
-P 10200 5100
-F 0 "#PWR0109" H 10200 4850 50  0001 C CNN
-F 1 "GNDREF" H 10200 4950 50  0000 C CNN
-F 2 "" H 10200 5100 50  0001 C CNN
-F 3 "" H 10200 5100 50  0001 C CNN
-	1    10200 5100
-	0    -1   -1   0   
-$EndComp
+	6650 4850 6650 4800
 $Comp
-L power:GNDREF #PWR0110
-U 1 1 5B94FE8C
-P 8950 5100
-F 0 "#PWR0110" H 8950 4850 50  0001 C CNN
-F 1 "GNDREF" H 8950 4950 50  0000 C CNN
-F 2 "" H 8950 5100 50  0001 C CNN
-F 3 "" H 8950 5100 50  0001 C CNN
-	1    8950 5100
+L power:GNDREF #PWR0113
+U 1 1 5B950115
+P 8500 4600
+F 0 "#PWR0113" H 8500 4350 50  0001 C CNN
+F 1 "GNDREF" H 8500 4450 50  0000 C CNN
+F 2 "" H 8500 4600 50  0001 C CNN
+F 3 "" H 8500 4600 50  0001 C CNN
+	1    8500 4600
 	0    -1   -1   0   
 $EndComp
 $Comp
-L power:GNDREF #PWR0111
-U 1 1 5B95001F
-P 8950 5450
-F 0 "#PWR0111" H 8950 5200 50  0001 C CNN
-F 1 "GNDREF" H 8950 5300 50  0000 C CNN
-F 2 "" H 8950 5450 50  0001 C CNN
-F 3 "" H 8950 5450 50  0001 C CNN
-	1    8950 5450
-	0    -1   -1   0   
+L Device:Battery_Cell BT1
+U 1 1 5BA7F4A1
+P 9200 5800
+F 0 "BT1" H 9318 5896 50  0000 L CNN
+F 1 "Battery_Cell" H 9318 5805 50  0000 L CNN
+F 2 "Custom Parts:CR1220_Holder" V 9200 5860 50  0001 C CNN
+F 3 "~" V 9200 5860 50  0001 C CNN
+	1    9200 5800
+	1    0    0    -1  
 $EndComp
 $Comp
-L power:GNDREF #PWR0112
-U 1 1 5B95009A
-P 8950 5800
-F 0 "#PWR0112" H 8950 5550 50  0001 C CNN
-F 1 "GNDREF" H 8950 5650 50  0000 C CNN
-F 2 "" H 8950 5800 50  0001 C CNN
-F 3 "" H 8950 5800 50  0001 C CNN
-	1    8950 5800
-	0    -1   -1   0   
+L Custom_Parts:DS3231 U2
+U 1 1 5BAADC28
+P 8250 5750
+F 0 "U2" H 8250 6325 50  0000 C CNN
+F 1 "DS3231" H 8250 6234 50  0000 C CNN
+F 2 "SMD_Packages:SO-16-L" H 8250 5750 50  0001 C CNN
+F 3 "" H 8250 5750 50  0001 C CNN
+	1    8250 5750
+	1    0    0    -1  
 $EndComp
 $Comp
-L power:GNDREF #PWR0113
-U 1 1 5B950115
-P 8950 6150
-F 0 "#PWR0113" H 8950 5900 50  0001 C CNN
-F 1 "GNDREF" H 8950 6000 50  0000 C CNN
-F 2 "" H 8950 6150 50  0001 C CNN
-F 3 "" H 8950 6150 50  0001 C CNN
-	1    8950 6150
-	0    -1   -1   0   
+L power:GNDREF #PWR0109
+U 1 1 5BAADEE2
+P 9200 6000
+F 0 "#PWR0109" H 9200 5750 50  0001 C CNN
+F 1 "GNDREF" H 9200 5850 50  0000 C CNN
+F 2 "" H 9200 6000 50  0001 C CNN
+F 3 "" H 9200 6000 50  0001 C CNN
+	1    9200 6000
+	1    0    0    -1  
 $EndComp
+Text Label 8700 5500 0    60   ~ 0
+SDA
+Text Label 8700 5400 0    60   ~ 0
+SCL
+Text Label 7800 5500 2    60   ~ 0
+VDD
+Text Label 5500 3200 2    60   ~ 0
+VBUS
+Text Label 5550 1600 2    60   ~ 0
+VBUS
+Text Label 3300 3650 2    60   ~ 0
+USB_INT
+Text Label 7800 5600 2    50   ~ 0
+RTC_INT
+Wire Wire Line
+	8700 5600 9200 5600
+Wire Wire Line
+	8700 5700 8950 5700
+Wire Wire Line
+	8950 5700 8950 5900
+Wire Wire Line
+	8950 5900 9200 5900
+Wire Wire Line
+	9200 5900 9200 6000
+Connection ~ 9200 5900
 $EndSCHEMATC

Nixie_Bottom_Board/nixie_bottom_board.sch

@@ -15,213 +15,75 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Sheet
-S 3400 3650 650  400 
+S 5650 1500 650  400 
 U 5B07197A
 F0 "HV Power Supply" 60
 F1 "hv_power_supply.sch" 60
-F2 "VIN" I L 3400 3750 60 
-F3 "EN" I L 3400 3850 60 
-F4 "GND" I L 3400 3950 60 
-F5 "VOUT" I R 4050 3750 60 
-F6 "GND" I R 4050 3850 60 
+F2 "VIN" I L 5650 1600 60 
+F3 "EN" I L 5650 1700 60 
+F4 "GND" I L 5650 1800 60 
+F5 "VOUT" I R 6300 1600 60 
+F6 "GND" I R 6300 1700 60 
 $EndSheet
-$Comp
-L Device:Crystal Y1
-U 1 1 5B073DBF
-P 3200 5050
-F 0 "Y1" H 3200 5200 50  0000 C CNN
-F 1 "32.78k" H 3200 4900 50  0000 C CNN
-F 2 "Crystals:Crystal_SMD_2520-4pin_2.5x2.0mm" H 3200 5050 50  0001 C CNN
-F 3 "" H 3200 5050 50  0001 C CNN
-	1    3200 5050
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C26
-U 1 1 5B073E81
-P 3450 4850
-F 0 "C26" H 3460 4920 50  0000 L CNN
-F 1 "10pF" H 3460 4770 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 3450 4850 50  0001 C CNN
-F 3 "" H 3450 4850 50  0001 C CNN
-	1    3450 4850
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C25
-U 1 1 5B073EE2
-P 2900 4850
-F 0 "C25" H 2910 4920 50  0000 L CNN
-F 1 "10pF" H 2910 4770 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 2900 4850 50  0001 C CNN
-F 3 "" H 2900 4850 50  0001 C CNN
-	1    2900 4850
-	1    0    0    -1  
-$EndComp
-Text Label 5350 6600 0    60   ~ 0
+Text Label 5900 6250 0    60   ~ 0
 VDD
-Text Label 5350 6000 0    60   ~ 0
+Text Label 5900 5650 0    60   ~ 0
 SWDIO
-Text Label 5350 5900 0    60   ~ 0
+Text Label 5900 5550 0    60   ~ 0
 SWCLK
-Text Label 5350 5700 0    60   ~ 0
+Text Label 5900 5350 0    60   ~ 0
 SWO
-$Comp
-L Device:Battery_Cell BT1
-U 1 1 5B07444B
-P 8050 2550
-F 0 "BT1" H 8150 2650 50  0000 L CNN
-F 1 "BAT" H 8150 2550 50  0000 L CNN
-F 2 "Connectors_JST:JST_PH_S2B-PH-SM4-TB_02x2.00mm_Angled" V 8050 2610 50  0001 C CNN
-F 3 "" V 8050 2610 50  0001 C CNN
-	1    8050 2550
-	1    0    0    -1  
-$EndComp
 Text Label 2050 4700 0    60   ~ 0
 SWO
 Text Label 2050 4800 0    60   ~ 0
 SWCLK
 Text Label 1350 4800 2    60   ~ 0
 SWDIO
-Text Label 3950 5400 2    60   ~ 0
+Text Label 4500 5050 2    60   ~ 0
 NRST
 Text Label 2050 4900 0    60   ~ 0
 NRST
-Text Label 5350 6200 0    60   ~ 0
+Text Label 5900 5850 0    60   ~ 0
 USB_N
-Text Label 5350 6100 0    60   ~ 0
+Text Label 5900 5750 0    60   ~ 0
 USB_P
-Text Label 1350 6000 2    60   ~ 0
-SCL
 Text Label 1350 6100 2    60   ~ 0
+SCL
+Text Label 1350 6200 2    60   ~ 0
 SDA
-Text Label 2150 5400 0    60   ~ 0
+Text Label 2150 5450 0    60   ~ 0
 HV_OUT
-Text Label 2050 5900 0    60   ~ 0
+Text Label 2050 6000 0    60   ~ 0
 VNIXIE
-Text Label 5350 5600 0    60   ~ 0
-TSC_1
-Text Label 5350 5500 0    60   ~ 0
-TSC_2
-Text Label 5350 5400 0    60   ~ 0
-TSC_3
-$Comp
-L Device:C_Small C28
-U 1 1 5B07ACF8
-P 10000 5100
-F 0 "C28" H 10010 5170 50  0000 L CNN
-F 1 "C" H 10010 5020 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 10000 5100 50  0001 C CNN
-F 3 "" H 10000 5100 50  0001 C CNN
-	1    10000 5100
-	0    -1   -1   0   
-$EndComp
-Text Label 9750 6000 2    60   ~ 0
-TSC_1
-Text Label 9750 5700 2    60   ~ 0
-TSC_2
-Text Label 9750 5400 2    60   ~ 0
-TSC_3
-$Comp
-L Device:R R17
-U 1 1 5B07B730
-P 10000 5400
-F 0 "R17" V 10080 5400 50  0000 C CNN
-F 1 "1k" V 9900 5400 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 9930 5400 50  0001 C CNN
-F 3 "" H 10000 5400 50  0001 C CNN
-	1    10000 5400
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:R R18
-U 1 1 5B07B7AC
-P 10000 5700
-F 0 "R18" V 10080 5700 50  0000 C CNN
-F 1 "1k" V 9900 5700 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 9930 5700 50  0001 C CNN
-F 3 "" H 10000 5700 50  0001 C CNN
-	1    10000 5700
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:R R19
-U 1 1 5B07B818
-P 10000 6000
-F 0 "R19" V 10080 6000 50  0000 C CNN
-F 1 "1k" V 9900 6000 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 9930 6000 50  0001 C CNN
-F 3 "" H 10000 6000 50  0001 C CNN
-	1    10000 6000
-	0    -1   -1   0   
-$EndComp
-Text Label 5350 6500 0    60   ~ 0
+Text Label 5900 6150 0    60   ~ 0
 MCO
-Text Label 8500 4700 2    60   ~ 0
+Text Label 8000 4100 2    60   ~ 0
 MCO
-Text Label 3950 6100 2    60   ~ 0
+Text Label 4500 5750 2    60   ~ 0
 DAC
-Text Label 3600 5800 2    60   ~ 0
-QSPI_CS
-Text Label 3600 5900 2    60   ~ 0
-QSPI_CLK
-Text Label 3600 6200 2    60   ~ 0
-QSPI_IO3
-Text Label 3600 6300 2    60   ~ 0
-QSPI_IO2
-Text Label 3600 6500 2    60   ~ 0
-QSPI_IO0
-Text Label 3600 6400 2    60   ~ 0
-QSPI_IO1
-Text Label 6000 5900 0    60   ~ 0
-SAI_FS
-Text Label 6000 6000 0    60   ~ 0
-SAI_SD
-Text Label 5350 6400 0    60   ~ 0
+Text Label 5900 6050 0    60   ~ 0
 SCL
-Text Label 5350 6300 0    60   ~ 0
+Text Label 5900 5950 0    60   ~ 0
 SDA
-Text Label 6000 5600 0    60   ~ 0
-SAI_MCLK
-Text Label 3950 5700 2    60   ~ 0
-SW_1
-Text Label 3950 6000 2    60   ~ 0
-SW_2
-Text Label 6000 6500 0    60   ~ 0
-SAI_SCK
-Text Label 8350 5100 2    60   ~ 0
-SW_1
-Text Label 8350 5450 2    60   ~ 0
-SW_2
-Text Label 8350 5800 2    60   ~ 0
-SW_3
-Text Label 8350 6150 2    60   ~ 0
+Text Label 7900 4600 2    60   ~ 0
 NRST
-Text Label 3300 3850 2    60   ~ 0
+Text Label 5550 1700 2    60   ~ 0
 HV_EN
-Text Label 9750 5100 2    60   ~ 0
-TSC_4
 $Comp
 L Device:R R16
 U 1 1 5B08854F
-P 5850 5200
-F 0 "R16" V 5930 5200 50  0000 C CNN
-F 1 "1M" V 5750 5200 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5780 5200 50  0001 C CNN
-F 3 "" H 5850 5200 50  0001 C CNN
-	1    5850 5200
+P 6400 4850
+F 0 "R16" V 6480 4850 50  0000 C CNN
+F 1 "1M" V 6300 4850 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 6330 4850 50  0001 C CNN
+F 3 "" H 6400 4850 50  0001 C CNN
+	1    6400 4850
 	0    -1   -1   0   
 $EndComp
-Text Label 4150 3750 0    60   ~ 0
+Text Label 6400 1600 0    60   ~ 0
 HV_OUT
-Text Notes 3150 6650 0    60   ~ 0
-Rev. B
-Text Notes 5950 6650 0    60   ~ 0
-Rev. B
-Text Label 5350 5200 0    60   ~ 0
+Text Label 5900 4850 0    60   ~ 0
 HV_EN
-Text Label 5650 5700 0    60   ~ 0
-SW_3
 Text Label 2050 1550 0    60   ~ 0
 CC1
 Text Label 2050 1650 0    60   ~ 0
@@ -233,408 +95,111 @@ USB_P
 $Comp
 L Device:R R9
 U 1 1 5B096154
-P 3150 2950
-F 0 "R9" V 3230 2950 50  0000 C CNN
-F 1 "900k" V 3050 2950 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 3080 2950 50  0001 C CNN
-F 3 "" H 3150 2950 50  0001 C CNN
-	1    3150 2950
+P 3150 3450
+F 0 "R9" V 3230 3450 50  0000 C CNN
+F 1 "900k" V 3050 3450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 3080 3450 50  0001 C CNN
+F 3 "" H 3150 3450 50  0001 C CNN
+	1    3150 3450
 	0    -1   -1   0   
 $EndComp
-Text Label 3000 2950 2    60   ~ 0
+Text Label 3000 3450 2    60   ~ 0
 VBUS
-Text Label 4200 3050 0    60   ~ 0
+Text Label 4200 3550 0    60   ~ 0
 SCL
-Text Label 4200 3150 0    60   ~ 0
+Text Label 4200 3650 0    60   ~ 0
 SDA
 $Comp
 L Device:R R14
 U 1 1 5B0B7874
-P 10000 4450
-F 0 "R14" V 10080 4450 50  0000 C CNN
-F 1 "10k" V 9900 4450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 9930 4450 50  0001 C CNN
-F 3 "" H 10000 4450 50  0001 C CNN
-	1    10000 4450
+P 9400 4400
+F 0 "R14" V 9480 4400 50  0000 C CNN
+F 1 "10k" V 9300 4400 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 9330 4400 50  0001 C CNN
+F 3 "" H 9400 4400 50  0001 C CNN
+	1    9400 4400
 	0    -1   -1   0   
 $EndComp
 $Comp
 L Device:R R15
 U 1 1 5B0B79AE
-P 10000 4750
-F 0 "R15" V 10080 4750 50  0000 C CNN
-F 1 "10k" V 9900 4750 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 9930 4750 50  0001 C CNN
-F 3 "" H 10000 4750 50  0001 C CNN
-	1    10000 4750
+P 9400 4700
+F 0 "R15" V 9480 4700 50  0000 C CNN
+F 1 "10k" V 9300 4700 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 9330 4700 50  0001 C CNN
+F 3 "" H 9400 4700 50  0001 C CNN
+	1    9400 4700
 	0    -1   -1   0   
 $EndComp
-Text Label 10150 4450 0    60   ~ 0
-SCL
-Text Label 10150 4750 0    60   ~ 0
-SDA
-Text Label 6150 1250 2    60   ~ 0
-VBUS
-Text Label 6150 1350 2    60   ~ 0
-USB_P
-Text Label 6150 1450 2    60   ~ 0
-USB_N
-Text Label 6150 1650 2    60   ~ 0
+Text Label 9550 4400 0    60   ~ 0
 SCL
-Text Label 6150 1750 2    60   ~ 0
+Text Label 9550 4700 0    60   ~ 0
 SDA
-$Comp
-L Device:C_Small C13
-U 1 1 5B0C2749
-P 7550 1650
-F 0 "C13" H 7560 1720 50  0000 L CNN
-F 1 "47nF" H 7560 1570 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 7550 1650 50  0001 C CNN
-F 3 "" H 7550 1650 50  0001 C CNN
-	1    7550 1650
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C12
-U 1 1 5B0C2BAC
-P 7800 1550
-F 0 "C12" H 7810 1620 50  0000 L CNN
-F 1 "4.7uF" H 7810 1470 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 7800 1550 50  0001 C CNN
-F 3 "" H 7800 1550 50  0001 C CNN
-	1    7800 1550
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C9
-U 1 1 5B0C33A4
-P 5750 1250
-F 0 "C9" H 5760 1320 50  0000 L CNN
-F 1 "1uF" H 5760 1170 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 5750 1250 50  0001 C CNN
-F 3 "" H 5750 1250 50  0001 C CNN
-	1    5750 1250
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:LED D3
-U 1 1 5B0C55EE
-P 5400 1550
-F 0 "D3" H 5400 1650 50  0000 C CNN
-F 1 "LED" H 5400 1450 50  0000 C CNN
-F 2 "LEDs:LED_0603" H 5400 1550 50  0001 C CNN
-F 3 "" H 5400 1550 50  0001 C CNN
-	1    5400 1550
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:R R7
-U 1 1 5B0C5697
-P 5700 1550
-F 0 "R7" V 5780 1550 50  0000 C CNN
-F 1 "2.2k" V 5600 1550 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5630 1550 50  0001 C CNN
-F 3 "" H 5700 1550 50  0001 C CNN
-	1    5700 1550
-	0    -1   -1   0   
-$EndComp
-Text Label 5250 1550 2    60   ~ 0
-REGN
-$Comp
-L Device:R R8
-U 1 1 5B0C68E7
-P 5450 2150
-F 0 "R8" V 5530 2150 50  0000 C CNN
-F 1 "260" V 5350 2150 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5380 2150 50  0001 C CNN
-F 3 "" H 5450 2150 50  0001 C CNN
-	1    5450 2150
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:Thermistor TH1
-U 1 1 5B0C6F00
-P 5850 2750
-F 0 "TH1" V 5950 2800 50  0000 C CNN
-F 1 "103AT" V 5750 2750 50  0000 C BNN
-F 2 "Connectors_JST:JST_PH_S2B-PH-SM4-TB_02x2.00mm_Angled" H 5850 2750 50  0001 C CNN
-F 3 "" H 5850 2750 50  0001 C CNN
-	1    5850 2750
-	0    -1   -1   0   
-$EndComp
-Text Label 7150 1450 0    60   ~ 0
-REGN
-$Comp
-L Device:R R11
-U 1 1 5B0C76F2
-P 5850 2450
-F 0 "R11" V 5930 2450 50  0000 C CNN
-F 1 "30.31k" V 5750 2450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5780 2450 50  0001 C CNN
-F 3 "" H 5850 2450 50  0001 C CNN
-	1    5850 2450
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:R R10
-U 1 1 5B0C7966
-P 5450 2450
-F 0 "R10" V 5530 2450 50  0000 C CNN
-F 1 "5.24k" V 5350 2450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5380 2450 50  0001 C CNN
-F 3 "" H 5450 2450 50  0001 C CNN
-	1    5450 2450
-	0    -1   -1   0   
-$EndComp
-Text Label 5250 2450 2    60   ~ 0
-REGN
-$Comp
-L Device:C_Small C11
-U 1 1 5B0CC3F6
-P 8050 1450
-F 0 "C11" H 8060 1520 50  0000 L CNN
-F 1 "10uF" H 8060 1370 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 8050 1450 50  0001 C CNN
-F 3 "" H 8050 1450 50  0001 C CNN
-	1    8050 1450
-	1    0    0    -1  
-$EndComp
-NoConn ~ 3300 2850
-Text Notes 3500 3300 0    60   ~ 0
+NoConn ~ 3300 3350
+Text Notes 3500 3800 0    60   ~ 0
 ADDR: 0x60
-$Comp
-L Device:C_Small C10
-U 1 1 5B0CEA4D
-P 8300 1350
-F 0 "C10" H 8310 1420 50  0000 L CNN
-F 1 "47nF" H 8310 1270 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 8300 1350 50  0001 C CNN
-F 3 "" H 8300 1350 50  0001 C CNN
-	1    8300 1350
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:L_Small L1
-U 1 1 5B0DB40F
-P 7550 1950
-F 0 "L1" H 7580 1990 50  0000 L CNN
-F 1 "1uH" H 7580 1910 50  0000 L CNN
-F 2 "Inductors_SMD:L_Taiyo-Yuden_NR-40xx" H 7550 1950 50  0001 C CNN
-F 3 "" H 7550 1950 50  0001 C CNN
-	1    7550 1950
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C15
-U 1 1 5B0DC42A
-P 7800 2000
-F 0 "C15" H 7810 2070 50  0000 L CNN
-F 1 "10uF" H 7810 1920 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 7800 2000 50  0001 C CNN
-F 3 "" H 7800 2000 50  0001 C CNN
-	1    7800 2000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C16
-U 1 1 5B0DC519
-P 8050 2000
-F 0 "C16" H 8060 2070 50  0000 L CNN
-F 1 "10uF" H 8060 1920 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 8050 2000 50  0001 C CNN
-F 3 "" H 8050 2000 50  0001 C CNN
-	1    8050 2000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C19
-U 1 1 5B0DFFED
-P 7250 2500
-F 0 "C19" H 7260 2570 50  0000 L CNN
-F 1 "10uF" H 7260 2420 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 7250 2500 50  0001 C CNN
-F 3 "" H 7250 2500 50  0001 C CNN
-	1    7250 2500
-	1    0    0    -1  
-$EndComp
-NoConn ~ 6150 2350
 Text Label 2150 1050 0    60   ~ 0
 VBUS
-Text Notes 6400 2500 0    60   ~ 0
-ADDR: 0x6A
-Text Notes 1300 6400 0    60   ~ 0
+Text Notes 1300 6500 0    60   ~ 0
 ADDR: 0x70-0x73
-Text Label 8450 2150 0    60   ~ 0
-VSYS
-Text Label 6150 1950 2    60   ~ 0
-VSYS
-Text Label 6150 1850 2    60   ~ 0
-USB_INT
-Text Label 3950 5600 2    60   ~ 0
+Text Label 4500 5250 2    60   ~ 0
 USB_INT
-Text Label 5350 5300 0    60   ~ 0
-TSC_4
-Text Label 3950 5100 2    60   ~ 0
+Text Label 4500 4750 2    60   ~ 0
 VDD
-Text Label 3950 5500 2    60   ~ 0
+Text Label 4500 5150 2    60   ~ 0
 VDD
-Text Label 4200 2650 0    60   ~ 0
+Text Label 4200 3150 0    60   ~ 0
 VDD
-Text Label 9850 4450 2    60   ~ 0
+Text Label 9250 4400 2    60   ~ 0
 VDD
-Text Label 9850 4750 2    60   ~ 0
+Text Label 9250 4700 2    60   ~ 0
 VDD
 Text Label 1350 4700 2    60   ~ 0
 VDD
 $Comp
 L Device:C_Small C20
 U 1 1 5B1737BD
-P 7050 3750
-F 0 "C20" H 7060 3820 50  0000 L CNN
-F 1 "10uF" H 7060 3670 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 7050 3750 50  0001 C CNN
-F 3 "" H 7050 3750 50  0001 C CNN
-	1    7050 3750
+P 6900 2650
+F 0 "C20" H 6910 2720 50  0000 L CNN
+F 1 "10uF" H 6910 2570 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 6900 2650 50  0001 C CNN
+F 3 "" H 6900 2650 50  0001 C CNN
+	1    6900 2650
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C24
 U 1 1 5B1732A3
-P 6800 3850
-F 0 "C24" H 6810 3920 50  0000 L CNN
-F 1 "10uF" H 6810 3770 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 6800 3850 50  0001 C CNN
-F 3 "" H 6800 3850 50  0001 C CNN
-	1    6800 3850
+P 6650 2750
+F 0 "C24" H 6660 2820 50  0000 L CNN
+F 1 "10uF" H 6660 2670 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 6650 2750 50  0001 C CNN
+F 3 "" H 6650 2750 50  0001 C CNN
+	1    6650 2750
 	1    0    0    -1  
 $EndComp
-Text Label 7050 3550 2    60   ~ 0
+Text Label 6900 2450 2    60   ~ 0
 VDD
-Text Label 5650 4300 2    60   ~ 0
-VSYS
 $Comp
 L Device:L_Small L2
 U 1 1 5B16755A
-P 5250 3700
-F 0 "L2" H 5280 3740 50  0000 L CNN
-F 1 "1uH" H 5280 3660 50  0000 L CNN
-F 2 "Inductors_SMD:L_Taiyo-Yuden_NR-40xx" H 5250 3700 50  0001 C CNN
-F 3 "" H 5250 3700 50  0001 C CNN
-	1    5250 3700
+P 5100 2600
+F 0 "L2" H 5130 2640 50  0000 L CNN
+F 1 "1uH" H 5130 2560 50  0000 L CNN
+F 2 "Inductors_SMD:L_Taiyo-Yuden_NR-40xx" H 5100 2600 50  0001 C CNN
+F 3 "" H 5100 2600 50  0001 C CNN
+	1    5100 2600
 	-1   0    0    1   
 $EndComp
 $Comp
-L Custom_Parts:TPS63025X U5
+L Custom_Parts:TPS63025X U4
 U 1 1 5B1672A1
-P 6200 3750
-F 0 "U5" H 6200 4150 60  0000 C CNN
-F 1 "TPS63025X" H 6200 4050 60  0000 C CNN
-F 2 "Custom Parts:VQFN-14_2.5x3mm_Pitch0.5mm" H 6200 3750 60  0001 C CNN
-F 3 "" H 6200 3750 60  0001 C CNN
-	1    6200 3750
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C17
-U 1 1 5B15DD3E
-P 8300 2000
-F 0 "C17" H 8310 2070 50  0000 L CNN
-F 1 "1uF" H 8310 1920 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 8300 2000 50  0001 C CNN
-F 3 "" H 8300 2000 50  0001 C CNN
-	1    8300 2000
-	1    0    0    -1  
-$EndComp
-Text Label 6150 2050 2    60   ~ 0
-USB_CE
-Text Label 5350 5800 0    60   ~ 0
-USB_CE
-$Comp
-L Device:Jumper_NC_Small JP1
-U 1 1 5B0F1B1A
-P 7700 2650
-F 0 "JP1" H 7700 2730 50  0000 C CNN
-F 1 "Jumper_5V" H 7710 2590 50  0000 C CNN
-F 2 "Custom Parts:Jumper_0603" H 7700 2650 50  0001 C CNN
-F 3 "" H 7700 2650 50  0001 C CNN
-	1    7700 2650
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDREF #PWR01
-U 1 1 5B0F40EF
-P 7350 1850
-F 0 "#PWR01" H 7350 1600 50  0001 C CNN
-F 1 "GNDREF" H 7350 1700 50  0000 C CNN
-F 2 "" H 7350 1850 50  0001 C CNN
-F 3 "" H 7350 1850 50  0001 C CNN
-	1    7350 1850
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDREF #PWR02
-U 1 1 5B0F4F3F
-P 8400 1800
-F 0 "#PWR02" H 8400 1550 50  0001 C CNN
-F 1 "GNDREF" H 8400 1650 50  0000 C CNN
-F 2 "" H 8400 1800 50  0001 C CNN
-F 3 "" H 8400 1800 50  0001 C CNN
-	1    8400 1800
-	0    -1   -1   0   
-$EndComp
-$Comp
-L power:GNDREF #PWR03
-U 1 1 5B0F5B5A
-P 5650 1250
-F 0 "#PWR03" H 5650 1000 50  0001 C CNN
-F 1 "GNDREF" H 5650 1100 50  0000 C CNN
-F 2 "" H 5650 1250 50  0001 C CNN
-F 3 "" H 5650 1250 50  0001 C CNN
-	1    5650 1250
-	0    1    1    0   
-$EndComp
-$Comp
-L power:GNDREF #PWR05
-U 1 1 5B0F610A
-P 5300 2150
-F 0 "#PWR05" H 5300 1900 50  0001 C CNN
-F 1 "GNDREF" H 5300 2000 50  0000 C CNN
-F 2 "" H 5300 2150 50  0001 C CNN
-F 3 "" H 5300 2150 50  0001 C CNN
-	1    5300 2150
-	0    1    1    0   
-$EndComp
-$Comp
-L power:GNDREF #PWR06
-U 1 1 5B0F6B8D
-P 6050 2750
-F 0 "#PWR06" H 6050 2500 50  0001 C CNN
-F 1 "GNDREF" H 6050 2600 50  0000 C CNN
-F 2 "" H 6050 2750 50  0001 C CNN
-F 3 "" H 6050 2750 50  0001 C CNN
-	1    6050 2750
-	0    -1   -1   0   
-$EndComp
-$Comp
-L power:GNDREF #PWR07
-U 1 1 5B0F743C
-P 7250 2600
-F 0 "#PWR07" H 7250 2350 50  0001 C CNN
-F 1 "GNDREF" H 7250 2450 50  0000 C CNN
-F 2 "" H 7250 2600 50  0001 C CNN
-F 3 "" H 7250 2600 50  0001 C CNN
-	1    7250 2600
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDREF #PWR08
-U 1 1 5B0F751C
-P 8050 2650
-F 0 "#PWR08" H 8050 2400 50  0001 C CNN
-F 1 "GNDREF" H 8050 2500 50  0000 C CNN
-F 2 "" H 8050 2650 50  0001 C CNN
-F 3 "" H 8050 2650 50  0001 C CNN
-	1    8050 2650
+P 6050 2650
+F 0 "U4" H 6050 3050 60  0000 C CNN
+F 1 "TPS63025X" H 6050 2950 60  0000 C CNN
+F 2 "Custom Parts:VQFN-14_2.5x3mm_Pitch0.5mm" H 6050 2650 60  0001 C CNN
+F 3 "" H 6050 2650 60  0001 C CNN
+	1    6050 2650
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -651,195 +216,162 @@ $EndComp
 $Comp
 L power:GNDREF #PWR010
 U 1 1 5B0F887D
-P 3200 3950
-F 0 "#PWR010" H 3200 3700 50  0001 C CNN
-F 1 "GNDREF" H 3200 3800 50  0000 C CNN
-F 2 "" H 3200 3950 50  0001 C CNN
-F 3 "" H 3200 3950 50  0001 C CNN
-	1    3200 3950
+P 5450 1800
+F 0 "#PWR010" H 5450 1550 50  0001 C CNN
+F 1 "GNDREF" H 5450 1650 50  0000 C CNN
+F 2 "" H 5450 1800 50  0001 C CNN
+F 3 "" H 5450 1800 50  0001 C CNN
+	1    5450 1800
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDREF #PWR011
 U 1 1 5B0F899A
-P 4250 3850
-F 0 "#PWR011" H 4250 3600 50  0001 C CNN
-F 1 "GNDREF" H 4250 3700 50  0000 C CNN
-F 2 "" H 4250 3850 50  0001 C CNN
-F 3 "" H 4250 3850 50  0001 C CNN
-	1    4250 3850
+P 6500 1700
+F 0 "#PWR011" H 6500 1450 50  0001 C CNN
+F 1 "GNDREF" H 6500 1550 50  0000 C CNN
+F 2 "" H 6500 1700 50  0001 C CNN
+F 3 "" H 6500 1700 50  0001 C CNN
+	1    6500 1700
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDREF #PWR012
 U 1 1 5B0F9A68
-P 7050 4050
-F 0 "#PWR012" H 7050 3800 50  0001 C CNN
-F 1 "GNDREF" H 7050 3900 50  0000 C CNN
-F 2 "" H 7050 4050 50  0001 C CNN
-F 3 "" H 7050 4050 50  0001 C CNN
-	1    7050 4050
+P 6900 2950
+F 0 "#PWR012" H 6900 2700 50  0001 C CNN
+F 1 "GNDREF" H 6900 2800 50  0000 C CNN
+F 2 "" H 6900 2950 50  0001 C CNN
+F 3 "" H 6900 2950 50  0001 C CNN
+	1    6900 2950
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDREF #PWR013
 U 1 1 5B0FA54E
-P 5450 3650
-F 0 "#PWR013" H 5450 3400 50  0001 C CNN
-F 1 "GNDREF" H 5450 3500 50  0000 C CNN
-F 2 "" H 5450 3650 50  0001 C CNN
-F 3 "" H 5450 3650 50  0001 C CNN
-	1    5450 3650
-	1    0    0    -1  
-$EndComp
-$Comp
-L Custom_Parts:BQ25890 U2
-U 1 1 5B0BF1F9
-P 6650 1800
-F 0 "U2" H 6650 2550 60  0000 C CNN
-F 1 "BQ25890" H 6650 2450 60  0000 C CNN
-F 2 "Housings_DFN_QFN:QFN-24-1EP_4x4mm_Pitch0.5mm" H 6650 1950 60  0001 C CNN
-F 3 "" H 6650 1950 60  0001 C CNN
-	1    6650 1800
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDREF #PWR018
-U 1 1 5B109387
-P 3300 3150
-F 0 "#PWR018" H 3300 2900 50  0001 C CNN
-F 1 "GNDREF" H 3300 3000 50  0000 C CNN
-F 2 "" H 3300 3150 50  0001 C CNN
-F 3 "" H 3300 3150 50  0001 C CNN
-	1    3300 3150
+P 5300 2550
+F 0 "#PWR013" H 5300 2300 50  0001 C CNN
+F 1 "GNDREF" H 5300 2400 50  0000 C CNN
+F 2 "" H 5300 2550 50  0001 C CNN
+F 3 "" H 5300 2550 50  0001 C CNN
+	1    5300 2550
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDREF #PWR019
 U 1 1 5B1097EC
-P 4400 2750
-F 0 "#PWR019" H 4400 2500 50  0001 C CNN
-F 1 "GNDREF" H 4400 2600 50  0000 C CNN
-F 2 "" H 4400 2750 50  0001 C CNN
-F 3 "" H 4400 2750 50  0001 C CNN
-	1    4400 2750
+P 4400 3250
+F 0 "#PWR019" H 4400 3000 50  0001 C CNN
+F 1 "GNDREF" H 4400 3100 50  0000 C CNN
+F 2 "" H 4400 3250 50  0001 C CNN
+F 3 "" H 4400 3250 50  0001 C CNN
+	1    4400 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDREF #PWR023
 U 1 1 5B11A43E
-P 5400 5100
-F 0 "#PWR023" H 5400 4850 50  0001 C CNN
-F 1 "GNDREF" H 5400 4950 50  0000 C CNN
-F 2 "" H 5400 5100 50  0001 C CNN
-F 3 "" H 5400 5100 50  0001 C CNN
-	1    5400 5100
+P 5950 4750
+F 0 "#PWR023" H 5950 4500 50  0001 C CNN
+F 1 "GNDREF" H 5950 4600 50  0000 C CNN
+F 2 "" H 5950 4750 50  0001 C CNN
+F 3 "" H 5950 4750 50  0001 C CNN
+	1    5950 4750
 	-1   0    0    1   
 $EndComp
 $Comp
 L power:GNDREF #PWR024
 U 1 1 5B11AD2A
-P 3900 6600
-F 0 "#PWR024" H 3900 6350 50  0001 C CNN
-F 1 "GNDREF" H 3900 6450 50  0000 C CNN
-F 2 "" H 3900 6600 50  0001 C CNN
-F 3 "" H 3900 6600 50  0001 C CNN
-	1    3900 6600
+P 4450 6250
+F 0 "#PWR024" H 4450 6000 50  0001 C CNN
+F 1 "GNDREF" H 4450 6100 50  0000 C CNN
+F 2 "" H 4450 6250 50  0001 C CNN
+F 3 "" H 4450 6250 50  0001 C CNN
+	1    4450 6250
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDREF #PWR025
 U 1 1 5B11DE34
-P 4050 4700
-F 0 "#PWR025" H 4050 4450 50  0001 C CNN
-F 1 "GNDREF" H 4050 4550 50  0000 C CNN
-F 2 "" H 4050 4700 50  0001 C CNN
-F 3 "" H 4050 4700 50  0001 C CNN
-	1    4050 4700
+P 4600 4350
+F 0 "#PWR025" H 4600 4100 50  0001 C CNN
+F 1 "GNDREF" H 4600 4200 50  0000 C CNN
+F 2 "" H 4600 4350 50  0001 C CNN
+F 3 "" H 4600 4350 50  0001 C CNN
+	1    4600 4350
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C27
 U 1 1 5B143B7A
-P 3700 4850
-F 0 "C27" H 3710 4920 50  0000 L CNN
-F 1 "1uF" H 3710 4770 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 3700 4850 50  0001 C CNN
-F 3 "" H 3700 4850 50  0001 C CNN
-	1    3700 4850
+P 4250 4500
+F 0 "C27" H 4260 4570 50  0000 L CNN
+F 1 "1uF" H 4260 4420 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 4250 4500 50  0001 C CNN
+F 3 "" H 4250 4500 50  0001 C CNN
+	1    4250 4500
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R13
 U 1 1 5B1468ED
-P 10000 4150
-F 0 "R13" V 10080 4150 50  0000 C CNN
-F 1 "10k" V 9900 4150 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 9930 4150 50  0001 C CNN
-F 3 "" H 10000 4150 50  0001 C CNN
-	1    10000 4150
+P 9400 4100
+F 0 "R13" V 9480 4100 50  0000 C CNN
+F 1 "10k" V 9300 4100 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 9330 4100 50  0001 C CNN
+F 3 "" H 9400 4100 50  0001 C CNN
+	1    9400 4100
 	0    -1   -1   0   
 $EndComp
-Text Label 9850 4150 2    60   ~ 0
+Text Label 9250 4100 2    60   ~ 0
 VDD
-Text Label 10150 4150 0    60   ~ 0
+Text Label 9550 4100 0    60   ~ 0
 USB_INT
-Text Label 8500 3400 2    60   ~ 0
+Text Label 8550 2650 2    60   ~ 0
 VDD
 $Comp
 L power:GNDREF #PWR026
 U 1 1 5B2B81FD
-P 8500 4000
-F 0 "#PWR026" H 8500 3750 50  0001 C CNN
-F 1 "GNDREF" H 8500 3850 50  0000 C CNN
-F 2 "" H 8500 4000 50  0001 C CNN
-F 3 "" H 8500 4000 50  0001 C CNN
-	1    8500 4000
+P 8550 3250
+F 0 "#PWR026" H 8550 3000 50  0001 C CNN
+F 1 "GNDREF" H 8550 3100 50  0000 C CNN
+F 2 "" H 8550 3250 50  0001 C CNN
+F 3 "" H 8550 3250 50  0001 C CNN
+	1    8550 3250
 	1    0    0    -1  
 $EndComp
-Text Label 8250 3600 2    60   ~ 0
+Text Label 8300 2850 2    60   ~ 0
 DAC
-Text Label 8900 3700 0    60   ~ 0
+Text Label 8950 2950 0    60   ~ 0
 VNIXIE
-Text Label 8250 3800 2    60   ~ 0
+Text Label 8300 3050 2    60   ~ 0
 VNIXIE
 Wire Wire Line
-	7900 2650 7900 2350
-Wire Wire Line
-	7800 2650 7900 2650
-Wire Wire Line
-	7500 2650 7600 2650
+	6900 2950 6900 2750
 Wire Wire Line
-	7900 2350 8050 2350
+	6500 2850 6500 2950
 Wire Wire Line
-	7050 4050 7050 3850
+	6500 2450 6650 2450
 Wire Wire Line
-	6650 3950 6650 4050
+	6500 2450 6500 2550
+Connection ~ 6500 2450
+Connection ~ 6500 2550
 Wire Wire Line
-	6650 3550 6800 3550
+	6650 2450 6650 2650
 Wire Wire Line
-	6650 3550 6650 3650
-Connection ~ 6650 3550
-Connection ~ 6650 3650
+	6900 2450 6900 2550
+Connection ~ 6650 2450
 Wire Wire Line
-	6800 3550 6800 3750
+	6650 2950 6650 2850
+Connection ~ 6500 2950
+Connection ~ 6650 2950
+Connection ~ 6500 2650
+Connection ~ 2050 5450
 Wire Wire Line
-	7050 3550 7050 3650
-Connection ~ 6800 3550
+	2050 5350 2050 5450
+Connection ~ 1350 5450
 Wire Wire Line
-	6800 4050 6800 3950
-Connection ~ 6650 4050
-Connection ~ 6800 4050
-Connection ~ 6650 3750
-Wire Wire Line
-	7150 2350 7250 2350
-Connection ~ 8050 2150
-Connection ~ 2050 5400
-Wire Wire Line
-	2050 5300 2050 5400
-Connection ~ 1350 5400
-Wire Wire Line
-	1350 5300 1350 5400
+	1350 5350 1350 5450
 Connection ~ 2050 1050
 Connection ~ 2050 1150
 Connection ~ 2050 1250
@@ -856,61 +388,6 @@ Connection ~ 2050 2650
 Connection ~ 2050 2450
 Wire Wire Line
 	2050 4050 2050 3650
-Wire Wire Line
-	7150 1850 7150 1950
-Wire Wire Line
-	8300 1450 8300 1800
-Connection ~ 8050 1800
-Connection ~ 7800 1800
-Wire Wire Line
-	8050 1550 8050 1800
-Wire Wire Line
-	7800 1650 7800 1800
-Connection ~ 7800 2150
-Wire Wire Line
-	7800 2150 7800 2100
-Wire Wire Line
-	8050 2150 8050 2100
-Wire Wire Line
-	7150 1250 8300 1250
-Wire Wire Line
-	7150 1350 8050 1350
-Wire Wire Line
-	7150 1450 7800 1450
-Connection ~ 7550 2150
-Wire Wire Line
-	7150 2150 7550 2150
-Connection ~ 7150 2150
-Wire Wire Line
-	7150 2050 7150 2150
-Wire Wire Line
-	7550 2150 7550 2050
-Connection ~ 7150 1750
-Wire Wire Line
-	7150 1650 7150 1750
-Wire Wire Line
-	7550 1750 7550 1850
-Wire Wire Line
-	7150 1750 7550 1750
-Wire Wire Line
-	6050 2450 6050 2750
-Wire Wire Line
-	6000 2450 6050 2450
-Wire Wire Line
-	7150 1850 7350 1850
-Connection ~ 5650 2450
-Wire Wire Line
-	5650 2250 6150 2250
-Wire Wire Line
-	5650 2250 5650 2450
-Wire Wire Line
-	5250 2450 5300 2450
-Wire Wire Line
-	5600 2450 5650 2450
-Wire Wire Line
-	5850 1550 6150 1550
-Wire Wire Line
-	7150 1550 7550 1550
 Wire Wire Line
 	2050 3650 1950 3650
 Wire Wire Line
@@ -948,9 +425,9 @@ Wire Wire Line
 Wire Wire Line
 	1450 4050 1450 3950
 Wire Wire Line
-	3300 2750 3200 2750
+	3300 3250 3200 3250
 Wire Wire Line
-	3200 2650 3300 2650
+	3200 3150 3300 3150
 Wire Wire Line
 	2050 2050 1950 2050
 Wire Wire Line
@@ -968,41 +445,21 @@ Wire Wire Line
 Wire Wire Line
 	1950 1050 2050 1050
 Wire Wire Line
-	5350 5100 5400 5100
-Wire Wire Line
-	2050 5500 1950 5500
+	5900 4750 5950 4750
 Wire Wire Line
-	1950 5400 2050 5400
+	2050 5550 1950 5550
 Wire Wire Line
-	1950 5300 2050 5300
+	1950 5450 2050 5450
 Wire Wire Line
-	1450 6000 1350 6000
+	1950 5350 2050 5350
 Wire Wire Line
-	2050 5900 1950 5900
+	1450 6100 1350 6100
 Wire Wire Line
-	1350 6100 1450 6100
-Wire Notes Line
-	5950 6550 5950 5450
-Wire Notes Line
-	6450 6550 5950 6550
-Wire Notes Line
-	6450 5450 6450 6550
-Wire Notes Line
-	5950 5450 6450 5450
-Wire Notes Line
-	3150 5650 3650 5650
-Wire Notes Line
-	3150 6550 3150 5650
-Wire Notes Line
-	3650 6550 3150 6550
-Wire Notes Line
-	3650 5650 3650 6550
-Wire Wire Line
-	4150 3750 4050 3750
+	2050 6000 1950 6000
 Wire Wire Line
-	9900 5100 9750 5100
+	1350 6200 1450 6200
 Wire Wire Line
-	10100 5100 10200 5100
+	6400 1600 6300 1600
 Wire Wire Line
 	1350 4700 1450 4700
 Wire Wire Line
@@ -1010,9 +467,7 @@ Wire Wire Line
 Wire Wire Line
 	1950 4800 2050 4800
 Wire Wire Line
-	3700 5100 3950 5100
-Wire Wire Line
-	5350 5900 6000 5900
+	4250 4750 4500 4750
 Wire Wire Line
 	1450 4900 1350 4900
 Wire Wire Line
@@ -1020,161 +475,91 @@ Wire Wire Line
 Wire Wire Line
 	1950 4900 2050 4900
 Wire Wire Line
-	5350 5200 5700 5200
-Wire Wire Line
-	2050 6000 1950 6000
+	5900 4850 6250 4850
 Wire Wire Line
 	2050 6100 1950 6100
 Wire Wire Line
-	1350 5900 1450 5900
-Wire Wire Line
-	1350 5300 1450 5300
-Wire Wire Line
-	1350 5500 1450 5500
-Wire Wire Line
-	5350 5600 6000 5600
-Wire Wire Line
-	9750 5400 9850 5400
+	2050 6200 1950 6200
 Wire Wire Line
-	9750 5700 9850 5700
+	1350 6000 1450 6000
 Wire Wire Line
-	9750 6000 9850 6000
+	1350 5350 1450 5350
 Wire Wire Line
-	5350 6500 6000 6500
+	1350 5550 1450 5550
 Wire Wire Line
-	8500 4700 8600 4700
+	8000 4100 8100 4100
 Wire Wire Line
-	3600 5800 3950 5800
+	4150 5850 4500 5850
 Wire Wire Line
-	3600 5900 3950 5900
+	4150 5950 4500 5950
 Wire Wire Line
-	3600 6200 3950 6200
+	4150 6050 4500 6050
 Wire Wire Line
-	3600 6300 3950 6300
+	4150 6150 4500 6150
 Wire Wire Line
-	3600 6400 3950 6400
+	7900 4600 8000 4600
 Wire Wire Line
-	3600 6500 3950 6500
+	8400 4600 8500 4600
 Wire Wire Line
-	5350 6000 6000 6000
+	6500 1700 6300 1700
 Wire Wire Line
-	5350 5700 5650 5700
+	5650 1800 5450 1800
 Wire Wire Line
-	8850 5800 8950 5800
+	6500 2950 6650 2950
 Wire Wire Line
-	8850 5450 8950 5450
+	5600 2750 5600 2850
+Connection ~ 5600 2850
+Connection ~ 5600 2950
 Wire Wire Line
-	8850 5100 8950 5100
+	5600 2650 5500 2650
 Wire Wire Line
-	8350 5100 8450 5100
+	5500 2650 5500 2800
 Wire Wire Line
-	8350 5450 8450 5450
+	5500 2800 5100 2800
 Wire Wire Line
-	8350 5800 8450 5800
+	5100 2800 5100 2700
 Wire Wire Line
-	8350 6150 8450 6150
+	5600 2450 5100 2450
 Wire Wire Line
-	8850 6150 8950 6150
-Connection ~ 7150 1850
+	5100 2450 5100 2500
 Wire Wire Line
-	7800 1800 8050 1800
+	5600 2550 5300 2550
 Wire Wire Line
-	4250 3850 4050 3850
+	6500 3200 6500 3050
 Wire Wire Line
-	3400 3950 3200 3950
+	5500 3200 5600 3200
+Connection ~ 5600 3050
 Wire Wire Line
-	6650 4050 6800 4050
+	4200 3250 4400 3250
 Wire Wire Line
-	5750 3850 5750 3950
-Connection ~ 5750 3950
-Connection ~ 5750 4050
+	5550 1700 5650 1700
 Wire Wire Line
-	5750 3750 5650 3750
+	4450 6250 4500 6250
+Connection ~ 5600 3200
 Wire Wire Line
-	5650 3750 5650 3900
+	4250 4600 4250 4750
 Wire Wire Line
-	5650 3900 5250 3900
+	4250 4350 4250 4400
 Wire Wire Line
-	5250 3900 5250 3800
+	8300 2850 8350 2850
 Wire Wire Line
-	5750 3550 5250 3550
+	8300 3050 8350 3050
 Wire Wire Line
-	5250 3550 5250 3600
+	6500 2550 6500 2650
 Wire Wire Line
-	5750 3650 5450 3650
+	6650 2450 6900 2450
 Wire Wire Line
-	6650 4300 6650 4150
+	6650 2950 6900 2950
 Wire Wire Line
-	5650 4300 5750 4300
-Connection ~ 5750 4150
+	6500 2650 6500 2750
 Wire Wire Line
-	7250 2350 7250 2400
+	2050 5450 2050 5550
 Wire Wire Line
-	7500 2350 7500 2650
-Connection ~ 7250 2350
+	2050 5450 2150 5450
 Wire Wire Line
-	7150 2250 7150 2350
+	1350 5450 1350 5550
 Wire Wire Line
-	4200 2750 4400 2750
-Wire Wire Line
-	3300 3850 3400 3850
-Wire Wire Line
-	3900 6600 3950 6600
-Wire Wire Line
-	2900 4950 2900 5050
-Wire Wire Line
-	3450 4950 3450 5050
-Wire Wire Line
-	2900 5300 3950 5300
-Connection ~ 2900 5050
-Wire Wire Line
-	3450 5200 3950 5200
-Connection ~ 3450 5050
-Connection ~ 8300 1800
-Wire Wire Line
-	8300 2100 8300 2150
-Connection ~ 8300 2150
-Wire Wire Line
-	3450 5050 3350 5050
-Wire Wire Line
-	3050 5050 2900 5050
-Connection ~ 5750 4300
-Wire Wire Line
-	3700 4950 3700 5100
-Wire Wire Line
-	2900 4700 3450 4700
-Wire Wire Line
-	3700 4700 3700 4750
-Wire Wire Line
-	3450 4700 3450 4750
-Connection ~ 3700 4700
-Wire Wire Line
-	2900 4700 2900 4750
-Connection ~ 3450 4700
-Wire Wire Line
-	5600 2150 6150 2150
-Wire Wire Line
-	8250 3600 8300 3600
-Wire Wire Line
-	8250 3800 8300 3800
-Wire Wire Line
-	6650 3650 6650 3750
-Wire Wire Line
-	6800 3550 7050 3550
-Wire Wire Line
-	6800 4050 7050 4050
-Wire Wire Line
-	6650 3750 6650 3850
-Wire Wire Line
-	8050 2150 8300 2150
-Wire Wire Line
-	2050 5400 2050 5500
-Wire Wire Line
-	2050 5400 2150 5400
-Wire Wire Line
-	1350 5400 1350 5500
-Wire Wire Line
-	1350 5400 1450 5400
+	1350 5450 1450 5450
 Wire Wire Line
 	2050 1050 2150 1050
 Wire Wire Line
@@ -1199,20 +584,6 @@ Wire Wire Line
 	2050 2650 2050 2450
 Wire Wire Line
 	2050 2450 2050 2350
-Wire Wire Line
-	5850 1250 6150 1250
-Wire Wire Line
-	8050 1800 8050 1900
-Wire Wire Line
-	8050 1800 8300 1800
-Wire Wire Line
-	7800 1800 7800 1900
-Wire Wire Line
-	7800 2150 8050 2150
-Wire Wire Line
-	5650 2450 5650 2750
-Wire Wire Line
-	5650 2450 5700 2450
 Wire Wire Line
 	1150 4050 1250 4050
 Wire Wire Line
@@ -1222,52 +593,38 @@ Wire Wire Line
 Wire Wire Line
 	1450 4050 2050 4050
 Wire Wire Line
-	5750 3950 5750 4050
-Wire Wire Line
-	5750 4050 5750 4150
-Wire Wire Line
-	5750 4150 5750 4300
-Wire Wire Line
-	7250 2350 7500 2350
-Wire Wire Line
-	2900 5050 2900 5300
-Wire Wire Line
-	3450 5050 3450 5200
+	5600 2850 5600 2950
 Wire Wire Line
-	8300 1800 8300 1900
+	5600 2950 5600 3050
 Wire Wire Line
-	8300 1800 8400 1800
+	5600 3050 5600 3200
 Wire Wire Line
-	8300 2150 8450 2150
+	5600 3200 6500 3200
 Wire Wire Line
-	5750 4300 6650 4300
+	4250 4350 4600 4350
 Wire Wire Line
-	3700 4700 4050 4700
-Wire Wire Line
-	3450 4700 3700 4700
-Wire Wire Line
-	4200 2750 4200 2850
+	4200 3250 4200 3350
 $Comp
-L Custom_Parts:TUSB320 U4
+L Custom_Parts:TUSB320 U3
 U 1 1 5B5B1CD3
-P 3750 2900
-F 0 "U4" H 3750 3397 60  0000 C CNN
-F 1 "TUSB320" H 3750 3291 60  0000 C CNN
-F 2 "Custom Parts:X2QFN-12_1.6x1.6mm_Pitch0.4mm" H 4100 2900 60  0001 C CNN
-F 3 "" H 4100 2900 60  0001 C CNN
-	1    3750 2900
+P 3750 3400
+F 0 "U3" H 3750 3897 60  0000 C CNN
+F 1 "TUSB320" H 3750 3791 60  0000 C CNN
+F 2 "Custom Parts:X2QFN-12_1.6x1.6mm_Pitch0.4mm" H 4100 3400 60  0001 C CNN
+F 3 "" H 4100 3400 60  0001 C CNN
+	1    3750 3400
 	1    0    0    -1  
 $EndComp
-Connection ~ 4200 2750
+Connection ~ 4200 3250
 $Comp
-L Custom_Parts:STM32L432K U7
+L Custom_Parts:STM32L432K U5
 U 1 1 5B622DF7
-P 4650 5850
-F 0 "U7" H 4650 6847 60  0000 C CNN
-F 1 "STM32L432K" H 4650 6741 60  0000 C CNN
-F 2 "Housings_DFN_QFN:QFN-32-1EP_5x5mm_Pitch0.5mm" H 4650 6300 60  0001 C CNN
-F 3 "" H 4650 6300 60  0001 C CNN
-	1    4650 5850
+P 5200 5500
+F 0 "U5" H 5200 6497 60  0000 C CNN
+F 1 "STM32L432K" H 5200 6391 60  0000 C CNN
+F 2 "Housings_DFN_QFN:QFN-32-1EP_5x5mm_Pitch0.5mm" H 5200 5950 60  0001 C CNN
+F 3 "" H 5200 5950 60  0001 C CNN
+	1    5200 5500
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1292,100 +649,34 @@ Wire Wire Line
 $Comp
 L pspice:OPAMP U8
 U 1 1 5B648E46
-P 8600 3700
-F 0 "U8" H 8600 3700 50  0000 L CNN
-F 1 "OPAMP" H 8941 3655 50  0000 L CNN
-F 2 "TO_SOT_Packages_SMD:SOT-23-6" H 8600 3700 50  0001 C CNN
-F 3 "" H 8600 3700 50  0001 C CNN
-	1    8600 3700
+P 8650 2950
+F 0 "U8" H 8650 2950 50  0000 L CNN
+F 1 "OPAMP" H 8991 2905 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-6" H 8650 2950 50  0001 C CNN
+F 3 "" H 8650 2950 50  0001 C CNN
+	1    8650 2950
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector:Conn_01x01_Female J8
 U 1 1 5B649686
-P 8800 4700
-F 0 "J8" H 8827 4726 50  0000 L CNN
-F 1 "Conn_01x01_Female" H 8827 4635 50  0000 L CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm" H 8800 4700 50  0001 C CNN
-F 3 "~" H 8800 4700 50  0001 C CNN
-	1    8800 4700
-	1    0    0    -1  
-$EndComp
-$Comp
-L Connector:Conn_01x01_Female J5
-U 1 1 5B64998B
-P 10350 5400
-F 0 "J5" H 10377 5426 50  0000 L CNN
-F 1 "Conn_01x01_Female" H 10377 5335 50  0000 L CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm" H 10350 5400 50  0001 C CNN
-F 3 "~" H 10350 5400 50  0001 C CNN
-	1    10350 5400
-	1    0    0    -1  
-$EndComp
-$Comp
-L Connector:Conn_01x01_Female J6
-U 1 1 5B649A31
-P 10350 5700
-F 0 "J6" H 10377 5726 50  0000 L CNN
-F 1 "Conn_01x01_Female" H 10377 5635 50  0000 L CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm" H 10350 5700 50  0001 C CNN
-F 3 "~" H 10350 5700 50  0001 C CNN
-	1    10350 5700
-	1    0    0    -1  
-$EndComp
-$Comp
-L Connector:Conn_01x01_Female J7
-U 1 1 5B649AD1
-P 10350 6000
-F 0 "J7" H 10377 6026 50  0000 L CNN
-F 1 "Conn_01x01_Female" H 10377 5935 50  0000 L CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm" H 10350 6000 50  0001 C CNN
-F 3 "~" H 10350 6000 50  0001 C CNN
-	1    10350 6000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push SW1
-U 1 1 5B64A153
-P 8650 5100
-F 0 "SW1" H 8650 5385 50  0000 C CNN
-F 1 "SW_Push" H 8650 5294 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_EVQP7A" H 8650 5300 50  0001 C CNN
-F 3 "" H 8650 5300 50  0001 C CNN
-	1    8650 5100
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push SW2
-U 1 1 5B64A319
-P 8650 5450
-F 0 "SW2" H 8650 5735 50  0000 C CNN
-F 1 "SW_Push" H 8650 5644 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_EVQP7A" H 8650 5650 50  0001 C CNN
-F 3 "" H 8650 5650 50  0001 C CNN
-	1    8650 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push SW3
-U 1 1 5B64A3B3
-P 8650 5800
-F 0 "SW3" H 8650 6085 50  0000 C CNN
-F 1 "SW_Push" H 8650 5994 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_EVQP7A" H 8650 6000 50  0001 C CNN
-F 3 "" H 8650 6000 50  0001 C CNN
-	1    8650 5800
+P 8300 4100
+F 0 "J8" H 8327 4126 50  0000 L CNN
+F 1 "Conn_01x01_Female" H 8327 4035 50  0000 L CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm" H 8300 4100 50  0001 C CNN
+F 3 "~" H 8300 4100 50  0001 C CNN
+	1    8300 4100
 	1    0    0    -1  
 $EndComp
 $Comp
 L Switch:SW_Push SW4
 U 1 1 5B64A44F
-P 8650 6150
-F 0 "SW4" H 8650 6435 50  0000 C CNN
-F 1 "SW_Push" H 8650 6344 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_EVQP7A" H 8650 6350 50  0001 C CNN
-F 3 "" H 8650 6350 50  0001 C CNN
-	1    8650 6150
+P 8200 4600
+F 0 "SW4" H 8200 4885 50  0000 C CNN
+F 1 "SW_Push" H 8200 4794 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_EVQP7A" H 8200 4800 50  0001 C CNN
+F 3 "" H 8200 4800 50  0001 C CNN
+	1    8200 4600
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1402,40 +693,25 @@ $EndComp
 $Comp
 L Connector_Generic:Conn_02x03_Odd_Even J4
 U 1 1 5B6941D3
-P 1650 5400
-F 0 "J4" H 1700 5717 50  0000 C CNN
-F 1 "Nixie_HV" H 1700 5626 50  0000 C CNN
-F 2 "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm" H 1650 5400 50  0001 C CNN
-F 3 "~" H 1650 5400 50  0001 C CNN
-	1    1650 5400
+P 1650 5450
+F 0 "J4" H 1700 5767 50  0000 C CNN
+F 1 "Nixie_HV" H 1700 5676 50  0000 C CNN
+F 2 "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm" H 1650 5450 50  0001 C CNN
+F 3 "~" H 1650 5450 50  0001 C CNN
+	1    1650 5450
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector_Generic:Conn_02x03_Odd_Even J2
 U 1 1 5B694500
-P 1650 6000
-F 0 "J2" H 1700 6317 50  0000 C CNN
-F 1 "Nixie_CTRL" H 1700 6226 50  0000 C CNN
-F 2 "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm" H 1650 6000 50  0001 C CNN
-F 3 "~" H 1650 6000 50  0001 C CNN
-	1    1650 6000
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	7550 2150 7800 2150
-$Comp
-L Connector:TestPoint_2Pole TP1
-U 1 1 5B695245
-P 7700 2350
-F 0 "TP1" H 7700 2250 50  0000 C CNN
-F 1 "TEST_BAT" H 7700 2454 50  0000 C CNN
-F 2 "Measurement_Points:Test_Point_2Pads" H 7700 2350 50  0001 C CNN
-F 3 "~" H 7700 2350 50  0001 C CNN
-	1    7700 2350
+P 1650 6100
+F 0 "J2" H 1700 6417 50  0000 C CNN
+F 1 "Nixie_CTRL" H 1700 6326 50  0000 C CNN
+F 2 "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm" H 1650 6100 50  0001 C CNN
+F 3 "~" H 1650 6100 50  0001 C CNN
+	1    1650 6100
 	1    0    0    -1  
 $EndComp
-Connection ~ 7500 2350
-Connection ~ 7900 2350
 $Comp
 L Custom_Parts:ESD122 D4
 U 1 1 5B916041
@@ -1447,19 +723,17 @@ F 3 "" H 3750 1350 50  0001 C CNN
 	1    3750 1350
 	1    0    0    -1  
 $EndComp
-Text Label 3200 2750 2    60   ~ 0
+Text Label 3200 3250 2    60   ~ 0
 CC1
-Text Label 3200 2650 2    60   ~ 0
+Text Label 3200 3150 2    60   ~ 0
 CC2
 Text Label 3400 1450 2    60   ~ 0
 CC2
 Text Label 3400 1250 2    60   ~ 0
 CC1
-Connection ~ 7050 4050
-Text Label 3300 3750 2    60   ~ 0
-VSYS
+Connection ~ 6900 2950
 Wire Wire Line
-	3300 3750 3400 3750
+	5550 1600 5650 1600
 $Comp
 L Custom_Parts:ESD122 D5
 U 1 1 5BA1CDBE
@@ -1500,25 +774,25 @@ $EndComp
 $Comp
 L Device:D D6
 U 1 1 5B902F50
-P 10000 3800
-F 0 "D6" H 10000 4016 50  0000 C CNN
-F 1 "D" H 10000 3925 50  0000 C CNN
-F 2 "Custom Parts:X1SON" H 10000 3800 50  0001 C CNN
-F 3 "~" H 10000 3800 50  0001 C CNN
-	1    10000 3800
+P 3650 2650
+F 0 "D6" H 3650 2866 50  0000 C CNN
+F 1 "D" H 3650 2775 50  0000 C CNN
+F 2 "Custom Parts:X1SON" H 3650 2650 50  0001 C CNN
+F 3 "~" H 3650 2650 50  0001 C CNN
+	1    3650 2650
 	1    0    0    -1  
 $EndComp
-Text Label 9850 3800 2    60   ~ 0
+Text Label 3500 2650 2    60   ~ 0
 VBUS
 $Comp
 L power:GNDREF #PWR0103
 U 1 1 5B903362
-P 10150 3800
-F 0 "#PWR0103" H 10150 3550 50  0001 C CNN
-F 1 "GNDREF" H 10150 3650 50  0000 C CNN
-F 2 "" H 10150 3800 50  0001 C CNN
-F 3 "" H 10150 3800 50  0001 C CNN
-	1    10150 3800
+P 3800 2650
+F 0 "#PWR0103" H 3800 2400 50  0001 C CNN
+F 1 "GNDREF" H 3800 2500 50  0000 C CNN
+F 2 "" H 3800 2650 50  0001 C CNN
+F 3 "" H 3800 2650 50  0001 C CNN
+	1    3800 2650
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -1535,119 +809,122 @@ $EndComp
 $Comp
 L power:GNDREF #PWR0105
 U 1 1 5B91DEBE
-P 1350 5500
-F 0 "#PWR0105" H 1350 5250 50  0001 C CNN
-F 1 "GNDREF" H 1350 5350 50  0000 C CNN
-F 2 "" H 1350 5500 50  0001 C CNN
-F 3 "" H 1350 5500 50  0001 C CNN
-	1    1350 5500
+P 1350 5550
+F 0 "#PWR0105" H 1350 5300 50  0001 C CNN
+F 1 "GNDREF" H 1350 5400 50  0000 C CNN
+F 2 "" H 1350 5550 50  0001 C CNN
+F 3 "" H 1350 5550 50  0001 C CNN
+	1    1350 5550
 	1    0    0    -1  
 $EndComp
-Connection ~ 1350 5500
+Connection ~ 1350 5550
 $Comp
 L power:GNDREF #PWR0106
 U 1 1 5B91DFA9
-P 2050 6100
-F 0 "#PWR0106" H 2050 5850 50  0001 C CNN
-F 1 "GNDREF" H 2050 5950 50  0000 C CNN
-F 2 "" H 2050 6100 50  0001 C CNN
-F 3 "" H 2050 6100 50  0001 C CNN
-	1    2050 6100
+P 2050 6200
+F 0 "#PWR0106" H 2050 5950 50  0001 C CNN
+F 1 "GNDREF" H 2050 6050 50  0000 C CNN
+F 2 "" H 2050 6200 50  0001 C CNN
+F 3 "" H 2050 6200 50  0001 C CNN
+	1    2050 6200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2050 6000 2050 6100
-Connection ~ 2050 6100
+	2050 6100 2050 6200
+Connection ~ 2050 6200
 $Comp
 L power:GNDREF #PWR0107
 U 1 1 5B92A060
-P 1350 5900
-F 0 "#PWR0107" H 1350 5650 50  0001 C CNN
-F 1 "GNDREF" H 1350 5750 50  0000 C CNN
-F 2 "" H 1350 5900 50  0001 C CNN
-F 3 "" H 1350 5900 50  0001 C CNN
-	1    1350 5900
+P 1350 6000
+F 0 "#PWR0107" H 1350 5750 50  0001 C CNN
+F 1 "GNDREF" H 1350 5850 50  0000 C CNN
+F 2 "" H 1350 6000 50  0001 C CNN
+F 3 "" H 1350 6000 50  0001 C CNN
+	1    1350 6000
 	-1   0    0    1   
 $EndComp
 $Comp
 L power:GNDREF #PWR0108
 U 1 1 5B94360C
-P 6100 5150
-F 0 "#PWR0108" H 6100 4900 50  0001 C CNN
-F 1 "GNDREF" H 6100 5000 50  0000 C CNN
-F 2 "" H 6100 5150 50  0001 C CNN
-F 3 "" H 6100 5150 50  0001 C CNN
-	1    6100 5150
+P 6650 4800
+F 0 "#PWR0108" H 6650 4550 50  0001 C CNN
+F 1 "GNDREF" H 6650 4650 50  0000 C CNN
+F 2 "" H 6650 4800 50  0001 C CNN
+F 3 "" H 6650 4800 50  0001 C CNN
+	1    6650 4800
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	6000 5200 6100 5200
+	6550 4850 6650 4850
 Wire Wire Line
-	6100 5200 6100 5150
-$Comp
-L power:GNDREF #PWR0109
-U 1 1 5B94FE11
-P 10200 5100
-F 0 "#PWR0109" H 10200 4850 50  0001 C CNN
-F 1 "GNDREF" H 10200 4950 50  0000 C CNN
-F 2 "" H 10200 5100 50  0001 C CNN
-F 3 "" H 10200 5100 50  0001 C CNN
-	1    10200 5100
-	0    -1   -1   0   
-$EndComp
+	6650 4850 6650 4800
 $Comp
-L power:GNDREF #PWR0110
-U 1 1 5B94FE8C
-P 8950 5100
-F 0 "#PWR0110" H 8950 4850 50  0001 C CNN
-F 1 "GNDREF" H 8950 4950 50  0000 C CNN
-F 2 "" H 8950 5100 50  0001 C CNN
-F 3 "" H 8950 5100 50  0001 C CNN
-	1    8950 5100
-	0    -1   -1   0   
-$EndComp
-$Comp
-L power:GNDREF #PWR0111
-U 1 1 5B95001F
-P 8950 5450
-F 0 "#PWR0111" H 8950 5200 50  0001 C CNN
-F 1 "GNDREF" H 8950 5300 50  0000 C CNN
-F 2 "" H 8950 5450 50  0001 C CNN
-F 3 "" H 8950 5450 50  0001 C CNN
-	1    8950 5450
+L power:GNDREF #PWR0113
+U 1 1 5B950115
+P 8500 4600
+F 0 "#PWR0113" H 8500 4350 50  0001 C CNN
+F 1 "GNDREF" H 8500 4450 50  0000 C CNN
+F 2 "" H 8500 4600 50  0001 C CNN
+F 3 "" H 8500 4600 50  0001 C CNN
+	1    8500 4600
 	0    -1   -1   0   
 $EndComp
 $Comp
-L power:GNDREF #PWR0112
-U 1 1 5B95009A
-P 8950 5800
-F 0 "#PWR0112" H 8950 5550 50  0001 C CNN
-F 1 "GNDREF" H 8950 5650 50  0000 C CNN
-F 2 "" H 8950 5800 50  0001 C CNN
-F 3 "" H 8950 5800 50  0001 C CNN
-	1    8950 5800
-	0    -1   -1   0   
+L Device:Battery_Cell BT1
+U 1 1 5BA7F4A1
+P 9200 5800
+F 0 "BT1" H 9318 5896 50  0000 L CNN
+F 1 "Battery_Cell" H 9318 5805 50  0000 L CNN
+F 2 "Custom Parts:CR1220_Holder" V 9200 5860 50  0001 C CNN
+F 3 "~" V 9200 5860 50  0001 C CNN
+	1    9200 5800
+	1    0    0    -1  
 $EndComp
 $Comp
-L power:GNDREF #PWR0113
-U 1 1 5B950115
-P 8950 6150
-F 0 "#PWR0113" H 8950 5900 50  0001 C CNN
-F 1 "GNDREF" H 8950 6000 50  0000 C CNN
-F 2 "" H 8950 6150 50  0001 C CNN
-F 3 "" H 8950 6150 50  0001 C CNN
-	1    8950 6150
-	0    -1   -1   0   
+L Custom_Parts:DS3231 U2
+U 1 1 5BAADC28
+P 8250 5750
+F 0 "U2" H 8250 6325 50  0000 C CNN
+F 1 "DS3231" H 8250 6234 50  0000 C CNN
+F 2 "SMD_Packages:SO-16-L" H 8250 5750 50  0001 C CNN
+F 3 "" H 8250 5750 50  0001 C CNN
+	1    8250 5750
+	1    0    0    -1  
 $EndComp
 $Comp
-L power:GNDREF #PWR?
-U 1 1 5B9832A9
-P 6650 2600
-F 0 "#PWR?" H 6650 2350 50  0001 C CNN
-F 1 "GNDREF" H 6650 2450 50  0000 C CNN
-F 2 "" H 6650 2600 50  0001 C CNN
-F 3 "" H 6650 2600 50  0001 C CNN
-	1    6650 2600
+L power:GNDREF #PWR0109
+U 1 1 5BAADEE2
+P 9200 6000
+F 0 "#PWR0109" H 9200 5750 50  0001 C CNN
+F 1 "GNDREF" H 9200 5850 50  0000 C CNN
+F 2 "" H 9200 6000 50  0001 C CNN
+F 3 "" H 9200 6000 50  0001 C CNN
+	1    9200 6000
 	1    0    0    -1  
 $EndComp
+Text Label 8700 5500 0    60   ~ 0
+SDA
+Text Label 8700 5400 0    60   ~ 0
+SCL
+Text Label 7800 5500 2    60   ~ 0
+VDD
+Text Label 5500 3200 2    60   ~ 0
+VBUS
+Text Label 5550 1600 2    60   ~ 0
+VBUS
+Text Label 3300 3650 2    60   ~ 0
+USB_INT
+Text Label 7800 5600 2    50   ~ 0
+RTC_INT
+Wire Wire Line
+	8700 5600 9200 5600
+Wire Wire Line
+	8700 5700 8950 5700
+Wire Wire Line
+	8950 5700 8950 5900
+Wire Wire Line
+	8950 5900 9200 5900
+Wire Wire Line
+	9200 5900 9200 6000
+Connection ~ 9200 5900
 $EndSCHEMATC