further cleanup

git-svn-id: https://svn.spreadspace.org/mur.sat@718 7de4ea59-55d0-425e-a1af-a3118ea81d4c

1 files changed, 963 insertions, 752 deletions

diff --git a/hardware/satelite-bus/powerpath.sch b/hardware/satelite-bus/powerpath.sch
index adaa732..67d8305 100644
--- a/hardware/satelite-bus/powerpath.sch
+++ b/hardware/satelite-bus/powerpath.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sa 06 Apr 2013 10:13:55 CEST
+EESchema Schematic File Version 2  date Sam 06 Apr 2013 23:40:35 CEST
 LIBS:mur-sat
 LIBS:power
 LIBS:device
@@ -29,6 +29,7 @@ LIBS:opto
 LIBS:atmel
 LIBS:contrib
 LIBS:valves
+LIBS:satelite-bus-cache
 EELAYER 25  0
 EELAYER END
 $Descr A4 11700 8267
@@ -44,188 +45,214 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	6050 3500 6000 3500
+	5750 6200 5850 6200
 Wire Wire Line
-	6300 5250 6300 5200
+	5850 6100 5750 6100
+Text HLabel 5750 6100 0    60   Input ~ 0
+TTX_P1
+Text HLabel 5750 6200 0    60   Input ~ 0
+TTX_P0
 Wire Wire Line
-	6550 5150 6500 5150
+	9450 2050 9450 2750
 Wire Wire Line
-	6500 5150 6500 5100
+	9450 2050 9400 2050
+Connection ~ 8600 2250
 Wire Wire Line
-	5850 7200 5800 7200
+	8600 2250 8600 2750
+Connection ~ 4550 1650
 Wire Wire Line
-	5800 7200 5800 7650
+	4550 1700 4550 1650
 Wire Wire Line
-	8100 1150 8150 1150
+	4350 2700 4550 2700
 Wire Wire Line
-	8150 1150 8150 1200
+	4550 2700 4550 2650
 Wire Wire Line
-	8150 1650 8150 1600
+	2550 2250 2550 2200
+Connection ~ 9450 2250
 Wire Wire Line
-	7950 1650 7950 1400
+	9450 2750 9500 2750
 Wire Wire Line
-	7950 900  7950 850 
+	9650 2450 9800 2450
 Wire Wire Line
-	7350 950  7350 900 
+	9800 2450 9800 2550
 Wire Wire Line
-	7350 1650 7350 1400
+	8950 2550 8950 2450
 Wire Wire Line
-	7550 1650 7550 1600
+	8950 2450 8800 2450
 Wire Wire Line
-	7550 1200 7550 1150
+	9700 3550 9850 3550
 Wire Wire Line
-	7550 1150 7500 1150
+	9850 3550 9850 3650
 Wire Wire Line
-	6950 1150 7000 1150
+	10650 3000 10650 2950
 Wire Wire Line
-	7000 1150 7000 1200
+	9800 3000 9800 2950
+Connection ~ 10350 3850
 Wire Wire Line
-	7000 1650 7000 1600
+	10350 3900 10350 3300
 Wire Wire Line
-	6800 1650 6800 1400
+	10350 3300 7850 3300
+Connection ~ 8650 3850
 Wire Wire Line
-	6800 900  6800 850 
+	8650 3900 8650 3500
 Wire Wire Line
-	6050 900  6050 850 
+	8650 3500 7850 3500
 Wire Wire Line
-	6050 1650 6050 1400
+	3800 3000 3800 3200
+Connection ~ 5250 3500
 Wire Wire Line
-	6250 1650 6250 1600
+	5050 3500 6050 3500
 Wire Wire Line
-	6000 2500 6050 2500
-Connection ~ 8850 2600
-Connection ~ 9150 2600
+	5250 3500 5250 3450
 Wire Wire Line
-	7850 2900 7900 2900
+	9200 1100 9250 1100
 Wire Wire Line
-	7850 2700 7900 2700
+	7900 3100 7850 3100
+Connection ~ 6250 1850
+Connection ~ 6400 1850
 Wire Wire Line
-	9150 2600 9150 2550
+	6550 1850 5950 1850
 Wire Wire Line
-	9450 2550 9450 2600
+	9900 6900 9900 6800
 Wire Wire Line
-	9450 2050 9450 2150
+	10400 6900 10400 6800
 Wire Wire Line
-	9150 2050 9150 2150
+	10150 6900 10150 6800
+Connection ~ 8750 6300
 Wire Wire Line
-	8850 2050 8850 2150
+	9350 6300 8700 6300
+Connection ~ 9250 5900
 Wire Wire Line
-	10400 1800 10300 1800
-Connection ~ 5000 7650
+	9350 5900 8700 5900
 Wire Wire Line
-	5000 7650 5000 6750
-Connection ~ 4050 5050
-Connection ~ 4050 3500
+	9000 6100 9000 6350
 Wire Wire Line
-	4050 3500 4050 5100
-Connection ~ 950  5050
-Connection ~ 950  3650
+	10150 5700 10150 5600
+Connection ~ 10400 4700
 Wire Wire Line
-	950  2700 950  5100
-Connection ~ 2500 3650
-Connection ~ 2500 5050
+	10500 4700 9850 4700
+Connection ~ 9000 4900
 Wire Wire Line
-	2500 3650 2500 5100
-Connection ~ 950  3350
+	9350 4900 8700 4900
 Wire Wire Line
-	1650 6700 1650 6800
+	9250 4700 9250 5150
+Connection ~ 8750 5100
 Wire Wire Line
-	1350 6700 1350 6800
+	9350 5100 8700 5100
 Wire Wire Line
-	4650 3100 4650 3150
+	10400 4700 10400 5200
 Wire Wire Line
-	4200 3250 4200 3300
+	9900 5100 9900 5200
 Wire Wire Line
-	4200 2800 4300 2800
+	5100 3350 5100 3400
 Wire Wire Line
-	6900 2000 6900 1950
-Connection ~ 2800 2150
+	5850 7200 5800 7200
 Wire Wire Line
-	3150 2150 2550 2150
+	5800 7200 5800 7650
 Wire Wire Line
-	4900 2450 5000 2450
+	7650 5100 7700 5100
 Wire Wire Line
-	5000 2450 5000 2400
+	7700 5100 7700 5150
 Wire Wire Line
-	5000 1800 5000 1900
+	7700 5600 7700 5550
 Wire Wire Line
-	5200 1250 5200 1200
+	7500 5600 7500 5350
 Wire Wire Line
-	2150 2700 2150 3500
+	7500 4850 7500 4800
 Wire Wire Line
-	2800 3500 2800 3350
+	6900 5600 6900 5350
 Wire Wire Line
-	2800 3350 2750 3350
+	7100 5600 7100 5550
 Wire Wire Line
-	2800 2150 2800 2300
+	7100 5150 7100 5100
 Wire Wire Line
-	2550 2150 2550 2250
+	7100 5100 7050 5100
 Wire Wire Line
-	3900 1650 3650 1650
+	6450 5100 6500 5100
 Wire Wire Line
-	3650 1500 2700 1500
+	6500 5100 6500 5150
 Wire Wire Line
-	3900 1500 3850 1500
-Connection ~ 3400 1500
+	6500 5600 6500 5550
 Wire Wire Line
-	3100 1500 3100 1400
-Connection ~ 2800 1750
+	6300 5600 6300 5350
 Wire Wire Line
-	2700 2000 2800 2000
+	6300 4850 6300 4800
 Wire Wire Line
-	10650 4700 10650 4650
+	5600 4850 5600 4800
 Wire Wire Line
-	10300 6350 10300 6300
+	5600 5600 5600 5350
 Wire Wire Line
-	10300 5900 10300 5850
+	5800 5600 5800 5550
 Wire Wire Line
-	10650 6100 10650 6150
+	6000 2500 6050 2500
 Wire Wire Line
-	10650 6650 10650 6700
+	7850 2900 7900 2900
 Wire Wire Line
-	10700 6100 10600 6100
-Connection ~ 10650 6100
+	7850 2700 7900 2700
 Wire Wire Line
-	10700 5250 10600 5250
+	6250 1850 6250 1800
 Wire Wire Line
-	10300 5050 10300 5000
+	6550 1850 6550 1800
 Wire Wire Line
-	10300 5500 10300 5450
+	6550 1300 6550 1400
 Wire Wire Line
-	10650 5250 10650 5200
-Connection ~ 10650 5250
-Connection ~ 9500 5250
+	6250 1300 6250 1400
 Wire Wire Line
-	9500 5250 9500 5200
+	5950 1300 5950 1400
 Wire Wire Line
-	9150 5500 9150 5450
+	10400 1450 10300 1450
+Connection ~ 5000 7650
 Wire Wire Line
-	9150 5050 9150 5000
+	5000 7650 5000 6750
+Connection ~ 4050 5050
+Connection ~ 4050 3500
 Wire Wire Line
-	9550 5250 9450 5250
-Connection ~ 9500 6100
+	4050 3500 4050 5100
+Connection ~ 950  5050
+Connection ~ 950  3650
 Wire Wire Line
-	9550 6100 9450 6100
+	950  2700 950  5100
+Connection ~ 2500 3650
+Connection ~ 2500 5050
 Wire Wire Line
-	9500 6650 9500 6700
+	2500 3650 2500 5100
+Connection ~ 950  3350
+Wire Wire Line
+	1650 6700 1650 6800
+Wire Wire Line
+	1350 6700 1350 6800
+Wire Wire Line
+	8950 1400 8950 1450
+Wire Wire Line
+	8500 1550 8500 1600
+Wire Wire Line
+	8500 1100 8600 1100
+Wire Wire Line
+	6900 2000 6900 1950
+Wire Wire Line
+	5100 1900 5100 1850
 Wire Wire Line
-	9500 6100 9500 6150
+	2150 2700 2150 3500
+Wire Wire Line
+	2800 3500 2800 3350
 Wire Wire Line
-	9150 5900 9150 5850
+	2800 3350 2750 3350
+Wire Wire Line
+	2700 1500 3650 1500
 Wire Wire Line
-	9150 6350 9150 6300
+	3900 1500 3850 1500
+Connection ~ 3400 1500
 Wire Wire Line
-	9500 4650 9500 4700
+	3100 1500 3100 1400
+Connection ~ 2800 1750
 Wire Wire Line
-	8350 4700 8350 4650
+	2700 2000 2800 2000
 Wire Wire Line
 	6850 6900 6950 6900
 Wire Wire Line
 	6950 6650 6850 6650
 Wire Wire Line
-	8000 6350 8000 6300
-Wire Wire Line
-	8000 5900 8000 5850
+	9000 4100 9000 4050
 Wire Wire Line
 	1250 4200 1250 5100
 Wire Wire Line
@@ -258,9 +285,9 @@ Wire Wire Line
 Connection ~ 2150 3150
 Connection ~ 3450 6750
 Wire Wire Line
-	10400 1400 10300 1400
+	10400 1050 10300 1050
 Wire Wire Line
-	10400 1600 10300 1600
+	10400 1250 10300 1250
 Wire Wire Line
 	4050 5050 4150 5050
 Wire Wire Line
@@ -312,31 +339,17 @@ Wire Wire Line
 Wire Wire Line
 	950  6750 950  6700
 Wire Wire Line
-	10550 3350 10550 3300
-Wire Wire Line
-	10800 2800 10800 2550
+	9000 5700 9000 5650
 Wire Wire Line
-	10800 2550 10250 2550
+	8750 5100 8750 5150
 Wire Wire Line
-	10300 2800 10300 2750
+	9250 5700 9250 5650
 Wire Wire Line
-	10300 2750 10250 2750
+	8750 5700 8750 5650
 Wire Wire Line
-	10250 2650 10550 2650
+	8750 6900 8750 6850
 Wire Wire Line
-	10550 2650 10550 2800
-Wire Wire Line
-	10800 3350 10800 3300
-Wire Wire Line
-	10300 3350 10300 3300
-Wire Wire Line
-	10300 4400 10300 4350
-Wire Wire Line
-	10800 4400 10800 4350
-Wire Wire Line
-	10550 3850 10550 3700
-Wire Wire Line
-	10550 3700 10250 3700
+	9250 6900 9250 6850
 Wire Wire Line
 	950  3350 1300 3350
 Wire Wire Line
@@ -348,11 +361,7 @@ Wire Wire Line
 Wire Wire Line
 	5750 6500 5850 6500
 Wire Wire Line
-	5750 6200 5850 6200
-Wire Wire Line
-	3700 2750 3700 2800
-Wire Wire Line
-	3100 2900 3100 2950
+	3100 3150 3100 3200
 Connection ~ 950  1500
 Wire Wire Line
 	950  1300 950  2300
@@ -362,7 +371,7 @@ Wire Wire Line
 Wire Wire Line
 	1600 3150 1500 3150
 Wire Wire Line
-	9450 900  9350 900 
+	5050 900  4950 900 
 Wire Wire Line
 	1550 1750 2300 1750
 Connection ~ 950  1350
@@ -373,13 +382,13 @@ Wire Wire Line
 Wire Wire Line
 	1650 1350 1550 1350
 Wire Wire Line
-	10350 2050 10350 2000
+	10350 1700 10350 1650
 Wire Wire Line
-	10350 2000 10400 2000
+	10350 1650 10400 1650
 Wire Wire Line
-	9400 1150 9400 1100
+	5000 1150 5000 1100
 Wire Wire Line
-	9400 1100 9450 1100
+	5000 1100 5050 1100
 Wire Wire Line
 	3400 850  3400 1000
 Wire Wire Line
@@ -391,13 +400,13 @@ Wire Wire Line
 Wire Wire Line
 	3100 850  3100 1000
 Wire Wire Line
-	9350 800  9450 800 
+	4950 800  5050 800 
 Wire Wire Line
-	10350 1250 10350 1300
+	10350 900  10350 950 
 Wire Wire Line
-	10350 1300 10400 1300
+	10350 950  10400 950 
 Wire Wire Line
-	10300 1700 10400 1700
+	10300 1350 10400 1350
 Wire Wire Line
 	950  1350 1050 1350
 Wire Wire Line
@@ -419,11 +428,9 @@ Wire Wire Line
 Wire Wire Line
 	950  1500 2300 1500
 Wire Wire Line
-	8350 6100 8350 6150
+	8650 4400 8650 4450
 Wire Wire Line
-	8350 6650 8350 6700
-Wire Wire Line
-	9450 1000 9350 1000
+	5050 1000 4950 1000
 Wire Wire Line
 	2150 2000 2300 2000
 Connection ~ 2150 2000
@@ -445,17 +452,13 @@ Wire Wire Line
 	700  2150 950  2150
 Connection ~ 950  2150
 Wire Wire Line
-	3150 2350 3100 2350
-Wire Wire Line
-	3100 2350 3100 2400
-Wire Wire Line
-	3800 2750 3800 2800
+	3150 2600 3100 2600
 Wire Wire Line
-	4350 2250 4400 2250
+	3100 2600 3100 2650
 Wire Wire Line
-	4400 2250 4400 2300
+	4350 2500 4400 2500
 Wire Wire Line
-	5850 6100 5750 6100
+	4400 2500 4400 2550
 Wire Wire Line
 	5750 6400 5850 6400
 Wire Wire Line
@@ -467,15 +470,9 @@ Wire Wire Line
 Wire Wire Line
 	650  5950 650  5900
 Wire Wire Line
-	10250 3800 10300 3800
-Wire Wire Line
-	10300 3800 10300 3850
-Wire Wire Line
-	10250 3600 10800 3600
+	8750 6300 8750 6350
 Wire Wire Line
-	10800 3600 10800 3850
-Wire Wire Line
-	10550 4400 10550 4350
+	9000 6900 9000 6850
 Wire Wire Line
 	650  5900 700  5900
 Wire Wire Line
@@ -504,7 +501,7 @@ Wire Wire Line
 Wire Wire Line
 	2600 5050 2500 5050
 Wire Wire Line
-	10300 1500 10400 1500
+	10300 1150 10400 1150
 Connection ~ 5000 6750
 Wire Wire Line
 	2150 3150 2100 3150
@@ -540,21 +537,11 @@ Wire Wire Line
 Wire Wire Line
 	1250 3650 950  3650
 Wire Wire Line
-	8400 6100 8300 6100
-Connection ~ 8350 6100
-Wire Wire Line
 	5800 7650 1900 7650
 Wire Wire Line
 	6850 6750 6950 6750
 Wire Wire Line
-	8400 5250 8300 5250
-Wire Wire Line
-	8000 5050 8000 5000
-Wire Wire Line
-	8000 5500 8000 5450
-Wire Wire Line
-	8350 5250 8350 5200
-Connection ~ 8350 5250
+	8950 3000 8950 2950
 Wire Wire Line
 	2800 1750 2700 1750
 Wire Wire Line
@@ -566,9 +553,6 @@ Connection ~ 3100 1500
 Wire Wire Line
 	3850 1500 3850 1450
 Wire Wire Line
-	3650 1650 3650 1450
-Connection ~ 3650 1500
-Wire Wire Line
 	2750 3150 2800 3150
 Wire Wire Line
 	2800 3150 2800 2700
@@ -578,30 +562,19 @@ Wire Wire Line
 	1550 3650 2800 3650
 Connection ~ 2800 3500
 Wire Wire Line
-	5000 1200 5000 1300
-Wire Wire Line
-	5000 1850 4400 1850
-Connection ~ 5000 1850
-Wire Wire Line
-	4400 1850 4400 2150
-Wire Wire Line
-	4400 2150 4350 2150
-Wire Wire Line
-	4500 2450 4350 2450
-Wire Wire Line
 	7000 2000 7000 1950
 Wire Wire Line
 	1800 3350 2150 3350
 Connection ~ 2150 3350
 Wire Wire Line
-	4950 2800 4950 2850
+	9250 1100 9250 1150
 Wire Wire Line
-	4200 2850 4200 2750
-Connection ~ 4200 2800
+	8500 1150 8500 1050
+Connection ~ 8500 1100
 Wire Wire Line
-	4550 3100 4550 3150
+	8850 1400 8850 1450
 Wire Wire Line
-	4950 3250 4950 3300
+	9250 1550 9250 1600
 Wire Wire Line
 	1250 6800 1250 6700
 Wire Wire Line
@@ -633,52 +606,30 @@ Wire Wire Line
 Wire Wire Line
 	4650 6700 4650 6800
 Wire Wire Line
-	10300 1900 10400 1900
-Wire Wire Line
-	9000 2050 9000 2150
-Wire Wire Line
-	9300 2050 9300 2150
+	10300 1550 10400 1550
 Wire Wire Line
-	8850 2600 8850 2550
+	6100 1300 6100 1400
 Wire Wire Line
-	9300 2600 9300 2550
+	6400 1300 6400 1400
 Wire Wire Line
-	9000 2600 9000 2550
-Connection ~ 9300 3100
+	5950 1850 5950 1800
 Wire Wire Line
-	9300 3150 9300 3100
-Connection ~ 9000 3100
+	6400 1850 6400 1800
 Wire Wire Line
-	9000 3150 9000 3100
+	7800 1400 7800 1300
 Wire Wire Line
-	9450 3150 9450 3100
-Wire Wire Line
-	9300 3650 9300 3550
-Wire Wire Line
-	9000 3650 9000 3550
+	7500 1400 7500 1300
 Wire Wire Line
-	8850 3650 8850 3550
+	7350 1400 7350 1300
 Wire Wire Line
-	9150 3650 9150 3550
+	7650 1400 7650 1300
 Wire Wire Line
-	9450 3650 9450 3550
-Wire Wire Line
-	8850 3150 8850 3100
-Connection ~ 8850 3100
-Wire Wire Line
-	9150 3150 9150 3100
-Connection ~ 9150 3100
+	7950 1400 7950 1300
 Wire Wire Line
 	7850 2800 7900 2800
 Wire Wire Line
 	7850 3000 7900 3000
 Wire Wire Line
-	9450 3100 7850 3100
-Connection ~ 9300 2600
-Connection ~ 9000 2600
-Wire Wire Line
-	9450 2600 7850 2600
-Wire Wire Line
 	6000 2900 6050 2900
 Wire Wire Line
 	6000 2700 6050 2700
@@ -695,8 +646,6 @@ Wire Wire Line
 Wire Wire Line
 	7850 3700 7900 3700
 Wire Wire Line
-	7850 3500 7900 3500
-Wire Wire Line
 	7850 3600 7900 3600
 Wire Wire Line
 	7850 3800 7900 3800
@@ -713,10 +662,6 @@ Wire Wire Line
 Wire Wire Line
 	6000 3800 6050 3800
 Wire Wire Line
-	7850 3300 7900 3300
-Wire Wire Line
-	7850 3400 7900 3400
-Wire Wire Line
 	6000 3200 6050 3200
 Wire Wire Line
 	6000 3000 6050 3000
@@ -731,233 +676,655 @@ Wire Wire Line
 Wire Wire Line
 	6900 4500 6900 4550
 Wire Wire Line
-	8350 4650 10650 4650
-Connection ~ 9500 4650
+	5800 5150 5800 5100
 Wire Wire Line
-	6250 1200 6250 1150
+	5800 5100 5750 5100
 Wire Wire Line
-	6250 1150 6200 1150
+	5750 7050 5850 7050
 Wire Wire Line
-	4900 2800 6050 2800
-Connection ~ 4950 2800
+	5100 3650 5100 3600
 Wire Wire Line
-	5750 7050 5850 7050
+	5250 2950 5250 2900
+Wire Wire Line
+	10150 4900 10150 5200
+Wire Wire Line
+	9000 4900 9000 5150
+Wire Wire Line
+	9350 4700 8700 4700
+Connection ~ 9250 4700
+Wire Wire Line
+	10500 4900 9850 4900
+Connection ~ 10150 4900
+Wire Wire Line
+	10500 5100 9850 5100
+Connection ~ 9900 5100
+Connection ~ 9900 6300
+Wire Wire Line
+	10500 6300 9850 6300
+Connection ~ 10150 6100
+Wire Wire Line
+	10500 6100 9850 6100
+Wire Wire Line
+	10150 6100 10150 6400
+Wire Wire Line
+	9900 6300 9900 6400
+Wire Wire Line
+	10400 5900 10400 6400
+Wire Wire Line
+	10500 5900 9850 5900
+Connection ~ 10400 5900
+Wire Wire Line
+	10400 5700 10400 5600
+Wire Wire Line
+	9900 5700 9900 5600
+Wire Wire Line
+	9250 5900 9250 6350
+Wire Wire Line
+	9350 6100 8700 6100
+Connection ~ 9000 6100
+Wire Wire Line
+	6100 1850 6100 1800
+Connection ~ 6100 1850
+Wire Wire Line
+	7900 2600 7850 2600
+Wire Wire Line
+	6050 2800 6000 2800
+Wire Wire Line
+	5100 3400 5050 3400
+Wire Wire Line
+	5100 3600 5050 3600
+Wire Wire Line
+	3700 3000 3700 3200
+Wire Wire Line
+	3650 1500 3650 1450
+Connection ~ 7500 1850
+Wire Wire Line
+	7500 1850 7500 1800
+Wire Wire Line
+	7800 1850 7800 1800
+Wire Wire Line
+	7350 1800 7350 1850
+Wire Wire Line
+	7950 1800 7950 1850
+Wire Wire Line
+	7650 1850 7650 1800
+Wire Wire Line
+	7950 1850 7350 1850
+Connection ~ 7800 1850
+Connection ~ 7650 1850
+Wire Wire Line
+	8650 3850 8700 3850
+Wire Wire Line
+	9500 3850 9550 3850
+Wire Wire Line
+	9500 4400 9500 4450
+Wire Wire Line
+	9850 4100 9850 4050
+Wire Wire Line
+	10700 4100 10700 4050
 Wire Wire Line
-	6550 5350 6500 5350
+	10350 4400 10350 4450
 Wire Wire Line
-	6500 5350 6500 5400
+	10350 3850 10400 3850
 Wire Wire Line
-	6050 5250 6550 5250
-Connection ~ 6300 5250
+	9500 3900 9500 3400
+Wire Wire Line
+	9500 3400 7850 3400
+Connection ~ 9500 3850
+Wire Wire Line
+	9000 3650 9000 3550
+Wire Wire Line
+	9000 3550 8850 3550
+Wire Wire Line
+	10550 3550 10700 3550
+Wire Wire Line
+	10700 3550 10700 3650
+Wire Wire Line
+	6900 4850 6900 4800
+Wire Wire Line
+	8600 2750 8650 2750
+Wire Wire Line
+	10650 2550 10650 2450
+Wire Wire Line
+	10650 2450 10500 2450
+Wire Wire Line
+	10350 2750 10300 2750
+Wire Wire Line
+	10300 2750 10300 2250
+Wire Wire Line
+	10300 2250 8450 2250
+Wire Wire Line
+	5100 1850 5150 1850
+Wire Wire Line
+	5150 1650 5100 1650
+Wire Wire Line
+	3150 2400 3100 2400
+Wire Wire Line
+	2800 2200 2800 2300
+Wire Wire Line
+	4550 2250 4550 2200
+Wire Wire Line
+	4600 1650 4400 1650
+Wire Wire Line
+	4400 1650 4400 2400
+Wire Wire Line
+	4400 2400 4350 2400
+Wire Wire Line
+	2550 2200 3100 2200
+Wire Wire Line
+	3100 2200 3100 2400
+Connection ~ 2800 2200
+Wire Wire Line
+	8800 2050 8900 2050
+Text Label 10500 2450 0    60   ~ 0
+B2_MAIN_EN
+$Comp
+L GND #PWR?
+U 1 1 51608CC0
+P 10650 3000
+F 0 "#PWR?" H 10650 3000 30  0001 C CNN
+F 1 "GND" H 10650 2930 30  0001 C CNN
+	1    10650 3000
+	1    0    0    -1  
+$EndComp
+$Comp
+L PMGD370XN Q?
+U 1 1 51608CBF
+P 10550 2750
+F 0 "Q?" H 10550 2550 60  0000 R CNN
+F 1 "PMGD370XN" V 10800 2800 60  0000 R CNN
+	1    10550 2750
+	1    0    0    1   
+$EndComp
+$Comp
+L PMGD370XN Q?
+U 1 1 51608CA6
+P 9700 2750
+F 0 "Q?" H 9700 2550 60  0000 R CNN
+F 1 "PMGD370XN" V 9950 2800 60  0000 R CNN
+	1    9700 2750
+	1    0    0    1   
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 51608CA5
+P 9800 3000
+F 0 "#PWR?" H 9800 3000 30  0001 C CNN
+F 1 "GND" H 9800 2930 30  0001 C CNN
+	1    9800 3000
+	1    0    0    -1  
+$EndComp
+Text Label 9650 2450 0    60   ~ 0
+B1_MAIN_EN
+Text Label 8450 2250 2    60   ~ 0
+MAIN_OFF
+Text Label 10550 3550 0    60   ~ 0
+B2_CHG_OFF
+$Comp
+L PMGD370XN Q?
+U 1 1 51608BA1
+P 10600 3850
+F 0 "Q?" H 10500 3650 60  0000 R CNN
+F 1 "PMGD370XN" V 10850 3900 60  0000 R CNN
+	1    10600 3850
+	1    0    0    1   
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 51608BA0
+P 10350 4450
+F 0 "#PWR?" H 10350 4450 30  0001 C CNN
+F 1 "GND" H 10350 4380 30  0001 C CNN
+	1    10350 4450
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 51608B9F
+P 10700 4100
+F 0 "#PWR?" H 10700 4100 30  0001 C CNN
+F 1 "GND" H 10700 4030 30  0001 C CNN
+	1    10700 4100
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 51608B9E
+P 10350 4150
+F 0 "R?" V 10430 4150 50  0000 C CNN
+F 1 "220k" V 10350 4150 50  0000 C CNN
+	1    10350 4150
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 51608B93
+P 9500 4150
+F 0 "R?" V 9580 4150 50  0000 C CNN
+F 1 "220k" V 9500 4150 50  0000 C CNN
+	1    9500 4150
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 51608B92
+P 9850 4100
+F 0 "#PWR?" H 9850 4100 30  0001 C CNN
+F 1 "GND" H 9850 4030 30  0001 C CNN
+	1    9850 4100
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 51608B91
+P 9500 4450
+F 0 "#PWR?" H 9500 4450 30  0001 C CNN
+F 1 "GND" H 9500 4380 30  0001 C CNN
+	1    9500 4450
+	1    0    0    -1  
+$EndComp
+$Comp
+L PMGD370XN Q?
+U 1 1 51608B90
+P 9750 3850
+F 0 "Q?" H 9650 3650 60  0000 R CNN
+F 1 "PMGD370XN" V 10000 3900 60  0000 R CNN
+	1    9750 3850
+	1    0    0    1   
+$EndComp
+Text Label 9700 3550 0    60   ~ 0
+B1_CHG_OFF
+Text Notes 5300 1550 0    100  ~ 20
+USB
+Text Notes 2250 2900 0    60   ~ 0
+disconnect\nbefore\nflight
+Text Label 6000 2800 2    60   ~ 0
++1.25V
+Text Label 8800 2050 2    60   ~ 0
+VITAL_PWR_STBY
+$Comp
+L GND #PWR?
+U 1 1 516086D5
+P 9900 6900
+F 0 "#PWR?" H 9900 6900 30  0001 C CNN
+F 1 "GND" H 9900 6830 30  0001 C CNN
+	1    9900 6900
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 516086D4
+P 10150 6900
+F 0 "#PWR?" H 10150 6900 30  0001 C CNN
+F 1 "GND" H 10150 6830 30  0001 C CNN
+	1    10150 6900
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 516086D3
+P 10400 6900
+F 0 "#PWR?" H 10400 6900 30  0001 C CNN
+F 1 "GND" H 10400 6830 30  0001 C CNN
+	1    10400 6900
+	1    0    0    -1  
+$EndComp
+Text Label 8700 5900 2    60   ~ 0
+B0_CHG_LIM
+$Comp
+L GND #PWR?
+U 1 1 51608675
+P 10400 5700
+F 0 "#PWR?" H 10400 5700 30  0001 C CNN
+F 1 "GND" H 10400 5630 30  0001 C CNN
+	1    10400 5700
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 51608674
+P 10150 5700
+F 0 "#PWR?" H 10150 5700 30  0001 C CNN
+F 1 "GND" H 10150 5630 30  0001 C CNN
+	1    10150 5700
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 51608672
+P 9900 5700
+F 0 "#PWR?" H 9900 5700 30  0001 C CNN
+F 1 "GND" H 9900 5630 30  0001 C CNN
+	1    9900 5700
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 51608670
+P 9600 6100
+F 0 "R?" V 9680 6100 50  0000 C CNN
+F 1 "20k" V 9600 6100 50  0000 C CNN
+	1    9600 6100
+	0    1    1    0   
+$EndComp
+$Comp
+L R R?
+U 1 1 5160866F
+P 9600 5900
+F 0 "R?" V 9680 5900 50  0000 C CNN
+F 1 "20k" V 9600 5900 50  0000 C CNN
+	1    9600 5900
+	0    1    1    0   
+$EndComp
+$Comp
+L R R?
+U 1 1 5160866E
+P 9600 6300
+F 0 "R?" V 9680 6300 50  0000 C CNN
+F 1 "20k" V 9600 6300 50  0000 C CNN
+	1    9600 6300
+	0    1    1    0   
+$EndComp
+$Comp
+L C C?
+U 1 1 5160866D
+P 9900 6600
+F 0 "C?" H 9950 6700 50  0000 L CNN
+F 1 "10µF" H 9950 6500 50  0000 L CNN
+	1    9900 6600
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 5160866C
+P 10150 6600
+F 0 "C?" H 10200 6700 50  0000 L CNN
+F 1 "10µF" H 10200 6500 50  0000 L CNN
+	1    10150 6600
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 5160866B
+P 10400 6600
+F 0 "C?" H 10450 6700 50  0000 L CNN
+F 1 "10µF" H 10450 6500 50  0000 L CNN
+	1    10400 6600
+	1    0    0    -1  
+$EndComp
+Text Label 10500 5900 0    60   ~ 0
+B0_PWR_C
+Text Label 10500 6100 0    60   ~ 0
+B1_PWR_C
+Text Label 10500 6300 0    60   ~ 0
+B2_PWR_C
+Text Label 10500 5100 0    60   ~ 0
+B2_PWR_C
+Text Label 10500 4900 0    60   ~ 0
+B1_PWR_C
+Text Label 10500 4700 0    60   ~ 0
+B0_PWR_C
+$Comp
+L C C?
+U 1 1 51608603
+P 10400 5400
+F 0 "C?" H 10450 5500 50  0000 L CNN
+F 1 "10µF" H 10450 5300 50  0000 L CNN
+	1    10400 5400
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 51608601
+P 10150 5400
+F 0 "C?" H 10200 5500 50  0000 L CNN
+F 1 "10µF" H 10200 5300 50  0000 L CNN
+	1    10150 5400
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 516085ED
+P 9900 5400
+F 0 "C?" H 9950 5500 50  0000 L CNN
+F 1 "10µF" H 9950 5300 50  0000 L CNN
+	1    9900 5400
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 516085C1
+P 9600 5100
+F 0 "R?" V 9680 5100 50  0000 C CNN
+F 1 "20k" V 9600 5100 50  0000 C CNN
+	1    9600 5100
+	0    1    1    0   
+$EndComp
+$Comp
+L R R?
+U 1 1 516085BF
+P 9600 4700
+F 0 "R?" V 9680 4700 50  0000 C CNN
+F 1 "20k" V 9600 4700 50  0000 C CNN
+	1    9600 4700
+	0    1    1    0   
+$EndComp
+$Comp
+L R R?
+U 1 1 516085A6
+P 9600 4900
+F 0 "R?" V 9680 4900 50  0000 C CNN
+F 1 "20k" V 9600 4900 50  0000 C CNN
+	1    9600 4900
+	0    1    1    0   
+$EndComp
 Text Label 6000 3500 2    60   ~ 0
-BatTemp
-Text Label 6050 5250 2    60   ~ 0
-BatTemp
+BAT_TEMP
 $Comp
 L VCC #PWR?
 U 1 1 515FD910
-P 6500 5100
-F 0 "#PWR?" H 6500 5200 30  0001 C CNN
-F 1 "VCC" H 6500 5200 30  0000 C CNN
-	1    6500 5100
+P 5100 3350
+F 0 "#PWR?" H 5100 3450 30  0001 C CNN
+F 1 "VCC" H 5100 3450 30  0000 C CNN
+	1    5100 3350
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515FD907
-P 6500 5400
-F 0 "#PWR?" H 6500 5400 30  0001 C CNN
-F 1 "GND" H 6500 5330 30  0001 C CNN
-	1    6500 5400
+P 5100 3650
+F 0 "#PWR?" H 5100 3650 30  0001 C CNN
+F 1 "GND" H 5100 3580 30  0001 C CNN
+	1    5100 3650
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR?
 U 1 1 515FD904
-P 6300 4650
-F 0 "#PWR?" H 6300 4750 30  0001 C CNN
-F 1 "VCC" H 6300 4750 30  0000 C CNN
-	1    6300 4650
+P 5250 2900
+F 0 "#PWR?" H 5250 3000 30  0001 C CNN
+F 1 "VCC" H 5250 3000 30  0000 C CNN
+	1    5250 2900
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 515FD8BA
-P 6300 4950
-F 0 "R?" V 6380 4950 50  0000 C CNN
-F 1 "4k7" V 6300 4950 50  0000 C CNN
-	1    6300 4950
+P 5250 3200
+F 0 "R?" V 5350 3200 50  0000 C CNN
+F 1 "4k7" V 5250 3200 50  0000 C CNN
+	1    5250 3200
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_3 K?
 U 1 1 515FD894
-P 6900 5250
-F 0 "K?" V 6850 5250 50  0000 C CNN
-F 1 "TEMP" V 6950 5250 40  0000 C CNN
-	1    6900 5250
-	1    0    0    -1  
+P 4700 3500
+F 0 "K?" V 4650 3500 50  0000 C CNN
+F 1 "TEMP" V 4750 3500 40  0000 C CNN
+	1    4700 3500
+	-1   0    0    1   
 $EndComp
 Text HLabel 5750 7050 0    60   Input ~ 0
 HEAT_PWR
 $Comp
 L POT RV?
 U 1 1 515E4D71
-P 7950 1150
-F 0 "RV?" H 7950 1050 50  0000 C CNN
-F 1 "1M0" H 7950 1150 50  0000 C CNN
-	1    7950 1150
+P 7500 5100
+F 0 "RV?" H 7500 5000 50  0000 C CNN
+F 1 "1M0" H 7500 5100 50  0000 C CNN
+	1    7500 5100
 	0    1    1    0   
 $EndComp
 $Comp
 L C C?
 U 1 1 515E4D70
-P 8150 1400
-F 0 "C?" H 8200 1500 50  0000 L CNN
-F 1 "10µF" H 8200 1300 50  0000 L CNN
-	1    8150 1400
+P 7700 5350
+F 0 "C?" H 7750 5450 50  0000 L CNN
+F 1 "10µF" H 7750 5250 50  0000 L CNN
+	1    7700 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515E4D6F
-P 8150 1650
-F 0 "#PWR?" H 8150 1650 30  0001 C CNN
-F 1 "GND" H 8150 1580 30  0001 C CNN
-	1    8150 1650
+P 7700 5600
+F 0 "#PWR?" H 7700 5600 30  0001 C CNN
+F 1 "GND" H 7700 5530 30  0001 C CNN
+	1    7700 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515E4D6E
-P 7950 1650
-F 0 "#PWR?" H 7950 1650 30  0001 C CNN
-F 1 "GND" H 7950 1580 30  0001 C CNN
-	1    7950 1650
+P 7500 5600
+F 0 "#PWR?" H 7500 5600 30  0001 C CNN
+F 1 "GND" H 7500 5530 30  0001 C CNN
+	1    7500 5600
 	1    0    0    -1  
 $EndComp
-Text Label 7950 850  0    60   ~ 0
+Text Label 7500 4800 0    60   ~ 0
 BATT2
-Text Label 8150 1150 0    60   ~ 0
+Text Label 7700 5100 0    60   ~ 0
 B2_V
-Text Label 7550 1150 0    60   ~ 0
+Text Label 7100 5100 0    60   ~ 0
 B1_V
-Text Label 7350 850  0    60   ~ 0
+Text Label 6900 4800 0    60   ~ 0
 BATT1
 $Comp
 L GND #PWR?
 U 1 1 515E4D6C
-P 7350 1650
-F 0 "#PWR?" H 7350 1650 30  0001 C CNN
-F 1 "GND" H 7350 1580 30  0001 C CNN
-	1    7350 1650
+P 6900 5600
+F 0 "#PWR?" H 6900 5600 30  0001 C CNN
+F 1 "GND" H 6900 5530 30  0001 C CNN
+	1    6900 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515E4D6B
-P 7550 1650
-F 0 "#PWR?" H 7550 1650 30  0001 C CNN
-F 1 "GND" H 7550 1580 30  0001 C CNN
-	1    7550 1650
+P 7100 5600
+F 0 "#PWR?" H 7100 5600 30  0001 C CNN
+F 1 "GND" H 7100 5530 30  0001 C CNN
+	1    7100 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C?
 U 1 1 515E4D6A
-P 7550 1400
-F 0 "C?" H 7600 1500 50  0000 L CNN
-F 1 "10µF" H 7600 1300 50  0000 L CNN
-	1    7550 1400
+P 7100 5350
+F 0 "C?" H 7150 5450 50  0000 L CNN
+F 1 "10µF" H 7150 5250 50  0000 L CNN
+	1    7100 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L POT RV?
 U 1 1 515E4D69
-P 7350 1150
-F 0 "RV?" H 7350 1050 50  0000 C CNN
-F 1 "1M0" H 7350 1150 50  0000 C CNN
-	1    7350 1150
+P 6900 5100
+F 0 "RV?" H 6900 5000 50  0000 C CNN
+F 1 "1M0" H 6900 5100 50  0000 C CNN
+	1    6900 5100
 	0    1    1    0   
 $EndComp
 $Comp
 L POT RV?
 U 1 1 515E4D4F
-P 6800 1150
-F 0 "RV?" H 6800 1050 50  0000 C CNN
-F 1 "1M0" H 6800 1150 50  0000 C CNN
-	1    6800 1150
+P 6300 5100
+F 0 "RV?" H 6300 5000 50  0000 C CNN
+F 1 "1M0" H 6300 5100 50  0000 C CNN
+	1    6300 5100
 	0    1    1    0   
 $EndComp
 $Comp
 L C C?
 U 1 1 515E4D4E
-P 7000 1400
-F 0 "C?" H 7050 1500 50  0000 L CNN
-F 1 "10µF" H 7050 1300 50  0000 L CNN
-	1    7000 1400
+P 6500 5350
+F 0 "C?" H 6550 5450 50  0000 L CNN
+F 1 "10µF" H 6550 5250 50  0000 L CNN
+	1    6500 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515E4D4D
-P 7000 1650
-F 0 "#PWR?" H 7000 1650 30  0001 C CNN
-F 1 "GND" H 7000 1580 30  0001 C CNN
-	1    7000 1650
+P 6500 5600
+F 0 "#PWR?" H 6500 5600 30  0001 C CNN
+F 1 "GND" H 6500 5530 30  0001 C CNN
+	1    6500 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515E4D4C
-P 6800 1650
-F 0 "#PWR?" H 6800 1650 30  0001 C CNN
-F 1 "GND" H 6800 1580 30  0001 C CNN
-	1    6800 1650
+P 6300 5600
+F 0 "#PWR?" H 6300 5600 30  0001 C CNN
+F 1 "GND" H 6300 5530 30  0001 C CNN
+	1    6300 5600
 	1    0    0    -1  
 $EndComp
-Text Label 6800 850  0    60   ~ 0
+Text Label 6300 4800 0    60   ~ 0
 BATT0
-Text Label 7000 1150 0    60   ~ 0
+Text Label 6500 5100 0    60   ~ 0
 B0_V
-Text Label 6250 1150 0    60   ~ 0
+Text Label 5800 5100 0    60   ~ 0
 MAIN_V
-Text Label 6050 850  0    60   ~ 0
+Text Label 5600 4800 0    60   ~ 0
 MAIN_PWR
 $Comp
 L GND #PWR?
 U 1 1 515E4D27
-P 6050 1650
-F 0 "#PWR?" H 6050 1650 30  0001 C CNN
-F 1 "GND" H 6050 1580 30  0001 C CNN
-	1    6050 1650
+P 5600 5600
+F 0 "#PWR?" H 5600 5600 30  0001 C CNN
+F 1 "GND" H 5600 5530 30  0001 C CNN
+	1    5600 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515E4D25
-P 6250 1650
-F 0 "#PWR?" H 6250 1650 30  0001 C CNN
-F 1 "GND" H 6250 1580 30  0001 C CNN
-	1    6250 1650
+P 5800 5600
+F 0 "#PWR?" H 5800 5600 30  0001 C CNN
+F 1 "GND" H 5800 5530 30  0001 C CNN
+	1    5800 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C?
 U 1 1 515E4D1B
-P 6250 1400
-F 0 "C?" H 6300 1500 50  0000 L CNN
-F 1 "10µF" H 6300 1300 50  0000 L CNN
-	1    6250 1400
+P 5800 5350
+F 0 "C?" H 5850 5450 50  0000 L CNN
+F 1 "10µF" H 5850 5250 50  0000 L CNN
+	1    5800 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L POT RV?
 U 1 1 515E4D09
-P 6050 1150
-F 0 "RV?" H 6050 1050 50  0000 C CNN
-F 1 "1M0" H 6050 1150 50  0000 C CNN
-	1    6050 1150
+P 5600 5100
+F 0 "RV?" H 5600 5000 50  0000 C CNN
+F 1 "1M0" H 5600 5100 50  0000 C CNN
+	1    5600 5100
 	0    1    1    0   
 $EndComp
 $Comp
@@ -979,136 +1346,136 @@ F 1 "GND" H 7000 4480 30  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Text Label 6000 3100 2    60   ~ 0
-B0_PWR_LIM
+B0_PWR_C
 Text Label 6000 3200 2    60   ~ 0
-B1_PWR_LIM
+B1_PWR_C
 Text Label 6000 3300 2    60   ~ 0
-B2_PWR_LIM
+B2_PWR_C
 Text Label 6000 2700 2    60   ~ 0
-B2_CHG_LIM
+B2_CHG_C
 Text Label 6000 2600 2    60   ~ 0
-B1_CHG_LIM
+B1_CHG_C
 Text Label 6000 2500 2    60   ~ 0
-B0_CHG_LIM
-Text Label 9450 3650 3    60   ~ 0
+B0_CHG_C
+Text Label 7950 1300 1    60   ~ 0
 B2_PWR_WARN
-Text Label 9300 3650 3    60   ~ 0
+Text Label 7800 1300 1    60   ~ 0
 B1_PWR_WARN
-Text Label 9150 3650 3    60   ~ 0
+Text Label 7650 1300 1    60   ~ 0
 B2_CHG_WARN
-Text Label 9000 3650 3    60   ~ 0
+Text Label 7500 1300 1    60   ~ 0
 B1_CHG_WARN
-Text Label 8850 3650 3    60   ~ 0
+Text Label 7350 1300 1    60   ~ 0
 B0_CHG_WARN
 $Comp
 L DIODESCH D?
 U 1 1 515E49A0
-P 8850 3350
-F 0 "D?" H 8700 3300 40  0000 C CNN
-F 1 "CRS06" H 9000 3300 40  0000 C CNN
-	1    8850 3350
-	0    1    1    0   
+P 7350 1600
+F 0 "D?" H 7200 1550 40  0000 C CNN
+F 1 "CRS06" H 7500 1550 40  0000 C CNN
+	1    7350 1600
+	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D?
 U 1 1 515E499F
-P 9000 3350
-F 0 "D?" H 8850 3300 40  0000 C CNN
-F 1 "CRS06" H 9150 3300 40  0000 C CNN
-	1    9000 3350
-	0    1    1    0   
+P 7500 1600
+F 0 "D?" H 7350 1550 40  0000 C CNN
+F 1 "CRS06" H 7650 1550 40  0000 C CNN
+	1    7500 1600
+	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D?
 U 1 1 515E499E
-P 9150 3350
-F 0 "D?" H 9000 3300 40  0000 C CNN
-F 1 "CRS06" H 9300 3300 40  0000 C CNN
-	1    9150 3350
-	0    1    1    0   
+P 7650 1600
+F 0 "D?" H 7500 1550 40  0000 C CNN
+F 1 "CRS06" H 7800 1550 40  0000 C CNN
+	1    7650 1600
+	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D?
 U 1 1 515E499D
-P 9300 3350
-F 0 "D?" H 9150 3300 40  0000 C CNN
-F 1 "CRS06" H 9450 3300 40  0000 C CNN
-	1    9300 3350
-	0    1    1    0   
+P 7800 1600
+F 0 "D?" H 7650 1550 40  0000 C CNN
+F 1 "CRS06" H 7950 1550 40  0000 C CNN
+	1    7800 1600
+	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D?
 U 1 1 515E499C
-P 9450 3350
-F 0 "D?" H 9300 3300 40  0000 C CNN
-F 1 "CRS06" H 9600 3300 40  0000 C CNN
-	1    9450 3350
-	0    1    1    0   
+P 7950 1600
+F 0 "D?" H 7800 1550 40  0000 C CNN
+F 1 "CRS06" H 8100 1550 40  0000 C CNN
+	1    7950 1600
+	0    -1   -1   0   
 $EndComp
-Text Label 9450 2050 1    60   ~ 0
+Text Label 6550 1300 1    60   ~ 0
 B2_PWR_STAT
-Text Label 9300 2050 1    60   ~ 0
+Text Label 6400 1300 1    60   ~ 0
 B1_PWR_STAT
-Text Label 9150 2050 1    60   ~ 0
+Text Label 6250 1300 1    60   ~ 0
 B2_CHG_STAT
-Text Label 9000 2050 1    60   ~ 0
+Text Label 6100 1300 1    60   ~ 0
 B1_CHG_STAT
-Text Label 8850 2050 1    60   ~ 0
+Text Label 5950 1300 1    60   ~ 0
 B0_CHG_STAT
 $Comp
 L DIODESCH D?
 U 1 1 515E4948
-P 8850 2350
-F 0 "D?" H 8700 2300 40  0000 C CNN
-F 1 "CRS06" H 9000 2300 40  0000 C CNN
-	1    8850 2350
+P 5950 1600
+F 0 "D?" H 5800 1550 40  0000 C CNN
+F 1 "CRS06" H 6100 1550 40  0000 C CNN
+	1    5950 1600
 	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D?
 U 1 1 515E4947
-P 9000 2350
-F 0 "D?" H 8850 2300 40  0000 C CNN
-F 1 "CRS06" H 9150 2300 40  0000 C CNN
-	1    9000 2350
+P 6100 1600
+F 0 "D?" H 5950 1550 40  0000 C CNN
+F 1 "CRS06" H 6250 1550 40  0000 C CNN
+	1    6100 1600
 	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D?
 U 1 1 515E4946
-P 9150 2350
-F 0 "D?" H 9000 2300 40  0000 C CNN
-F 1 "CRS06" H 9300 2300 40  0000 C CNN
-	1    9150 2350
+P 6250 1600
+F 0 "D?" H 6100 1550 40  0000 C CNN
+F 1 "CRS06" H 6400 1550 40  0000 C CNN
+	1    6250 1600
 	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D?
 U 1 1 515E4944
-P 9300 2350
-F 0 "D?" H 9150 2300 40  0000 C CNN
-F 1 "CRS06" H 9450 2300 40  0000 C CNN
-	1    9300 2350
+P 6400 1600
+F 0 "D?" H 6250 1550 40  0000 C CNN
+F 1 "CRS06" H 6550 1550 40  0000 C CNN
+	1    6400 1600
 	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D?
 U 1 1 515E4921
-P 9450 2350
-F 0 "D?" H 9300 2300 40  0000 C CNN
-F 1 "CRS06" H 9600 2300 40  0000 C CNN
-	1    9450 2350
+P 6550 1600
+F 0 "D?" H 6400 1550 40  0000 C CNN
+F 1 "CRS06" H 6700 1550 40  0000 C CNN
+	1    6550 1600
 	0    -1   -1   0   
 $EndComp
 NoConn ~ 7850 2500
 NoConn ~ 7850 2400
 NoConn ~ 6050 3600
 Text Label 7900 3400 0    60   ~ 0
-BATT1_EN
+B1_CHG_EN
 Text Label 7900 3500 0    60   ~ 0
-BATT0_EN
+B0_CHG_EN
 Text Label 7900 3300 0    60   ~ 0
-BATT2_EN
+B2_CHG_EN
 Text Label 7900 2700 0    60   ~ 0
 MAIN_V
 Text Label 7900 2900 0    60   ~ 0
@@ -1138,15 +1505,15 @@ F 1 "PIC16F887PT" H 7100 1900 50  0000 L BNN
 	1    7000 3200
 	1    0    0    -1  
 $EndComp
-Text HLabel 10300 1900 0    60   Input ~ 0
+Text HLabel 10300 1550 0    60   Input ~ 0
 BAT_RST
 $Comp
 L CONN_8 P?
 U 1 1 515E444C
-P 10750 1650
-F 0 "P?" V 10700 1650 60  0000 C CNN
-F 1 "BAT" V 10800 1650 60  0000 C CNN
-	1    10750 1650
+P 10750 1300
+F 0 "P?" V 10700 1300 60  0000 C CNN
+F 1 "BAT" V 10800 1300 60  0000 C CNN
+	1    10750 1300
 	1    0    0    -1  
 $EndComp
 Text Label 7900 4200 0    60   ~ 0
@@ -1202,84 +1569,84 @@ BAT
 $Comp
 L CONN_4 P?
 U 1 1 515E4111
-P 9800 950
-F 0 "P?" V 9750 950 50  0000 C CNN
-F 1 "IHU_PWR" V 9850 950 50  0000 C CNN
-	1    9800 950 
+P 5400 950
+F 0 "P?" V 5350 950 50  0000 C CNN
+F 1 "IHU_PWR" V 5450 950 50  0000 C CNN
+	1    5400 950 
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515E2F76
-P 4950 3300
-F 0 "#PWR?" H 4950 3300 30  0001 C CNN
-F 1 "GND" H 4950 3230 30  0001 C CNN
-	1    4950 3300
+P 9250 1600
+F 0 "#PWR?" H 9250 1600 30  0001 C CNN
+F 1 "GND" H 9250 1530 30  0001 C CNN
+	1    9250 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515E2F75
-P 4650 3150
-F 0 "#PWR?" H 4650 3150 30  0001 C CNN
-F 1 "GND" H 4650 3080 30  0001 C CNN
-	1    4650 3150
+P 8950 1450
+F 0 "#PWR?" H 8950 1450 30  0001 C CNN
+F 1 "GND" H 8950 1380 30  0001 C CNN
+	1    8950 1450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515E2F73
-P 4550 3150
-F 0 "#PWR?" H 4550 3150 30  0001 C CNN
-F 1 "GND" H 4550 3080 30  0001 C CNN
-	1    4550 3150
+P 8850 1450
+F 0 "#PWR?" H 8850 1450 30  0001 C CNN
+F 1 "GND" H 8850 1380 30  0001 C CNN
+	1    8850 1450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515E2F71
-P 4200 3300
-F 0 "#PWR?" H 4200 3300 30  0001 C CNN
-F 1 "GND" H 4200 3230 30  0001 C CNN
-	1    4200 3300
+P 8500 1600
+F 0 "#PWR?" H 8500 1600 30  0001 C CNN
+F 1 "GND" H 8500 1530 30  0001 C CNN
+	1    8500 1600
 	1    0    0    -1  
 $EndComp
-Text Label 4950 2800 0    60   ~ 0
+Text Label 9250 1100 0    60   ~ 0
 +1.25V
 $Comp
 L VCC #PWR?
 U 1 1 515E2F23
-P 4200 2750
-F 0 "#PWR?" H 4200 2850 30  0001 C CNN
-F 1 "VCC" H 4200 2850 30  0000 C CNN
-	1    4200 2750
+P 8500 1050
+F 0 "#PWR?" H 8500 1150 30  0001 C CNN
+F 1 "VCC" H 8500 1150 30  0000 C CNN
+	1    8500 1050
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C?
 U 1 1 515E2F1C
-P 4950 3050
-F 0 "C?" H 5000 3150 50  0000 L CNN
-F 1 "C" H 5000 2950 50  0000 L CNN
-	1    4950 3050
+P 9250 1350
+F 0 "C?" H 9300 1450 50  0000 L CNN
+F 1 "1µF" H 9300 1250 50  0000 L CNN
+	1    9250 1350
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C?
 U 1 1 515E2F17
-P 4200 3050
-F 0 "C?" H 4250 3150 50  0000 L CNN
-F 1 "C" H 4250 2950 50  0000 L CNN
-	1    4200 3050
+P 8500 1350
+F 0 "C?" H 8550 1450 50  0000 L CNN
+F 1 "0.1µF" H 8550 1250 50  0000 L CNN
+	1    8500 1350
 	1    0    0    -1  
 $EndComp
 $Comp
 L LT6656-TSOT U?
 U 1 1 515E2F10
-P 4600 2850
-F 0 "U?" H 4750 2650 60  0000 C CNN
-F 1 "LT6656-1.25" H 4600 3000 60  0000 C CNN
-	1    4600 2850
+P 8900 1150
+F 0 "U?" H 9050 950 60  0000 C CNN
+F 1 "LT6656-1.25" H 8900 1300 60  0000 C CNN
+	1    8900 1150
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1309,180 +1676,34 @@ F 1 "USB_DIS" V 2450 3250 40  0000 C CNN
 	1    2400 3250
 	-1   0    0    1   
 $EndComp
-Text Label 10300 5000 2    60   ~ 0
-B2_MAIN_EN
-$Comp
-L R R?
-U 1 1 515DDB84
-P 10650 4950
-F 0 "R?" V 10730 4950 50  0000 C CNN
-F 1 "220k" V 10650 4950 50  0000 C CNN
-	1    10650 4950
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 515DDB83
-P 10300 5500
-F 0 "#PWR?" H 10300 5500 30  0001 C CNN
-F 1 "GND" H 10300 5430 30  0001 C CNN
-	1    10300 5500
-	1    0    0    -1  
-$EndComp
-Text Label 10700 5250 0    60   ~ 0
-MAIN_OFF
-$Comp
-L PMGD370XN Q?
-U 1 1 515DDB82
-P 10400 5250
-F 0 "Q?" V 10700 5300 60  0000 R CNN
-F 1 "PMGD370XN" V 10600 5450 60  0000 R CNN
-	1    10400 5250
-	-1   0    0    -1  
-$EndComp
-Text Label 10300 5850 2    60   ~ 0
-BATT2_OFF
-$Comp
-L PMGD370XN Q?
-U 1 1 515DDB81
-P 10400 6100
-F 0 "Q?" V 10700 6150 60  0000 R CNN
-F 1 "PMGD370XN" V 10600 6300 60  0000 R CNN
-	1    10400 6100
-	-1   0    0    -1  
-$EndComp
-Text Label 10700 6100 0    60   ~ 0
-BATT2_EN
-$Comp
-L GND #PWR?
-U 1 1 515DDB80
-P 10650 6700
-F 0 "#PWR?" H 10650 6700 30  0001 C CNN
-F 1 "GND" H 10650 6630 30  0001 C CNN
-	1    10650 6700
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 515DDB7F
-P 10300 6350
-F 0 "#PWR?" H 10300 6350 30  0001 C CNN
-F 1 "GND" H 10300 6280 30  0001 C CNN
-	1    10300 6350
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R?
-U 1 1 515DDB7E
-P 10650 6400
-F 0 "R?" V 10730 6400 50  0000 C CNN
-F 1 "220k" V 10650 6400 50  0000 C CNN
-	1    10650 6400
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R?
-U 1 1 515DDB5D
-P 9500 6400
-F 0 "R?" V 9580 6400 50  0000 C CNN
-F 1 "220k" V 9500 6400 50  0000 C CNN
-	1    9500 6400
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 515DDB5C
-P 9150 6350
-F 0 "#PWR?" H 9150 6350 30  0001 C CNN
-F 1 "GND" H 9150 6280 30  0001 C CNN
-	1    9150 6350
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 515DDB5B
-P 9500 6700
-F 0 "#PWR?" H 9500 6700 30  0001 C CNN
-F 1 "GND" H 9500 6630 30  0001 C CNN
-	1    9500 6700
-	1    0    0    -1  
-$EndComp
-Text Label 9550 6100 0    60   ~ 0
-BATT1_EN
-$Comp
-L PMGD370XN Q?
-U 1 1 515DDB5A
-P 9250 6100
-F 0 "Q?" V 9550 6150 60  0000 R CNN
-F 1 "PMGD370XN" V 9450 6300 60  0000 R CNN
-	1    9250 6100
-	-1   0    0    -1  
-$EndComp
-Text Label 9150 5850 2    60   ~ 0
-BATT1_OFF
-$Comp
-L PMGD370XN Q?
-U 1 1 515DDB59
-P 9250 5250
-F 0 "Q?" V 9550 5300 60  0000 R CNN
-F 1 "PMGD370XN" V 9450 5450 60  0000 R CNN
-	1    9250 5250
-	-1   0    0    -1  
-$EndComp
-Text Label 9550 5250 0    60   ~ 0
-MAIN_OFF
-$Comp
-L GND #PWR?
-U 1 1 515DDB58
-P 9150 5500
-F 0 "#PWR?" H 9150 5500 30  0001 C CNN
-F 1 "GND" H 9150 5430 30  0001 C CNN
-	1    9150 5500
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R?
-U 1 1 515DDB57
-P 9500 4950
-F 0 "R?" V 9580 4950 50  0000 C CNN
-F 1 "220k" V 9500 4950 50  0000 C CNN
-	1    9500 4950
-	1    0    0    -1  
-$EndComp
-Text Label 9150 5000 2    60   ~ 0
-B1_MAIN_EN
-Text Label 9500 4650 2    60   ~ 0
-VITAL_PWR_STBY
-Text Label 8000 5000 2    60   ~ 0
+Text Label 8800 2450 0    60   ~ 0
 B0_MAIN_EN
 $Comp
 L R R?
 U 1 1 515DDA2C
-P 8350 4950
-F 0 "R?" V 8430 4950 50  0000 C CNN
-F 1 "220k" V 8350 4950 50  0000 C CNN
-	1    8350 4950
-	1    0    0    -1  
+P 9150 2050
+F 0 "R?" V 9230 2050 50  0000 C CNN
+F 1 "220k" V 9150 2050 50  0000 C CNN
+	1    9150 2050
+	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515DDA2B
-P 8000 5500
-F 0 "#PWR?" H 8000 5500 30  0001 C CNN
-F 1 "GND" H 8000 5430 30  0001 C CNN
-	1    8000 5500
+P 8950 3000
+F 0 "#PWR?" H 8950 3000 30  0001 C CNN
+F 1 "GND" H 8950 2930 30  0001 C CNN
+	1    8950 3000
 	1    0    0    -1  
 $EndComp
-Text Label 8400 5250 0    60   ~ 0
-MAIN_OFF
 $Comp
 L PMGD370XN Q?
 U 1 1 515DDA29
-P 8100 5250
-F 0 "Q?" V 8400 5300 60  0000 R CNN
-F 1 "PMGD370XN" V 8300 5450 60  0000 R CNN
-	1    8100 5250
-	-1   0    0    -1  
+P 8850 2750
+F 0 "Q?" H 8850 2550 60  0000 R CNN
+F 1 "PMGD370XN" V 9100 2800 60  0000 R CNN
+	1    8850 2750
+	1    0    0    1   
 $EndComp
 $Sheet
 S 5850 5950 1000 1350
@@ -1510,18 +1731,18 @@ Text Label 3200 5000 1    60   ~ 0
 B1_MAIN_EN
 Text Label 1650 5000 1    60   ~ 0
 B0_MAIN_EN
-Text Label 8000 5850 2    60   ~ 0
-BATT0_OFF
+Text Label 8850 3550 0    60   ~ 0
+B0_CHG_OFF
 Text Label 1250 5000 1    60   ~ 0
-BATT0_OFF
+B0_CHG_OFF
 $Comp
 L PMGD370XN Q?
 U 1 1 515DD227
-P 8100 6100
-F 0 "Q?" V 8400 6150 60  0000 R CNN
-F 1 "PMGD370XN" V 8300 6300 60  0000 R CNN
-	1    8100 6100
-	-1   0    0    -1  
+P 8900 3850
+F 0 "Q?" H 8800 3650 60  0000 R CNN
+F 1 "PMGD370XN" V 9150 3900 60  0000 R CNN
+	1    8900 3850
+	1    0    0    1   
 $EndComp
 $Comp
 L R R?
@@ -1638,121 +1859,119 @@ $EndComp
 $Comp
 L R R?
 U 1 1 515B90A4
-P 10300 3050
-F 0 "R?" V 10380 3050 50  0000 C CNN
-F 1 "200R" V 10300 3050 50  0000 C CNN
-	1    10300 3050
+P 8750 5400
+F 0 "R?" V 8830 5400 50  0000 C CNN
+F 1 "200R" V 8750 5400 50  0000 C CNN
+	1    8750 5400
 	1    0    0    -1  
 $EndComp
-Text Label 10250 2750 2    60   ~ 0
+Text Label 8700 5100 2    60   ~ 0
 B2_PWR_LIM
 $Comp
 L GND #PWR?
 U 1 1 515B90A3
-P 10300 3350
-F 0 "#PWR?" H 10300 3350 30  0001 C CNN
-F 1 "GND" H 10300 3280 30  0001 C CNN
-	1    10300 3350
+P 8750 5700
+F 0 "#PWR?" H 8750 5700 30  0001 C CNN
+F 1 "GND" H 8750 5630 30  0001 C CNN
+	1    8750 5700
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515B90A2
-P 10550 3350
-F 0 "#PWR?" H 10550 3350 30  0001 C CNN
-F 1 "GND" H 10550 3280 30  0001 C CNN
-	1    10550 3350
+P 9000 5700
+F 0 "#PWR?" H 9000 5700 30  0001 C CNN
+F 1 "GND" H 9000 5630 30  0001 C CNN
+	1    9000 5700
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 515B90A1
-P 10550 3050
-F 0 "R?" V 10630 3050 50  0000 C CNN
-F 1 "200R" V 10550 3050 50  0000 C CNN
-	1    10550 3050
+P 9000 5400
+F 0 "R?" V 9080 5400 50  0000 C CNN
+F 1 "200R" V 9000 5400 50  0000 C CNN
+	1    9000 5400
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 515B90A0
-P 10800 3050
-F 0 "R?" V 10880 3050 50  0000 C CNN
-F 1 "200R" V 10800 3050 50  0000 C CNN
-	1    10800 3050
+P 9250 5400
+F 0 "R?" V 9330 5400 50  0000 C CNN
+F 1 "200R" V 9250 5400 50  0000 C CNN
+	1    9250 5400
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515B909F
-P 10800 3350
-F 0 "#PWR?" H 10800 3350 30  0001 C CNN
-F 1 "GND" H 10800 3280 30  0001 C CNN
-	1    10800 3350
+P 9250 5700
+F 0 "#PWR?" H 9250 5700 30  0001 C CNN
+F 1 "GND" H 9250 5630 30  0001 C CNN
+	1    9250 5700
 	1    0    0    -1  
 $EndComp
-Text Label 10250 2650 2    60   ~ 0
+Text Label 8700 4900 2    60   ~ 0
 B1_PWR_LIM
-Text Label 10250 2550 2    60   ~ 0
+Text Label 8700 4700 2    60   ~ 0
 B0_PWR_LIM
-Text Label 10250 3600 2    60   ~ 0
-B0_CHG_LIM
-Text Label 10250 3700 2    60   ~ 0
+Text Label 8700 6100 2    60   ~ 0
 B1_CHG_LIM
 $Comp
 L GND #PWR?
 U 1 1 515B905C
-P 10800 4400
-F 0 "#PWR?" H 10800 4400 30  0001 C CNN
-F 1 "GND" H 10800 4330 30  0001 C CNN
-	1    10800 4400
+P 9250 6900
+F 0 "#PWR?" H 9250 6900 30  0001 C CNN
+F 1 "GND" H 9250 6830 30  0001 C CNN
+	1    9250 6900
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 515B905B
-P 10800 4100
-F 0 "R?" V 10880 4100 50  0000 C CNN
-F 1 "1k0" V 10800 4100 50  0000 C CNN
-	1    10800 4100
+P 9250 6600
+F 0 "R?" V 9330 6600 50  0000 C CNN
+F 1 "1k0" V 9250 6600 50  0000 C CNN
+	1    9250 6600
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 515B9058
-P 10550 4100
-F 0 "R?" V 10630 4100 50  0000 C CNN
-F 1 "1k0" V 10550 4100 50  0000 C CNN
-	1    10550 4100
+P 9000 6600
+F 0 "R?" V 9080 6600 50  0000 C CNN
+F 1 "1k0" V 9000 6600 50  0000 C CNN
+	1    9000 6600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515B9057
-P 10550 4400
-F 0 "#PWR?" H 10550 4400 30  0001 C CNN
-F 1 "GND" H 10550 4330 30  0001 C CNN
-	1    10550 4400
+P 9000 6900
+F 0 "#PWR?" H 9000 6900 30  0001 C CNN
+F 1 "GND" H 9000 6830 30  0001 C CNN
+	1    9000 6900
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 515B9044
-P 10300 4400
-F 0 "#PWR?" H 10300 4400 30  0001 C CNN
-F 1 "GND" H 10300 4330 30  0001 C CNN
-	1    10300 4400
+P 8750 6900
+F 0 "#PWR?" H 8750 6900 30  0001 C CNN
+F 1 "GND" H 8750 6830 30  0001 C CNN
+	1    8750 6900
 	1    0    0    -1  
 $EndComp
-Text Label 10250 3800 2    60   ~ 0
+Text Label 8700 6300 2    60   ~ 0
 B2_CHG_LIM
 $Comp
 L R R?
 U 1 1 515B902A
-P 10300 4100
-F 0 "R?" V 10380 4100 50  0000 C CNN
-F 1 "1k0" V 10300 4100 50  0000 C CNN
-	1    10300 4100
+P 8750 6600
+F 0 "R?" V 8830 6600 50  0000 C CNN
+F 1 "1k0" V 8750 6600 50  0000 C CNN
+	1    8750 6600
 	1    0    0    -1  
 $EndComp
 Text Label 1350 5000 1    60   ~ 0
@@ -1777,11 +1996,9 @@ F 1 "GND" H 650 5880 30  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Text Label 4350 5000 1    60   ~ 0
-BATT2_OFF
+B2_CHG_OFF
 Text Label 2800 5000 1    60   ~ 0
-BATT1_OFF
-Text Label 8400 6100 0    60   ~ 0
-BATT0_EN
+B1_CHG_OFF
 Text Label 5150 7650 0    60   ~ 0
 MAIN_PWR
 $Comp
@@ -1837,142 +2054,136 @@ Text HLabel 5750 6500 0    60   Input ~ 0
 PRF_P0
 Text HLabel 5750 6400 0    60   Input ~ 0
 PRF_P1
-Text HLabel 5750 6100 0    60   Input ~ 0
-TTX_P1
-Text HLabel 5750 6200 0    60   Input ~ 0
-TTX_P0
-Text Notes 2250 2900 0    60   ~ 0
-disconnect\nbefore\nflight
 $Comp
 L FUSE F7
 U 1 1 4FE712AE
-P 5000 1550
-F 0 "F7" H 5100 1600 40  0000 C CNN
-F 1 "USB_FUSE" H 5000 1450 40  0000 C CNN
-	1    5000 1550
-	0    1    1    0   
+P 4850 1650
+F 0 "F7" H 4950 1700 40  0000 C CNN
+F 1 "USB_FUSE" H 4850 1550 40  0000 C CNN
+	1    4850 1650
+	-1   0    0    1   
 $EndComp
 $Comp
 L R R67
 U 1 1 4FE7118F
-P 5000 2150
-F 0 "R67" V 5080 2150 50  0000 C CNN
-F 1 "1k0" V 5000 2150 50  0000 C CNN
-	1    5000 2150
+P 4550 1950
+F 0 "R67" V 4630 1950 50  0000 C CNN
+F 1 "1k0" V 4550 1950 50  0000 C CNN
+	1    4550 1950
 	1    0    0    -1  
 $EndComp
 $Comp
 L LED D13
 U 1 1 4FE71187
-P 4700 2450
-F 0 "D13" H 4700 2550 50  0000 C CNN
-F 1 "USB_CHRG" H 4700 2350 50  0000 C CNN
-	1    4700 2450
-	-1   0    0    1   
+P 4550 2450
+F 0 "D13" V 4900 2450 50  0000 C CNN
+F 1 "USB_CHRG" H 4550 2550 50  0000 C CNN
+	1    4550 2450
+	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR236
 U 1 1 4FE71166
-P 5200 1250
-F 0 "#PWR236" H 5200 1250 30  0001 C CNN
-F 1 "GND" H 5200 1180 30  0001 C CNN
-	1    5200 1250
+P 5100 1900
+F 0 "#PWR236" H 5100 1900 30  0001 C CNN
+F 1 "GND" H 5100 1830 30  0001 C CNN
+	1    5100 1900
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P75
 U 1 1 4FE71153
-P 5100 850
-F 0 "P75" V 5050 850 40  0000 C CNN
-F 1 "USB_PWR" V 5150 850 40  0000 C CNN
-	1    5100 850 
-	0    -1   -1   0   
+P 5500 1750
+F 0 "P75" V 5450 1750 40  0000 C CNN
+F 1 "USB_PWR" V 5550 1750 40  0000 C CNN
+	1    5500 1750
+	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR220
 U 1 1 4FE710E4
-P 3100 2950
-F 0 "#PWR220" H 3100 2950 30  0001 C CNN
-F 1 "GND" H 3100 2880 30  0001 C CNN
-	1    3100 2950
+P 3100 3200
+F 0 "#PWR220" H 3100 3200 30  0001 C CNN
+F 1 "GND" H 3100 3130 30  0001 C CNN
+	1    3100 3200
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R66
 U 1 1 4FE710E1
-P 3100 2650
-F 0 "R66" V 3180 2650 50  0000 C CNN
-F 1 "2k0" V 3100 2650 50  0000 C CNN
-	1    3100 2650
+P 3100 2900
+F 0 "R66" V 3180 2900 50  0000 C CNN
+F 1 "2k0" V 3100 2900 50  0000 C CNN
+	1    3100 2900
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR230
 U 1 1 4FE710BF
-P 4400 2300
-F 0 "#PWR230" H 4400 2300 30  0001 C CNN
-F 1 "GND" H 4400 2230 30  0001 C CNN
-	1    4400 2300
+P 4400 2550
+F 0 "#PWR230" H 4400 2550 30  0001 C CNN
+F 1 "GND" H 4400 2480 30  0001 C CNN
+	1    4400 2550
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR226
 U 1 1 4FE710AA
-P 3800 2800
-F 0 "#PWR226" H 3800 2800 30  0001 C CNN
-F 1 "GND" H 3800 2730 30  0001 C CNN
-	1    3800 2800
+P 3800 3200
+F 0 "#PWR226" H 3800 3200 30  0001 C CNN
+F 1 "GND" H 3800 3130 30  0001 C CNN
+	1    3800 3200
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR224
 U 1 1 4FE710A9
-P 3700 2800
-F 0 "#PWR224" H 3700 2800 30  0001 C CNN
-F 1 "GND" H 3700 2730 30  0001 C CNN
-	1    3700 2800
+P 3700 3200
+F 0 "#PWR224" H 3700 3200 30  0001 C CNN
+F 1 "GND" H 3700 3130 30  0001 C CNN
+	1    3700 3200
 	1    0    0    -1  
 $EndComp
 $Comp
 L LTC4065 U38
 U 1 1 4FE71092
-P 3750 2300
-F 0 "U38" H 3750 2450 60  0000 C CNN
-F 1 "LTC4065" H 3750 2350 60  0000 C CNN
-	1    3750 2300
+P 3750 2550
+F 0 "U38" H 3750 2700 60  0000 C CNN
+F 1 "LTC4065" H 3750 2600 60  0000 C CNN
+	1    3750 2550
 	-1   0    0    -1  
 $EndComp
-Text HLabel 10300 1800 0    60   Input ~ 0
+Text HLabel 10300 1450 0    60   Input ~ 0
 BAT_INT
 Text Label 6950 6900 0    60   ~ 0
 RADIO_SILENCE
-Text HLabel 9350 1000 0    60   Input ~ 0
+Text HLabel 4950 1000 0    60   Input ~ 0
 RADIO_SILENCE
 $Comp
 L GND #PWR234
 U 1 1 4F70BA7C
-P 8350 6700
-F 0 "#PWR234" H 8350 6700 30  0001 C CNN
-F 1 "GND" H 8350 6630 30  0001 C CNN
-	1    8350 6700
+P 8650 4450
+F 0 "#PWR234" H 8650 4450 30  0001 C CNN
+F 1 "GND" H 8650 4380 30  0001 C CNN
+	1    8650 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR232
 U 1 1 4F70BA7B
-P 8000 6350
-F 0 "#PWR232" H 8000 6350 30  0001 C CNN
-F 1 "GND" H 8000 6280 30  0001 C CNN
-	1    8000 6350
+P 9000 4100
+F 0 "#PWR232" H 9000 4100 30  0001 C CNN
+F 1 "GND" H 9000 4030 30  0001 C CNN
+	1    9000 4100
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R41
 U 1 1 4F70BA7A
-P 8350 6400
-F 0 "R41" V 8430 6400 50  0000 C CNN
-F 1 "220k" V 8350 6400 50  0000 C CNN
-	1    8350 6400
+P 8650 4150
+F 0 "R41" V 8730 4150 50  0000 C CNN
+F 1 "220k" V 8650 4150 50  0000 C CNN
+	1    8650 4150
 	1    0    0    -1  
 $EndComp
 Text HLabel 2250 1200 1    60   Input ~ 0
@@ -2088,11 +2299,11 @@ Text HLabel 6950 6250 2    60   Input ~ 0
 TTX_EN
 Text HLabel 6950 6150 2    60   Input ~ 0
 TTX_PWR
-Text Label 3900 1650 0    60   ~ 0
+Text Label 3250 1750 0    60   ~ 0
 VITAL_PWR_STBY
 Text Notes 3600 800  0    60   ~ 0
 connect\nbefore\nflight
-Text HLabel 9350 900  0    60   Input ~ 0
+Text HLabel 4950 900  0    60   Input ~ 0
 MAIN_OFF
 Text Label 5100 5050 0    60   ~ 0
 BATT2
@@ -2139,40 +2350,40 @@ $EndComp
 $Comp
 L VCC #PWR245
 U 1 1 4F5CE3A8
-P 10350 1250
-F 0 "#PWR245" H 10350 1350 30  0001 C CNN
-F 1 "VCC" H 10350 1350 30  0000 C CNN
-	1    10350 1250
+P 10350 900
+F 0 "#PWR245" H 10350 1000 30  0001 C CNN
+F 1 "VCC" H 10350 1000 30  0000 C CNN
+	1    10350 900 
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR246
 U 1 1 4F5CE3A2
-P 10350 2050
-F 0 "#PWR246" H 10350 2050 30  0001 C CNN
-F 1 "GND" H 10350 1980 30  0001 C CNN
-	1    10350 2050
+P 10350 1700
+F 0 "#PWR246" H 10350 1700 30  0001 C CNN
+F 1 "GND" H 10350 1630 30  0001 C CNN
+	1    10350 1700
 	1    0    0    -1  
 $EndComp
-Text HLabel 10300 1400 0    60   Input ~ 0
+Text HLabel 10300 1050 0    60   Input ~ 0
 BAT_SS
-Text HLabel 10300 1500 0    60   Input ~ 0
+Text HLabel 10300 1150 0    60   Input ~ 0
 BAT_SCK
-Text HLabel 10300 1600 0    60   Input ~ 0
+Text HLabel 10300 1250 0    60   Input ~ 0
 BAT_MOSI
-Text HLabel 10300 1700 0    60   Input ~ 0
+Text HLabel 10300 1350 0    60   Input ~ 0
 BAT_MISO
 Text Label 3900 1500 0    60   ~ 0
 VITAL_PWR
-Text HLabel 9350 800  0    60   Input ~ 0
+Text HLabel 4950 800  0    60   Input ~ 0
 VITAL_PWR
 $Comp
 L GND #PWR244
 U 1 1 4F5CB1CC
-P 9400 1150
-F 0 "#PWR244" H 9400 1150 30  0001 C CNN
-F 1 "GND" H 9400 1080 30  0001 C CNN
-	1    9400 1150
+P 5000 1150
+F 0 "#PWR244" H 5000 1150 30  0001 C CNN
+F 1 "GND" H 5000 1080 30  0001 C CNN
+	1    5000 1150
 	1    0    0    -1  
 $EndComp
 $Comp