added new icsp header to idm

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

1 files changed, 390 insertions, 422 deletions

diff --git a/hardware/idm/idm.sch b/hardware/idm/idm.sch
index 4eebf39..e64552c 100644
--- a/hardware/idm/idm.sch
+++ b/hardware/idm/idm.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mit 30 Mai 2012 21:28:14 CEST
+EESchema Schematic File Version 2  date Die 03 Jul 2012 21:22:38 CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -36,7 +36,7 @@ EELAYER END
 $Descr A4 11700 8267
 Sheet 1 1
 Title "IDM"
-Date "23 may 2012"
+Date "3 jul 2012"
 Rev "2"
 Comp "mur.sat - A Space Art Project"
 Comment1 ""
@@ -45,18 +45,22 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	2200 5200 2300 5200
+	10200 1250 10000 1250
 Wire Wire Line
-	2300 5600 2300 5400
+	10200 1450 10150 1450
+Wire Wire Line
+	2400 5300 9350 5300
+Connection ~ 1550 5600
+Wire Wire Line
+	1550 5700 1550 5500
+Wire Wire Line
+	2400 5200 2500 5200
 Wire Wire Line
 	7250 6100 7250 6150
 Wire Wire Line
 	7250 6150 7350 6150
 Wire Wire Line
-	2300 5600 1100 5600
-Connection ~ 1450 5600
-Wire Wire Line
-	2300 5400 2200 5400
+	2400 5400 2500 5400
 Connection ~ 5550 5300
 Connection ~ 1800 1800
 Wire Wire Line
@@ -77,27 +81,25 @@ Wire Wire Line
 	1200 1800 1200 1950
 Wire Wire Line
 	2200 1800 2550 1800
-Connection ~ 5750 4150
+Connection ~ 5250 4350
 Wire Wire Line
-	5750 4350 5800 4350
+	5250 4550 5300 4550
 Wire Wire Line
-	6200 4150 6250 4150
+	5700 4350 5750 4350
 Wire Wire Line
-	6250 4150 6250 4250
+	5750 4350 5750 4450
 Wire Wire Line
-	6250 4250 6300 4250
+	5750 4450 5800 4450
 Wire Wire Line
-	6200 4550 6250 4550
+	5700 4750 5750 4750
 Wire Wire Line
-	6250 4550 6250 4450
+	5750 4750 5750 4650
 Wire Wire Line
-	6250 4450 6300 4450
+	5750 4650 5800 4650
 Wire Wire Line
-	6800 4350 7150 4350
+	6300 4550 6650 4550
 Wire Wire Line
-	7800 1700 7800 1250
-Wire Wire Line
-	9400 1250 9400 1450
+	7900 1700 7900 1450
 Wire Wire Line
 	3350 1150 3400 1150
 Wire Wire Line
@@ -117,21 +119,19 @@ Connection ~ 2500 2500
 Wire Wire Line
 	5550 5300 5550 5750
 Wire Wire Line
-	1450 5700 1450 5500
-Wire Wire Line
 	3300 4200 3300 4350
 Wire Wire Line
 	3050 4200 3050 4250
 Wire Wire Line
-	1100 6150 1100 6250
+	1200 6150 1200 6250
 Wire Wire Line
-	4800 2350 4900 2350
+	4600 2350 4700 2350
 Wire Wire Line
-	4900 2350 4900 2300
+	4700 2350 4700 2300
 Wire Wire Line
-	5350 3050 5350 3100
+	5150 3050 5150 3100
 Wire Wire Line
-	5350 2550 5350 2150
+	5150 2550 5150 2150
 Wire Wire Line
 	3450 6100 3450 6150
 Wire Wire Line
@@ -140,7 +140,7 @@ Connection ~ 6800 6150
 Wire Wire Line
 	9450 5750 9350 5750
 Wire Wire Line
-	1450 4950 1450 5000
+	1550 4950 1550 5000
 Connection ~ 10600 6650
 Wire Wire Line
 	9350 6650 10700 6650
@@ -154,84 +154,82 @@ Wire Wire Line
 	5050 6150 4650 6150
 Connection ~ 4700 6150
 Wire Wire Line
-	10100 4850 10100 4800
-Wire Wire Line
-	10100 4400 10100 4300
+	9950 5100 9950 5050
 Wire Wire Line
-	9250 4400 9300 4400
+	9950 4650 9950 4550
 Wire Wire Line
-	9300 4400 9300 4200
+	9100 4650 9150 4650
 Wire Wire Line
-	9300 4200 9250 4200
+	9150 4650 9150 4450
 Wire Wire Line
-	7200 2500 7100 2500
+	9150 4450 9100 4450
 Wire Wire Line
-	9500 1250 9500 1300
+	7300 2500 7200 2500
 Wire Wire Line
-	9500 1300 10200 1300
+	10000 1350 10200 1350
 Wire Wire Line
-	5950 3300 5950 3250
-Connection ~ 5700 2800
+	5750 3300 5750 3250
+Connection ~ 5500 2800
 Wire Wire Line
-	5700 2850 5700 2800
+	5500 2850 5500 2800
 Wire Wire Line
-	10150 2700 10250 2700
+	10100 3200 10200 3200
 Wire Wire Line
-	8450 4400 8350 4400
+	8300 4650 8200 4650
 Wire Wire Line
-	8450 4200 8350 4200
-Connection ~ 9150 2700
+	8300 4450 8200 4450
+Connection ~ 9250 2700
 Wire Wire Line
-	9150 2750 9150 2700
+	9250 2750 9250 2700
 Wire Wire Line
-	7450 3450 7400 3450
+	7600 3550 7550 3550
 Wire Wire Line
-	8000 3300 8000 3350
+	8150 3400 8150 3450
 Wire Wire Line
-	8000 3350 8050 3350
+	8150 3450 8200 3450
 Wire Wire Line
-	7100 4600 7100 4550
+	6600 4800 6600 4750
 Wire Wire Line
-	7100 4550 7150 4550
+	6600 4750 6650 4750
 Wire Wire Line
-	7050 4150 7150 4150
+	6550 4350 6650 4350
 Wire Wire Line
-	7100 2600 7200 2600
+	7200 2600 7300 2600
 Wire Wire Line
-	8800 2000 8900 2000
+	8900 2000 9000 2000
 Wire Wire Line
-	8900 2300 8800 2300
+	9000 2300 8900 2300
 Wire Wire Line
-	7200 2200 7100 2200
+	7300 2200 7200 2200
 Wire Wire Line
-	7200 2000 7100 2000
+	7300 2000 7200 2000
 Wire Wire Line
-	8900 2100 8800 2100
+	9000 2100 8900 2100
 Wire Wire Line
-	8900 2400 8800 2400
+	9000 2400 8900 2400
 Wire Wire Line
-	8900 2600 8800 2600
+	9000 2600 8900 2600
 Wire Wire Line
-	10000 1500 10200 1500
+	10000 1650 10200 1650
 Wire Wire Line
-	10200 1400 10150 1400
+	10200 1550 10150 1550
 Wire Wire Line
-	10150 3100 10250 3100
+	10100 3600 10200 3600
 Wire Wire Line
-	10150 2900 10250 2900
+	10100 3400 10200 3400
 Wire Wire Line
-	10200 3350 10200 3300
+	10150 3850 10150 3800
 Wire Wire Line
-	10200 3300 10250 3300
-Connection ~ 5700 1900
+	10150 3800 10200 3800
+Connection ~ 5500 1900
 Wire Wire Line
-	5350 1650 5350 1600
+	5150 1650 5150 1600
 Wire Wire Line
-	5350 1100 5350 1050
+	5150 1100 5150 1050
 Wire Wire Line
-	5700 2350 5700 2400
+	5500 2350 5500 2400
 Wire Wire Line
-	5950 1900 5950 1950
+	5750 1900 5750 1950
 Wire Wire Line
 	4100 6650 4100 6600
 Connection ~ 4100 6150
@@ -254,9 +252,9 @@ Wire Wire Line
 Wire Wire Line
 	3050 1650 3050 1600
 Wire Wire Line
-	8200 1700 8200 1500
-Connection ~ 8200 1600
-Connection ~ 7800 1600
+	8300 1700 8300 1500
+Connection ~ 8300 1600
+Connection ~ 7900 1600
 Wire Wire Line
 	3300 1650 3300 1600
 Wire Wire Line
@@ -264,75 +262,71 @@ Wire Wire Line
 Wire Wire Line
 	1550 2400 1550 2500
 Wire Wire Line
-	5950 2400 5950 2350
+	5750 2400 5750 2350
 Wire Wire Line
-	5350 3600 5350 3650
+	5150 3600 5150 3650
 Wire Wire Line
-	5700 1950 5700 1900
-Connection ~ 5950 1900
+	5500 1950 5500 1900
+Connection ~ 5750 1900
 Wire Wire Line
-	10250 2600 10200 2600
+	10200 3100 10150 3100
 Wire Wire Line
-	10250 2800 10150 2800
+	10200 3300 10100 3300
 Wire Wire Line
-	10250 3000 10150 3000
+	10200 3500 10100 3500
 Wire Wire Line
-	10250 3200 10150 3200
+	10200 3700 10100 3700
 Wire Wire Line
-	10200 1700 10150 1700
+	10200 1850 10150 1850
 Wire Wire Line
-	10150 1700 10150 1750
+	10150 1850 10150 1900
 Wire Wire Line
-	10200 1600 10000 1600
+	10200 1750 10000 1750
 Wire Wire Line
-	8800 2200 8900 2200
+	8900 2200 9000 2200
 Wire Wire Line
-	8900 2500 8800 2500
+	9000 2500 8900 2500
 Wire Wire Line
-	7100 2100 7200 2100
+	7200 2100 7300 2100
 Wire Wire Line
-	7200 2300 7100 2300
+	7300 2300 7200 2300
 Wire Wire Line
-	7200 2400 7100 2400
+	7300 2400 7200 2400
 Wire Wire Line
-	7200 2700 7100 2700
+	7300 2700 7200 2700
 Wire Wire Line
-	7150 4050 7100 4050
+	6650 4250 6600 4250
 Wire Wire Line
-	7100 4050 7100 4000
+	6600 4250 6600 4200
 Wire Wire Line
-	8050 3450 7950 3450
+	8200 3550 8100 3550
 Wire Wire Line
-	8050 3550 8000 3550
+	8200 3650 8150 3650
 Wire Wire Line
-	8000 3550 8000 3600
+	8150 3650 8150 3700
 Wire Wire Line
-	8800 2700 9200 2700
+	8900 2700 9300 2700
 Wire Wire Line
-	9150 3250 9150 3300
+	9250 3250 9250 3300
 Wire Wire Line
-	5500 1900 6200 1900
+	5300 1900 6000 1900
 Wire Wire Line
-	5500 2800 6200 2800
+	5300 2800 6000 2800
 Wire Wire Line
-	8350 4300 8450 4300
+	8200 4550 8300 4550
 Wire Wire Line
-	5950 2800 5950 2850
-Connection ~ 5950 2800
+	5750 2850 5750 2800
+Connection ~ 5750 2800
 Wire Wire Line
-	5700 3300 5700 3250
+	5500 3300 5500 3250
 Wire Wire Line
-	9300 1250 9300 1300
+	9300 4550 9100 4550
+Connection ~ 9150 4550
 Wire Wire Line
-	9300 1300 9200 1300
+	9800 4550 10150 4550
+Connection ~ 9950 4550
 Wire Wire Line
-	9450 4300 9250 4300
-Connection ~ 9300 4300
-Wire Wire Line
-	9950 4300 10300 4300
-Connection ~ 10100 4300
-Wire Wire Line
-	4700 6150 4700 6200
+	4700 6200 4700 6150
 Wire Wire Line
 	5050 6650 5000 6650
 Wire Wire Line
@@ -377,7 +371,7 @@ Wire Wire Line
 	8850 6150 8450 6150
 Connection ~ 8800 6150
 Wire Wire Line
-	9400 6600 9400 6650
+	9400 6650 9400 6600
 Wire Wire Line
 	9450 6150 9350 6150
 Connection ~ 9400 6150
@@ -387,16 +381,16 @@ Connection ~ 6800 6650
 Wire Wire Line
 	5550 5750 5650 5750
 Wire Wire Line
-	1450 6200 1450 6250
+	1550 6200 1550 6250
 Wire Wire Line
 	3150 6150 3250 6150
 Wire Wire Line
 	3250 6150 3250 6100
-Connection ~ 5350 2350
+Connection ~ 5150 2350
 Wire Wire Line
-	5350 2350 5100 2350
+	5150 2350 4900 2350
 Wire Wire Line
-	5100 2350 5100 2300
+	4900 2350 4900 2300
 Wire Wire Line
 	3800 2000 3650 2000
 Wire Wire Line
@@ -425,28 +419,20 @@ Connection ~ 3700 3200
 Wire Wire Line
 	8400 5700 8450 5700
 Wire Wire Line
-	10200 2600 10200 2550
-Wire Wire Line
-	7650 1300 7700 1300
-Wire Wire Line
-	7700 1300 7700 1250
-Wire Wire Line
-	7900 1250 7900 1300
-Wire Wire Line
-	7900 1300 7950 1300
+	10150 3100 10150 3050
 Wire Wire Line
-	6800 4250 7150 4250
+	6300 4450 6650 4450
 Wire Wire Line
-	6800 4450 7150 4450
+	6300 4650 6650 4650
 Wire Wire Line
-	6200 4350 6300 4350
+	5700 4550 5800 4550
 Wire Wire Line
-	5800 4150 5750 4150
+	5300 4350 5250 4350
 Wire Wire Line
-	5750 4050 5750 4550
+	5250 4250 5250 4750
 Wire Wire Line
-	5750 4550 5800 4550
-Connection ~ 5750 4350
+	5250 4750 5300 4750
+Connection ~ 5250 4550
 Wire Wire Line
 	2000 1800 2000 1750
 Wire Wire Line
@@ -455,16 +441,27 @@ Wire Wire Line
 	2400 1950 2400 1800
 Connection ~ 2400 1800
 Wire Wire Line
-	1100 5600 1100 5750
+	1200 5750 1200 5600
 Wire Wire Line
 	6800 6150 7050 6150
 Wire Wire Line
 	7050 6150 7050 6100
 Wire Wire Line
-	9350 5300 2200 5300
+	2500 5400 2500 5600
 Wire Wire Line
-	2300 5200 2300 4050
-Connection ~ 2300 4050
+	2500 5600 1200 5600
+Wire Wire Line
+	2500 5200 2500 4050
+Connection ~ 2500 4050
+$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
+	1    0    0    1   
+$EndComp
 $Comp
 L CONN_2 P109
 U 1 1 4FBC459A
@@ -478,10 +475,10 @@ $EndComp
 $Comp
 L CONN_3 K4
 U 1 1 4FBC4460
-P 1850 5300
-F 0 "K4" V 1800 5300 50  0000 C CNN
-F 1 "LOWPWR" V 1900 5300 40  0000 C CNN
-	1    1850 5300
+P 2050 5300
+F 0 "K4" V 2000 5300 50  0000 C CNN
+F 1 "LOWPWR" V 2100 5300 40  0000 C CNN
+	1    2050 5300
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -514,114 +511,96 @@ $EndComp
 $Comp
 L LED D3
 U 1 1 4FBBD131
-P 6000 4550
-F 0 "D3" H 5650 4550 50  0000 C CNN
-F 1 "RB0" H 5850 4500 50  0000 C CNN
-	1    6000 4550
+P 5500 4750
+F 0 "D3" H 5150 4750 50  0000 C CNN
+F 1 "RB0" H 5350 4700 50  0000 C CNN
+	1    5500 4750
 	1    0    0    -1  
 $EndComp
 $Comp
 L LED D2
 U 1 1 4FBBD12F
-P 6000 4350
-F 0 "D2" H 5650 4350 50  0000 C CNN
-F 1 "RA7" H 5850 4300 50  0000 C CNN
-	1    6000 4350
+P 5500 4550
+F 0 "D2" H 5150 4550 50  0000 C CNN
+F 1 "RA7" H 5350 4500 50  0000 C CNN
+	1    5500 4550
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR02
 U 1 1 4FBBD117
-P 5750 4050
-F 0 "#PWR02" H 5750 4010 30  0001 C CNN
-F 1 "+3.3V" H 5750 4160 30  0000 C CNN
-	1    5750 4050
+P 5250 4250
+F 0 "#PWR02" H 5250 4210 30  0001 C CNN
+F 1 "+3.3V" H 5250 4360 30  0000 C CNN
+	1    5250 4250
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R29
 U 1 1 4FBBD107
-P 6550 4450
-F 0 "R29" V 6500 4200 50  0000 C CNN
-F 1 "330R" V 6550 4450 50  0000 C CNN
-	1    6550 4450
+P 6050 4650
+F 0 "R29" V 6000 4400 50  0000 C CNN
+F 1 "330R" V 6050 4650 50  0000 C CNN
+	1    6050 4650
 	0    1    1    0   
 $EndComp
 $Comp
 L R R28
 U 1 1 4FBBD105
-P 6550 4350
-F 0 "R28" V 6500 4100 50  0000 C CNN
-F 1 "330R" V 6550 4350 50  0000 C CNN
-	1    6550 4350
+P 6050 4550
+F 0 "R28" V 6000 4300 50  0000 C CNN
+F 1 "330R" V 6050 4550 50  0000 C CNN
+	1    6050 4550
 	0    1    1    0   
 $EndComp
 $Comp
 L LED D1
 U 1 1 4FBBD08D
-P 6000 4150
-F 0 "D1" H 5650 4150 50  0000 C CNN
-F 1 "RA6" H 5850 4100 50  0000 C CNN
-	1    6000 4150
+P 5500 4350
+F 0 "D1" H 5150 4350 50  0000 C CNN
+F 1 "RA6" H 5350 4300 50  0000 C CNN
+	1    5500 4350
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R27
 U 1 1 4FBBD07F
-P 6550 4250
-F 0 "R27" V 6500 4000 50  0000 C CNN
-F 1 "330R" V 6550 4250 50  0000 C CNN
-	1    6550 4250
+P 6050 4450
+F 0 "R27" V 6000 4200 50  0000 C CNN
+F 1 "330R" V 6050 4450 50  0000 C CNN
+	1    6050 4450
 	0    1    1    0   
 $EndComp
 $Comp
 L VCC #PWR03
 U 1 1 4FBA6C36
-P 10150 1400
-F 0 "#PWR03" H 10150 1500 30  0001 C CNN
-F 1 "VCC" H 10150 1500 30  0000 C CNN
-	1    10150 1400
+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
 	0    -1   -1   0   
 $EndComp
 $Comp
 L VCC #PWR04
 U 1 1 4FBA6C2E
-P 7950 1300
-F 0 "#PWR04" H 7950 1400 30  0001 C CNN
-F 1 "VCC" H 7950 1400 30  0000 C CNN
-	1    7950 1300
-	0    1    1    0   
+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
+	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR05
 U 1 1 4FBA6BD2
-P 7650 1300
-F 0 "#PWR05" H 7650 1260 30  0001 C CNN
-F 1 "+3.3V" H 7650 1410 30  0000 C CNN
-	1    7650 1300
+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
 	0    -1   -1   0   
 $EndComp
-Text Label 9400 1450 2    60   ~ 0
+Text Label 10000 1350 2    60   ~ 0
 MCLR
 $Comp
-L CONN_3 K2
-U 1 1 4FBA6B8F
-P 7800 900
-F 0 "K2" V 7750 900 50  0000 C CNN
-F 1 "PROG" V 7850 900 40  0000 C CNN
-	1    7800 900 
-	0    -1   -1   0   
-$EndComp
-$Comp
-L CONN_3 K3
-U 1 1 4FBA6B75
-P 9400 900
-F 0 "K3" V 9350 900 50  0000 C CNN
-F 1 "PROG" V 9450 900 40  0000 C CNN
-	1    9400 900 
-	0    -1   -1   0   
-$EndComp
-$Comp
 L C C15
 U 1 1 4FBA6B22
 P 3150 1150
@@ -698,31 +677,31 @@ $EndComp
 $Comp
 L GND #PWR010
 U 1 1 4FB2FE0C
-P 1100 6250
-F 0 "#PWR010" H 1100 6250 30  0001 C CNN
-F 1 "GND" H 1100 6180 30  0001 C CNN
-	1    1100 6250
+P 1200 6250
+F 0 "#PWR010" H 1200 6250 30  0001 C CNN
+F 1 "GND" H 1200 6180 30  0001 C CNN
+	1    1200 6250
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C14
 U 1 1 4FB2FE04
-P 1100 5950
-F 0 "C14" H 1150 6050 50  0000 L CNN
-F 1 "100nF" H 1150 5850 50  0000 L CNN
-	1    1100 5950
+P 1200 5950
+F 0 "C14" H 1250 6050 50  0000 L CNN
+F 1 "100nF" H 1250 5850 50  0000 L CNN
+	1    1200 5950
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P107
 U 1 1 4FB2FA8A
-P 5000 1950
-F 0 "P107" V 4950 1950 40  0000 C CNN
-F 1 "TIN" V 5050 1950 40  0000 C CNN
-	1    5000 1950
+P 4800 1950
+F 0 "P107" V 4750 1950 40  0000 C CNN
+F 1 "TIN" V 4850 1950 40  0000 C CNN
+	1    4800 1950
 	0    -1   -1   0   
 $EndComp
-Text Label 4800 2350 2    60   ~ 0
+Text Label 4600 2350 2    60   ~ 0
 AMP_OUT
 $Comp
 L CONN_2 P106
@@ -736,37 +715,37 @@ $EndComp
 $Comp
 L +3.3V #PWR011
 U 1 1 4FB2F734
-P 1450 4950
-F 0 "#PWR011" H 1450 4910 30  0001 C CNN
-F 1 "+3.3V" H 1450 5060 30  0000 C CNN
-	1    1450 4950
+P 1550 4950
+F 0 "#PWR011" H 1550 4910 30  0001 C CNN
+F 1 "+3.3V" H 1550 5060 30  0000 C CNN
+	1    1550 4950
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR012
 U 1 1 4FB2F730
-P 1450 6250
-F 0 "#PWR012" H 1450 6250 30  0001 C CNN
-F 1 "GND" H 1450 6180 30  0001 C CNN
-	1    1450 6250
+P 1550 6250
+F 0 "#PWR012" H 1550 6250 30  0001 C CNN
+F 1 "GND" H 1550 6180 30  0001 C CNN
+	1    1550 6250
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R18
 U 1 1 4FB2F72A
-P 1450 5250
-F 0 "R18" V 1530 5250 50  0000 C CNN
-F 1 "1M0" V 1450 5250 50  0000 C CNN
-	1    1450 5250
+P 1550 5250
+F 0 "R18" V 1630 5250 50  0000 C CNN
+F 1 "1M0" V 1550 5250 50  0000 C CNN
+	1    1550 5250
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R19
 U 1 1 4FB2F71F
-P 1450 5950
-F 0 "R19" V 1530 5950 50  0000 C CNN
-F 1 "1M0" V 1450 5950 50  0000 C CNN
-	1    1450 5950
+P 1550 5950
+F 0 "R19" V 1630 5950 50  0000 C CNN
+F 1 "1M0" V 1550 5950 50  0000 C CNN
+	1    1550 5950
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -893,78 +872,78 @@ PWRDWN
 $Comp
 L GND #PWR017
 U 1 1 4FB2F4ED
-P 10100 4850
-F 0 "#PWR017" H 10100 4850 30  0001 C CNN
-F 1 "GND" H 10100 4780 30  0001 C CNN
-	1    10100 4850
+P 9950 5100
+F 0 "#PWR017" H 9950 5100 30  0001 C CNN
+F 1 "GND" H 9950 5030 30  0001 C CNN
+	1    9950 5100
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_3X2 P108
 U 1 1 4FB2F4D8
-P 8850 4350
-F 0 "P108" H 8850 4600 50  0000 C CNN
-F 1 "ADC_IN" V 8850 4400 40  0000 C CNN
-	1    8850 4350
+P 8700 4600
+F 0 "P108" H 8700 4850 50  0000 C CNN
+F 1 "ADC_IN" V 8700 4650 40  0000 C CNN
+	1    8700 4600
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C20
 U 1 1 4FB2F4B0
-P 10100 4600
-F 0 "C20" H 10150 4700 50  0000 L CNN
-F 1 "47nF" H 10150 4500 50  0000 L CNN
-	1    10100 4600
+P 9950 4850
+F 0 "C20" H 10000 4950 50  0000 L CNN
+F 1 "47nF" H 10000 4750 50  0000 L CNN
+	1    9950 4850
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R26
 U 1 1 4FB2F4AC
-P 9700 4300
-F 0 "R26" V 9780 4300 50  0000 C CNN
-F 1 "910R" V 9700 4300 50  0000 C CNN
-	1    9700 4300
+P 9550 4550
+F 0 "R26" V 9630 4550 50  0000 C CNN
+F 1 "910R" V 9550 4550 50  0000 C CNN
+	1    9550 4550
 	0    1    1    0   
 $EndComp
-Text Label 7100 2500 2    60   ~ 0
+Text Label 7200 2500 2    60   ~ 0
 MCLR
 Text Label 3300 1600 0    60   ~ 0
 PWRDWN
-Text Label 9200 1300 2    60   ~ 0
+Text Label 10000 1250 2    60   ~ 0
 PWRDWN
-Text Label 10150 2700 2    60   ~ 0
+Text Label 10100 3200 2    60   ~ 0
 PWRDWN
 $Comp
 L CONN_8 P105
 U 1 1 4F5A4C4E
-P 10600 2950
-F 0 "P105" V 10550 2950 60  0000 C CNN
-F 1 "MPU" V 10650 2950 60  0000 C CNN
-	1    10600 2950
+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
 	1    0    0    -1  
 $EndComp
-Text Label 8350 4400 2    60   ~ 0
+Text Label 8200 4650 2    60   ~ 0
 F2_OUT
-Text Label 8350 4200 2    60   ~ 0
+Text Label 8200 4450 2    60   ~ 0
 AMP_OUT
-Text Label 8350 4300 2    60   ~ 0
+Text Label 8200 4550 2    60   ~ 0
 F1_OUT
 $Comp
 L TST P104
 U 1 1 4F5A06F2
-P 6200 2800
-F 0 "P104" H 6200 3100 40  0000 C CNN
-F 1 "COMP_LOW" H 6200 3050 30  0000 C CNN
-	1    6200 2800
+P 6000 2800
+F 0 "P104" H 6000 3100 40  0000 C CNN
+F 1 "COMP_LOW" H 6000 3050 30  0000 C CNN
+	1    6000 2800
 	0    1    1    0   
 $EndComp
 $Comp
 L TST P103
 U 1 1 4F5A06E6
-P 6200 1900
-F 0 "P103" H 6200 2200 40  0000 C CNN
-F 1 "COMP_HIGH" H 6200 2150 30  0000 C CNN
-	1    6200 1900
+P 6000 1900
+F 0 "P103" H 6000 2200 40  0000 C CNN
+F 1 "COMP_HIGH" H 6000 2150 30  0000 C CNN
+	1    6000 1900
 	0    1    1    0   
 $EndComp
 Text Label 10700 6650 0    60   ~ 0
@@ -974,309 +953,298 @@ F1_OUT
 $Comp
 L GND #PWR018
 U 1 1 4F56D6E5
-P 9150 3300
-F 0 "#PWR018" H 9150 3300 30  0001 C CNN
-F 1 "GND" H 9150 3230 30  0001 C CNN
-	1    9150 3300
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R17
 U 1 1 4F56D6CE
-P 9150 3000
-F 0 "R17" V 9230 3000 50  0000 C CNN
-F 1 "470k" V 9150 3000 50  0000 C CNN
-	1    9150 3000
+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
 	1    0    0    -1  
 $EndComp
-Text Label 9200 2700 0    60   ~ 0
+Text Label 9300 2700 0    60   ~ 0
 FILTER_EN
-Text Label 7050 4450 2    60   ~ 0
+Text Label 6550 4650 2    60   ~ 0
 RB0
-Text Label 7050 4350 2    60   ~ 0
+Text Label 6550 4550 2    60   ~ 0
 RA7
-Text Label 7050 4250 2    60   ~ 0
+Text Label 6550 4450 2    60   ~ 0
 RA6
-Text Label 7050 4150 2    60   ~ 0
+Text Label 6550 4350 2    60   ~ 0
 CCP4
-Text Label 7400 3450 2    60   ~ 0
+Text Label 7550 3550 2    60   ~ 0
 CCP4
 $Comp
 L R R13
 U 1 1 4F56D5B4
-P 7700 3450
-F 0 "R13" V 7780 3450 50  0000 C CNN
-F 1 "R" V 7700 3450 50  0000 C CNN
-	1    7700 3450
+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
 	0    -1   -1   0   
 $EndComp
 $Comp
 L +3.3V #PWR019
 U 1 1 4F56D5AC
-P 8000 3300
-F 0 "#PWR019" H 8000 3260 30  0001 C CNN
-F 1 "+3.3V" H 8000 3410 30  0000 C CNN
-	1    8000 3300
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR020
 U 1 1 4F56D5A4
-P 8000 3600
-F 0 "#PWR020" H 8000 3600 30  0001 C CNN
-F 1 "GND" H 8000 3530 30  0001 C CNN
-	1    8000 3600
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR021
 U 1 1 4F56D5A1
-P 7100 4000
-F 0 "#PWR021" H 7100 3960 30  0001 C CNN
-F 1 "+3.3V" H 7100 4110 30  0000 C CNN
-	1    7100 4000
+P 6600 4200
+F 0 "#PWR021" H 6600 4160 30  0001 C CNN
+F 1 "+3.3V" H 6600 4310 30  0000 C CNN
+	1    6600 4200
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR022
 U 1 1 4F56D59E
-P 7100 4600
-F 0 "#PWR022" H 7100 4600 30  0001 C CNN
-F 1 "GND" H 7100 4530 30  0001 C CNN
-	1    7100 4600
+P 6600 4800
+F 0 "#PWR022" H 6600 4800 30  0001 C CNN
+F 1 "GND" H 6600 4730 30  0001 C CNN
+	1    6600 4800
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_3 K1
 U 1 1 4F56D585
-P 8400 3450
-F 0 "K1" V 8350 3450 50  0000 C CNN
-F 1 "SPEAKER" V 8450 3450 40  0000 C CNN
-	1    8400 3450
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_6 P2
 U 1 1 4F56D57B
-P 7500 4300
-F 0 "P2" V 7450 4300 60  0000 C CNN
-F 1 "UNUSED" V 7550 4300 60  0000 C CNN
-	1    7500 4300
+P 7000 4500
+F 0 "P2" V 6950 4500 60  0000 C CNN
+F 1 "UNUSED" V 7050 4500 60  0000 C CNN
+	1    7000 4500
 	1    0    0    -1  
 $EndComp
-Text Label 8900 2000 0    60   ~ 0
+Text Label 9000 2000 0    60   ~ 0
 RB0
-Text Label 7100 2700 2    60   ~ 0
+Text Label 7200 2700 2    60   ~ 0
 RA7
-Text Label 7100 2600 2    60   ~ 0
+Text Label 7200 2600 2    60   ~ 0
 RA6
-Text Label 7100 2400 2    60   ~ 0
+Text Label 7200 2400 2    60   ~ 0
 CCP4
-Text Label 8900 2300 0    60   ~ 0
+Text Label 9000 2300 0    60   ~ 0
 INT
-Text Label 7100 2300 2    60   ~ 0
+Text Label 7200 2300 2    60   ~ 0
 ADC_IN
-Text Label 7100 2200 2    60   ~ 0
+Text Label 7200 2200 2    60   ~ 0
 AMP_OUT
-Text Label 7100 2100 2    60   ~ 0
+Text Label 7200 2100 2    60   ~ 0
 C2+
-Text Label 7100 2000 2    60   ~ 0
+Text Label 7200 2000 2    60   ~ 0
 C1-
-Text Label 8900 2200 0    60   ~ 0
+Text Label 9000 2200 0    60   ~ 0
 SDO
-Text Label 8900 2100 0    60   ~ 0
+Text Label 9000 2100 0    60   ~ 0
 SDI
-Text Label 8900 2400 0    60   ~ 0
+Text Label 9000 2400 0    60   ~ 0
 SCK
-Text Label 8900 2500 0    60   ~ 0
+Text Label 9000 2500 0    60   ~ 0
 CS
-Text Label 8900 2600 0    60   ~ 0
+Text Label 9000 2600 0    60   ~ 0
 PGC
-Text Label 8900 2700 0    60   ~ 0
+Text Label 9000 2700 0    60   ~ 0
 PGD
-Text Label 10000 1600 2    60   ~ 0
+Text Label 10000 1750 2    60   ~ 0
 PGC
-Text Label 10000 1500 2    60   ~ 0
+Text Label 10000 1650 2    60   ~ 0
 PGD
-Text Label 10000 1300 2    60   ~ 0
-VPP
 $Comp
 L GND #PWR023
 U 1 1 4F56CFED
-P 10150 1750
-F 0 "#PWR023" H 10150 1750 30  0001 C CNN
-F 1 "GND" H 10150 1680 30  0001 C CNN
-	1    10150 1750
+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
 	1    0    0    -1  
 $EndComp
-$Comp
-L CONN_5 P4
-U 1 1 4F56CFE5
-P 10600 1500
-F 0 "P4" V 10550 1500 50  0000 C CNN
-F 1 "ICSP" V 10650 1500 50  0000 C CNN
-	1    10600 1500
-	1    0    0    1   
-$EndComp
-Text Label 10150 3200 2    60   ~ 0
+Text Label 10100 3700 2    60   ~ 0
 SDO
-Text Label 10150 3100 2    60   ~ 0
+Text Label 10100 3600 2    60   ~ 0
 SDI
-Text Label 10150 3000 2    60   ~ 0
+Text Label 10100 3500 2    60   ~ 0
 SCK
-Text Label 10150 2900 2    60   ~ 0
+Text Label 10100 3400 2    60   ~ 0
 CS
-Text Label 10150 2800 2    60   ~ 0
+Text Label 10100 3300 2    60   ~ 0
 INT
 $Comp
 L +3.3V #PWR024
 U 1 1 4F56CF77
-P 10200 2550
-F 0 "#PWR024" H 10200 2510 30  0001 C CNN
-F 1 "+3.3V" H 10200 2660 30  0000 C CNN
-	1    10200 2550
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR025
 U 1 1 4F56CF70
-P 10200 3350
-F 0 "#PWR025" H 10200 3350 30  0001 C CNN
-F 1 "GND" H 10200 3280 30  0001 C CNN
-	1    10200 3350
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L POT RV2
 U 1 1 4F56CEE5
-P 5350 1900
-F 0 "RV2" H 5350 1800 50  0000 C CNN
-F 1 "50k" H 5350 1900 50  0000 C CNN
-	1    5350 1900
+P 5150 1900
+F 0 "RV2" H 5150 1800 50  0000 C CNN
+F 1 "50k" H 5150 1900 50  0000 C CNN
+	1    5150 1900
 	0    1    1    0   
 $EndComp
 $Comp
 L POT RV3
 U 1 1 4F56CE90
-P 5350 2800
-F 0 "RV3" H 5350 2700 50  0000 C CNN
-F 1 "50k" H 5350 2800 50  0000 C CNN
-	1    5350 2800
+P 5150 2800
+F 0 "RV3" H 5150 2700 50  0000 C CNN
+F 1 "50k" H 5150 2800 50  0000 C CNN
+	1    5150 2800
 	0    1    1    0   
 $EndComp
-Text Label 6050 1900 0    60   ~ 0
+Text Label 5850 1900 0    60   ~ 0
 C1-
-Text Label 6050 2800 0    60   ~ 0
+Text Label 5850 2800 0    60   ~ 0
 C2+
 $Comp
 L +3.3V #PWR026
 U 1 1 4F56CDD2
-P 5350 1050
-F 0 "#PWR026" H 5350 1010 30  0001 C CNN
-F 1 "+3.3V" H 5350 1160 30  0000 C CNN
-	1    5350 1050
+P 5150 1050
+F 0 "#PWR026" H 5150 1010 30  0001 C CNN
+F 1 "+3.3V" H 5150 1160 30  0000 C CNN
+	1    5150 1050
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR027
 U 1 1 4F56CDB6
-P 5350 3650
-F 0 "#PWR027" H 5350 3650 30  0001 C CNN
-F 1 "GND" H 5350 3580 30  0001 C CNN
-	1    5350 3650
+P 5150 3650
+F 0 "#PWR027" H 5150 3650 30  0001 C CNN
+F 1 "GND" H 5150 3580 30  0001 C CNN
+	1    5150 3650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R10
 U 1 1 4F56CDB1
-P 5350 3350
-F 0 "R10" V 5430 3350 50  0000 C CNN
-F 1 "330k" V 5350 3350 50  0000 C CNN
-	1    5350 3350
+P 5150 3350
+F 0 "R10" V 5230 3350 50  0000 C CNN
+F 1 "330k" V 5150 3350 50  0000 C CNN
+	1    5150 3350
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C8
 U 1 1 4F56CDAF
-P 5700 3050
-F 0 "C8" H 5750 3150 50  0000 L CNN
-F 1 "5µF" H 5750 2950 50  0000 L CNN
-	1    5700 3050
+P 5500 3050
+F 0 "C8" H 5550 3150 50  0000 L CNN
+F 1 "5µF" H 5550 2950 50  0000 L CNN
+	1    5500 3050
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C10
 U 1 1 4F56CDAE
-P 5950 3050
-F 0 "C10" H 6000 3150 50  0000 L CNN
-F 1 "5µF" H 6000 2950 50  0000 L CNN
-	1    5950 3050
+P 5750 3050
+F 0 "C10" H 5800 3150 50  0000 L CNN
+F 1 "5µF" H 5800 2950 50  0000 L CNN
+	1    5750 3050
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR028
 U 1 1 4F56CDAD
-P 5950 3300
-F 0 "#PWR028" H 5950 3300 30  0001 C CNN
-F 1 "GND" H 5950 3230 30  0001 C CNN
-	1    5950 3300
+P 5750 3300
+F 0 "#PWR028" H 5750 3300 30  0001 C CNN
+F 1 "GND" H 5750 3230 30  0001 C CNN
+	1    5750 3300
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR029
 U 1 1 4F56CDAC
-P 5700 3300
-F 0 "#PWR029" H 5700 3300 30  0001 C CNN
-F 1 "GND" H 5700 3230 30  0001 C CNN
-	1    5700 3300
+P 5500 3300
+F 0 "#PWR029" H 5500 3300 30  0001 C CNN
+F 1 "GND" H 5500 3230 30  0001 C CNN
+	1    5500 3300
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR030
 U 1 1 4F56CD9B
-P 5700 2400
-F 0 "#PWR030" H 5700 2400 30  0001 C CNN
-F 1 "GND" H 5700 2330 30  0001 C CNN
-	1    5700 2400
+P 5500 2400
+F 0 "#PWR030" H 5500 2400 30  0001 C CNN
+F 1 "GND" H 5500 2330 30  0001 C CNN
+	1    5500 2400
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR031
 U 1 1 4F56CD99
-P 5950 2400
-F 0 "#PWR031" H 5950 2400 30  0001 C CNN
-F 1 "GND" H 5950 2330 30  0001 C CNN
-	1    5950 2400
+P 5750 2400
+F 0 "#PWR031" H 5750 2400 30  0001 C CNN
+F 1 "GND" H 5750 2330 30  0001 C CNN
+	1    5750 2400
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C9
 U 1 1 4F56CD43
-P 5950 2150
-F 0 "C9" H 6000 2250 50  0000 L CNN
-F 1 "5µF" H 6000 2050 50  0000 L CNN
-	1    5950 2150
+P 5750 2150
+F 0 "C9" H 5800 2250 50  0000 L CNN
+F 1 "5µF" H 5800 2050 50  0000 L CNN
+	1    5750 2150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C7
 U 1 1 4F56CD3B
-P 5700 2150
-F 0 "C7" H 5750 2250 50  0000 L CNN
-F 1 "5µF" H 5750 2050 50  0000 L CNN
-	1    5700 2150
+P 5500 2150
+F 0 "C7" H 5550 2250 50  0000 L CNN
+F 1 "5µF" H 5550 2050 50  0000 L CNN
+	1    5500 2150
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R9
 U 1 1 4F56CD2D
-P 5350 1350
-F 0 "R9" V 5430 1350 50  0000 C CNN
-F 1 "330k" V 5350 1350 50  0000 C CNN
-	1    5350 1350
+P 5150 1350
+F 0 "R9" V 5230 1350 50  0000 C CNN
+F 1 "330k" V 5150 1350 50  0000 C CNN
+	1    5150 1350
 	1    0    0    -1  
 $EndComp
-Text Label 10300 4300 0    60   ~ 0
+Text Label 10150 4550 0    60   ~ 0
 ADC_IN
 Text Label 3150 6150 2    60   ~ 0
 AMP_OUT
@@ -1431,28 +1399,28 @@ $EndComp
 $Comp
 L C C13
 U 1 1 4F56B741
-P 8000 1600
-F 0 "C13" H 8050 1700 50  0000 L CNN
-F 1 "100nF" H 8050 1500 50  0000 L CNN
-	1    8000 1600
+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   
 $EndComp
 $Comp
 L GND #PWR038
 U 1 1 4F56B73F
-P 8200 1500
-F 0 "#PWR038" H 8200 1500 30  0001 C CNN
-F 1 "GND" H 8200 1430 30  0001 C CNN
-	1    8200 1500
+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   
 $EndComp
 $Comp
 L PIC16F1847SO U3
 U 1 1 4F56B72F
-P 8000 2350
-F 0 "U3" H 8000 2400 60  0000 C CNN
-F 1 "PIC16F1847SO" H 8000 2300 60  0000 C CNN
-	1    8000 2350
+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
 	1    0    0    -1  
 $EndComp
 $Comp