From: ian Date: Sat, 28 Aug 2004 23:37:34 +0000 (+0000) Subject: pic senses done? wip X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=3dd597ac6f24dcec8ebf7b544c40790468ce1575;p=trains.git pic senses done? wip --- diff --git a/pcb/detectors.pcb b/pcb/detectors.pcb index b13e2a0..81ee052 100644 --- a/pcb/detectors.pcb +++ b/pcb/detectors.pcb @@ -1,12 +1,12 @@ # release: pcb-bin 1.99p -# date: Sat Aug 28 23:49:43 2004 +# date: Sun Aug 29 00:37:10 2004 # user: ian (Ian Jackson) # host: anarres.relativity.greenend.org.uk PCB["detectors.pcb" 1410000 355000] Grid[2500.00000000 0 0 0] -Cursor[665000 220000 1.826317] +Cursor[670404 211290 3.826317] Thermal[0.500000] DRC[809 400 800 800] Flags(0x0000000000001e51) @@ -993,7 +993,7 @@ Element[0x00000000 "generic" "OC2" "DIL 16" 580000 162500 10000 8000 0 100 0x000 Pin[30000 30000 6000 3000 6600 2800 "13" "13" 0x00000001] Pin[30000 20000 6000 3000 6600 2800 "14" "14" 0x00000001] Pin[30000 10000 6000 3000 6600 2800 "15" "15" 0x00000001] - Pin[30000 0 6000 3000 6600 2800 "16" "16" 0x00000001] + Pin[30000 0 6000 3000 6600 2800 "16" "16" 0x00000041] ElementLine [20000 -5000 35000 -5000 1000] ElementLine [-5000 -5000 10000 -5000 1000] ElementLine [35000 -5000 35000 75000 1000] @@ -1727,7 +1727,7 @@ Element[0x00000000 "generic" "OC3" "DIL 16" 625000 162500 10000 8000 0 100 0x000 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" 0x00000001] - Pin[30000 60000 6000 3000 6600 2800 "10" "10" 0x00000001] + Pin[30000 60000 6000 3000 6600 2800 "10" "10" 0x00000041] Pin[30000 50000 6000 3000 6600 2800 "11" "11" 0x00000001] Pin[30000 40000 6000 3000 6600 2800 "12" "12" 0x00000001] Pin[30000 30000 6000 3000 6600 2800 "13" "13" 0x00000001] @@ -1746,7 +1746,7 @@ Element[0x00000000 "generic" "OC3" "DIL 16" 625000 162500 10000 8000 0 100 0x000 Element[0x00000000 "8xR-array 0.25W, common pin" "RAS1" "100" 670000 162500 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 10000 7000 3000 7500 3000 "1" "2" 0x00000041] 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] @@ -2298,7 +2298,7 @@ Element[0x00000000 "generic" "PIC" "DIL 40" 717500 70000 25000 8000 0 100 0x0000 Pin[0 110000 6000 3000 6000 2800 "12" "12" 0x00000001] Pin[0 120000 6000 3000 6000 2800 "13" "13" 0x00000001] Pin[0 130000 6000 3000 6000 2800 "14" "14" 0x00000001] - Pin[0 140000 6000 3000 6000 2800 "15" "15" 0x00000001] + Pin[0 140000 6000 3000 6000 2800 "15" "15" 0x00000041] Pin[0 150000 6000 3000 6000 2800 "16" "16" 0x00000001] Pin[0 160000 6000 3000 6000 2800 "17" "17" 0x00000001] Pin[0 170000 6000 3000 6000 2800 "18" "18" 0x00000001] @@ -2312,13 +2312,13 @@ Element[0x00000000 "generic" "PIC" "DIL 40" 717500 70000 25000 8000 0 100 0x0000 Pin[60000 140000 6000 3000 6000 2800 "26" "26" 0x00000001] Pin[60000 130000 6000 3000 6000 2800 "27" "27" 0x00000001] Pin[60000 120000 6000 3000 6000 2800 "28" "28" 0x00000001] - Pin[60000 110000 6000 3000 6000 2800 "29" "29" 0x00000001] + Pin[60000 110000 6000 3000 6000 2800 "29" "29" 0x00000041] Pin[60000 100000 6000 3000 6000 2800 "30" "30" 0x00000001] Pin[60000 90000 6000 3000 6000 2800 "31" "31" 0x00000001] Pin[60000 80000 6000 3000 6000 2800 "32" "32" 0x00000001] Pin[60000 70000 6000 3000 6000 2800 "33" "33" 0x00000001] Pin[60000 60000 6000 3000 6000 2800 "34" "34" 0x00000001] - Pin[60000 50000 6000 3000 6000 2800 "35" "35" 0x00000001] + Pin[60000 50000 6000 3000 6000 2800 "35" "35" 0x00000041] Pin[60000 40000 6000 3000 6000 2800 "36" "36" 0x00000001] Pin[60000 30000 6000 3000 6000 2800 "37" "37" 0x00000001] Pin[60000 20000 6000 3000 6000 2800 "38" "38" 0x00000001] @@ -2390,7 +2390,7 @@ Element[0x00000000 "8xR-array 0.25W, common pin" "RAS2" "100" 695000 215000 6000 ( 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 20000 7000 3000 7500 3000 "2" "3" 0x00000041] 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] @@ -2443,7 +2443,7 @@ Element[0x00000000 "capacitor_radial" "CPIC0" "200" 697500 180000 -7500 7500 0 1 Element[0x00000000 "" "RLL" "" 742500 287500 0 12500 0 100 0x00000000] ( Pin[0 0 6500 3000 7000 3000 "" "2" 0x00004001] - Pin[10000 0 6500 3000 7000 3000 "" "1" 0x00004041] + Pin[10000 0 6500 3000 7000 3000 "" "1" 0x00004001] ElementLine [7500 -10000 2500 -5000 1000] ElementLine [7500 -10000 10000 -10000 1000] ElementLine [7500 10000 2500 5000 1000] @@ -2505,7 +2505,7 @@ Rat[645000 15000 1 665000 25000 1 0x00000010] Rat[552500 15000 1 492500 15000 1 0x00000010] Rat[665000 25000 1 655000 87500 0 0x00000010] Rat[647500 177500 0 647500 180000 0 0x00000010] -Rat[647500 242500 0 655000 232500 1 0x00000210] +Rat[647500 242500 0 655000 232500 1 0x00000010] Rat[647500 242500 0 650000 257500 1 0x00000010] Rat[650000 257500 1 630000 257500 1 0x00000010] Rat[630000 257500 1 610000 257500 1 0x00000010] @@ -2513,7 +2513,7 @@ Rat[610000 257500 1 602500 242500 0 0x00000010] Rat[602500 180000 0 602500 177500 0 0x00000010] Rat[602500 242500 0 590000 257500 1 0x00000010] Rat[650000 257500 1 675000 265000 1 0x00000010] -Rat[655000 172500 1 697500 180000 1 0x00000210] +Rat[655000 172500 1 697500 180000 1 0x00000010] Rat[697500 180000 1 717500 180000 1 0x00000010] Rat[717500 180000 1 777500 160000 1 0x00000010] Rat[777500 160000 1 795000 172500 1 0x00000010] @@ -2583,7 +2583,7 @@ Rat[572500 177500 0 572500 180000 0 0x00000010] Rat[572500 222500 0 580000 232500 1 0x00000010] Rat[580000 172500 1 617500 177500 0 0x00000010] Rat[617500 177500 0 617500 180000 0 0x00000010] -Rat[617500 242500 0 625000 232500 1 0x00000210] +Rat[617500 242500 0 625000 232500 1 0x00000010] Rat[617500 242500 0 610000 287500 1 0x00000010] Rat[610000 287500 1 630000 287500 1 0x00000010] Rat[610000 287500 1 590000 287500 1 0x00000010] @@ -2603,20 +2603,6 @@ Rat[457500 302500 1 507500 302500 1 0x00000010] Rat[372500 97500 1 495000 97500 1 0x00000010] Rat[487500 242500 1 495000 242500 1 0x00000010] Rat[302500 95000 1 497500 95000 1 0x00000010] -Rat[620000 257500 1 655000 222500 1 0x00000210] -Rat[695000 235000 1 707500 275000 1 0x00000010] -Rat[640000 257500 1 665000 217500 1 0x00000010] -Rat[710000 260000 1 702500 260000 1 0x00000010] -Rat[690000 235000 1 687500 240000 1 0x00000010] -Rat[665000 232500 1 670000 242500 1 0x00000010] -Rat[580000 257500 1 695000 255000 1 0x00000010] -Rat[697500 255000 1 707500 280000 1 0x00000010] -Rat[755000 255000 1 757500 257500 1 0x00000010] -Rat[705000 232500 1 702500 232500 1 0x00000010] -Rat[665000 265000 1 695000 265000 1 0x00000010] -Rat[695000 265000 1 707500 282500 1 0x00000010] -Rat[707500 275000 1 707500 277500 1 0x00000010] -Rat[680000 232500 1 677500 237500 1 0x00000010] Rat[625000 137500 1 615000 142500 1 0x00000010] Rat[665000 295000 1 562500 297500 1 0x00000010] Layer(1 "component") @@ -3077,8 +3063,8 @@ Layer(2 "solder") Line[577500 137500 580000 137500 1000 2000 0x00000220] Line[615000 77500 620000 72500 1000 2000 0x00000020] Line[610000 77500 615000 77500 1000 2000 0x00000020] - Line[610000 162500 615000 162500 1000 2000 0x00000020] - Line[615000 162500 620000 157500 1000 2000 0x00000020] + Line[610000 162500 615000 162500 1000 2000 0x00000060] + Line[615000 162500 620000 157500 1000 2000 0x00000060] Line[677500 172500 677500 155000 1000 2000 0x00000020] Line[567500 175000 562500 175000 1000 2000 0x00000020] Line[565000 247500 562500 247500 1000 2000 0x00000020] @@ -3175,10 +3161,10 @@ Layer(2 "solder") Line[660000 132500 665000 137500 1000 2000 0x00000020] Line[692500 127500 670000 127500 1000 2000 0x00000020] Line[655000 137500 660000 137500 1000 2000 0x00000020] - Line[620000 157500 660000 157500 1000 2000 0x00000020] - Line[660000 157500 662500 160000 1000 2000 0x00000020] - Line[662500 160000 662500 165000 1000 2000 0x00000020] - Line[677500 190000 677500 180000 1000 2000 0x00000020] + Line[620000 157500 660000 157500 1000 2000 0x00000060] + Line[660000 157500 662500 160000 1000 2000 0x00000060] + Line[662500 160000 662500 165000 1000 2000 0x00000060] + Line[677500 190000 677500 180000 1000 2000 0x00000060] Line[655000 162500 660000 162500 1000 2000 0x00000220] Line[660000 162500 660000 167500 1000 2000 0x00000020] Line[660000 167500 662500 170000 1000 2000 0x00000020] @@ -3198,10 +3184,10 @@ Layer(2 "solder") Line[662500 200000 662500 205000 1000 2000 0x00000020] Line[662500 205000 670000 212500 1000 2000 0x00000020] Line[655000 202500 660000 202500 1000 2000 0x00000220] - Line[777500 120000 757500 140000 1000 2000 0x00000020] + Line[777500 120000 757500 140000 1000 2000 0x00000060] Line[777500 110000 755000 132500 1000 2000 0x00000020] Line[755000 132500 755000 255000 1000 2000 0x00000020] - Line[757500 140000 757500 257500 1000 2000 0x00000020] + Line[757500 140000 757500 257500 1000 2000 0x00000060] Line[620000 217500 660000 217500 1000 2000 0x00000020] Line[687500 217500 695000 225000 1000 2000 0x00000020] Line[777500 100000 752500 125000 1000 2000 0x00000020] @@ -3241,11 +3227,11 @@ Layer(2 "solder") Line[682500 200000 675000 192500 1000 2000 0x00000020] Line[672500 182500 670000 182500 1000 2000 0x00000020] Line[662500 175000 675000 187500 1000 2000 0x00000020] - Line[717500 210000 712500 205000 1000 2000 0x00000020] - Line[712500 205000 712500 197500 1000 2000 0x00000020] - Line[712500 197500 685000 197500 1000 2000 0x00000020] - Line[685000 197500 677500 190000 1000 2000 0x00000020] - Line[662500 165000 677500 180000 1000 2000 0x00000020] + Line[717500 210000 712500 205000 1000 2000 0x00000060] + Line[712500 205000 712500 197500 1000 2000 0x00000060] + Line[712500 197500 685000 197500 1000 2000 0x00000060] + Line[685000 197500 677500 190000 1000 2000 0x00000060] + Line[662500 165000 677500 180000 1000 2000 0x00000060] Line[717500 200000 715000 197500 1000 2000 0x00000020] Line[715000 197500 715000 195000 1000 2000 0x00000020] Line[715000 195000 687500 195000 1000 2000 0x00000020] @@ -3289,37 +3275,37 @@ Layer(2 "solder") Line[705000 237500 705000 252500 1000 2000 0x00000020] Line[705000 252500 707500 255000 1000 2000 0x00000020] Line[707500 255000 707500 262500 1000 2000 0x00000020] - Line[770000 270000 757500 282500 1000 2000 0x00000020] + Line[755000 280000 700000 280000 1000 2000 0x00000020] Line[702500 267500 707500 272500 1000 2000 0x00000020] - Line[690000 235000 695000 235000 1000 2000 0x00000020] - Line[682500 227500 690000 235000 1000 2000 0x00000020] + Line[702500 240000 697500 235000 1000 2000 0x00000060] + Line[682500 227500 690000 235000 1000 2000 0x00000060] Line[747500 272500 760000 260000 1000 2000 0x00000020] - Line[702500 255000 705000 257500 1000 2000 0x00000020] - Line[705000 257500 705000 265000 1000 2000 0x00000020] - Line[705000 265000 710000 270000 1000 2000 0x00000020] + Line[702500 255000 705000 257500 1000 2000 0x00000060] + Line[705000 257500 705000 265000 1000 2000 0x00000060] + Line[705000 265000 710000 270000 1000 2000 0x00000060] Line[707500 262500 712500 267500 1000 2000 0x00000020] Line[695000 255000 697500 255000 1000 2000 0x00000020] - Line[752500 277500 707500 277500 1000 2000 0x00000020] - Line[707500 282500 757500 282500 1000 2000 0x00000020] - Line[750000 275000 707500 275000 1000 2000 0x00000020] + Line[687500 257500 705000 275000 1000 2000 0x00000020] + Line[700000 280000 695000 285000 1000 2000 0x00000020] + Line[685000 275000 695000 285000 1000 2000 0x00000020] Line[610000 247500 600000 257500 1000 2000 0x00000020] Line[765000 265000 752500 277500 1000 2000 0x00000020] - Line[755000 280000 707500 280000 1000 2000 0x00000020] - Line[762500 262500 750000 275000 1000 2000 0x00000020] + Line[697500 277500 695000 275000 1000 2000 0x00000020] + Line[762500 262500 750000 275000 1000 2000 0x00000060] Line[777500 190000 765000 202500 1000 2000 0x00000020] Line[767500 267500 755000 280000 1000 2000 0x00000020] Line[767500 267500 767500 240000 1000 2000 0x00000020] Line[687500 240000 680000 232500 1000 2000 0x00000020] Line[665000 232500 670000 232500 1000 2000 0x00000020] - Line[700000 240000 687500 240000 1000 2000 0x00000020] - Line[777500 180000 762500 195000 1000 2000 0x00000020] - Line[762500 195000 762500 262500 1000 2000 0x00000020] + Line[660000 252500 685000 252500 1000 2000 0x00000020] + Line[777500 180000 762500 195000 1000 2000 0x00000060] + Line[762500 195000 762500 262500 1000 2000 0x00000060] Line[760000 260000 760000 187500 1000 2000 0x00000020] Line[760000 187500 777500 170000 1000 2000 0x00000020] - Line[770000 255000 770000 270000 1000 2000 0x00000020] + Line[685000 265000 685000 275000 1000 2000 0x00000020] Line[777500 230000 767500 240000 1000 2000 0x00000020] Line[777500 250000 775000 250000 1000 2000 0x00000020] - Line[775000 250000 770000 255000 1000 2000 0x00000020] + Line[752500 277500 697500 277500 1000 2000 0x00000020] Line[765000 202500 765000 265000 1000 2000 0x00000020] Line[717500 130000 705000 130000 1000 2000 0x00000020] Line[705000 130000 682500 107500 1000 2000 0x00000020] @@ -3344,42 +3330,48 @@ Layer(2 "solder") Line[700000 230000 690000 230000 1000 2000 0x00000020] Line[690000 230000 682500 222500 1000 2000 0x00000020] Line[660000 217500 665000 222500 1000 2000 0x00000020] - Line[702500 255000 702500 242500 1000 2000 0x00000020] - Line[702500 242500 700000 240000 1000 2000 0x00000020] + Line[685000 252500 687500 255000 1000 2000 0x00000020] + Line[687500 255000 687500 257500 1000 2000 0x00000020] Line[715000 265000 740000 265000 1000 2000 0x00000020] Line[740000 265000 752500 252500 1000 2000 0x00000020] Line[712500 267500 742500 267500 1000 2000 0x00000020] Line[742500 267500 755000 255000 1000 2000 0x00000020] - Line[757500 257500 745000 270000 1000 2000 0x00000020] - Line[745000 270000 710000 270000 1000 2000 0x00000020] + Line[757500 257500 745000 270000 1000 2000 0x00000060] + Line[745000 270000 710000 270000 1000 2000 0x00000060] Line[682500 222500 665000 222500 1000 2000 0x00000020] - Line[682500 227500 662500 227500 1000 2000 0x00000020] - Line[662500 227500 657500 222500 1000 2000 0x00000220] - Line[657500 222500 655000 222500 1000 2000 0x00000220] + Line[682500 227500 662500 227500 1000 2000 0x00000060] + Line[662500 227500 657500 222500 1000 2000 0x00000260] + Line[657500 222500 655000 222500 1000 2000 0x00000260] Line[680000 232500 665000 232500 1000 2000 0x00000020] Line[665000 232500 652500 245000 1000 2000 0x00000020] Line[652500 245000 612500 245000 1000 2000 0x00000020] Line[612500 245000 592500 245000 1000 2000 0x00000020] Line[592500 245000 580000 257500 1000 2000 0x00000020] - Line[695000 245000 690000 250000 1000 2000 0x00000020] + Line[700000 257500 702500 260000 1000 2000 0x00000020] Line[690000 250000 662500 250000 1000 2000 0x00000020] Line[662500 250000 660000 247500 1000 2000 0x00000020] Line[660000 247500 610000 247500 1000 2000 0x00000020] - Line[695000 255000 692500 252500 1000 2000 0x00000020] - Line[692500 252500 660000 252500 1000 2000 0x00000020] + Line[697500 240000 700000 242500 1000 2000 0x00000020] + Line[700000 242500 700000 257500 1000 2000 0x00000020] Line[660000 252500 657500 250000 1000 2000 0x00000020] Line[657500 250000 627500 250000 1000 2000 0x00000020] Line[627500 250000 620000 257500 1000 2000 0x00000020] Line[640000 257500 645000 252500 1000 2000 0x00000020] Line[645000 252500 655000 252500 1000 2000 0x00000020] Line[655000 252500 657500 255000 1000 2000 0x00000020] - Line[657500 255000 685000 255000 1000 2000 0x00000020] - Line[685000 255000 695000 265000 1000 2000 0x00000020] - Line[695000 275000 687500 267500 1000 2000 0x00000020] - Line[687500 267500 687500 262500 1000 2000 0x00000020] - Line[687500 262500 682500 257500 1000 2000 0x00000020] - Line[682500 257500 672500 257500 1000 2000 0x00000020] - Line[672500 257500 665000 265000 1000 2000 0x00000020] + Line[687500 240000 697500 240000 1000 2000 0x00000020] + Line[695000 255000 690000 250000 1000 2000 0x00000020] + Line[690000 235000 697500 235000 1000 2000 0x00000060] + Line[750000 275000 705000 275000 1000 2000 0x00000020] + Line[702500 255000 702500 240000 1000 2000 0x00000060] + Line[657500 255000 680000 255000 1000 2000 0x00000020] + Line[680000 255000 687500 262500 1000 2000 0x00000020] + Line[687500 262500 687500 270000 1000 2000 0x00000020] + Line[687500 270000 692500 275000 1000 2000 0x00000020] + Line[692500 275000 695000 275000 1000 2000 0x00000020] + Line[665000 265000 672500 257500 1000 2000 0x00000020] + Line[672500 257500 677500 257500 1000 2000 0x00000020] + Line[677500 257500 685000 265000 1000 2000 0x00000020] Text[370000 337500 0 122 "$Revision$" 0x00000080] Text[472500 330000 0 100 "side tracks" 0x00000080] Text[472500 335000 0 100 "Non-component-" 0x00000080] @@ -4057,7 +4049,7 @@ NetList() ( Connect("OC4-12") Connect("PIC-29") - Connect("RAS2-3") + Connect("RAS2-6") ) Net("sense12" "Signal") ( @@ -4074,8 +4066,8 @@ NetList() Net("sense14" "Signal") ( Connect("OC4-10") - Connect("PIC-30") - Connect("RAS2-2") + Connect("PIC-28") + Connect("RAS2-7") ) Net("sense15" "Signal") ( @@ -4093,7 +4085,7 @@ NetList() ( Connect("OC3-10") Connect("PIC-35") - Connect("RAS1-9") + Connect("RAS2-3") ) Net("sense18" "Signal") ( @@ -4110,14 +4102,14 @@ NetList() Net("sense2" "Signal") ( Connect("OC4-16") - Connect("PIC-24") - Connect("RAS2-5") + Connect("PIC-30") + Connect("RAS1-8") ) Net("sense20" "Signal") ( Connect("OC2-10") Connect("PIC-36") - Connect("RAS1-8") + Connect("RAS1-7") ) Net("sense3" "Signal") ( @@ -4129,13 +4121,13 @@ NetList() ( Connect("OC3-12") Connect("PIC-37") - Connect("RAS1-7") + Connect("RAS2-2") ) Net("sense5" "Signal") ( Connect("OC5-4") - Connect("PIC-22") - Connect("RAS2-6") + Connect("PIC-24") + Connect("RAS2-8") ) Net("sense6" "Signal") ( @@ -4152,8 +4144,7 @@ NetList() Net("sense8" "Signal") ( Connect("OC4-14") - Connect("PIC-28") - Connect("RAS2-4") + Connect("RAS2-5") ) Net("sense9" "Signal") ( @@ -4371,4 +4362,8 @@ NetList() Connect("BR9-1") Connect("BR9-3") ) + Net("xsense20y" "Signal") + ( + Connect("PIC-22") + ) ) diff --git a/pcb/generate-netspec.pl b/pcb/generate-netspec.pl index 1ee7913..c6fd398 100755 --- a/pcb/generate-netspec.pl +++ b/pcb/generate-netspec.pl @@ -68,8 +68,11 @@ if ($reversers) { $val{'M'}= $val{'m'}; $val{'M'} =~ s/sensei/sense/g; @senser= @sensel[0..12]; - push @senser, qw(20 2 - 4 17 8 11 14 5 -); - $val{'r'}= join ' ', map { "sense$_" } @senser; + push @senser, qw(20 2 - 4 17 - 8 11 14 5 -); + @senser= map { s/^\d/sense$&/; $_ } @senser; + print "RAS0 9 l_vcc @senser[0..7]\n"; + print "RAS1 9 l_vcc @senser[8..15]\n"; + print "RAS2 9 l_vcc @senser[16..23]\n"; } print "INDIV0 25 :1%13/2 @indiv\n"; # 26-way ribbon @@ -77,6 +80,7 @@ print "INDIV0 25 :1%13/2 @indiv\n"; # 26-way ribbon $doing= 1; while () { + next if m/^\#/; if (m/^\^\=(reversers|detectors)\:\s*$/) { $doing= $$1; next; @@ -246,9 +250,9 @@ POINTS 25 ^=detectors: -0-^q/8 RAS= 9 - l_vcc - :2 ^r +#0-^q/8 RAS= 9 +# l_vcc +# :2 line{ line0..20 - - }{ ^r } line& RAS2 9 :9 perpicled @@ -257,31 +261,41 @@ RAS2 9 1 mclr pt4,analogue pt5,spare0 - sense0..6 + sense18 + sense15 + sense12 + sense9 + sense6 + sense0 + sense3 l_vcc l_gnd clock - sense7..10 + sense19 + sense16 + sense13 + sense10 i2c_clock - sense11..12 + sense7 + sense1 :40- pt0,icsp_pd pt1,icsp_pc pt2 - sense13 - sense14 - sense15 + sense4 + sense20 + sense17 pt6,extint1 pt7,extint0 l_vcc l_gnd - sense16 - sense17 - sense18 + sense2 + sense11 + sense14 pt3,pwmout pt8,rs232_rxin pt9,rs232_txout - sense19 + sense5 i2c_data - sense20 + xsense20y 21 perpicled TERM 22 diff --git a/pcb/netlist-expand b/pcb/netlist-expand index 648189b..5e6841e 100755 --- a/pcb/netlist-expand +++ b/pcb/netlist-expand @@ -156,7 +156,7 @@ sub unpack_iter_list ($$@) { } elsif (m/^\}$/) { die unless $current==\@usegate; last; - } elsif (m/^[a-z]\w*$/) { + } elsif (m/^(?:[a-z]\w*|\-)$/) { push @$current, $&; } elsif (m/^\d+$/) { push @$current, $netbase.$&;