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

diff --cc easymini.sch
index 5458e9a280f0b0648a42566f53b3e54dd96814a1,d4a98e655ad222d9865cf5f82cf28c402d0f6968..6bfe5a29535cf9311353d5d21cb51208ceead7ce
--- 1/easymini.sch
--- 2/easymini.sch
+++ b/easymini.sch
@@@ -10,6 -10,14 +10,17 @@@ T 14500 16300 5 10 0 1 0 0 
  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 -29,12 +32,15 @@@ T 24595 10095 5 10 0 1 0 0 
  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,6 -70,12 +76,15 @@@ T 27000 22700 5 10 0 0 90 0 
  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
@@@ -74,6 -96,12 +105,15 @@@ T 27700 23600 5 10 0 0 0 0 
  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
@@@ -85,6 -115,12 +127,15 @@@ T 27700 19900 5 10 0 0 0 0 
  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
@@@ -98,6 -136,12 +151,15 @@@ T 30000 20200 5 10 0 0 90 0 
  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
@@@ -109,6 -155,12 +173,15 @@@ T 30000 23000 5 10 0 0 90 0 
  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
@@@ -122,6 -176,12 +197,15 @@@ T 30000 19300 5 10 0 0 90 0 
  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
@@@ -135,6 -197,12 +221,15 @@@ T 28595 22970 5 10 0 1 0 0 
  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
@@@ -148,6 -218,12 +245,15 @@@ T 28595 19270 5 10 0 1 0 0 
  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
@@@ -166,6 -244,12 +274,15 @@@ T 27000 19000 5 10 0 0 90 0 
  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
@@@ -177,6 -263,12 +296,15 @@@ T 30600 24200 5 10 0 0 270 0 
  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
@@@ -189,6 -283,12 +319,15 @@@ refdes=J
  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 -305,14 +344,17 @@@ T 14200 20650 5 10 1 1 0 0 
  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 -324,14 +366,17 @@@ T 14200 19750 5 10 1 1 0 0 
  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 -366,15 +411,19 @@@ footprint=SOIJ
  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
@@@ -291,8 -415,16 +464,21 @@@ T 23500 14100 5 10 1 1 90 0 
  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
  {
@@@ -304,8 -436,16 +490,21 @@@ T 21900 14100 5 10 1 1 90 0 
  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
  {
@@@ -317,8 -457,16 +516,21 @@@ T 12500 17100 5 10 1 1 90 0 
  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
  {
@@@ -330,8 -478,16 +542,21 @@@ T 13400 16800 5 10 1 1 90 0 
  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,10 -495,16 +564,10 @@@ C 13850 25300 1 270 0 capacitor.sy
  {
  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
 -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
@@@ -352,10 -516,16 +579,10 @@@ C 12550 25300 1 270 0 capacitor.sy
  {
  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
 -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
@@@ -367,10 -539,16 +596,10 @@@ C 13050 24900 1 0 0 ABM8.sy
  {
  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
 -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
@@@ -395,8 -575,14 +626,13 @@@ C 17300 11700 1 90 0 capacitor.sy
  {
  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
@@@ -423,6 -619,12 +663,15 @@@ T 14395 12395 5 10 0 1 0 0 
  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
@@@ -506,6 -710,14 +757,17 @@@ T 12750 20950 5 10 1 1 0 0 
  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 -730,12 +780,15 @@@ T 15400 15200 5 10 0 1 0 0 
  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 -747,12 +800,15 @@@ T 13500 13800 5 10 0 1 0 0 
  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,6 -793,12 +849,15 @@@ T 28600 14700 5 10 0 0 90 0 
  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
@@@ -581,6 -813,12 +872,15 @@@ T 28600 13800 5 10 0 0 90 0 
  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
@@@ -656,14 -896,22 +958,25 @@@ C 24100 20800 1 0 1 beeper.sy
  {
  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 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
+ mfg_part_number=PS1240P02BT
  }
  N 21500 19700 20500 19700 4
  {
@@@ -715,6 -963,10 +1028,13 @@@ T 23400 18000 5 10 0 1 0 0 
  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
  {
@@@ -795,7 -1047,15 +1115,18 @@@ value=LM29
  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
  {
@@@ -810,7 -1070,15 +1141,18 @@@ slot=
  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 -1113,17 +1187,18 @@@ device=DIOD
  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
+ mfg_part_number=DFLS130L-7
  }
  N 12600 12600 13800 12600 4
  {
@@@ -860,10 -1136,18 +1211,24 @@@ T 24400 22700 5 10 0 0 90 0 
  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 -1155,18 +1236,24 @@@ T 24400 23600 5 10 0 0 90 0 
  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 -1174,18 +1261,24 @@@ T 23600 24200 5 10 0 0 90 0 
  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 -1193,18 +1286,24 @@@ T 23600 25100 5 10 0 0 90 0 
  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
@@@ -944,8 -1252,16 +1351,10 @@@ T 17800 14600 5 10 1 1 0 0 
  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
+ mfg_part_number=440054-2
  }
  N 14500 15100 14500 15500 4
  N 14500 15500 17500 15500 4