X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=easymini.sch;h=5eb9b89648bed7cdea2b7be7c867caaa78a3b429;hb=29f3c79d4ded016a4310a81a9ef1ecc7c52d9297;hp=6bfe5a29535cf9311353d5d21cb51208ceead7ce;hpb=5bfcec13cf5b99cacbbefbf2aebd18fa5878ae3c;p=hw%2Feasymini

diff --git a/easymini.sch b/easymini.sch
index 6bfe5a2..5eb9b89 100644
--- a/easymini.sch
+++ b/easymini.sch
@@ -1,27 +1,5 @@
-v 20130925 2
-C 10100 10100 0 0 0 title-C-both.sym
-C 14500 16300 1 0 0 lpc11u1x.sym
-{
-T 14495 16300 5 10 0 1 0 0 1
-footprint=hvqfn33
-T 14895 26200 5 10 1 1 0 0 1
-refdes=U1
-T 14500 16300 5 10 0 1 0 0 1
-device=IC
-T 18600 26200 5 10 1 1 0 0 1
-value=LPC11U14FHI33
-<<<<<<< HEAD
-=======
-T 14500 16300 5 10 0 1 0 0 1
-loadstatus=smt
-T 14500 16300 5 10 0 1 0 0 1
-vendor=avnet
-T 14500 16300 5 10 1 1 0 0 1
-vendor_part_number=LPC11U14FHI33/201
-T 14500 16300 5 10 1 1 0 0 1
-mfg_part_number=LPC11U14FHI33/201
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-}
+v 20211219 2
+C 10100 10100 0 0 0 title-C.sym
 C 24600 13300 1 0 0 MS5607.sym
 {
 T 25895 15495 5 10 0 1 0 0 1
@@ -32,15 +10,6 @@ T 24595 10095 5 10 0 1 0 0 1
 footprint=MS5607
 T 25400 14700 5 10 1 1 0 0 1
 value=MS5607
-<<<<<<< HEAD
-=======
-T 24600 13300 5 10 0 1 0 0 1
-loadstatus=smt
-T 24600 13300 5 10 0 1 0 0 1
-vendor=measspec
-T 24600 13300 5 10 1 1 0 0 1
-vendor_part_number=MS5607
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 }
 N 29800 24500 31800 24500 4
 {
@@ -76,21 +45,10 @@ T 27000 22700 5 10 0 0 90 0 1
 device=RESISTOR
 T 27400 22395 5 10 0 1 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 27400 22400 5 10 1 1 0 0 1
-vendor_part_number=P3.30KLCT-ND
-T 27400 22400 5 10 0 1 0 0 1
-vendor=digikey
-T 27400 22400 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 27100 23100 5 10 1 1 180 0 1
+T 27100 22900 5 10 1 1 0 6 1
 refdes=R1
-T 26800 22600 5 10 1 1 0 0 1
+T 27100 22600 5 10 1 1 0 6 1
 value=3.3k
-T 27400 22400 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF3301X
 }
 C 27200 22100 1 0 0 gnd.sym
 C 27200 18400 1 0 0 gnd.sym
@@ -105,21 +63,10 @@ T 27700 23600 5 10 0 0 0 0 1
 device=RESISTOR
 T 27400 23200 5 10 0 0 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 27400 23200 5 10 1 1 90 0 1
-vendor_part_number=P100LCT-ND
-T 27400 23200 5 10 0 0 0 0 1
-vendor=digikey
-T 27400 23200 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 27800 23600 5 10 1 1 180 0 1
+T 27700 23500 5 10 1 1 0 6 1
 refdes=R2
-T 28200 23600 5 10 1 1 180 0 1
-value=100
-T 27400 23200 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF1000X
+T 27800 23500 5 10 1 1 0 0 1
+value=1.5k
 }
 C 27400 19500 1 0 0 resistor.sym
 {
@@ -127,21 +74,10 @@ T 27700 19900 5 10 0 0 0 0 1
 device=RESISTOR
 T 27400 19500 5 10 0 0 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 27400 19500 5 10 1 1 90 0 1
-vendor_part_number=P100LCT-ND
-T 27400 19500 5 10 0 0 0 0 1
-vendor=digikey
-T 27400 19500 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 27800 19900 5 10 1 1 180 0 1
+T 27700 19800 5 10 1 1 0 6 1
 refdes=R5
-T 28200 19900 5 10 1 1 180 0 1
-value=100
-T 27400 19500 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF1000X
+T 27800 19800 5 10 1 1 0 0 1
+value=1.5k
 }
 N 28300 23300 28900 23300 4
 N 28300 19600 28900 19600 4
@@ -151,21 +87,10 @@ T 30000 20200 5 10 0 0 90 0 1
 device=RESISTOR
 T 30400 19900 5 10 0 0 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 30400 19900 5 10 1 1 90 0 1
-vendor_part_number=P100KLCT-ND
-T 30400 19900 5 10 0 1 90 0 1
-vendor=digikey
-T 30400 19900 5 10 0 1 90 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 30800 20600 5 10 1 1 180 0 1
+T 30500 20400 5 10 1 1 0 0 1
 refdes=R7
-T 30900 20200 5 10 1 1 180 0 1
+T 30500 20100 5 10 1 1 0 0 1
 value=100k
-T 30400 19900 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF1003X
 }
 C 30400 22700 1 90 0 resistor.sym
 {
@@ -173,21 +98,10 @@ T 30000 23000 5 10 0 0 90 0 1
 device=RESISTOR
 T 30400 22695 5 10 0 1 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 30400 22700 5 10 1 1 90 0 1
-vendor_part_number=P27.0KLCT-ND
-T 30400 22700 5 10 0 0 0 0 1
-vendor=digikey
-T 30400 22700 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 30800 23400 5 10 1 1 180 0 1
+T 30500 23200 5 10 1 1 0 0 1
 refdes=R6
 T 30500 22900 5 10 1 1 0 0 1
 value=27k
-T 30400 22700 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF2702X
 }
 C 30200 22400 1 0 0 gnd.sym
 C 30200 18700 1 0 0 gnd.sym
@@ -197,21 +111,10 @@ T 30000 19300 5 10 0 0 90 0 1
 device=RESISTOR
 T 30400 18995 5 10 0 1 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 30400 19000 5 10 1 1 90 0 1
-vendor_part_number=P27.0KLCT-ND
-T 30400 19000 5 10 0 0 0 0 1
-vendor=digikey
-T 30400 19000 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 30900 19700 5 10 1 1 180 0 1
+T 30500 19500 5 10 1 1 0 0 1
 refdes=R8
-T 30600 19200 5 10 1 1 0 0 1
+T 30500 19200 5 10 1 1 0 0 1
 value=27k
-T 30400 19000 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF2702X
 }
 C 28900 23000 1 0 0 FDS9926A.sym
 {
@@ -221,21 +124,10 @@ T 28595 22970 5 10 0 1 0 0 1
 footprint=1212-8
 T 28900 23000 5 10 0 0 0 0 1
 slot=1
-<<<<<<< HEAD
-=======
-T 28900 23000 5 10 1 1 0 0 1
-vendor_part_number=SI7232DN-T1-GE3CT-ND
-T 28900 23000 5 10 0 0 0 0 1
-vendor=digikey
-T 28900 23000 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 T 28900 24200 5 10 1 1 0 0 1
 refdes=Q1
 T 28900 23000 5 10 1 1 0 0 1
 value=Si7232DN
-T 28900 23000 5 10 1 1 0 0 1
-mfg_part_number=SI7232DN-T1-GE3
 }
 C 28900 19300 1 0 0 FDS9926A.sym
 {
@@ -245,21 +137,10 @@ T 28595 19270 5 10 0 1 0 0 1
 footprint=1212-8
 T 28900 19300 5 10 0 0 0 0 1
 slot=2
-<<<<<<< HEAD
-=======
-T 28900 19300 5 10 1 1 0 0 1
-vendor_part_number=SI7232DN-T1-GE3CT-ND
-T 28900 19300 5 10 0 1 0 0 1
-vendor=digikey
-T 28900 19300 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 T 28900 20500 5 10 1 1 0 0 1
 refdes=Q1
 T 28900 19300 5 10 1 1 0 0 1
 value=Si7232DN
-T 28900 19300 5 10 1 1 0 0 1
-mfg_part_number=SI7232DN-T1-GE3
 }
 N 29800 23300 29900 23300 4
 N 29900 23300 29900 23100 4
@@ -274,21 +155,10 @@ T 27000 19000 5 10 0 0 90 0 1
 device=RESISTOR
 T 27400 18695 5 10 0 1 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 27400 18700 5 10 1 1 0 0 1
-vendor_part_number=P3.30KLCT-ND
-T 27400 18700 5 10 0 1 0 0 1
-vendor=digikey
-T 27400 18700 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 27100 19400 5 10 1 1 180 0 1
+T 27100 19200 5 10 1 1 0 6 1
 refdes=R4
-T 26800 18900 5 10 1 1 0 0 1
+T 27100 18900 5 10 1 1 0 6 1
 value=3.3k
-T 27400 18700 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF3301X
 }
 C 30200 24500 1 270 0 resistor.sym
 {
@@ -296,90 +166,48 @@ T 30600 24200 5 10 0 0 270 0 1
 device=RESISTOR
 T 30200 24500 5 10 0 0 270 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 30200 24500 5 10 1 1 270 0 1
-vendor_part_number=P100KLCT-ND
-T 30200 24500 5 10 0 1 270 0 1
-vendor=digikey
-T 30200 24500 5 10 0 1 270 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 T 30500 24100 5 10 1 1 0 0 1
 refdes=R3
 T 30500 23800 5 10 1 1 0 0 1
 value=100k
-T 30200 24500 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF1003X
 }
-C 11800 18900 1 0 1 USBmicroB.sym
+C 11600 16900 1 0 1 USBmicroB.sym
 {
-T 10805 21300 5 10 1 1 0 6 1
+T 10605 19300 5 10 1 1 0 6 1
 refdes=J1
-T 11445 19295 5 10 0 1 0 6 1
-footprint=ZX62-B-5PA
-T 11800 18900 5 10 0 0 0 0 1
-<<<<<<< HEAD
-=======
-vendor=4ucon
-T 11800 18900 5 10 1 1 0 0 1
-vendor_part_number=18575
-T 11800 18900 5 10 0 0 0 0 1
-loadstatus=smt
-T 11800 18900 5 10 0 0 0 0 1
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
+T 11245 17295 5 10 0 1 0 6 1
+footprint=11071
+T 11600 16900 5 10 0 0 0 0 1
 device=CONNECTOR
-T 11800 18900 5 10 0 0 0 0 1
+T 11600 16900 5 10 0 0 0 0 1
 value=USBmicroB
 }
-C 11700 19000 1 0 0 gnd.sym
+C 11500 17000 1 0 0 gnd.sym
 C 24100 13200 1 0 0 gnd.sym
-C 13600 20400 1 0 0 resistor.sym
+C 12400 18400 1 0 0 resistor.sym
 {
-T 13900 20800 5 10 0 0 0 0 1
+T 12700 18800 5 10 0 0 0 0 1
 device=RESISTOR
-T 13750 20650 5 10 1 1 0 0 1
+T 12550 18650 5 10 1 1 0 0 1
 refdes=R10
-T 14200 20650 5 10 1 1 0 0 1
+T 13000 18650 5 10 1 1 0 0 1
 value=33
-T 13600 20400 5 10 0 1 0 0 1
+T 12400 18400 5 10 0 1 0 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 13600 20400 5 10 0 1 0 0 1
-loadstatus=smt
-T 13600 20400 5 10 0 1 0 0 1
-vendor=digikey
-T 13600 20400 5 10 1 1 0 0 1
-vendor_part_number=P33.0LCT-ND
-T 13600 20400 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF33R0X
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-}
-C 13600 20000 1 0 0 resistor.sym
-{
-T 13900 20400 5 10 0 0 0 0 1
+}
+C 12400 18000 1 0 0 resistor.sym
+{
+T 12700 18400 5 10 0 0 0 0 1
 device=RESISTOR
-T 13750 19750 5 10 1 1 0 0 1
+T 12550 17750 5 10 1 1 0 0 1
 refdes=R11
-T 14200 19750 5 10 1 1 0 0 1
+T 13000 17750 5 10 1 1 0 0 1
 value=33
-T 13600 20000 5 10 0 1 0 0 1
+T 12400 18000 5 10 0 1 0 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 13600 20000 5 10 0 1 0 0 1
-loadstatus=smt
-T 13600 20000 5 10 0 1 0 0 1
-vendor=digikey
-T 13600 20000 5 10 1 1 0 0 1
-vendor_part_number=P33.0LCT-ND
-T 13600 20000 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF33R0X
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-}
-N 11800 20500 13600 20500 4
-N 11800 20100 13600 20100 4
+}
+N 11600 18500 12400 18500 4
+N 11600 18100 12400 18100 4
 N 26900 14700 26900 15100 4
 N 26900 15100 27600 15100 4
 {
@@ -411,19 +239,7 @@ footprint=SOIJ8
 T 20095 14595 5 10 1 1 0 0 1
 refdes=U4
 T 20400 13000 5 10 1 1 0 0 1
-<<<<<<< HEAD
-value=W25Q80BVSSIG
-=======
-value=W25Q80DVSSIG
-T 19800 11300 5 10 0 1 0 0 1
-vendor=digikey
-T 19800 11300 5 10 1 1 0 0 1
-vendor_part_number=W25Q80DVSSIG-ND
-T 19800 11300 5 10 0 1 0 0 1
-loadstatus=smt
-T 19800 11300 5 10 1 1 0 0 1
-mfg_part_number=W25Q80DVSSIG
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
+value=W25Q80
 }
 C 20800 14800 1 0 0 3.3V-plus.sym
 N 22200 13700 22200 14800 4
@@ -460,25 +276,12 @@ T 23700 14100 5 10 0 0 90 0 1
 device=CAPACITOR
 T 24000 14700 5 10 1 1 180 0 1
 refdes=C4
-T 23500 14100 5 10 1 1 90 0 1
+T 23500 14100 5 10 0 0 90 0 1
 symversion=0.1
 T 23600 14000 5 10 1 1 0 0 1
 value=0.1uF
-<<<<<<< HEAD
-T 24400 13900 5 10 0 0 0 0 1
-footprint=0402
-=======
-T 24400 13900 5 10 0 0 0 0 1
-vendor_part_number=399-3027-1-ND
 T 24400 13900 5 10 0 0 0 0 1
 footprint=0402
-T 24400 13900 5 10 0 1 0 0 1
-vendor=digikey
-T 24400 13900 5 10 0 1 0 0 1
-loadstatus=smt
-T 24400 13900 5 10 1 1 0 0 1
-mfg_part_number=C0402C104K8PACTU
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 }
 C 22800 13900 1 90 0 capacitor.sym
 {
@@ -486,201 +289,136 @@ T 22100 14100 5 10 0 0 90 0 1
 device=CAPACITOR
 T 23000 14700 5 10 1 1 180 0 1
 refdes=C10
-T 21900 14100 5 10 1 1 90 0 1
+T 21900 14100 5 10 0 0 90 0 1
 symversion=0.1
 T 22700 14000 5 10 1 1 0 0 1
 value=0.1uF
-<<<<<<< HEAD
 T 22800 13900 5 10 0 0 0 0 1
 footprint=0402
-=======
-T 22800 13900 5 10 0 0 0 0 1
-vendor_part_number=399-3027-1-ND
-T 22800 13900 5 10 0 0 0 0 1
-footprint=0402
-T 22800 13900 5 10 0 1 0 0 1
-vendor=digikey
-T 22800 13900 5 10 0 1 0 0 1
-loadstatus=smt
-T 22800 13900 5 10 1 1 0 0 1
-mfg_part_number=C0402C104K8PACTU
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 }
-C 13400 16900 1 90 0 capacitor.sym
+C 12700 16400 1 90 0 capacitor.sym
 {
-T 12700 17100 5 10 0 0 90 0 1
+T 12000 16600 5 10 0 0 90 0 1
 device=CAPACITOR
-T 13000 17700 5 10 1 1 180 0 1
+T 12300 17200 5 10 1 1 180 0 1
 refdes=C7
-T 12500 17100 5 10 1 1 90 0 1
+T 11800 16600 5 10 0 0 90 0 1
 symversion=0.1
-T 12600 17000 5 10 1 1 0 0 1
+T 11900 16500 5 10 1 1 0 0 1
 value=0.1uF
-<<<<<<< HEAD
-T 13400 16900 5 10 0 0 0 0 1
+T 12700 16400 5 10 0 0 0 0 1
 footprint=0402
-=======
-T 13400 16900 5 10 0 0 0 0 1
-vendor_part_number=399-3027-1-ND
-T 13400 16900 5 10 0 0 0 0 1
-footprint=0402
-T 13400 16900 5 10 0 1 0 0 1
-vendor=digikey
-T 13400 16900 5 10 0 1 0 0 1
-loadstatus=smt
-T 13400 16900 5 10 1 1 0 0 1
-mfg_part_number=C0402C104K8PACTU
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 }
-C 14300 16600 1 90 0 capacitor.sym
+C 13600 16400 1 90 0 capacitor.sym
 {
-T 13600 16800 5 10 0 0 90 0 1
+T 12900 16600 5 10 0 0 90 0 1
 device=CAPACITOR
-T 13900 17400 5 10 1 1 180 0 1
+T 13200 17200 5 10 1 1 180 0 1
 refdes=C9
-T 13400 16800 5 10 1 1 90 0 1
+T 12700 16600 5 10 0 0 90 0 1
 symversion=0.1
-T 13500 16700 5 10 1 1 0 0 1
+T 12800 16500 5 10 1 1 0 0 1
 value=0.1uF
-<<<<<<< HEAD
-T 14300 16600 5 10 0 0 0 0 1
-footprint=0402
-=======
-T 14300 16600 5 10 0 0 0 0 1
-vendor_part_number=399-3027-1-ND
-T 14300 16600 5 10 0 0 0 0 1
+T 13600 16400 5 10 0 0 0 0 1
 footprint=0402
-T 14300 16600 5 10 0 1 0 0 1
-vendor=digikey
-T 14300 16600 5 10 0 1 0 0 1
-loadstatus=smt
-T 14300 16600 5 10 1 1 0 0 1
-mfg_part_number=C0402C104K8PACTU
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-}
-C 13900 18300 1 0 0 3.3V-plus.sym
-C 14000 16000 1 0 0 gnd.sym
-C 13850 25300 1 270 0 capacitor.sym
-{
-T 14550 25100 5 10 0 0 270 0 1
+}
+C 12300 17300 1 0 0 3.3V-plus.sym
+C 13300 16100 1 0 0 gnd.sym
+C 11850 25300 1 270 0 capacitor.sym
+{
+T 12550 25100 5 10 0 0 270 0 1
 device=CAPACITOR
-T 14750 25100 5 10 1 1 270 0 1
+T 12750 25100 5 10 0 0 270 0 1
 symversion=0.1
-T 13850 25300 5 10 0 0 0 0 1
+T 11850 25300 5 10 0 0 0 0 1
 footprint=0402
-T 14250 25000 5 10 1 1 0 0 1
+T 12250 25000 5 10 1 1 0 0 1
 refdes=C3
-T 14250 24500 5 10 1 1 0 0 1
+T 12150 24500 5 10 1 1 0 0 1
 value=18pF
-T 13850 25300 5 10 1 1 0 0 1
-mfg_part_number=GRM1555C1H180FA01D
 }
-C 12550 25300 1 270 0 capacitor.sym
+C 10550 25300 1 270 0 capacitor.sym
 {
-T 13250 25100 5 10 0 0 270 0 1
+T 11250 25100 5 10 0 0 270 0 1
 device=CAPACITOR
-T 13450 25100 5 10 1 1 270 0 1
+T 11450 25100 5 10 0 0 270 0 1
 symversion=0.1
-T 12550 25300 5 10 0 0 0 0 1
+T 10550 25300 5 10 0 0 0 0 1
 footprint=0402
-T 12250 25000 5 10 1 1 0 0 1
+T 10550 25000 5 10 1 1 0 6 1
 refdes=C2
-T 12150 24500 5 10 1 1 0 0 1
+T 10250 24500 5 10 1 1 0 0 1
 value=18pF
-T 12550 25300 5 10 1 1 0 0 1
-mfg_part_number=GRM1555C1H180FA01D
 }
-C 13950 24100 1 0 0 gnd.sym
-C 12650 24100 1 0 0 gnd.sym
-C 13050 24900 1 0 0 ABM8.sym
+C 11950 24100 1 0 0 gnd.sym
+C 10650 24100 1 0 0 gnd.sym
+C 11050 24900 1 0 0 ABM8.sym
 {
-T 13250 25400 5 10 0 0 0 0 1
+T 11250 25400 5 10 0 0 0 0 1
 device=CRYSTAL
-T 13250 25600 5 10 1 1 0 0 1
+T 11250 25600 5 10 0 0 0 0 1
 symversion=0.1
-T 13050 24900 5 10 0 0 0 0 1
+T 11050 24900 5 10 0 0 0 0 1
 footprint=ABM8
-T 12950 25400 5 10 1 1 0 0 1
+T 10950 25400 5 10 1 1 0 0 1
 refdes=X1
-T 13650 25400 5 10 1 1 0 0 1
+T 11650 25400 5 10 1 1 0 0 1
 value=12MHz
-T 13050 24900 5 10 1 1 0 0 1
-mfg_part_number=ABM8G-12.000MHZ-4Y-T3
-}
-C 13650 24600 1 0 0 gnd.sym
-C 12950 24600 1 0 0 gnd.sym
-N 13050 25300 12750 25300 4
-N 12750 25300 12750 25700 4
-N 13750 25300 14500 25300 4
-N 12750 25700 14500 25700 4
-N 14900 11250 14900 11700 4
-N 11000 12600 11700 12600 4
-{
-T 11000 12700 5 10 1 1 0 0 1
+}
+C 11650 24600 1 0 0 gnd.sym
+C 10950 24600 1 0 0 gnd.sym
+N 11050 25300 10750 25300 4
+N 10750 25300 10750 25700 4
+N 11750 25300 13900 25300 4
+N 10750 25700 13900 25700 4
+N 15000 10650 15000 11100 4
+N 11100 12000 11800 12000 4
+{
+T 11100 12100 5 10 1 1 0 0 1
 netname=v_bat
 }
-N 13800 12200 13800 12600 4
-C 16900 12600 1 0 0 3.3V-plus.sym
-N 15900 12600 17100 12600 4
-C 17300 11700 1 90 0 capacitor.sym
+N 13900 11600 13900 12000 4
+C 17000 12000 1 0 0 3.3V-plus.sym
+N 16000 12000 17200 12000 4
+C 17400 11100 1 90 0 capacitor.sym
 {
-T 16600 11900 5 10 0 0 90 0 1
+T 16700 11300 5 10 0 0 90 0 1
 device=CAPACITOR
-<<<<<<< HEAD
-=======
-T 17300 11700 5 10 0 1 0 0 1
-vendor_part_number=587-2787-1-ND
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 17300 11700 5 10 0 0 0 0 1
+T 17400 11100 5 10 0 0 0 0 1
 footprint=0402
-T 17500 12500 5 10 1 1 180 0 1
+T 17600 11900 5 10 1 1 180 0 1
 refdes=C6
-T 17300 11800 5 10 1 1 0 0 1
+T 17400 11200 5 10 1 1 0 0 1
 value=4.7uF
-T 17300 11700 5 10 1 1 0 0 1
+T 17400 11100 5 10 0 1 0 0 1
 symversion=0.1
-T 17300 11700 5 10 1 1 0 0 1
-mfg_part_number=JMK105BBJ475MV-F
 }
-C 13400 11400 1 90 0 capacitor.sym
+C 13500 10800 1 90 0 capacitor.sym
 {
-T 12700 11600 5 10 0 0 90 0 1
+T 12800 11000 5 10 0 0 90 0 1
 device=CAPACITOR
-T 12500 11600 5 10 1 1 90 0 1
+T 12600 11000 5 10 0 0 90 0 1
 symversion=0.1
-T 13400 11400 5 10 0 0 90 0 1
-footprint=1210
-T 13550 12150 5 10 1 1 180 0 1
+T 13500 10800 5 10 0 0 90 0 1
+footprint=1206
+T 13650 11550 5 10 1 1 180 0 1
 refdes=C8
-T 13800 11700 5 10 1 1 180 0 1
+T 13900 11100 5 10 1 1 180 0 1
 value=22uF
-T 13400 11400 5 10 1 1 0 0 1
-mfg_part_number=CL31A226KAHNNNE
 }
-C 13800 11700 1 0 0 TC2185.sym
+C 13900 11100 1 0 0 TC2185.sym
 {
-T 14395 12395 5 10 0 1 0 0 1
+T 14495 11795 5 10 0 1 0 0 1
 device=IC
-T 13795 11695 5 10 0 1 0 0 1
+T 13895 11095 5 10 0 1 0 0 1
 footprint=SOT23-5
-<<<<<<< HEAD
-=======
-T 13800 11700 5 10 0 0 0 0 1
-vendor=digikey
-T 13800 11700 5 10 1 1 0 0 1
-vendor_part_number=	296-11010-1-ND	
-T 13800 11700 5 10 0 0 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 14095 12895 5 10 1 1 0 0 1
+T 14195 12295 5 10 1 1 0 0 1
 refdes=U2
-T 14900 12900 5 10 1 1 0 0 1
-value=TPS76133
-T 13800 11700 5 10 1 1 0 0 1
-mfg_part_number=TPS76133DBVR
+T 15000 12300 5 10 1 1 0 0 1
+value=LD2980CM33TR
 }
-C 14800 10950 1 0 0 gnd.sym
-T 26850 11900 9 40 1 0 0 0 1
+C 14900 10350 1 0 0 gnd.sym
+T 26550 11900 9 40 1 0 0 0 1
 EasyMini
 N 21500 22500 20500 22500 4
 {
@@ -697,19 +435,14 @@ N 21500 23300 20500 23300 4
 T 21500 23350 5 10 1 1 0 6 1
 netname=sclk0
 }
-N 21500 17300 20500 17300 4
-{
-T 21500 17350 5 10 1 1 0 6 1
-netname=mosi1
-}
 N 21500 16900 20500 16900 4
 {
 T 21500 16950 5 10 1 1 0 6 1
 netname=miso1
 }
-N 14000 23200 14500 23200 4
+N 12800 22500 13900 22500 4
 {
-T 14000 23250 5 10 1 1 0 0 1
+T 12800 22550 5 10 1 1 0 0 1
 netname=sclk1
 }
 N 21500 16500 20500 16500 4
@@ -717,124 +450,84 @@ N 21500 16500 20500 16500 4
 T 21500 16550 5 10 1 1 0 6 1
 netname=cs_flash
 }
-N 21500 22900 20500 22900 4
-{
-T 21500 22950 5 10 1 1 0 6 1
-netname=cs_baro
-}
 N 21500 21300 20500 21300 4
 {
 T 21500 21350 5 10 1 1 0 6 1
 netname=sense_a
 }
-N 21500 20900 20500 20900 4
-{
-T 21500 20950 5 10 1 1 0 6 1
-netname=sense_b
-}
 N 21500 20500 20500 20500 4
 {
 T 21500 20550 5 10 1 1 0 6 1
-netname=sense_bat
+netname=sense_b
 }
-N 21500 24900 20500 24900 4
+N 13900 20500 12800 20500 4
 {
-T 21500 24950 5 10 1 1 0 6 1
+T 12800 20550 5 10 1 1 0 0 1
 netname=fire_a
 }
-N 21500 24500 20500 24500 4
+C 12350 19300 1 90 0 resistor.sym
 {
-T 21500 24550 5 10 1 1 0 6 1
-netname=fire_b
-}
-C 13350 20700 1 90 0 resistor.sym
-{
-T 12950 21000 5 10 0 0 90 0 1
+T 11950 19600 5 10 0 0 90 0 1
 device=RESISTOR
-T 12750 21200 5 10 1 1 0 0 1
+T 11750 19800 5 10 1 1 0 0 1
 refdes=R9
-T 12750 20950 5 10 1 1 0 0 1
+T 11750 19550 5 10 1 1 0 0 1
 value=1.5k
-T 13350 20700 5 10 0 1 0 0 1
+T 12350 19300 5 10 0 1 0 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 13350 20700 5 10 0 1 0 0 1
-loadstatus=smt
-T 13350 20700 5 10 0 1 0 0 1
-vendor=digikey
-T 13350 20700 5 10 1 1 0 0 1
-vendor_part_number=P1.50KLCT-ND
-T 13350 20700 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF1501X
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-}
-N 13250 20700 13250 20100 4
-C 15400 15200 1 180 1 conn-4.sym
-{
-T 15750 15250 5 10 1 1 0 0 1
+}
+N 12250 19300 12250 18100 4
+C 15500 14600 1 180 1 conn-4.sym
+{
+T 15850 14650 5 10 1 1 0 0 1
 refdes=J2
-T 15400 15200 5 10 0 0 180 6 1
+T 15500 14600 5 10 0 0 180 6 1
 footprint=282834-4
-T 15400 15200 5 10 0 1 0 0 1
+T 15500 14600 5 10 0 1 0 0 1
 device=CONNECTOR
-T 15400 15200 5 10 0 1 0 0 1
-value=Terminal-4
-<<<<<<< HEAD
-=======
-T 15400 15200 5 10 0 1 0 0 1
-loadstatus=throughhole
-T 15400 15200 5 10 0 1 0 0 1
-vendor=4ucon
-T 15400 15200 5 10 1 1 0 0 1
-vendor_part_number=20087
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-}
-C 13500 13800 1 0 1 conn-4.sym
-{
-T 12900 15350 5 10 1 1 0 0 1
+T 15500 14600 5 10 0 1 0 0 1
+value=4screws
+T 15500 14600 5 10 0 0 0 0 1
+mfg_part_number=282834-4
+}
+C 13600 13200 1 0 1 conn-4.sym
+{
+T 13000 14750 5 10 1 1 0 0 1
 refdes=J3
-T 13500 13800 5 10 0 0 0 0 1
+T 13600 13200 5 10 0 0 0 0 1
 footprint=282834-4
-T 13500 13800 5 10 0 1 0 0 1
+T 13600 13200 5 10 0 1 0 0 1
 device=CONNECTOR
-T 13500 13800 5 10 0 1 0 0 1
-value=Terminal-4
-<<<<<<< HEAD
-=======
-T 13500 13800 5 10 0 1 0 0 1
-loadstatus=throughhole
-T 13500 13800 5 10 0 1 0 0 1
-vendor=4ucon
-T 13500 13800 5 10 1 1 0 0 1
-vendor_part_number=20087
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-}
-T 12650 14700 9 10 1 0 0 6 1
+T 13600 13200 5 10 0 1 0 0 1
+value=4screws
+T 13600 13200 5 10 0 0 0 0 1
+mfg_part_number=282834-4
+}
+T 12750 14100 9 10 1 0 0 6 1
 Switch Out
-T 12650 15100 9 10 1 0 0 6 1
+T 12750 14500 9 10 1 0 0 6 1
 Switch In
-T 16150 14700 9 10 1 0 0 0 1
+T 16250 14100 9 10 1 0 0 0 1
 Battery +
-T 16150 15100 9 10 1 0 0 0 1
+T 16250 14500 9 10 1 0 0 0 1
 Battery -
-T 12650 14300 9 10 1 0 0 6 1
+T 12750 13700 9 10 1 0 0 6 1
 Apogee +
-T 12650 13900 9 10 1 0 0 6 1
+T 12750 13300 9 10 1 0 0 6 1
 Apogee -
-T 16150 14300 9 10 1 0 0 0 1
+T 16250 13700 9 10 1 0 0 0 1
 Main +
-T 16150 13900 9 10 1 0 0 0 1
+T 16250 13300 9 10 1 0 0 0 1
 Main -
-N 13500 14300 15400 14300 4
-N 14700 13900 15400 13900 4
+N 13600 13700 15500 13700 4
+N 14800 13300 15500 13300 4
 {
-T 14700 13950 5 10 1 1 0 0 1
+T 14800 13350 5 10 1 1 0 0 1
 netname=fet_b
 }
-N 13500 13900 14200 13900 4
+N 13600 13300 14300 13300 4
 {
-T 14200 13950 5 10 1 1 0 6 1
+T 14300 13350 5 10 1 1 0 6 1
 netname=fet_a
 }
 C 22500 13600 1 0 0 gnd.sym
@@ -849,21 +542,10 @@ T 28600 14700 5 10 0 0 90 0 1
 device=RESISTOR
 T 29000 14400 5 10 0 0 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 29000 14400 5 10 1 1 90 0 1
-vendor_part_number=P100KLCT-ND
-T 29000 14400 5 10 0 1 90 0 1
-vendor=digikey
-T 29000 14400 5 10 0 1 90 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 T 28700 14800 5 10 1 1 180 0 1
 value=100k
 T 28700 15100 5 10 1 1 180 0 1
 refdes=R12
-T 29000 14400 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF1003X
 }
 C 28800 13200 1 0 0 gnd.sym
 C 29000 13500 1 90 0 resistor.sym
@@ -872,21 +554,10 @@ T 28600 13800 5 10 0 0 90 0 1
 device=RESISTOR
 T 29000 13495 5 10 0 1 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 29000 13500 5 10 1 1 90 0 1
-vendor_part_number=P27.0KLCT-ND
-T 29000 13500 5 10 0 0 0 0 1
-vendor=digikey
-T 29000 13500 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 T 28700 14200 5 10 1 1 180 0 1
 refdes=R13
 T 28400 13700 5 10 1 1 0 0 1
 value=27k
-T 29000 13500 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF2702X
 }
 N 28900 15300 28200 15300 4
 {
@@ -901,7 +572,7 @@ T 30900 15200 5 10 0 0 0 0 1
 footprint=hole-M3
 T 30900 15200 5 10 0 1 0 0 1
 loadstatus=noload
-T 30900 15200 5 10 1 1 0 0 1
+T 30900 15200 5 10 0 1 0 0 1
 nobom=1
 T 30500 15400 5 10 1 1 0 0 1
 refdes=H1
@@ -918,7 +589,7 @@ T 30900 14600 5 10 0 0 0 0 1
 footprint=hole-M3
 T 30900 14600 5 10 0 1 0 0 1
 loadstatus=noload
-T 30900 14600 5 10 1 1 0 0 1
+T 30900 14600 5 10 0 1 0 0 1
 nobom=1
 T 30500 14800 5 10 1 1 0 0 1
 refdes=H2
@@ -931,7 +602,7 @@ T 30900 14000 5 10 0 0 0 0 1
 footprint=hole-M3
 T 30900 14000 5 10 0 1 0 0 1
 loadstatus=noload
-T 30900 14000 5 10 1 1 0 0 1
+T 30900 14000 5 10 0 1 0 0 1
 nobom=1
 T 30500 14200 5 10 1 1 0 0 1
 refdes=H3
@@ -944,7 +615,7 @@ T 30900 13400 5 10 0 0 0 0 1
 footprint=hole-M3
 T 30900 13400 5 10 0 1 0 0 1
 loadstatus=noload
-T 30900 13400 5 10 1 1 0 0 1
+T 30900 13400 5 10 0 1 0 0 1
 nobom=1
 T 30500 13600 5 10 1 1 0 0 1
 refdes=H4
@@ -958,27 +629,16 @@ C 24100 20800 1 0 1 beeper.sym
 {
 T 23800 21700 5 10 0 0 0 6 1
 device=BEEPER
-T 23800 21900 5 10 1 1 0 6 1
+T 23800 21900 5 10 0 0 0 6 1
 symversion=0.1
-<<<<<<< HEAD
-T 24100 20800 5 10 0 1 0 6 1
-footprint=TDK_PS12
-=======
-T 24100 20800 5 10 0 0 0 6 1
-vendor_part_number=445-2525-1-ND
 T 24100 20800 5 10 0 1 0 6 1
 footprint=TDK_PS12
 T 24100 20800 5 10 0 1 0 6 1
-vendor=digikey
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 24100 20800 5 10 0 1 0 6 1
 value=TDK_PS12
 T 24000 21400 5 10 1 1 0 6 1
 refdes=U8
-T 24100 20800 5 10 1 1 0 0 1
-mfg_part_number=PS1240P02BT
 }
-N 21500 19700 20500 19700 4
+N 22200 19700 20500 19700 4
 {
 T 21500 19750 5 10 1 1 0 6 1
 netname=swdio
@@ -1003,15 +663,14 @@ N 23400 18900 22650 18900 4
 T 22650 19000 5 10 1 1 0 0 1
 netname=swclk
 }
-N 22600 21100 23100 21100 4
 C 24000 20800 1 0 0 gnd.sym
 C 23300 19800 1 0 0 gnd.sym
-N 20500 18500 23400 18500 4
+N 22600 18500 23400 18500 4
 {
 T 22650 18550 5 10 1 1 0 0 1
 netname=rxd
 }
-N 20500 18100 23400 18100 4
+N 22600 18100 23400 18100 4
 {
 T 22650 18150 5 10 1 1 0 0 1
 netname=txd
@@ -1028,24 +687,17 @@ T 23400 18000 5 10 0 1 0 0 1
 device=CONNECTOR
 T 23400 18000 5 10 0 1 0 0 1
 loadstatus=noload
-<<<<<<< HEAD
-=======
-T 23400 18000 5 10 0 1 0 0 1
-vendor=digikey
-T 23400 18000 5 10 1 1 0 0 1
-vendor_part_number=WM1735-ND
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 }
-N 13500 14700 14200 14700 4
+N 13600 14100 14300 14100 4
 {
-T 14200 14750 5 10 1 1 0 6 1
+T 14300 14150 5 10 1 1 0 6 1
 netname=v_bat
 }
-C 15300 14800 1 0 0 gnd.sym
-N 13500 15100 14950 15100 4
-N 14950 15100 14950 14700 4
-N 14950 14700 15400 14700 4
-N 13500 14700 13500 14300 4
+C 15400 14200 1 0 0 gnd.sym
+N 13600 14500 15050 14500 4
+N 15050 14500 15050 14100 4
+N 15050 14100 15500 14100 4
+N 13600 14100 13600 13700 4
 C 20500 25200 1 0 0 nc-right.sym
 {
 T 20600 25700 5 10 0 0 0 0 1
@@ -1067,13 +719,6 @@ value=NoConnection
 T 20600 24300 5 10 0 0 0 0 1
 device=DRC_Directive
 }
-C 20500 19200 1 0 0 nc-right.sym
-{
-T 20600 19700 5 10 0 0 0 0 1
-value=NoConnection
-T 20600 19900 5 10 0 0 0 0 1
-device=DRC_Directive
-}
 C 20500 18800 1 0 0 nc-right.sym
 {
 T 20600 19300 5 10 0 0 0 0 1
@@ -1081,25 +726,18 @@ value=NoConnection
 T 20600 19500 5 10 0 0 0 0 1
 device=DRC_Directive
 }
-C 14000 22700 1 0 0 nc-left.sym
-{
-T 14000 23100 5 10 0 0 0 0 1
-value=NoConnection
-T 14000 23500 5 10 0 0 0 0 1
-device=DRC_Directive
-}
-C 11800 20800 1 0 0 nc-right.sym
+C 11600 18800 1 0 0 nc-right.sym
 {
-T 11900 21300 5 10 0 0 0 0 1
+T 11700 19300 5 10 0 0 0 0 1
 value=NoConnection
-T 11900 21500 5 10 0 0 0 0 1
+T 11700 19500 5 10 0 0 0 0 1
 device=DRC_Directive
 }
-C 11800 19600 1 0 0 nc-right.sym
+C 11600 17600 1 0 0 nc-right.sym
 {
-T 11900 20100 5 10 0 0 0 0 1
+T 11700 18100 5 10 0 0 0 0 1
 value=NoConnection
-T 11900 20300 5 10 0 0 0 0 1
+T 11700 18300 5 10 0 0 0 0 1
 device=DRC_Directive
 }
 C 27100 24200 1 0 0 opamp-dual.sym
@@ -1108,25 +746,14 @@ T 28200 25500 5 10 0 0 0 0 1
 device=IC
 T 27900 24900 5 10 1 1 0 0 1
 refdes=U5
-T 28200 26100 5 10 1 1 0 0 1
+T 28200 26100 5 10 0 0 0 0 1
 symversion=0.1
 T 27900 24200 5 10 1 1 0 0 1
 value=LM293
 T 27100 24200 5 10 0 1 0 0 1
 slot=1
 T 27100 24200 5 10 0 1 0 0 1
-<<<<<<< HEAD
-=======
-loadstatus=smt
-T 27100 24200 5 10 0 1 0 0 1
-vendor=digikey
-T 27100 24200 5 10 0 0 0 0 1
-vendor_part_number=497-11134-1-ND
-T 27100 24200 5 10 0 1 0 0 1
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 footprint=8ufson2x2
-T 27100 24200 5 10 1 1 0 0 1
-mfg_part_number=LM293QT
 }
 C 27100 20500 1 0 0 opamp-dual.sym
 {
@@ -1134,25 +761,14 @@ T 28200 21800 5 10 0 0 0 0 1
 device=IC
 T 27900 21200 5 10 1 1 0 0 1
 refdes=U5
-T 28200 22400 5 10 1 1 0 0 1
+T 28200 22400 5 10 0 0 0 0 1
 symversion=0.1
 T 27100 20500 5 10 0 0 0 0 1
 slot=2
 T 27900 20500 5 10 1 1 0 0 1
 value=LM293
 T 27100 20500 5 10 0 1 0 0 1
-<<<<<<< HEAD
-=======
-loadstatus=smt
-T 27100 20500 5 10 0 1 0 0 1
-vendor=digikey
-T 27100 20500 5 10 0 0 0 0 1
-vendor_part_number=497-11134-1-ND
-T 27100 20500 5 10 0 1 0 0 1
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 footprint=8ufson2x2
-T 27100 20500 5 10 1 1 0 0 1
-mfg_part_number=LM293QT
 }
 N 28100 24600 28600 24600 4
 N 28600 24600 28600 23300 4
@@ -1162,47 +778,29 @@ C 27500 23900 1 0 0 gnd.sym
 C 27500 20200 1 0 0 gnd.sym
 C 27400 25000 1 0 0 3.3V-plus.sym
 C 27400 21300 1 0 0 3.3V-plus.sym
-N 13200 11400 13200 11300 4
-N 13200 11300 14900 11300 4
-N 14900 11300 17100 11300 4
-N 17100 11300 17100 11700 4
-N 13200 12300 13200 12600 4
-N 14100 16300 14100 16600 4
-N 14100 17500 14100 18300 4
-N 14500 17700 14100 17700 4
-N 14500 18100 14100 18100 4
-N 14500 16500 14100 16500 4
-N 13200 17800 13200 18100 4
-N 13200 18100 14100 18100 4
-N 13200 16900 13200 16500 4
-N 13200 16500 14100 16500 4
-N 23400 19300 21500 19300 4
-N 21500 19300 21500 19700 4
-N 20500 20100 22600 20100 4
-N 22600 20100 22600 21100 4
-C 11700 12400 1 0 0 diode.sym
-{
-T 12100 13000 5 10 0 0 0 0 1
+N 13300 10800 13300 10700 4
+N 13300 10700 15000 10700 4
+N 15000 10700 17200 10700 4
+N 17200 10700 17200 11100 4
+N 13300 11700 13300 12000 4
+N 13400 17300 13400 17700 4
+N 12500 17300 13900 17300 4
+N 23400 19300 22200 19300 4
+N 22200 19300 22200 19700 4
+C 11800 11800 1 0 0 diode.sym
+{
+T 12200 12400 5 10 0 0 0 0 1
 device=DIODE
-T 12000 12900 5 10 1 1 0 0 1
+T 12100 12300 5 10 1 1 0 0 1
 refdes=D1
-T 11700 12400 5 10 0 0 0 0 1
-<<<<<<< HEAD
-=======
-vendor=digikey
-T 11700 12400 5 10 1 1 0 0 1
-vendor_part_number=DFLS130LDICT-ND
-T 11700 12400 5 10 0 0 0 0 1
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
+T 11800 11800 5 10 0 0 0 0 1
 footprint=powerdi123
-T 11700 12100 5 10 1 1 0 0 1
+T 11800 11500 5 10 1 1 0 0 1
 value=DFLS130L
-T 11700 12400 5 10 1 1 0 0 1
-mfg_part_number=DFLS130L-7
 }
-N 12600 12600 13800 12600 4
+N 12700 12000 13900 12000 4
 {
-T 12900 12700 5 10 1 1 0 0 1
+T 13000 12100 5 10 1 1 0 0 1
 netname=v_ldo_in
 }
 C 24800 22400 1 90 0 resistor.sym
@@ -1211,24 +809,10 @@ T 24400 22700 5 10 0 0 90 0 1
 device=RESISTOR
 T 24800 22395 5 10 0 1 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 24800 22400 5 10 0 1 0 0 1
-vendor=digikey
-T 24800 22400 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
 T 24500 23100 5 10 1 1 180 0 1
 refdes=R17
-T 24100 22600 5 10 1 1 0 0 1
-value=9.09k
-<<<<<<< HEAD
-=======
-T 24800 22400 5 10 1 1 0 0 1
-vendor_part_number=P9.09KLCT-ND
-T 24800 22400 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF9091X
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
+T 24500 22600 5 10 1 1 0 6 1
+value=90.9k
 }
 C 24800 23300 1 90 0 resistor.sym
 {
@@ -1236,74 +820,32 @@ T 24400 23600 5 10 0 0 90 0 1
 device=RESISTOR
 T 24800 23295 5 10 0 1 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 24800 23300 5 10 0 1 0 0 1
-vendor=digikey
-T 24800 23300 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 24500 24000 5 10 1 1 180 0 1
+T 24500 23800 5 10 1 1 0 6 1
 refdes=R16
-T 24200 23500 5 10 1 1 0 0 1
-value=10k
-<<<<<<< HEAD
-=======
-T 24800 23300 5 10 1 1 0 0 1
-vendor_part_number=P10.0KLCT-ND
-T 24800 23300 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF1002X
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-}
-C 24000 23900 1 90 0 resistor.sym
-{
-T 23600 24200 5 10 0 0 90 0 1
+T 24500 23500 5 10 1 1 0 6 1
+value=100k
+}
+C 23900 23900 1 90 0 resistor.sym
+{
+T 23500 24200 5 10 0 0 90 0 1
 device=RESISTOR
-T 24000 23895 5 10 0 1 90 0 1
+T 23900 23895 5 10 0 1 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 24000 23900 5 10 0 1 0 0 1
-vendor=digikey
-T 24000 23900 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 23700 24600 5 10 1 1 180 0 1
+T 23600 24400 5 10 1 1 0 6 1
 refdes=R15
-T 23300 24100 5 10 1 1 0 0 1
-value=8.06k
-<<<<<<< HEAD
-=======
-T 24000 23900 5 10 1 1 0 0 1
-vendor_part_number=P8.06KLCT-ND
-T 24000 23900 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF8061X
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-}
-C 24000 24800 1 90 0 resistor.sym
-{
-T 23600 25100 5 10 0 0 90 0 1
+T 23600 24100 5 10 1 1 0 6 1
+value=80.6k
+}
+C 23900 24800 1 90 0 resistor.sym
+{
+T 23500 25100 5 10 0 0 90 0 1
 device=RESISTOR
-T 24000 24795 5 10 0 1 90 0 1
+T 23900 24795 5 10 0 1 90 0 1
 footprint=0402
-<<<<<<< HEAD
-=======
-T 24000 24800 5 10 0 1 0 0 1
-vendor=digikey
-T 24000 24800 5 10 0 1 0 0 1
-loadstatus=smt
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
-T 23700 25500 5 10 1 1 180 0 1
+T 23600 25300 5 10 1 1 0 6 1
 refdes=R14
-T 23400 25000 5 10 1 1 0 0 1
-value=10k
-<<<<<<< HEAD
-=======
-T 24000 24800 5 10 1 1 0 0 1
-vendor_part_number=P10.0KLCT-ND
-T 24000 24800 5 10 1 1 0 0 1
-mfg_part_number=ERJ-2RKF1002X
->>>>>>> eefc21b76d14abba56c3d66f9f58c54d66dde2a7
+T 23600 25000 5 10 1 1 0 6 1
+value=100k
 }
 C 24500 24200 1 0 0 3.3V-plus.sym
 C 24600 22100 1 0 0 gnd.sym
@@ -1315,14 +857,14 @@ netname=cmp_rail
 N 25700 20700 25700 24400 4
 N 25700 20700 27100 20700 4
 N 27100 24400 25700 24400 4
-C 23800 23600 1 0 0 gnd.sym
-N 23900 25700 23900 25800 4
-N 23900 25800 22900 25800 4
+C 23700 23600 1 0 0 gnd.sym
+N 23800 25700 23800 25800 4
+N 23800 25800 22800 25800 4
 {
-T 22900 25900 5 10 1 1 0 0 1
+T 22800 25900 5 10 1 1 0 0 1
 netname=v_ldo_in
 }
-N 23900 24800 27100 24800 4
+N 23800 24800 27100 24800 4
 {
 T 24900 24900 5 10 1 1 0 0 1
 netname=cmp_ldo_in
@@ -1334,46 +876,212 @@ T 28100 10500 9 10 1 0 0 0 1
 T 28700 10500 9 10 1 0 0 0 1
 1
 T 30500 10500 9 10 1 0 0 0 1
-1.0
+3.0
 T 25800 10500 9 10 1 0 0 0 1
 easymini.sch
 T 25800 10200 9 10 1 0 0 0 1
 http://altusmetrum.org/EasyMini
-C 17300 15100 1 270 0 battery.sym
+C 17400 14500 1 270 0 battery.sym
 {
-T 18200 14800 5 10 0 1 270 0 1
+T 18300 14200 5 10 0 1 270 0 1
 device=CONNECTOR
-T 17800 15000 5 10 1 1 0 0 1
+T 17900 14400 5 10 1 1 0 0 1
 refdes=B1
-T 18600 14800 5 10 1 1 270 0 1
+T 18700 14200 5 10 0 0 270 0 1
 symversion=0.1
-T 17800 14600 5 10 1 1 0 0 1
+T 17900 14000 5 10 1 1 0 0 1
 value=LiPo
-T 17300 15100 5 10 0 0 0 0 1
+T 17400 14500 5 10 0 0 0 0 1
 footprint=B2B-PH
-T 17300 15100 5 10 0 1 0 0 1
+T 17400 14500 5 10 0 1 0 0 1
 device=CONNECTOR
-T 17300 15100 5 10 1 1 0 0 1
-mfg_part_number=440054-2
 }
-N 14500 15100 14500 15500 4
-N 14500 15500 17500 15500 4
-N 17500 15500 17500 15100 4
-C 17400 14100 1 0 0 gnd.sym
-C 15900 12100 1 0 0 nc-right.sym
+N 14600 14500 14600 14900 4
+N 14600 14900 17600 14900 4
+N 17600 14900 17600 14500 4
+C 17500 13500 1 0 0 gnd.sym
+C 16000 11500 1 0 0 nc-right.sym
 {
-T 16000 12600 5 10 0 0 0 0 1
+T 16100 12000 5 10 0 0 0 0 1
 value=NoConnection
-T 16000 12800 5 10 0 0 0 0 1
+T 16100 12200 5 10 0 0 0 0 1
 device=DRC_Directive
 }
-N 13250 22250 13250 21600 4
+N 12250 21300 13900 21300 4
 {
-T 12800 22350 5 10 1 1 0 0 1
+T 12800 21350 5 10 1 1 0 0 1
 netname=usb_pullup
 }
-N 21500 17700 20500 17700 4
+C 10600 16500 1 0 0 gnd.sym
+C 13900 16300 1 0 0 lpc11u2x_bga.sym
 {
-T 21500 17750 5 10 1 1 0 6 1
-netname=usb_pullup
+T 14295 26500 5 10 0 0 0 0 1
+footprint=sot1155-2
+T 14295 26200 5 10 1 1 0 0 1
+refdes=U1
+T 20100 26200 5 10 1 1 0 6 1
+value=LPC11U24FET48/301
+T 13900 16300 5 10 0 1 0 0 1
+device=IC
+}
+N 13400 17700 13900 17700 4
+N 12500 16400 13900 16400 4
+N 13900 16400 13900 16900 4
+C 13400 23600 1 0 0 nc-left.sym
+{
+T 13400 24000 5 10 0 0 0 0 1
+value=NoConnection
+T 13400 24400 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+C 13400 23200 1 0 0 nc-left.sym
+{
+T 13400 23600 5 10 0 0 0 0 1
+value=NoConnection
+T 13400 24000 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+C 13400 22800 1 0 0 nc-left.sym
+{
+T 13400 23200 5 10 0 0 0 0 1
+value=NoConnection
+T 13400 23600 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+C 13400 22000 1 0 0 nc-left.sym
+{
+T 13400 22400 5 10 0 0 0 0 1
+value=NoConnection
+T 13400 22800 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+C 13400 20800 1 0 0 nc-left.sym
+{
+T 13400 21200 5 10 0 0 0 0 1
+value=NoConnection
+T 13400 21600 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+C 13400 19200 1 0 0 nc-left.sym
+{
+T 13400 19600 5 10 0 0 0 0 1
+value=NoConnection
+T 13400 20000 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+C 13400 18800 1 0 0 nc-left.sym
+{
+T 13400 19200 5 10 0 0 0 0 1
+value=NoConnection
+T 13400 19600 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+C 20500 17600 1 0 0 nc-right.sym
+{
+T 20600 18100 5 10 0 0 0 0 1
+value=NoConnection
+T 20600 18300 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+N 12250 20200 12250 21300 4
+C 20500 20000 1 0 0 nc-right.sym
+{
+T 20600 20500 5 10 0 0 0 0 1
+value=NoConnection
+T 20600 20700 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+N 13900 21700 12800 21700 4
+{
+T 12800 21750 5 10 1 1 0 0 1
+netname=mosi1
+}
+C 20500 17200 1 0 0 nc-right.sym
+{
+T 20600 17700 5 10 0 0 0 0 1
+value=NoConnection
+T 20600 17900 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+N 21500 24900 20500 24900 4
+{
+T 21500 24950 5 10 1 1 0 6 1
+netname=fire_b
+}
+C 20500 24400 1 0 0 nc-right.sym
+{
+T 20600 24900 5 10 0 0 0 0 1
+value=NoConnection
+T 20600 25100 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+C 20500 18400 1 0 0 nc-right.sym
+{
+T 20600 18900 5 10 0 0 0 0 1
+value=NoConnection
+T 20600 19100 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+C 20500 18000 1 0 0 nc-right.sym
+{
+T 20600 18500 5 10 0 0 0 0 1
+value=NoConnection
+T 20600 18700 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+N 13900 24100 12800 24100 4
+{
+T 12800 24150 5 10 1 1 0 0 1
+netname=rxd
+}
+N 13900 24500 12800 24500 4
+{
+T 12800 24550 5 10 1 1 0 0 1
+netname=txd
+}
+N 13900 19700 12800 19700 4
+{
+T 12800 19750 5 10 1 1 0 0 1
+netname=beep
+}
+C 13400 20000 1 0 0 nc-left.sym
+{
+T 13400 20400 5 10 0 0 0 0 1
+value=NoConnection
+T 13400 20800 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+N 23100 21100 22300 21100 4
+{
+T 22300 21150 5 10 1 1 0 0 1
+netname=beep
+}
+N 13900 24900 12800 24900 4
+{
+T 12800 24950 5 10 1 1 0 0 1
+netname=cs_baro
+}
+C 20500 22800 1 0 0 nc-right.sym
+{
+T 20600 23300 5 10 0 0 0 0 1
+value=NoConnection
+T 20600 23500 5 10 0 0 0 0 1
+device=DRC_Directive
+}
+N 21500 19300 20500 19300 4
+{
+T 21500 19350 5 10 1 1 0 6 1
+netname=sense_bat
+}
+C 20500 20800 1 0 0 nc-right.sym
+{
+T 20600 21300 5 10 0 0 0 0 1
+value=NoConnection
+T 20600 21500 5 10 0 0 0 0 1
+device=DRC_Directive
 }
+N 13300 18500 13900 18500 4
+N 13300 18100 13900 18100 4
+T 24900 10900 9 10 1 0 0 0 2
+                   Copyright 2022 by Bdale Garbee & Keith Packard
+Licensed under the TAPR Open Hardware License, http://www.tapr.org/OHL