From: Keith Packard <keithp@keithp.com>
Date: Thu, 11 Jul 2013 05:09:30 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/hw/telebt
X-Git-Tag: fab-1.1~5
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b3651454deb58e0aa65e62d292a64beb6ad06755;hp=-c;p=hw%2Ftelebt

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

Signed-off-by: Keith Packard <keithp@keithp.com>

Conflicts:
	telebt.sch
---

b3651454deb58e0aa65e62d292a64beb6ad06755
diff --combined telebt.sch
index c96f52f,9ed7303..2b98016
--- a/telebt.sch
+++ b/telebt.sch
@@@ -776,23 -776,6 +776,6 @@@ N 63800 42800 65000 42800 
  T 63900 42900 5 10 1 1 0 0 1
  netname=reset_n
  }
- N 53800 45900 52900 45900 4
- {
- T 52900 46000 5 10 1 1 0 0 1
- netname=mi0
- }
- N 53800 46300 52900 46300 4
- {
- T 52900 46400 5 10 1 1 0 0 1
- netname=mo0
- }
- N 53800 46700 52900 46700 4
- {
- T 52900 46800 5 10 1 1 0 0 1
- netname=c0
- }
- C 54800 48400 1 0 0 3.3V-plus.sym
- C 54900 44400 1 0 0 gnd.sym
  T 13300 -8600 8 10 0 1 0 0 1
  vendor_part_number=MMA7260QT-ND
  T 13300 -8600 8 10 0 1 0 0 1
@@@ -860,11 -843,6 +843,6 @@@ C 74100 45700 1 0 0 gnd.sy
  C 73400 45700 1 0 0 gnd.sym
  N 65800 44500 65000 44500 4
  N 65000 42800 65000 44500 4
- N 56200 45500 57000 45500 4
- {
- T 56700 45600 5 10 1 1 0 0 1
- netname=cs0
- }
  C 78400 48000 1 0 0 gnd.sym
  N 78800 47900 77100 47900 4
  {
@@@ -972,11 -950,6 +950,6 @@@ T 61600 41800 5 10 0 1 0 0 
  loadstatus=smt
  }
  C 62700 41300 1 0 0 gnd.sym
- N 56200 47500 56300 47500 4
- N 55000 48200 55000 48400 4
- N 55000 48300 56300 48300 4
- N 56300 47100 56300 48300 4
- N 56300 47100 56200 47100 4
  C 77200 59100 1 90 0 capacitor.sym
  {
  T 76500 59300 5 10 0 0 90 0 1
@@@ -1059,23 -1032,6 +1032,6 @@@ N 61400 42800 61800 42800 
  N 61400 41700 62800 41700 4
  N 62800 41600 62800 42100 4
  N 61400 41800 61400 41700 4
- C 53800 44700 1 0 0 M25P80.sym
- {
- T 54855 46300 5 10 0 1 0 0 1
- device=IC
- T 53795 44695 5 10 0 1 0 0 1
- footprint=SOIJ8
- T 54095 47995 5 10 1 1 0 0 1
- refdes=U5
- T 53800 44700 5 10 0 0 0 0 1
- vendor=digikey
- T 53800 44700 5 10 1 1 0 0 1
- value=W25Q64
- T 53800 44700 5 10 0 1 0 0 1
- loadstatus=noload
- T 53800 44700 5 10 0 1 0 0 1
- vendor_part_number=W25Q64FVSSIG-ND
- }
  C 63200 51600 1 270 0 resistor.sym
  {
  T 63600 51300 5 10 0 0 270 0 1
@@@ -1327,7 -1283,7 +1283,7 @@@ loadstatus=sm
  T 66600 59100 5 10 0 1 0 0 1
  vendor=digikey
  T 66600 59100 5 10 0 1 0 0 1
 -vendor_part_number=MCP73831T-2ACI/OTCT-ND	
 +vendor_part_number=MCP73831T-2ACI/OTCT-ND
  T 67800 60700 5 10 1 1 0 0 1
  value=MCP73831
  }