complete redesign

1 files changed, 305 insertions, 239 deletions

diff --git a/uart-1wire.sch b/uart-1wire.sch
index 514fd14..d247f7e 100644
--- a/uart-1wire.sch
+++ b/uart-1wire.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Die 20 Dez 2011 01:38:19 CET
+EESchema Schematic File Version 2  date Do 15 Aug 2013 00:47:07 CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -31,12 +31,13 @@ LIBS:contrib
 LIBS:valves
 LIBS:uart-1wire
 LIBS:uart-1wire-cache
-EELAYER 24  0
+EELAYER 25  0
 EELAYER END
 $Descr A4 11700 8267
+encoding utf-8
 Sheet 1 1
 Title ""
-Date "20 dec 2011"
+Date "14 aug 2013"
 Rev ""
 Comp ""
 Comment1 ""
@@ -44,226 +45,333 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+Connection ~ 9850 3250
 Wire Wire Line
-	7800 5450 8200 5450
+	9850 3250 9900 3250
+Connection ~ 9850 3450
 Wire Wire Line
-	9100 4700 9100 4750
-Connection ~ 9300 4250
+	9850 3450 9900 3450
 Wire Wire Line
-	9300 4200 9300 4250
+	9500 4250 9100 4250
 Wire Wire Line
-	9000 5450 9500 5450
+	2550 2500 3250 2500
 Wire Wire Line
-	9500 5450 9500 5250
+	3250 2500 3250 2250
 Wire Wire Line
-	9000 5350 9100 5350
+	3250 2250 4100 2250
 Wire Wire Line
-	9500 2200 10050 2200
+	2550 2250 2600 2250
 Wire Wire Line
-	9500 2500 10050 2500
+	1800 2350 1750 2350
 Wire Wire Line
-	8100 2150 8100 2050
+	6550 5450 6400 5450
 Wire Wire Line
-	8100 2050 8250 2050
+	5600 5450 5700 5450
 Wire Wire Line
-	8250 1850 5950 1850
+	9400 5550 9400 5400
 Wire Wire Line
-	8200 2750 5950 2750
+	9400 5400 9500 5400
 Wire Wire Line
-	8200 2950 5950 2950
+	9500 5400 9500 5250
 Wire Wire Line
-	3750 2750 3750 2850
+	2750 5400 2850 5400
 Wire Wire Line
-	3750 2850 3550 2850
-Connection ~ 3950 3050
+	2850 5400 2850 5450
 Wire Wire Line
-	3550 3050 4100 3050
+	3950 1900 4100 1900
+Connection ~ 3000 2050
 Wire Wire Line
-	1650 5550 2050 5550
+	3450 2050 3450 1950
 Wire Wire Line
-	2950 5550 2850 5550
-Connection ~ 2900 5250
+	2100 2050 2100 1950
 Wire Wire Line
-	2950 5350 2900 5350
+	9500 4700 9500 4750
 Wire Wire Line
-	2900 5350 2900 5000
-Connection ~ 4500 5250
+	9500 4250 9500 4300
 Wire Wire Line
-	4500 5000 4500 5250
+	9100 4250 9100 4300
 Wire Wire Line
-	6350 2050 5950 2050
+	10050 2100 9500 2100
 Wire Wire Line
-	6350 2250 5950 2250
+	9500 2300 10050 2300
 Wire Wire Line
-	6350 2450 5950 2450
-Connection ~ 1650 2550
+	10050 2400 9500 2400
 Wire Wire Line
-	1550 2450 1650 2450
+	10050 2600 9500 2600
 Wire Wire Line
-	5750 5900 5750 5950
+	8250 1950 5950 1950
 Wire Wire Line
-	4850 4800 4850 4750
+	8200 2650 5950 2650
 Wire Wire Line
-	4450 5550 4550 5550
-Connection ~ 4950 5450
+	5950 2850 8200 2850
 Wire Wire Line
-	4450 5450 5100 5450
-Connection ~ 5750 5450
+	8200 3050 5950 3050
 Wire Wire Line
-	5600 5450 6200 5450
+	3550 2950 3750 2950
 Wire Wire Line
-	6150 5700 6150 5550
+	6500 5250 6500 5350
 Wire Wire Line
-	6150 5550 6200 5550
+	6500 5350 6550 5350
 Wire Wire Line
-	4100 1800 4100 1350
+	2850 5450 2950 5450
 Wire Wire Line
-	3950 3600 3950 3500
+	2900 5250 2950 5250
 Wire Wire Line
-	3600 1600 3600 1500
-Connection ~ 1800 2050
+	8250 1750 7850 1750
 Wire Wire Line
-	1800 2000 1800 2050
-Connection ~ 3600 2050
+	6350 2150 5950 2150
 Wire Wire Line
-	3600 2050 3600 2000
+	5950 2350 6350 2350
 Wire Wire Line
-	1550 2050 2200 2050
+	5950 2550 6350 2550
 Wire Wire Line
-	1550 2150 4100 2150
+	4950 5900 4950 5950
 Wire Wire Line
-	3950 3050 3950 3100
+	4850 5200 4850 5250
 Wire Wire Line
-	5050 3750 5050 3900
-Connection ~ 5200 3850
-Connection ~ 5050 3850
+	4850 5250 4450 5250
+Wire Wire Line
+	4550 5600 4550 5550
+Wire Wire Line
+	4950 5450 4950 5500
+Wire Wire Line
+	2100 1550 2100 1450
+Wire Wire Line
+	3000 1550 3000 1450
+Connection ~ 4900 3850
+Wire Wire Line
+	4900 3850 4900 3750
+Wire Wire Line
+	5200 3750 5200 3850
+Wire Wire Line
+	5350 3750 5350 3850
+Wire Wire Line
+	4750 3750 4750 3850
 Wire Wire Line
 	4750 3850 5350 3850
-Connection ~ 1650 2750
+Connection ~ 5050 3850
+Connection ~ 5200 3850
 Wire Wire Line
-	1650 2650 1550 2650
-Connection ~ 1650 2850
+	5050 3750 5050 3900
 Wire Wire Line
-	1650 2850 1550 2850
+	3950 3050 3950 3100
 Wire Wire Line
-	1650 2750 1550 2750
+	3450 1550 3450 1450
 Wire Wire Line
-	4750 3850 4750 3750
+	3950 3600 3950 3500
 Wire Wire Line
-	5350 3850 5350 3750
+	6550 5550 6500 5550
 Wire Wire Line
-	5200 3750 5200 3850
+	4450 5450 5100 5450
+Connection ~ 4950 5450
 Wire Wire Line
-	4900 3850 4900 3750
-Connection ~ 4900 3850
+	4550 5550 4450 5550
 Wire Wire Line
-	4100 2250 1550 2250
+	4850 4800 4850 4750
 Wire Wire Line
-	2900 2050 4000 2050
+	5650 5800 5650 5750
 Wire Wire Line
-	4100 1900 4000 1900
-Connection ~ 4000 1900
+	6350 2450 5950 2450
 Wire Wire Line
-	3150 2050 3150 2000
-Connection ~ 3150 2050
+	6350 2250 5950 2250
 Wire Wire Line
-	3150 1600 3150 1500
+	6350 2050 5950 2050
 Wire Wire Line
-	1800 1600 1800 1500
+	4500 5000 4500 5250
+Connection ~ 4500 5250
 Wire Wire Line
-	4000 2050 4000 1250
+	2900 5000 2900 5350
 Wire Wire Line
-	4100 1350 4750 1350
+	2900 5350 2950 5350
+Connection ~ 2900 5250
 Wire Wire Line
-	5750 5450 5750 5500
+	2950 5550 2850 5550
 Wire Wire Line
-	4950 5450 4950 5500
+	3550 3050 4100 3050
+Connection ~ 3950 3050
 Wire Wire Line
-	4550 5550 4550 5600
+	3550 2850 3750 2850
 Wire Wire Line
-	4450 5250 4850 5250
+	3750 2850 3750 2750
 Wire Wire Line
-	4850 5250 4850 5200
+	8200 2950 5950 2950
 Wire Wire Line
-	4950 5900 4950 5950
+	8200 2750 5950 2750
 Wire Wire Line
-	1650 2550 1550 2550
-Connection ~ 1650 2650
+	8250 1850 5950 1850
 Wire Wire Line
-	1550 2350 1650 2350
+	8250 2050 8100 2050
 Wire Wire Line
-	1650 2350 1650 2950
-Connection ~ 1650 2450
+	8100 2050 8100 2150
 Wire Wire Line
-	5950 2550 6350 2550
+	9500 2500 10050 2500
 Wire Wire Line
-	5950 2350 6350 2350
+	9500 2200 10050 2200
 Wire Wire Line
-	6350 2150 5950 2150
+	9300 4200 9300 4250
+Connection ~ 9300 4250
 Wire Wire Line
-	8250 1750 7850 1750
+	9100 4700 9100 4750
 Wire Wire Line
-	2900 5250 2950 5250
+	3000 2050 3000 1950
 Wire Wire Line
-	2850 5450 2950 5450
+	4750 1350 4050 1350
 Wire Wire Line
-	2050 5450 1650 5450
+	4050 1350 4050 1800
 Wire Wire Line
-	6200 5350 6150 5350
+	4050 1800 4100 1800
 Wire Wire Line
-	6150 5350 6150 5250
+	2900 2050 3950 2050
 Wire Wire Line
-	3550 2950 3750 2950
+	3950 2050 3950 1250
+Connection ~ 3950 1900
+Connection ~ 3450 2050
 Wire Wire Line
-	8200 3050 5950 3050
+	2850 5550 2850 5600
 Wire Wire Line
-	5950 2850 8200 2850
+	2850 5600 2750 5600
 Wire Wire Line
-	8200 2650 5950 2650
+	9100 5250 9100 5400
 Wire Wire Line
-	8250 1950 5950 1950
+	9100 5400 9200 5400
 Wire Wire Line
-	10050 2600 9500 2600
+	9200 5400 9200 5550
 Wire Wire Line
-	10050 2400 9500 2400
+	5650 5750 5700 5750
 Wire Wire Line
-	9500 2300 10050 2300
+	6500 5550 6500 5750
 Wire Wire Line
-	10050 2100 9500 2100
+	6500 5750 6400 5750
 Wire Wire Line
-	9100 5350 9100 5250
+	2200 2050 1650 2050
 Wire Wire Line
-	9100 4300 9100 4250
+	1650 2050 1650 2500
 Wire Wire Line
-	9100 4250 9500 4250
+	1650 2500 1800 2500
+Connection ~ 2100 2050
 Wire Wire Line
-	9500 4250 9500 4300
+	1750 2250 1800 2250
 Wire Wire Line
-	9500 4700 9500 4750
+	2550 2350 3150 2350
 Wire Wire Line
-	8200 5350 7800 5350
-Text Label 7800 5450 0    60   ~ 0
-CBUS1
-Text Label 7800 5350 0    60   ~ 0
-CBUS0
+	3150 2350 3150 2150
+Wire Wire Line
+	3150 2150 4100 2150
+Wire Wire Line
+	9900 3150 9850 3150
+Wire Wire Line
+	9850 3150 9850 3500
+Wire Wire Line
+	9900 3350 9850 3350
+Connection ~ 9850 3350
+$Comp
+L GND #PWR01
+U 1 1 520C06DA
+P 9850 3500
+F 0 "#PWR01" H 9850 3500 30  0001 C CNN
+F 1 "GND" H 9850 3430 30  0001 C CNN
+	1    9850 3500
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_1 P8
+U 1 1 520C06D6
+P 10050 3350
+F 0 "P8" H 10130 3350 40  0000 L CNN
+F 1 "HOLE" H 10050 3405 30  0001 C CNN
+	1    10050 3350
+	1    0    0    -1  
+$EndComp
 $Comp
-L VCC #PWR18
+L CONN_1 P9
+U 1 1 520C06D5
+P 10050 3450
+F 0 "P9" H 10130 3450 40  0000 L CNN
+F 1 "HOLE" H 10050 3505 30  0001 C CNN
+	1    10050 3450
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_1 P7
+U 1 1 520C06CA
+P 10050 3250
+F 0 "P7" H 10130 3250 40  0000 L CNN
+F 1 "HOLE" H 10050 3305 30  0001 C CNN
+	1    10050 3250
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_1 P1
+U 1 1 520C06C4
+P 10050 3150
+F 0 "P1" H 10130 3150 40  0000 L CNN
+F 1 "HOLE" H 10050 3205 30  0001 C CNN
+	1    10050 3150
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR02
+U 1 1 520BFA35
+P 1750 2350
+F 0 "#PWR02" H 1750 2350 30  0001 C CNN
+F 1 "GND" H 1750 2280 30  0001 C CNN
+	1    1750 2350
+	0    1    1    0   
+$EndComp
+$Comp
+L GND #PWR03
+U 1 1 520BFA32
+P 1750 2250
+F 0 "#PWR03" H 1750 2250 30  0001 C CNN
+F 1 "GND" H 1750 2180 30  0001 C CNN
+	1    1750 2250
+	0    1    1    0   
+$EndComp
+$Comp
+L USB J1
+U 1 1 520BF9C7
+P 2200 2700
+F 0 "J1" H 2150 3100 60  0000 C CNN
+F 1 "USB" V 1950 2850 60  0000 C CNN
+	1    2200 2700
+	1    0    0    1   
+$EndComp
+$Comp
+L DS9503 U3
+U 1 1 520BF63D
+P 6050 5600
+F 0 "U3" H 5970 5590 60  0000 C CNN
+F 1 "DS9503" H 6050 5850 60  0000 C CNN
+	1    6050 5600
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_2 P5
+U 1 1 52082E52
+P 9300 5900
+F 0 "P5" V 9250 5900 40  0000 C CNN
+F 1 "LED_ENABLE" V 9350 5900 40  0000 C CNN
+	1    9300 5900
+	0    -1   1    0   
+$EndComp
+$Comp
+L CONN_2 P2
+U 1 1 520825F9
+P 2400 5500
+F 0 "P2" V 2350 5500 40  0000 C CNN
+F 1 "1WIRE_SELECT" V 2450 5500 40  0000 C CNN
+	1    2400 5500
+	-1   0    0    1   
+$EndComp
+$Comp
+L VCC #PWR04
 U 1 1 4EEFD710
 P 9300 4200
-F 0 "#PWR18" H 9300 4300 30  0001 C CNN
+F 0 "#PWR04" H 9300 4300 30  0001 C CNN
 F 1 "VCC" H 9300 4300 30  0000 C CNN
 	1    9300 4200
 	1    0    0    -1  
 $EndComp
-$Comp
-L CONN_2X2 P5
-U 1 1 4EEFD6DC
-P 8600 5400
-F 0 "P5" H 8600 5550 50  0000 C CNN
-F 1 "LED_ENABLE" H 8610 5270 40  0000 C CNN
-	1    8600 5400
-	1    0    0    -1  
-$EndComp
 Text Label 9500 2600 0    60   ~ 0
 RI
 Text Label 9500 2500 0    60   ~ 0
@@ -279,59 +387,46 @@ RTS
 Text Label 3750 2950 0    60   ~ 0
 VCC_IO
 $Comp
-L VCC #PWR6
+L VCC #PWR05
 U 1 1 4EEFD611
 P 3750 2750
-F 0 "#PWR6" H 3750 2850 30  0001 C CNN
+F 0 "#PWR05" H 3750 2850 30  0001 C CNN
 F 1 "VCC" H 3750 2850 30  0000 C CNN
 	1    3750 2750
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR15
+L VCC #PWR06
 U 1 1 4EEFD5CC
-P 6150 5250
-F 0 "#PWR15" H 6150 5350 30  0001 C CNN
-F 1 "VCC" H 6150 5350 30  0000 C CNN
-	1    6150 5250
-	1    0    0    -1  
-$EndComp
-Text Label 1650 5550 0    60   ~ 0
-RxD
-Text Label 1650 5450 0    60   ~ 0
-TxD
-$Comp
-L CONN_2X2 P2
-U 1 1 4EEFD5A2
-P 2450 5500
-F 0 "P2" H 2450 5650 50  0000 C CNN
-F 1 "1WIRE_SELECT" H 2460 5370 40  0000 C CNN
-	1    2450 5500
+P 6500 5250
+F 0 "#PWR06" H 6500 5350 30  0001 C CNN
+F 1 "VCC" H 6500 5350 30  0000 C CNN
+	1    6500 5250
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR3
+L VCC #PWR07
 U 1 1 4EEFD58D
 P 2900 5000
-F 0 "#PWR3" H 2900 5100 30  0001 C CNN
+F 0 "#PWR07" H 2900 5100 30  0001 C CNN
 F 1 "VCC" H 2900 5100 30  0000 C CNN
 	1    2900 5000
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR9
+L VCC #PWR08
 U 1 1 4EEFD575
 P 4500 5000
-F 0 "#PWR9" H 4500 5100 30  0001 C CNN
+F 0 "#PWR08" H 4500 5100 30  0001 C CNN
 F 1 "VCC" H 4500 5100 30  0000 C CNN
 	1    4500 5000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR17
+L GND #PWR09
 U 1 1 4EEFD565
 P 8100 2150
-F 0 "#PWR17" H 8100 2150 30  0001 C CNN
+F 0 "#PWR09" H 8100 2150 30  0001 C CNN
 F 1 "GND" H 8100 2080 30  0001 C CNN
 	1    8100 2150
 	1    0    0    -1  
@@ -339,12 +434,12 @@ $EndComp
 Text Label 7850 1750 0    60   ~ 0
 VCC_IO
 $Comp
-L VCC #PWR8
+L VCC #PWR010
 U 1 1 4EEFD501
-P 4000 1250
-F 0 "#PWR8" H 4000 1350 30  0001 C CNN
-F 1 "VCC" H 4000 1350 30  0000 C CNN
-	1    4000 1250
+P 3950 1250
+F 0 "#PWR010" H 3950 1350 30  0001 C CNN
+F 1 "VCC" H 3950 1350 30  0000 C CNN
+	1    3950 1250
 	1    0    0    -1  
 $EndComp
 Text Label 6350 1850 0    60   ~ 0
@@ -392,42 +487,33 @@ F 1 "RS232" V 8650 1900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR11
+L GND #PWR011
 U 1 1 4EEFD29E
 P 4850 4750
-F 0 "#PWR11" H 4850 4750 30  0001 C CNN
+F 0 "#PWR011" H 4850 4750 30  0001 C CNN
 F 1 "GND" H 4850 4680 30  0001 C CNN
 	1    4850 4750
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR12
+L GND #PWR012
 U 1 1 4EEFD29B
 P 4950 5950
-F 0 "#PWR12" H 4950 5950 30  0001 C CNN
+F 0 "#PWR012" H 4950 5950 30  0001 C CNN
 F 1 "GND" H 4950 5880 30  0001 C CNN
 	1    4950 5950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR14
+L GND #PWR013
 U 1 1 4EEFD298
-P 5750 5950
-F 0 "#PWR14" H 5750 5950 30  0001 C CNN
-F 1 "GND" H 5750 5880 30  0001 C CNN
-	1    5750 5950
+P 5650 5800
+F 0 "#PWR013" H 5650 5800 30  0001 C CNN
+F 1 "GND" H 5650 5730 30  0001 C CNN
+	1    5650 5800
 	1    0    0    -1  
 $EndComp
 NoConn ~ 4450 5350
-$Comp
-L DIODE D1
-U 1 1 4EEFD23B
-P 5750 5700
-F 0 "D1" H 5750 5800 40  0000 C CNN
-F 1 "DS9503" H 5750 5600 40  0000 C CNN
-	1    5750 5700
-	0    -1   -1   0   
-$EndComp
 Text Label 4750 1350 0    60   ~ 0
 VCC_IO
 $Comp
@@ -440,37 +526,37 @@ F 1 "IO_SELECT" V 3250 2950 40  0000 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR2
+L GND #PWR014
 U 1 1 4EEFD048
-P 1800 1500
-F 0 "#PWR2" H 1800 1500 30  0001 C CNN
-F 1 "GND" H 1800 1430 30  0001 C CNN
-	1    1800 1500
+P 2100 1450
+F 0 "#PWR014" H 2100 1450 30  0001 C CNN
+F 1 "GND" H 2100 1380 30  0001 C CNN
+	1    2100 1450
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR4
+L GND #PWR015
 U 1 1 4EEFD046
-P 3150 1500
-F 0 "#PWR4" H 3150 1500 30  0001 C CNN
-F 1 "GND" H 3150 1430 30  0001 C CNN
-	1    3150 1500
+P 3000 1450
+F 0 "#PWR015" H 3000 1450 30  0001 C CNN
+F 1 "GND" H 3000 1380 30  0001 C CNN
+	1    3000 1450
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR5
+L GND #PWR016
 U 1 1 4EEFD042
-P 3600 1500
-F 0 "#PWR5" H 3600 1500 30  0001 C CNN
-F 1 "GND" H 3600 1430 30  0001 C CNN
-	1    3600 1500
+P 3450 1450
+F 0 "#PWR016" H 3450 1450 30  0001 C CNN
+F 1 "GND" H 3450 1380 30  0001 C CNN
+	1    3450 1450
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR7
+L GND #PWR017
 U 1 1 4EEFCFDB
 P 3950 3600
-F 0 "#PWR7" H 3950 3600 30  0001 C CNN
+F 0 "#PWR017" H 3950 3600 30  0001 C CNN
 F 1 "GND" H 3950 3530 30  0001 C CNN
 	1    3950 3600
 	1    0    0    -1  
@@ -507,7 +593,7 @@ L R R3
 U 1 1 4EEFCC2B
 P 9500 5000
 F 0 "R3" V 9580 5000 50  0000 C CNN
-F 1 "1k0" V 9500 5000 50  0000 C CNN
+F 1 "470R" V 9500 5000 50  0000 C CNN
 	1    9500 5000
 	1    0    0    -1  
 $EndComp
@@ -516,59 +602,39 @@ L R R2
 U 1 1 4EEFCC28
 P 9100 5000
 F 0 "R2" V 9180 5000 50  0000 C CNN
-F 1 "1k0" V 9100 5000 50  0000 C CNN
+F 1 "470R" V 9100 5000 50  0000 C CNN
 	1    9100 5000
 	1    0    0    -1  
 $EndComp
 NoConn ~ 4100 2850
 NoConn ~ 4100 2750
-NoConn ~ 4100 2650
 NoConn ~ 4100 2550
-NoConn ~ 4100 2450
 $Comp
-L GND #PWR13
+L GND #PWR018
 U 1 1 4EEFCAFE
 P 5050 3900
-F 0 "#PWR13" H 5050 3900 30  0001 C CNN
+F 0 "#PWR018" H 5050 3900 30  0001 C CNN
 F 1 "GND" H 5050 3830 30  0001 C CNN
 	1    5050 3900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR16
-U 1 1 4EEFCB0F
-P 6150 5700
-F 0 "#PWR16" H 6150 5700 30  0001 C CNN
-F 1 "GND" H 6150 5630 30  0001 C CNN
-	1    6150 5700
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR10
+L GND #PWR019
 U 1 1 4EEFCB0C
 P 4550 5600
-F 0 "#PWR10" H 4550 5600 30  0001 C CNN
+F 0 "#PWR019" H 4550 5600 30  0001 C CNN
 F 1 "GND" H 4550 5530 30  0001 C CNN
 	1    4550 5600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR1
+L GND #PWR020
 U 1 1 4EEFCAE9
-P 1650 2950
-F 0 "#PWR1" H 1650 2950 30  0001 C CNN
-F 1 "GND" H 1650 2880 30  0001 C CNN
-	1    1650 2950
-	1    0    0    -1  
-$EndComp
-$Comp
-L CONN_9 P1
-U 1 1 4EEFCAD4
-P 1200 2450
-F 0 "P1" H 1150 2450 60  0000 C CNN
-F 1 "USB" V 1250 2450 60  0000 C CNN
-	1    1200 2450
-	-1   0    0    1   
+P 2600 2250
+F 0 "#PWR020" H 2600 2250 30  0001 C CNN
+F 1 "GND" H 2600 2180 30  0001 C CNN
+	1    2600 2250
+	0    -1   -1   0   
 $EndComp
 $Comp
 L CONN_6 P6
@@ -582,10 +648,10 @@ $EndComp
 $Comp
 L CONN_3 K2
 U 1 1 4EEFC7AD
-P 6550 5450
-F 0 "K2" V 6500 5450 50  0000 C CNN
-F 1 "1WIRE" V 6600 5450 40  0000 C CNN
-	1    6550 5450
+P 6900 5450
+F 0 "K2" V 6850 5450 50  0000 C CNN
+F 1 "1WIRE" V 6950 5450 40  0000 C CNN
+	1    6900 5450
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -619,28 +685,28 @@ $EndComp
 $Comp
 L CP1 C3
 U 1 1 4EEFC438
-P 3600 1800
-F 0 "C3" H 3450 1700 50  0000 L CNN
-F 1 "4.7µF" H 3350 1900 50  0000 L CNN
-	1    3600 1800
+P 3450 1750
+F 0 "C3" H 3300 1650 50  0000 L CNN
+F 1 "4.7µF" H 3200 1550 50  0000 L CNN
+	1    3450 1750
 	-1   0    0    1   
 $EndComp
 $Comp
 L C C2
 U 1 1 4EEFC423
-P 3150 1800
-F 0 "C2" H 3200 1900 50  0000 L CNN
-F 1 "100nF" H 3200 1700 50  0000 L CNN
-	1    3150 1800
+P 3000 1750
+F 0 "C2" H 3050 1850 50  0000 L CNN
+F 1 "100nF" H 3050 1950 50  0000 L CNN
+	1    3000 1750
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1
 U 1 1 4EEFC41D
-P 1800 1800
-F 0 "C1" H 1850 1900 50  0000 L CNN
-F 1 "10nF" H 1850 1700 50  0000 L CNN
-	1    1800 1800
+P 2100 1750
+F 0 "C1" H 2150 1850 50  0000 L CNN
+F 1 "10nF" H 2150 1950 50  0000 L CNN
+	1    2100 1750
 	1    0    0    -1  
 $EndComp
 $Comp