cleanups

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

5 files changed, 603 insertions, 792 deletions

diff --git a/hardware/ihu-ttx-test/ihu-ttx-test.sch b/hardware/ihu-ttx-test/ihu-ttx-test.sch
index 829194f..450db8e 100644
--- a/hardware/ihu-ttx-test/ihu-ttx-test.sch
+++ b/hardware/ihu-ttx-test/ihu-ttx-test.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Die 27 Mär 2012 02:20:48 CEST
+EESchema Schematic File Version 2  date Die 27 Mär 2012 03:01:43 CEST
 LIBS:mur-sat
 LIBS:power
 LIBS:device
@@ -30,9 +30,10 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:ihu-ttx-test-cache
-EELAYER 24  0
+EELAYER 25  0
 EELAYER END
 $Descr A4 11700 8267
+encoding utf-8
 Sheet 1 5
 Title "IHU, RTC"
 Date "27 mar 2012"
@@ -43,10 +44,8 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-NoConn ~ 7250 5200
-NoConn ~ 7250 4700
-NoConn ~ 9450 5200
-NoConn ~ 9450 4700
+Wire Wire Line
+	4600 2900 4600 3150
 Wire Wire Line
 	9350 5100 9450 5100
 Wire Wire Line
@@ -62,15 +61,11 @@ Wire Wire Line
 Wire Wire Line
 	8200 5050 8150 5050
 Wire Wire Line
-	7250 5650 7250 5700
-Wire Wire Line
-	7250 5700 7250 5750
+	7250 5750 7250 5650
 Wire Wire Line
 	7750 4150 7750 4000
 Wire Wire Line
-	7750 4000 8500 4000
-Wire Wire Line
-	8500 4000 9950 4000
+	7750 4000 9950 4000
 Wire Wire Line
 	3250 1500 2650 1500
 Wire Wire Line
@@ -119,18 +114,14 @@ Wire Wire Line
 Wire Wire Line
 	9450 2850 9600 2850
 Wire Wire Line
-	9600 2850 9600 3000
-Wire Wire Line
-	9600 3000 9600 3050
+	9600 2850 9600 3050
 Wire Wire Line
 	9550 1150 9550 1500
 Wire Wire Line
 	9550 1500 9350 1500
 Connection ~ 9650 1400
 Wire Wire Line
-	9650 1150 9650 1400
-Wire Wire Line
-	9650 1400 9650 1550
+	9650 1150 9650 1550
 Wire Wire Line
 	9650 1550 9750 1550
 Wire Wire Line
@@ -156,9 +147,7 @@ Wire Wire Line
 Wire Wire Line
 	2300 6400 850  6400
 Wire Wire Line
-	2300 6500 2150 6500
-Wire Wire Line
-	2150 6500 800  6500
+	2300 6500 800  6500
 Connection ~ 2150 6500
 Wire Wire Line
 	850  6400 850  4450
@@ -188,9 +177,7 @@ Connection ~ 4900 2200
 Wire Wire Line
 	2450 4950 2600 4950
 Wire Wire Line
-	3850 5350 3550 5350
-Wire Wire Line
-	3550 5350 3500 5350
+	3500 5350 3850 5350
 Wire Wire Line
 	3000 5350 2450 5350
 Wire Wire Line
@@ -203,9 +190,7 @@ Connection ~ 4450 1000
 Wire Wire Line
 	4900 1600 4900 1000
 Wire Wire Line
-	4900 1000 4450 1000
-Wire Wire Line
-	4450 1000 4400 1000
+	4900 1000 4400 1000
 Wire Wire Line
 	4450 1250 4450 1200
 Wire Wire Line
@@ -214,9 +199,7 @@ Connection ~ 4600 1650
 Wire Wire Line
 	4400 1100 4600 1100
 Wire Wire Line
-	4600 1100 4600 1650
-Wire Wire Line
-	4600 1650 4600 2200
+	4600 1100 4600 2200
 Wire Wire Line
 	4450 2350 4450 2300
 Wire Wire Line
@@ -230,9 +213,7 @@ Wire Wire Line
 Wire Wire Line
 	8000 950  8100 950 
 Wire Wire Line
-	4600 6600 3600 6600
-Wire Wire Line
-	3600 6600 3500 6600
+	3500 6600 4600 6600
 Wire Wire Line
 	10300 2700 10300 2550
 Wire Wire Line
@@ -289,15 +270,11 @@ Wire Wire Line
 	5350 1200 5350 1450
 Wire Wire Line
 	5350 1450 5200 1450
-Connection ~ 4200 2650
-Wire Wire Line
-	4050 2650 4200 2650
+Connection ~ 4200 2550
 Wire Wire Line
-	4200 2650 4600 2650
+	4050 2550 4600 2550
 Wire Wire Line
-	4600 2650 4600 2800
-Wire Wire Line
-	4600 2800 6050 2800
+	6050 2800 4600 2800
 Wire Wire Line
 	3350 4400 3350 4350
 Wire Wire Line
@@ -328,9 +305,7 @@ Wire Wire Line
 Wire Wire Line
 	3600 7400 3600 7450
 Wire Wire Line
-	3600 7450 3750 7450
-Wire Wire Line
-	3750 7450 3900 7450
+	3600 7450 3900 7450
 Wire Wire Line
 	3900 7450 3900 7400
 Wire Wire Line
@@ -343,9 +318,7 @@ Connection ~ 6350 6500
 Wire Wire Line
 	6200 6950 6350 6950
 Wire Wire Line
-	10450 6500 10450 6450
-Wire Wire Line
-	10450 6450 10450 6300
+	10450 6300 10450 6500
 Connection ~ 10450 5700
 Wire Wire Line
 	8050 6450 7600 6450
@@ -371,9 +344,7 @@ Wire Wire Line
 Wire Wire Line
 	4350 7000 4350 6950
 Wire Wire Line
-	4350 6950 4500 6950
-Wire Wire Line
-	4500 6950 4600 6950
+	4350 6950 4600 6950
 Connection ~ 6300 5950
 Wire Wire Line
 	6300 5950 6300 6050
@@ -383,9 +354,7 @@ Connection ~ 6900 5700
 Wire Wire Line
 	6900 6250 7250 6250
 Wire Wire Line
-	6900 6200 6900 6250
-Wire Wire Line
-	6900 6250 6900 6300
+	6900 6300 6900 6200
 Wire Wire Line
 	6350 7450 6350 7400
 Wire Wire Line
@@ -401,7 +370,7 @@ Wire Wire Line
 Wire Wire Line
 	4400 1650 4600 1650
 Wire Wire Line
-	6050 2900 4600 2900
+	4600 2900 6050 2900
 Wire Wire Line
 	7400 1200 7500 1200
 Connection ~ 6950 1200
@@ -412,18 +381,14 @@ Wire Wire Line
 Wire Wire Line
 	6850 3800 6850 3850
 Wire Wire Line
-	6850 1200 6950 1200
-Wire Wire Line
-	6950 1200 7000 1200
+	7000 1200 6850 1200
 Connection ~ 6850 1200
 Wire Wire Line
-	6850 1300 6850 1200
+	6850 1100 6850 1300
 Wire Wire Line
-	6850 1200 6850 1100
+	3650 2550 3550 2550
 Wire Wire Line
-	3650 2650 3550 2650
-Wire Wire Line
-	3650 3250 3550 3250
+	3650 3150 3550 3150
 Wire Wire Line
 	8050 1150 8050 1200
 Wire Wire Line
@@ -441,9 +406,7 @@ Wire Wire Line
 Wire Wire Line
 	1500 6900 2300 6900
 Wire Wire Line
-	6350 6900 6350 6950
-Wire Wire Line
-	6350 6950 6350 7000
+	6350 7000 6350 6900
 Connection ~ 6350 6950
 Wire Wire Line
 	4050 6150 4050 6300
@@ -451,9 +414,7 @@ Wire Wire Line
 	4050 6150 4100 6150
 Connection ~ 6900 6250
 Wire Wire Line
-	6200 5950 6300 5950
-Wire Wire Line
-	6300 5950 6750 5950
+	6750 5950 6200 5950
 Wire Wire Line
 	5400 7200 5400 7250
 Wire Wire Line
@@ -476,37 +437,21 @@ Wire Wire Line
 	8000 6350 8050 6350
 Connection ~ 7600 5700
 Wire Wire Line
-	9050 5700 10200 5700
-Wire Wire Line
-	10200 5700 10450 5700
-Wire Wire Line
-	10450 5700 10550 5700
+	10550 5700 9050 5700
 Wire Wire Line
-	10450 5700 10450 5900
+	10450 5900 10450 5700
 Wire Wire Line
 	9750 6450 10450 6450
 Connection ~ 10450 6450
 Wire Wire Line
-	6200 5700 6300 5700
-Wire Wire Line
-	6300 5700 6900 5700
-Wire Wire Line
-	6900 5700 7250 5700
-Wire Wire Line
-	7250 5700 7600 5700
-Wire Wire Line
-	7600 5700 8650 5700
+	8650 5700 6200 5700
 Wire Wire Line
 	7600 6450 7600 5700
 Wire Wire Line
-	7250 6150 7250 6250
-Wire Wire Line
-	7250 6250 7250 6300
+	7250 6300 7250 6150
 Connection ~ 7250 6250
 Wire Wire Line
-	6200 6500 6350 6500
-Wire Wire Line
-	6350 6500 6600 6500
+	6200 6500 6600 6500
 Wire Wire Line
 	6600 6500 6600 6800
 Wire Wire Line
@@ -536,9 +481,7 @@ Connection ~ 9200 3600
 Wire Wire Line
 	5950 4850 5950 4800
 Wire Wire Line
-	5650 4800 5950 4800
-Wire Wire Line
-	5950 4800 6300 4800
+	5650 4800 6300 4800
 Wire Wire Line
 	6300 4800 6300 5700
 Connection ~ 6300 5700
@@ -548,12 +491,8 @@ Wire Wire Line
 Wire Wire Line
 	3350 3550 3350 3500
 Wire Wire Line
-	4050 3250 4200 3250
-Wire Wire Line
-	4200 3250 4600 3250
-Wire Wire Line
-	4600 3250 4600 2900
-Connection ~ 4200 3250
+	4600 3150 4050 3150
+Connection ~ 4200 3150
 Wire Wire Line
 	5450 1200 5450 1550
 Wire Wire Line
@@ -593,15 +532,11 @@ Wire Wire Line
 Wire Wire Line
 	4600 5700 3850 5700
 Wire Wire Line
-	3850 5700 3850 5350
-Wire Wire Line
-	3850 5350 3850 4800
+	3850 5700 3850 4800
 Wire Wire Line
 	9700 2600 9700 2450
 Wire Wire Line
-	4600 6800 3900 6800
-Wire Wire Line
-	3900 6800 3500 6800
+	3500 6800 4600 6800
 Wire Wire Line
 	8100 850  8000 850 
 Wire Wire Line
@@ -640,11 +575,7 @@ Wire Wire Line
 Wire Wire Line
 	1350 5900 1350 5250
 Wire Wire Line
-	6050 2200 4900 2200
-Wire Wire Line
-	4900 2200 4600 2200
-Wire Wire Line
-	4600 2200 4400 2200
+	4400 2200 6050 2200
 Connection ~ 4600 2200
 Wire Wire Line
 	1150 1850 1200 1850
@@ -713,9 +644,7 @@ Wire Wire Line
 Wire Wire Line
 	8950 2850 8850 2850
 Wire Wire Line
-	9200 3550 9200 3600
-Wire Wire Line
-	9200 3600 9200 3750
+	9200 3550 9200 3750
 Wire Wire Line
 	9200 3750 9250 3750
 Wire Wire Line
@@ -753,9 +682,7 @@ Connection ~ 8500 4000
 Wire Wire Line
 	7850 4150 7850 4100
 Wire Wire Line
-	9850 3900 8600 3900
-Wire Wire Line
-	8600 3900 7650 3900
+	9850 3900 7650 3900
 Wire Wire Line
 	7650 3900 7650 4150
 Wire Wire Line
@@ -772,6 +699,12 @@ Wire Wire Line
 	9450 4600 9350 4600
 Wire Wire Line
 	9350 5000 9450 5000
+Wire Wire Line
+	4600 2800 4600 2550
+NoConn ~ 7250 5200
+NoConn ~ 7250 4700
+NoConn ~ 9450 5200
+NoConn ~ 9450 4700
 Text Label 9350 5000 2    60   ~ 0
 SOLAR_C11
 Text Label 9350 4500 2    60   ~ 0
@@ -1328,20 +1261,20 @@ F6 "MPU_PWR" I R 2450 4550 60
 F7 "TTX_PWR" I L 1500 4450 60 
 F8 "CRX_PWR" I L 1500 4850 60 
 F9 "CRX_EN" I L 1500 4750 60 
-F10 "BATT_SDA" I R 2450 4050 60 
-F11 "BATT_SCL" I R 2450 3950 60 
-F12 "MPU_EN" I R 2450 4650 60 
-F13 "MAIN_PWR" I L 1500 5150 60 
-F14 "PRF_EN" I R 2450 5050 60 
-F15 "PRF_PWR" I R 2450 4950 60 
-F16 "BATT0_EN" I R 2450 3650 60 
-F17 "BATT1_EN" I R 2450 3750 60 
-F18 "BATT2_EN" I R 2450 3850 60 
-F19 "CHARGE2" I L 1500 3500 60 
-F20 "ENE_SEL1" I R 2450 4250 60 
-F21 "ENE_SEL0" I R 2450 4150 60 
-F22 "RADIO_SILENCE" I L 1500 5500 60 
-F23 "MAIN_EN" I L 1500 5250 60 
+F10 "MPU_EN" I R 2450 4650 60 
+F11 "MAIN_PWR" I L 1500 5150 60 
+F12 "PRF_EN" I R 2450 5050 60 
+F13 "PRF_PWR" I R 2450 4950 60 
+F14 "BATT0_EN" I R 2450 3650 60 
+F15 "BATT1_EN" I R 2450 3750 60 
+F16 "BATT2_EN" I R 2450 3850 60 
+F17 "CHARGE2" I L 1500 3500 60 
+F18 "ENE_SEL1" I R 2450 4250 60 
+F19 "ENE_SEL0" I R 2450 4150 60 
+F20 "RADIO_SILENCE" I L 1500 5500 60 
+F21 "MAIN_EN" I L 1500 5250 60 
+F22 "I2C_SDA" I R 2450 4050 60 
+F23 "I2C_SCL" I R 2450 3950 60 
 $EndSheet
 Text Label 9350 2250 3    60   ~ 0
 1HZ
@@ -1884,19 +1817,19 @@ SOLAR_V2
 $Comp
 L GND #PWR?
 U 1 1 4ED1B4C0
-P 3550 3250
-F 0 "#PWR?" H 3550 3250 30  0001 C CNN
-F 1 "GND" H 3550 3180 30  0001 C CNN
-	1    3550 3250
+P 3550 3150
+F 0 "#PWR?" H 3550 3150 30  0001 C CNN
+F 1 "GND" H 3550 3080 30  0001 C CNN
+	1    3550 3150
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4ED1B4BE
-P 3550 2650
-F 0 "#PWR?" H 3550 2650 30  0001 C CNN
-F 1 "GND" H 3550 2580 30  0001 C CNN
-	1    3550 2650
+P 3550 2550
+F 0 "#PWR?" H 3550 2550 30  0001 C CNN
+F 1 "GND" H 3550 2480 30  0001 C CNN
+	1    3550 2550
 	0    1    1    0   
 $EndComp
 $Comp
@@ -2019,19 +1952,19 @@ $EndComp
 $Comp
 L C C?
 U 1 1 4ED153B2
-P 3850 2650
-F 0 "C?" H 3900 2750 50  0000 L CNN
-F 1 "22p" V 3900 2550 50  0000 L CNN
-	1    3850 2650
+P 3850 2550
+F 0 "C?" H 3900 2650 50  0000 L CNN
+F 1 "22p" V 3900 2450 50  0000 L CNN
+	1    3850 2550
 	0    1    1    0   
 $EndComp
 $Comp
 L C C?
 U 1 1 4ED153A2
-P 3850 3250
-F 0 "C?" H 3900 3350 50  0000 L CNN
-F 1 "22p" V 3900 3150 50  0000 L CNN
-	1    3850 3250
+P 3850 3150
+F 0 "C?" H 3900 3250 50  0000 L CNN
+F 1 "22p" V 3900 3050 50  0000 L CNN
+	1    3850 3150
 	0    1    1    0   
 $EndComp
 $Comp
@@ -2046,10 +1979,10 @@ $EndComp
 $Comp
 L CRYSTAL X?
 U 1 1 4ED1537B
-P 4200 2950
-F 0 "X?" H 4200 3100 60  0000 C CNN
-F 1 "8MHz" H 4200 2800 60  0000 C CNN
-	1    4200 2950
+P 4200 2850
+F 0 "X?" H 4200 3000 60  0000 C CNN
+F 1 "8MHz" H 4200 2700 60  0000 C CNN
+	1    4200 2850
 	0    1    1    0   
 $EndComp
 $Comp
diff --git a/hardware/ihu-ttx-test/mainpower.sch b/hardware/ihu-ttx-test/mainpower.sch
index ac55348..0c62f9d 100644
--- a/hardware/ihu-ttx-test/mainpower.sch
+++ b/hardware/ihu-ttx-test/mainpower.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Die 27 Mär 2012 02:20:48 CEST
+EESchema Schematic File Version 2  date Die 27 Mär 2012 03:01:43 CEST
 LIBS:mur-sat
 LIBS:power
 LIBS:device
@@ -30,9 +30,10 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:ihu-ttx-test-cache
-EELAYER 24  0
+EELAYER 25  0
 EELAYER END
 $Descr A4 11700 8267
+encoding utf-8
 Sheet 3 5
 Title "Power Path - Main Power"
 Date "27 mar 2012"
diff --git a/hardware/ihu-ttx-test/powerpath.sch b/hardware/ihu-ttx-test/powerpath.sch
index 5cec869..e562e43 100644
--- a/hardware/ihu-ttx-test/powerpath.sch
+++ b/hardware/ihu-ttx-test/powerpath.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Die 27 Mär 2012 02:20:48 CEST
+EESchema Schematic File Version 2  date Die 27 Mär 2012 03:01:43 CEST
 LIBS:mur-sat
 LIBS:power
 LIBS:device
@@ -30,9 +30,10 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:ihu-ttx-test-cache
-EELAYER 24  0
+EELAYER 25  0
 EELAYER END
 $Descr A4 11700 8267
+encoding utf-8
 Sheet 2 5
 Title "Power Path"
 Date "27 mar 2012"
@@ -43,9 +44,18 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-NoConn ~ 7250 5550
-NoConn ~ 9500 3750
-NoConn ~ 9500 5550
+Text Notes 7200 4400 0    150  ~ 0
+?
+Wire Notes Line
+	6900 4650 6900 3950
+Wire Notes Line
+	6900 4650 7600 4650
+Wire Notes Line
+	7600 4650 7600 3950
+Wire Notes Line
+	7600 3950 6900 3950
+Wire Wire Line
+	2200 4150 2200 6250
 Wire Wire Line
 	7700 6250 7700 6300
 Wire Wire Line
@@ -55,82 +65,48 @@ Wire Wire Line
 Wire Wire Line
 	8250 6050 8350 6050
 Wire Wire Line
-	9400 5950 9500 5950
-Wire Wire Line
-	10600 6150 10600 6050
-Wire Wire Line
-	10600 5450 10600 5550
-Wire Wire Line
-	10600 3650 10600 3750
-Wire Wire Line
-	9400 4150 9500 4150
-Wire Wire Line
-	10500 4250 10600 4250
+	9350 5950 9450 5950
 Wire Wire Line
-	10600 3750 10500 3750
-Connection ~ 1650 7300
+	10550 6150 10550 6050
 Wire Wire Line
-	4950 7300 4150 7300
+	10550 5450 10550 5550
 Wire Wire Line
-	4150 7300 3450 7300
+	10550 3700 10550 3800
 Wire Wire Line
-	3450 7300 2900 7300
+	9350 4200 9450 4200
 Wire Wire Line
-	2900 7300 2200 7300
+	10450 4300 10550 4300
 Wire Wire Line
-	2200 7300 1650 7300
+	10550 3800 10450 3800
+Connection ~ 1650 7350
 Wire Wire Line
-	1650 7300 950  7300
-Connection ~ 2900 7300
-Connection ~ 4150 7300
-Wire Wire Line
-	3450 4150 3450 5950
-Wire Wire Line
-	3450 5950 3450 6200
-Wire Wire Line
-	2200 4150 2200 5950
-Wire Wire Line
-	2200 5950 2200 6200
+	4950 7350 950  7350
+Connection ~ 2900 7350
+Connection ~ 4150 7350
 Wire Wire Line
 	1300 4550 1300 4500
 Wire Wire Line
 	5600 2550 5600 2600
 Wire Wire Line
-	5450 2000 5600 2000
-Wire Wire Line
-	5600 2000 6200 2000
+	6200 2000 5450 2000
 Connection ~ 3450 3150
 Wire Wire Line
-	2150 3150 3450 3150
-Wire Wire Line
-	3450 3150 3800 3150
+	2150 3150 3800 3150
 Connection ~ 2200 3250
 Wire Wire Line
-	2550 3250 2200 3250
-Wire Wire Line
-	2200 3250 1550 3250
+	2550 3250 1550 3250
 Wire Wire Line
-	5950 7450 5800 7450
+	5950 7500 5800 7500
 Connection ~ 4450 2800
 Wire Wire Line
 	4350 2800 4450 2800
 Wire Wire Line
-	2700 2000 2750 2000
-Wire Wire Line
-	2750 2000 3000 2000
-Wire Wire Line
-	3000 2000 3300 2000
-Wire Wire Line
-	3300 2000 3450 2000
-Wire Wire Line
-	3450 2000 3600 2000
-Wire Wire Line
-	3600 2000 4450 2000
+	2700 2000 4450 2000
 Wire Wire Line
 	10300 2700 10200 2700
 Connection ~ 3450 2000
 Wire Wire Line
-	3450 1750 3450 2000
+	3450 2000 3450 1750
 Wire Wire Line
 	3550 1300 3450 1300
 Connection ~ 2750 2000
@@ -147,9 +123,7 @@ Connection ~ 950  2000
 Wire Wire Line
 	950  2000 1300 2000
 Wire Wire Line
-	1500 2200 1550 2200
-Wire Wire Line
-	1550 2200 1600 2200
+	1600 2200 1500 2200
 Connection ~ 2150 2200
 Wire Wire Line
 	2150 2200 2100 2200
@@ -157,7 +131,7 @@ Connection ~ 1550 1750
 Wire Wire Line
 	1550 1750 2300 1750
 Wire Wire Line
-	3450 3150 3450 3750
+	3450 3750 3450 3150
 Wire Wire Line
 	2150 3150 2150 2850
 Wire Wire Line
@@ -173,7 +147,7 @@ Wire Wire Line
 Wire Wire Line
 	700  2400 700  2450
 Wire Wire Line
-	5500 5350 5400 5350
+	5350 5600 5250 5600
 Wire Wire Line
 	7950 1850 7950 1900
 Wire Wire Line
@@ -181,72 +155,50 @@ Wire Wire Line
 Wire Wire Line
 	7750 1700 7700 1700
 Wire Wire Line
-	5950 7150 5800 7150
+	5950 7200 5800 7200
 Wire Wire Line
-	5800 6850 5950 6850
+	5800 6900 5950 6900
 Wire Wire Line
-	5950 6750 5800 6750
+	5950 6800 5800 6800
 Wire Wire Line
-	5950 6450 5800 6450
+	5950 6500 5800 6500
 Wire Wire Line
-	1800 6000 1800 5900
+	1800 6050 1800 5950
 Wire Wire Line
-	4300 6000 4300 5900
+	4300 6050 4300 5950
 Wire Wire Line
 	2550 3250 2550 3400
 Connection ~ 3800 3950
 Wire Wire Line
-	3800 3900 3800 3950
-Wire Wire Line
-	3800 3950 3800 4000
+	3800 4000 3800 3900
 Connection ~ 1300 3950
 Wire Wire Line
-	1300 3900 1300 3950
-Wire Wire Line
-	1300 3950 1300 4000
-Connection ~ 3800 7000
+	1300 4000 1300 3900
+Connection ~ 3800 7050
 Wire Wire Line
-	3850 7000 3800 7000
+	3750 7050 3850 7050
+Connection ~ 1300 7050
 Wire Wire Line
-	3800 7000 3750 7000
-Connection ~ 1300 7000
+	1250 7050 1350 7050
 Wire Wire Line
-	1350 7000 1300 7000
+	3450 7350 3450 7250
+Connection ~ 3700 6750
 Wire Wire Line
-	1300 7000 1250 7000
+	3800 7050 3800 6900
 Wire Wire Line
-	3450 7300 3450 7200
-Connection ~ 3700 6700
+	3800 6900 3700 6900
 Wire Wire Line
-	3800 7000 3800 6850
+	3700 6900 3700 6600
 Wire Wire Line
-	3800 6850 3700 6850
+	2200 7350 2200 7250
 Wire Wire Line
-	3700 6850 3700 6700
+	950  6650 950  6850
+Connection ~ 2450 6750
 Wire Wire Line
-	3700 6700 3700 6550
-Wire Wire Line
-	2200 7300 2200 7200
-Wire Wire Line
-	950  6600 950  6800
-Connection ~ 2450 6700
-Wire Wire Line
-	2450 6550 2450 6700
-Wire Wire Line
-	2450 6700 2450 6850
+	2450 6600 2450 6900
 Connection ~ 950  1350
 Wire Wire Line
-	950  2450 950  2400
-Wire Wire Line
-	950  2400 950  2200
-Wire Wire Line
-	950  2200 950  2000
-Wire Wire Line
-	950  2000 950  1500
-Wire Wire Line
-	950  1500 950  1350
-Wire Wire Line
-	950  1350 950  1300
+	950  1300 950  2450
 Wire Wire Line
 	2500 3950 2550 3950
 Wire Wire Line
@@ -258,15 +210,15 @@ Wire Wire Line
 Wire Wire Line
 	6100 2250 6200 2250
 Wire Wire Line
-	4150 7300 4150 6900
+	4150 7350 4150 6950
 Wire Wire Line
-	2900 7300 2900 6900
+	2900 7350 2900 6950
 Wire Wire Line
-	1650 7300 1650 6900
+	1650 6950 1650 7350
 Wire Wire Line
-	1300 6550 1300 6400
+	1300 6600 1300 6450
 Wire Wire Line
-	1300 6550 1200 6550
+	1300 6600 1200 6600
 Wire Wire Line
 	1300 2850 1300 2900
 Wire Wire Line
@@ -274,15 +226,15 @@ Wire Wire Line
 Wire Wire Line
 	1650 1350 1550 1350
 Wire Wire Line
-	5450 5600 5450 5550
+	5300 5850 5300 5800
 Wire Wire Line
-	5450 5550 5500 5550
+	5300 5800 5350 5800
 Wire Wire Line
-	5500 5250 5400 5250
+	5350 5500 5250 5500
 Wire Wire Line
-	5500 5050 5400 5050
+	5350 5300 5250 5300
 Wire Wire Line
-	5500 4850 5400 4850
+	5350 5100 5250 5100
 Wire Wire Line
 	10250 2950 10250 2900
 Wire Wire Line
@@ -290,11 +242,11 @@ Wire Wire Line
 Wire Wire Line
 	10300 2500 10200 2500
 Wire Wire Line
-	10800 6150 10800 6100
+	10750 6150 10750 6100
 Wire Wire Line
 	8550 6150 8550 6100
 Wire Wire Line
-	10800 4350 10800 4300
+	10750 4400 10750 4350
 Wire Wire Line
 	3000 2650 3000 2500
 Wire Wire Line
@@ -329,13 +281,7 @@ Connection ~ 9400 2100
 Connection ~ 9750 2100
 Connection ~ 8450 1300
 Wire Wire Line
-	9100 1300 9050 1300
-Wire Wire Line
-	9050 1300 8750 1300
-Wire Wire Line
-	8750 1300 8450 1300
-Wire Wire Line
-	8450 1300 8400 1300
+	8400 1300 9100 1300
 Connection ~ 9050 1300
 Wire Wire Line
 	9750 1300 9750 1500
@@ -356,9 +302,7 @@ Wire Wire Line
 Wire Wire Line
 	8750 1300 8750 1500
 Wire Wire Line
-	8450 1300 8450 1400
-Wire Wire Line
-	8450 1400 8450 1650
+	8450 1650 8450 1300
 Wire Wire Line
 	7700 1400 7750 1400
 Connection ~ 7750 1300
@@ -367,9 +311,7 @@ Wire Wire Line
 Wire Wire Line
 	6200 2150 6150 2150
 Wire Wire Line
-	6100 1800 6150 1800
-Wire Wire Line
-	6150 1800 6200 1800
+	6200 1800 6100 1800
 Wire Wire Line
 	6150 1850 6150 1800
 Connection ~ 6150 1800
@@ -378,9 +320,7 @@ Wire Wire Line
 Wire Wire Line
 	6150 1400 6150 1300
 Wire Wire Line
-	7800 1300 7750 1300
-Wire Wire Line
-	7750 1300 7700 1300
+	7700 1300 7800 1300
 Wire Wire Line
 	7950 1450 7950 1400
 Wire Wire Line
@@ -399,9 +339,7 @@ Wire Wire Line
 Wire Wire Line
 	6700 2500 6700 2550
 Wire Wire Line
-	5650 1800 5650 1500
-Wire Wire Line
-	5650 1500 5650 1300
+	5650 1800 5650 1300
 Connection ~ 5650 1500
 Wire Wire Line
 	10550 1500 10500 1500
@@ -411,13 +349,7 @@ Wire Wire Line
 	9050 1300 9050 1500
 Connection ~ 8750 1300
 Wire Wire Line
-	10050 2100 9750 2100
-Wire Wire Line
-	9750 2100 9400 2100
-Wire Wire Line
-	9400 2100 9050 2100
-Wire Wire Line
-	9050 2100 8750 2100
+	10050 2100 8750 2100
 Connection ~ 9050 2100
 Wire Wire Line
 	9750 2100 9750 1900
@@ -427,27 +359,13 @@ Wire Wire Line
 	10500 1250 10500 1300
 Connection ~ 10500 1300
 Wire Wire Line
-	10550 1300 10500 1300
-Wire Wire Line
-	10500 1300 10050 1300
-Wire Wire Line
-	10050 1300 9750 1300
-Wire Wire Line
-	9750 1300 9700 1300
+	9700 1300 10550 1300
 Connection ~ 9750 1300
 Wire Wire Line
 	5350 1300 5350 1350
 Connection ~ 5650 1300
 Wire Wire Line
-	6200 1300 6150 1300
-Wire Wire Line
-	6150 1300 5650 1300
-Wire Wire Line
-	5650 1300 5350 1300
-Wire Wire Line
-	5350 1300 5100 1300
-Wire Wire Line
-	5100 1300 5050 1300
+	5050 1300 6200 1300
 Connection ~ 5100 1300
 Wire Wire Line
 	4150 1350 4150 1300
@@ -455,13 +373,7 @@ Wire Wire Line
 	5100 1750 5100 1800
 Connection ~ 4400 1800
 Wire Wire Line
-	4150 1800 4400 1800
-Wire Wire Line
-	4400 1800 4750 1800
-Wire Wire Line
-	4750 1800 5100 1800
-Wire Wire Line
-	5100 1800 5350 1800
+	4150 1800 5350 1800
 Connection ~ 5100 1800
 Wire Wire Line
 	750  1350 750  1300
@@ -470,13 +382,13 @@ Wire Wire Line
 Wire Wire Line
 	10200 2600 10300 2600
 Wire Wire Line
-	5450 4700 5450 4750
+	5300 4950 5300 5000
 Wire Wire Line
-	5450 4750 5500 4750
+	5300 5000 5350 5000
 Wire Wire Line
-	5400 4950 5500 4950
+	5250 5200 5350 5200
 Wire Wire Line
-	5400 5150 5500 5150
+	5250 5400 5350 5400
 Wire Wire Line
 	950  1350 1050 1350
 Wire Wire Line
@@ -484,106 +396,92 @@ Wire Wire Line
 Wire Wire Line
 	700  2850 700  2900
 Wire Wire Line
-	2050 6500 2050 6450
+	2050 6550 2050 6500
 Wire Wire Line
-	2050 6450 2000 6450
+	2050 6500 2000 6500
 Wire Wire Line
-	1300 6400 1250 6400
+	1300 6450 1250 6450
 Wire Wire Line
-	1250 6700 1200 6700
+	1250 6750 1200 6750
 Wire Wire Line
-	1450 6000 1450 5950
+	1450 6050 1450 6000
 Wire Wire Line
-	1450 5950 950  5950
-Connection ~ 950  5950
-Connection ~ 2200 5950
+	1450 6000 950  6000
+Connection ~ 950  6000
+Connection ~ 2200 6000
 Wire Wire Line
-	2200 5950 2700 5950
+	2200 6000 2700 6000
 Wire Wire Line
-	2700 5950 2700 6000
+	2700 6000 2700 6050
 Wire Wire Line
-	2500 6700 2450 6700
+	2500 6750 2450 6750
 Wire Wire Line
-	2500 6400 2550 6400
+	2500 6450 2550 6450
 Wire Wire Line
-	3250 6450 3300 6450
+	3250 6500 3300 6500
 Wire Wire Line
-	3300 6450 3300 6500
+	3300 6500 3300 6550
 Wire Wire Line
-	2450 6550 2550 6550
+	2450 6600 2550 6600
 Wire Wire Line
-	2550 6550 2550 6400
-Connection ~ 3450 5950
+	2550 6600 2550 6450
+Connection ~ 3450 6000
 Wire Wire Line
-	3450 5950 3950 5950
+	3450 6000 3950 6000
 Wire Wire Line
-	3950 5950 3950 6000
+	3950 6000 3950 6050
 Wire Wire Line
-	3750 6700 3700 6700
+	3750 6750 3700 6750
 Wire Wire Line
-	3750 6400 3800 6400
+	3750 6450 3800 6450
 Wire Wire Line
-	4500 6450 4550 6450
+	4500 6500 4550 6500
 Wire Wire Line
-	4550 6450 4550 6500
+	4550 6500 4550 6550
 Wire Wire Line
-	3700 6550 3800 6550
+	3700 6600 3800 6600
 Wire Wire Line
-	3800 6550 3800 6400
+	3800 6600 3800 6450
 Wire Wire Line
 	6200 2400 6200 2350
 Wire Wire Line
 	3750 3950 3800 3950
 Connection ~ 1550 1350
 Wire Wire Line
-	1550 2450 1550 2400
-Wire Wire Line
-	1550 2400 1550 2200
+	1550 1300 1550 2450
 Wire Wire Line
-	1550 2200 1550 1750
+	2450 6900 2550 6900
 Wire Wire Line
-	1550 1750 1550 1350
+	2550 6900 2550 7050
 Wire Wire Line
-	1550 1350 1550 1300
+	1200 6600 1200 6900
 Wire Wire Line
-	2450 6850 2550 6850
+	1200 6900 1300 6900
 Wire Wire Line
-	2550 6850 2550 7000
+	1300 6900 1300 7050
+Connection ~ 1200 6750
 Wire Wire Line
-	1200 6550 1200 6700
+	2200 6650 2200 6850
 Wire Wire Line
-	1200 6700 1200 6850
+	950  7350 950  7250
 Wire Wire Line
-	1200 6850 1300 6850
+	3450 6650 3450 6850
 Wire Wire Line
-	1300 6850 1300 7000
-Connection ~ 1200 6700
+	2500 7050 2600 7050
+Connection ~ 2550 7050
 Wire Wire Line
-	2200 6600 2200 6800
-Wire Wire Line
-	950  7300 950  7200
-Wire Wire Line
-	3450 6600 3450 6800
-Wire Wire Line
-	2600 7000 2550 7000
-Wire Wire Line
-	2550 7000 2500 7000
-Connection ~ 2550 7000
-Wire Wire Line
-	2550 3900 2550 3950
-Wire Wire Line
-	2550 3950 2550 4000
+	2550 4000 2550 3900
 Connection ~ 2550 3950
 Wire Wire Line
 	1300 3400 1300 3350
 Wire Wire Line
-	2200 3250 2200 3750
+	2200 3750 2200 3250
 Wire Wire Line
-	3050 6000 3050 5900
+	3050 6050 3050 5950
 Wire Wire Line
-	5800 6550 5950 6550
+	5800 6600 5950 6600
 Wire Wire Line
-	5800 7050 5950 7050
+	5800 7100 5950 7100
 Wire Wire Line
 	2900 5300 2900 5350
 Wire Wire Line
@@ -603,27 +501,17 @@ Wire Wire Line
 Wire Wire Line
 	3800 5350 3800 4950
 Wire Wire Line
-	7750 1900 7950 1900
-Wire Wire Line
-	7950 1900 8300 1900
+	7750 1900 8300 1900
 Connection ~ 7950 1900
 Wire Wire Line
-	5400 5450 5500 5450
+	5250 5700 5350 5700
 Wire Wire Line
 	1300 3350 950  3350
 Connection ~ 4400 1300
 Wire Wire Line
 	1900 2850 1900 2900
 Wire Wire Line
-	2150 2450 2150 2400
-Wire Wire Line
-	2150 2400 2150 2200
-Wire Wire Line
-	2150 2200 2150 2000
-Wire Wire Line
-	2150 2000 2150 1350
-Wire Wire Line
-	2150 1350 2150 1300
+	2150 1300 2150 2450
 Connection ~ 2150 1350
 Wire Wire Line
 	1950 1350 1950 1300
@@ -649,45 +537,31 @@ Wire Wire Line
 	950  2200 1000 2200
 Connection ~ 950  2200
 Wire Wire Line
-	1800 2000 2150 2000
-Wire Wire Line
-	2150 2000 2300 2000
-Wire Wire Line
-	2750 1500 2750 1750
+	2300 2000 1800 2000
 Wire Wire Line
-	2750 1750 2750 2000
+	2750 1500 2750 2000
 Connection ~ 2750 1750
 Wire Wire Line
-	3600 2000 3600 2100
+	3600 2100 3600 2000
 Connection ~ 3300 2000
 Connection ~ 3600 2000
 Wire Wire Line
-	3450 1200 3450 1300
-Wire Wire Line
-	3450 1300 3450 1550
+	3450 1550 3450 1200
 Connection ~ 3450 1300
 Wire Wire Line
-	4050 1300 4150 1300
-Wire Wire Line
-	4150 1300 4400 1300
-Wire Wire Line
-	4400 1300 4450 1300
+	4450 1300 4050 1300
 Connection ~ 4150 1300
 Wire Wire Line
 	4450 3700 4450 3300
 Connection ~ 4800 3100
 Wire Wire Line
-	4900 3100 4800 3100
-Wire Wire Line
-	4800 3100 4750 3100
+	4750 3100 4900 3100
 Wire Wire Line
 	4800 3150 4800 3100
 Wire Wire Line
 	4800 3650 4800 3700
 Wire Wire Line
-	4450 2900 4450 2800
-Wire Wire Line
-	4450 2800 4450 2700
+	4450 2700 4450 2900
 Wire Wire Line
 	4450 2000 4450 2200
 Wire Wire Line
@@ -696,63 +570,66 @@ Wire Wire Line
 	5600 2050 5600 2000
 Connection ~ 5600 2000
 Wire Wire Line
-	950  4150 950  5950
-Wire Wire Line
-	950  5950 950  6200
-Wire Wire Line
-	1600 4750 1650 4750
-Wire Wire Line
-	1650 4750 1700 4750
+	1700 4750 1600 4750
 Connection ~ 1650 4750
 Wire Wire Line
-	2850 4750 2900 4750
-Wire Wire Line
-	2900 4750 2950 4750
+	2950 4750 2850 4750
 Connection ~ 2900 4750
 Wire Wire Line
-	4100 4750 4150 4750
-Wire Wire Line
-	4150 4750 4200 4750
+	4200 4750 4100 4750
 Connection ~ 4150 4750
 Wire Wire Line
 	2550 4550 2550 4500
 Wire Wire Line
 	3800 4550 3800 4500
-Connection ~ 3450 7300
-Connection ~ 2200 7300
+Connection ~ 3450 7350
+Connection ~ 2200 7350
 Wire Wire Line
-	10600 4250 10600 4350
+	10550 4300 10550 4400
 Wire Wire Line
-	9500 4250 9400 4250
+	9450 4300 9350 4300
 Wire Wire Line
-	9950 4500 9950 4450
+	9900 4550 9900 4500
 Wire Wire Line
-	10600 5550 10500 5550
+	10550 5550 10450 5550
 Wire Wire Line
-	10600 6050 10500 6050
+	10550 6050 10450 6050
 Wire Wire Line
-	9500 6050 9400 6050
+	9450 6050 9350 6050
 Wire Wire Line
-	9950 6250 9950 6300
+	9900 6250 9900 6300
 Wire Wire Line
 	8350 6050 8350 6150
 Wire Wire Line
 	8350 5550 8250 5550
 Wire Wire Line
 	7150 5950 7250 5950
-Text Label 7100 4150 0    60   ~ 0
+Wire Wire Line
+	3450 4150 3450 6250
+Wire Wire Line
+	950  4150 950  6250
+Text Label 1800 5950 1    60   ~ 0
+MAIN_OFF
+Text Label 6850 4500 2    60   ~ 0
+I2C_SDA
+Text Label 7650 4500 0    60   ~ 0
+BATT_SDA
+NoConn ~ 7250 5550
+NoConn ~ 9450 3800
+NoConn ~ 9450 5550
+Text Label 7650 4300 0    60   ~ 0
 BATT_SCL2
-Text Label 7100 4050 0    60   ~ 0
+Text Label 7650 4200 0    60   ~ 0
 BATT_SCL1
-Text Label 7100 3950 0    60   ~ 0
+Text Label 7650 4100 0    60   ~ 0
 BATT_SCL0
 $Comp
 L GND #PWR?
 U 1 1 4F7106EC
-P 9950 4500
-F 0 "#PWR?" H 9950 4500 30  0001 C CNN
-F 1 "GND" H 9950 4430 30  0001 C CNN
-	1    9950 4500
+P 9900 4550
+F 0 "#PWR?" H 9900 4550 30  0001 C CNN
+F 1 "GND" H 9900 4480 30  0001 C CNN
+	1    9900 4550
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -767,19 +644,19 @@ $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F7106E0
-P 9950 6300
-F 0 "#PWR?" H 9950 6300 30  0001 C CNN
-F 1 "GND" H 9950 6230 30  0001 C CNN
-	1    9950 6300
+P 9900 6300
+F 0 "#PWR?" H 9900 6300 30  0001 C CNN
+F 1 "GND" H 9900 6230 30  0001 C CNN
+	1    9900 6300
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 4F710695
-P 10600 5800
-F 0 "R?" V 10680 5800 50  0000 C CNN
-F 1 "10m" V 10600 5800 50  0000 C CNN
-	1    10600 5800
+P 10550 5800
+F 0 "R?" V 10630 5800 50  0000 C CNN
+F 1 "10m" V 10550 5800 50  0000 C CNN
+	1    10550 5800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -794,31 +671,31 @@ $EndComp
 $Comp
 L R R?
 U 1 1 4F710666
-P 10600 4000
-F 0 "R?" V 10680 4000 50  0000 C CNN
-F 1 "10m" V 10600 4000 50  0000 C CNN
-	1    10600 4000
+P 10550 4050
+F 0 "R?" V 10630 4050 50  0000 C CNN
+F 1 "10m" V 10550 4050 50  0000 C CNN
+	1    10550 4050
 	1    0    0    -1  
 $EndComp
-Text Label 9400 6050 2    60   ~ 0
+Text Label 9350 6050 2    60   ~ 0
 BATT_SDA
 Text Label 7150 6050 2    60   ~ 0
 BATT_SDA
-Text Label 9400 4250 2    60   ~ 0
+Text Label 9350 4300 2    60   ~ 0
 BATT_SDA
-Text Label 10600 5450 1    60   ~ 0
+Text Label 10550 5450 1    60   ~ 0
 BATT2
 Text Label 8350 5450 1    60   ~ 0
 BATT1
-Text Label 10600 3650 1    60   ~ 0
+Text Label 10550 3700 1    60   ~ 0
 BATT0
 $Comp
 L LTC2942 U?
 U 1 1 4F710412
-P 10000 5800
-F 0 "U?" H 10000 5850 60  0000 C CNN
-F 1 "LTC2942" H 10000 5750 60  0000 C CNN
-	1    10000 5800
+P 9950 5800
+F 0 "U?" H 9950 5850 60  0000 C CNN
+F 1 "LTC2942" H 9950 5750 60  0000 C CNN
+	1    9950 5800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -833,10 +710,10 @@ $EndComp
 $Comp
 L LTC2942 U?
 U 1 1 4F7103BE
-P 10000 4000
-F 0 "U?" H 10000 4050 60  0000 C CNN
-F 1 "LTC2942" H 10000 3950 60  0000 C CNN
-	1    10000 4000
+P 9950 4050
+F 0 "U?" H 9950 4100 60  0000 C CNN
+F 1 "LTC2942" H 9950 4000 60  0000 C CNN
+	1    9950 4050
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -857,19 +734,19 @@ F 1 "GND" H 5600 2530 30  0001 C CNN
 	1    5600 2600
 	1    0    0    -1  
 $EndComp
-Text Label 6750 3950 2    60   ~ 0
-BATT_SCL
-Text Label 6750 4050 2    60   ~ 0
+Text Label 6850 4200 2    60   ~ 0
+I2C_SCL
+Text Label 7250 3900 1    60   ~ 0
 ENE_SEL0
-Text Label 6750 4150 2    60   ~ 0
+Text Label 7350 3900 1    60   ~ 0
 ENE_SEL1
-Text Label 9400 5950 2    60   ~ 0
+Text Label 9350 5950 2    60   ~ 0
 BATT_SCL2
 Text Label 7150 5950 2    60   ~ 0
 BATT_SCL1
-Text Label 9400 4150 2    60   ~ 0
+Text Label 9350 4200 2    60   ~ 0
 BATT_SCL0
-Text Label 5950 7450 0    60   ~ 0
+Text Label 5950 7500 0    60   ~ 0
 RADIO_SILENCE
 Text HLabel 10200 2800 0    60   Input ~ 0
 RADIO_SILENCE
@@ -996,17 +873,17 @@ F 1 "ACT" V 3150 1650 40  0000 C CNN
 	1    3100 1650
 	-1   0    0    1   
 $EndComp
-Text HLabel 5400 5450 0    60   Input ~ 0
+Text HLabel 5250 5700 0    60   Input ~ 0
 ENE_SEL1
-Text HLabel 5400 5350 0    60   Input ~ 0
+Text HLabel 5250 5600 0    60   Input ~ 0
 ENE_SEL0
 $Comp
 L CONN_9 P?
 U 1 1 4F6F883D
-P 5850 5150
-F 0 "P?" V 5800 5150 60  0000 C CNN
-F 1 "BATT_CTL" V 5900 5150 60  0000 C CNN
-	1    5850 5150
+P 5700 5400
+F 0 "P?" V 5650 5400 60  0000 C CNN
+F 1 "BATT_CTL" V 5750 5400 60  0000 C CNN
+	1    5700 5400
 	1    0    0    -1  
 $EndComp
 Text Label 4200 4750 0    60   ~ 0
@@ -1123,37 +1000,35 @@ F 1 "GND" H 2900 5280 30  0001 C CNN
 	1    2900 5350
 	1    0    0    -1  
 $EndComp
-Text HLabel 5950 7150 2    60   Input ~ 0
+Text HLabel 5950 7200 2    60   Input ~ 0
 PRF_EN
-Text HLabel 5950 7050 2    60   Input ~ 0
+Text HLabel 5950 7100 2    60   Input ~ 0
 PRF_PWR
-Text HLabel 5950 6850 2    60   Input ~ 0
+Text HLabel 5950 6900 2    60   Input ~ 0
 MPU_EN
-Text HLabel 5950 6750 2    60   Input ~ 0
+Text HLabel 5950 6800 2    60   Input ~ 0
 MPU_PWR
-Text HLabel 5950 6550 2    60   Input ~ 0
+Text HLabel 5950 6600 2    60   Input ~ 0
 TTX_EN
-Text HLabel 5950 6450 2    60   Input ~ 0
+Text HLabel 5950 6500 2    60   Input ~ 0
 TTX_PWR
-Text Label 1800 5900 1    60   ~ 0
+Text Label 3050 5950 1    60   ~ 0
 MAIN_OFF
-Text Label 3050 5900 1    60   ~ 0
-MAIN_OFF
-Text Label 4300 5900 1    60   ~ 0
+Text Label 4300 5950 1    60   ~ 0
 MAIN_OFF
 $Sheet
-S 4950 6350 850  1200
+S 4950 6400 850  1200
 U 4F676622
 F0 "Main Power" 60
 F1 "mainpower.sch" 60
-F2 "MAIN_PWR" I L 4950 7300 60 
-F3 "PRF_PWR" I R 5800 7050 60 
-F4 "PRF_EN" I R 5800 7150 60 
-F5 "MPU_PWR" I R 5800 6750 60 
-F6 "TTX_PWR" I R 5800 6450 60 
-F7 "TTX_EN" I R 5800 6550 60 
-F8 "MPU_EN" I R 5800 6850 60 
-F9 "RADIO_SILENCE" I R 5800 7450 60 
+F2 "MAIN_PWR" I L 4950 7350 60 
+F3 "PRF_PWR" I R 5800 7100 60 
+F4 "PRF_EN" I R 5800 7200 60 
+F5 "MPU_PWR" I R 5800 6800 60 
+F6 "TTX_PWR" I R 5800 6500 60 
+F7 "TTX_EN" I R 5800 6600 60 
+F8 "MPU_EN" I R 5800 6900 60 
+F9 "RADIO_SILENCE" I R 5800 7500 60 
 $EndSheet
 $Comp
 L R R?
@@ -1196,28 +1071,28 @@ $EndComp
 $Comp
 L TST P?
 U 1 1 4F5FF060
-P 1350 7000
-F 0 "P?" V 1350 7150 40  0000 C CNN
-F 1 "B0_GATE" V 1300 7150 30  0000 C CNN
-	1    1350 7000
+P 1350 7050
+F 0 "P?" V 1350 7200 40  0000 C CNN
+F 1 "B0_GATE" V 1300 7200 30  0000 C CNN
+	1    1350 7050
 	0    1    1    0   
 $EndComp
 $Comp
 L TST P?
 U 1 1 4F5FF05D
-P 2600 7000
-F 0 "P?" V 2600 7150 40  0000 C CNN
-F 1 "B1_GATE" V 2550 7150 30  0000 C CNN
-	1    2600 7000
+P 2600 7050
+F 0 "P?" V 2600 7200 40  0000 C CNN
+F 1 "B1_GATE" V 2550 7200 30  0000 C CNN
+	1    2600 7050
 	0    1    1    0   
 $EndComp
 $Comp
 L TST P?
 U 1 1 4F5FF029
-P 3850 7000
-F 0 "P?" V 3850 7150 40  0000 C CNN
-F 1 "B2_GATE" V 3800 7150 30  0000 C CNN
-	1    3850 7000
+P 3850 7050
+F 0 "P?" V 3850 7200 40  0000 C CNN
+F 1 "B2_GATE" V 3800 7200 30  0000 C CNN
+	1    3850 7050
 	0    1    1    0   
 $EndComp
 Text Notes 2950 1300 0    60   ~ 0
@@ -1227,28 +1102,28 @@ MAIN_EN
 $Comp
 L MOS_P Q?
 U 1 1 4F5FCD84
-P 3550 7000
-F 0 "Q?" H 3600 7200 60  0000 R CNN
-F 1 "FDS4465" H 3450 7100 60  0000 R CNN
-	1    3550 7000
+P 3550 7050
+F 0 "Q?" H 3600 7250 60  0000 R CNN
+F 1 "FDS4465" H 3450 7150 60  0000 R CNN
+	1    3550 7050
 	-1   0    0    1   
 $EndComp
 $Comp
 L MOS_P Q?
 U 1 1 4F5FCD48
-P 2300 7000
-F 0 "Q?" H 2350 7200 60  0000 R CNN
-F 1 "FDS4465" H 2200 7100 60  0000 R CNN
-	1    2300 7000
+P 2300 7050
+F 0 "Q?" H 2350 7250 60  0000 R CNN
+F 1 "FDS4465" H 2200 7150 60  0000 R CNN
+	1    2300 7050
 	-1   0    0    1   
 $EndComp
 $Comp
 L MOS_P Q?
 U 1 1 4F5FCD35
-P 1050 7000
-F 0 "Q?" H 1100 6800 60  0000 R CNN
-F 1 "FDS4465" H 950 6900 60  0000 R CNN
-	1    1050 7000
+P 1050 7050
+F 0 "Q?" H 1100 6850 60  0000 R CNN
+F 1 "FDS4465" H 950 6950 60  0000 R CNN
+	1    1050 7050
 	-1   0    0    -1  
 $EndComp
 $Comp
@@ -1311,72 +1186,72 @@ Text Label 2200 5500 1    60   ~ 0
 BATT1
 Text Label 950  5500 1    60   ~ 0
 BATT0
-Text Label 4300 7300 0    60   ~ 0
+Text Label 4300 7350 0    60   ~ 0
 MAIN_PWR
 $Comp
 L LTC4412 U?
 U 1 1 4F5FB91E
-P 4150 6450
-F 0 "U?" H 4050 6450 60  0000 C CNN
-F 1 "LTC4412" H 4100 6550 60  0000 C CNN
-	1    4150 6450
+P 4150 6500
+F 0 "U?" H 4050 6500 60  0000 C CNN
+F 1 "LTC4412" H 4100 6600 60  0000 C CNN
+	1    4150 6500
 	0    -1   1    0   
 $EndComp
 $Comp
 L MOS_P Q?
 U 1 1 4F5FB91D
-P 3550 6400
-F 0 "Q?" H 3600 6200 60  0000 R CNN
-F 1 "FDS4465" V 3450 6650 60  0000 R CNN
-	1    3550 6400
+P 3550 6450
+F 0 "Q?" H 3600 6250 60  0000 R CNN
+F 1 "FDS4465" V 3450 6700 60  0000 R CNN
+	1    3550 6450
 	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F5FB91C
-P 4550 6500
-F 0 "#PWR?" H 4550 6500 30  0001 C CNN
-F 1 "GND" H 4550 6430 30  0001 C CNN
-	1    4550 6500
+P 4550 6550
+F 0 "#PWR?" H 4550 6550 30  0001 C CNN
+F 1 "GND" H 4550 6480 30  0001 C CNN
+	1    4550 6550
 	1    0    0    -1  
 $EndComp
-NoConn ~ 4300 6900
+NoConn ~ 4300 6950
 $Comp
 L LTC4412 U?
 U 1 1 4F5FB902
-P 2900 6450
-F 0 "U?" H 2800 6450 60  0000 C CNN
-F 1 "LTC4412" H 2850 6550 60  0000 C CNN
-	1    2900 6450
+P 2900 6500
+F 0 "U?" H 2800 6500 60  0000 C CNN
+F 1 "LTC4412" H 2850 6600 60  0000 C CNN
+	1    2900 6500
 	0    -1   1    0   
 $EndComp
 $Comp
 L MOS_P Q?
 U 1 1 4F5FB901
-P 2300 6400
-F 0 "Q?" H 2350 6200 60  0000 R CNN
-F 1 "FDS4465" V 2200 6650 60  0000 R CNN
-	1    2300 6400
+P 2300 6450
+F 0 "Q?" H 2350 6250 60  0000 R CNN
+F 1 "FDS4465" V 2200 6700 60  0000 R CNN
+	1    2300 6450
 	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F5FB900
-P 3300 6500
-F 0 "#PWR?" H 3300 6500 30  0001 C CNN
-F 1 "GND" H 3300 6430 30  0001 C CNN
-	1    3300 6500
+P 3300 6550
+F 0 "#PWR?" H 3300 6550 30  0001 C CNN
+F 1 "GND" H 3300 6480 30  0001 C CNN
+	1    3300 6550
 	1    0    0    -1  
 $EndComp
-NoConn ~ 3050 6900
-NoConn ~ 1800 6900
+NoConn ~ 3050 6950
+NoConn ~ 1800 6950
 $Comp
 L GND #PWR?
 U 1 1 4F5FB389
-P 2050 6500
-F 0 "#PWR?" H 2050 6500 30  0001 C CNN
-F 1 "GND" H 2050 6430 30  0001 C CNN
-	1    2050 6500
+P 2050 6550
+F 0 "#PWR?" H 2050 6550 30  0001 C CNN
+F 1 "GND" H 2050 6480 30  0001 C CNN
+	1    2050 6550
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1418,48 +1293,48 @@ $EndComp
 $Comp
 L MOS_P Q?
 U 1 1 4F5D24FB
-P 1050 6400
-F 0 "Q?" H 1100 6200 60  0000 R CNN
-F 1 "FDS4465" V 950 6650 60  0000 R CNN
-	1    1050 6400
+P 1050 6450
+F 0 "Q?" H 1100 6250 60  0000 R CNN
+F 1 "FDS4465" V 950 6700 60  0000 R CNN
+	1    1050 6450
 	-1   0    0    -1  
 $EndComp
 $Comp
 L LTC4412 U?
 U 1 1 4F5D2454
-P 1650 6450
-F 0 "U?" H 1550 6450 60  0000 C CNN
-F 1 "LTC4412" H 1600 6550 60  0000 C CNN
-	1    1650 6450
+P 1650 6500
+F 0 "U?" H 1550 6500 60  0000 C CNN
+F 1 "LTC4412" H 1600 6600 60  0000 C CNN
+	1    1650 6500
 	0    -1   1    0   
 $EndComp
 $Comp
 L VCC #PWR?
 U 1 1 4F5CE3A8
-P 5450 4700
-F 0 "#PWR?" H 5450 4800 30  0001 C CNN
-F 1 "VCC" H 5450 4800 30  0000 C CNN
-	1    5450 4700
+P 5300 4950
+F 0 "#PWR?" H 5300 5050 30  0001 C CNN
+F 1 "VCC" H 5300 5050 30  0000 C CNN
+	1    5300 4950
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F5CE3A2
-P 5450 5600
-F 0 "#PWR?" H 5450 5600 30  0001 C CNN
-F 1 "GND" H 5450 5530 30  0001 C CNN
-	1    5450 5600
+P 5300 5850
+F 0 "#PWR?" H 5300 5850 30  0001 C CNN
+F 1 "GND" H 5300 5780 30  0001 C CNN
+	1    5300 5850
 	1    0    0    -1  
 $EndComp
-Text HLabel 5400 5250 0    60   Input ~ 0
-BATT_SDA
-Text HLabel 5400 5150 0    60   Input ~ 0
-BATT_SCL
-Text HLabel 5400 4850 0    60   Input ~ 0
+Text HLabel 5250 5500 0    60   Input ~ 0
+I2C_SDA
+Text HLabel 5250 5400 0    60   Input ~ 0
+I2C_SCL
+Text HLabel 5250 5100 0    60   Input ~ 0
 BATT0_EN
-Text HLabel 5400 4950 0    60   Input ~ 0
+Text HLabel 5250 5200 0    60   Input ~ 0
 BATT1_EN
-Text HLabel 5400 5050 0    60   Input ~ 0
+Text HLabel 5250 5300 0    60   Input ~ 0
 BATT2_EN
 Text HLabel 10200 2600 0    60   Input ~ 0
 MAIN_PWR
@@ -1479,19 +1354,19 @@ $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F5CAE4B
-P 10800 6100
-F 0 "#PWR?" H 10800 6100 30  0001 C CNN
-F 1 "GND" H 10800 6030 30  0001 C CNN
-	1    10800 6100
+P 10750 6100
+F 0 "#PWR?" H 10750 6100 30  0001 C CNN
+F 1 "GND" H 10750 6030 30  0001 C CNN
+	1    10750 6100
 	-1   0    0    1   
 $EndComp
 $Comp
 L CONN_2 P?
 U 1 1 4F5CAE4A
-P 10700 6500
-F 0 "P?" V 10650 6500 40  0000 C CNN
-F 1 "BATT2_PWR" V 10750 6500 40  0000 C CNN
-	1    10700 6500
+P 10650 6500
+F 0 "P?" V 10600 6500 40  0000 C CNN
+F 1 "BATT2_PWR" V 10700 6500 40  0000 C CNN
+	1    10650 6500
 	0    1    1    0   
 $EndComp
 $Comp
@@ -1524,10 +1399,10 @@ $EndComp
 $Comp
 L CONN_2 P?
 U 1 1 4F5A684E
-P 10700 4700
-F 0 "P?" V 10650 4700 40  0000 C CNN
-F 1 "BATT0_PWR" V 10750 4700 40  0000 C CNN
-	1    10700 4700
+P 10650 4750
+F 0 "P?" V 10600 4750 40  0000 C CNN
+F 1 "BATT0_PWR" V 10700 4750 40  0000 C CNN
+	1    10650 4750
 	0    1    1    0   
 $EndComp
 $Comp
@@ -1941,10 +1816,10 @@ $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F54279E
-P 10800 4300
-F 0 "#PWR?" H 10800 4300 30  0001 C CNN
-F 1 "GND" H 10800 4230 30  0001 C CNN
-	1    10800 4300
+P 10750 4350
+F 0 "#PWR?" H 10750 4350 30  0001 C CNN
+F 1 "GND" H 10750 4280 30  0001 C CNN
+	1    10750 4350
 	-1   0    0    1   
 $EndComp
 $Comp
diff --git a/hardware/ihu-ttx-test/solar-input.sch b/hardware/ihu-ttx-test/solar-input.sch
index 32f0960..6c6fb12 100644
--- a/hardware/ihu-ttx-test/solar-input.sch
+++ b/hardware/ihu-ttx-test/solar-input.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Die 27 Mär 2012 02:20:48 CEST
+EESchema Schematic File Version 2  date Die 27 Mär 2012 03:01:43 CEST
 LIBS:mur-sat
 LIBS:power
 LIBS:device
@@ -30,9 +30,10 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:ihu-ttx-test-cache
-EELAYER 24  0
+EELAYER 25  0
 EELAYER END
 $Descr A4 11700 8267
+encoding utf-8
 Sheet 5 5
 Title "Solar Panel Input"
 Date "27 mar 2012"
diff --git a/hardware/ihu-ttx-test/ttxcrx.sch b/hardware/ihu-ttx-test/ttxcrx.sch
index 5eb9ce7..1f2ecb1 100644
--- a/hardware/ihu-ttx-test/ttxcrx.sch
+++ b/hardware/ihu-ttx-test/ttxcrx.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Die 27 Mär 2012 02:20:48 CEST
+EESchema Schematic File Version 2  date Die 27 Mär 2012 03:01:43 CEST
 LIBS:mur-sat
 LIBS:power
 LIBS:device
@@ -30,9 +30,10 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:ihu-ttx-test-cache
-EELAYER 24  0
+EELAYER 25  0
 EELAYER END
 $Descr A4 11700 8267
+encoding utf-8
 Sheet 4 5
 Title "CTR, TTX, CRX"
 Date "27 mar 2012"
@@ -44,32 +45,32 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	2750 6400 2400 6400
+	2650 6400 2300 6400
 Wire Wire Line
-	2750 6500 2400 6500
+	2650 6500 2300 6500
 Wire Wire Line
-	4400 3850 4300 3850
+	4100 3850 4000 3850
 Wire Wire Line
-	2550 4950 2450 4950
+	2400 4950 2300 4950
 Wire Wire Line
-	4400 6600 4500 6600
+	4350 6600 4450 6600
 Wire Wire Line
-	2500 6650 2500 6600
+	2400 6650 2400 6600
 Wire Wire Line
 	9500 5250 7650 5250
 Connection ~ 7850 1350
 Wire Wire Line
 	7700 1350 8400 1350
 Wire Wire Line
-	4300 3750 5050 3750
+	4000 3750 4750 3750
 Wire Wire Line
-	4500 5400 4600 5400
+	4350 5400 4450 5400
 Wire Wire Line
-	4500 5200 4600 5200
+	4350 5200 4450 5200
 Wire Wire Line
-	4550 4950 4550 5000
+	4400 4950 4400 5000
 Wire Wire Line
-	4550 5000 4500 5000
+	4400 5000 4350 5000
 Wire Wire Line
 	8300 2700 8300 2450
 Wire Wire Line
@@ -92,15 +93,15 @@ Wire Wire Line
 Wire Wire Line
 	9750 3850 10100 3850
 Wire Wire Line
-	3225 1175 3625 1175
+	2925 1175 3325 1175
 Wire Wire Line
-	3525 1475 3525 1275
+	3225 1475 3225 1275
 Wire Wire Line
-	3525 1275 3225 1275
+	3225 1275 2925 1275
 Wire Wire Line
-	2000 3100 2000 3050
+	1700 3100 1700 3050
 Wire Wire Line
-	3725 1475 3725 1425
+	3425 1475 3425 1425
 Connection ~ 6250 4500
 Wire Wire Line
 	6300 4500 6250 4500
@@ -112,40 +113,40 @@ Connection ~ 8800 5250
 Connection ~ 8200 5250
 Connection ~ 8050 5250
 Wire Wire Line
-	5350 3450 5350 3550
-Connection ~ 5350 3500
+	5050 3450 5050 3550
+Connection ~ 5050 3500
 Wire Wire Line
-	5350 3500 5500 3500
+	5050 3500 5200 3500
 Wire Wire Line
-	5500 3500 5500 3000
+	5200 3500 5200 3000
 Wire Wire Line
-	5500 3000 5650 3000
+	5200 3000 5350 3000
 Wire Wire Line
-	5600 3150 5600 3100
+	5300 3150 5300 3100
 Wire Wire Line
-	2550 5450 2450 5450
+	2400 5450 2300 5450
 Wire Wire Line
-	2550 5250 2450 5250
+	2400 5250 2300 5250
 Wire Wire Line
-	2550 5050 2450 5050
+	2400 5050 2300 5050
 Wire Wire Line
-	2450 4750 2550 4750
+	2300 4750 2400 4750
 Wire Wire Line
-	2550 4750 2550 4700
+	2400 4750 2400 4700
 Wire Wire Line
-	2600 3750 2700 3750
+	2300 3750 2400 3750
 Wire Wire Line
-	2600 3550 2700 3550
+	2300 3550 2400 3550
 Wire Wire Line
-	2600 3350 2700 3350
+	2300 3350 2400 3350
 Wire Wire Line
-	2700 3150 2600 3150
+	2400 3150 2300 3150
 Wire Wire Line
-	4400 3650 4300 3650
+	4100 3650 4000 3650
 Wire Wire Line
-	4400 3450 4300 3450
+	4100 3450 4000 3450
 Wire Wire Line
-	4400 3250 4300 3250
+	4100 3250 4000 3250
 Wire Wire Line
 	6850 3300 6850 3350
 Wire Wire Line
@@ -260,11 +261,11 @@ Wire Wire Line
 Wire Wire Line
 	9000 2700 9000 2550
 Wire Wire Line
-	3700 2750 3700 2850
-Connection ~ 3700 2800
+	3400 2750 3400 2850
+Connection ~ 3400 2800
 Wire Wire Line
-	3300 2750 3300 2850
-Connection ~ 3300 2800
+	3000 2750 3000 2850
+Connection ~ 3000 2800
 Wire Wire Line
 	9900 3000 9900 2900
 Wire Wire Line
@@ -274,31 +275,31 @@ Wire Wire Line
 Wire Wire Line
 	6900 3550 6800 3550
 Wire Wire Line
-	4400 3150 4300 3150
+	4100 3150 4000 3150
 Wire Wire Line
-	4400 3350 4300 3350
+	4100 3350 4000 3350
 Wire Wire Line
-	4400 3550 4300 3550
+	4100 3550 4000 3550
 Wire Wire Line
-	2700 3250 2600 3250
+	2400 3250 2300 3250
 Wire Wire Line
-	2700 3450 2600 3450
+	2400 3450 2300 3450
 Wire Wire Line
-	2700 3850 2600 3850
+	2400 3850 2300 3850
 Wire Wire Line
-	2450 5150 2550 5150
+	2300 5150 2400 5150
 Wire Wire Line
-	2450 5350 2550 5350
+	2300 5350 2400 5350
 Wire Wire Line
-	2450 5550 2550 5550
+	2300 5550 2400 5550
 Wire Wire Line
-	2550 5550 2550 5600
+	2400 5550 2400 5600
 Wire Wire Line
-	5600 3100 5650 3100
+	5300 3100 5350 3100
 Wire Wire Line
-	5350 4000 5350 3950
+	5050 4000 5050 3950
 Wire Wire Line
-	5350 2900 5350 2950
+	5050 2900 5050 2950
 Connection ~ 7900 5250
 Connection ~ 9200 5250
 Wire Wire Line
@@ -314,18 +315,18 @@ Wire Wire Line
 	6900 4500 6950 4500
 Connection ~ 6950 4500
 Wire Wire Line
-	3425 1475 3425 1425
+	3125 1475 3125 1425
 Wire Wire Line
-	3325 1475 3325 1425
+	3025 1475 3025 1425
 Wire Wire Line
-	3325 1425 3225 1425
+	3025 1425 2925 1425
 Wire Wire Line
-	2000 3650 2000 3600
+	1700 3650 1700 3600
 Wire Wire Line
-	1850 3650 2700 3650
-Connection ~ 2000 3650
+	1550 3650 2400 3650
+Connection ~ 1700 3650
 Wire Wire Line
-	3625 1175 3625 1475
+	3325 1175 3325 1475
 Wire Wire Line
 	9900 3500 9900 3550
 Wire Wire Line
@@ -352,104 +353,104 @@ Connection ~ 7150 2450
 Wire Wire Line
 	8400 1350 8400 2700
 Wire Wire Line
-	5100 2900 5650 2900
-Connection ~ 5350 2900
+	4800 2900 5350 2900
+Connection ~ 5050 2900
 Wire Wire Line
-	4600 5100 4500 5100
+	4450 5100 4350 5100
 Wire Wire Line
-	4600 5300 4500 5300
+	4450 5300 4350 5300
 Wire Wire Line
-	4550 5550 4550 5500
+	4400 5550 4400 5500
 Wire Wire Line
-	4550 5500 4500 5500
+	4400 5500 4350 5500
 Wire Wire Line
 	8300 2450 7700 2450
 Connection ~ 7850 2450
 Wire Wire Line
-	4500 6600 4500 6650
+	4450 6600 4450 6650
 Wire Wire Line
-	2500 6600 2400 6600
+	2400 6600 2300 6600
 Wire Wire Line
 	9350 5250 9350 5900
 Connection ~ 9350 5900
 Connection ~ 9350 5250
 Wire Wire Line
-	2600 4850 2450 4850
+	2450 4850 2300 4850
 Wire Wire Line
-	4750 6400 4400 6400
+	4700 6400 4350 6400
 Wire Wire Line
-	4750 6500 4400 6500
-Text Label 2600 4850 0    60   ~ 0
+	4700 6500 4350 6500
+Text Label 2450 4850 0    60   ~ 0
 TTX_EN
 $Comp
 L CONN_9 P?
 U 1 1 4F5CEDEC
-P 2100 5150
-F 0 "P?" V 2050 5150 60  0000 C CNN
-F 1 "IHU" V 2150 5150 60  0000 C CNN
-	1    2100 5150
+P 1950 5150
+F 0 "P?" V 1900 5150 60  0000 C CNN
+F 1 "IHU" V 2000 5150 60  0000 C CNN
+	1    1950 5150
 	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F5B7446
-P 4500 6650
-F 0 "#PWR?" H 4500 6650 30  0001 C CNN
-F 1 "GND" H 4500 6580 30  0001 C CNN
-	1    4500 6650
+P 4450 6650
+F 0 "#PWR?" H 4450 6650 30  0001 C CNN
+F 1 "GND" H 4450 6580 30  0001 C CNN
+	1    4450 6650
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F5B7435
-P 2500 6650
-F 0 "#PWR?" H 2500 6650 30  0001 C CNN
-F 1 "GND" H 2500 6580 30  0001 C CNN
-	1    2500 6650
+P 2400 6650
+F 0 "#PWR?" H 2400 6650 30  0001 C CNN
+F 1 "GND" H 2400 6580 30  0001 C CNN
+	1    2400 6650
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_3 K?
 U 1 1 4F5B741E
-P 4050 6500
-F 0 "K?" V 4000 6500 50  0000 C CNN
-F 1 "CRX_PWR" V 4100 6500 40  0000 C CNN
-	1    4050 6500
+P 4000 6500
+F 0 "K?" V 3950 6500 50  0000 C CNN
+F 1 "CRX_PWR" V 4050 6500 40  0000 C CNN
+	1    4000 6500
 	-1   0    0    -1  
 $EndComp
 $Comp
 L CONN_3 K?
 U 1 1 4F5B741A
-P 2050 6500
-F 0 "K?" V 2000 6500 50  0000 C CNN
-F 1 "TTX_PWR" V 2100 6500 40  0000 C CNN
-	1    2050 6500
+P 1950 6500
+F 0 "K?" V 1900 6500 50  0000 C CNN
+F 1 "TTX_PWR" V 2000 6500 40  0000 C CNN
+	1    1950 6500
 	-1   0    0    -1  
 $EndComp
-Text HLabel 4750 6400 2    60   Input ~ 0
+Text HLabel 4700 6400 2    60   Input ~ 0
 CRX_PWR
-Text Label 5100 2900 2    60   ~ 0
+Text Label 4800 2900 2    60   ~ 0
 TTX_PWR
-Text HLabel 2750 6500 2    60   Input ~ 0
+Text HLabel 2650 6500 2    60   Input ~ 0
 TTX_EN
-Text HLabel 4750 6500 2    60   Input ~ 0
+Text HLabel 4700 6500 2    60   Input ~ 0
 CRX_EN
 Text Label 9500 5250 0    60   ~ 0
 CRX_PWR
-Text Label 4400 3850 0    60   ~ 0
+Text Label 4100 3850 0    60   ~ 0
 TTX_EN
 $Comp
 L PMGD370XN Q?
 U 1 1 4F5A5AE5
-P 5250 3750
-F 0 "Q?" H 5250 3950 60  0000 R CNN
-F 1 "PMGD370XN" V 5500 3650 60  0000 R CNN
-	1    5250 3750
+P 4950 3750
+F 0 "Q?" H 4950 3950 60  0000 R CNN
+F 1 "PMGD370XN" V 5200 3650 60  0000 R CNN
+	1    4950 3750
 	1    0    0    -1  
 $EndComp
 Text Notes 8300 4200 0    150  ~ 30
 CRX
-Text Notes 3300 3600 0    150  ~ 30
+Text Notes 3000 3600 0    150  ~ 30
 CTR
 $Comp
 L PMGD370XN Q?
@@ -543,63 +544,63 @@ F 1 "100" V 9150 2150 50  0000 C CNN
 	1    9150 2150
 	0    -1   -1   0   
 $EndComp
-Text HLabel 2750 6400 2    60   Input ~ 0
+Text HLabel 2650 6400 2    60   Input ~ 0
 TTX_PWR
-Text Label 3225 1175 2    60   ~ 0
+Text Label 2925 1175 2    60   ~ 0
 CW
-Text Label 3225 1275 2    60   ~ 0
+Text Label 2925 1275 2    60   ~ 0
 TTX_EN
-Text Label 3225 1425 2    60   ~ 0
+Text Label 2925 1425 2    60   ~ 0
 CTR_MCLR
-Text Label 1850 3650 2    60   ~ 0
+Text Label 1550 3650 2    60   ~ 0
 CTR_MCLR
 $Comp
 L R R?
 U 1 1 4F4DA468
-P 2000 3350
-F 0 "R?" V 2080 3350 50  0000 C CNN
-F 1 "20k" V 2000 3350 50  0000 C CNN
-	1    2000 3350
+P 1700 3350
+F 0 "R?" V 1780 3350 50  0000 C CNN
+F 1 "20k" V 1700 3350 50  0000 C CNN
+	1    1700 3350
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR?
 U 1 1 4F4DA41A
-P 3425 1425
-F 0 "#PWR?" H 3425 1525 30  0001 C CNN
-F 1 "VCC" H 3425 1525 30  0000 C CNN
-	1    3425 1425
+P 3125 1425
+F 0 "#PWR?" H 3125 1525 30  0001 C CNN
+F 1 "VCC" H 3125 1525 30  0000 C CNN
+	1    3125 1425
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F4DA414
-P 3725 1425
-F 0 "#PWR?" H 3725 1425 30  0001 C CNN
-F 1 "GND" H 3725 1355 30  0001 C CNN
-	1    3725 1425
+P 3425 1425
+F 0 "#PWR?" H 3425 1425 30  0001 C CNN
+F 1 "GND" H 3425 1355 30  0001 C CNN
+	1    3425 1425
 	-1   0    0    1   
 $EndComp
 $Comp
 L CONN_5 P?
 U 1 1 4F4DA3EE
-P 3525 1875
-F 0 "P?" V 3475 1875 50  0000 C CNN
-F 1 "CTR_ICSP" V 3575 1875 50  0000 C CNN
-	1    3525 1875
+P 3225 1875
+F 0 "P?" V 3175 1875 50  0000 C CNN
+F 1 "CTR_ICSP" V 3275 1875 50  0000 C CNN
+	1    3225 1875
 	0    1    1    0   
 $EndComp
-Text HLabel 2550 5450 2    60   Input ~ 0
+Text HLabel 2400 5450 2    60   Input ~ 0
 CTR_INT
-Text HLabel 2550 5250 2    60   Input ~ 0
+Text HLabel 2400 5250 2    60   Input ~ 0
 CTR_SDI
-Text HLabel 2550 5350 2    60   Input ~ 0
+Text HLabel 2400 5350 2    60   Input ~ 0
 CTR_SDO
-Text HLabel 2550 5150 2    60   Input ~ 0
+Text HLabel 2400 5150 2    60   Input ~ 0
 CTR_SCK
-Text HLabel 2550 5050 2    60   Input ~ 0
+Text HLabel 2400 5050 2    60   Input ~ 0
 CTR_SS
-Text HLabel 2550 4950 2    60   Input ~ 0
+Text HLabel 2400 4950 2    60   Input ~ 0
 1HZ
 $Comp
 L GND #PWR?
@@ -613,37 +614,37 @@ $EndComp
 $Comp
 L R R?
 U 1 1 4F4D9A22
-P 5350 3200
-F 0 "R?" V 5430 3200 50  0000 C CNN
-F 1 "10K" V 5350 3200 50  0000 C CNN
-	1    5350 3200
+P 5050 3200
+F 0 "R?" V 5130 3200 50  0000 C CNN
+F 1 "10K" V 5050 3200 50  0000 C CNN
+	1    5050 3200
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F4D99F6
-P 5350 4000
-F 0 "#PWR?" H 5350 4000 30  0001 C CNN
-F 1 "GND" H 5350 3930 30  0001 C CNN
-	1    5350 4000
+P 5050 4000
+F 0 "#PWR?" H 5050 4000 30  0001 C CNN
+F 1 "GND" H 5050 3930 30  0001 C CNN
+	1    5050 4000
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F4D997A
-P 5600 3150
-F 0 "#PWR?" H 5600 3150 30  0001 C CNN
-F 1 "GND" H 5600 3080 30  0001 C CNN
-	1    5600 3150
+P 5300 3150
+F 0 "#PWR?" H 5300 3150 30  0001 C CNN
+F 1 "GND" H 5300 3080 30  0001 C CNN
+	1    5300 3150
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_3 K?
 U 1 1 4F4D9965
-P 6000 3000
-F 0 "K?" V 5950 3000 50  0000 C CNN
-F 1 "TTX" V 6050 3000 40  0000 C CNN
-	1    6000 3000
+P 5700 3000
+F 0 "K?" V 5650 3000 50  0000 C CNN
+F 1 "TTX" V 5750 3000 40  0000 C CNN
+	1    5700 3000
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -658,84 +659,84 @@ $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F4D951D
-P 2550 5600
-F 0 "#PWR?" H 2550 5600 30  0001 C CNN
-F 1 "GND" H 2550 5530 30  0001 C CNN
-	1    2550 5600
+P 2400 5600
+F 0 "#PWR?" H 2400 5600 30  0001 C CNN
+F 1 "GND" H 2400 5530 30  0001 C CNN
+	1    2400 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR?
 U 1 1 4F4D951A
-P 2550 4700
-F 0 "#PWR?" H 2550 4800 30  0001 C CNN
-F 1 "VCC" H 2550 4800 30  0000 C CNN
-	1    2550 4700
+P 2400 4700
+F 0 "#PWR?" H 2400 4800 30  0001 C CNN
+F 1 "VCC" H 2400 4800 30  0000 C CNN
+	1    2400 4700
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR?
 U 1 1 4F4D949D
-P 4550 4950
-F 0 "#PWR?" H 4550 5050 30  0001 C CNN
-F 1 "VCC" H 4550 5050 30  0000 C CNN
-	1    4550 4950
+P 4400 4950
+F 0 "#PWR?" H 4400 5050 30  0001 C CNN
+F 1 "VCC" H 4400 5050 30  0000 C CNN
+	1    4400 4950
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F4D9497
-P 4550 5550
-F 0 "#PWR?" H 4550 5550 30  0001 C CNN
-F 1 "GND" H 4550 5480 30  0001 C CNN
-	1    4550 5550
+P 4400 5550
+F 0 "#PWR?" H 4400 5550 30  0001 C CNN
+F 1 "GND" H 4400 5480 30  0001 C CNN
+	1    4400 5550
 	1    0    0    -1  
 $EndComp
-Text Label 4600 5200 0    60   ~ 0
+Text Label 4450 5200 0    60   ~ 0
 RA1
-Text Label 4600 5100 0    60   ~ 0
+Text Label 4450 5100 0    60   ~ 0
 RA0
-Text Label 4600 5400 0    60   ~ 0
+Text Label 4450 5400 0    60   ~ 0
 RB5
-Text Label 4600 5300 0    60   ~ 0
+Text Label 4450 5300 0    60   ~ 0
 RB2
-Text Label 4400 3750 0    60   ~ 0
+Text Label 4100 3750 0    60   ~ 0
 CW
-Text Label 4400 3650 0    60   ~ 0
+Text Label 4100 3650 0    60   ~ 0
 RB5
-Text Label 4400 3550 0    60   ~ 0
+Text Label 4100 3550 0    60   ~ 0
 CTR_SCK
-Text Label 4400 3450 0    60   ~ 0
+Text Label 4100 3450 0    60   ~ 0
 CRX_INT
-Text Label 4400 3350 0    60   ~ 0
+Text Label 4100 3350 0    60   ~ 0
 RB2
-Text Label 4400 3250 0    60   ~ 0
+Text Label 4100 3250 0    60   ~ 0
 CTR_SDI
-Text Label 4400 3150 0    60   ~ 0
+Text Label 4100 3150 0    60   ~ 0
 1HZ
-Text Label 2600 3850 2    60   ~ 0
+Text Label 2300 3850 2    60   ~ 0
 CTR_INT
-Text Label 2600 3750 2    60   ~ 0
+Text Label 2300 3750 2    60   ~ 0
 CTR_SDO
-Text Label 2000 3050 1    60   ~ 0
+Text Label 1700 3050 1    60   ~ 0
 CTR_SS
-Text Label 2600 3550 2    60   ~ 0
+Text Label 2300 3550 2    60   ~ 0
 CRX_EN
-Text Label 2600 3450 2    60   ~ 0
+Text Label 2300 3450 2    60   ~ 0
 CRX_SDA
-Text Label 2600 3350 2    60   ~ 0
+Text Label 2300 3350 2    60   ~ 0
 CRX_SCL
-Text Label 2600 3250 2    60   ~ 0
+Text Label 2300 3250 2    60   ~ 0
 RA1
-Text Label 2600 3150 2    60   ~ 0
+Text Label 2300 3150 2    60   ~ 0
 RA0
 $Comp
 L CONN_6 P?
 U 1 1 4F4D9398
-P 4150 5250
-F 0 "P?" V 4100 5250 60  0000 C CNN
-F 1 "CTR_UNUSED" V 4200 5250 60  0000 C CNN
-	1    4150 5250
+P 4000 5250
+F 0 "P?" V 3950 5250 60  0000 C CNN
+F 1 "CTR_UNUSED" V 4050 5250 60  0000 C CNN
+	1    4000 5250
 	-1   0    0    -1  
 $EndComp
 $Comp
@@ -813,28 +814,28 @@ $EndComp
 $Comp
 L C C?
 U 1 1 4F4D8FA6
-P 3500 2800
-F 0 "C?" H 3550 2900 50  0000 L CNN
-F 1 "C" H 3550 2700 50  0000 L CNN
-	1    3500 2800
+P 3200 2800
+F 0 "C?" H 3250 2900 50  0000 L CNN
+F 1 "C" H 3250 2700 50  0000 L CNN
+	1    3200 2800
 	0    1    1    0   
 $EndComp
 $Comp
 L VCC #PWR?
 U 1 1 4F4D8F9C
-P 3300 2750
-F 0 "#PWR?" H 3300 2850 30  0001 C CNN
-F 1 "VCC" H 3300 2850 30  0000 C CNN
-	1    3300 2750
+P 3000 2750
+F 0 "#PWR?" H 3000 2850 30  0001 C CNN
+F 1 "VCC" H 3000 2850 30  0000 C CNN
+	1    3000 2750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 4F4D8F79
-P 3700 2750
-F 0 "#PWR?" H 3700 2750 30  0001 C CNN
-F 1 "GND" H 3700 2680 30  0001 C CNN
-	1    3700 2750
+P 3400 2750
+F 0 "#PWR?" H 3400 2750 30  0001 C CNN
+F 1 "GND" H 3400 2680 30  0001 C CNN
+	1    3400 2750
 	-1   0    0    1   
 $EndComp
 Text Label 9800 1900 0    60   ~ 0
@@ -1284,10 +1285,10 @@ $EndComp
 $Comp
 L PIC16F1847SO U?
 U 1 1 4F4AC6E1
-P 3500 3500
-F 0 "U?" H 3500 3250 60  0000 C CNN
-F 1 "PIC16F1847SO" H 3750 3000 60  0000 C CNN
-	1    3500 3500
+P 3200 3500
+F 0 "U?" H 3200 3250 60  0000 C CNN
+F 1 "PIC16F1847SO" H 3450 3000 60  0000 C CNN
+	1    3200 3500
 	1    0    0    -1  
 $EndComp
 $EndSCHEMATC