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;hp=f801e0c8dd228c56c8d46bd09f8a12d729873aea

Merge branch 'allspi'

Conflicts:
	teleshield.sch
---

diff --git a/teleshield.pcb b/teleshield.pcb
index 9199c89..7f72f31 100644
--- a/teleshield.pcb
+++ b/teleshield.pcb
@@ -6,7 +6,7 @@ FileVersion[20070407]
 PCB["Diavolino" 270000 210000]
 
 Grid[100.0 0 0 0]
-Cursor[145300 68700 0.000000]
+Cursor[137800 7600 0.000000]
 PolyArea[200000000.000000]
 Thermal[0.500000]
 DRC[600 1000 600 500 1500 700]
@@ -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"]
@@ -2033,6 +2031,8 @@ Layer(1 "component")
 	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] 
@@ -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" ""]
@@ -2247,7 +2247,7 @@ NetList()
 	)
 	Net("csA" "(unknown)")
 	(
-		Connect("J3-1")
+		Connect("J3-3")
 		Connect("U10-16")
 	)
 	Net("csSD" "(unknown)")
@@ -2400,7 +2400,7 @@ NetList()
 	)
 	Net("rtsA" "(unknown)")
 	(
-		Connect("J1-4")
+		Connect("J1-5")
 		Connect("U10-15")
 	)
 	Net("rx1" "(unknown)")
diff --git a/teleshield.sch b/teleshield.sch
index cd8fc13..d423cd5 100644
--- a/teleshield.sch
+++ b/teleshield.sch
@@ -1311,9 +1311,9 @@ N 43000 60300 43800 60300 4
 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 46000 57500 44900 57500 4
@@ -1383,9 +1383,9 @@ 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