From: ian Date: Sat, 28 Aug 2004 16:56:44 +0000 (+0000) Subject: rasN X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=f79bd39f83c2af6613cdd2fe23651603de09268c;p=trains.git rasN --- diff --git a/pcb/detectors.pcb b/pcb/detectors.pcb index c9d3594..6e6f375 100644 --- a/pcb/detectors.pcb +++ b/pcb/detectors.pcb @@ -1,12 +1,12 @@ # release: pcb-bin 1.99p -# date: Sat Aug 28 17:40:38 2004 +# date: Sat Aug 28 17:56:27 2004 # user: ian (Ian Jackson) # host: anarres.relativity.greenend.org.uk PCB["detectors.pcb" 1410000 355000] Grid[2500.00000000 0 0 1] -Cursor[642500 210000 2.677289] +Cursor[715000 205000 0.677289] Thermal[0.500000] DRC[809 400 800 800] Flags(0x0000000000001e51) @@ -1403,14 +1403,14 @@ Element[0x00000000 "Axial non-polar component (typically resistor or capacitor), ) -Element[0x00000000 "8xR-array 0.25W, common pin" "RAS" "100" 720000 160000 6000 -6000 0 100 0x00000000] +Element[0x00000000 "8xR-array 0.25W, common pin" "RAS0" "100" 720000 160000 6000 -6000 0 100 0x00000000] ( Pin[0 0 7000 3000 7500 3000 "common" "1" 0x00000101] - Pin[0 10000 7000 3000 7500 3000 "1" "2" 0x00000001] - Pin[0 20000 7000 3000 7500 3000 "2" "3" 0x00000001] - Pin[0 30000 7000 3000 7500 3000 "3" "4" 0x00000001] - Pin[0 40000 7000 3000 7500 3000 "4" "5" 0x00000001] - Pin[0 50000 7000 3000 7500 3000 "5" "6" 0x00000001] + Pin[0 10000 7000 3000 7500 3000 "1" "2" 0x00000041] + Pin[0 20000 7000 3000 7500 3000 "2" "3" 0x00000041] + Pin[0 30000 7000 3000 7500 3000 "3" "4" 0x00000041] + Pin[0 40000 7000 3000 7500 3000 "4" "5" 0x00000041] + Pin[0 50000 7000 3000 7500 3000 "5" "6" 0x00000041] Pin[0 60000 7000 3000 7500 3000 "6" "7" 0x00000001] Pin[0 70000 7000 3000 7500 3000 "7" "8" 0x00000001] Pin[0 80000 7000 3000 7500 3000 "8" "9" 0x00000001] @@ -1557,7 +1557,7 @@ Element[0x00000000 "generic" "TS912" "DIL 8" 877500 215000 7500 10500 0 100 0x00 Pin[0 0 6000 3000 6600 2800 "1" "1" 0x00000101] Pin[0 10000 6000 3000 6600 2800 "2" "2" 0x00000001] Pin[0 20000 6000 3000 6600 2800 "3" "3" 0x00000001] - Pin[0 30000 6000 3000 6600 2800 "4" "4" 0x00000201] + Pin[0 30000 6000 3000 6600 2800 "4" "4" 0x00000001] Pin[30000 30000 6000 3000 6600 2800 "5" "5" 0x00000001] Pin[30000 20000 6000 3000 6600 2800 "6" "6" 0x00000001] Pin[30000 10000 6000 3000 6600 2800 "7" "7" 0x00000001] @@ -2482,7 +2482,7 @@ Element[0x00000000 "generic" "OC2" "DIL 16" 705000 262500 10000 8000 0 100 0x000 Pin[0 50000 6000 3000 6600 2800 "6" "6" 0x00000001] Pin[0 60000 6000 3000 6600 2800 "7" "7" 0x00000001] Pin[0 70000 6000 3000 6600 2800 "8" "8" 0x00000001] - Pin[30000 70000 6000 3000 6600 2800 "9" "9" 0x00000201] + Pin[30000 70000 6000 3000 6600 2800 "9" "9" 0x00000001] Pin[30000 60000 6000 3000 6600 2800 "10" "10" 0x00000001] Pin[30000 50000 6000 3000 6600 2800 "11" "11" 0x00000001] Pin[30000 40000 6000 3000 6600 2800 "12" "12" 0x00000001] @@ -2498,6 +2498,245 @@ Element[0x00000000 "generic" "OC2" "DIL 16" 705000 262500 10000 8000 0 100 0x000 ElementArc [15000 -5000 5000 5000 0 180 1000] ) + +Element[0x00000000 "8xR-array 0.25W, common pin" "RAS1" "100" 707500 160000 6000 -6000 0 100 0x00000000] +( + Pin[0 0 7000 3000 7500 3000 "common" "1" 0x00000101] + Pin[0 10000 7000 3000 7500 3000 "1" "2" 0x00000041] + Pin[0 20000 7000 3000 7500 3000 "2" "3" 0x00000041] + Pin[0 30000 7000 3000 7500 3000 "3" "4" 0x00000041] + Pin[0 40000 7000 3000 7500 3000 "4" "5" 0x00000041] + Pin[0 50000 7000 3000 7500 3000 "5" "6" 0x00000041] + Pin[0 60000 7000 3000 7500 3000 "6" "7" 0x00000001] + Pin[0 70000 7000 3000 7500 3000 "7" "8" 0x00000001] + Pin[0 80000 7000 3000 7500 3000 "8" "9" 0x00000001] + ElementLine [-5000 5000 5000 5000 1000] + ElementLine [5000 0 5000 80000 2000] + ElementLine [-5000 0 -5000 80000 2000] + ElementArc [0 80000 5000 5000 0 180 2000] + ElementArc [0 0 5000 5000 180 180 2000] + + ) + +Element[0x00000000 "8xR-array 0.25W, common pin" "RAS2" "100" 695000 160000 6000 -6000 0 100 0x00000000] +( + Pin[0 0 7000 3000 7500 3000 "common" "1" 0x00000101] + Pin[0 10000 7000 3000 7500 3000 "1" "2" 0x00000041] + Pin[0 20000 7000 3000 7500 3000 "2" "3" 0x00000041] + Pin[0 30000 7000 3000 7500 3000 "3" "4" 0x00000041] + Pin[0 40000 7000 3000 7500 3000 "4" "5" 0x00000041] + Pin[0 50000 7000 3000 7500 3000 "5" "6" 0x00000041] + Pin[0 60000 7000 3000 7500 3000 "6" "7" 0x00000001] + Pin[0 70000 7000 3000 7500 3000 "7" "8" 0x00000001] + Pin[0 80000 7000 3000 7500 3000 "8" "9" 0x00000001] + ElementLine [-5000 5000 5000 5000 1000] + ElementLine [5000 0 5000 80000 2000] + ElementLine [-5000 0 -5000 80000 2000] + ElementArc [0 80000 5000 5000 0 180 2000] + ElementArc [0 0 5000 5000 180 180 2000] + + ) +Rat[1049400 211500 1 1049400 265500 1 0x00000010] +Rat[1049400 211500 1 985000 175000 0 0x00000010] +Rat[985000 45000 0 775000 65000 1 0x00000010] +Rat[745000 22500 1 1180000 22500 1 0x00000010] +Rat[1180000 122500 1 1265000 131500 1 0x00000010] +Rat[796500 38500 1 1205000 47500 1 0x00000010] +Rat[1205000 47500 1 1205000 22500 1 0x00000010] +Rat[1205000 47500 1 1205000 72500 1 0x00000010] +Rat[1205000 72500 1 1205000 97500 1 0x00000010] +Rat[1205000 97500 1 1205000 122500 1 0x00000010] +Rat[1205000 97500 1 1290000 87500 1 0x00000010] +Rat[1290000 87500 1 1290000 112500 1 0x00000010] +Rat[1290000 87500 1 1290000 62500 1 0x00000010] +Rat[1290000 112500 1 1290000 137500 1 0x00000010] +Rat[1290000 62500 1 1290000 37500 1 0x00000010] +Rat[790000 27501 0 775000 175000 1 0x00000010] +Rat[1060600 281700 1 1049400 233100 1 0x00000010] +Rat[1049400 233100 1 1032500 142500 1 0x00000010] +Rat[1105000 142500 1 1102500 67500 1 0x00000010] +Rat[1049400 276300 1 1060600 238500 1 0x00000010] +Rat[1060600 238500 1 1075000 105000 0 0x00000010] +Rat[995000 105000 0 995000 115000 1 0x00000010] +Rat[780000 190000 0 775000 225000 1 0x00000010] +Rat[785499 95500 0 835000 225000 1 0x00000010] +Rat[1060600 249300 1 905000 77500 1 0x00000010] +Rat[905000 77500 1 872500 67500 1 0x00000010] +Rat[872500 67500 1 835000 65000 1 0x00000010] +Rat[835000 65000 1 852500 35000 1 0x00000010] +Rat[1060600 184500 1 872500 57500 1 0x00000010] +Rat[697500 87500 1 717500 87500 1 0x00000010] +Rat[717500 87500 1 707500 57500 1 0x00000010] +Rat[717500 87500 1 752500 120000 1 0x00000010] +Rat[752500 120000 1 835000 55000 1 0x00000010] +Rat[835000 55000 1 1049400 243900 1 0x00000010] +Rat[687500 87500 1 677500 87500 1 0x00000010] +Rat[687500 87500 1 717500 137500 1 0x00000010] +Rat[707500 87500 1 675000 32500 1 0x00000010] +Rat[687500 57500 1 665000 32500 1 0x00000010] +Rat[677500 57500 1 717500 112500 1 0x00000010] +Rat[717500 112500 1 752500 130000 1 0x00000010] +Rat[662500 105000 0 677500 127500 1 0x00000010] +Rat[677500 127500 1 677500 147500 1 0x00000010] +Rat[677500 147500 1 677500 167500 1 0x00000010] +Rat[677500 167500 1 677500 187500 1 0x00000010] +Rat[677500 187500 1 677500 210000 1 0x00000010] +Rat[677500 210000 1 677500 230000 1 0x00000010] +Rat[677500 230000 1 677500 250000 1 0x00000010] +Rat[677500 250000 1 677500 270000 1 0x00000010] +Rat[677500 127500 1 695000 105000 0 0x00000010] +Rat[940000 90000 0 915000 77500 1 0x00000010] +Rat[847500 227500 1 820000 272500 1 0x00000010] +Rat[820000 272500 1 820000 292500 1 0x00000010] +Rat[820000 292500 1 820000 312500 1 0x00000010] +Rat[820000 312500 1 820000 332500 1 0x00000010] +Rat[820000 292500 1 777500 292500 1 0x00000010] +Rat[777500 292500 1 777500 312500 1 0x00000010] +Rat[777500 292500 1 777500 272500 1 0x00000010] +Rat[777500 312500 1 777500 332500 1 0x00000010] +Rat[777500 312500 1 735000 312500 1 0x00000010] +Rat[735000 312500 1 735000 292500 1 0x00000010] +Rat[735000 312500 1 735000 332500 1 0x00000010] +Rat[735000 292500 1 735000 272500 1 0x00000010] +Rat[677500 210000 1 557500 212500 1 0x00000010] +Rat[940000 130000 0 1049400 189900 1 0x00000010] +Rat[727500 155000 1 720000 160000 1 0x00000010] +Rat[720000 160000 1 707500 160000 1 0x00000010] +Rat[707500 160000 1 695000 160000 1 0x00000010] +Rat[855000 135000 1 907500 215000 1 0x00000010] +Rat[855000 135000 1 932500 27500 1 0x00000010] +Rat[1049400 200700 1 1000000 100000 1 0x00000010] +Rat[1060600 195300 1 995000 95000 1 0x00000010] +Rat[787999 40499 0 907500 235000 1 0x00000010] +Rat[795499 170499 0 877500 235000 1 0x00000010] +Rat[905000 180000 1 907500 225000 1 0x00000010] +Rat[887500 172500 1 877500 215000 1 0x00000010] +Rat[835000 245000 1 857500 227500 1 0x00000010] +Rat[857500 227500 1 877500 225000 1 0x00000010] +Rat[877500 225000 1 907500 245000 1 0x00000010] +Rat[1049400 254700 1 995000 105000 1 0x00000010] +Rat[958100 102500 1 980000 40000 0 0x00000010] +Rat[1060600 227700 1 1060600 260100 1 0x00000010] +Rat[1060600 227700 1 982500 175000 0 0x00000010] +Rat[982500 175000 0 835000 185000 1 0x00000010] +Rat[1060600 206100 1 1060600 270900 1 0x00000010] +Rat[1060600 206100 1 987500 175000 0 0x00000010] +Rat[987500 47500 0 777500 75000 1 0x00000010] +Rat[1049400 287100 1 1060600 216900 1 0x00000010] +Rat[1060600 216900 1 1002500 150000 1 0x00000010] +Rat[1005000 145000 1 1007500 107500 0 0x00000010] +Rat[1060600 292500 1 1049400 222300 1 0x00000010] +Rat[1049400 222300 1 995000 155000 1 0x00000010] +Rat[995000 155000 1 995000 115000 0 0x00000010] +Rat[782999 59500 1 982500 27500 1 0x00000010] +Rat[982500 27500 1 1160000 22500 1 0x00000010] +Rat[1177500 37500 0 902500 35000 1 0x00000010] +Rat[1160000 47500 1 1132500 17500 1 0x00000010] +Rat[1177500 62500 0 1132500 27500 1 0x00000010] +Rat[1160000 72500 1 1132500 37500 1 0x00000010] +Rat[1177500 87500 0 1132500 47500 1 0x00000010] +Rat[1160000 97500 1 1132500 57500 1 0x00000010] +Rat[1177500 112500 0 1132500 67500 1 0x00000010] +Rat[1160000 122500 1 1132500 77500 1 0x00000010] +Rat[1177500 137500 0 1132500 87500 1 0x00000010] +Rat[440000 177500 0 377500 177500 1 0x00000010] +Rat[440000 115000 0 377500 105000 1 0x00000010] +Rat[232500 250000 1 232500 177500 1 0x00000010] +Rat[232500 177500 1 160000 177500 1 0x00000010] +Rat[160000 177500 1 160000 105000 1 0x00000010] +Rat[160000 105000 1 87500 105000 1 0x00000010] +Rat[87500 105000 1 20000 97500 1 0x00000010] +Rat[20000 97500 1 15000 105000 1 0x00000010] +Rat[87500 105000 1 87500 177500 1 0x00000010] +Rat[87500 177500 1 15000 177500 1 0x00000010] +Rat[377500 105000 1 305000 105000 1 0x00000010] +Rat[305000 105000 1 305000 177500 1 0x00000010] +Rat[305000 105000 1 232500 105000 1 0x00000010] +Rat[450000 177500 0 527500 212500 1 0x00000010] +Rat[527500 212500 1 647500 210000 1 0x00000010] +Rat[647500 210000 1 647500 230000 1 0x00000010] +Rat[647500 230000 1 647500 250000 1 0x00000010] +Rat[647500 250000 1 647500 270000 1 0x00000010] +Rat[647500 210000 1 647500 187500 1 0x00000010] +Rat[647500 187500 1 647500 167500 1 0x00000010] +Rat[647500 167500 1 647500 147500 1 0x00000010] +Rat[647500 147500 1 647500 127500 1 0x00000010] +Rat[647500 270000 1 705000 272500 1 0x00000010] +Rat[705000 272500 1 705000 292500 1 0x00000010] +Rat[705000 292500 1 705000 312500 1 0x00000010] +Rat[705000 312500 1 705000 332500 1 0x00000010] +Rat[705000 332500 1 747500 332500 1 0x00000010] +Rat[747500 332500 1 747500 312500 1 0x00000010] +Rat[747500 312500 1 747500 292500 1 0x00000010] +Rat[747500 292500 1 747500 272500 1 0x00000010] +Rat[747500 292500 1 790000 292500 1 0x00000010] +Rat[790000 292500 1 790000 312500 1 0x00000010] +Rat[790000 312500 1 790000 332500 1 0x00000010] +Rat[790000 292500 1 790000 272500 1 0x00000010] +Rat[365000 102500 0 352500 90000 0 0x00000010] +Rat[677500 117500 1 665000 72500 1 0x00000010] +Rat[677500 117500 1 720000 170000 1 0x00000010] +Rat[677500 137500 1 720000 180000 1 0x00000010] +Rat[677500 137500 1 662500 75000 1 0x00000010] +Rat[735000 302500 1 775000 215000 1 0x00000010] +Rat[775000 215000 1 707500 190000 1 0x00000010] +Rat[735000 322500 1 775000 235000 1 0x00000010] +Rat[775000 235000 1 707500 200000 1 0x00000010] +Rat[777500 262500 1 775000 245000 1 0x00000010] +Rat[775000 245000 1 707500 210000 1 0x00000010] +Rat[777500 282500 1 835000 235000 1 0x00000010] +Rat[777500 282500 1 707500 220000 1 0x00000010] +Rat[777500 302500 1 707500 230000 1 0x00000010] +Rat[777500 302500 1 835000 215000 1 0x00000010] +Rat[777500 322500 1 707500 240000 1 0x00000010] +Rat[707500 240000 1 830000 175000 1 0x00000010] +Rat[820000 262500 1 835000 165000 1 0x00000010] +Rat[835000 165000 1 695000 170000 1 0x00000010] +Rat[820000 282500 1 835000 155000 1 0x00000010] +Rat[835000 155000 1 695000 180000 1 0x00000010] +Rat[820000 302500 1 695000 190000 1 0x00000010] +Rat[695000 190000 1 835000 105000 1 0x00000010] +Rat[820000 322500 1 695000 200000 1 0x00000010] +Rat[695000 200000 1 835000 95000 1 0x00000010] +Rat[677500 157500 1 720000 190000 1 0x00000010] +Rat[720000 190000 1 764500 175500 1 0x00000010] +Rat[557500 202500 1 695000 210000 1 0x00000010] +Rat[695000 210000 1 835000 85000 1 0x00000010] +Rat[677500 177500 1 720000 200000 1 0x00000010] +Rat[720000 200000 1 775000 115000 1 0x00000010] +Rat[677500 200000 1 720000 210000 1 0x00000010] +Rat[720000 210000 1 775000 125000 1 0x00000010] +Rat[677500 220000 1 720000 220000 1 0x00000010] +Rat[720000 220000 1 775000 135000 1 0x00000010] +Rat[677500 240000 1 720000 230000 1 0x00000010] +Rat[720000 230000 1 767500 180000 1 0x00000010] +Rat[677500 260000 1 720000 240000 1 0x00000010] +Rat[720000 240000 1 775000 185000 1 0x00000010] +Rat[735000 262500 1 775000 195000 1 0x00000010] +Rat[775000 195000 1 707500 170000 1 0x00000010] +Rat[735000 282500 1 775000 205000 1 0x00000010] +Rat[775000 205000 1 707500 180000 1 0x00000010] +Rat[647500 117500 1 622500 105000 1 0x00000010] +Rat[647500 137500 1 622500 180000 1 0x00000010] +Rat[705000 302500 1 622500 200000 1 0x00000010] +Rat[705000 322500 1 622500 272500 1 0x00000010] +Rat[747500 262500 1 622500 135000 1 0x00000010] +Rat[747500 282500 1 622500 210000 1 0x00000010] +Rat[747500 302500 1 622500 282500 1 0x00000010] +Rat[747500 322500 1 622500 145000 1 0x00000010] +Rat[790000 262500 1 622500 220000 1 0x00000010] +Rat[790000 282500 1 622500 292500 1 0x00000010] +Rat[790000 302500 1 622500 155000 1 0x00000010] +Rat[790000 322500 1 622500 230000 1 0x00000010] +Rat[647500 157500 1 622500 252500 1 0x00000010] +Rat[527500 202500 1 622500 302500 1 0x00000010] +Rat[647500 177500 1 622500 95000 1 0x00000010] +Rat[647500 200000 1 622500 170000 1 0x00000010] +Rat[647500 220000 1 622500 242500 1 0x00000010] +Rat[647500 240000 1 622500 115000 1 0x00000010] +Rat[647500 260000 1 622500 190000 1 0x00000010] +Rat[705000 262500 1 622500 262500 1 0x00000010] +Rat[705000 282500 1 622500 125000 1 0x00000010] Layer(1 "component") ( Line[1255000 137500 1265000 127500 2500 2000 0x00000020] @@ -2643,9 +2882,9 @@ Layer(1 "component") Line[170000 42500 170000 260000 4000 2000 0x00000020] Line[170000 260000 202500 292500 4000 2000 0x00000020] Line[330000 30000 330000 27185 4000 2000 0x00000020] - Line[720000 170000 712500 177500 1000 2000 0x00000020] - Line[695000 177500 712500 177500 1000 2000 0x00000020] - Line[720000 180000 705000 195000 1000 2000 0x00000020] + Line[735000 22500 735000 12500 2500 2000 0x00000020] + Line[650000 12500 735000 12500 2500 2000 0x00000020] + Line[742500 40000 786999 40000 1000 2000 0x00000020] Line[330000 27185 331772 27185 4000 2000 0x00000020] Line[331772 27185 331772 27500 4000 2000 0x00000020] Line[331772 27500 332500 27500 4000 2000 0x00000020] @@ -2653,15 +2892,15 @@ Layer(1 "component") Line[351457 27500 352500 27500 4000 2000 0x00000020] Line[371142 27185 371142 27500 4000 2000 0x00000020] Line[371142 27500 370000 27500 4000 2000 0x00000020] - Line[690000 197500 712500 197500 1000 2000 0x00000020] + Line[770000 170000 775000 165000 2500 2000 0x00000020] Line[202500 220000 177500 195000 4000 2000 0x00000020] Line[770000 170000 752500 170000 2500 2000 0x00000020] Line[430197 27185 430197 27500 4000 2000 0x00000020] Line[430197 27500 430000 27500 4000 2000 0x00000020] Line[695000 105000 730000 105000 2500 2000 0x00000020] - Line[710000 210000 695000 210000 1000 2000 0x00000020] + Line[855000 145000 855000 220000 2500 2000 0x00000020] Line[292402 27185 292402 27500 4000 2000 0x00000020] - Line[712500 202500 695000 202500 1000 2000 0x00000020] + Line[855000 220000 847500 227500 2500 2000 0x00000020] Line[292402 27500 292500 27500 4000 2000 0x00000020] Line[440000 240000 387500 240000 4000 2000 0x00000020] Line[177500 195000 177500 30000 4000 2000 0x00000020] @@ -2809,12 +3048,6 @@ Layer(1 "component") Line[305000 200000 292500 187500 4000 2000 0x00000020] Line[292500 187500 292500 27500 4000 2000 0x00000020] Line[312500 27500 312500 32500 4000 2000 0x00000020] - Line[735000 22500 735000 12500 2500 2000 0x00000020] - Line[650000 12500 735000 12500 2500 2000 0x00000020] - Line[742500 40000 786999 40000 1000 2000 0x00000020] - Line[770000 170000 775000 165000 2500 2000 0x00000020] - Line[855000 145000 855000 220000 2500 2000 0x00000020] - Line[855000 220000 847500 227500 2500 2000 0x00000020] Text[470000 322500 0 122 "$Revision$" 0x00000000] Text[565000 322500 0 100 "side tracks" 0x00000000] Text[562500 315000 0 122 "Component-" 0x00000000] @@ -2943,7 +3176,7 @@ Layer(2 "solder") Line[750000 27500 750000 42500 1000 2000 0x00000020] Line[275000 250000 232500 292500 4000 2000 0x00000020] Line[727500 137500 727500 155000 2500 2000 0x00000020] - Line[727500 155000 720000 162500 2500 2000 0x00000020] + Line[935000 122500 860000 122500 1000 2000 0x00000020] Line[992700 167300 995000 165000 1000 2000 0x00000020] Line[750000 42500 775000 47500 1000 2000 0x00000020] Line[775000 47500 775000 55000 1000 2000 0x00000020] @@ -3011,7 +3244,7 @@ Layer(2 "solder") Line[130000 250000 87500 292500 4000 2000 0x00000020] Line[750000 75000 775000 75000 1000 2000 0x00000020] Line[77500 260000 77500 300000 4000 2000 0x00000020] - Line[720000 160000 720000 162500 2500 2000 0x00000020] + Line[942500 130000 935000 122500 1000 2000 0x00000020] Line[87500 250000 77500 260000 4000 2000 0x00000020] Line[7500 260000 7500 300000 4000 2000 0x00000020] Line[202500 105000 160000 147500 4000 2000 0x00000020] @@ -3107,8 +3340,6 @@ Layer(2 "solder") Line[867500 142500 935000 142500 1000 2000 0x00000020] Line[790000 160000 787500 160000 1000 2000 0x00000020] Line[942500 130000 946900 130000 1000 2000 0x00000020] - Line[942500 130000 935000 122500 1000 2000 0x00000020] - Line[935000 122500 860000 122500 1000 2000 0x00000020] Text[460000 327500 0 122 "$Revision$" 0x00000080] Text[562500 320000 0 100 "side tracks" 0x00000080] Text[562500 325000 0 100 "Non-component-" 0x00000080] @@ -3167,3 +3398,936 @@ Layer(10 "silk") Text[460000 315000 0 100 "DETECTORS $Revision$" 0x00000000] Text[480000 322500 0 100 "Copyright 2004 Ian Jackson" 0x00000000] ) +NetList() +( + Net("analogue__pt4" "Signal") + ( + Connect("INDIV0-16") + Connect("INDIV0-21") + Connect("PIC-2") + Connect("RAP0-3") + ) + Net("cdu_gnd" "Power") + ( + Connect("BUS-18") + Connect("PTFET0-3") + Connect("PTFET1-3") + Connect("PTFET2-3") + Connect("PTFET3-3") + Connect("PTFET4-3") + Connect("PTFET5-3") + Connect("PTFET6-3") + Connect("PTFET7-3") + Connect("PTFET8-3") + Connect("PTFET9-3") + ) + Net("cdu_out" "Power") + ( + Connect("BUS-19") + Connect("PTD0-1") + Connect("PTD1-1") + Connect("PTD2-1") + Connect("PTD3-1") + Connect("PTD4-1") + Connect("PTD5-1") + Connect("PTD6-1") + Connect("PTD7-1") + Connect("PTD8-1") + Connect("PTD9-1") + ) + Net("clock" "Signal") + ( + Connect("BUS-7") + Connect("PIC-13") + ) + Net("extint0__pt7" "Signal") + ( + Connect("INDIV0-10") + Connect("INDIV0-18") + Connect("PIC-33") + Connect("RAP0-6") + ) + Net("extint1__pt6" "Signal") + ( + Connect("INDIV0-22") + Connect("INDIV0-6") + Connect("PIC-34") + Connect("RAP0-5") + ) + Net("i2c_clock" "Signal") + ( + Connect("BUS-12") + Connect("PIC-18") + ) + Net("i2c_data" "Signal") + ( + Connect("BUS-14") + Connect("PIC-23") + ) + Net("icsp_pc__pt1" "Signal") + ( + Connect("INDIV0-7") + Connect("PIC-39") + Connect("RPCI-1") + Connect("RPCL-1") + Connect("RPCPT-1") + ) + Net("icsp_pcq" "Signal") + ( + Connect("INDIV0-1") + Connect("RPCI-2") + ) + Net("icsp_pd__pt0" "Signal") + ( + Connect("AC05-11") + Connect("AC05-13") + Connect("AC05-3") + Connect("INDIV0-19") + Connect("PIC-40") + Connect("RPDWI-2") + ) + Net("icsp_pdrall" "Signal") + ( + Connect("AC05-8") + Connect("BUS-5") + ) + Net("icsp_pdrall_mid" "Signal") + ( + Connect("AC05-10") + Connect("AC05-9") + Connect("RPDR-1") + ) + Net("icsp_pdrany" "Signal") + ( + Connect("AC05-12") + Connect("BUS-3") + ) + Net("icsp_pdw" "Signal") + ( + Connect("AC05-5") + Connect("BUS-1") + ) + Net("icsp_pdw_mid" "Signal") + ( + Connect("AC05-6") + Connect("RPDWI-1") + Connect("RPDWU-1") + ) + Net("l_gnd" "Power") + ( + Connect("AC05-1") + Connect("AC05-7") + Connect("BUS-11") + Connect("BUS-2") + Connect("BUS-4") + Connect("BUS-6") + Connect("BUS-8") + Connect("CAC05-1") + Connect("CPIC0-1") + Connect("CPIC1-1") + Connect("INDIV0-14") + Connect("OC0-11") + Connect("OC0-13") + Connect("OC0-15") + Connect("OC0-9") + Connect("OC1-11") + Connect("OC1-13") + Connect("OC1-15") + Connect("OC1-9") + Connect("OC2-11") + Connect("OC2-13") + Connect("OC2-15") + Connect("OC2-9") + Connect("OC3-11") + Connect("OC3-13") + Connect("OC3-15") + Connect("OC3-9") + Connect("OC4-11") + Connect("OC4-13") + Connect("OC4-15") + Connect("OC4-9") + Connect("OC5-3") + Connect("PIC-12") + Connect("PIC-31") + Connect("RLL-2") + Connect("RPCL-2") + Connect("TS912-4") + ) + Net("l_vcc" "Power") + ( + Connect("AC05-14") + Connect("BUS-9") + Connect("CAC05-2") + Connect("CPIC0-2") + Connect("CPIC1-2") + Connect("PIC-11") + Connect("PIC-32") + Connect("RAS0-1") + Connect("RAS1-1") + Connect("RAS2-1") + Connect("RPDR-2") + Connect("RPDWU-2") + Connect("RPT0U-2") + Connect("TS912-8") + ) + Net("led_green" "Signal") + ( + Connect("INDIV0-15") + Connect("RLG-2") + ) + Net("led_red" "Signal") + ( + Connect("INDIV0-2") + Connect("RLR-2") + ) + Net("led_refhigh" "Signal") + ( + Connect("BUS-15") + Connect("TS912-6") + ) + Net("led_reflow" "Signal") + ( + Connect("BUS-13") + Connect("TS912-3") + ) + Net("ledmid_green" "Signal") + ( + Connect("RLG-1") + Connect("TS912-7") + ) + Net("ledmid_red" "Signal") + ( + Connect("RLR-1") + Connect("TS912-1") + ) + Net("mclr" "Signal") + ( + Connect("BUS-10") + Connect("PIC-1") + ) + Net("perpicled" "Signal") + ( + Connect("PIC-21") + Connect("RLL-1") + Connect("TS912-2") + Connect("TS912-5") + ) + Net("pt10" "Signal") + ( + Connect("INDIV0-24") + ) + Net("pt2" "Signal") + ( + Connect("INDIV0-20") + Connect("PIC-38") + Connect("RAP0-1") + ) + Net("pt3__pwmout" "Signal") + ( + Connect("INDIV0-5") + Connect("INDIV0-8") + Connect("PIC-27") + Connect("RAP0-2") + ) + Net("pt5__spare0" "Signal") + ( + Connect("INDIV0-3") + Connect("INDIV0-9") + Connect("PIC-3") + Connect("RAP0-4") + ) + Net("pt8__rs232_rxin" "Signal") + ( + Connect("INDIV0-23") + Connect("INDIV0-4") + Connect("PIC-26") + Connect("RAP0-7") + ) + Net("pt9__rs232_txout" "Signal") + ( + Connect("INDIV0-11") + Connect("INDIV0-17") + Connect("PIC-25") + Connect("RAP0-8") + ) + Net("ptdrain0" "Power") + ( + Connect("PTD0-2") + Connect("PTFET0-2") + ) + Net("ptdrain1" "Power") + ( + Connect("PTD1-2") + Connect("PTFET1-2") + ) + Net("ptdrain2" "Power") + ( + Connect("PTD2-2") + Connect("PTFET2-2") + ) + Net("ptdrain3" "Power") + ( + Connect("PTD3-2") + Connect("PTFET3-2") + ) + Net("ptdrain4" "Power") + ( + Connect("PTD4-2") + Connect("PTFET4-2") + ) + Net("ptdrain5" "Power") + ( + Connect("PTD5-2") + Connect("PTFET5-2") + ) + Net("ptdrain6" "Power") + ( + Connect("PTD6-2") + Connect("PTFET6-2") + ) + Net("ptdrain7" "Power") + ( + Connect("PTD7-2") + Connect("PTFET7-2") + ) + Net("ptdrain8" "Power") + ( + Connect("PTD8-2") + Connect("PTFET8-2") + ) + Net("ptdrain9" "Power") + ( + Connect("PTD9-2") + Connect("PTFET9-2") + ) + Net("ptgate0" "Signal") + ( + Connect("AC05-4") + Connect("PTFET0-1") + Connect("RPT0U-1") + ) + Net("ptgate1" "Signal") + ( + Connect("PTFET1-1") + Connect("RPCPT-2") + ) + Net("ptgate2" "Signal") + ( + Connect("PTFET2-1") + Connect("RAP0-16") + ) + Net("ptgate3" "Signal") + ( + Connect("PTFET3-1") + Connect("RAP0-15") + ) + Net("ptgate4" "Signal") + ( + Connect("PTFET4-1") + Connect("RAP0-14") + ) + Net("ptgate5" "Signal") + ( + Connect("PTFET5-1") + Connect("RAP0-13") + ) + Net("ptgate6" "Signal") + ( + Connect("PTFET6-1") + Connect("RAP0-12") + ) + Net("ptgate7" "Signal") + ( + Connect("PTFET7-1") + Connect("RAP0-11") + ) + Net("ptgate8" "Signal") + ( + Connect("PTFET8-1") + Connect("RAP0-10") + ) + Net("ptgate9" "Signal") + ( + Connect("PTFET9-1") + Connect("RAP0-9") + ) + Net("q" "Signal") + ( + Connect("BR0-4") + Connect("BR1-4") + Connect("BR10-4") + Connect("BR11-4") + Connect("BR12-4") + Connect("BR13-4") + Connect("BR14-4") + Connect("BR15-4") + Connect("BR16-4") + Connect("BR17-4") + Connect("BR18-4") + Connect("BR19-4") + Connect("BR2-4") + Connect("BR20-4") + Connect("BR3-4") + Connect("BR4-4") + Connect("BR5-4") + Connect("BR6-4") + Connect("BR7-4") + Connect("BR8-4") + Connect("BR9-4") + Connect("OC0-2") + Connect("OC0-4") + Connect("OC0-6") + Connect("OC0-8") + Connect("OC1-2") + Connect("OC1-4") + Connect("OC1-6") + Connect("OC1-8") + Connect("OC2-2") + Connect("OC2-4") + Connect("OC2-6") + Connect("OC2-8") + Connect("OC3-2") + Connect("OC3-4") + Connect("OC3-6") + Connect("OC3-8") + Connect("OC4-2") + Connect("OC4-4") + Connect("OC4-6") + Connect("OC4-8") + Connect("OC5-2") + Connect("TERM-22") + ) + Net("q0" "Fat") + ( + Connect("BR0-2") + Connect("TERM-1") + ) + Net("q1" "Fat") + ( + Connect("BR1-2") + Connect("TERM-2") + ) + Net("q10" "Fat") + ( + Connect("BR10-2") + Connect("TERM-11") + ) + Net("q11" "Fat") + ( + Connect("BR11-2") + Connect("TERM-12") + ) + Net("q12" "Fat") + ( + Connect("BR12-2") + Connect("TERM-13") + ) + Net("q13" "Fat") + ( + Connect("BR13-2") + Connect("TERM-14") + ) + Net("q14" "Fat") + ( + Connect("BR14-2") + Connect("TERM-15") + ) + Net("q15" "Fat") + ( + Connect("BR15-2") + Connect("TERM-16") + ) + Net("q16" "Fat") + ( + Connect("BR16-2") + Connect("TERM-17") + ) + Net("q17" "Fat") + ( + Connect("BR17-2") + Connect("TERM-18") + ) + Net("q18" "Fat") + ( + Connect("BR18-2") + Connect("TERM-19") + ) + Net("q19" "Fat") + ( + Connect("BR19-2") + Connect("TERM-20") + ) + Net("q2" "Fat") + ( + Connect("BR2-2") + Connect("TERM-3") + ) + Net("q20" "Fat") + ( + Connect("BR20-2") + Connect("TERM-21") + ) + Net("q3" "Fat") + ( + Connect("BR3-2") + Connect("TERM-4") + ) + Net("q4" "Fat") + ( + Connect("BR4-2") + Connect("TERM-5") + ) + Net("q5" "Fat") + ( + Connect("BR5-2") + Connect("TERM-6") + ) + Net("q6" "Fat") + ( + Connect("BR6-2") + Connect("TERM-7") + ) + Net("q7" "Fat") + ( + Connect("BR7-2") + Connect("TERM-8") + ) + Net("q8" "Fat") + ( + Connect("BR8-2") + Connect("TERM-9") + ) + Net("q9" "Fat") + ( + Connect("BR9-2") + Connect("TERM-10") + ) + Net("qmid0" "Fat") + ( + Connect("RS0-2") + ) + Net("qmid1" "Fat") + ( + Connect("RS1-2") + ) + Net("qmid10" "Fat") + ( + Connect("RS10-2") + ) + Net("qmid11" "Fat") + ( + Connect("RS11-2") + ) + Net("qmid12" "Fat") + ( + Connect("RS12-2") + ) + Net("qmid13" "Fat") + ( + Connect("RS13-2") + ) + Net("qmid14" "Fat") + ( + Connect("RS14-2") + ) + Net("qmid15" "Fat") + ( + Connect("RS15-2") + ) + Net("qmid16" "Fat") + ( + Connect("RS16-2") + ) + Net("qmid17" "Fat") + ( + Connect("RS17-2") + ) + Net("qmid18" "Fat") + ( + Connect("RS18-2") + ) + Net("qmid19" "Fat") + ( + Connect("RS19-2") + ) + Net("qmid2" "Fat") + ( + Connect("RS2-2") + ) + Net("qmid20" "Fat") + ( + Connect("RS20-2") + ) + Net("qmid3" "Fat") + ( + Connect("RS3-2") + ) + Net("qmid4" "Fat") + ( + Connect("RS4-2") + ) + Net("qmid5" "Fat") + ( + Connect("RS5-2") + ) + Net("qmid6" "Fat") + ( + Connect("RS6-2") + ) + Net("qmid7" "Fat") + ( + Connect("RS7-2") + ) + Net("qmid8" "Fat") + ( + Connect("RS8-2") + ) + Net("qmid9" "Fat") + ( + Connect("RS9-2") + ) + Net("rly_gnd" "Power") + ( + Connect("BUS-16") + ) + Net("rly_v12" "Power") + ( + Connect("BUS-17") + ) + Net("sense0" "Signal") + ( + Connect("OC0-16") + Connect("PIC-4") + Connect("RAS0-2") + ) + Net("sense1" "Signal") + ( + Connect("OC0-14") + Connect("PIC-5") + Connect("RAS0-3") + ) + Net("sense10" "Signal") + ( + Connect("OC2-12") + Connect("PIC-17") + Connect("RAS1-4") + ) + Net("sense11" "Signal") + ( + Connect("OC2-10") + Connect("PIC-19") + Connect("RAS1-5") + ) + Net("sense12" "Signal") + ( + Connect("OC3-16") + Connect("PIC-20") + Connect("RAS1-6") + ) + Net("sense13" "Signal") + ( + Connect("OC3-14") + Connect("PIC-22") + Connect("RAS1-7") + ) + Net("sense14" "Signal") + ( + Connect("OC3-12") + Connect("PIC-24") + Connect("RAS1-8") + ) + Net("sense15" "Signal") + ( + Connect("OC3-10") + Connect("PIC-28") + Connect("RAS1-9") + ) + Net("sense16" "Signal") + ( + Connect("OC4-16") + Connect("PIC-29") + Connect("RAS2-2") + ) + Net("sense17" "Signal") + ( + Connect("OC4-14") + Connect("PIC-30") + Connect("RAS2-3") + ) + Net("sense18" "Signal") + ( + Connect("OC4-12") + Connect("PIC-35") + Connect("RAS2-4") + ) + Net("sense19" "Signal") + ( + Connect("OC4-10") + Connect("PIC-36") + Connect("RAS2-5") + ) + Net("sense2" "Signal") + ( + Connect("OC0-12") + Connect("PIC-6") + Connect("RAS0-4") + ) + Net("sense20" "Signal") + ( + Connect("OC5-4") + Connect("PIC-37") + Connect("RAS2-6") + ) + Net("sense3" "Signal") + ( + Connect("OC0-10") + Connect("PIC-7") + Connect("RAS0-5") + ) + Net("sense4" "Signal") + ( + Connect("OC1-16") + Connect("PIC-8") + Connect("RAS0-6") + ) + Net("sense5" "Signal") + ( + Connect("OC1-14") + Connect("PIC-9") + Connect("RAS0-7") + ) + Net("sense6" "Signal") + ( + Connect("OC1-12") + Connect("PIC-10") + Connect("RAS0-8") + ) + Net("sense7" "Signal") + ( + Connect("OC1-10") + Connect("PIC-14") + Connect("RAS0-9") + ) + Net("sense8" "Signal") + ( + Connect("OC2-16") + Connect("PIC-15") + Connect("RAS1-2") + ) + Net("sense9" "Signal") + ( + Connect("OC2-14") + Connect("PIC-16") + Connect("RAS1-3") + ) + Net("sensei0" "Signal") + ( + Connect("OC0-1") + Connect("RS0-1") + ) + Net("sensei1" "Signal") + ( + Connect("OC0-3") + Connect("RS1-1") + ) + Net("sensei10" "Signal") + ( + Connect("OC2-5") + Connect("RS10-1") + ) + Net("sensei11" "Signal") + ( + Connect("OC2-7") + Connect("RS11-1") + ) + Net("sensei12" "Signal") + ( + Connect("OC3-1") + Connect("RS12-1") + ) + Net("sensei13" "Signal") + ( + Connect("OC3-3") + Connect("RS13-1") + ) + Net("sensei14" "Signal") + ( + Connect("OC3-5") + Connect("RS14-1") + ) + Net("sensei15" "Signal") + ( + Connect("OC3-7") + Connect("RS15-1") + ) + Net("sensei16" "Signal") + ( + Connect("OC4-1") + Connect("RS16-1") + ) + Net("sensei17" "Signal") + ( + Connect("OC4-3") + Connect("RS17-1") + ) + Net("sensei18" "Signal") + ( + Connect("OC4-5") + Connect("RS18-1") + ) + Net("sensei19" "Signal") + ( + Connect("OC4-7") + Connect("RS19-1") + ) + Net("sensei2" "Signal") + ( + Connect("OC0-5") + Connect("RS2-1") + ) + Net("sensei20" "Signal") + ( + Connect("OC5-1") + Connect("RS20-1") + ) + Net("sensei3" "Signal") + ( + Connect("OC0-7") + Connect("RS3-1") + ) + Net("sensei4" "Signal") + ( + Connect("OC1-1") + Connect("RS4-1") + ) + Net("sensei5" "Signal") + ( + Connect("OC1-3") + Connect("RS5-1") + ) + Net("sensei6" "Signal") + ( + Connect("OC1-5") + Connect("RS6-1") + ) + Net("sensei7" "Signal") + ( + Connect("OC1-7") + Connect("RS7-1") + ) + Net("sensei8" "Signal") + ( + Connect("OC2-1") + Connect("RS8-1") + ) + Net("sensei9" "Signal") + ( + Connect("OC2-3") + Connect("RS9-1") + ) + Net("sshort0" "Signal") + ( + Connect("BR0-1") + Connect("BR0-3") + ) + Net("sshort1" "Signal") + ( + Connect("BR1-1") + Connect("BR1-3") + ) + Net("sshort10" "Signal") + ( + Connect("BR10-1") + Connect("BR10-3") + ) + Net("sshort11" "Signal") + ( + Connect("BR11-1") + Connect("BR11-3") + ) + Net("sshort12" "Signal") + ( + Connect("BR12-1") + Connect("BR12-3") + ) + Net("sshort13" "Signal") + ( + Connect("BR13-1") + Connect("BR13-3") + ) + Net("sshort14" "Signal") + ( + Connect("BR14-1") + Connect("BR14-3") + ) + Net("sshort15" "Signal") + ( + Connect("BR15-1") + Connect("BR15-3") + ) + Net("sshort16" "Signal") + ( + Connect("BR16-1") + Connect("BR16-3") + ) + Net("sshort17" "Signal") + ( + Connect("BR17-1") + Connect("BR17-3") + ) + Net("sshort18" "Signal") + ( + Connect("BR18-1") + Connect("BR18-3") + ) + Net("sshort19" "Signal") + ( + Connect("BR19-1") + Connect("BR19-3") + ) + Net("sshort2" "Signal") + ( + Connect("BR2-1") + Connect("BR2-3") + ) + Net("sshort20" "Signal") + ( + Connect("BR20-1") + Connect("BR20-3") + ) + Net("sshort3" "Signal") + ( + Connect("BR3-1") + Connect("BR3-3") + ) + Net("sshort4" "Signal") + ( + Connect("BR4-1") + Connect("BR4-3") + ) + Net("sshort5" "Signal") + ( + Connect("BR5-1") + Connect("BR5-3") + ) + Net("sshort6" "Signal") + ( + Connect("BR6-1") + Connect("BR6-3") + ) + Net("sshort7" "Signal") + ( + Connect("BR7-1") + Connect("BR7-3") + ) + Net("sshort8" "Signal") + ( + Connect("BR8-1") + Connect("BR8-3") + ) + Net("sshort9" "Signal") + ( + Connect("BR9-1") + Connect("BR9-3") + ) +) diff --git a/pcb/generate-netspec.pl b/pcb/generate-netspec.pl index b716aa0..bec6eec 100755 --- a/pcb/generate-netspec.pl +++ b/pcb/generate-netspec.pl @@ -230,10 +230,9 @@ POINTS 25 ^=detectors: -RAS 9 +0-^q/8 RAS= 9 l_vcc - :2 sense3..0 sense5..4 - - perpicled + :2 sense<..> !PIC-ASSIGN 1 mclr diff --git a/pcb/netlist-expand b/pcb/netlist-expand index b298cd0..393d381 100755 --- a/pcb/netlist-expand +++ b/pcb/netlist-expand @@ -386,9 +386,18 @@ foreach $chipuse (sort keys %chipuse) { foreach $canon (sort keys %propernet) { @stuff= sort { $a cmp $b } split /\s+/, $propernet{$canon}{Stuff}; - printf("%s\t%s\t%s\n", - $canon, - $propernet{$canon}{Type}, - join ' ', @stuff) + $output= sprintf("%s\t%s\t%s\n", + $canon, + $propernet{$canon}{Type}, + join ' ', @stuff); + while ($output =~ m/.{80,}/m) { + $lhs= $`; + $rhs= $'; + $mid= $&; + $mid =~ s/^(.{1,60})[\t ]/$1\\\n\t\t/m + or die "overlong $output ($lhs|$mid|$rhs)"; + $output = $lhs.$mid.$rhs; + } + print $output or die $!; }