Use tyco 6-pin header for all switches

Should make connecting the switches a lot easier

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/Makefile b/Makefile
index 18735f786eb6071efd308bb82e6b27c6a32801dc..a46f05278ecfc003cd66b51953516680735b2896 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,13 +10,10 @@ partslist:  $(PROJECT).sch Makefile
        gnetlist -g bom -o $(PROJECT)-bom.unsorted $(PROJECT).sch
        head -n1 $(PROJECT)-bom.unsorted > partslist
        tail -n+2 $(PROJECT)-bom.unsorted | sort >> partslist
-#      rm -f $(PROJECT)-bom.unsorted
+       rm -f $(PROJECT)-bom.unsorted
 
 partslist.csv: $(PROJECT).sch Makefile
-       gnetlist -g partslist3 -o $(PROJECT)-list.unsorted $(PROJECT).sch
-       head -n1 $(PROJECT)-list.unsorted > partslist.csv
-       tail -n+2 $(PROJECT)-list.unsorted | sort -t \, -k 8 >> partslist.csv
-#      rm -f $(PROJECT)-list.unsorted
+       gnetlist -l gnet-partslist-keithp.scm -g partslist-keithp -o $@ $(PROJECT).sch
 
 pcb:   $(PROJECT).sch project Makefile
        gsch2pcb project

diff --git a/telelco.pcb b/telelco.pcb
index 9da20908f7f616ffd27e15e8e3e674595ab2fb63..130045122a09376092a1d488cb9af1d387c357d7 100644 (file)
--- a/telelco.pcb
+++ b/telelco.pcb
@@ -6,7 +6,7 @@ FileVersion[20070407]
 PCB["TeleLco" 450000 375000]
 
 Grid[100.0 0 0 0]
-Cursor[122700 375000 0.000000]
+Cursor[98300 0 0.000000]
 PolyArea[200000000.000000]
 Thermal[0.500000]
 DRC[500 1000 500 500 1500 650]
@@ -972,9 +972,7 @@ Via[81100 117400 3000 2000 0 1500 "" ""]
 Via[112300 156100 3000 2000 0 1500 "" "thermal(1S)"]
 Via[81755 147688 3000 2000 0 1500 "" "thermal(0+,1S)"]
 Via[95500 160900 3000 2000 0 1500 "" "thermal(1S)"]
-Via[180200 168200 3000 2000 0 1500 "" "thermal(1S)"]
 Via[219700 122600 3000 2000 0 1500 "" "thermal(1S)"]
-Via[175200 225500 3000 2000 0 1500 "" ""]
 Via[171700 225500 3000 2000 0 1500 "" ""]
 Via[198200 260500 3000 2000 0 1500 "" ""]
 Via[198200 264100 3000 2000 0 1500 "" ""]
@@ -986,6 +984,10 @@ Via[149100 163900 3000 2000 0 1500 "" ""]
 Via[138100 167300 3000 2000 0 1500 "" ""]
 Via[141900 170000 3000 2000 0 1500 "" ""]
 Via[145500 172600 3000 2000 0 1500 "" ""]
+Via[209500 296500 3000 2000 0 1500 "" ""]
+Via[222700 296500 3000 2000 0 1500 "" ""]
+Via[182200 169700 3000 2000 0 1500 "" "thermal(1S)"]
+Via[175200 225300 3000 2000 0 1500 "" ""]
 
 Element["" "TDK_PS12" "U8" "TDK_PS12" 225000 277558 -4600 -3632 0 100 ""]
 (
@@ -1136,9 +1138,9 @@ Element["" "0402" "R14" "1k" 399326 326100 3652 0 0 100 ""]
 
 Element["onsolder" "PEC11" "S1" "none" 307500 337500 2675 870 2 100 "auto"]
 (
-       Pin[-9800 -29500 6500 2000 7500 3900 "A" "A" "edge2"]
-       Pin[0 -29500 6500 2000 7500 3900 "C" "C" "edge2,thermal(1X)"]
-       Pin[9800 -29500 6500 2000 7500 3900 "B" "B" "edge2"]
+       Pin[-9800 -29500 6500 2000 7500 3900 "terminal A" "A" "edge2"]
+       Pin[0 -29500 6500 2000 7500 3900 "common" "C" "edge2,thermal(1X)"]
+       Pin[9800 -29500 6500 2000 7500 3900 "terminal B" "B" "edge2"]
        Pin[22450 0 15100 2000 16100 12500 "Left" "" "edge2"]
        Pin[-22450 0 15100 2000 16100 12500 "Right" "" "edge2"]
        ElementLine [-23250 -23600 23250 -23600 1000]
@@ -1150,9 +1152,9 @@ Element["onsolder" "PEC11" "S1" "none" 307500 337500 2675 870 2 100 "auto"]
 
 Element["onsolder" "PEC11" "S2" "none" 80000 338500 3075 870 2 100 "auto"]
 (
-       Pin[-9800 -29500 6500 2000 7500 3900 "A" "A" "edge2"]
-       Pin[0 -29500 6500 2000 7500 3900 "C" "C" "edge2,thermal(1X)"]
-       Pin[9800 -29500 6500 2000 7500 3900 "B" "B" "edge2"]
+       Pin[-9800 -29500 6500 2000 7500 3900 "terminal A" "A" "edge2"]
+       Pin[0 -29500 6500 2000 7500 3900 "common" "C" "edge2,thermal(1X)"]
+       Pin[9800 -29500 6500 2000 7500 3900 "terminal B" "B" "edge2"]
        Pin[22450 0 15100 2000 16100 12500 "Left" "" "edge2"]
        Pin[-22450 0 15100 2000 16100 12500 "Right" "" "edge2"]
        ElementLine [-23250 -23600 23250 -23600 1000]
@@ -1205,17 +1207,6 @@ Element["" "SOT23-5" "U2" "MCP73831" 394800 312500 5700 -10900 0 89 ""]
 
        )
 
-Element["" "2pin-solder" "S5" "none" 377500 342500 -2275 -5830 0 100 ""]
-(
-       Pin[20000 0 17000 2000 18000 15000 "1" "1" "square,edge2"]
-       Pin[-20000 0 17000 2000 18000 15000 "2" "2" "edge2"]
-       ElementLine [30000 -10000 30000 10000 1000]
-       ElementLine [-30000 -10000 30000 -10000 1000]
-       ElementLine [-30000 -10000 -30000 10000 1000]
-       ElementLine [-30000 10000 30000 10000 1000]
-
-       )
-
 Element["" "0402" "C1" "0.01uF" 257974 291500 -2474 -9500 0 100 ""]
 (
        Pad[-1574 -393 -1574 393 1968 2000 2568 "1" "1" "square"]
@@ -1474,28 +1465,6 @@ Element["onsolder" "LCD-S101D14TR" "U21" "digit" 240000 137500 62700 82000 2 100
 
        )
 
-Element["" "2pin-solder" "S3" "none" 160000 342500 -2575 -2130 0 100 ""]
-(
-       Pin[0 -20000 17000 2000 18000 15000 "1" "1" "square"]
-       Pin[0 20000 17000 2000 18000 15000 "2" "2" "thermal(1X)"]
-       ElementLine [-10000 -30000 10000 -30000 1000]
-       ElementLine [-10000 -30000 -10000 30000 1000]
-       ElementLine [-10000 30000 10000 30000 1000]
-       ElementLine [10000 -30000 10000 30000 1000]
-
-       )
-
-Element["" "2pin-solder" "S4" "none" 188000 342500 30 125 3 100 ""]
-(
-       Pin[0 -20000 17000 2000 18000 15000 "1" "1" "square"]
-       Pin[0 20000 17000 2000 18000 15000 "2" "2" "thermal(1X)"]
-       ElementLine [-10000 -30000 10000 -30000 1000]
-       ElementLine [-10000 -30000 -10000 30000 1000]
-       ElementLine [-10000 30000 10000 30000 1000]
-       ElementLine [10000 -30000 10000 30000 1000]
-
-       )
-
 Element["" "sma-edge" "J8" "SMA" 400 132200 300 1300 1 10 ""]
 (
        Pad[3000 7000 13000 7000 6000 800 6600 "2" "2" "square,nopaste"]
@@ -2133,6 +2102,21 @@ Element["" "0402" "C607" "0.1uF" 173100 109726 -12698 -9176 0 100 ""]
        Pad[-393 -1574 393 -1574 1968 2000 2568 "1" "1" "square"]
        Pad[-393 1574 393 1574 1968 2000 2568 "2" "2" "square"]
 
+       )
+
+Element["" "282834-6" "J9" "switch_connector" 350194 340605 0 0 0 100 ""]
+(
+       Pin[5906 12795 7087 1260 8346 4528 "6" "6" "edge2,thermal(1X)"]
+       Pin[15906 12795 7087 1260 8346 4528 "5" "5" "edge2"]
+       Pin[25906 12795 7087 1260 8346 4528 "4" "4" "edge2,thermal(1X)"]
+       Pin[35906 12795 7087 1260 8346 4528 "3" "3" "edge2"]
+       Pin[45906 12795 7087 1260 8346 4528 "2" "2" "edge2"]
+       Pin[55906 12795 7087 1260 8346 4528 "1" "1" "square,edge2"]
+       ElementLine [0 0 0 25591 600]
+       ElementLine [0 25591 61811 25591 600]
+       ElementLine [61811 25591 61811 0 600]
+       ElementLine [61811 0 0 0 600]
+
        )
 Layer(1 "top")
 (
@@ -2158,7 +2142,6 @@ Layer(1 "top")
        Line[176300 228100 180600 223800 1000 2000 "clearline"]
        Line[129500 228100 176300 228100 1000 2000 "clearline"]
        Line[174000 181200 174000 185700 1000 2000 "clearline"]
-       Line[160100 322400 160000 322500 1000 2000 "clearline"]
        Line[287000 253900 294400 246500 1000 2000 "clearline"]
        Line[189800 253900 287000 253900 1000 2000 "clearline"]
        Line[186200 257500 189800 253900 1000 2000 "clearline"]
@@ -2326,9 +2309,6 @@ Layer(1 "top")
        Line[397752 326100 392900 326100 1000 2000 "clearline"]
        Line[404700 322300 400900 326100 1000 2000 "clearline"]
        Line[404700 316748 404700 322300 1000 2000 "clearline"]
-       Line[357500 342500 357500 311100 2500 2000 "clearline"]
-       Line[379600 324600 379600 312500 2500 2000 "clearline"]
-       Line[397500 342500 379600 324600 2500 2000 "clearline"]
        Line[365800 312500 386600 312500 2500 2000 "clearline"]
        Line[389400 304700 386600 304700 1000 2000 "clearline"]
        Line[390900 306200 389400 304700 1000 2000 "clearline"]
@@ -2418,10 +2398,6 @@ Layer(1 "top")
        Line[34274 289874 34274 291400 1000 2000 "clearline"]
        Line[111174 291400 119278 291400 1000 2000 "clearline"]
        Line[122500 291300 122500 289900 1000 2000 "clearline"]
-       Line[160000 322400 192000 290400 1000 2000 "clearline"]
-       Line[192000 290400 192000 256500 1000 2000 "clearline"]
-       Line[188000 322500 195600 314900 1000 2000 "clearline"]
-       Line[195600 314900 195600 256500 1000 2000 "clearline"]
        Line[343900 291452 343848 291400 1000 2000 "clearline"]
        Line[276900 291474 276826 291400 1000 2000 "clearline"]
        Line[276826 291400 270374 291400 1000 2000 "clearline"]
@@ -2453,7 +2429,6 @@ Layer(1 "top")
        Line[187400 214400 186400 213400 1000 2000 "clearline"]
        Line[186400 213400 186400 158704 1000 2000 "clearline"]
        Line[186400 158704 186396 158700 1000 2000 "clearline"]
-       Line[183800 228100 183800 164600 1000 2000 "clearline"]
        Line[183800 164600 183600 164400 1000 2000 "clearline"]
        Line[180200 228000 180200 226500 1000 2000 "clearline"]
        Line[180200 226500 182200 224500 1000 2000 "clearline"]
@@ -2850,8 +2825,6 @@ Layer(1 "top")
        Line[61200 147900 61200 142565 1000 2000 "clearline"]
        Line[61200 142565 61167 142532 1000 2000 "clearline"]
        Line[194900 177800 202600 177800 1000 2000 "clearline"]
-       Line[202350 180350 198450 180350 1000 2000 "clearline"]
-       Line[198450 180350 194900 183900 1000 2000 "clearline"]
        Line[198500 183800 201300 183800 1000 2000 "clearline"]
        Line[201300 183800 222800 162300 1000 2000 "clearline"]
        Line[153700 98200 113243 98200 2500 2000 "clearline"]
@@ -2963,17 +2936,6 @@ Layer(1 "top")
        Line[129100 163800 127400 165500 1000 2000 "clearline"]
        Line[127400 165500 78800 165500 1000 2000 "clearline"]
        Line[61200 147900 78800 165500 1000 2000 "clearline"]
-       Line[177000 165074 176926 165000 1000 2000 "clearline"]
-       Line[176926 165000 176926 163674 1000 2000 "clearline"]
-       Line[176926 163674 178500 162100 1000 2000 "clearline"]
-       Line[178500 162100 178500 158722 1000 2000 "clearline"]
-       Line[178500 158722 178522 158700 1000 2000 "clearline"]
-       Line[180490 158690 180490 164584 1000 2000 "clearline"]
-       Line[180490 164584 180074 165000 1000 2000 "clearline"]
-       Line[180200 168200 177600 168200 1000 2000 "clearline"]
-       Line[177600 168200 176900 167500 1000 2000 "clearline"]
-       Line[176900 167500 176900 165026 1000 2000 "clearline"]
-       Line[176900 165026 176926 165000 1000 2000 "clearline"]
        Line[182200 173600 179500 170900 1000 2000 "clearline"]
        Line[179500 170900 177600 170900 1000 2000 "clearline"]
        Line[177600 170900 174800 168100 1000 2000 "clearline"]
@@ -3033,7 +2995,6 @@ Layer(1 "top")
        Line[157900 167400 172400 181900 1000 2000 "clearline"]
        Line[172400 181900 172400 194800 1000 2000 "clearline"]
        Line[172400 194800 175200 197600 1000 2000 "clearline"]
-       Line[175200 197600 175200 225500 1000 2000 "clearline"]
        Line[141900 170000 158200 170000 1000 2000 "clearline"]
        Line[158200 170000 170800 182600 1000 2000 "clearline"]
        Line[170800 182600 170800 195500 1000 2000 "clearline"]
@@ -3058,12 +3019,47 @@ Layer(1 "top")
        Line[70150 309000 63300 309000 1000 2000 "clearline"]
        Line[63300 309000 48100 293800 1000 2000 "clearline"]
        Line[48100 293800 48100 291400 1000 2000 "clearline"]
-       Line[282900 296500 241000 296500 1000 2000 "clearline"]
-       Line[241000 296500 202800 334700 1000 2000 "clearline"]
-       Line[202800 334700 143200 334700 1000 2000 "clearline"]
-       Line[143200 334700 105000 296500 1000 2000 "clearline"]
        Line[414500 237100 414500 233300 1000 2000 "clearline"]
        Line[414500 233300 301200 120000 1000 2000 "clearline"]
+       Line[406100 353400 406100 348200 2500 2000 "clearline"]
+       Line[406100 348200 376800 318900 2500 2000 "clearline"]
+       Line[376800 318900 376800 312500 2500 2000 "clearline"]
+       Line[396100 353400 396100 350700 2500 2000 "clearline"]
+       Line[396100 350700 380700 335300 2500 2000 "clearline"]
+       Line[380700 335300 366900 335300 2500 2000 "clearline"]
+       Line[366900 335300 357500 325900 2500 2000 "clearline"]
+       Line[357500 325900 357500 311200 2500 2000 "clearline"]
+       Line[195600 256500 195600 273800 1000 2000 "clearline"]
+       Line[195600 273800 237400 315600 1000 2000 "clearline"]
+       Line[237400 315600 341400 315600 1000 2000 "clearline"]
+       Line[341400 315600 366200 340400 1000 2000 "clearline"]
+       Line[366200 340400 373100 340400 1000 2000 "clearline"]
+       Line[373100 340400 386100 353400 1000 2000 "clearline"]
+       Line[192000 256500 192000 275400 1000 2000 "clearline"]
+       Line[192000 275400 236300 319700 1000 2000 "clearline"]
+       Line[236300 319700 332400 319700 1000 2000 "clearline"]
+       Line[332400 319700 366100 353400 1000 2000 "clearline"]
+       Line[105000 296500 209500 296500 1000 2000 "clearline"]
+       Line[222700 296500 282900 296500 1000 2000 "clearline"]
+       Line[183600 164400 183600 164900 1000 2000 "clearline"]
+       Line[183600 164900 184800 166100 1000 2000 "clearline"]
+       Line[184800 166100 184800 227100 1000 2000 "clearline"]
+       Line[184800 227100 183800 228100 1000 2000 "clearline"]
+       Line[176926 165000 176926 166426 1000 2000 "clearline"]
+       Line[176926 166426 178900 168400 1000 2000 "clearline"]
+       Line[178900 168400 180900 168400 1000 2000 "clearline"]
+       Line[180900 168400 182200 169700 1000 2000 "clearline"]
+       Line[178522 158700 178522 161578 1000 2000 "clearline"]
+       Line[178522 161578 176900 163200 1000 2000 "clearline"]
+       Line[176900 163200 176900 165074 1000 2000 "clearline"]
+       Line[176900 165074 176926 165100 1000 2000 "clearline"]
+       Line[180490 158700 180490 164584 1000 2000 "clearline"]
+       Line[180490 164584 180074 165000 1000 2000 "clearline"]
+       Line[175200 197600 175200 225300 1000 2000 "clearline"]
+       Line[331800 271600 331800 269600 1000 2000 "clearline"]
+       Line[194900 183900 194900 182500 1000 2000 "clearline"]
+       Line[194900 182500 197000 180400 1000 2000 "clearline"]
+       Line[197000 180400 202300 180400 1000 2000 "clearline"]
 )
 Layer(2 "bottom")
 (
@@ -3189,7 +3185,6 @@ Layer(2 "bottom")
        Line[70900 108900 70900 105700 1000 2000 "clearline"]
        Line[70900 105700 74100 102500 1000 2000 "clearline"]
        Line[81100 117400 53700 117400 1000 2000 "clearline"]
-       Line[175200 225500 175200 243500 1000 2000 "clearline"]
        Line[175200 243500 192200 260500 1000 2000 "clearline"]
        Line[192200 260500 198200 260500 1000 2000 "clearline"]
        Line[171700 225500 171700 242300 1000 2000 "clearline"]
@@ -3201,6 +3196,8 @@ Layer(2 "bottom")
        Line[138100 150300 138100 167300 1000 2000 "clearline"]
        Line[141900 150300 141900 170000 1000 2000 "clearline"]
        Line[145500 150300 145500 172600 1000 2000 "clearline"]
+       Line[209500 296500 222700 296500 1000 2000 "clearline"]
+       Line[175200 225300 175200 243500 1000 2000 "clearline"]
        Polygon("clearpoly")
        (
                [446600 372500] [1600 372500] [1600 2500] [446600 2500] 
@@ -3220,13 +3217,13 @@ Layer(3 "outline")
 )
 Layer(4 "silk")
 (
-       Text[391288 363128 2 100 "tapr.org/OHL" "onsolder"]
-       Text[419000 354900 2 100 "Licensed under the TAPR OHL" "onsolder"]
-       Text[389574 243800 2 100 "TeleLco v0.1" "onsolder"]
-       Text[405400 254000 2 100 "` 2012 Keith Packard" "onsolder"]
+       Text[174974 316200 2 100 "TeleLco v0.1" "onsolder"]
+       Text[190100 326200 2 100 "` 2012 Keith Packard" "onsolder"]
+       Text[197400 336200 2 100 "Licensed under the TAPR OHL" "onsolder"]
+       Text[179188 346228 2 100 "tapr.org/OHL" "onsolder"]
        Polygon("clearpoly")
        (
-               [253000 335000] [253000 348400] [206500 348400] [206500 335000] 
+               [183800 357000] [183800 370400] [137300 370400] [137300 357000] 
        )
 )
 Layer(5 "silk")
@@ -3272,7 +3269,7 @@ NetList()
        )
        Net("arm" "(unknown)")
        (
-               Connect("S3-1")
+               Connect("J9-5")
                Connect("U7-24")
        )
        Net("boot0" "(unknown)")
@@ -3340,7 +3337,7 @@ NetList()
        )
        Net("fire" "(unknown)")
        (
-               Connect("S4-1")
+               Connect("J9-3")
                Connect("U7-25")
        )
        Net("GND" "(unknown)")
@@ -3406,6 +3403,8 @@ NetList()
                Connect("J5-5")
                Connect("J6-1")
                Connect("J8-2")
+               Connect("J9-4")
+               Connect("J9-6")
                Connect("R4-1")
                Connect("R14-1")
                Connect("R15-1")
@@ -3414,8 +3413,6 @@ NetList()
                Connect("R402-2")
                Connect("S1-C")
                Connect("S2-C")
-               Connect("S3-2")
-               Connect("S4-2")
                Connect("U1-2")
                Connect("U2-2")
                Connect("U7-12")
@@ -3855,14 +3852,14 @@ NetList()
        (
                Connect("B1-1")
                Connect("C7-2")
-               Connect("S5-1")
+               Connect("J9-1")
                Connect("U2-3")
        )
        Net("v_lipo" "(unknown)")
        (
                Connect("C5-2")
+               Connect("J9-2")
                Connect("R5-2")
-               Connect("S5-2")
                Connect("U1-1")
                Connect("U1-3")
        )

diff --git a/telelco.sch b/telelco.sch
index a74e1d85c56ba5f61ed985ceaa121aa990d3b5ec..782f8087b9c1d10877df2c499602f23bb82c1b83 100644 (file)
--- a/telelco.sch
+++ b/telelco.sch
@@ -750,7 +750,7 @@ C 55200 49400 1 0 0 MIC5235.sym
 T 55495 50595 5 10 1 1 0 0 1
 refdes=U1
 T 55995 50595 5 10 1 1 0 0 1
-device=MIC5235-3.3
+device=IC
 T 55195 49395 5 10 0 1 0 0 1
 footprint=SOT23-5
 T 44595 55395 5 10 0 1 0 0 1
@@ -1086,63 +1086,55 @@ N 63100 75500 64400 75500 4
 T 63900 75600 5 10 1 1 0 0 1
 netname=pad_a
 }
-C 77500 63500 1 0 0 switch-spst.sym
+C 74300 62000 1 0 0 switch-spst.sym
 {
-T 77755 63795 5 10 1 1 0 0 1
+T 75155 61995 5 10 1 1 0 0 1
 refdes=S3
-T 77300 64100 5 10 1 1 0 0 1
+T 75600 62000 5 10 1 1 0 0 1
 description=Arming Switch
-T 77400 62600 5 10 1 1 0 0 1
+T 74200 61100 5 10 0 1 0 0 1
 device=SWITCH
-T 77500 63500 5 10 0 0 0 0 1
+T 74300 62000 5 10 0 0 0 0 1
 vendor=digikey
-T 77500 63500 5 10 0 0 0 0 1
+T 74300 62000 5 10 0 0 0 0 1
 vendor_part_number=CKC8039-ND
-T 77500 63500 5 10 0 0 0 0 1
+T 74300 62000 5 10 0 0 0 0 1
 manufacturer=C&K Components
-T 77500 63500 5 10 0 0 0 0 1
+T 74300 62000 5 10 0 0 0 0 1
 manufacturer_partnumber=Y101132C203NQ
-T 77500 63500 5 10 0 0 0 0 1
+T 74300 62000 5 10 0 0 0 0 1
 footprint=2pin-solder
-T 77500 63500 5 10 0 0 0 0 1
+T 74300 62000 5 10 0 0 0 0 1
 value=none
-T 77500 63500 5 10 0 0 0 0 1
+T 74300 62000 5 10 0 0 0 0 1
 loadstatus=noload
+T 74300 62000 5 10 0 0 0 0 1
+graphical=1
 }
-C 77500 62000 1 0 0 switch-spst.sym
+C 74300 62800 1 0 0 switch-spst.sym
 {
-T 77755 62295 5 10 1 1 0 0 1
+T 75155 62795 5 10 1 1 0 0 1
 refdes=S4
-T 77400 62600 5 10 1 1 0 0 1
+T 75600 62800 5 10 1 1 0 0 1
 description=Firing Switch
-T 77400 62600 5 10 1 1 0 0 1
+T 74200 63400 5 10 0 0 0 0 1
 device=SWITCH
-T 77500 62000 5 10 0 0 0 0 1
+T 74300 62800 5 10 0 0 0 0 1
 vendor=digikey
-T 77500 62000 5 10 0 0 0 0 1
+T 74300 62800 5 10 0 0 0 0 1
 vendor_part_number=EG4727-ND
-T 77500 62000 5 10 0 0 0 0 1
+T 74300 62800 5 10 0 0 0 0 1
 manufacturer=E-Switch
-T 77500 62000 5 10 0 0 0 0 1
+T 74300 62800 5 10 0 0 0 0 1
 manufacturer_partnumber=PV5S64019
-T 77500 62000 5 10 0 0 0 0 1
+T 74300 62800 5 10 0 0 0 0 1
 footprint=2pin-solder
-T 77500 63500 5 10 0 0 0 0 1
+T 74300 64300 5 10 0 0 0 0 1
 value=none
-T 77500 63500 5 10 0 0 0 0 1
+T 74300 64300 5 10 0 0 0 0 1
 loadstatus=noload
-}
-C 78200 61700 1 0 0 gnd.sym
-C 78200 63200 1 0 0 gnd.sym
-N 77500 63500 76500 63500 4
-{
-T 76500 63600 5 10 1 1 0 0 1
-netname=arm
-}
-N 77500 62000 76500 62000 4
-{
-T 76500 62100 5 10 1 1 0 0 1
-netname=fire
+T 74300 62800 5 10 0 0 0 0 1
+graphical=1
 }
 N 63100 75100 64400 75100 4
 {
@@ -1456,7 +1448,7 @@ N 52200 49100 52200 47900 4
 C 47800 49300 1 0 0 MCP73831.sym
 {
 T 48995 50895 5 10 0 1 0 0 1
-device=MCP73831
+device=IC
 T 48095 50895 5 10 1 1 0 0 1
 refdes=U2
 T 47795 47395 5 10 0 1 0 0 1
@@ -1569,35 +1561,27 @@ N 46700 49200 46200 49200 4
 N 46200 49200 46200 49400 4
 N 47400 48800 47100 48800 4
 N 46700 48800 46500 48800 4
-N 50200 50300 52400 50300 4
-{
-T 51100 50400 5 10 1 1 0 0 1
-netname=v_charge
-}
-N 55200 50300 53200 50300 4
-{
-T 54000 50400 5 10 1 1 0 0 1
-netname=v_lipo
-}
 N 45700 47900 52200 47900 4
-C 52400 50300 1 0 0 switch-spst.sym
+C 74300 63600 1 0 0 switch-spst.sym
 {
-T 52655 50595 5 10 1 1 0 0 1
+T 75155 63595 5 10 1 1 0 0 1
 refdes=S5
-T 52400 50300 5 10 0 0 0 0 1
+T 75600 63600 5 10 1 1 0 0 1
 description=Power Switch
-T 52400 50300 5 10 0 0 0 0 1
+T 74300 63600 5 10 0 0 0 0 1
 footprint=2pin-solder
-T 52400 50300 5 10 0 0 0 0 1
+T 74300 63600 5 10 0 0 0 0 1
 vendor=digikey
-T 52400 50300 5 10 0 0 0 0 1
+T 74300 63600 5 10 0 0 0 0 1
 vendor_part_number=EG1889-ND
-T 52400 50300 5 10 0 0 0 0 1
-loadstatus=throughhole
-T 52400 50300 5 10 0 0 0 0 1
+T 74300 63600 5 10 0 0 0 0 1
+loadstatus=noload
+T 74300 63600 5 10 0 0 0 0 1
 value=none
-T 52400 50300 5 10 0 0 0 0 1
+T 74300 63600 5 10 0 0 0 0 1
 device=SWITCH
+T 74300 63600 5 10 0 0 0 0 1
+graphical=1
 }
 N 47100 67100 46000 67100 4
 {
@@ -1796,7 +1780,7 @@ C 58200 77800 1 0 0 gnd.sym
 C 53600 57100 1 0 0 STM32L152-64.sym
 {
 T 47200 55500 5 10 0 0 0 0 1
-device=STM32L152RBT6
+device=IC
 T 54000 77200 5 10 1 1 0 0 1
 refdes=U7
 T 53600 57100 5 10 0 0 0 0 1
@@ -2835,3 +2819,82 @@ T 76700 50200 9 10 1 0 0 0 1
 Radio RX
 T 75700 50200 9 10 1 0 0 0 1
 Radio TX
+C 69800 61500 1 0 0 conn-6.sym
+{
+T 70155 63795 5 10 1 1 0 0 1
+refdes=J9
+T 69800 61500 5 10 0 0 0 0 1
+device=CONNECTOR
+T 69800 61500 5 10 0 0 0 0 1
+loadstatus=throughhole
+T 69800 61500 5 10 0 0 0 0 1
+vendor=digikey
+T 69800 61500 5 10 0 0 0 0 1
+vendor_part_number=A1973-ND
+T 69800 61500 5 10 0 0 0 0 1
+value=switch connector
+T 69800 61500 5 10 0 0 0 0 1
+footprint=282834-6
+}
+N 69800 63600 68700 63600 4
+{
+T 69400 63700 5 10 1 1 0 6 1
+netname=v_charge
+}
+N 69800 63200 68700 63200 4
+{
+T 69200 63300 5 10 1 1 0 6 1
+netname=v_lipo
+}
+N 69800 62000 68700 62000 4
+{
+T 69000 62100 5 10 1 1 0 6 1
+netname=arm
+}
+N 69800 62800 68700 62800 4
+{
+T 69000 62900 5 10 1 1 0 6 1
+netname=fire
+}
+N 69800 61600 69700 61600 4
+N 69700 61600 69700 62400 4
+N 69700 62400 69800 62400 4
+C 69800 61300 1 0 1 gnd.sym
+C 73300 61500 1 0 1 conn-6.sym
+{
+T 72945 63795 5 10 1 1 0 6 1
+refdes=J10
+T 73300 61500 5 10 0 0 0 0 1
+loadstatus=noload
+T 73300 61500 5 10 0 0 0 0 1
+vendor=digikey
+T 73300 61500 5 10 0 0 0 0 1
+vendor_part_number=3-644791-6-ND
+T 73300 61500 5 10 0 0 0 0 1
+value=switch connector
+T 73300 61500 5 10 0 0 0 0 1
+device=CONNECTOR
+T 73300 61500 5 10 0 0 0 0 1
+graphical=1
+}
+N 73300 63600 74300 63600 4
+N 75100 63600 75100 63200 4
+N 75100 63200 73300 63200 4
+N 75100 62400 73300 62400 4
+N 73300 61600 75100 61600 4
+N 50200 50300 52600 50300 4
+N 52600 50300 52600 51000 4
+{
+T 51800 51100 5 10 1 1 0 0 1
+netname=v_charge
+}
+N 55200 50300 53100 50300 4
+N 53100 50300 53100 51000 4
+{
+T 53200 51100 5 10 1 1 0 0 1
+netname=v_lipo
+}
+N 74300 62800 73300 62800 4
+N 75100 62800 75100 62400 4
+N 73300 62000 74300 62000 4
+N 75100 62000 75100 61600 4