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

diff --git a/easymini.pcb b/easymini.pcb
index 23f5e3b8ab2accda6dbb376f8a1d69eb65b02464..89bfd8dfc3f2239dcba417f9008c2d64cc3bd59e 100644 (file)
--- a/easymini.pcb
+++ b/easymini.pcb
@@ -1,4 +1,4 @@
-# release: pcb 1.99z
+# release: pcb 20140316
 
 # To read pcb files, the pcb version (or the git source date) must be >= the file version
 FileVersion[20091103]
@@ -1010,14 +1010,14 @@ Element["" "0402" "C4" "0.1uF" 1395.00mil 468.00mil -22.00mil -71.00mil 0 80 ""]
 
        )
 
-Element["" "0402" "R11" "33" 26.6126mm 561.00mil 0.9210mm -24.00mil 0 80 ""]
+Element["" "0402" "R11" "33" 26.6126mm 561.00mil 1.0480mm -22.00mil 0 80 ""]
 (
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
 
        )
 
-Element["" "0402" "R10" "33" 934.00mil 570.00mil -105.00mil -24.00mil 0 80 ""]
+Element["" "0402" "R10" "33" 934.00mil 570.00mil 15.00mil -27.00mil 0 80 ""]
 (
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
@@ -1061,7 +1061,7 @@ Element["" "0402" "R2" "100" 14.5730mm 419.00mil -0.8316mm 15.00mil 0 80 ""]
 
        )
 
-Element["" "MS5607" "U3" "MS5607" 1275.30mil 395.00mil -90.30mil -166.00mil 0 80 ""]
+Element["" "MS5607" "U3" "MS5607" 1275.30mil 395.00mil -22.30mil -71.00mil 0 80 ""]
 (
        Pad[-53.14mil 73.81mil -33.45mil 73.81mil 23.62mil 25.59mil 29.62mil "SCLK" "8" "square"]
        Pad[33.46mil 73.81mil 53.15mil 73.81mil 23.62mil 25.59mil 29.62mil "VDD" "1" "square,edge2"]
@@ -1130,7 +1130,7 @@ Element["" "1210" "C8" "22uF" 167.00mil 359.95mil 108.00mil -19.95mil 3 80 ""]
 
        )
 
-Element["" "0402" "R9" "1.5k" 850.74mil 563.00mil -25.26mil -74.00mil 0 80 ""]
+Element["" "0402" "R9" "1.5k" 850.74mil 563.00mil -81.74mil -41.00mil 0 80 ""]
 (
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
@@ -1151,14 +1151,14 @@ Element["" "0402" "R1" "3.3k" 632.00mil 417.00mil 63.00mil -22.00mil 3 80 ""]
 
        )
 
-Element["" "0402" "R16" "10k" 744.26mil 629.00mil -2.4450mm -24.00mil 0 80 ""]
+Element["" "0402" "R16" "10k" 744.26mil 629.00mil -55.26mil 15.00mil 0 80 ""]
 (
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
 
        )
 
-Element["" "0402" "R17" "9.09k" 805.74mil 629.00mil -32.74mil 16.00mil 0 80 ""]
+Element["" "0402" "R17" "9.09k" 805.74mil 629.00mil -46.74mil -60.00mil 0 80 ""]
 (
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
@@ -1172,14 +1172,14 @@ Element["" "0402" "C2" "18pF" 718.00mil 63.00mil 36.00mil -25.00mil 0 80 ""]
 
        )
 
-Element["" "0402" "C3" "18pF" 623.00mil 146.00mil -17.00mil -20.00mil 3 80 ""]
+Element["" "0402" "C3" "18pF" 623.00mil 146.00mil 21.00mil 36.00mil 3 80 ""]
 (
        Pad[-3.93mil 15.74mil 3.93mil 15.74mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-3.93mil -15.74mil 3.93mil -15.74mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
 
        )
 
-Element["" "SOIJ8" "U4" "W25Q80BVSSIG" 1038.00mil 124.00mil 179.00mil -122.00mil 0 80 ""]
+Element["" "SOIJ8" "U4" "W25Q80BVSSIG" 1038.00mil 124.00mil -90.00mil -98.00mil 0 80 ""]
 (
        Pad[-158.45mil 74.99mil -117.12mil 74.99mil 25.59mil 24.41mil 31.59mil "VCC" "8" "square"]
        Pad[2.9751mm 74.99mil 158.46mil 74.99mil 25.59mil 24.41mil 31.59mil "CS" "1" "square,edge2"]
@@ -1218,14 +1218,14 @@ Element["" "ABM8" "X1" "12MHz" 18.2556mm 145.59mil -2.1266mm -111.59mil 0 80 ""]
 
        )
 
-Element["" "0402" "R14" "10k" 779.00mil 18.0660mm -66.00mil 1.7592mm 1 80 ""]
+Element["" "0402" "R14" "10k" 779.00mil 18.0660mm -22.00mil -0.3876mm 3 80 ""]
 (
        Pad[-3.93mil -15.74mil 3.93mil -15.74mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-3.93mil 15.74mil 3.93mil 15.74mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
 
        )
 
-Element["" "0402" "R15" "8.06k" 809.00mil 679.26mil -15.00mil -0.8956mm 1 80 ""]
+Element["" "0402" "R15" "8.06k" 809.00mil 679.26mil 70.00mil -63.26mil 3 80 ""]
 (
        Pad[-3.93mil -15.74mil 3.93mil -15.74mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-3.93mil 15.74mil 3.93mil 15.74mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
@@ -1280,42 +1280,42 @@ Element["onsolder" "B2B-PH" "B1" "LiPo" 4.7813mm 13.0940mm 0.0000 0.0000 3 100 "
 
        )
 
-Element["" "0402" "R3" "100k" 461.00mil 85.00mil 0.1336mm -13.52mil 2 80 ""]
+Element["" "0402" "R3" "100k" 461.00mil 85.00mil -25.00mil -67.00mil 0 80 ""]
 (
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
 
        )
 
-Element["" "0402" "R7" "100k" 460.52mil 123.00mil 63.00mil 54.00mil 2 80 ""]
+Element["" "0402" "R7" "100k" 460.52mil 123.00mil -86.52mil -24.00mil 0 80 ""]
 (
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
 
        )
 
-Element["" "0402" "R12" "100k" 460.74mil 162.00mil 0.8448mm 65.00mil 2 80 ""]
+Element["" "0402" "R12" "100k" 460.74mil 162.00mil -37.74mil 16.00mil 0 80 ""]
 (
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
 
        )
 
-Element["" "0402" "R13" "27k" 13.8750mm 161.00mil 32.00mil 65.00mil 2 80 ""]
+Element["" "0402" "R13" "27k" 13.8750mm 161.00mil -0.8194mm 17.00mil 0 80 ""]
 (
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
 
        )
 
-Element["" "0402" "R6" "27k" 13.8750mm 85.00mil 80.74mil 24.00mil 2 80 ""]
+Element["" "0402" "R6" "27k" 13.8750mm 85.00mil -0.5654mm -67.00mil 0 80 ""]
 (
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
 
        )
 
-Element["" "0402" "R8" "27k" 13.8750mm 123.00mil 80.00mil 24.00mil 2 80 ""]
+Element["" "0402" "R8" "27k" 13.8750mm 123.00mil 0.8824mm -47.00mil 0 80 ""]
 (
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]

diff --git a/easymini.sch b/easymini.sch
index 5458e9a280f0b0648a42566f53b3e54dd96814a1..6bfe5a29535cf9311353d5d21cb51208ceead7ce 100644 (file)
--- a/easymini.sch
+++ b/easymini.sch
@@ -10,6 +10,17 @@ 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
 {
@@ -21,6 +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
 {
@@ -56,10 +76,21 @@ 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
@@ -74,10 +105,21 @@ 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
 {
@@ -85,10 +127,21 @@ 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
@@ -98,10 +151,21 @@ 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
 {
@@ -109,10 +173,21 @@ 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
@@ -122,10 +197,21 @@ 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
 {
@@ -135,10 +221,21 @@ 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
 {
@@ -148,10 +245,21 @@ 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
@@ -166,10 +274,21 @@ 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
 {
@@ -177,10 +296,21 @@ 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
 {
@@ -189,6 +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
@@ -205,6 +344,17 @@ 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
 {
@@ -216,6 +366,17 @@ 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
@@ -250,7 +411,19 @@ 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
@@ -287,12 +460,25 @@ 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 0 0 90 0 1
+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
 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
 {
@@ -300,12 +486,25 @@ 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 0 0 90 0 1
+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
 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
 {
@@ -313,12 +512,25 @@ 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 0 0 90 0 1
+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
 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
 {
@@ -326,12 +538,25 @@ 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 0 0 90 0 1
+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
+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
@@ -339,7 +564,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 0 0 270 0 1
+T 14750 25100 5 10 1 1 270 0 1
 symversion=0.1
 T 13850 25300 5 10 0 0 0 0 1
 footprint=0402
@@ -347,12 +572,14 @@ 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 0 0 270 0 1
+T 13450 25100 5 10 1 1 270 0 1
 symversion=0.1
 T 12550 25300 5 10 0 0 0 0 1
 footprint=0402
@@ -360,6 +587,8 @@ 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
@@ -367,7 +596,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 0 0 0 0 1
+T 13250 25600 5 10 1 1 0 0 1
 symversion=0.1
 T 13050 24900 5 10 0 0 0 0 1
 footprint=ABM8
@@ -375,6 +604,8 @@ 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
@@ -395,20 +626,27 @@ 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 0 1 0 0 1
+T 17300 11700 5 10 1 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 0 0 90 0 1
+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
@@ -416,6 +654,8 @@ 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
 {
@@ -423,10 +663,21 @@ 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
@@ -506,6 +757,17 @@ 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
@@ -518,6 +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
 {
@@ -529,6 +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
@@ -569,10 +849,21 @@ 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
@@ -581,10 +872,21 @@ 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
 {
@@ -599,7 +901,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 0 1 0 0 1
+T 30900 15200 5 10 1 1 0 0 1
 nobom=1
 T 30500 15400 5 10 1 1 0 0 1
 refdes=H1
@@ -616,7 +918,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 0 1 0 0 1
+T 30900 14600 5 10 1 1 0 0 1
 nobom=1
 T 30500 14800 5 10 1 1 0 0 1
 refdes=H2
@@ -629,7 +931,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 0 1 0 0 1
+T 30900 14000 5 10 1 1 0 0 1
 nobom=1
 T 30500 14200 5 10 1 1 0 0 1
 refdes=H3
@@ -642,7 +944,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 0 1 0 0 1
+T 30900 13400 5 10 1 1 0 0 1
 nobom=1
 T 30500 13600 5 10 1 1 0 0 1
 refdes=H4
@@ -656,14 +958,25 @@ 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 0 0 0 6 1
+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 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
 {
@@ -715,6 +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
 {
@@ -788,14 +1108,25 @@ 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 0 0 0 0 1
+T 28200 26100 5 10 1 1 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
 {
@@ -803,14 +1134,25 @@ 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 0 0 0 0 1
+T 28200 22400 5 10 1 1 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
@@ -845,9 +1187,18 @@ 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
 {
@@ -860,10 +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
 {
@@ -871,10 +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
 {
@@ -882,10 +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
 {
@@ -893,10 +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
@@ -938,7 +1345,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 0 0 270 0 1
+T 18600 14800 5 10 1 1 270 0 1
 symversion=0.1
 T 17800 14600 5 10 1 1 0 0 1
 value=LiPo
@@ -946,6 +1353,8 @@ 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