Merge branch 'master' into fixup

diff --git a/Makefile b/Makefile
index 422591800e23237a1cc59e485fe19b46b5b41b2e..6c9cca1a044e9a746dfb29b7a44629ffafd6e29a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,6 @@ SCHEMATICS=easymini.sch
 LAYERS=2
 
 # sides with silkscreen, can be none|top|bottom|both
-SILK=bottom
+SILK=both
 
 include ../altusmetrum/pcb.mk

diff --git a/easymini.sch b/easymini.sch
index 6bfe5a29535cf9311353d5d21cb51208ceead7ce..5458e9a280f0b0648a42566f53b3e54dd96814a1 100644 (file)
--- a/easymini.sch
+++ b/easymini.sch
@@ -10,17 +10,6 @@ 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
 }
 C 24600 13300 1 0 0 MS5607.sym
 {
@@ -32,15 +21,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 +56,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
 refdes=R1
 T 26800 22600 5 10 1 1 0 0 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 +74,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
 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
 }
 C 27400 19500 1 0 0 resistor.sym
 {
@@ -127,21 +85,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
 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
 }
 N 28300 23300 28900 23300 4
 N 28300 19600 28900 19600 4
@@ -151,21 +98,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
 refdes=R7
 T 30900 20200 5 10 1 1 180 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 +109,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
 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 +122,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
 refdes=R8
 T 30600 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 +135,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 +148,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 +166,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
 refdes=R4
 T 26800 18900 5 10 1 1 0 0 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,21 +177,10 @@ 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
 {
@@ -319,15 +189,6 @@ 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
 device=CONNECTOR
 T 11800 18900 5 10 0 0 0 0 1
 value=USBmicroB
@@ -344,17 +205,6 @@ T 14200 20650 5 10 1 1 0 0 1
 value=33
 T 13600 20400 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
 {
@@ -366,17 +216,6 @@ T 14200 19750 5 10 1 1 0 0 1
 value=33
 T 13600 20000 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
@@ -411,19 +250,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
 }
 C 20800 14800 1 0 0 3.3V-plus.sym
 N 22200 13700 22200 14800 4
@@ -460,25 +287,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,25 +300,12 @@ 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
 {
@@ -512,25 +313,12 @@ T 12700 17100 5 10 0 0 90 0 1
 device=CAPACITOR
 T 13000 17700 5 10 1 1 180 0 1
 refdes=C7
-T 12500 17100 5 10 1 1 90 0 1
+T 12500 17100 5 10 0 0 90 0 1
 symversion=0.1
 T 12600 17000 5 10 1 1 0 0 1
 value=0.1uF
-<<<<<<< HEAD
-T 13400 16900 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
 {
@@ -538,25 +326,12 @@ T 13600 16800 5 10 0 0 90 0 1
 device=CAPACITOR
 T 13900 17400 5 10 1 1 180 0 1
 refdes=C9
-T 13400 16800 5 10 1 1 90 0 1
+T 13400 16800 5 10 0 0 90 0 1
 symversion=0.1
 T 13500 16700 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
-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
@@ -564,7 +339,7 @@ C 13850 25300 1 270 0 capacitor.sym
 {
 T 14550 25100 5 10 0 0 270 0 1
 device=CAPACITOR
-T 14750 25100 5 10 1 1 270 0 1
+T 14750 25100 5 10 0 0 270 0 1
 symversion=0.1
 T 13850 25300 5 10 0 0 0 0 1
 footprint=0402
@@ -572,14 +347,12 @@ T 14250 25000 5 10 1 1 0 0 1
 refdes=C3
 T 14250 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
 {
 T 13250 25100 5 10 0 0 270 0 1
 device=CAPACITOR
-T 13450 25100 5 10 1 1 270 0 1
+T 13450 25100 5 10 0 0 270 0 1
 symversion=0.1
 T 12550 25300 5 10 0 0 0 0 1
 footprint=0402
@@ -587,8 +360,6 @@ T 12250 25000 5 10 1 1 0 0 1
 refdes=C2
 T 12150 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
@@ -596,7 +367,7 @@ C 13050 24900 1 0 0 ABM8.sym
 {
 T 13250 25400 5 10 0 0 0 0 1
 device=CRYSTAL
-T 13250 25600 5 10 1 1 0 0 1
+T 13250 25600 5 10 0 0 0 0 1
 symversion=0.1
 T 13050 24900 5 10 0 0 0 0 1
 footprint=ABM8
@@ -604,8 +375,6 @@ T 12950 25400 5 10 1 1 0 0 1
 refdes=X1
 T 13650 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
@@ -626,27 +395,20 @@ C 17300 11700 1 90 0 capacitor.sym
 {
 T 16600 11900 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
 footprint=0402
 T 17500 12500 5 10 1 1 180 0 1
 refdes=C6
 T 17300 11800 5 10 1 1 0 0 1
 value=4.7uF
-T 17300 11700 5 10 1 1 0 0 1
+T 17300 11700 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
 {
 T 12700 11600 5 10 0 0 90 0 1
 device=CAPACITOR
-T 12500 11600 5 10 1 1 90 0 1
+T 12500 11600 5 10 0 0 90 0 1
 symversion=0.1
 T 13400 11400 5 10 0 0 90 0 1
 footprint=1210
@@ -654,8 +416,6 @@ T 13550 12150 5 10 1 1 180 0 1
 refdes=C8
 T 13800 11700 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
 {
@@ -663,21 +423,10 @@ T 14395 12395 5 10 0 1 0 0 1
 device=IC
 T 13795 11695 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
 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
 }
 C 14800 10950 1 0 0 gnd.sym
 T 26850 11900 9 40 1 0 0 0 1
@@ -757,17 +506,6 @@ T 12750 20950 5 10 1 1 0 0 1
 value=1.5k
 T 13350 20700 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
@@ -780,15 +518,6 @@ T 15400 15200 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
 {
@@ -800,15 +529,6 @@ T 13500 13800 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
 Switch Out
@@ -849,21 +569,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 +581,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 +599,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 +616,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 +629,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 +642,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,25 +656,14 @@ 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
 {
@@ -1028,13 +715,6 @@ 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
 {
@@ -1108,25 +788,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 +803,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
@@ -1187,18 +845,9 @@ device=DIODE
 T 12000 12900 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
 footprint=powerdi123
 T 11700 12100 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
 {
@@ -1211,24 +860,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
 }
 C 24800 23300 1 90 0 resistor.sym
 {
@@ -1236,24 +871,10 @@ 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
 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
 {
@@ -1261,24 +882,10 @@ T 23600 24200 5 10 0 0 90 0 1
 device=RESISTOR
 T 24000 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
 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
 {
@@ -1286,24 +893,10 @@ T 23600 25100 5 10 0 0 90 0 1
 device=RESISTOR
 T 24000 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
 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
 }
 C 24500 24200 1 0 0 3.3V-plus.sym
 C 24600 22100 1 0 0 gnd.sym
@@ -1345,7 +938,7 @@ T 18200 14800 5 10 0 1 270 0 1
 device=CONNECTOR
 T 17800 15000 5 10 1 1 0 0 1
 refdes=B1
-T 18600 14800 5 10 1 1 270 0 1
+T 18600 14800 5 10 0 0 270 0 1
 symversion=0.1
 T 17800 14600 5 10 1 1 0 0 1
 value=LiPo
@@ -1353,8 +946,6 @@ T 17300 15100 5 10 0 0 0 0 1
 footprint=B2B-PH
 T 17300 15100 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