From: Bdale Garbee <bdale@gag.com>
Date: Mon, 19 Dec 2011 20:54:14 +0000 (-0700)
Subject: Merge branch 'allspi'
X-Git-Url: https://git.gag.com/?p=hw%2Fteleshield;a=commitdiff_plain;h=b6e1bb6d755865e8c1c9d79709d2ab0b715ebe5f

Merge branch 'allspi'

Conflicts:
	teleshield.sch
---

b6e1bb6d755865e8c1c9d79709d2ab0b715ebe5f
diff --cc teleshield.pcb
index 5d43b0e,9199c89..7f72f31
--- a/teleshield.pcb
+++ b/teleshield.pcb
@@@ -6,7 -6,7 +6,7 @@@ FileVersion[20070407
  PCB["Diavolino" 270000 210000]
  
  Grid[100.0 0 0 0]
- Cursor[37500 2300 0.000000]
 -Cursor[145300 68700 0.000000]
++Cursor[137800 7600 0.000000]
  PolyArea[200000000.000000]
  Thermal[0.500000]
  DRC[600 1000 600 500 1500 700]
@@@ -1559,14 -1574,14 +1574,12 @@@ Layer(1 "component"
  	Line[229500 10000 230000 10000 1000 1600 "clearline"]
  	Line[180614 31009 180600 30995 1000 1600 "clearline"]
  	Line[180600 30995 180600 18900 1000 1600 "clearline"]
--	Line[183200 16400 214900 16400 1000 1600 "clearline"]
--	Line[214900 16400 220000 11300 1000 1600 "clearline"]
++	Line[183200 16400 203600 16400 1000 1600 "clearline"]
  	Line[220000 11300 220000 10000 1000 1600 "clearline"]
  	Line[178056 31009 178100 30965 1000 1600 "clearline"]
  	Line[178100 30965 178100 18900 1000 1600 "clearline"]
  	Line[178100 18900 175600 16400 1000 1600 "clearline"]
--	Line[175600 16400 168900 16400 1000 1600 "clearline"]
--	Line[168900 16400 164000 11500 1000 1600 "clearline"]
++	Line[175600 16400 150500 16400 1000 1600 "clearline"]
  	Line[164000 11500 164000 10000 1000 1600 "clearline"]
  	Line[175497 31009 175500 31006 1000 1600 "clearline"]
  	Line[175500 31006 175500 21900 1000 1600 "clearline"]
@@@ -2014,6 -2011,28 +2009,30 @@@
  	Line[232500 170000 232500 157100 1000 1400 "clearline"]
  	Line[237500 160100 237500 156701 1000 1400 "clearline"]
  	Line[237500 156701 237299 156500 1000 1400 "clearline"]
+ 	Line[212263 93876 212263 90163 1000 1400 "clearline"]
+ 	Line[212263 90163 195300 73200 1000 1400 "clearline"]
+ 	Line[195300 73200 194000 73200 1000 1400 "clearline"]
+ 	Line[194000 73200 193000 72200 1000 1400 "clearline"]
+ 	Line[180614 54237 180614 65814 1000 1400 "clearline"]
+ 	Line[180614 65814 181000 66200 1000 1400 "clearline"]
+ 	Line[183173 54237 183173 61173 1000 1400 "clearline"]
+ 	Line[183173 61173 185000 63000 1000 1400 "clearline"]
+ 	Line[185000 63000 185000 66200 1000 1400 "clearline"]
+ 	Line[185732 54237 185732 59732 1000 1400 "clearline"]
+ 	Line[185732 59732 189000 63000 1000 1400 "clearline"]
+ 	Line[189000 63000 189000 66200 1000 1400 "clearline"]
+ 	Line[188291 54237 188291 58191 1000 1400 "clearline"]
+ 	Line[188291 58191 192900 62800 1000 1400 "clearline"]
+ 	Line[192900 62800 192900 66100 1000 1400 "clearline"]
+ 	Line[192900 66100 193000 66200 1000 1400 "clearline"]
+ 	Line[189000 72200 189000 74200 1000 1400 "clearline"]
+ 	Line[189000 74200 195800 81000 1000 1400 "clearline"]
+ 	Line[185000 72200 185000 78300 1000 1400 "clearline"]
+ 	Line[185000 78300 185300 78600 1000 1400 "clearline"]
+ 	Line[181000 72200 181000 86600 1000 1400 "clearline"]
+ 	Line[181000 86600 186000 91600 1000 1400 "clearline"]
++	Line[210000 10000 203600 16400 1000 1400 "clearline"]
++	Line[144000 10000 150400 16400 1000 1400 "clearline"]
  	Polygon("clearpoly")
  	(
  		[253400 78600] [269000 78600] [269000 98000] [253400 98000] 
@@@ -2120,7 -2140,7 +2140,7 @@@ Layer(5 "silk"
  	Text[143094 181545 3 111 "3v3" ""]
  	Text[127600 17200 3 111 "D12" ""]
  	Text[137600 17200 3 111 "D11" ""]
--	Text[147600 17200 3 111 "D10" ""]
++	Text[147300 16900 3 111 "D10" ""]
  	Text[157600 17200 3 111 "D9" ""]
  	Text[167600 17200 3 111 "D8" ""]
  	Text[183700 17300 3 111 "D7" ""]
@@@ -2226,8 -2247,7 +2247,7 @@@ NetList(
  	)
  	Net("csA" "(unknown)")
  	(
--		Connect("J3-1")
++		Connect("J3-3")
  		Connect("U10-16")
  	)
  	Net("csSD" "(unknown)")
@@@ -2380,7 -2400,7 +2400,7 @@@
  	)
  	Net("rtsA" "(unknown)")
  	(
--		Connect("J1-4")
++		Connect("J1-5")
  		Connect("U10-15")
  	)
  	Net("rx1" "(unknown)")
diff --cc teleshield.sch
index 1799cb1,cd8fc13..d423cd5
--- a/teleshield.sch
+++ b/teleshield.sch
@@@ -1311,81 -1311,81 +1311,81 @@@ N 43000 60300 43800 60300 
  T 43500 60400 5 10 1 1 0 0 1
  netname=ctsA
  }
 -N 43000 59900 43800 59900 4
 +N 43000 59500 43800 59500 4
  {
 -T 43500 60000 5 10 1 1 0 0 1
 +T 43500 59600 5 10 1 1 0 0 1
  netname=rtsA
  }
- N 47000 57500 45900 57500 4
+ N 46000 57500 44900 57500 4
  {
- T 46300 57600 5 10 1 1 0 6 1
+ T 45300 57600 5 10 1 1 0 6 1
  netname=mo0
  }
- N 47000 57900 45900 57900 4
+ N 46000 57900 44900 57900 4
  {
- T 46200 58000 5 10 1 1 0 6 1
+ T 45200 58000 5 10 1 1 0 6 1
  netname=mi0
  }
- N 47000 58300 45900 58300 4
+ N 46000 58300 44900 58300 4
  {
- T 46200 58400 5 10 1 1 0 6 1
+ T 45200 58400 5 10 1 1 0 6 1
  netname=cs0
  }
- C 47000 56900 1 0 0 TXS0108E.sym
+ C 48100 56900 1 0 0 TXS0108E.sym
  {
- T 48295 59095 5 10 0 1 0 0 1
+ T 49395 59095 5 10 0 1 0 0 1
  device=IC
- T 47295 60995 5 10 1 1 0 0 1
+ T 48395 60995 5 10 1 1 0 0 1
  refdes=U10
- T 47995 60995 5 10 1 1 0 0 1
+ T 49095 60995 5 10 1 1 0 0 1
  value=TXS0108
- T 47000 56900 5 10 0 0 0 6 1
+ T 48100 56900 5 10 0 0 0 6 1
  footprint=TSSOP20
- T 47000 56900 5 10 0 0 0 6 1
+ T 48100 56900 5 10 0 0 0 6 1
  loadstatus=smt
- T 47000 56900 5 10 0 1 0 0 1
+ T 48100 56900 5 10 0 1 0 0 1
  vendor=digikey
- T 47000 56900 5 10 0 1 0 0 1
+ T 48100 56900 5 10 0 1 0 0 1
  vendor_part_number=296-23011-1-ND
  }
  C 43200 50400 1 0 0 5V-plus.sym
- C 49500 60300 1 0 1 5V-plus.sym
+ C 50600 60300 1 0 1 5V-plus.sym
  N 43000 50300 43400 50300 4
  N 43400 50300 43400 50400 4
- C 46900 60300 1 0 1 3.3V-plus.sym
- N 45900 58700 47000 58700 4
+ C 48000 60300 1 0 1 3.3V-plus.sym
+ N 44900 58700 46000 58700 4
  {
- T 45900 58800 5 10 1 1 0 0 1
+ T 44900 58800 5 10 1 1 0 0 1
  netname=c0
  }
- N 49000 57500 49800 57500 4
+ N 50100 57500 50900 57500 4
  {
- T 49600 57700 5 10 1 1 0 2 1
+ T 50700 57700 5 10 1 1 0 2 1
  netname=rxA
  }
- N 49000 57900 49800 57900 4
+ N 50100 57900 50900 57900 4
  {
- T 49600 58100 5 10 1 1 0 2 1
+ T 50700 58100 5 10 1 1 0 2 1
  netname=txA
  }
- N 49000 58300 49800 58300 4
+ N 50100 58300 50900 58300 4
  {
- T 49500 58500 5 10 1 1 0 2 1
+ T 50600 58500 5 10 1 1 0 2 1
  netname=ctsA
  }
- N 49000 58700 49800 58700 4
+ N 50100 58700 50900 58700 4
  {
- T 49500 58900 5 10 1 1 0 2 1
+ T 50600 58900 5 10 1 1 0 2 1
  netname=rtsA
  }
- N 47000 60300 46700 60300 4
- N 49000 60300 50500 60300 4
- N 47000 57100 46700 57100 4
- N 46700 57100 46700 60300 4
- C 48900 56800 1 0 0 gnd.sym
+ N 48100 60300 47800 60300 4
+ N 50100 60300 51600 60300 4
+ N 48100 57100 47800 57100 4
+ N 47800 57100 47800 60300 4
+ C 50000 56800 1 0 0 gnd.sym
 -N 43000 57500 43800 57500 4
 +N 43000 56700 43800 56700 4
  {
 -T 43500 57600 5 10 1 1 0 0 1
 +T 43500 56800 5 10 1 1 0 0 1
  netname=csA
  }
  N 43000 56300 43800 56300 4