before adjust silk

diff --git a/pcb/Makefile b/pcb/Makefile
index b24a80c07efc9b49c7a9174d96f9f0da09b23bb5..3e1aab6d3e1792a655945948ee37856e4b222496 100644 (file)
--- a/pcb/Makefile
+++ b/pcb/Makefile
@@ -15,7 +15,7 @@ LAYERS=               $(LAYERS_L) $(LAYERS_E)
 
 LPAGES=         $(foreach x, 0 1 2 3 4 5 6, $(foreach y, 1 2 3 4 5, ours-p0-$xx$y.ps))
 
-default:       ours-a.ps ours-al.ps parts.ps
+default:       netlists picprogs
 layers:                $(LAYERS)
 lpages:                $(LPAGES)
 

diff --git a/pcb/detectors.pcb b/pcb/detectors.pcb
index 6398d272998c4cec17af4c7c5007dbb8b5b9aea4..6c211110e5db9464088e77b081205706c76706f4 100644 (file)
--- a/pcb/detectors.pcb
+++ b/pcb/detectors.pcb
@@ -1,12 +1,12 @@
 # release: pcb-bin 1.99p
-# date:    Mon Aug 30 02:49:24 2004
+# date:    Thu Sep  2 00:31:44 2004
 # user:    ian (Ian Jackson)
 # host:    anarres.relativity.greenend.org.uk
 
-PCB["detectors.pcb" 990000 312500]
+PCB["detectors.pcb" 1990000 312500]
 
-Grid[2500.00000000 0 0 0]
-Cursor[543322 407492 5.721399]
+Grid[2500.00000000 0 0 1]
+Cursor[950000 144070 2.721399]
 Thermal[0.500000]
 DRC[809 400 800 800]
 Flags(0x0000000000001e51)
@@ -2433,65 +2433,57 @@ Element[0x00000000 "" "PTD2" "" 910000 80000 7500 -12500 0 100 0x00000000]
 
        )
 
-Element[0x00000000 "" "INDIV0" "" 965000 27500 3900 198600 0 100 0x00000000]
-(
-       Pin[5600 70200 6000 3000 6600 3500 "" "5" 0x00000001]
-       Pin[5600 81000 6000 3000 6600 3500 "" "6" 0x00000001]
-       Pin[5600 91800 6000 3000 6600 3500 "" "7" 0x00000001]
-       Pin[5600 102600 6000 3000 6600 3500 "" "8" 0x00000001]
-       Pin[5600 113400 6000 3000 6600 3500 "" "9" 0x00000001]
-       Pin[5600 124200 6000 3000 6600 3500 "" "10" 0x00000001]
-       Pin[-5600 32400 6000 3000 6600 3500 "" "14" 0x00000001]
-       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" 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]
-       Pin[-5600 151200 6000 3000 6600 3500 "" "25" 0x00000001]
-       Pin[-5600 75600 6000 3000 6600 3500 "" "18" 0x00000001]
-       Pin[-5600 64800 6000 3000 6600 3500 "" "17" 0x00000001]
-       Pin[-5600 54000 6000 3000 6600 3500 "" "16" 0x00000001]
-       Pin[-5600 43200 6000 3000 6600 3500 "" "15" 0x00000001]
-       Pin[-5600 86400 6000 3000 6600 3500 "" "19" 0x00000001]
-       Pin[-5600 118800 6000 3000 6600 3500 "" "22" 0x00000001]
-       Pin[-5600 108000 6000 3000 6600 3500 "" "21" 0x00000001]
-       Pin[-5600 97200 6000 3000 6600 3500 "" "20" 0x00000001]
+Element[0x00000000 "" "INDIV0" "" 965000 211100 -2500 -167200 0 100 0x00000000]
+(
+       Pin[5600 -48600 6000 3000 6600 3500 "" "3" 0x00000001]
+       Pin[5600 -59400 6000 3000 6600 3500 "" "4" 0x00000001]
+       Pin[5600 -70200 6000 3000 6600 3500 "" "5" 0x00000001]
+       Pin[5600 -81000 6000 3000 6600 3500 "" "6" 0x00000001]
+       Pin[5600 -91800 6000 3000 6600 3500 "" "7" 0x00000001]
+       Pin[5600 -102600 6000 3000 6600 3500 "" "8" 0x00000001]
+       Pin[5600 -113400 6000 3000 6600 3500 "" "9" 0x00000001]
+       Pin[5600 -124200 6000 3000 6600 3500 "" "10" 0x00000001]
+       Pin[5600 -135000 6000 3000 6600 3500 "" "11" 0x00000001]
+       Pin[5600 -145800 6000 3000 6600 3500 "" "12" 0x00000001]
+       Pin[5600 -156600 6000 3000 6600 3500 "" "13" 0x00000001]
+       Pin[-5600 -32400 6000 3000 6600 3500 "" "14" 0x00000001]
+       Pin[-5600 -43200 6000 3000 6600 3500 "" "15" 0x00000001]
+       Pin[-5600 -54000 6000 3000 6600 3500 "" "16" 0x00000001]
+       Pin[-5600 -64800 6000 3000 6600 3500 "" "17" 0x00000001]
+       Pin[-5600 -75600 6000 3000 6600 3500 "" "18" 0x00000001]
+       Pin[-5600 -86400 6000 3000 6600 3500 "" "19" 0x00000001]
+       Pin[-5600 -97200 6000 3000 6600 3500 "" "20" 0x00000001]
+       Pin[-5600 -108000 6000 3000 6600 3500 "" "21" 0x00000001]
+       Pin[-5600 -118800 6000 3000 6600 3500 "" "22" 0x00000001]
+       Pin[-5600 -129600 6000 3000 6600 3500 "" "23" 0x00000001]
+       Pin[-5600 -140400 6000 3000 6600 3500 "" "24" 0x00000001]
+       Pin[-5600 -151200 6000 3000 6600 3500 "" "25" 0x00000001]
+       Pin[0 -183600 25000 3000 25600 12500 "" "26" 0x00000001]
        Pin[0 0 25000 3000 25600 12500 "" "27" 0x00000001]
-       Pin[0 183600 25000 3000 25600 12500 "" "26" 0x00000001]
-       Pin[5600 59400 6000 3000 6600 3500 "" "4" 0x00000001]
-       Pin[5600 145800 6000 3000 6600 3500 "" "12" 0x00000001]
-       ElementLine [-10000 45000 -10000 47500 1000]
-       ElementLine [-12500 42500 -10000 45000 1000]
-       ElementLine [-17500 42500 -12500 42500 1000]
-       ElementLine [-20000 45000 -17500 42500 1000]
-       ElementLine [-17500 47500 -20000 45000 1000]
-       ElementLine [-17500 47500 -15000 47500 1000]
-       ElementLine [-15000 45000 -15000 47500 1000]
-       ElementLine [-17500 40000 -10000 40000 1000]
-       ElementLine [-20000 37500 -17500 40000 1000]
-       ElementLine [-17500 35000 -20000 37500 1000]
-       ElementLine [-17500 35000 -10000 35000 1000]
-       ElementLine [-20000 27500 -20000 32500 1000]
-       ElementLine [-20000 27500 -10000 27500 1000]
-       ElementLine [-15000 20000 -15000 22500 1000]
-       ElementLine [-12500 25000 -15000 22500 1000]
-       ElementLine [-10000 22500 -12500 25000 1000]
-       ElementLine [-10000 20000 -10000 22500 1000]
-       ElementLine [-20000 20000 -10000 20000 1000]
-       ElementLine [-25000 -7500 -25000 190000 2500]
-       ElementLine [-20000 195000 20000 195000 2500]
-       ElementLine [25000 -7500 25000 190000 2500]
-       ElementLine [-20000 -12500 20000 -12500 2500]
-       ElementArc [-20000 190000 5000 5000 0 90 2500]
-       ElementArc [20000 190000 5000 5000 90 90 2500]
-       ElementArc [19999 -7499 5001 5001 180 90 2500]
-       ElementArc [-20000 -7500 5000 5000 270 90 2500]
-       ElementArc [19999 -12501 1 1 90 90 2500]
-       ElementArc [20001 195001 1 1 270 90 2500]
-       ElementArc [29999 165001 1 1 180 90 1000]
-       ElementArc [29999 165001 1 1 180 90 1000]
+       Pin[5600 -27000 6000 3000 6600 3500 "" "1" 0x00000101]
+       Pin[5600 -37800 6000 3000 6600 3500 "" "2" 0x00000001]
+       ElementLine [-22500 -155000 -12500 -155000 2500]
+       ElementLine [-12500 -157500 -12500 -152500 2500]
+       ElementLine [-17500 -167500 -22500 -162500 2500]
+       ElementLine [-17500 -167500 -12500 -162500 2500]
+       ElementLine [-22500 -167500 -12500 -167500 2500]
+       ElementLine [-22500 -177500 -22500 -172500 2500]
+       ElementLine [-22500 -172500 -17500 -172500 2500]
+       ElementLine [-17500 -177500 -17500 -172500 2500]
+       ElementLine [-17500 -177500 -12500 -177500 2500]
+       ElementLine [-12500 -177500 -12500 -172500 2500]
+       ElementLine [25000 -190000 25000 7500 2500]
+       ElementLine [-20000 -195000 20000 -195000 2500]
+       ElementLine [-25000 -190000 -25000 7500 2500]
+       ElementLine [-20000 12500 20000 12500 2500]
+       ElementArc [20000 -190000 5000 5000 180 90 2500]
+       ElementArc [-20001 -195001 1 1 90 90 2500]
+       ElementArc [-20000 -190000 5000 5000 270 90 2500]
+       ElementArc [-19999 7499 5001 5001 0 90 2500]
+       ElementArc [-19999 12501 1 1 270 90 2500]
+       ElementArc [20000 7500 5000 5000 90 90 2500]
+       ElementArc [-14999 -182501 1 1 0 90 1000]
+       ElementArc [-14999 -182501 1 1 0 90 1000]
 
        )
 Layer(1 "component")
@@ -3984,7 +3976,7 @@ NetList()
 (
        Net("analogue__pt4" "Signal")
        (
-               Connect("INDIV0-16")
+               Connect("INDIV0-23")
                Connect("PIC-2")
                Connect("RAP0-3")
        )
@@ -4023,13 +4015,13 @@ NetList()
        )
        Net("extint0__pt7" "Signal")
        (
-               Connect("INDIV0-18")
+               Connect("INDIV0-21")
                Connect("PIC-33")
                Connect("RAP0-6")
        )
        Net("extint1__pt6" "Signal")
        (
-               Connect("INDIV0-6")
+               Connect("INDIV0-8")
                Connect("PIC-34")
                Connect("RAP0-5")
        )
@@ -4052,7 +4044,7 @@ NetList()
        )
        Net("icsp_pcq" "Signal")
        (
-               Connect("INDIV0-1")
+               Connect("INDIV0-13")
                Connect("RPCI-2")
        )
        Net("icsp_pd__pt0" "Signal")
@@ -4102,7 +4094,7 @@ NetList()
                Connect("CAC05-1")
                Connect("CPIC0-1")
                Connect("CPIC1-1")
-               Connect("INDIV0-14")
+               Connect("INDIV0-25")
                Connect("OC0-11")
                Connect("OC0-13")
                Connect("OC0-15")
@@ -4149,12 +4141,12 @@ NetList()
        )
        Net("led_green" "Signal")
        (
-               Connect("INDIV0-15")
+               Connect("INDIV0-24")
                Connect("RLG-2")
        )
        Net("led_red" "Signal")
        (
-               Connect("INDIV0-2")
+               Connect("INDIV0-12")
                Connect("RLR-2")
        )
        Net("led_refhigh" "Signal")
@@ -4197,31 +4189,31 @@ NetList()
        )
        Net("pt3__pwmout" "Signal")
        (
-               Connect("INDIV0-5")
+               Connect("INDIV0-9")
                Connect("PIC-27")
                Connect("RAP0-2")
        )
        Net("pt5__spare0" "Signal")
        (
-               Connect("INDIV0-3")
+               Connect("INDIV0-11")
                Connect("PIC-3")
                Connect("RAP0-4")
        )
        Net("pt8__rs232_rxin" "Signal")
        (
-               Connect("INDIV0-4")
+               Connect("INDIV0-10")
                Connect("PIC-26")
                Connect("RAP0-7")
        )
        Net("pt9__rs232_txout" "Signal")
        (
-               Connect("INDIV0-17")
+               Connect("INDIV0-22")
                Connect("PIC-25")
                Connect("RAP0-8")
        )
        Net("ptdrain0" "Power")
        (
-               Connect("INDIV0-19")
+               Connect("INDIV0-20")
                Connect("PTD0-2")
                Connect("PTFET0-2")
        )
@@ -4233,53 +4225,53 @@ NetList()
        )
        Net("ptdrain10" "Signal")
        (
-               Connect("INDIV0-24")
+               Connect("INDIV0-15")
        )
        Net("ptdrain2" "Power")
        (
-               Connect("INDIV0-20")
+               Connect("INDIV0-19")
                Connect("PTD2-2")
                Connect("PTFET2-2")
        )
        Net("ptdrain3" "Power")
        (
-               Connect("INDIV0-8")
+               Connect("INDIV0-6")
                Connect("PTD3-2")
                Connect("PTFET3-2")
        )
        Net("ptdrain4" "Power")
        (
-               Connect("INDIV0-21")
+               Connect("INDIV0-18")
                Connect("PTD4-2")
                Connect("PTFET4-2")
        )
        Net("ptdrain5" "Power")
        (
-               Connect("INDIV0-9")
+               Connect("INDIV0-5")
                Connect("PTD5-2")
                Connect("PTFET5-2")
        )
        Net("ptdrain6" "Power")
        (
-               Connect("INDIV0-22")
+               Connect("INDIV0-17")
                Connect("PTD6-2")
                Connect("PTFET6-2")
        )
        Net("ptdrain7" "Power")
        (
-               Connect("INDIV0-10")
+               Connect("INDIV0-4")
                Connect("PTD7-2")
                Connect("PTFET7-2")
        )
        Net("ptdrain8" "Power")
        (
-               Connect("INDIV0-23")
+               Connect("INDIV0-16")
                Connect("PTD8-2")
                Connect("PTFET8-2")
        )
        Net("ptdrain9" "Power")
        (
-               Connect("INDIV0-11")
+               Connect("INDIV0-3")
                Connect("PTD9-2")
                Connect("PTFET9-2")
        )

diff --git a/pcb/generate-netspec.pl b/pcb/generate-netspec.pl
index 87de3492f80f6a15513f597269545ff1341c0285..baebdaef03be1b1af7c0f35dc159a750b0ad5157 100755 (executable)
--- a/pcb/generate-netspec.pl
+++ b/pcb/generate-netspec.pl
@@ -75,7 +75,7 @@ if ($reversers) {
        print "RAS2 9 l_vcc @senser[16..23]\n";
 }
 
-print "INDIV0 25 :1%13/2 @indiv\n"; # 26-way ribbon
+print "INDIV0 25 :13-%12/2 @indiv\n"; # 26-way ribbon
 
 $doing= 1;
 

diff --git a/pic.make b/pic.make
index b24a80c07efc9b49c7a9174d96f9f0da09b23bb5..3e1aab6d3e1792a655945948ee37856e4b222496 100644 (file)
--- a/pic.make
+++ b/pic.make
@@ -15,7 +15,7 @@ LAYERS=               $(LAYERS_L) $(LAYERS_E)
 
 LPAGES=         $(foreach x, 0 1 2 3 4 5 6, $(foreach y, 1 2 3 4 5, ours-p0-$xx$y.ps))
 
-default:       ours-a.ps ours-al.ps parts.ps
+default:       netlists picprogs
 layers:                $(LAYERS)
 lpages:                $(LPAGES)
 

diff --git a/spice/Makefile b/spice/Makefile
index b24a80c07efc9b49c7a9174d96f9f0da09b23bb5..3e1aab6d3e1792a655945948ee37856e4b222496 100644 (file)
--- a/spice/Makefile
+++ b/spice/Makefile
@@ -15,7 +15,7 @@ LAYERS=               $(LAYERS_L) $(LAYERS_E)
 
 LPAGES=         $(foreach x, 0 1 2 3 4 5 6, $(foreach y, 1 2 3 4 5, ours-p0-$xx$y.ps))
 
-default:       ours-a.ps ours-al.ps parts.ps
+default:       netlists picprogs
 layers:                $(LAYERS)
 lpages:                $(LPAGES)