cleanup finished

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

1 files changed, 96 insertions, 86 deletions

diff --git a/hardware/idm/idm.sch b/hardware/idm/idm.sch
index 5f26f74..19555b0 100644
--- a/hardware/idm/idm.sch
+++ b/hardware/idm/idm.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sam 10 Mär 2012 04:03:29 CET
+EESchema Schematic File Version 2  date Sam 10 Mär 2012 06:07:23 CET
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -45,6 +45,16 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+Text Label 7200 2450 2    60   ~ 0
+MCLR
+Text Label 3600 2000 0    60   ~ 0
+PWRDWN
+Wire Wire Line
+	7300 2450 7200 2450
+Wire Wire Line
+	9600 1200 9600 1250
+Wire Wire Line
+	9600 1250 10300 1250
 Wire Wire Line
 	5550 3300 5550 3250
 Connection ~ 5300 2800
@@ -106,8 +116,6 @@ Wire Wire Line
 Wire Wire Line
 	9000 2350 8900 2350
 Wire Wire Line
-	7300 2450 7200 2450
-Wire Wire Line
 	9000 2550 8900 2550
 Wire Wire Line
 	10100 1450 10300 1450
@@ -300,8 +308,6 @@ Wire Wire Line
 Wire Wire Line
 	10250 1650 10250 1700
 Wire Wire Line
-	10300 1250 10100 1250
-Wire Wire Line
 	10300 1550 10100 1550
 Wire Wire Line
 	8900 2150 9000 2150
@@ -373,6 +379,21 @@ Wire Wire Line
 Connection ~ 5550 2800
 Wire Wire Line
 	5300 3300 5300 3250
+Wire Wire Line
+	9400 1200 9400 1250
+Wire Wire Line
+	9400 1250 9300 1250
+Text Label 9300 1250 2    60   ~ 0
+PWRDWN
+$Comp
+L CONN_2 P102
+U 1 1 4F5ADCF7
+P 9500 850
+F 0 "P102" V 9450 850 40  0000 C CNN
+F 1 "PROG" V 9550 850 40  0000 C CNN
+	1    9500 850 
+	0    -1   -1   0   
+$EndComp
 Text Label 10250 2600 2    60   ~ 0
 PWRDWN
 $Comp
@@ -384,15 +405,6 @@ F 1 "MPU" V 10750 2850 60  0000 C CNN
 	1    10700 2850
 	1    0    0    -1  
 $EndComp
-$Comp
-L +3.3V #PWR10
-U 1 1 4F56C95E
-P 3600 2000
-F 0 "#PWR10" H 3600 1960 30  0001 C CNN
-F 1 "+3.3V" H 3600 2110 30  0000 C CNN
-	1    3600 2000
-	1    0    0    -1  
-$EndComp
 Text Label 9450 4300 2    60   ~ 0
 F3_OUT
 Text Label 9450 4200 2    60   ~ 0
@@ -435,10 +447,10 @@ F2_OUT
 Text Label 4250 5150 0    60   ~ 0
 F1_OUT
 $Comp
-L GND #PWR30
+L GND #PWR01
 U 1 1 4F56D6E5
 P 9250 3250
-F 0 "#PWR30" H 9250 3250 30  0001 C CNN
+F 0 "#PWR01" H 9250 3250 30  0001 C CNN
 F 1 "GND" H 9250 3180 30  0001 C CNN
 	1    9250 3250
 	1    0    0    -1  
@@ -474,37 +486,37 @@ F 1 "R" V 6800 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3.3V #PWR22
+L +3.3V #PWR02
 U 1 1 4F56D5AC
 P 7100 4000
-F 0 "#PWR22" H 7100 3960 30  0001 C CNN
+F 0 "#PWR02" H 7100 3960 30  0001 C CNN
 F 1 "+3.3V" H 7100 4110 30  0000 C CNN
 	1    7100 4000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR23
+L GND #PWR03
 U 1 1 4F56D5A4
 P 7100 4300
-F 0 "#PWR23" H 7100 4300 30  0001 C CNN
+F 0 "#PWR03" H 7100 4300 30  0001 C CNN
 F 1 "GND" H 7100 4230 30  0001 C CNN
 	1    7100 4300
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR26
+L +3.3V #PWR04
 U 1 1 4F56D5A1
 P 8250 3800
-F 0 "#PWR26" H 8250 3760 30  0001 C CNN
+F 0 "#PWR04" H 8250 3760 30  0001 C CNN
 F 1 "+3.3V" H 8250 3910 30  0000 C CNN
 	1    8250 3800
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR27
+L GND #PWR05
 U 1 1 4F56D59E
 P 8250 4400
-F 0 "#PWR27" H 8250 4400 30  0001 C CNN
+F 0 "#PWR05" H 8250 4400 30  0001 C CNN
 F 1 "GND" H 8250 4330 30  0001 C CNN
 	1    8250 4400
 	1    0    0    -1  
@@ -557,8 +569,6 @@ Text Label 9000 2550 0    60   ~ 0
 PGC
 Text Label 9000 2650 0    60   ~ 0
 PGD
-Text Label 7200 2450 2    60   ~ 0
-MCLR
 Text Label 10100 1550 2    60   ~ 0
 PGC
 Text Label 10100 1450 2    60   ~ 0
@@ -566,19 +576,19 @@ PGD
 Text Label 10100 1250 2    60   ~ 0
 MCLR
 $Comp
-L GND #PWR34
+L GND #PWR06
 U 1 1 4F56CFED
 P 10250 1700
-F 0 "#PWR34" H 10250 1700 30  0001 C CNN
+F 0 "#PWR06" H 10250 1700 30  0001 C CNN
 F 1 "GND" H 10250 1630 30  0001 C CNN
 	1    10250 1700
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR33
+L +3.3V #PWR07
 U 1 1 4F56CFEA
 P 10250 1350
-F 0 "#PWR33" H 10250 1310 30  0001 C CNN
+F 0 "#PWR07" H 10250 1310 30  0001 C CNN
 F 1 "+3.3V" H 10250 1460 30  0000 C CNN
 	1    10250 1350
 	0    -1   -1   0   
@@ -603,19 +613,19 @@ CS
 Text Label 10250 2700 2    60   ~ 0
 INT
 $Comp
-L +3.3V #PWR35
+L +3.3V #PWR08
 U 1 1 4F56CF77
 P 10300 2450
-F 0 "#PWR35" H 10300 2410 30  0001 C CNN
+F 0 "#PWR08" H 10300 2410 30  0001 C CNN
 F 1 "+3.3V" H 10300 2560 30  0000 C CNN
 	1    10300 2450
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR36
+L GND #PWR09
 U 1 1 4F56CF70
 P 10300 3250
-F 0 "#PWR36" H 10300 3250 30  0001 C CNN
+F 0 "#PWR09" H 10300 3250 30  0001 C CNN
 F 1 "GND" H 10300 3180 30  0001 C CNN
 	1    10300 3250
 	1    0    0    -1  
@@ -643,19 +653,19 @@ C1-
 Text Label 5650 2800 0    60   ~ 0
 C2+
 $Comp
-L +3.3V #PWR13
+L +3.3V #PWR010
 U 1 1 4F56CDD2
 P 4950 1100
-F 0 "#PWR13" H 4950 1060 30  0001 C CNN
+F 0 "#PWR010" H 4950 1060 30  0001 C CNN
 F 1 "+3.3V" H 4950 1210 30  0000 C CNN
 	1    4950 1100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR14
+L GND #PWR011
 U 1 1 4F56CDB6
 P 4950 3700
-F 0 "#PWR14" H 4950 3700 30  0001 C CNN
+F 0 "#PWR011" H 4950 3700 30  0001 C CNN
 F 1 "GND" H 4950 3630 30  0001 C CNN
 	1    4950 3700
 	1    0    0    -1  
@@ -688,37 +698,37 @@ F 1 "5µF" H 5600 2950 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR18
+L GND #PWR012
 U 1 1 4F56CDAD
 P 5550 3300
-F 0 "#PWR18" H 5550 3300 30  0001 C CNN
+F 0 "#PWR012" H 5550 3300 30  0001 C CNN
 F 1 "GND" H 5550 3230 30  0001 C CNN
 	1    5550 3300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR16
+L GND #PWR013
 U 1 1 4F56CDAC
 P 5300 3300
-F 0 "#PWR16" H 5300 3300 30  0001 C CNN
+F 0 "#PWR013" H 5300 3300 30  0001 C CNN
 F 1 "GND" H 5300 3230 30  0001 C CNN
 	1    5300 3300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR15
+L GND #PWR014
 U 1 1 4F56CD9B
 P 5300 2450
-F 0 "#PWR15" H 5300 2450 30  0001 C CNN
+F 0 "#PWR014" H 5300 2450 30  0001 C CNN
 F 1 "GND" H 5300 2380 30  0001 C CNN
 	1    5300 2450
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR17
+L GND #PWR015
 U 1 1 4F56CD99
 P 5550 2450
-F 0 "#PWR17" H 5550 2450 30  0001 C CNN
+F 0 "#PWR015" H 5550 2450 30  0001 C CNN
 F 1 "GND" H 5550 2380 30  0001 C CNN
 	1    5550 2450
 	1    0    0    -1  
@@ -755,19 +765,19 @@ ADC_IN
 Text Label 1000 5850 2    60   ~ 0
 AMP_OUT
 $Comp
-L GND #PWR29
+L GND #PWR016
 U 1 1 4F56CC3C
 P 9200 6350
-F 0 "#PWR29" H 9200 6350 30  0001 C CNN
+F 0 "#PWR016" H 9200 6350 30  0001 C CNN
 F 1 "GND" H 9200 6280 30  0001 C CNN
 	1    9200 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR25
+L GND #PWR017
 U 1 1 4F56CC3B
 P 8000 6350
-F 0 "#PWR25" H 8000 6350 30  0001 C CNN
+F 0 "#PWR017" H 8000 6350 30  0001 C CNN
 F 1 "GND" H 8000 6280 30  0001 C CNN
 	1    8000 6350
 	1    0    0    -1  
@@ -829,19 +839,19 @@ $EndComp
 Text Label 10200 5650 1    60   ~ 0
 FILTER_EN
 $Comp
-L GND #PWR32
+L GND #PWR018
 U 1 1 4F56CC34
 P 9950 6450
-F 0 "#PWR32" H 9950 6450 30  0001 C CNN
+F 0 "#PWR018" H 9950 6450 30  0001 C CNN
 F 1 "GND" H 9950 6380 30  0001 C CNN
 	1    9950 6450
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR31
+L +3.3V #PWR019
 U 1 1 4F56CC33
 P 9950 5650
-F 0 "#PWR31" H 9950 5610 30  0001 C CNN
+F 0 "#PWR019" H 9950 5610 30  0001 C CNN
 F 1 "+3.3V" H 9950 5760 30  0000 C CNN
 	1    9950 5650
 	1    0    0    -1  
@@ -865,19 +875,19 @@ F 1 "MAX9913" H 6950 5800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR20
+L +3.3V #PWR020
 U 1 1 4F56CBF5
 P 6750 5650
-F 0 "#PWR20" H 6750 5610 30  0001 C CNN
+F 0 "#PWR020" H 6750 5610 30  0001 C CNN
 F 1 "+3.3V" H 6750 5760 30  0000 C CNN
 	1    6750 5650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR21
+L GND #PWR021
 U 1 1 4F56CBF4
 P 6750 6450
-F 0 "#PWR21" H 6750 6450 30  0001 C CNN
+F 0 "#PWR021" H 6750 6450 30  0001 C CNN
 F 1 "GND" H 6750 6380 30  0001 C CNN
 	1    6750 6450
 	1    0    0    -1  
@@ -939,37 +949,37 @@ F 1 "47nF" H 5450 5450 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR12
+L GND #PWR022
 U 1 1 4F56CBED
 P 4800 6350
-F 0 "#PWR12" H 4800 6350 30  0001 C CNN
+F 0 "#PWR022" H 4800 6350 30  0001 C CNN
 F 1 "GND" H 4800 6280 30  0001 C CNN
 	1    4800 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR19
+L GND #PWR023
 U 1 1 4F56CBEC
 P 6000 6350
-F 0 "#PWR19" H 6000 6350 30  0001 C CNN
+F 0 "#PWR023" H 6000 6350 30  0001 C CNN
 F 1 "GND" H 6000 6280 30  0001 C CNN
 	1    6000 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR5
+L GND #PWR024
 U 1 1 4F56CB68
 P 2800 6350
-F 0 "#PWR5" H 2800 6350 30  0001 C CNN
+F 0 "#PWR024" H 2800 6350 30  0001 C CNN
 F 1 "GND" H 2800 6280 30  0001 C CNN
 	1    2800 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR1
+L GND #PWR025
 U 1 1 4F56CB66
 P 1600 6350
-F 0 "#PWR1" H 1600 6350 30  0001 C CNN
+F 0 "#PWR025" H 1600 6350 30  0001 C CNN
 F 1 "GND" H 1600 6280 30  0001 C CNN
 	1    1600 6350
 	1    0    0    -1  
@@ -1033,19 +1043,19 @@ FILTER_EN
 Text Label 4300 2400 0    60   ~ 0
 AMP_OUT
 $Comp
-L +3.3V #PWR3
+L +3.3V #PWR026
 U 1 1 4F56CA59
 P 2500 1550
-F 0 "#PWR3" H 2500 1510 30  0001 C CNN
+F 0 "#PWR026" H 2500 1510 30  0001 C CNN
 F 1 "+3.3V" H 2500 1660 30  0000 C CNN
 	1    2500 1550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR11
+L GND #PWR027
 U 1 1 4F56CA1A
 P 4100 4100
-F 0 "#PWR11" H 4100 4100 30  0001 C CNN
+F 0 "#PWR027" H 4100 4100 30  0001 C CNN
 F 1 "GND" H 4100 4030 30  0001 C CNN
 	1    4100 4100
 	1    0    0    -1  
@@ -1078,19 +1088,19 @@ F 1 "100k" H 4100 3250 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR2
+L GND #PWR028
 U 1 1 4F56C942
 P 1700 2750
-F 0 "#PWR2" H 1700 2750 30  0001 C CNN
+F 0 "#PWR028" H 1700 2750 30  0001 C CNN
 F 1 "GND" H 1700 2680 30  0001 C CNN
 	1    1700 2750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR4
+L GND #PWR029
 U 1 1 4F56C940
 P 2500 2900
-F 0 "#PWR4" H 2500 2900 30  0001 C CNN
+F 0 "#PWR029" H 2500 2900 30  0001 C CNN
 F 1 "GND" H 2500 2830 30  0001 C CNN
 	1    2500 2900
 	1    0    0    -1  
@@ -1141,19 +1151,19 @@ F 1 "100nF" H 8150 1450 50  0000 L CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR28
+L GND #PWR030
 U 1 1 4F56B73F
 P 8300 1450
-F 0 "#PWR28" H 8300 1450 30  0001 C CNN
+F 0 "#PWR030" H 8300 1450 30  0001 C CNN
 F 1 "GND" H 8300 1380 30  0001 C CNN
 	1    8300 1450
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3.3V #PWR24
+L +3.3V #PWR031
 U 1 1 4F56B73C
 P 7900 1450
-F 0 "#PWR24" H 7900 1410 30  0001 C CNN
+F 0 "#PWR031" H 7900 1410 30  0001 C CNN
 F 1 "+3.3V" H 7900 1560 30  0000 C CNN
 	1    7900 1450
 	1    0    0    -1  
@@ -1168,37 +1178,37 @@ F 1 "PIC16F1847SO" H 8100 2250 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR7
+L GND #PWR032
 U 1 1 4F56B6FA
 P 3350 2800
-F 0 "#PWR7" H 3350 2800 30  0001 C CNN
+F 0 "#PWR032" H 3350 2800 30  0001 C CNN
 F 1 "GND" H 3350 2730 30  0001 C CNN
 	1    3350 2800
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR9
+L GND #PWR033
 U 1 1 4F56B6F7
 P 3550 6450
-F 0 "#PWR9" H 3550 6450 30  0001 C CNN
+F 0 "#PWR033" H 3550 6450 30  0001 C CNN
 F 1 "GND" H 3550 6380 30  0001 C CNN
 	1    3550 6450
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR8
+L +3.3V #PWR034
 U 1 1 4F56B6E8
 P 3550 5650
-F 0 "#PWR8" H 3550 5610 30  0001 C CNN
+F 0 "#PWR034" H 3550 5610 30  0001 C CNN
 F 1 "+3.3V" H 3550 5760 30  0000 C CNN
 	1    3550 5650
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR6
+L +3.3V #PWR035
 U 1 1 4F56B6E5
 P 3350 2000
-F 0 "#PWR6" H 3350 1960 30  0001 C CNN
+F 0 "#PWR035" H 3350 1960 30  0001 C CNN
 F 1 "+3.3V" H 3350 2110 30  0000 C CNN
 	1    3350 2000
 	1    0    0    -1