Component placement

gpstracker-interface.sch

@@ -314,10 +314,10 @@ F 3 "" H 4450 2000 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3.3V_FDTI #PWR044
+L +3.3V_FDTI #PWR51
 U 1 1 5A36BE13
 P 4450 1750
-F 0 "#PWR044" H 4450 1600 50  0001 C CNN
+F 0 "#PWR51" H 4450 1600 50  0001 C CNN
 F 1 "+3.3V_FDTI" H 4450 1890 50  0000 C CNN
 F 2 "" H 4450 1750 50  0001 C CNN
 F 3 "" H 4450 1750 50  0001 C CNN
@@ -325,10 +325,10 @@ F 3 "" H 4450 1750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V_FDTI #PWR045
+L +3.3V_FDTI #PWR47
 U 1 1 5A36BE45
 P 2050 1650
-F 0 "#PWR045" H 2050 1500 50  0001 C CNN
+F 0 "#PWR47" H 2050 1500 50  0001 C CNN
 F 1 "+3.3V_FDTI" H 2050 1790 50  0000 C CNN
 F 2 "" H 2050 1650 50  0001 C CNN
 F 3 "" H 2050 1650 50  0001 C CNN
@@ -336,10 +336,10 @@ F 3 "" H 2050 1650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR046
+L GND #PWR46
 U 1 1 5A36E473
 P 2000 2700
-F 0 "#PWR046" H 2000 2450 50  0001 C CNN
+F 0 "#PWR46" H 2000 2450 50  0001 C CNN
 F 1 "GND" H 2000 2550 50  0000 C CNN
 F 2 "" H 2000 2700 50  0001 C CNN
 F 3 "" H 2000 2700 50  0001 C CNN
@@ -347,10 +347,10 @@ F 3 "" H 2000 2700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR047
+L GND #PWR49
 U 1 1 5A36E4AC
 P 2800 3300
-F 0 "#PWR047" H 2800 3050 50  0001 C CNN
+F 0 "#PWR49" H 2800 3050 50  0001 C CNN
 F 1 "GND" H 2800 3150 50  0000 C CNN
 F 2 "" H 2800 3300 50  0001 C CNN
 F 3 "" H 2800 3300 50  0001 C CNN
@@ -369,10 +369,10 @@ F 3 "" H 1250 950 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR048
+L GND #PWR44
 U 1 1 5A36EE8C
 P 1350 2550
-F 0 "#PWR048" H 1350 2300 50  0001 C CNN
+F 0 "#PWR44" H 1350 2300 50  0001 C CNN
 F 1 "GND" H 1350 2400 50  0000 C CNN
 F 2 "" H 1350 2550 50  0001 C CNN
 F 3 "" H 1350 2550 50  0001 C CNN
@@ -380,10 +380,10 @@ F 3 "" H 1350 2550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBUS #PWR049
+L VBUS #PWR45
 U 1 1 5A36EF48
 P 1700 1000
-F 0 "#PWR049" H 1700 850 50  0001 C CNN
+F 0 "#PWR45" H 1700 850 50  0001 C CNN
 F 1 "VBUS" H 1700 1150 50  0000 C CNN
 F 2 "" H 1700 1000 50  0001 C CNN
 F 3 "" H 1700 1000 50  0001 C CNN
@@ -391,10 +391,10 @@ F 3 "" H 1700 1000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBUS #PWR050
+L VBUS #PWR48
 U 1 1 5A36EFB3
 P 2700 1400
-F 0 "#PWR050" H 2700 1250 50  0001 C CNN
+F 0 "#PWR48" H 2700 1250 50  0001 C CNN
 F 1 "VBUS" H 2700 1550 50  0000 C CNN
 F 2 "" H 2700 1400 50  0001 C CNN
 F 3 "" H 2700 1400 50  0001 C CNN
@@ -404,10 +404,10 @@ $EndComp
 NoConn ~ 3500 2600
 NoConn ~ 3500 2900
 $Comp
-L +3.3V_FDTI #PWR051
+L +3.3V_FDTI #PWR50
 U 1 1 5A36F015
 P 2900 1300
-F 0 "#PWR051" H 2900 1150 50  0001 C CNN
+F 0 "#PWR50" H 2900 1150 50  0001 C CNN
 F 1 "+3.3V_FDTI" H 2900 1440 50  0000 C CNN
 F 2 "" H 2900 1300 50  0001 C CNN
 F 3 "" H 2900 1300 50  0001 C CNN
@@ -427,10 +427,10 @@ CTS
 Text HLabel 3600 2100 2    60   Input ~ 0
 DTR
 $Comp
-L GND #PWR052
+L GND #PWR43
 U 1 1 5A3703B4
 P 1300 1800
-F 0 "#PWR052" H 1300 1550 50  0001 C CNN
+F 0 "#PWR43" H 1300 1550 50  0001 C CNN
 F 1 "GND" H 1300 1650 50  0000 C CNN
 F 2 "" H 1300 1800 50  0001 C CNN
 F 3 "" H 1300 1800 50  0001 C CNN
@@ -439,10 +439,10 @@ F 3 "" H 1300 1800 50  0001 C CNN
 $EndComp
 NoConn ~ 900  1300
 $Comp
-L GND #PWR053
+L GND #PWR42
 U 1 1 5A370474
 P 600 1050
-F 0 "#PWR053" H 600 800 50  0001 C CNN
+F 0 "#PWR42" H 600 800 50  0001 C CNN
 F 1 "GND" H 600 900 50  0000 C CNN
 F 2 "" H 600 1050 50  0001 C CNN
 F 3 "" H 600 1050 50  0001 C CNN

gpstracker.net

@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source D:/working-copies/Engineering/gpstacker/gpstracker.sch)
-    (date "12/17/17 16:05:34")
+    (date "12/17/17 18:23:44")
     (tool "Eeschema 4.0.6")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -135,8 +135,8 @@
       (sheetpath (names /) (tstamps /))
       (tstamp 5A3673F0))
     (comp (ref J2)
-      (value GS2)
-      (footprint Connectors:GS2)
+      (value Leds)
+      (footprint Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm)
       (libsource (lib conn) (part GS2))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A36856F))
@@ -201,7 +201,7 @@
       (sheetpath (names /) (tstamps /))
       (tstamp 5A374BBC))
     (comp (ref BT2)
-      (value Battery_Cell)
+      (value "Backup battery")
       (footprint Battery_Holders:Keystone_1058_1x2032-CoinCell)
       (libsource (lib device) (part Battery_Cell))
       (sheetpath (names /) (tstamps /))
@@ -225,7 +225,7 @@
       (sheetpath (names /) (tstamps /))
       (tstamp 5A385146))
     (comp (ref BT1)
-      (value Battery_Cell)
+      (value "External battery")
       (footprint Connectors_JST:JST_PH_S2B-PH-SM4-TB_02x2.00mm_Angled)
       (libsource (lib device) (part Battery_Cell))
       (sheetpath (names /) (tstamps /))
@@ -315,6 +315,12 @@
       (libsource (lib Switch) (part SW_Push))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A36BA3E))
+    (comp (ref C15)
+      (value 0.1uF)
+      (footprint Capacitors_SMD:C_0805_HandSoldering)
+      (libsource (lib device) (part C))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5A376B81))
     (comp (ref U6)
       (value FT231XS)
       (footprint Housings_SSOP:SSOP-20_4.4x6.5mm_Pitch0.65mm)
@@ -849,350 +855,352 @@
     (library (logical device)
       (uri C:\Apps\Engineering\KiCad\share\kicad\library\device.lib)))
   (nets
-    (net (code 1) (name /ARD_HRX)
-      (node (ref IC1) (pin 14))
-      (node (ref U2) (pin 9)))
-    (net (code 2) (name "Net-(IC1-Pad42)")
-      (node (ref IC1) (pin 42)))
-    (net (code 3) (name "Net-(IC1-Pad62)")
-      (node (ref IC1) (pin 62)))
-    (net (code 4) (name "Net-(IC1-Pad13)")
-      (node (ref IC1) (pin 13))
-      (node (ref R13) (pin 1)))
-    (net (code 5) (name "Net-(IC1-Pad23)")
+    (net (code 1) (name "Net-(IC1-Pad44)")
+      (node (ref IC1) (pin 44)))
+    (net (code 2) (name "Net-(IC1-Pad23)")
       (node (ref IC1) (pin 23)))
-    (net (code 6) (name "Net-(IC1-Pad33)")
+    (net (code 3) (name "Net-(IC1-Pad33)")
       (node (ref IC1) (pin 33)))
-    (net (code 7) (name "Net-(IC1-Pad43)")
+    (net (code 4) (name "Net-(IC1-Pad43)")
       (node (ref IC1) (pin 43)))
-    (net (code 8) (name "Net-(IC1-Pad53)")
+    (net (code 5) (name "Net-(IC1-Pad53)")
       (node (ref IC1) (pin 53)))
-    (net (code 9) (name "Net-(IC1-Pad63)")
+    (net (code 6) (name "Net-(IC1-Pad63)")
       (node (ref IC1) (pin 63)))
-    (net (code 10) (name /SIMRST)
-      (node (ref TV1) (pin 3))
-      (node (ref J3) (pin 2))
-      (node (ref IC1) (pin 32)))
-    (net (code 11) (name "Net-(IC1-Pad24)")
+    (net (code 7) (name "Net-(IC1-Pad24)")
       (node (ref IC1) (pin 24)))
-    (net (code 12) (name "Net-(IC1-Pad44)")
-      (node (ref IC1) (pin 44)))
-    (net (code 13) (name "Net-(IC1-Pad25)")
+    (net (code 8) (name "Net-(IC1-Pad62)")
+      (node (ref IC1) (pin 62)))
+    (net (code 9) (name "Net-(IC1-Pad25)")
       (node (ref IC1) (pin 25)))
-    (net (code 14) (name "Net-(IC1-Pad35)")
+    (net (code 10) (name "Net-(IC1-Pad35)")
       (node (ref J4) (pin 1))
       (node (ref IC1) (pin 35)))
-    (net (code 15) (name "Net-(IC1-Pad45)")
+    (net (code 11) (name "Net-(IC1-Pad45)")
       (node (ref IC1) (pin 45)))
-    (net (code 16) (name "Net-(IC1-Pad60)")
-      (node (ref IC1) (pin 60)))
-    (net (code 17) (name +BATT)
-      (node (ref Q1) (pin 2))
-      (node (ref IC1) (pin 6))
-      (node (ref BT1) (pin 1))
-      (node (ref IC1) (pin 5))
-      (node (ref IC1) (pin 4))
-      (node (ref U1) (pin 3))
-      (node (ref C3) (pin 1)))
-    (net (code 18) (name /SIM808_P)
-      (node (ref IC1) (pin 8))
-      (node (ref U2) (pin 13)))
-    (net (code 19) (name "Net-(IC1-Pad9)")
+    (net (code 12) (name "Net-(IC1-Pad55)")
+      (node (ref IC1) (pin 55)))
+    (net (code 13) (name "Net-(IC1-Pad21)")
+      (node (ref IC1) (pin 21)))
+    (net (code 14) (name /SIM808_P)
+      (node (ref U2) (pin 13))
+      (node (ref IC1) (pin 8)))
+    (net (code 15) (name "Net-(IC1-Pad9)")
       (node (ref IC1) (pin 9)))
-    (net (code 20) (name "Net-(IC1-Pad20)")
+    (net (code 16) (name /SIM808_RI)
+      (node (ref U2) (pin 32))
+      (node (ref IC1) (pin 10)))
+    (net (code 17) (name "Net-(IC1-Pad20)")
       (node (ref IC1) (pin 20)))
-    (net (code 21) (name /SIMDATA)
-      (node (ref J3) (pin 7))
+    (net (code 18) (name /SIMDATA)
       (node (ref TV1) (pin 5))
-      (node (ref IC1) (pin 30)))
-    (net (code 22) (name /NETWORK_LED)
+      (node (ref IC1) (pin 30))
+      (node (ref J3) (pin 7)))
+    (net (code 19) (name /NETWORK_LED)
       (node (ref R10) (pin 2))
       (node (ref IC1) (pin 50)))
-    (net (code 23) (name "Net-(IC1-Pad55)")
-      (node (ref IC1) (pin 55)))
-    (net (code 24) (name "Net-(IC1-Pad11)")
+    (net (code 20) (name "Net-(IC1-Pad60)")
+      (node (ref IC1) (pin 60)))
+    (net (code 21) (name "Net-(IC1-Pad11)")
       (node (ref IC1) (pin 11)))
-    (net (code 25) (name "Net-(IC1-Pad21)")
-      (node (ref IC1) (pin 21)))
-    (net (code 26) (name /SIMCLK)
+    (net (code 22) (name "Net-(IC1-Pad26)")
+      (node (ref IC1) (pin 26)))
+    (net (code 23) (name /SIMCLK)
       (node (ref TV1) (pin 4))
       (node (ref J3) (pin 3))
       (node (ref IC1) (pin 31)))
-    (net (code 27) (name "Net-(IC1-Pad41)")
+    (net (code 24) (name "Net-(IC1-Pad41)")
       (node (ref IC1) (pin 41)))
-    (net (code 28) (name "Net-(IC1-Pad61)")
+    (net (code 25) (name "Net-(IC1-Pad61)")
       (node (ref IC1) (pin 61)))
-    (net (code 29) (name "Net-(IC1-Pad12)")
+    (net (code 26) (name "Net-(IC1-Pad12)")
       (node (ref IC1) (pin 12)))
-    (net (code 30) (name "Net-(IC1-Pad22)")
+    (net (code 27) (name "Net-(IC1-Pad22)")
       (node (ref IC1) (pin 22)))
-    (net (code 31) (name "Net-(IC1-Pad39)")
-      (node (ref IC1) (pin 39)))
-    (net (code 32) (name "Net-(IC1-Pad19)")
-      (node (ref IC1) (pin 19)))
-    (net (code 33) (name /SIM808_S)
-      (node (ref U2) (pin 12))
+    (net (code 28) (name "Net-(IC1-Pad42)")
+      (node (ref IC1) (pin 42)))
+    (net (code 29) (name /SIMRST)
+      (node (ref TV1) (pin 3))
+      (node (ref J3) (pin 2))
+      (node (ref IC1) (pin 32)))
+    (net (code 30) (name /SIM808_S)
       (node (ref R9) (pin 2))
+      (node (ref U2) (pin 12))
       (node (ref IC1) (pin 49)))
-    (net (code 34) (name "Net-(IC1-Pad59)")
+    (net (code 31) (name "Net-(IC1-Pad59)")
       (node (ref IC1) (pin 59)))
-    (net (code 35) (name GND)
-      (node (ref U5) (pin 10))
-      (node (ref U5) (pin 8))
-      (node (ref IC1) (pin 36))
-      (node (ref U5) (pin 7))
-      (node (ref IC1) (pin 65))
-      (node (ref IC1) (pin 67))
-      (node (ref U5) (pin 6))
-      (node (ref U5) (pin 5))
+    (net (code 32) (name GND)
+      (node (ref C8) (pin 2))
+      (node (ref C6) (pin 2))
       (node (ref U5) (pin 9))
-      (node (ref C9) (pin 2))
-      (node (ref IC1) (pin 40))
-      (node (ref C2) (pin 2))
-      (node (ref IC1) (pin 28))
+      (node (ref U2) (pin 3))
+      (node (ref C10) (pin 2))
       (node (ref C3) (pin 2))
       (node (ref C1) (pin 1))
-      (node (ref J1) (pin 6))
-      (node (ref J1) (pin 5))
-      (node (ref IC1) (pin 18))
-      (node (ref ICSP1) (pin 6))
-      (node (ref U5) (pin 13))
-      (node (ref U5) (pin 12))
+      (node (ref SW1) (pin 1))
       (node (ref U5) (pin 11))
-      (node (ref J4) (pin 2))
+      (node (ref U5) (pin 5))
+      (node (ref C15) (pin 2))
+      (node (ref U5) (pin 6))
+      (node (ref U5) (pin 7))
+      (node (ref U5) (pin 8))
       (node (ref J5) (pin 2))
-      (node (ref IC1) (pin 64))
-      (node (ref C4) (pin 2))
-      (node (ref IC1) (pin 34))
-      (node (ref C6) (pin 2))
-      (node (ref U4) (pin 1))
-      (node (ref C8) (pin 2))
-      (node (ref IC1) (pin 68))
-      (node (ref IC1) (pin 54))
-      (node (ref J3) (pin 5))
-      (node (ref J6) (pin 6))
+      (node (ref BT1) (pin 2))
+      (node (ref J2) (pin 1))
       (node (ref J6) (pin 9))
-      (node (ref R7) (pin 2))
-      (node (ref C10) (pin 2))
-      (node (ref LED2) (pin 1))
-      (node (ref U2) (pin 21))
-      (node (ref TV1) (pin 2))
+      (node (ref J6) (pin 6))
+      (node (ref C9) (pin 2))
+      (node (ref J4) (pin 2))
+      (node (ref ICSP1) (pin 6))
+      (node (ref C2) (pin 2))
+      (node (ref C7) (pin 2))
+      (node (ref R1) (pin 2))
       (node (ref IC1) (pin 52))
+      (node (ref U5) (pin 13))
+      (node (ref IC1) (pin 36))
+      (node (ref U5) (pin 12))
+      (node (ref IC1) (pin 67))
+      (node (ref U4) (pin 1))
+      (node (ref BT2) (pin 2))
+      (node (ref U5) (pin 10))
+      (node (ref C4) (pin 2))
+      (node (ref IC1) (pin 64))
       (node (ref U6) (pin 6))
       (node (ref U6) (pin 9))
       (node (ref C11) (pin 2))
       (node (ref U6) (pin 16))
       (node (ref C12) (pin 2))
-      (node (ref IC1) (pin 51))
       (node (ref C13) (pin 2))
       (node (ref C14) (pin 2))
+      (node (ref J3) (pin 5))
+      (node (ref U1) (pin 2))
       (node (ref IC1) (pin 1))
       (node (ref IC1) (pin 2))
       (node (ref IC1) (pin 3))
-      (node (ref U1) (pin 2))
-      (node (ref C7) (pin 2))
-      (node (ref BT1) (pin 2))
-      (node (ref U3) (pin 1))
-      (node (ref R1) (pin 2))
-      (node (ref SW1) (pin 1))
-      (node (ref U2) (pin 5))
-      (node (ref BT2) (pin 2))
-      (node (ref U2) (pin 3))
+      (node (ref IC1) (pin 18))
+      (node (ref IC1) (pin 28))
+      (node (ref IC1) (pin 68))
+      (node (ref J1) (pin 5))
+      (node (ref J1) (pin 6))
+      (node (ref IC1) (pin 34))
+      (node (ref IC1) (pin 54))
+      (node (ref IC1) (pin 65))
+      (node (ref TV1) (pin 2))
+      (node (ref IC1) (pin 40))
+      (node (ref IC1) (pin 51))
+      (node (ref LED2) (pin 1))
+      (node (ref U2) (pin 21))
       (node (ref U3) (pin 4))
-      (node (ref J2) (pin 1))
+      (node (ref U3) (pin 1))
       (node (ref U3) (pin 2))
-      (node (ref U3) (pin 3)))
-    (net (code 36) (name "Net-(IC1-Pad38)")
+      (node (ref U3) (pin 3))
+      (node (ref R7) (pin 2))
+      (node (ref U2) (pin 5)))
+    (net (code 33) (name "Net-(IC1-Pad39)")
+      (node (ref IC1) (pin 39)))
+    (net (code 34) (name "Net-(IC1-Pad38)")
       (node (ref IC1) (pin 38)))
-    (net (code 37) (name +1V8)
+    (net (code 35) (name +1V8)
       (node (ref IC1) (pin 29))
-      (node (ref J3) (pin 1))
-      (node (ref TV1) (pin 1)))
-    (net (code 38) (name "Net-(IC1-Pad37)")
-      (node (ref IC1) (pin 37)))
-    (net (code 39) (name /ARD_RST)
-      (node (ref SW1) (pin 2))
-      (node (ref U2) (pin 29))
-      (node (ref ICSP1) (pin 5))
-      (node (ref IC1) (pin 16))
-      (node (ref C5) (pin 1))
-      (node (ref R6) (pin 1)))
-    (net (code 40) (name "Net-(IC1-Pad26)")
-      (node (ref IC1) (pin 26)))
-    (net (code 41) (name "Net-(IC1-Pad46)")
+      (node (ref TV1) (pin 1))
+      (node (ref J3) (pin 1)))
+    (net (code 36) (name "Net-(IC1-Pad46)")
       (node (ref IC1) (pin 46)))
-    (net (code 42) (name "Net-(IC1-Pad56)")
+    (net (code 37) (name "Net-(IC1-Pad56)")
       (node (ref IC1) (pin 56)))
-    (net (code 43) (name "Net-(IC1-Pad66)")
+    (net (code 38) (name "Net-(IC1-Pad66)")
       (node (ref J5) (pin 1))
       (node (ref IC1) (pin 66)))
-    (net (code 44) (name "Net-(C9-Pad1)")
-      (node (ref C9) (pin 1))
-      (node (ref IC1) (pin 17)))
-    (net (code 45) (name "Net-(IC1-Pad27)")
+    (net (code 39) (name "Net-(C9-Pad1)")
+      (node (ref IC1) (pin 17))
+      (node (ref C9) (pin 1)))
+    (net (code 40) (name "Net-(IC1-Pad27)")
       (node (ref IC1) (pin 27)))
-    (net (code 46) (name "Net-(IC1-Pad47)")
+    (net (code 41) (name "Net-(IC1-Pad37)")
+      (node (ref IC1) (pin 37)))
+    (net (code 42) (name "Net-(IC1-Pad47)")
       (node (ref IC1) (pin 47)))
-    (net (code 47) (name "Net-(IC1-Pad57)")
+    (net (code 43) (name "Net-(IC1-Pad57)")
       (node (ref IC1) (pin 57)))
-    (net (code 48) (name "Net-(IC1-Pad48)")
+    (net (code 44) (name +2V8)
+      (node (ref IC1) (pin 7))
+      (node (ref R13) (pin 2)))
+    (net (code 45) (name "Net-(IC1-Pad48)")
       (node (ref IC1) (pin 48)))
-    (net (code 49) (name "Net-(IC1-Pad58)")
+    (net (code 46) (name "Net-(IC1-Pad58)")
       (node (ref IC1) (pin 58)))
-    (net (code 50) (name "Net-(BT2-Pad1)")
-      (node (ref BT2) (pin 1))
-      (node (ref U5) (pin 14)))
-    (net (code 51) (name "Net-(R11-Pad1)")
+    (net (code 47) (name "Net-(IC1-Pad19)")
+      (node (ref IC1) (pin 19)))
+    (net (code 48) (name "Net-(BT2-Pad1)")
+      (node (ref U5) (pin 14))
+      (node (ref BT2) (pin 1)))
+    (net (code 49) (name "Net-(R11-Pad1)")
       (node (ref U5) (pin 2))
       (node (ref R11) (pin 1)))
-    (net (code 52) (name "Net-(R1-Pad1)")
-      (node (ref R1) (pin 1))
-      (node (ref U1) (pin 5)))
-    (net (code 53) (name "Net-(R2-Pad2)")
-      (node (ref U1) (pin 1))
+    (net (code 50) (name "Net-(R1-Pad1)")
+      (node (ref U1) (pin 5))
+      (node (ref R1) (pin 1)))
+    (net (code 51) (name "Net-(R2-Pad2)")
       (node (ref R2) (pin 2))
+      (node (ref U1) (pin 1))
       (node (ref R3) (pin 2)))
-    (net (code 54) (name "Net-(J2-Pad2)")
-      (node (ref J2) (pin 2))
-      (node (ref LED5) (pin 1))
-      (node (ref LED4) (pin 1))
-      (node (ref LED3) (pin 1)))
-    (net (code 55) (name "Net-(LED3-Pad2)")
-      (node (ref LED3) (pin 2))
-      (node (ref R8) (pin 1)))
-    (net (code 56) (name "Net-(LED4-Pad2)")
-      (node (ref LED4) (pin 2))
-      (node (ref R9) (pin 1)))
-    (net (code 57) (name "Net-(LED5-Pad2)")
+    (net (code 52) (name "Net-(LED3-Pad2)")
+      (node (ref R8) (pin 1))
+      (node (ref LED3) (pin 2)))
+    (net (code 53) (name "Net-(LED4-Pad2)")
+      (node (ref R9) (pin 1))
+      (node (ref LED4) (pin 2)))
+    (net (code 54) (name "Net-(LED5-Pad2)")
       (node (ref R10) (pin 1))
       (node (ref LED5) (pin 2)))
-    (net (code 58) (name "Net-(U2-Pad26)")
-      (node (ref U2) (pin 26)))
-    (net (code 59) (name "Net-(U2-Pad11)")
-      (node (ref U2) (pin 11)))
-    (net (code 60) (name "Net-(U2-Pad19)")
-      (node (ref U2) (pin 19)))
-    (net (code 61) (name "Net-(U2-Pad22)")
-      (node (ref U2) (pin 22)))
-    (net (code 62) (name "Net-(U2-Pad25)")
-      (node (ref U2) (pin 25)))
-    (net (code 63) (name +3V3)
-      (node (ref R4) (pin 2))
-      (node (ref R5) (pin 2))
-      (node (ref R6) (pin 2))
-      (node (ref R12) (pin 2))
+    (net (code 55) (name +3V3)
+      (node (ref U3) (pin 8))
+      (node (ref U2) (pin 6))
+      (node (ref U2) (pin 4))
+      (node (ref R14) (pin 2))
+      (node (ref R15) (pin 2))
       (node (ref R8) (pin 2))
+      (node (ref J6) (pin 4))
+      (node (ref R12) (pin 2))
       (node (ref C8) (pin 1))
+      (node (ref R4) (pin 2))
+      (node (ref R5) (pin 2))
       (node (ref U4) (pin 2))
-      (node (ref R14) (pin 2))
+      (node (ref R6) (pin 2))
       (node (ref C4) (pin 1))
-      (node (ref U3) (pin 8))
-      (node (ref J6) (pin 4))
+      (node (ref U2) (pin 18))
       (node (ref ICSP1) (pin 2))
-      (node (ref R15) (pin 2))
-      (node (ref U2) (pin 6))
-      (node (ref U2) (pin 4))
-      (node (ref U2) (pin 18)))
-    (net (code 64) (name "Net-(U2-Pad23)")
+      (node (ref C15) (pin 1)))
+    (net (code 56) (name "Net-(U2-Pad19)")
+      (node (ref U2) (pin 19)))
+    (net (code 57) (name "Net-(U2-Pad22)")
+      (node (ref U2) (pin 22)))
+    (net (code 58) (name "Net-(U2-Pad11)")
+      (node (ref U2) (pin 11)))
+    (net (code 59) (name +BATT)
+      (node (ref Q1) (pin 2))
+      (node (ref U1) (pin 3))
+      (node (ref BT1) (pin 1))
+      (node (ref C3) (pin 1))
+      (node (ref IC1) (pin 6))
+      (node (ref IC1) (pin 5))
+      (node (ref IC1) (pin 4)))
+    (net (code 60) (name "Net-(U2-Pad23)")
       (node (ref U2) (pin 23)))
-    (net (code 65) (name "Net-(U2-Pad24)")
+    (net (code 61) (name "Net-(U2-Pad24)")
       (node (ref U2) (pin 24)))
-    (net (code 66) (name "Net-(LED1-Pad1)")
+    (net (code 62) (name "Net-(U2-Pad25)")
+      (node (ref U2) (pin 25)))
+    (net (code 63) (name "Net-(U2-Pad26)")
+      (node (ref U2) (pin 26)))
+    (net (code 64) (name "Net-(LED1-Pad1)")
       (node (ref LED1) (pin 1))
       (node (ref R3) (pin 1)))
-    (net (code 67) (name "Net-(LED2-Pad2)")
+    (net (code 65) (name "Net-(LED2-Pad2)")
       (node (ref LED2) (pin 2))
       (node (ref R2) (pin 1)))
-    (net (code 68) (name "Net-(C2-Pad1)")
-      (node (ref U2) (pin 20))
-      (node (ref C2) (pin 1)))
-    (net (code 69) (name /ARD_RX)
-      (node (ref U2) (pin 30))
-      (node (ref U6) (pin 20)))
-    (net (code 70) (name /ARD_TX)
+    (net (code 66) (name /ARD_TX)
       (node (ref U6) (pin 4))
       (node (ref U2) (pin 31)))
-    (net (code 71) (name /DTR)
+    (net (code 67) (name /ARD_RX)
+      (node (ref U6) (pin 20))
+      (node (ref U2) (pin 30)))
+    (net (code 68) (name /DTR)
       (node (ref U6) (pin 1))
       (node (ref C5) (pin 2)))
-    (net (code 72) (name "Net-(U3-Pad7)")
+    (net (code 69) (name "Net-(U3-Pad7)")
       (node (ref U3) (pin 7)))
-    (net (code 73) (name /SIM808_RI)
-      (node (ref U2) (pin 32))
-      (node (ref IC1) (pin 10)))
-    (net (code 74) (name /ARD_HTX)
-      (node (ref IC1) (pin 15))
-      (node (ref U2) (pin 10)))
-    (net (code 75) (name +2V8)
-      (node (ref R13) (pin 2))
-      (node (ref IC1) (pin 7)))
-    (net (code 77) (name /RTC_PWR)
-      (node (ref R11) (pin 2))
+    (net (code 70) (name "Net-(IC1-Pad13)")
+      (node (ref IC1) (pin 13))
+      (node (ref R13) (pin 1)))
+    (net (code 71) (name /ARD_RST)
+      (node (ref U2) (pin 29))
+      (node (ref SW1) (pin 2))
+      (node (ref C5) (pin 1))
+      (node (ref IC1) (pin 16))
+      (node (ref R6) (pin 1))
+      (node (ref ICSP1) (pin 5)))
+    (net (code 72) (name /ARD_HRX)
+      (node (ref U2) (pin 9))
+      (node (ref IC1) (pin 14)))
+    (net (code 73) (name /ARD_HTX)
+      (node (ref U2) (pin 10))
+      (node (ref IC1) (pin 15)))
+    (net (code 75) (name "Net-(C2-Pad1)")
+      (node (ref C2) (pin 1))
+      (node (ref U2) (pin 20)))
+    (net (code 76) (name /RTC_PWR)
       (node (ref C7) (pin 1))
-      (node (ref U2) (pin 2)))
-    (net (code 78) (name /ARD_SCK)
+      (node (ref U2) (pin 2))
+      (node (ref R11) (pin 2)))
+    (net (code 77) (name /ARD_SCK)
       (node (ref J6) (pin 5))
-      (node (ref U2) (pin 17))
-      (node (ref ICSP1) (pin 3)))
+      (node (ref ICSP1) (pin 3))
+      (node (ref U2) (pin 17)))
+    (net (code 78) (name /ARD_MOSI)
+      (node (ref J6) (pin 3))
+      (node (ref ICSP1) (pin 4))
+      (node (ref U2) (pin 15)))
     (net (code 79) (name "Net-(J6-Pad8)")
-      (node (ref R14) (pin 1))
-      (node (ref J6) (pin 8)))
+      (node (ref J6) (pin 8))
+      (node (ref R14) (pin 1)))
     (net (code 80) (name "Net-(J6-Pad1)")
       (node (ref R15) (pin 1))
       (node (ref J6) (pin 1)))
-    (net (code 81) (name /ARD_MOSI)
-      (node (ref ICSP1) (pin 4))
-      (node (ref J6) (pin 3))
-      (node (ref U2) (pin 15)))
-    (net (code 82) (name /ARD_MISO)
+    (net (code 81) (name /ARD_MISO)
       (node (ref U2) (pin 16))
       (node (ref ICSP1) (pin 1))
       (node (ref J6) (pin 7)))
-    (net (code 83) (name /ARD_IO10)
-      (node (ref U2) (pin 14))
-      (node (ref J6) (pin 2)))
-    (net (code 84) (name /SDA)
-      (node (ref U2) (pin 27))
+    (net (code 82) (name /ARD_IO10)
+      (node (ref J6) (pin 2))
+      (node (ref U2) (pin 14)))
+    (net (code 83) (name /SDA)
       (node (ref R4) (pin 1))
+      (node (ref U2) (pin 27))
       (node (ref U5) (pin 15))
       (node (ref U3) (pin 5)))
-    (net (code 85) (name /SCL)
-      (node (ref R5) (pin 1))
-      (node (ref U2) (pin 28))
-      (node (ref U5) (pin 16))
-      (node (ref U3) (pin 6)))
-    (net (code 86) (name "Net-(C6-Pad1)")
-      (node (ref U4) (pin 3))
+    (net (code 84) (name "Net-(C6-Pad1)")
       (node (ref Q1) (pin 3))
       (node (ref C6) (pin 1))
+      (node (ref U4) (pin 3))
       (node (ref D3) (pin 1)))
-    (net (code 87) (name "Net-(TV1-Pad6)")
+    (net (code 85) (name "Net-(TV1-Pad6)")
       (node (ref TV1) (pin 6)))
-    (net (code 88) (name /WAKE_UP)
-      (node (ref U5) (pin 3))
+    (net (code 86) (name /SCL)
+      (node (ref U5) (pin 16))
+      (node (ref U3) (pin 6))
+      (node (ref R5) (pin 1))
+      (node (ref U2) (pin 28)))
+    (net (code 87) (name /WAKE_UP)
       (node (ref R12) (pin 1))
-      (node (ref U2) (pin 1)))
-    (net (code 89) (name "Net-(U2-Pad7)")
+      (node (ref U2) (pin 1))
+      (node (ref U5) (pin 3)))
+    (net (code 88) (name "Net-(U2-Pad7)")
       (node (ref U2) (pin 7)))
-    (net (code 90) (name "Net-(U2-Pad8)")
+    (net (code 89) (name "Net-(U2-Pad8)")
       (node (ref U2) (pin 8)))
-    (net (code 91) (name "Net-(J3-Pad6)")
+    (net (code 90) (name "Net-(J3-Pad6)")
       (node (ref J3) (pin 6)))
-    (net (code 92) (name "Net-(U5-Pad1)")
-      (node (ref U5) (pin 1)))
-    (net (code 93) (name "Net-(U5-Pad4)")
+    (net (code 91) (name "Net-(J2-Pad2)")
+      (node (ref J2) (pin 2))
+      (node (ref LED5) (pin 1))
+      (node (ref LED4) (pin 1))
+      (node (ref LED3) (pin 1)))
+    (net (code 92) (name "Net-(U5-Pad4)")
       (node (ref U5) (pin 4)))
+    (net (code 93) (name "Net-(U5-Pad1)")
+      (node (ref U5) (pin 1)))
     (net (code 94) (name VBUS)
+      (node (ref R7) (pin 1))
       (node (ref U6) (pin 15))
-      (node (ref Q1) (pin 1))
-      (node (ref C14) (pin 1))
       (node (ref U1) (pin 4))
-      (node (ref R7) (pin 1))
+      (node (ref C14) (pin 1))
+      (node (ref LED1) (pin 2))
+      (node (ref C10) (pin 1))
+      (node (ref D3) (pin 2))
       (node (ref C1) (pin 2))
       (node (ref J1) (pin 1))
-      (node (ref D3) (pin 2))
-      (node (ref LED1) (pin 2))
-      (node (ref C10) (pin 1)))
+      (node (ref Q1) (pin 1)))
     (net (code 95) (name "Net-(R19-Pad1)")
       (node (ref U6) (pin 10))
       (node (ref R19) (pin 1)))
@@ -1200,8 +1208,8 @@
       (node (ref C12) (pin 1))
       (node (ref U6) (pin 14)))
     (net (code 97) (name "Net-(R18-Pad1)")
-      (node (ref U6) (pin 17))
-      (node (ref R18) (pin 1)))
+      (node (ref R18) (pin 1))
+      (node (ref U6) (pin 17)))
     (net (code 98) (name "Net-(J1-Pad4)")
       (node (ref J1) (pin 4)))
     (net (code 99) (name "Net-(U6-Pad2)")
@@ -1213,18 +1221,18 @@
     (net (code 102) (name "Net-(U6-Pad5)")
       (node (ref U6) (pin 5)))
     (net (code 103) (name +3V3_FDTI)
-      (node (ref LED7) (pin 1))
-      (node (ref LED6) (pin 1))
       (node (ref U6) (pin 3))
-      (node (ref U6) (pin 13)))
+      (node (ref LED7) (pin 1))
+      (node (ref U6) (pin 13))
+      (node (ref LED6) (pin 1)))
     (net (code 104) (name "Net-(C13-Pad1)")
-      (node (ref C13) (pin 1))
+      (node (ref J1) (pin 3))
       (node (ref R16) (pin 2))
-      (node (ref J1) (pin 3)))
+      (node (ref C13) (pin 1)))
     (net (code 105) (name "Net-(C11-Pad1)")
       (node (ref R17) (pin 1))
-      (node (ref C11) (pin 1))
-      (node (ref J1) (pin 2)))
+      (node (ref J1) (pin 2))
+      (node (ref C11) (pin 1)))
     (net (code 106) (name "Net-(LED6-Pad2)")
       (node (ref R18) (pin 2))
       (node (ref LED6) (pin 2)))