From: ian Date: Mon, 23 Aug 2004 03:57:56 +0000 (+0000) Subject: wip nice X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=7e0b5b3839354177a8559a4bf80162e085a5a873;p=trains.git wip nice --- diff --git a/pcb/reversers.pcb b/pcb/reversers.pcb index 4931fad..368d4ec 100644 --- a/pcb/reversers.pcb +++ b/pcb/reversers.pcb @@ -1,12 +1,12 @@ # release: pcb-bin 1.99p -# date: Mon Aug 23 04:27:54 2004 +# date: Mon Aug 23 04:57:45 2004 # user: ian (Ian Jackson) # host: anarres.relativity.greenend.org.uk PCB["reversers.pcb" 1410000 355000] Grid[2500.00000000 0 0 1] -Cursor[781846 186806 3.470945] +Cursor[845000 132092 2.470945] Thermal[0.500000] DRC[809 400 800 800] Flags(0x0000000000001e51) @@ -953,7 +953,7 @@ Element[0x00000000 "" "PTD2" "" 1065000 52500 25000 -2500 0 100 0x00000000] ) -Element[0x00000000 "generic" "RAP0" "DIL 16" 955000 17500 17000 5000 3 100 0x00000000] +Element[0x00000000 "generic" "RAP0" "DIL 16" 952500 52500 17000 5000 3 100 0x00000000] ( Pin[0 0 6000 3000 6600 2800 "1" "1" 0x00000101] Pin[0 10000 6000 3000 6600 2800 "2" "2" 0x00000001] @@ -1203,48 +1203,16 @@ Element[0x00000000 "" "RLY4" "" 150000 90000 12500 25000 1 100 0x00000000] ) -Element[0x00000000 "Header connector, ribbon cable numbering" "INDIV1" "HEADER34_2" 910000 22500 21000 -5000 3 100 0x00000000] +Element[0x00000000 "resistor_axial" "RLG" "800" 780000 152500 8600 -42000 1 100 0x00000000] ( - Pin[0 0 6000 3000 6600 3000 "1" "1" 0x00000101] - Pin[10000 0 6000 3000 6600 3000 "2" "2" 0x00000001] - Pin[0 10000 6000 3000 6600 3000 "3" "3" 0x00000001] - Pin[10000 10000 6000 3000 6600 3000 "4" "4" 0x00000001] - Pin[0 20000 6000 3000 6600 3000 "5" "5" 0x00000001] - Pin[10000 20000 6000 3000 6600 3000 "6" "6" 0x00000001] - Pin[0 30000 6000 3000 6600 3000 "7" "7" 0x00000001] - Pin[10000 30000 6000 3000 6600 3000 "8" "8" 0x00000001] - Pin[0 40000 6000 3000 6600 3000 "9" "9" 0x00000001] - Pin[10000 40000 6000 3000 6600 3000 "10" "10" 0x00000001] - Pin[0 50000 6000 3000 6600 3000 "11" "11" 0x00000001] - Pin[10000 50000 6000 3000 6600 3000 "12" "12" 0x00000001] - Pin[0 60000 6000 3000 6600 3000 "13" "13" 0x00000001] - Pin[10000 60000 6000 3000 6600 3000 "14" "14" 0x00000001] - Pin[0 70000 6000 3000 6600 3000 "15" "15" 0x00000001] - Pin[10000 70000 6000 3000 6600 3000 "16" "16" 0x00000001] - Pin[0 80000 6000 3000 6600 3000 "17" "17" 0x00000001] - Pin[10000 80000 6000 3000 6600 3000 "18" "18" 0x00000001] - Pin[0 90000 6000 3000 6600 3000 "19" "19" 0x00000001] - Pin[10000 90000 6000 3000 6600 3000 "20" "20" 0x00000001] - Pin[0 100000 6000 3000 6600 3000 "21" "21" 0x00000001] - Pin[10000 100000 6000 3000 6600 3000 "22" "22" 0x00000001] - Pin[0 110000 6000 3000 6600 3000 "23" "23" 0x00000001] - Pin[10000 110000 6000 3000 6600 3000 "24" "24" 0x00000001] - Pin[0 120000 6000 3000 6600 3000 "25" "25" 0x00000001] - Pin[10000 120000 6000 3000 6600 3000 "26" "26" 0x00000001] - Pin[0 130000 6000 3000 6600 3000 "27" "27" 0x00000001] - Pin[10000 130000 6000 3000 6600 3000 "28" "28" 0x00000001] - Pin[0 140000 6000 3000 6600 3000 "29" "29" 0x00000001] - Pin[10000 140000 6000 3000 6600 3000 "30" "30" 0x00000001] - Pin[0 150000 6000 3000 6600 3000 "31" "31" 0x00000001] - Pin[10000 150000 6000 3000 6600 3000 "32" "32" 0x00000001] - Pin[0 160000 6000 3000 6600 3000 "33" "33" 0x00000001] - Pin[10000 160000 6000 3000 6600 3000 "34" "34" 0x00000001] - ElementLine [5000 -5000 5000 5000 1000] - ElementLine [-5000 5000 5000 5000 1000] - ElementLine [-5000 -5000 15000 -5000 2000] - ElementLine [15000 -5000 15000 165000 2000] - ElementLine [-5000 165000 15000 165000 2000] - ElementLine [-5000 -5000 -5000 165000 2000] + Pin[0 20000 8000 3000 8600 2000 "1" "1" 0x00000101] + Pin[0 -60000 8000 3000 8600 2000 "2" "2" 0x00000001] + ElementLine [-6600 0 6600 0 1000] + ElementLine [6600 -40000 6600 0 1000] + ElementLine [-6600 -40000 6600 -40000 1000] + ElementLine [-6600 -40000 -6600 0 1000] + ElementLine [0 -60000 0 -40000 1000] + ElementLine [0 0 0 20000 1000] ) @@ -1599,7 +1567,7 @@ Element[0x00000000 "Transistor" "PTFET4" "TO220W" 1020000 77500 32500 -11500 0 1 ) -Element[0x00000000 "generic" "RAP1" "DIL 16" 957500 117500 17000 5000 3 100 0x00000000] +Element[0x00000000 "generic" "RAP1" "DIL 16" 952500 140000 17000 5000 3 100 0x00000000] ( Pin[0 0 6000 3000 6600 2800 "1" "1" 0x00000101] Pin[0 10000 6000 3000 6600 2800 "2" "2" 0x00000001] @@ -1667,7 +1635,7 @@ Element[0x00000000 "" "PTD1" "" 1200000 42500 25000 -2500 0 100 0x00000000] ) -Element[0x00000000 "Axial non-polar component (typically resistor or capacitor)," "RPT0U" "ACY500" 787500 10000 -27000 -6100 2 100 0x00000000] +Element[0x00000000 "Axial non-polar component (typically resistor or capacitor)," "RPT0U" "ACY500" 972500 25000 -27000 -6100 2 100 0x00000000] ( Pin[12500 0 5000 3000 5600 2000 "1" "1" 0x00004101] Pin[-37500 0 5000 3000 5600 2000 "2" "2" 0x00004001] @@ -1726,7 +1694,7 @@ Element[0x00000000 "" "INDIV0" "" 850000 25000 20000 17500 3 100 0x00000000] Pin[5600 135000 6000 3000 6600 3500 "" "11" 0x00000001] Pin[5600 48600 6000 3000 6600 3500 "" "3" 0x00000001] Pin[5600 156600 6000 3000 6600 3500 "" "13" 0x00000001] - Pin[5600 27000 6000 3000 6600 3500 "" "1" 0x00000001] + Pin[5600 27000 6000 3000 6600 3500 "" "1" 0x00000101] Pin[5600 37800 6000 3000 6600 3500 "" "2" 0x00000001] Pin[-5600 129600 6000 3000 6600 3500 "" "23" 0x00000001] Pin[-5600 140400 6000 3000 6600 3500 "" "24" 0x00000001] @@ -2242,52 +2210,52 @@ Element[0x00000000 "Transistor" "PTFET1" "TO220W" 1155000 42500 32500 -11500 0 1 ) -Element[0x00000000 "" "RLR" "" 722500 247500 -12500 0 3 100 0x00000000] +Element[0x00000000 "resistor_axial" "RLR" "800" 762500 145000 8600 -42000 1 100 0x00000000] ( - Pin[0 0 6000 2000 6006 3500 "" "2" 0x00000001] - Pin[0 10000 6000 2000 6006 3500 "" "1" 0x00000001] - ElementLine [10000 7500 5000 2500 1000] - ElementLine [10000 7500 10000 10000 1000] - ElementLine [-10000 7500 -5000 2500 1000] - ElementLine [-10000 7500 -10000 10000 1000] - ElementArc [1 9999 10001 10001 0 90 1000] - ElementArc [0 10000 10000 10000 90 90 1000] + Pin[0 20000 8000 3000 8600 2000 "1" "1" 0x00000101] + Pin[0 -60000 8000 3000 8600 2000 "2" "2" 0x00000001] + ElementLine [-6600 0 6600 0 1000] + ElementLine [6600 -40000 6600 0 1000] + ElementLine [-6600 -40000 6600 -40000 1000] + ElementLine [-6600 -40000 -6600 0 1000] + ElementLine [0 -60000 0 -40000 1000] + ElementLine [0 0 0 20000 1000] ) -Element[0x00000000 "" "RLL" "" 735000 217500 -12500 0 3 100 0x00000000] +Element[0x00000000 "" "RLL" "" 712500 185000 0 12500 0 100 0x00000000] ( - Pin[0 0 6000 2000 6006 3500 "" "2" 0x00000001] - Pin[0 10000 6000 2000 6006 3500 "" "1" 0x00000001] - ElementLine [10000 7500 5000 2500 1000] - ElementLine [10000 7500 10000 10000 1000] - ElementLine [-10000 7500 -5000 2500 1000] - ElementLine [-10000 7500 -10000 10000 1000] - ElementArc [1 9999 10001 10001 0 90 1000] - ElementArc [0 10000 10000 10000 90 90 1000] + Pin[0 0 6000 2000 6006 3500 "" "2" 0x00004001] + Pin[10000 0 6000 2000 6006 3500 "" "1" 0x00004001] + ElementLine [7500 -10000 2500 -5000 1000] + ElementLine [7500 -10000 10000 -10000 1000] + ElementLine [7500 10000 2500 5000 1000] + ElementLine [7500 10000 10000 10000 1000] + ElementArc [9999 -1 10001 10001 90 90 1000] + ElementArc [10000 0 10000 10000 180 90 1000] ) -Element[0x00000000 "generic" "TS912" "DIL 8" 792500 250000 -17000 -5000 1 100 0x00000000] +Element[0x00000000 "generic" "TS912" "DIL 8" 747500 210000 17000 5000 3 100 0x00000000] ( 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" 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] - Pin[-30000 0 6000 3000 6600 2800 "8" "8" 0x00000001] - ElementLine [-35000 5000 -20000 5000 1000] - ElementLine [-10000 5000 5000 5000 1000] - ElementLine [-35000 -35000 -35000 5000 1000] - ElementLine [-35000 -35000 5000 -35000 1000] - ElementLine [5000 -35000 5000 5000 1000] - ElementArc [-15000 5000 5000 5000 180 180 1000] + 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" 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] + Pin[30000 0 6000 3000 6600 2800 "8" "8" 0x00000001] + ElementLine [20000 -5000 35000 -5000 1000] + ElementLine [-5000 -5000 10000 -5000 1000] + ElementLine [35000 -5000 35000 35000 1000] + ElementLine [-5000 35000 35000 35000 1000] + ElementLine [-5000 -5000 -5000 35000 1000] + ElementArc [15000 -5000 5000 5000 0 180 1000] ) -Element[0x00000000 "" "RPCI" "" 757500 170000 -12500 0 3 100 0x00000000] +Element[0x00000000 "" "RPCI" "" 747500 50000 -12500 0 3 100 0x00000000] ( Pin[0 0 6000 2000 6006 3500 "" "2" 0x00000001] Pin[0 10000 6000 2000 6006 3500 "" "1" 0x00000001] @@ -2300,49 +2268,81 @@ Element[0x00000000 "" "RPCI" "" 757500 170000 -12500 0 3 100 0x00000000] ) -Element[0x00000000 "" "RPCL" "" 790000 185000 -12500 0 3 100 0x00000000] +Element[0x00000000 "" "RPCL" "" 790000 62500 0 -12500 2 100 0x00000000] ( - Pin[0 0 6000 2000 6006 3500 "" "2" 0x00000001] - Pin[0 10000 6000 2000 6006 3500 "" "1" 0x00000001] - ElementLine [10000 7500 5000 2500 1000] - ElementLine [10000 7500 10000 10000 1000] - ElementLine [-10000 7500 -5000 2500 1000] - ElementLine [-10000 7500 -10000 10000 1000] - ElementArc [1 9999 10001 10001 0 90 1000] - ElementArc [0 10000 10000 10000 90 90 1000] + Pin[0 0 6000 2000 6006 3500 "" "2" 0x00004001] + Pin[-10000 0 6000 2000 6006 3500 "" "1" 0x00004001] + ElementLine [-7500 10000 -2500 5000 1000] + ElementLine [-10000 10000 -7500 10000 1000] + ElementLine [-7500 -10000 -2500 -5000 1000] + ElementLine [-10000 -10000 -7500 -10000 1000] + ElementArc [-9999 1 10001 10001 270 90 1000] + ElementArc [-10000 0 10000 10000 0 90 1000] ) -Element[0x00000000 "" "RLG" "" 830000 240000 -12500 0 3 100 0x00000000] +Element[0x00000000 "Header connector, ribbon cable numbering" "INDIV1" "HEADER34_2" 902500 57500 21000 -5000 3 100 0x00000000] ( - Pin[0 0 6000 2000 6006 3500 "" "2" 0x00000001] - Pin[0 10000 6000 2000 6006 3500 "" "1" 0x00000001] - ElementLine [10000 7500 5000 2500 1000] - ElementLine [10000 7500 10000 10000 1000] - ElementLine [-10000 7500 -5000 2500 1000] - ElementLine [-10000 7500 -10000 10000 1000] - ElementArc [1 9999 10001 10001 0 90 1000] - ElementArc [0 10000 10000 10000 90 90 1000] + Pin[0 0 6000 3000 6600 3000 "1" "1" 0x00000101] + Pin[10000 0 6000 3000 6600 3000 "2" "2" 0x00000001] + Pin[0 10000 6000 3000 6600 3000 "3" "3" 0x00000001] + Pin[10000 10000 6000 3000 6600 3000 "4" "4" 0x00000001] + Pin[0 20000 6000 3000 6600 3000 "5" "5" 0x00000001] + Pin[10000 20000 6000 3000 6600 3000 "6" "6" 0x00000001] + Pin[0 30000 6000 3000 6600 3000 "7" "7" 0x00000001] + Pin[10000 30000 6000 3000 6600 3000 "8" "8" 0x00000001] + Pin[0 40000 6000 3000 6600 3000 "9" "9" 0x00000001] + Pin[10000 40000 6000 3000 6600 3000 "10" "10" 0x00000001] + Pin[0 50000 6000 3000 6600 3000 "11" "11" 0x00000001] + Pin[10000 50000 6000 3000 6600 3000 "12" "12" 0x00000001] + Pin[0 60000 6000 3000 6600 3000 "13" "13" 0x00000001] + Pin[10000 60000 6000 3000 6600 3000 "14" "14" 0x00000001] + Pin[0 70000 6000 3000 6600 3000 "15" "15" 0x00000001] + Pin[10000 70000 6000 3000 6600 3000 "16" "16" 0x00000001] + Pin[0 80000 6000 3000 6600 3000 "17" "17" 0x00000001] + Pin[10000 80000 6000 3000 6600 3000 "18" "18" 0x00000001] + Pin[0 90000 6000 3000 6600 3000 "19" "19" 0x00000001] + Pin[10000 90000 6000 3000 6600 3000 "20" "20" 0x00000001] + Pin[0 100000 6000 3000 6600 3000 "21" "21" 0x00000001] + Pin[10000 100000 6000 3000 6600 3000 "22" "22" 0x00000001] + Pin[0 110000 6000 3000 6600 3000 "23" "23" 0x00000001] + Pin[10000 110000 6000 3000 6600 3000 "24" "24" 0x00000001] + Pin[0 120000 6000 3000 6600 3000 "25" "25" 0x00000001] + Pin[10000 120000 6000 3000 6600 3000 "26" "26" 0x00000001] + Pin[0 130000 6000 3000 6600 3000 "27" "27" 0x00000001] + Pin[10000 130000 6000 3000 6600 3000 "28" "28" 0x00000001] + Pin[0 140000 6000 3000 6600 3000 "29" "29" 0x00000001] + Pin[10000 140000 6000 3000 6600 3000 "30" "30" 0x00000001] + Pin[0 150000 6000 3000 6600 3000 "31" "31" 0x00000001] + Pin[10000 150000 6000 3000 6600 3000 "32" "32" 0x00000001] + Pin[0 160000 6000 3000 6600 3000 "33" "33" 0x00000001] + Pin[10000 160000 6000 3000 6600 3000 "34" "34" 0x00000001] + ElementLine [5000 -5000 5000 5000 1000] + ElementLine [-5000 5000 5000 5000 1000] + ElementLine [-5000 -5000 15000 -5000 2000] + ElementLine [15000 -5000 15000 165000 2000] + ElementLine [-5000 165000 15000 165000 2000] + ElementLine [-5000 -5000 -5000 165000 2000] ) -Rat[697500 107500 1 855600 116800 1 0x00000010] -Rat[855600 116800 1 910000 52500 1 0x00000010] -Rat[910000 52500 1 955000 87500 1 0x00000010] -Rat[957500 187500 1 855600 138400 1 0x00000010] -Rat[855600 138400 1 910000 62500 1 0x00000010] -Rat[855600 138400 1 637500 187500 1 0x00000010] -Rat[957500 117500 1 920000 52500 1 0x00000010] -Rat[920000 52500 1 855600 127600 1 0x00000010] -Rat[855600 127600 1 697500 117500 1 0x00000010] -Rat[637500 197500 1 855600 149200 1 0x00000010] -Rat[855600 149200 1 957500 177500 1 0x00000010] -Rat[855600 149200 1 920000 62500 1 0x00000010] -Rat[955000 77500 1 920000 42500 1 0x00000010] -Rat[920000 42500 1 855600 106000 1 0x00000010] -Rat[855600 106000 1 697500 97500 1 0x00000010] -Rat[955000 57500 1 910000 42500 1 0x00000010] -Rat[910000 42500 1 855600 95200 1 0x00000010] -Rat[855600 95200 1 697500 67500 1 0x00000010] +Rat[697500 107500 1 855600 84400 1 0x00000010] +Rat[855600 84400 1 902500 87500 1 0x00000010] +Rat[902500 87500 1 952500 122500 1 0x00000010] +Rat[952500 210000 1 902500 97500 1 0x00000010] +Rat[902500 97500 1 855600 95200 1 0x00000010] +Rat[855600 95200 1 637500 187500 1 0x00000010] +Rat[952500 140000 1 912500 87500 1 0x00000010] +Rat[912500 87500 1 844400 89800 1 0x00000010] +Rat[844400 89800 1 697500 117500 1 0x00000010] +Rat[637500 197500 1 844400 100600 1 0x00000010] +Rat[844400 100600 1 912500 97500 1 0x00000010] +Rat[912500 97500 1 952500 200000 1 0x00000010] +Rat[952500 112500 1 912500 77500 1 0x00000010] +Rat[912500 77500 1 844400 79000 1 0x00000010] +Rat[844400 79000 1 697500 97500 1 0x00000010] +Rat[952500 92500 1 902500 77500 1 0x00000010] +Rat[902500 77500 1 855600 73600 1 0x00000010] +Rat[855600 73600 1 697500 67500 1 0x00000010] Rat[607500 15000 1 1040000 27500 1 0x00000010] Rat[1040000 52500 1 1175000 42500 1 0x00000010] Rat[617500 25000 1 1065000 27500 1 0x00000010] @@ -2350,11 +2350,11 @@ Rat[1065000 52500 1 1200000 42500 1 0x00000010] Rat[637500 167500 1 557500 25000 1 0x00000010] Rat[637500 217500 1 577500 15000 1 0x00000010] Rat[697500 217500 1 587500 15000 1 0x00000010] -Rat[757500 180000 1 790000 195000 1 0x00000010] -Rat[757500 180000 1 697500 47500 1 0x00000010] -Rat[697500 47500 1 715000 27500 1 0x00000010] -Rat[855600 52000 1 910000 22500 1 0x00000010] -Rat[855600 52000 1 757500 170000 1 0x00000010] +Rat[747500 60000 1 780000 62500 1 0x00000010] +Rat[747500 60000 1 715000 27500 1 0x00000010] +Rat[715000 27500 1 697500 47500 1 0x00000010] +Rat[855600 52000 1 902500 57500 1 0x00000010] +Rat[855600 52000 1 747500 50000 1 0x00000010] Rat[697500 57500 1 615000 112500 1 0x00000010] Rat[615000 112500 1 580000 80000 1 0x00000010] Rat[580000 80000 1 560000 80000 1 0x00000010] @@ -2368,87 +2368,87 @@ Rat[540000 50000 1 580000 105000 1 0x00000010] Rat[580000 105000 1 615000 122500 1 0x00000010] Rat[637500 157500 0 697500 137500 1 0x00000010] Rat[697500 137500 1 717500 140000 1 0x00000010] -Rat[717500 140000 1 735000 217500 1 0x00000010] -Rat[735000 217500 1 792500 220000 1 0x00000010] -Rat[792500 220000 1 790000 185000 1 0x00000010] -Rat[790000 185000 1 855600 62800 1 0x00000010] -Rat[855600 62800 1 920000 22500 1 0x00000010] +Rat[717500 140000 1 712500 185000 1 0x00000010] +Rat[712500 185000 1 747500 240000 1 0x00000010] +Rat[717500 140000 1 790000 62500 1 0x00000010] +Rat[790000 62500 1 844400 57400 1 0x00000010] +Rat[844400 57400 1 912500 57500 1 0x00000010] Rat[650000 135000 1 697500 127500 1 0x00000010] Rat[697500 127500 1 717500 130000 1 0x00000010] -Rat[650000 47500 1 750000 10000 1 0x00000010] -Rat[717500 130000 1 762500 250000 1 0x00000010] -Rat[855600 84400 1 920000 32500 1 0x00000010] -Rat[855600 84400 1 830000 240000 1 0x00000010] -Rat[855600 73600 1 910000 32500 1 0x00000010] -Rat[855600 73600 1 722500 247500 1 0x00000010] -Rat[597500 25000 1 792500 240000 1 0x00000010] -Rat[587500 25000 1 762500 220000 1 0x00000010] -Rat[792500 250000 1 830000 250000 1 0x00000010] -Rat[762500 240000 1 722500 257500 1 0x00000010] +Rat[717500 130000 1 777500 210000 1 0x00000010] +Rat[717500 130000 1 935000 25000 1 0x00000010] +Rat[844400 68200 1 912500 67500 1 0x00000010] +Rat[844400 68200 1 780000 92500 1 0x00000010] +Rat[855600 62800 1 902500 67500 1 0x00000010] +Rat[855600 62800 1 762500 85000 1 0x00000010] +Rat[597500 25000 1 777500 230000 1 0x00000010] +Rat[587500 25000 1 747500 230000 1 0x00000010] +Rat[777500 220000 1 780000 172500 1 0x00000010] +Rat[747500 210000 1 762500 165000 1 0x00000010] Rat[637500 47500 1 567500 15000 1 0x00000010] -Rat[697500 237500 1 735000 227500 1 0x00000010] -Rat[735000 227500 1 762500 230000 1 0x00000010] -Rat[762500 230000 1 792500 230000 1 0x00000010] +Rat[697500 237500 1 747500 220000 1 0x00000010] +Rat[747500 220000 1 777500 240000 1 0x00000010] +Rat[747500 220000 1 722500 185000 1 0x00000010] Rat[697500 237500 1 582500 232500 1 0x00000010] -Rat[957500 127500 1 910000 82500 1 0x00000010] -Rat[910000 82500 1 855600 181600 1 0x00000010] -Rat[855600 181600 1 697500 157500 1 0x00000010] -Rat[855600 170800 1 957500 137500 1 0x00000010] -Rat[957500 137500 1 920000 72500 1 0x00000010] -Rat[855600 170800 1 697500 167500 1 0x00000010] -Rat[957500 147500 1 920000 82500 1 0x00000010] -Rat[920000 82500 1 844400 57400 1 0x00000010] -Rat[844400 57400 1 697500 187500 1 0x00000010] -Rat[844400 68200 1 910000 92500 1 0x00000010] -Rat[910000 92500 1 957500 157500 1 0x00000010] -Rat[844400 68200 1 697500 197500 1 0x00000010] -Rat[957500 167500 1 910000 102500 1 0x00000010] -Rat[910000 102500 1 844400 89800 1 0x00000010] -Rat[844400 89800 1 697500 207500 1 0x00000010] -Rat[697500 87500 1 955000 17500 1 0x00000010] -Rat[697500 147500 1 955000 27500 1 0x00000010] -Rat[697500 177500 1 955000 37500 1 0x00000010] -Rat[697500 227500 1 955000 47500 1 0x00000010] -Rat[697500 77500 1 844400 79000 1 0x00000010] -Rat[844400 79000 1 920000 92500 1 0x00000010] -Rat[920000 92500 1 955000 67500 1 0x00000010] -Rat[1280000 27500 0 1330600 190500 1 0x00000010] -Rat[1270000 42500 0 1330600 179700 1 0x00000010] -Rat[1280000 152500 0 1330600 82500 1 0x00000010] -Rat[1280000 167500 0 1330600 71700 1 0x00000010] -Rat[1280000 177500 0 1330600 60900 1 0x00000010] -Rat[1270000 192500 0 1319400 185100 1 0x00000010] -Rat[1280000 202500 0 1319400 174300 1 0x00000010] -Rat[1280000 217500 0 1319400 163500 1 0x00000010] -Rat[1280000 227500 0 1319400 152700 1 0x00000010] -Rat[1260000 232500 0 1319400 141900 1 0x00000010] -Rat[1280000 52500 0 1330600 168900 1 0x00000010] -Rat[1280000 67500 0 1330600 158100 1 0x00000010] -Rat[1280000 77500 0 1330600 147300 1 0x00000010] -Rat[1270000 92500 0 1330600 136500 1 0x00000010] -Rat[1280000 102500 0 1330600 125700 1 0x00000010] -Rat[1280000 117500 0 1330600 114900 1 0x00000010] +Rat[952500 150000 1 902500 117500 1 0x00000010] +Rat[902500 117500 1 855600 116800 1 0x00000010] +Rat[855600 116800 1 697500 157500 1 0x00000010] +Rat[844400 111400 1 912500 107500 1 0x00000010] +Rat[912500 107500 1 952500 160000 1 0x00000010] +Rat[844400 111400 1 697500 167500 1 0x00000010] +Rat[952500 170000 1 912500 117500 1 0x00000010] +Rat[912500 117500 1 844400 122200 1 0x00000010] +Rat[844400 122200 1 697500 187500 1 0x00000010] +Rat[855600 127600 1 902500 127500 1 0x00000010] +Rat[902500 127500 1 952500 180000 1 0x00000010] +Rat[855600 127600 1 697500 197500 1 0x00000010] +Rat[952500 190000 1 902500 137500 1 0x00000010] +Rat[902500 137500 1 855600 138400 1 0x00000010] +Rat[855600 138400 1 697500 207500 1 0x00000010] +Rat[697500 87500 1 952500 52500 1 0x00000010] +Rat[697500 147500 1 952500 62500 1 0x00000010] +Rat[697500 177500 1 952500 72500 1 0x00000010] +Rat[697500 227500 1 952500 82500 1 0x00000010] +Rat[697500 77500 1 844400 133000 1 0x00000010] +Rat[844400 133000 1 912500 127500 1 0x00000010] +Rat[912500 127500 1 952500 102500 1 0x00000010] +Rat[1280000 27500 0 1330600 60900 1 0x00000010] +Rat[1270000 42500 0 1319400 66300 1 0x00000010] +Rat[1280000 152500 0 1330600 114900 1 0x00000010] +Rat[1280000 167500 0 1319400 120300 1 0x00000010] +Rat[1280000 177500 0 1330600 125700 1 0x00000010] +Rat[1260000 182500 0 1319400 131100 1 0x00000010] +Rat[1280000 202500 0 1330600 136500 1 0x00000010] +Rat[1280000 217500 0 1319400 141900 1 0x00000010] +Rat[1280000 227500 0 1330600 147300 1 0x00000010] +Rat[1260000 232500 0 1319400 152700 1 0x00000010] +Rat[1280000 52500 0 1330600 71700 1 0x00000010] +Rat[1280000 67500 0 1319400 77100 1 0x00000010] +Rat[1280000 77500 0 1330600 82500 1 0x00000010] +Rat[1270000 92500 0 1319400 87900 1 0x00000010] +Rat[1280000 102500 0 1330600 93300 1 0x00000010] +Rat[1280000 117500 0 1319400 98700 1 0x00000010] Rat[1280000 127500 0 1330600 104100 1 0x00000010] -Rat[1270000 142500 0 1330600 93300 1 0x00000010] -Rat[560000 50000 1 800000 10000 1 0x00000010] -Rat[800000 10000 1 1005000 27500 0 0x00000010] +Rat[1270000 142500 0 1319400 109500 1 0x00000010] +Rat[560000 50000 1 985000 25000 1 0x00000010] +Rat[985000 25000 1 1005000 27500 0 0x00000010] Rat[765000 27500 1 1005000 42500 0 0x00000010] -Rat[1005000 152500 0 987500 117500 1 0x00000010] -Rat[1005000 167500 0 987500 127500 1 0x00000010] -Rat[1005000 177500 0 987500 137500 1 0x00000010] -Rat[1005000 192500 0 987500 147500 1 0x00000010] -Rat[1005000 202500 0 987500 157500 1 0x00000010] -Rat[1005000 217500 0 987500 167500 1 0x00000010] -Rat[1005000 227500 0 987500 177500 1 0x00000010] -Rat[1005000 242500 0 987500 187500 1 0x00000010] -Rat[1005000 52500 0 985000 17500 1 0x00000010] -Rat[1005000 67500 0 985000 27500 1 0x00000010] -Rat[1005000 77500 0 985000 37500 1 0x00000010] -Rat[1005000 92500 0 985000 47500 1 0x00000010] -Rat[1005000 102500 0 985000 57500 1 0x00000010] -Rat[1005000 117500 0 985000 67500 1 0x00000010] -Rat[1005000 127500 0 985000 77500 1 0x00000010] -Rat[1005000 142500 0 985000 87500 1 0x00000010] +Rat[1005000 152500 0 982500 140000 1 0x00000010] +Rat[1005000 167500 0 982500 150000 1 0x00000010] +Rat[1005000 177500 0 982500 160000 1 0x00000010] +Rat[1005000 192500 0 982500 170000 1 0x00000010] +Rat[1005000 202500 0 982500 180000 1 0x00000010] +Rat[1005000 217500 0 982500 190000 1 0x00000010] +Rat[1005000 227500 0 982500 200000 1 0x00000010] +Rat[1005000 242500 0 982500 210000 1 0x00000010] +Rat[1005000 52500 0 982500 52500 1 0x00000010] +Rat[1005000 67500 0 982500 62500 1 0x00000010] +Rat[1005000 77500 0 982500 72500 1 0x00000010] +Rat[1005000 92500 0 982500 82500 1 0x00000010] +Rat[1005000 102500 0 982500 92500 1 0x00000010] +Rat[1005000 117500 0 982500 102500 1 0x00000010] +Rat[1005000 127500 0 982500 112500 1 0x00000010] +Rat[1005000 142500 0 982500 122500 1 0x00000010] Rat[535000 230000 0 527500 212500 1 0x00000010] Rat[535000 102500 0 527500 120000 1 0x00000010] Rat[527500 120000 1 527500 140000 1 0x00000010] @@ -2464,8 +2464,8 @@ Rat[630000 170000 1 582500 172500 0 0x00000010] Rat[627500 167500 1 582500 162500 0 0x00000010] Rat[637500 237500 1 582500 212500 0 0x00000010] Rat[637500 227500 1 582500 202500 0 0x00000010] -Rat[637500 57500 1 855600 160000 1 0x00000010] -Rat[855600 160000 1 910000 72500 1 0x00000010] +Rat[637500 57500 1 855600 106000 1 0x00000010] +Rat[855600 106000 1 902500 107500 1 0x00000010] Layer(1 "component") ( Line[390000 145000 390000 130000 4000 2000 0x00000020] @@ -2975,41 +2975,41 @@ NetList() ( Connect("PIC-34") Connect("RAP0-8") - Connect("INDIV0-7") + Connect("INDIV0-4") Connect("INDIV1-7") ) Net("booster_dirn__pt17" "Signal") ( Connect("RAP1-8") Connect("PIC-15") - Connect("INDIV0-9") + Connect("INDIV0-5") Connect("INDIV1-9") ) Net("booster_flag__pt10" "Signal") ( Connect("RAP1-1") Connect("PIC-33") - Connect("INDIV0-8") + Connect("INDIV0-17") Connect("INDIV1-8") ) Net("booster_pwm__pt16" "Signal") ( Connect("PIC-16") - Connect("INDIV0-10") + Connect("INDIV0-18") Connect("INDIV1-10") Connect("RAP1-7") ) Net("booster_retry__pt8" "Signal") ( Connect("RAP0-7") - Connect("INDIV0-6") + Connect("INDIV0-16") Connect("INDIV1-6") Connect("PIC-35") ) Net("cdu_enable__pt6" "Signal") ( Connect("RAP0-5") - Connect("INDIV0-5") + Connect("INDIV0-3") Connect("INDIV1-5") Connect("PIC-38") ) @@ -3129,7 +3129,7 @@ NetList() Connect("BUS-6") Connect("BUS-8") Connect("BUS-11") - Connect("INDIV0-2") + Connect("INDIV0-14") Connect("INDIV1-2") Connect("CAC05-1") Connect("CPIC0-1") @@ -3163,34 +3163,34 @@ NetList() ) Net("led_green" "Signal") ( - Connect("INDIV0-4") + Connect("INDIV0-15") Connect("INDIV1-4") Connect("RLG-2") ) Net("led_red" "Signal") ( - Connect("INDIV0-3") + Connect("INDIV0-2") Connect("INDIV1-3") Connect("RLR-2") ) Net("led_refhigh" "Signal") ( Connect("BUS-15") - Connect("TS912-2") + Connect("TS912-6") ) Net("led_reflow" "Signal") ( Connect("BUS-13") - Connect("TS912-5") + Connect("TS912-3") ) Net("ledmid_green" "Signal") ( - Connect("TS912-1") + Connect("TS912-7") Connect("RLG-1") ) Net("ledmid_red" "Signal") ( - Connect("TS912-7") + Connect("TS912-1") Connect("RLR-1") ) Net("mclr" "Signal") @@ -3202,20 +3202,20 @@ NetList() ( Connect("PIC-21") Connect("RAS-9") - Connect("TS912-3") - Connect("TS912-6") + Connect("TS912-2") + Connect("TS912-5") Connect("RLL-1") ) Net("pt11__spare2" "Signal") ( Connect("RAP1-2") - Connect("INDIV0-13") + Connect("INDIV0-7") Connect("INDIV1-13") Connect("PIC-29") ) Net("pt12__spare1" "Signal") ( - Connect("INDIV0-12") + Connect("INDIV0-19") Connect("INDIV1-12") Connect("RAP1-3") Connect("PIC-28") @@ -3223,13 +3223,13 @@ NetList() Net("pt13__rs232_rxin" "Signal") ( Connect("RAP1-4") - Connect("INDIV0-14") + Connect("INDIV0-20") Connect("INDIV1-14") Connect("PIC-26") ) Net("pt14__rs232_txout" "Signal") ( - Connect("INDIV0-15") + Connect("INDIV0-8") Connect("INDIV1-15") Connect("RAP1-5") Connect("PIC-25") @@ -3238,7 +3238,7 @@ NetList() ( Connect("RAP1-6") Connect("PIC-24") - Connect("INDIV0-17") + Connect("INDIV0-9") Connect("INDIV1-17") ) Net("pt2" "Signal") @@ -3264,7 +3264,7 @@ NetList() Net("pt7__rs232_fcin" "Signal") ( Connect("PIC-37") - Connect("INDIV0-16") + Connect("INDIV0-21") Connect("INDIV1-16") Connect("RAP0-6") ) @@ -3272,97 +3272,97 @@ NetList() ( Connect("PTFET0-2") Connect("PTD0-2") - Connect("POINTS-1") + Connect("POINTS-13") ) Net("ptdrain1" "Signal") ( Connect("PTFET1-2") Connect("PTD1-2") - Connect("POINTS-2") + Connect("POINTS-25") ) Net("ptdrain10" "Signal") ( Connect("PTFET10-2") Connect("PTD10-2") - Connect("POINTS-11") + Connect("POINTS-8") ) Net("ptdrain11" "Signal") ( Connect("PTFET11-2") Connect("PTD11-2") - Connect("POINTS-12") + Connect("POINTS-20") ) Net("ptdrain12" "Signal") ( Connect("PTFET12-2") Connect("PTD12-2") - Connect("POINTS-13") + Connect("POINTS-7") ) Net("ptdrain13" "Signal") ( Connect("PTFET13-2") Connect("PTD13-2") - Connect("POINTS-14") + Connect("POINTS-19") ) Net("ptdrain14" "Signal") ( Connect("PTFET14-2") Connect("PTD14-2") - Connect("POINTS-15") + Connect("POINTS-6") ) Net("ptdrain15" "Signal") ( Connect("PTFET15-2") Connect("PTD15-2") - Connect("POINTS-16") + Connect("POINTS-18") ) Net("ptdrain16" "Signal") ( Connect("PTFET16-2") Connect("PTD16-2") - Connect("POINTS-17") + Connect("POINTS-5") ) Net("ptdrain17" "Signal") ( Connect("PTFET17-2") Connect("PTD17-2") - Connect("POINTS-18") + Connect("POINTS-17") ) Net("ptdrain2" "Signal") ( Connect("PTFET2-2") Connect("PTD2-2") - Connect("POINTS-3") + Connect("POINTS-12") ) Net("ptdrain3" "Signal") ( Connect("PTFET3-2") Connect("PTD3-2") - Connect("POINTS-4") + Connect("POINTS-24") ) Net("ptdrain4" "Signal") ( Connect("PTFET4-2") Connect("PTD4-2") - Connect("POINTS-5") + Connect("POINTS-11") ) Net("ptdrain5" "Signal") ( Connect("PTFET5-2") Connect("PTD5-2") - Connect("POINTS-6") + Connect("POINTS-23") ) Net("ptdrain6" "Signal") ( Connect("PTFET6-2") Connect("PTD6-2") - Connect("POINTS-7") + Connect("POINTS-10") ) Net("ptdrain7" "Signal") ( Connect("PTFET7-2") Connect("PTD7-2") - Connect("POINTS-8") + Connect("POINTS-22") ) Net("ptdrain8" "Signal") ( @@ -3374,7 +3374,7 @@ NetList() ( Connect("PTFET9-2") Connect("PTD9-2") - Connect("POINTS-10") + Connect("POINTS-21") ) Net("ptgate0" "Signal") ( @@ -3704,7 +3704,7 @@ NetList() Net("spare0" "Signal") ( Connect("PIC-2") - Connect("INDIV0-11") + Connect("INDIV0-6") Connect("INDIV1-11") ) Net("sshort0" "Signal") diff --git a/reversers-netlist.pl b/reversers-netlist.pl index 389bcae..fa3538d 100755 --- a/reversers-netlist.pl +++ b/reversers-netlist.pl @@ -22,7 +22,7 @@ sub unpack_iter_list ($$@) { # o return array of pins (first entry is undef) in order # instead of array of { Pin =>, Action => } my ($currentpin, @expanded, $base,$start,$end,$step,$i, @done,@out); - my ($backwards, $sign); + my ($backwards, $sign, $jump, $modulo, $usepin); local ($_); @expanded= (); foreach $_ (@in) { @@ -48,20 +48,28 @@ sub unpack_iter_list ($$@) { if (m/^\d+$/) { die "$_ != $currentpin $max (@in) (@expanded)" if $currentpin ne $&; - } elsif (m/^\:(\-?)(\d+)(?:([-+]\d+)|([-+])|)$/) { - ($backwards,$start,$step,$sign)=($1,$2,$3,$4); + } elsif (m/^\:(\-?)(\d+)(?:([-+]\d+)|([-+])|)(?:\%(\d+)\/(\d+))?$/) { + ($backwards,$start,$step,$sign,$jump,$modulo)=($1,$2,$3,$4,$5,$6); $currentpin= length $backwards ? $max-$start : $start; $step= length $step ? $step : length $sign ? $sign.'1' : 1; } else { if ($_ ne '-') { - die "$currentpin<1 $_ $max (@in) (@expanded)" - if $currentpin < 1; - die "$currentpin>$max $_ $max (@in) (@expanded)" - if $currentpin > $max; - die "already $done[$currentpin] $_ $max (@in) (@expanded)" - if ($options !~ m/r/) && defined $done[$currentpin]; - push @out, { Pin => $currentpin, Action => $_ }; - $done[$currentpin]= $_; + $usepin= $currentpin; + if (length $jump) { + $usepin--; + my ($remainder) = $usepin % $modulo; + $usepin= ($usepin - $remainder) / $modulo + + $remainder * $jump; + $usepin++; + } + die "$usepin<1 $_ $max (@in) (@expanded)" + if $usepin < 1; + die "$usepin>$max $_ $max (@in) (@expanded)" + if $usepin > $max; + die "already $done[$usepin] $_ $max (@in) (@expanded)" + if ($options !~ m/r/) && defined $done[$usepin]; + push @out, { Pin => $usepin, Action => $_ }; + $done[$usepin]= $_; } $currentpin += $step; } @@ -185,8 +193,8 @@ push @indiv, qw(cdu_enable rs232_fcout ); -assignpins('INDIV0',26,@indiv); # 26-way ribbon -assignpins('INDIV1',25,@indiv); # 25-way D +assignpins('INDIV0',25, ':1%13/2', @indiv); # 26-way ribbon +assignpins('INDIV1',26,@indiv); # 25-way D sub assignpins_multi ($$@) { # Args are linemin linemax linesperchip and a list like for assignpins @@ -427,11 +435,12 @@ RPCPT 2 icsp_pc ptgate1 0-17/1 PTD@ 2 cdu_out ptdrain@ 2-17/8 RAP@ 16 :1 pt<..> :-0- ptgate<..> -POINTS 25 ptdrain0..17 +POINTS 25 + :25-1%13/2 ptdrain0..17 TS912 8 - :1 ledmid_green led_refhigh perpicled - :7- ledmid_red perpicled led_reflow + :1 ledmid_red perpicled led_reflow + :7- ledmid_green led_refhigh perpicled :4 l_gnd :8 l_vcc