7 files changed, 483 insertions, 450 deletions

diff --git a/contrib/kicad-libs/mur-sat.lib b/contrib/kicad-libs/mur-sat.lib
index 44b74be..4324d1b 100644
--- a/contrib/kicad-libs/mur-sat.lib
+++ b/contrib/kicad-libs/mur-sat.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Fr 05 Apr 2013 04:27:55 CEST
+EESchema-LIBRARY Version 2.3  Date: Son 07 Apr 2013 09:26:47 CEST
 #encoding utf-8
 #
 # AD8027
@@ -734,29 +734,29 @@ ENDDEF
 # PIC16F1847SO
 #
 DEF PIC16F1847SO U 0 40 Y Y 1 F N
-F0 "U" 0 50 60 H V C CNN
-F1 "PIC16F1847SO" 0 -50 60 H V C CNN
+F0 "U" 0 1000 60 H V C CNN
+F1 "PIC16F1847SO" 0 -800 60 H V C CNN
 DRAW
-S -700 -150 -700 -150 0 1 0 N
-S 600 450 -600 -450 0 1 0 N
-X RA2 1 -800 150 200 R 50 50 1 1 B
-X RA3 2 -800 50 200 R 50 50 1 1 B
-X RA4 3 -800 -50 200 R 50 50 1 1 B
-X RA5 4 -800 -150 200 R 50 50 1 1 I
-X Vss 5 200 650 200 D 50 50 1 1 W
-X RB0 6 800 350 200 L 50 50 1 1 B
-X RB1 7 800 250 200 L 50 50 1 1 B
-X RB2 8 800 150 200 L 50 50 1 1 B
-X RB3 9 800 50 200 L 50 50 1 1 B
-X RB4 10 800 -50 200 L 50 50 1 1 B
-X RB5 11 800 -150 200 L 50 50 1 1 B
-X RB6 12 800 -250 200 L 50 50 1 1 B
-X RB7 13 800 -350 200 L 50 50 1 1 B
-X Vdd 14 -200 650 200 D 50 50 1 1 W
-X RA6 15 -800 -250 200 R 50 50 1 1 B
-X RA7 16 -800 -350 200 R 50 50 1 1 B
-X RA0 17 -800 350 200 R 50 50 1 1 B
-X RA1 18 -800 250 200 R 50 50 1 1 B
+S -1100 -1250 -1100 -1250 0 1 0 N
+S 1500 -750 -1450 950 0 1 0 N
+X RA2(AN2/C12IN2-/C12IN+/VREF-/DACOUT) 1 -1550 600 100 R 50 50 1 1 B
+X RA3(AN3/C12IN3-/C1IN+/VREF+/C1OUT/CCP3/SRQ) 2 -1550 500 100 R 50 50 1 1 B
+X RA4(AN4/C2OUT/TOCKI/CCP4/SRNQ) 3 -1550 400 100 R 50 50 1 1 B
+X RA5(MCLR/VPP/SS1) 4 -1550 300 100 R 50 50 1 1 I
+X Vss 5 -1550 -650 100 R 50 50 1 1 W
+X RB0(T1G/CCP1/P1A/INT/SRI/FLT0) 6 1600 50 100 L 50 50 1 1 B
+X RB1(AN11/RX/DT/SDA1/SDI1) 7 1600 -50 100 L 50 50 1 1 B
+X RB2(AN10/MDMIN/TX/CK/RX/DT/SDA2/SDI2/SDO1) 8 1600 -150 100 L 50 50 1 1 B
+X RB3(AN9/MDOUT/CCP1/P1A) 9 1600 -250 100 L 50 50 1 1 B
+X RB4(AN8/SCL1/SCK1/MDCIN2) 10 1600 -350 100 L 50 50 1 1 B
+X RB5(AN7/P1B/TX/CK/SCL2/SCK2/SS1) 11 1600 -450 100 L 50 50 1 1 B
+X RB6(AN5/T1CKI/T1OSCI/P1C/CCP2/P2A/ICSPCLK) 12 1600 -550 100 L 50 50 1 1 B
+X RB7(AN6/T1OSCO/P1D/P2B/MDCIN1/ICSPDAT) 13 1600 -650 100 L 50 50 1 1 B
+X Vdd 14 1600 850 100 L 50 50 1 1 W
+X RA6(OSC2/CLKOUT/CLKR/P1D/P2B/SDO1) 15 -1550 200 100 R 50 50 1 1 B
+X RA7(OSC1/CLKIN/P1C/CCP2/P2A) 16 -1550 100 100 R 50 50 1 1 B
+X RA0(AN0/C12IN0-/SDO2) 17 -1550 800 100 R 50 50 1 1 B
+X RA1(AN1/C12IN1-/SS2) 18 -1550 700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
diff --git a/hardware/idm/idm.sch b/hardware/idm/idm.sch
index e64552c..a385d13 100644
--- a/hardware/idm/idm.sch
+++ b/hardware/idm/idm.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Die 03 Jul 2012 21:22:38 CEST
+EESchema Schematic File Version 2  date Son 07 Apr 2013 09:28:54 CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -31,12 +31,13 @@ LIBS:contrib
 LIBS:valves
 LIBS:mur-sat
 LIBS:idm-cache
-EELAYER 24  0
+EELAYER 25  0
 EELAYER END
 $Descr A4 11700 8267
+encoding utf-8
 Sheet 1 1
 Title "IDM"
-Date "3 jul 2012"
+Date "7 apr 2013"
 Rev "2"
 Comp "mur.sat - A Space Art Project"
 Comment1 ""
@@ -45,9 +46,16 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	10200 1250 10000 1250
+	7000 2400 6950 2400
 Wire Wire Line
-	10200 1450 10150 1450
+	6950 2400 6950 2450
+Connection ~ 10250 900 
+Wire Wire Line
+	10250 950  10250 850 
+Wire Wire Line
+	8350 3150 8150 3150
+Wire Wire Line
+	8350 3350 8300 3350
 Wire Wire Line
 	2400 5300 9350 5300
 Connection ~ 1550 5600
@@ -99,8 +107,6 @@ Wire Wire Line
 Wire Wire Line
 	6300 4550 6650 4550
 Wire Wire Line
-	7900 1700 7900 1450
-Wire Wire Line
 	3350 1150 3400 1150
 Wire Wire Line
 	2950 1150 2900 1150
@@ -164,29 +170,29 @@ Wire Wire Line
 Wire Wire Line
 	9150 4450 9100 4450
 Wire Wire Line
-	7300 2500 7200 2500
+	7000 1450 6900 1450
 Wire Wire Line
-	10000 1350 10200 1350
+	8150 3250 8350 3250
 Wire Wire Line
 	5750 3300 5750 3250
 Connection ~ 5500 2800
 Wire Wire Line
 	5500 2850 5500 2800
 Wire Wire Line
-	10100 3200 10200 3200
+	7000 3150 7100 3150
 Wire Wire Line
 	8300 4650 8200 4650
 Wire Wire Line
 	8300 4450 8200 4450
-Connection ~ 9250 2700
+Connection ~ 10500 2400
 Wire Wire Line
-	9250 2750 9250 2700
+	10500 2450 10500 2400
 Wire Wire Line
-	7600 3550 7550 3550
+	9600 3700 9550 3700
 Wire Wire Line
-	8150 3400 8150 3450
+	10150 3550 10150 3600
 Wire Wire Line
-	8150 3450 8200 3450
+	10150 3600 10200 3600
 Wire Wire Line
 	6600 4800 6600 4750
 Wire Wire Line
@@ -194,33 +200,33 @@ Wire Wire Line
 Wire Wire Line
 	6550 4350 6650 4350
 Wire Wire Line
-	7200 2600 7300 2600
+	6900 1550 7000 1550
 Wire Wire Line
-	8900 2000 9000 2000
+	10150 1700 10250 1700
 Wire Wire Line
-	9000 2300 8900 2300
+	10250 2000 10150 2000
 Wire Wire Line
-	7300 2200 7200 2200
+	7000 1150 6900 1150
 Wire Wire Line
-	7300 2000 7200 2000
+	7000 950  6900 950 
 Wire Wire Line
-	9000 2100 8900 2100
+	10250 1800 10150 1800
 Wire Wire Line
-	9000 2400 8900 2400
+	10250 2100 10150 2100
 Wire Wire Line
-	9000 2600 8900 2600
+	10250 2300 10150 2300
 Wire Wire Line
-	10000 1650 10200 1650
+	8150 3550 8350 3550
 Wire Wire Line
-	10200 1550 10150 1550
+	8350 3450 8300 3450
 Wire Wire Line
-	10100 3600 10200 3600
+	7000 3550 7100 3550
 Wire Wire Line
-	10100 3400 10200 3400
+	7000 3350 7100 3350
 Wire Wire Line
-	10150 3850 10150 3800
+	7050 3800 7050 3750
 Wire Wire Line
-	10150 3800 10200 3800
+	7050 3750 7100 3750
 Connection ~ 5500 1900
 Wire Wire Line
 	5150 1650 5150 1600
@@ -252,10 +258,6 @@ Wire Wire Line
 Wire Wire Line
 	3050 1650 3050 1600
 Wire Wire Line
-	8300 1700 8300 1500
-Connection ~ 8300 1600
-Connection ~ 7900 1600
-Wire Wire Line
 	3300 1650 3300 1600
 Wire Wire Line
 	1550 1200 1550 1150
@@ -269,45 +271,45 @@ Wire Wire Line
 	5500 1950 5500 1900
 Connection ~ 5750 1900
 Wire Wire Line
-	10200 3100 10150 3100
+	7100 3050 7050 3050
 Wire Wire Line
-	10200 3300 10100 3300
+	7100 3250 7000 3250
 Wire Wire Line
-	10200 3500 10100 3500
+	7100 3450 7000 3450
 Wire Wire Line
-	10200 3700 10100 3700
+	7100 3650 7000 3650
 Wire Wire Line
-	10200 1850 10150 1850
+	8350 3750 8300 3750
 Wire Wire Line
-	10150 1850 10150 1900
+	8300 3750 8300 3800
 Wire Wire Line
-	10200 1750 10000 1750
+	8350 3650 8150 3650
 Wire Wire Line
-	8900 2200 9000 2200
+	10150 1900 10250 1900
 Wire Wire Line
-	9000 2500 8900 2500
+	10250 2200 10150 2200
 Wire Wire Line
-	7200 2100 7300 2100
+	6900 1050 7000 1050
 Wire Wire Line
-	7300 2300 7200 2300
+	7000 1250 6900 1250
 Wire Wire Line
-	7300 2400 7200 2400
+	7000 1350 6900 1350
 Wire Wire Line
-	7300 2700 7200 2700
+	7000 1650 6900 1650
 Wire Wire Line
 	6650 4250 6600 4250
 Wire Wire Line
 	6600 4250 6600 4200
 Wire Wire Line
-	8200 3550 8100 3550
+	10200 3700 10100 3700
 Wire Wire Line
-	8200 3650 8150 3650
+	10200 3800 10150 3800
 Wire Wire Line
-	8150 3650 8150 3700
+	10150 3800 10150 3850
 Wire Wire Line
-	8900 2700 9300 2700
+	10150 2400 10550 2400
 Wire Wire Line
-	9250 3250 9250 3300
+	10500 2950 10500 3000
 Wire Wire Line
 	5300 1900 6000 1900
 Wire Wire Line
@@ -419,7 +421,7 @@ Connection ~ 3700 3200
 Wire Wire Line
 	8400 5700 8450 5700
 Wire Wire Line
-	10150 3100 10150 3050
+	7050 3050 7050 3000
 Wire Wire Line
 	6300 4450 6650 4450
 Wire Wire Line
@@ -453,13 +455,26 @@ Wire Wire Line
 Wire Wire Line
 	2500 5200 2500 4050
 Connection ~ 2500 4050
+Wire Wire Line
+	10250 900  10150 900 
+Wire Wire Line
+	10250 1400 10250 1350
+$Comp
+L GND #PWR?
+U 1 1 51611FEE
+P 10250 1400
+F 0 "#PWR?" H 10250 1400 30  0001 C CNN
+F 1 "GND" H 10250 1330 30  0001 C CNN
+	1    10250 1400
+	1    0    0    -1  
+$EndComp
 $Comp
 L CONN_7 P110
 U 1 1 4FF341FC
-P 10550 1550
-F 0 "P110" V 10520 1550 60  0000 C CNN
-F 1 "ICSP" V 10620 1550 60  0000 C CNN
-	1    10550 1550
+P 8700 3450
+F 0 "P110" V 8670 3450 60  0000 C CNN
+F 1 "ICSP" V 8770 3450 60  0000 C CNN
+	1    8700 3450
 	1    0    0    1   
 $EndComp
 $Comp
@@ -574,31 +589,31 @@ $EndComp
 $Comp
 L VCC #PWR03
 U 1 1 4FBA6C36
-P 10150 1550
-F 0 "#PWR03" H 10150 1650 30  0001 C CNN
-F 1 "VCC" V 10150 1700 30  0000 C CNN
-	1    10150 1550
+P 8300 3450
+F 0 "#PWR03" H 8300 3550 30  0001 C CNN
+F 1 "VCC" V 8300 3600 30  0000 C CNN
+	1    8300 3450
 	0    -1   -1   0   
 $EndComp
 $Comp
 L VCC #PWR04
 U 1 1 4FBA6C2E
-P 7900 1450
-F 0 "#PWR04" H 7900 1550 30  0001 C CNN
-F 1 "VCC" H 7900 1550 30  0000 C CNN
-	1    7900 1450
+P 10250 850
+F 0 "#PWR04" H 10250 950 30  0001 C CNN
+F 1 "VCC" H 10250 950 30  0000 C CNN
+	1    10250 850 
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR05
 U 1 1 4FBA6BD2
-P 10150 1450
-F 0 "#PWR05" H 10150 1410 30  0001 C CNN
-F 1 "+3.3V" V 10150 1600 30  0000 C CNN
-	1    10150 1450
+P 8300 3350
+F 0 "#PWR05" H 8300 3310 30  0001 C CNN
+F 1 "+3.3V" V 8300 3500 30  0000 C CNN
+	1    8300 3350
 	0    -1   -1   0   
 $EndComp
-Text Label 10000 1350 2    60   ~ 0
+Text Label 8150 3250 2    60   ~ 0
 MCLR
 $Comp
 L C C15
@@ -905,21 +920,21 @@ F 1 "910R" V 9550 4550 50  0000 C CNN
 	1    9550 4550
 	0    1    1    0   
 $EndComp
-Text Label 7200 2500 2    60   ~ 0
+Text Label 6900 1450 2    60   ~ 0
 MCLR
 Text Label 3300 1600 0    60   ~ 0
 PWRDWN
-Text Label 10000 1250 2    60   ~ 0
+Text Label 8150 3150 2    60   ~ 0
 PWRDWN
-Text Label 10100 3200 2    60   ~ 0
+Text Label 7000 3150 2    60   ~ 0
 PWRDWN
 $Comp
 L CONN_8 P105
 U 1 1 4F5A4C4E
-P 10550 3450
-F 0 "P105" V 10500 3450 60  0000 C CNN
-F 1 "MPU" V 10600 3450 60  0000 C CNN
-	1    10550 3450
+P 7450 3400
+F 0 "P105" V 7400 3400 60  0000 C CNN
+F 1 "MPU" V 7500 3400 60  0000 C CNN
+	1    7450 3400
 	1    0    0    -1  
 $EndComp
 Text Label 8200 4650 2    60   ~ 0
@@ -953,22 +968,22 @@ F1_OUT
 $Comp
 L GND #PWR018
 U 1 1 4F56D6E5
-P 9250 3300
-F 0 "#PWR018" H 9250 3300 30  0001 C CNN
-F 1 "GND" H 9250 3230 30  0001 C CNN
-	1    9250 3300
+P 10500 3000
+F 0 "#PWR018" H 10500 3000 30  0001 C CNN
+F 1 "GND" H 10500 2930 30  0001 C CNN
+	1    10500 3000
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R17
 U 1 1 4F56D6CE
-P 9250 3000
-F 0 "R17" V 9330 3000 50  0000 C CNN
-F 1 "470k" V 9250 3000 50  0000 C CNN
-	1    9250 3000
+P 10500 2700
+F 0 "R17" V 10580 2700 50  0000 C CNN
+F 1 "470k" V 10500 2700 50  0000 C CNN
+	1    10500 2700
 	1    0    0    -1  
 $EndComp
-Text Label 9300 2700 0    60   ~ 0
+Text Label 10550 2400 0    60   ~ 0
 FILTER_EN
 Text Label 6550 4650 2    60   ~ 0
 RB0
@@ -978,33 +993,33 @@ Text Label 6550 4450 2    60   ~ 0
 RA6
 Text Label 6550 4350 2    60   ~ 0
 CCP4
-Text Label 7550 3550 2    60   ~ 0
+Text Label 9550 3700 2    60   ~ 0
 CCP4
 $Comp
 L R R13
 U 1 1 4F56D5B4
-P 7850 3550
-F 0 "R13" V 7930 3550 50  0000 C CNN
-F 1 "R" V 7850 3550 50  0000 C CNN
-	1    7850 3550
+P 9850 3700
+F 0 "R13" V 9930 3700 50  0000 C CNN
+F 1 "R" V 9850 3700 50  0000 C CNN
+	1    9850 3700
 	0    -1   -1   0   
 $EndComp
 $Comp
 L +3.3V #PWR019
 U 1 1 4F56D5AC
-P 8150 3400
-F 0 "#PWR019" H 8150 3360 30  0001 C CNN
-F 1 "+3.3V" H 8150 3510 30  0000 C CNN
-	1    8150 3400
+P 10150 3550
+F 0 "#PWR019" H 10150 3510 30  0001 C CNN
+F 1 "+3.3V" H 10150 3660 30  0000 C CNN
+	1    10150 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR020
 U 1 1 4F56D5A4
-P 8150 3700
-F 0 "#PWR020" H 8150 3700 30  0001 C CNN
-F 1 "GND" H 8150 3630 30  0001 C CNN
-	1    8150 3700
+P 10150 3850
+F 0 "#PWR020" H 10150 3850 30  0001 C CNN
+F 1 "GND" H 10150 3780 30  0001 C CNN
+	1    10150 3850
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1028,10 +1043,10 @@ $EndComp
 $Comp
 L CONN_3 K1
 U 1 1 4F56D585
-P 8550 3550
-F 0 "K1" V 8500 3550 50  0000 C CNN
-F 1 "SPEAKER" V 8600 3550 40  0000 C CNN
-	1    8550 3550
+P 10550 3700
+F 0 "K1" V 10500 3700 50  0000 C CNN
+F 1 "SPEAKER" V 10600 3700 40  0000 C CNN
+	1    10550 3700
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1043,75 +1058,75 @@ F 1 "UNUSED" V 7050 4500 60  0000 C CNN
 	1    7000 4500
 	1    0    0    -1  
 $EndComp
-Text Label 9000 2000 0    60   ~ 0
+Text Label 10250 1700 0    60   ~ 0
 RB0
-Text Label 7200 2700 2    60   ~ 0
+Text Label 6900 1650 2    60   ~ 0
 RA7
-Text Label 7200 2600 2    60   ~ 0
+Text Label 6900 1550 2    60   ~ 0
 RA6
-Text Label 7200 2400 2    60   ~ 0
+Text Label 6900 1350 2    60   ~ 0
 CCP4
-Text Label 9000 2300 0    60   ~ 0
+Text Label 10250 2000 0    60   ~ 0
 INT
-Text Label 7200 2300 2    60   ~ 0
+Text Label 6900 1250 2    60   ~ 0
 ADC_IN
-Text Label 7200 2200 2    60   ~ 0
+Text Label 6900 1150 2    60   ~ 0
 AMP_OUT
-Text Label 7200 2100 2    60   ~ 0
+Text Label 6900 1050 2    60   ~ 0
 C2+
-Text Label 7200 2000 2    60   ~ 0
+Text Label 6900 950  2    60   ~ 0
 C1-
-Text Label 9000 2200 0    60   ~ 0
+Text Label 10250 1900 0    60   ~ 0
 SDO
-Text Label 9000 2100 0    60   ~ 0
+Text Label 10250 1800 0    60   ~ 0
 SDI
-Text Label 9000 2400 0    60   ~ 0
+Text Label 10250 2100 0    60   ~ 0
 SCK
-Text Label 9000 2500 0    60   ~ 0
+Text Label 10250 2200 0    60   ~ 0
 CS
-Text Label 9000 2600 0    60   ~ 0
+Text Label 10250 2300 0    60   ~ 0
 PGC
-Text Label 9000 2700 0    60   ~ 0
+Text Label 10250 2400 0    60   ~ 0
 PGD
-Text Label 10000 1750 2    60   ~ 0
+Text Label 8150 3650 2    60   ~ 0
 PGC
-Text Label 10000 1650 2    60   ~ 0
+Text Label 8150 3550 2    60   ~ 0
 PGD
 $Comp
 L GND #PWR023
 U 1 1 4F56CFED
-P 10150 1900
-F 0 "#PWR023" H 10150 1900 30  0001 C CNN
-F 1 "GND" H 10150 1830 30  0001 C CNN
-	1    10150 1900
+P 8300 3800
+F 0 "#PWR023" H 8300 3800 30  0001 C CNN
+F 1 "GND" H 8300 3730 30  0001 C CNN
+	1    8300 3800
 	1    0    0    -1  
 $EndComp
-Text Label 10100 3700 2    60   ~ 0
+Text Label 7000 3650 2    60   ~ 0
 SDO
-Text Label 10100 3600 2    60   ~ 0
+Text Label 7000 3550 2    60   ~ 0
 SDI
-Text Label 10100 3500 2    60   ~ 0
+Text Label 7000 3450 2    60   ~ 0
 SCK
-Text Label 10100 3400 2    60   ~ 0
+Text Label 7000 3350 2    60   ~ 0
 CS
-Text Label 10100 3300 2    60   ~ 0
+Text Label 7000 3250 2    60   ~ 0
 INT
 $Comp
 L +3.3V #PWR024
 U 1 1 4F56CF77
-P 10150 3050
-F 0 "#PWR024" H 10150 3010 30  0001 C CNN
-F 1 "+3.3V" H 10150 3160 30  0000 C CNN
-	1    10150 3050
+P 7050 3000
+F 0 "#PWR024" H 7050 2960 30  0001 C CNN
+F 1 "+3.3V" H 7050 3110 30  0000 C CNN
+	1    7050 3000
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR025
 U 1 1 4F56CF70
-P 10150 3850
-F 0 "#PWR025" H 10150 3850 30  0001 C CNN
-F 1 "GND" H 10150 3780 30  0001 C CNN
-	1    10150 3850
+P 7050 3800
+F 0 "#PWR025" H 7050 3800 30  0001 C CNN
+F 1 "GND" H 7050 3730 30  0001 C CNN
+	1    7050 3800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1399,28 +1414,28 @@ $EndComp
 $Comp
 L C C13
 U 1 1 4F56B741
-P 8100 1600
-F 0 "C13" H 8150 1700 50  0000 L CNN
-F 1 "100nF" H 8150 1500 50  0000 L CNN
-	1    8100 1600
-	0    1    1    0   
+P 10250 1150
+F 0 "C13" H 10300 1250 50  0000 L CNN
+F 1 "100nF" H 10300 1050 50  0000 L CNN
+	1    10250 1150
+	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR038
 U 1 1 4F56B73F
-P 8300 1500
-F 0 "#PWR038" H 8300 1500 30  0001 C CNN
-F 1 "GND" H 8300 1430 30  0001 C CNN
-	1    8300 1500
-	-1   0    0    1   
+P 6950 2450
+F 0 "#PWR038" H 6950 2450 30  0001 C CNN
+F 1 "GND" H 6950 2380 30  0001 C CNN
+	1    6950 2450
+	1    0    0    -1  
 $EndComp
 $Comp
 L PIC16F1847SO U3
 U 1 1 4F56B72F
-P 8100 2350
-F 0 "U3" H 8100 2400 60  0000 C CNN
-F 1 "PIC16F1847SO" H 8100 2300 60  0000 C CNN
-	1    8100 2350
+P 8550 1750
+F 0 "U3" H 8550 2750 60  0000 C CNN
+F 1 "PIC16F1847SO" H 8500 900 60  0000 C CNN
+	1    8550 1750
 	1    0    0    -1  
 $EndComp
 $Comp
diff --git a/hardware/satelite-bus/mainpower.sch b/hardware/satelite-bus/mainpower.sch
index 16b37ee..e3b6198 100644
--- a/hardware/satelite-bus/mainpower.sch
+++ b/hardware/satelite-bus/mainpower.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sam 06 Apr 2013 23:40:35 CEST
+EESchema Schematic File Version 2  date Son 07 Apr 2013 09:33:27 CEST
 LIBS:mur-sat
 LIBS:power
 LIBS:device
@@ -36,7 +36,7 @@ $Descr A4 11700 8267
 encoding utf-8
 Sheet 5 5
 Title "Main Power"
-Date "6 apr 2013"
+Date "7 apr 2013"
 Rev "5"
 Comp "mur.sat - A Space Art Project"
 Comment1 ""
diff --git a/hardware/satelite-bus/powerpath.sch b/hardware/satelite-bus/powerpath.sch
index 67d8305..9720ccd 100644
--- a/hardware/satelite-bus/powerpath.sch
+++ b/hardware/satelite-bus/powerpath.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sam 06 Apr 2013 23:40:35 CEST
+EESchema Schematic File Version 2  date Son 07 Apr 2013 09:33:27 CEST
 LIBS:mur-sat
 LIBS:power
 LIBS:device
@@ -36,7 +36,7 @@ $Descr A4 11700 8267
 encoding utf-8
 Sheet 4 5
 Title "Power Path"
-Date "6 apr 2013"
+Date "7 apr 2013"
 Rev "6"
 Comp "mur.sat - A Space Art Project"
 Comment1 ""
diff --git a/hardware/satelite-bus/satelite-bus.sch b/hardware/satelite-bus/satelite-bus.sch
index 85a9f3d..96f228f 100644
--- a/hardware/satelite-bus/satelite-bus.sch
+++ b/hardware/satelite-bus/satelite-bus.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sam 06 Apr 2013 23:40:35 CEST
+EESchema Schematic File Version 2  date Son 07 Apr 2013 09:33:27 CEST
 LIBS:mur-sat
 LIBS:power
 LIBS:device
@@ -36,7 +36,7 @@ $Descr A4 11700 8267
 encoding utf-8
 Sheet 1 5
 Title "IHU, RTC"
-Date "6 apr 2013"
+Date "7 apr 2013"
 Rev "5"
 Comp "mur.sat - A Space Art Project"
 Comment1 ""
@@ -707,11 +707,11 @@ F8 "HEAT_EN" I R 3050 6550 60
 F9 "HEAT1_DIR" I R 3050 6450 60 
 F10 "HEAT0_DIR" I R 3050 6350 60 
 F11 "HEAT_PWR" I L 2000 5650 60 
-F13 "CTR_RST" I L 2000 7200 60 
-F16 "TTX_PWR_PA" I L 2000 6050 60 
-F17 "CTR_MOSI" I L 2000 6900 60 
-F18 "CTR_MISO" I L 2000 7000 60 
-F19 "VITAL_PWR" I L 2000 5750 60 
+F12 "CTR_RST" I L 2000 7200 60 
+F13 "TTX_PWR_PA" I L 2000 6050 60 
+F14 "CTR_MOSI" I L 2000 6900 60 
+F15 "CTR_MISO" I L 2000 7000 60 
+F16 "VITAL_PWR" I L 2000 5750 60 
 $EndSheet
 Text Label 2600 3450 0    60   ~ 0
 BAT_RST
diff --git a/hardware/satelite-bus/solar-input.sch b/hardware/satelite-bus/solar-input.sch
index d5cbcd2..8b92f69 100644
--- a/hardware/satelite-bus/solar-input.sch
+++ b/hardware/satelite-bus/solar-input.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sam 06 Apr 2013 23:40:35 CEST
+EESchema Schematic File Version 2  date Son 07 Apr 2013 09:33:27 CEST
 LIBS:mur-sat
 LIBS:power
 LIBS:device
@@ -36,7 +36,7 @@ $Descr A4 11700 8267
 encoding utf-8
 Sheet 3 5
 Title "Solar Input"
-Date "6 apr 2013"
+Date "7 apr 2013"
 Rev "5"
 Comp "mur.sat - A Space Art Project"
 Comment1 ""
diff --git a/hardware/satelite-bus/ttxcrx.sch b/hardware/satelite-bus/ttxcrx.sch
index 2ab6c02..572c8f3 100644
--- a/hardware/satelite-bus/ttxcrx.sch
+++ b/hardware/satelite-bus/ttxcrx.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sam 06 Apr 2013 23:40:35 CEST
+EESchema Schematic File Version 2  date Son 07 Apr 2013 09:33:27 CEST
 LIBS:mur-sat
 LIBS:power
 LIBS:device
@@ -36,7 +36,7 @@ $Descr A4 11700 8267
 encoding utf-8
 Sheet 2 5
 Title "CTR, TTX, CRX, Heating"
-Date "6 apr 2013"
+Date "7 apr 2013"
 Rev "5"
 Comp "mur.sat - A Space Art Project"
 Comment1 ""
@@ -44,6 +44,19 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+Wire Wire Line
+	5100 3450 4950 3450
+Connection ~ 4050 3750
+Wire Wire Line
+	4050 3750 4050 3050
+Wire Wire Line
+	4050 3050 5100 3050
+Wire Wire Line
+	2250 5650 2250 5600
+Wire Wire Line
+	2250 5600 2300 5600
+Wire Wire Line
+	5550 4100 5450 4100
 Connection ~ 6700 6350
 Wire Wire Line
 	6700 6550 6700 6350
@@ -56,8 +69,6 @@ Wire Wire Line
 	4950 6350 5950 6350
 Connection ~ 2000 6350
 Wire Wire Line
-	5450 5050 4000 5050
-Wire Wire Line
 	5650 6350 5650 6550
 Wire Wire Line
 	6700 7050 6700 6950
@@ -118,68 +129,66 @@ Wire Wire Line
 Wire Wire Line
 	1450 6350 1350 6350
 Wire Wire Line
-	5450 4950 5300 4950
+	5100 3350 4950 3350
 Wire Wire Line
-	1800 1200 1650 1200
-Connection ~ 1800 3700
+	3000 3050 2850 3050
 Wire Wire Line
-	1800 3700 1800 3850
+	1650 3750 1650 3900
 Wire Wire Line
-	1450 3600 1300 3600
-Connection ~ 3000 4100
+	1300 3650 1150 3650
 Wire Wire Line
-	1400 3900 1300 3900
+	1250 3950 1150 3950
 Wire Wire Line
-	1400 3500 1300 3500
+	1250 3550 1150 3550
 Wire Wire Line
-	1600 5000 1600 4950
+	1500 4700 1500 4650
 Wire Wire Line
-	1600 4950 2400 4950
+	1500 4650 2300 4650
 Wire Wire Line
 	7600 3050 7650 3050
 Wire Wire Line
 	7650 3050 7650 2950
 Wire Wire Line
-	3650 2400 4300 2400
+	3300 2150 3950 2150
 Wire Wire Line
-	3750 1200 3650 1200
+	2350 1200 2250 1200
 Wire Wire Line
-	5450 1500 5400 1500
-Connection ~ 4250 1800
+	5100 1250 5050 1250
+Connection ~ 3900 1550
 Wire Wire Line
-	4300 2050 4250 2050
+	3950 1800 3900 1800
 Wire Wire Line
-	4250 2050 4250 1500
+	3900 1800 3900 1250
 Wire Wire Line
-	4000 1900 4300 1900
+	3650 1650 3950 1650
 Wire Wire Line
-	3700 2650 3700 2600
+	3350 2400 3350 2350
 Wire Wire Line
-	3700 2600 3650 2600
+	3350 2350 3300 2350
 Wire Wire Line
-	4900 1550 4900 1500
+	4550 1300 4550 1250
 Wire Wire Line
-	5550 2150 5700 2150
+	5200 1900 5350 1900
 Wire Wire Line
-	5550 2050 5800 2050
+	5200 1800 5450 1800
 Wire Wire Line
-	5550 1800 5700 1800
+	5200 1550 5350 1550
 Wire Wire Line
-	5700 1800 5700 1700
+	5350 1550 5350 1450
 Wire Wire Line
-	5700 1700 5800 1700
+	5350 1450 5450 1450
 Wire Wire Line
-	4950 2650 4950 2700
+	4600 2400 4600 2450
 Wire Wire Line
-	1800 1300 1650 1300
+	3000 3150 2850 3150
 Wire Wire Line
-	1800 1400 1650 1400
+	3000 3250 2850 3250
 Wire Wire Line
-	4100 5150 4000 5150
+	5550 5600 5450 5600
 Wire Wire Line
-	1750 2200 1650 2200
+	1350 2300 1250 2300
 Wire Wire Line
-	1750 1550 1750 1500
+	2950 3400 2950 3350
 Connection ~ 8050 1500
 Wire Wire Line
 	7900 1500 8600 1500
@@ -209,29 +218,29 @@ Connection ~ 9000 5400
 Connection ~ 8400 5400
 Connection ~ 8250 5400
 Wire Wire Line
-	5400 5200 5400 5150
+	5050 3600 5050 3550
 Wire Wire Line
-	1750 2700 1650 2700
+	1350 2800 1250 2800
 Wire Wire Line
-	1750 2500 1650 2500
+	1350 2600 1250 2600
 Wire Wire Line
-	1750 2300 1650 2300
+	1350 2400 1250 2400
 Wire Wire Line
-	1650 2000 1750 2000
+	1250 2100 1350 2100
 Wire Wire Line
-	1750 2000 1750 1950
+	1350 2100 1350 2050
 Wire Wire Line
-	2300 5050 2400 5050
+	2200 4750 2300 4750
 Wire Wire Line
-	2300 4850 2400 4850
+	2200 4550 2300 4550
 Wire Wire Line
-	2400 4450 2300 4450
+	2300 4150 2200 4150
 Wire Wire Line
-	4100 4950 4000 4950
+	5550 5400 5450 5400
 Wire Wire Line
-	4100 4750 4000 4750
+	5550 5200 5450 5200
 Wire Wire Line
-	4100 4550 4000 4550
+	5550 5000 5450 5000
 Wire Wire Line
 	7050 3450 7050 3500
 Wire Wire Line
@@ -346,9 +355,6 @@ Wire Wire Line
 Wire Wire Line
 	9200 2850 9200 2700
 Wire Wire Line
-	3400 4050 3400 4150
-Connection ~ 3400 4100
-Wire Wire Line
 	10100 3150 10100 3050
 Wire Wire Line
 	7550 3700 7500 3700
@@ -357,23 +363,23 @@ Wire Wire Line
 Wire Wire Line
 	7100 3700 7000 3700
 Wire Wire Line
-	4100 4450 4000 4450
+	5550 4900 5450 4900
 Wire Wire Line
-	4100 4850 4000 4850
+	5550 5300 5450 5300
 Wire Wire Line
-	2400 4550 2300 4550
+	2300 4250 2200 4250
 Wire Wire Line
-	2400 5150 2300 5150
+	2300 4850 2200 4850
 Wire Wire Line
-	1650 2400 1750 2400
+	1250 2500 1350 2500
 Wire Wire Line
-	1650 2600 1750 2600
+	1250 2700 1350 2700
 Wire Wire Line
-	1650 2900 1750 2900
+	1250 3000 1350 3000
 Wire Wire Line
-	1750 2900 1750 2950
+	1350 3000 1350 3050
 Wire Wire Line
-	5400 5150 5450 5150
+	5050 3550 5100 3550
 Connection ~ 8100 5400
 Connection ~ 9400 5400
 Wire Wire Line
@@ -414,46 +420,46 @@ Connection ~ 7350 2600
 Wire Wire Line
 	8600 1500 8600 2850
 Wire Wire Line
-	5300 4850 5450 4850
+	4950 3250 5100 3250
 Wire Wire Line
 	8500 2600 7900 2600
 Connection ~ 8050 2600
 Wire Wire Line
-	1750 1500 1650 1500
+	2950 3350 2850 3350
 Wire Wire Line
 	9550 5400 9550 6050
 Connection ~ 9550 6050
 Connection ~ 9550 5400
 Wire Wire Line
-	1800 2100 1650 2100
+	1400 2200 1250 2200
 Wire Wire Line
-	5100 2650 5100 2700
+	4750 2400 4750 2450
 Wire Wire Line
-	5550 1900 5800 1900
+	5200 1650 5450 1650
 Wire Wire Line
-	5700 2150 5700 2250
+	5350 1900 5350 2000
 Wire Wire Line
-	5700 2250 5800 2250
+	5350 2000 5450 2000
 Wire Wire Line
-	4300 2300 4000 2300
+	3950 2050 3650 2050
 Wire Wire Line
-	4300 2150 4000 2150
+	3950 1900 3650 1900
 Wire Wire Line
-	4300 1800 4250 1800
-Connection ~ 4900 1500
+	3950 1550 3900 1550
+Connection ~ 4550 1250
 Wire Wire Line
-	3650 1300 3700 1300
+	2250 1300 2300 1300
 Wire Wire Line
-	3700 1300 3700 1350
+	2300 1300 2300 1350
 Wire Wire Line
-	4250 1500 5000 1500
+	3900 1250 4650 1250
 Wire Wire Line
-	3750 1100 3650 1100
+	2350 1100 2250 1100
 Wire Wire Line
-	3750 2500 3700 2500
+	3400 2250 3350 2250
 Wire Wire Line
-	3700 2500 3700 2400
-Connection ~ 3700 2400
+	3350 2250 3350 2150
+Connection ~ 3350 2150
 Wire Wire Line
 	8100 2850 8100 2800
 Wire Wire Line
@@ -463,39 +469,26 @@ Wire Wire Line
 Wire Wire Line
 	7750 3150 7600 3150
 Wire Wire Line
-	1750 2800 1650 2800
+	1350 2900 1250 2900
 Wire Wire Line
-	1600 5450 1600 5400
+	1500 5150 1500 5100
 Wire Wire Line
-	1250 5800 1250 5750
+	1150 5500 1150 5450
 Wire Wire Line
-	1250 5250 1250 5200
-Connection ~ 1250 5200
+	1150 4950 1150 4900
+Connection ~ 1150 4900
 Wire Wire Line
-	1300 3800 1400 3800
+	1150 3850 1250 3850
 Wire Wire Line
-	1300 4000 1400 4000
+	1150 4050 1250 4050
 Wire Wire Line
-	1400 4000 1400 4050
+	1250 4050 1250 4100
 Wire Wire Line
-	1300 5200 1150 5200
+	1200 4900 1050 4900
 Wire Wire Line
-	3750 1000 3650 1000
+	2350 1000 2250 1000
 Wire Wire Line
-	3000 3700 3000 4150
-Wire Wire Line
-	5300 4750 5450 4750
-Wire Wire Line
-	2400 4750 1800 4750
-Wire Wire Line
-	1800 4750 1800 4350
-Wire Wire Line
-	1300 3700 5400 3700
-Connection ~ 3000 3700
-Wire Wire Line
-	5450 4650 5400 4650
-Wire Wire Line
-	5400 4650 5400 3700
+	4950 3150 5100 3150
 Wire Wire Line
 	2250 6350 2250 6500
 Wire Wire Line
@@ -507,15 +500,40 @@ Wire Wire Line
 	7000 5400 7000 6350
 Wire Wire Line
 	7000 6350 6650 6350
-NoConn ~ 2400 4650
-NoConn ~ 4000 4650
+Wire Wire Line
+	5550 4600 5550 4550
+Wire Wire Line
+	2300 4450 1650 4450
+Wire Wire Line
+	1650 4450 1650 4400
+Wire Wire Line
+	5550 4150 5550 3750
+Wire Wire Line
+	5550 3750 1150 3750
+Connection ~ 1650 3750
+Connection ~ 5550 4100
+Wire Wire Line
+	5550 5500 5450 5500
+Text Label 4950 3450 2    60   ~ 0
+CW
+$Comp
+L GND #PWR?
+U 1 1 516120B1
+P 5550 4600
+F 0 "#PWR?" H 5550 4600 30  0001 C CNN
+F 1 "GND" H 5550 4530 30  0001 C CNN
+	1    5550 4600
+	1    0    0    -1  
+$EndComp
+NoConn ~ 2300 4350
+NoConn ~ 5450 5100
 $Comp
 L CONN_10 P?
 U 1 1 51609303
-P 1300 2450
-F 0 "P?" V 1250 2450 60  0000 C CNN
-F 1 "CTR" V 1350 2450 60  0000 C CNN
-	1    1300 2450
+P 900 2550
+F 0 "P?" V 850 2550 60  0000 C CNN
+F 1 "CTR" V 950 2550 60  0000 C CNN
+	1    900  2550
 	-1   0    0    -1  
 $EndComp
 Text HLabel 1350 6350 0    60   Input ~ 0
@@ -711,46 +729,46 @@ F 1 "47nF" V 6750 6600 50  0000 L CNN
 	1    6700 6750
 	1    0    0    -1  
 $EndComp
-Text Label 5300 4950 2    60   ~ 0
+Text Label 4950 3350 2    60   ~ 0
 TTX_PWR
 $Comp
 L CONN_6 P?
 U 1 1 50A7BD82
-P 5800 4900
-F 0 "P?" V 5750 4900 60  0000 C CNN
-F 1 "TTX" V 5850 4900 60  0000 C CNN
-	1    5800 4900
+P 5450 3300
+F 0 "P?" V 5400 3300 60  0000 C CNN
+F 1 "TTX" V 5500 3300 60  0000 C CNN
+	1    5450 3300
 	1    0    0    -1  
 $EndComp
-Text HLabel 1800 1200 2    60   Input ~ 0
+Text HLabel 3000 3050 2    60   Input ~ 0
 TTX_PWR_PA
 $Comp
 L CONN_4 P?
 U 1 1 50A7BD34
-P 1300 1350
-F 0 "P?" V 1250 1350 50  0000 C CNN
-F 1 "TTX_PWR" V 1350 1350 50  0000 C CNN
-	1    1300 1350
+P 2500 3200
+F 0 "P?" V 2450 3200 50  0000 C CNN
+F 1 "TTX_PWR" V 2550 3200 50  0000 C CNN
+	1    2500 3200
 	-1   0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 502E332F
-P 1800 4100
-F 0 "R?" V 1880 4100 50  0000 C CNN
-F 1 "4k7" V 1800 4100 50  0000 C CNN
-	1    1800 4100
+P 1650 4150
+F 0 "R?" V 1730 4150 50  0000 C CNN
+F 1 "4k7" V 1650 4150 50  0000 C CNN
+	1    1650 4150
 	1    0    0    -1  
 $EndComp
-Text Label 2300 4750 2    60   ~ 0
+Text Label 2200 4450 2    60   ~ 0
 PA_TEMP
 $Comp
 L CONN_6 P77
 U 1 1 4FF23550
-P 950 3750
-F 0 "P77" V 900 3750 60  0000 C CNN
-F 1 "CTR_ICSP" V 1000 3750 60  0000 C CNN
-	1    950  3750
+P 800 3800
+F 0 "P77" V 750 3800 60  0000 C CNN
+F 1 "CTR_ICSP" V 850 3800 60  0000 C CNN
+	1    800  3800
 	-1   0    0    1   
 $EndComp
 Text Label 9700 5400 0    60   ~ 0
@@ -758,50 +776,50 @@ CRX_PWR
 $Comp
 L CONN_4 P35
 U 1 1 4FBA5578
-P 3300 1150
-F 0 "P35" V 3250 1150 50  0000 C CNN
-F 1 "CONN_4" V 3350 1150 50  0000 C CNN
-	1    3300 1150
+P 1900 1150
+F 0 "P35" V 1850 1150 50  0000 C CNN
+F 1 "CONN_4" V 1950 1150 50  0000 C CNN
+	1    1900 1150
 	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR163
 U 1 1 4FB992B4
-P 1250 5800
-F 0 "#PWR163" H 1250 5800 30  0001 C CNN
-F 1 "GND" H 1250 5730 30  0001 C CNN
-	1    1250 5800
+P 1150 5500
+F 0 "#PWR163" H 1150 5500 30  0001 C CNN
+F 1 "GND" H 1150 5430 30  0001 C CNN
+	1    1150 5500
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R26
 U 1 1 4FB9928F
-P 1250 5500
-F 0 "R26" V 1330 5500 50  0000 C CNN
-F 1 "20k" V 1250 5500 50  0000 C CNN
-	1    1250 5500
+P 1150 5200
+F 0 "R26" V 1230 5200 50  0000 C CNN
+F 1 "20k" V 1150 5200 50  0000 C CNN
+	1    1150 5200
 	1    0    0    -1  
 $EndComp
-Text Label 1150 5200 2    60   ~ 0
+Text Label 1050 4900 2    60   ~ 0
 CTR_RST
 $Comp
 L GND #PWR164
 U 1 1 4FB99241
-P 1600 5450
-F 0 "#PWR164" H 1600 5450 30  0001 C CNN
-F 1 "GND" H 1600 5380 30  0001 C CNN
-	1    1600 5450
+P 1500 5150
+F 0 "#PWR164" H 1500 5150 30  0001 C CNN
+F 1 "GND" H 1500 5080 30  0001 C CNN
+	1    1500 5150
 	1    0    0    -1  
 $EndComp
-Text HLabel 1750 2800 2    60   Input ~ 0
+Text HLabel 1350 2900 2    60   Input ~ 0
 CTR_RST
 $Comp
 L PMGD370XN Q4
 U 1 1 4FB991B0
-P 1500 5200
-F 0 "Q4" H 1500 5400 60  0000 R CNN
-F 1 "PMGD370XN" V 1750 5100 60  0000 R CNN
-	1    1500 5200
+P 1400 4900
+F 0 "Q4" H 1400 5100 60  0000 R CNN
+F 1 "PMGD370XN" V 1650 4800 60  0000 R CNN
+	1    1400 4900
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -813,138 +831,138 @@ F 1 "CRX_PDN" V 7300 3150 40  0000 C CNN
 	1    7250 3150
 	-1   0    0    -1  
 $EndComp
-Text Notes 5650 4500 0    150  ~ 30
+Text Notes 5300 2900 0    150  ~ 30
 TTX
-Text Label 4000 2150 2    60   ~ 0
+Text Label 3650 1900 2    60   ~ 0
 HEAT1_DIR
-Text Label 4000 1900 2    60   ~ 0
+Text Label 3650 1650 2    60   ~ 0
 HEAT0_DIR
-Text Label 4000 2300 2    60   ~ 0
+Text Label 3650 2050 2    60   ~ 0
 HEAT_EN
-Text HLabel 3750 1000 2    60   Input ~ 0
+Text HLabel 2350 1000 2    60   Input ~ 0
 HEAT_EN
-Text HLabel 3750 1200 2    60   Input ~ 0
+Text HLabel 2350 1200 2    60   Input ~ 0
 HEAT1_DIR
-Text HLabel 3750 1100 2    60   Input ~ 0
+Text HLabel 2350 1100 2    60   Input ~ 0
 HEAT0_DIR
-Text HLabel 3750 2500 2    60   Input ~ 0
+Text HLabel 3400 2250 2    60   Input ~ 0
 HEAT_PWR
-Text Notes 4650 1150 0    150  ~ 30
+Text Notes 4300 900  0    150  ~ 30
 HEATING
 $Comp
 L GND #PWR177
 U 1 1 4F87604F
-P 5450 1500
-F 0 "#PWR177" H 5450 1500 30  0001 C CNN
-F 1 "GND" H 5450 1430 30  0001 C CNN
-	1    5450 1500
+P 5100 1250
+F 0 "#PWR177" H 5100 1250 30  0001 C CNN
+F 1 "GND" H 5100 1180 30  0001 C CNN
+	1    5100 1250
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C57
 U 1 1 4F876032
-P 5200 1500
-F 0 "C57" H 5050 1600 50  0000 L CNN
-F 1 "C" H 5100 1400 50  0000 L CNN
-	1    5200 1500
+P 4850 1250
+F 0 "C57" H 4700 1350 50  0000 L CNN
+F 1 "C" H 4750 1150 50  0000 L CNN
+	1    4850 1250
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR169
 U 1 1 4F876024
-P 3700 1350
-F 0 "#PWR169" H 3700 1350 30  0001 C CNN
-F 1 "GND" H 3700 1280 30  0001 C CNN
-	1    3700 1350
+P 2300 1350
+F 0 "#PWR169" H 2300 1350 30  0001 C CNN
+F 1 "GND" H 2300 1280 30  0001 C CNN
+	1    2300 1350
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR170
 U 1 1 4F875F3D
-P 3700 2650
-F 0 "#PWR170" H 3700 2650 30  0001 C CNN
-F 1 "GND" H 3700 2580 30  0001 C CNN
-	1    3700 2650
+P 3350 2400
+F 0 "#PWR170" H 3350 2400 30  0001 C CNN
+F 1 "GND" H 3350 2330 30  0001 C CNN
+	1    3350 2400
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P37
 U 1 1 4F875F2F
-P 3300 2500
-F 0 "P37" V 3250 2500 40  0000 C CNN
-F 1 "HEAT_PWR" V 3350 2500 40  0000 C CNN
-	1    3300 2500
+P 2950 2250
+F 0 "P37" V 2900 2250 40  0000 C CNN
+F 1 "HEAT_PWR" V 3000 2250 40  0000 C CNN
+	1    2950 2250
 	-1   0    0    -1  
 $EndComp
-Text Label 4350 1500 0    60   ~ 0
+Text Label 4000 1250 0    60   ~ 0
 HEAT_PWR
 $Comp
 L CONN_2 P39
 U 1 1 4F875E37
-P 6150 1800
-F 0 "P39" V 6100 1800 40  0000 C CNN
-F 1 "HEAT_0" V 6200 1800 40  0000 C CNN
-	1    6150 1800
+P 5800 1550
+F 0 "P39" V 5750 1550 40  0000 C CNN
+F 1 "HEAT_0" V 5850 1550 40  0000 C CNN
+	1    5800 1550
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P40
 U 1 1 4F875E35
-P 6150 2150
-F 0 "P40" V 6100 2150 40  0000 C CNN
-F 1 "HEAT_1" V 6200 2150 40  0000 C CNN
-	1    6150 2150
+P 5800 1900
+F 0 "P40" V 5750 1900 40  0000 C CNN
+F 1 "HEAT_1" V 5850 1900 40  0000 C CNN
+	1    5800 1900
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR175
 U 1 1 4F8759BD
-P 5100 2700
-F 0 "#PWR175" H 5100 2700 30  0001 C CNN
-F 1 "GND" H 5100 2630 30  0001 C CNN
-	1    5100 2700
+P 4750 2450
+F 0 "#PWR175" H 4750 2450 30  0001 C CNN
+F 1 "GND" H 4750 2380 30  0001 C CNN
+	1    4750 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR174
 U 1 1 4F8759B6
-P 4950 2700
-F 0 "#PWR174" H 4950 2700 30  0001 C CNN
-F 1 "GND" H 4950 2630 30  0001 C CNN
-	1    4950 2700
+P 4600 2450
+F 0 "#PWR174" H 4600 2450 30  0001 C CNN
+F 1 "GND" H 4600 2380 30  0001 C CNN
+	1    4600 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L DRV8836 U22
 U 1 1 4F8759AE
-P 4900 2000
-F 0 "U22" H 4900 2000 60  0000 C CNN
-F 1 "DRV8836" H 4900 1900 60  0000 C CNN
-	1    4900 2000
+P 4550 1750
+F 0 "U22" H 4550 1750 60  0000 C CNN
+F 1 "DRV8836" H 4550 1650 60  0000 C CNN
+	1    4550 1750
 	1    0    0    -1  
 $EndComp
-Text Label 1800 2100 0    60   ~ 0
+Text Label 1400 2200 0    60   ~ 0
 TTX_EN
 $Comp
 L GND #PWR171
 U 1 1 4F5B7435
-P 1750 1550
-F 0 "#PWR171" H 1750 1550 30  0001 C CNN
-F 1 "GND" H 1750 1480 30  0001 C CNN
-	1    1750 1550
+P 2950 3400
+F 0 "#PWR171" H 2950 3400 30  0001 C CNN
+F 1 "GND" H 2950 3330 30  0001 C CNN
+	1    2950 3400
 	1    0    0    -1  
 $EndComp
-Text Label 5300 4850 2    60   ~ 0
+Text Label 4950 3250 2    60   ~ 0
 TTX_PWR_PA
-Text HLabel 1800 1400 2    60   Input ~ 0
+Text HLabel 3000 3250 2    60   Input ~ 0
 TTX_EN
 Text Label 7650 2950 2    60   ~ 0
 CRX_PWR
-Text Label 4100 5150 0    60   ~ 0
+Text Label 5550 5600 0    60   ~ 0
 TTX_EN
 Text Notes 8500 4350 0    150  ~ 30
 CRX
-Text Notes 3000 4900 0    150  ~ 30
+Text Notes 2650 5350 0    150  ~ 30
 CTR
 $Comp
 L PMGD370XN Q4
@@ -1038,36 +1056,36 @@ F 1 "100" V 9350 2300 50  0000 C CNN
 	1    9350 2300
 	0    -1   -1   0   
 $EndComp
-Text HLabel 1800 1300 2    60   Input ~ 0
+Text HLabel 3000 3150 2    60   Input ~ 0
 TTX_PWR
-Text Label 1400 3900 0    60   ~ 0
+Text Label 1250 3950 0    60   ~ 0
 CW
-Text Label 1400 3800 0    60   ~ 0
+Text Label 1250 3850 0    60   ~ 0
 TTX_EN
-Text Label 1400 3500 0    60   ~ 0
+Text Label 1250 3550 0    60   ~ 0
 CTR_MCLR
-Text Label 2300 4950 2    60   ~ 0
+Text Label 2200 4650 2    60   ~ 0
 CTR_MCLR
 $Comp
 L GND #PWR165
 U 1 1 4F4DA414
-P 1400 4050
-F 0 "#PWR165" H 1400 4050 30  0001 C CNN
-F 1 "GND" H 1400 3980 30  0001 C CNN
-	1    1400 4050
+P 1250 4100
+F 0 "#PWR165" H 1250 4100 30  0001 C CNN
+F 1 "GND" H 1250 4030 30  0001 C CNN
+	1    1250 4100
 	1    0    0    -1  
 $EndComp
-Text HLabel 1750 2700 2    60   Input ~ 0
+Text HLabel 1350 2800 2    60   Input ~ 0
 CTR_INT
-Text HLabel 1750 2500 2    60   Input ~ 0
+Text HLabel 1350 2600 2    60   Input ~ 0
 CTR_MOSI
-Text HLabel 1750 2600 2    60   Input ~ 0
+Text HLabel 1350 2700 2    60   Input ~ 0
 CTR_MISO
-Text HLabel 1750 2400 2    60   Input ~ 0
+Text HLabel 1350 2500 2    60   Input ~ 0
 CTR_SCK
-Text HLabel 1750 2300 2    60   Input ~ 0
+Text HLabel 1350 2400 2    60   Input ~ 0
 CTR_SS
-Text HLabel 1750 2200 2    60   Input ~ 0
+Text HLabel 1350 2300 2    60   Input ~ 0
 1HZ
 $Comp
 L GND #PWR204
@@ -1081,10 +1099,10 @@ $EndComp
 $Comp
 L GND #PWR181
 U 1 1 4F4D997A
-P 5400 5200
-F 0 "#PWR181" H 5400 5200 30  0001 C CNN
-F 1 "GND" H 5400 5130 30  0001 C CNN
-	1    5400 5200
+P 5050 3600
+F 0 "#PWR181" H 5050 3600 30  0001 C CNN
+F 1 "GND" H 5050 3530 30  0001 C CNN
+	1    5050 3600
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1099,44 +1117,44 @@ $EndComp
 $Comp
 L GND #PWR168
 U 1 1 4F4D951D
-P 1750 2950
-F 0 "#PWR168" H 1750 2950 30  0001 C CNN
-F 1 "GND" H 1750 2880 30  0001 C CNN
-	1    1750 2950
+P 1350 3050
+F 0 "#PWR168" H 1350 3050 30  0001 C CNN
+F 1 "GND" H 1350 2980 30  0001 C CNN
+	1    1350 3050
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR167
 U 1 1 4F4D951A
-P 1750 1950
-F 0 "#PWR167" H 1750 2050 30  0001 C CNN
-F 1 "VCC" H 1750 2050 30  0000 C CNN
-	1    1750 1950
+P 1350 2050
+F 0 "#PWR167" H 1350 2150 30  0001 C CNN
+F 1 "VCC" H 1350 2150 30  0000 C CNN
+	1    1350 2050
 	1    0    0    -1  
 $EndComp
-Text Label 5300 4750 2    60   ~ 0
+Text Label 4950 3150 2    60   ~ 0
 PA_TEMP
-Text Label 4100 5050 0    60   ~ 0
+Text Label 5550 5500 0    60   ~ 0
 CW
-Text Label 4100 4850 0    60   ~ 0
+Text Label 5550 5300 0    60   ~ 0
 CTR_SCK
-Text Label 4100 4750 0    60   ~ 0
+Text Label 5550 5200 0    60   ~ 0
 CRX_INT
-Text Label 4100 4550 0    60   ~ 0
+Text Label 5550 5000 0    60   ~ 0
 CTR_MOSI
-Text Label 4100 4450 0    60   ~ 0
+Text Label 5550 4900 0    60   ~ 0
 1HZ
-Text Label 2300 5150 2    60   ~ 0
+Text Label 2200 4850 2    60   ~ 0
 CTR_INT
-Text Label 2300 5050 2    60   ~ 0
+Text Label 2200 4750 2    60   ~ 0
 CTR_MISO
-Text Label 4100 4950 0    60   ~ 0
+Text Label 5550 5400 0    60   ~ 0
 CTR_SS
-Text Label 2300 4850 2    60   ~ 0
+Text Label 2200 4550 2    60   ~ 0
 CRX_EN
-Text Label 2300 4550 2    60   ~ 0
+Text Label 2200 4250 2    60   ~ 0
 CRX_SDA
-Text Label 2300 4450 2    60   ~ 0
+Text Label 2200 4150 2    60   ~ 0
 CRX_SCL
 $Comp
 L GND #PWR183
@@ -1213,29 +1231,29 @@ $EndComp
 $Comp
 L C C56
 U 1 1 4F4D8FA6
-P 3200 4100
-F 0 "C56" H 3250 4200 50  0000 L CNN
-F 1 "100nF" V 3000 4100 50  0000 L CNN
-	1    3200 4100
-	0    1    1    0   
+P 5550 4350
+F 0 "C56" H 5600 4450 50  0000 L CNN
+F 1 "100nF" V 5350 4350 50  0000 L CNN
+	1    5550 4350
+	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR166
 U 1 1 4F4D8F9C
-P 1450 3600
-F 0 "#PWR166" H 1450 3700 30  0001 C CNN
-F 1 "VCC" H 1450 3700 30  0000 C CNN
-	1    1450 3600
+P 1300 3650
+F 0 "#PWR166" H 1300 3750 30  0001 C CNN
+F 1 "VCC" H 1300 3750 30  0000 C CNN
+	1    1300 3650
 	0    1    -1   0   
 $EndComp
 $Comp
 L GND #PWR173
 U 1 1 4F4D8F79
-P 3400 4050
-F 0 "#PWR173" H 3400 4050 30  0001 C CNN
-F 1 "GND" H 3400 3980 30  0001 C CNN
-	1    3400 4050
-	-1   0    0    1   
+P 2250 5650
+F 0 "#PWR173" H 2250 5650 30  0001 C CNN
+F 1 "GND" H 2250 5580 30  0001 C CNN
+	1    2250 5650
+	1    0    0    -1  
 $EndComp
 Text Label 10000 2050 0    60   ~ 0
 CRX_INT
@@ -1675,10 +1693,10 @@ $EndComp
 $Comp
 L PIC16F1847SO U21
 U 1 1 4F4AC6E1
-P 3200 4800
-F 0 "U21" H 3200 4550 60  0000 C CNN
-F 1 "PIC16F1847SO" H 3450 4300 60  0000 C CNN
-	1    3200 4800
+P 3850 4950
+F 0 "U21" H 3850 5950 60  0000 C CNN
+F 1 "PIC16F1847SO" H 3850 4150 60  0000 C CNN
+	1    3850 4950
 	1    0    0    -1  
 $EndComp
 $EndSCHEMATC