From: Bdale Garbee <bdale@gag.com>
Date: Mon, 26 Oct 2015 02:32:30 +0000 (+0900)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/hw/easymini
X-Git-Tag: fab-v1.90~2^2
X-Git-Url: https://git.gag.com/?p=hw%2Feasymini;a=commitdiff_plain;h=5bfcec13cf5b99cacbbefbf2aebd18fa5878ae3c;hp=eefc21b76d14abba56c3d66f9f58c54d66dde2a7

Merge branch 'master' of ssh://git.gag.com/scm/git/hw/easymini
---

diff --git a/Makefile b/Makefile
index 80363bf..4225918 100644
--- a/Makefile
+++ b/Makefile
@@ -1,84 +1,13 @@
+# name of project, also used for PCB file
 PROJECT=easymini
-AM=../altusmetrum
-SCHEME=$(AM)/scheme
-NICKLE=$(AM)/nickle
-RETAB=nickle $(NICKLE)/retab
 
-# intentionally want to rebuild drc and bom on every invocation
-all:	drc pcb partslist $(PROJECT)-bom.csv partslist.dk muffin-5267.pdf zip
+# list of schematic files that make up this design
+SCHEMATICS=easymini.sch
 
-drc: $(PROJECT).sch
-	gnetlist -L $(SCHEME) -g drc2 $(PROJECT).sch -o $(PROJECT).drc
+# number of PCB layers
+LAYERS=2
 
-partslist: $(PROJECT).sch
-	gnetlist -L $(SCHEME) -g bom -o $(PROJECT).tabtmp $(PROJECT).sch
-	(head -n1 $(PROJECT).tabtmp; tail -n+2 $(PROJECT).tabtmp | sort) | $(RETAB) > $@ && rm -f $(PROJECT).tabtmp
+# sides with silkscreen, can be none|top|bottom|both
+SILK=bottom
 
-$(PROJECT)-bom.csv: $(PROJECT).sch Makefile
-	gnetlist -L $(SCHEME) -g partslistgag -o $(PROJECT).csvtmp $(PROJECT).sch
-	(head -n1 $(PROJECT).csvtmp; tail -n+2 $(PROJECT).csvtmp | sort -t \, -k 8) > $@ && rm -f $(PROJECT).csvtmp
-
-partslist.dk: $(PROJECT).sch Makefile $(SCHEME)/gnet-partslist-bom.scm
-	gnetlist -L $(SCHEME) -g partslist-bom -Ovendor=digikey -o $@ $(PROJECT).sch
-
-partslist-check.dk: $(PROJECT).sch Makefile $(SCHEME)/gnet-partslist-mfg-bom.scm
-	gnetlist -L $(SCHEME) -g partslist-mfg-bom -Ovendor=digikey -o $@ $(PROJECT).sch
-
-partslist.mouser: $(PROJECT).sch Makefile $(SCHEME)/gnet-partslist-bom.scm
-	gnetlist -L $(SCHEME) -g partslist-bom -Ovendor=mouser -o $@ $(PROJECT).sch
-
-muffin-5267.pdf: $(PROJECT)-bom.csv $(AM)/glabels/muffin-5267.glabels
-	glabels-3-batch $(AM)/glabels/muffin-5267.glabels -i $(PROJECT)-bom.csv -o muffin-5267.ps && ps2pdf muffin-5267.ps && rm muffin-5267.ps
-
-pcb:	$(PROJECT).sch project Makefile
-	gsch2pcb project
-
-$(PROJECT).xy:	$(PROJECT).pcb
-	pcb -x bom $(PROJECT).pcb
-
-$(PROJECT).gerb: $(PROJECT).pcb
-	rm -f *.gbr *.cnc
-	pcb -x gerber $(PROJECT).pcb
-	touch $@
-
-zip: $(PROJECT).zip $(PROJECT)-stencil.zip $(PROJECT)-oshpark.zip
-
-$(PROJECT).zip: $(PROJECT).gerb $(PROJECT).xy
-	rm -f $@
-	zip $@ *.gbr *.cnc *.xy
-
-$(PROJECT)-stencil.zip:	$(PROJECT).gerb
-	rm -f $@
-	zip $@ $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
-
-$(PROJECT)-oshpark.zip: $(PROJECT).gerb
-	cp easymini.bottom.gbr bottom\ layer.ger
-	cp easymini.bottommask.gbr bottom\ solder\ mask.ger
-	cp easymini.bottomsilk.gbr bottom\ silk\ screen.ger
-	cp easymini.outline.gbr board\ outline.ger
-	cp easymini.top.gbr top\ layer.ger
-	cp easymini.topmask.gbr top\ solder\ mask.ger
-	cp easymini.topsilk.gbr top\ silk\ screen.ger
-	cp easymini.plated-drill.cnc drills.xln
-	zip easymini-oshpark.zip *.ger *.xln
-
-$(PROJECT)-sch.ps:	$(PROJECT).sch
-	gschem -p -o $(PROJECT)-sch.ps -s /usr/share/gEDA/scheme/print.scm \
-		$(PROJECT).sch 
-
-$(PROJECT)-sch.pdf:	$(PROJECT)-sch.ps
-	ps2pdf $(PROJECT)-sch.ps
-
-$(PROJECT)-pcb.ps:	$(PROJECT).pcb
-	pcb -x ps --psfile $(PROJECT)-pcb.ps --media Letter $(PROJECT).pcb
-
-$(PROJECT)-pcb.pdf:	$(PROJECT)-pcb.ps
-	ps2pdf $(PROJECT)-pcb.ps
-
-pdf:	$(PROJECT)-sch.pdf $(PROJECT)-pcb.pdf
-
-clean:
-	rm -f *.bom *.drc *.log *~ $(PROJECT).ps *.gbr $(PROJECT).gerb *.cnc *bak* *- *.zip *.ger *.xln
-	rm -f *.net *.xy *.cmd *.png partslist $(PROJECT)-bom.csv partslist.dk partslist.mouser muffin-5267.pdf
-	rm -f *.partslist *.new.pcb *.unsorted $(PROJECT).xls
-	rm -f $(PROJECT)-stencil.zip $(PROJECT)*.pdf $(PROJECT)*.ps
+include ../altusmetrum/pcb.mk
diff --git a/attribs b/attribs
index 92a91e7..d7af178 100644
--- a/attribs
+++ b/attribs
@@ -1,6 +1,8 @@
+device
 value
-vendor
-vendor_part_number
 footprint
 loadstatus
-device
+provided
+mfg_part_number
+vendor
+vendor_part_number
diff --git a/easymini.sch b/easymini.sch
index d4a98e6..6bfe5a2 100644
--- a/easymini.sch
+++ b/easymini.sch
@@ -10,6 +10,8 @@ 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
@@ -18,6 +20,7 @@ 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
 {
@@ -29,12 +32,15 @@ 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
 {
@@ -70,12 +76,15 @@ 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
@@ -96,12 +105,15 @@ 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
@@ -115,12 +127,15 @@ 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
@@ -136,12 +151,15 @@ 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
@@ -155,12 +173,15 @@ 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
@@ -176,12 +197,15 @@ 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
@@ -197,12 +221,15 @@ 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
@@ -218,12 +245,15 @@ 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
@@ -244,12 +274,15 @@ 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
@@ -263,12 +296,15 @@ 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
@@ -283,12 +319,15 @@ 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
@@ -305,6 +344,8 @@ 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
@@ -313,6 +354,7 @@ 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
 {
@@ -324,6 +366,8 @@ 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
@@ -332,6 +376,7 @@ 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
@@ -366,6 +411,9 @@ 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
@@ -375,6 +423,7 @@ 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
@@ -415,6 +464,10 @@ T 23500 14100 5 10 1 1 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
@@ -425,6 +478,7 @@ 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
 {
@@ -436,6 +490,10 @@ T 21900 14100 5 10 1 1 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
@@ -446,6 +504,7 @@ 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
 {
@@ -457,6 +516,10 @@ T 12500 17100 5 10 1 1 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
@@ -467,6 +530,7 @@ 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
 {
@@ -478,6 +542,10 @@ T 13400 16800 5 10 1 1 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
@@ -488,6 +556,7 @@ 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
@@ -498,13 +567,7 @@ device=CAPACITOR
 T 14750 25100 5 10 1 1 270 0 1
 symversion=0.1
 T 13850 25300 5 10 0 0 0 0 1
-vendor_part_number=490-6203-1-ND
-T 13850 25300 5 10 0 0 0 0 1
 footprint=0402
-T 13850 25300 5 10 0 0 0 0 1
-vendor=digikey
-T 13850 25300 5 10 0 1 0 0 1
-loadstatus=smt
 T 14250 25000 5 10 1 1 0 0 1
 refdes=C3
 T 14250 24500 5 10 1 1 0 0 1
@@ -519,13 +582,7 @@ device=CAPACITOR
 T 13450 25100 5 10 1 1 270 0 1
 symversion=0.1
 T 12550 25300 5 10 0 0 0 0 1
-vendor_part_number=490-6203-1-ND
-T 12550 25300 5 10 0 0 0 0 1
 footprint=0402
-T 12550 25300 5 10 0 0 0 0 1
-vendor=digikey
-T 12550 25300 5 10 0 1 0 0 1
-loadstatus=smt
 T 12250 25000 5 10 1 1 0 0 1
 refdes=C2
 T 12150 24500 5 10 1 1 0 0 1
@@ -542,13 +599,7 @@ device=CRYSTAL
 T 13250 25600 5 10 1 1 0 0 1
 symversion=0.1
 T 13050 24900 5 10 0 0 0 0 1
-vendor_part_number=535-10901-1-ND
-T 13050 24900 5 10 0 0 0 0 1
 footprint=ABM8
-T 13050 24900 5 10 0 0 0 0 1
-vendor=digikey
-T 13050 24900 5 10 0 1 0 0 1
-loadstatus=smt
 T 12950 25400 5 10 1 1 0 0 1
 refdes=X1
 T 13650 25400 5 10 1 1 0 0 1
@@ -575,14 +626,13 @@ 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 17300 11700 5 10 0 0 0 0 1
-vendor=digikey
-T 17300 11700 5 10 0 1 0 0 1
-loadstatus=smt
 T 17500 12500 5 10 1 1 180 0 1
 refdes=C6
 T 17300 11800 5 10 1 1 0 0 1
@@ -600,12 +650,6 @@ T 12500 11600 5 10 1 1 90 0 1
 symversion=0.1
 T 13400 11400 5 10 0 0 90 0 1
 footprint=1210
-T 13400 11400 5 10 0 0 90 0 1
-vendor_part_number=1276-3047-1-ND
-T 13400 11400 5 10 0 0 0 0 1
-vendor=digikey
-T 13400 11400 5 10 0 1 0 0 1
-loadstatus=smt
 T 13550 12150 5 10 1 1 180 0 1
 refdes=C8
 T 13800 11700 5 10 1 1 180 0 1
@@ -619,12 +663,15 @@ 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
@@ -710,6 +757,8 @@ 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
@@ -718,6 +767,7 @@ 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
@@ -730,12 +780,15 @@ 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
 {
@@ -747,12 +800,15 @@ 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
@@ -793,12 +849,15 @@ 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
@@ -813,12 +872,15 @@ 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
@@ -898,16 +960,19 @@ T 23800 21700 5 10 0 0 0 6 1
 device=BEEPER
 T 23800 21900 5 10 1 1 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 24100 20800 5 10 0 0 0 6 1
-loadstatus=throughhole
 T 24000 21400 5 10 1 1 0 6 1
 refdes=U8
 T 24100 20800 5 10 1 1 0 0 1
@@ -963,10 +1028,13 @@ 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
 {
@@ -1047,12 +1115,15 @@ 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
@@ -1070,12 +1141,15 @@ 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
@@ -1113,13 +1187,14 @@ 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 12400 5 10 0 0 0 0 1
-loadstatus=smt
 T 11700 12100 5 10 1 1 0 0 1
 value=DFLS130L
 T 11700 12400 5 10 1 1 0 0 1
@@ -1136,18 +1211,24 @@ 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
 {
@@ -1155,18 +1236,24 @@ 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
 {
@@ -1174,18 +1261,24 @@ 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
 {
@@ -1193,18 +1286,24 @@ 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
@@ -1252,12 +1351,6 @@ T 17800 14600 5 10 1 1 0 0 1
 value=LiPo
 T 17300 15100 5 10 0 0 0 0 1
 footprint=B2B-PH
-T 17300 15100 5 10 0 0 0 0 1
-vendor_part_number=A100034-ND
-T 17300 15100 5 10 0 0 0 0 1
-loadstatus=throughhole
-T 17300 15100 5 10 0 0 0 0 1
-vendor=digikey
 T 17300 15100 5 10 0 1 0 0 1
 device=CONNECTOR
 T 17300 15100 5 10 1 1 0 0 1