checkpoint

diff --git a/src/edu/berkeley/obits/AtmelSerial.java b/src/edu/berkeley/obits/AtmelSerial.java
index 3216a3a..5bb4222 100644 (file)
--- a/src/edu/berkeley/obits/AtmelSerial.java
+++ b/src/edu/berkeley/obits/AtmelSerial.java
@@ -290,27 +290,39 @@ public class AtmelSerial {
             cell.oe(NONE);
             cell.ylut(0xff);
             */
-            for(int x=0; x<10; x++)
-                for(int y=20; y<23; y++) {
+            int fail = 0;
+            //int x = 5;
+            //int y = 11;
+
+            for(int x=0; x<24; x++)
+                for(int y=0; y<24; y++) {
+
+                    cell = at40k.cell(x,y);
                     scan(at40k, cell, YLUT, true);
                     //v.paint(img.getGraphics());
                     //v.getGraphics().drawImage(img, 0, 0, null);
-                    cell.ylut(0xff);
-                    cell.c(YLUT);
-                    cell.b(false);
-                    cell.f(false);
-                    cell.ylut(0xff);
-                    cell.ylut(0xff);
-                    cell.ylut(0xff);
-                    cell.ylut(0xff);
                     //try { Thread.sleep(1000); } catch (Exception e) { }
-                    int a = device.readBus();
+                    cell.ylut(0xff);
+                    boolean a = (device.readBus() & 0x80)!=0;
                     cell.ylut(0x00);
-                    int b = device.readBus();
+                    boolean b = (device.readBus() & 0x80)!=0;
+                    if (a & !b) {
+                        System.out.println("pass " + x+","+y);
+                        Graphics g = v.getGraphics();
+                        g.setColor(Color.green);
+                        g.drawString("pass", v.left(cell) + 10, v.top(cell) + 20);
+                    } else {
+                        System.out.println("FAIL!!!! " + x+","+y+" => " + a + " " + b);
+                        fail++;
+                        Graphics g = v.getGraphics();
+                        g.setColor(Color.red);
+                        g.drawString("FAIL", v.left(cell) + 10, v.top(cell) + 20);
+                    }
+
                     scan(at40k, cell, YLUT, false);
-                    System.out.println("scan " + x+","+y+" => " + a + " " + b);
                 }
 
+            System.out.println("failures: " + fail);
             for(int i=0; i<10000; i++) {
                 v.refresh();
                 try { Thread.sleep(100); } catch (Exception e) { }
@@ -410,14 +422,14 @@ public class AtmelSerial {
         cell.out(L3, setup);
 
         At40k.SectorWire sw = cell.vwire(L3);
-        //System.out.println("wire is: " + sw);
+        System.out.println("wire is: " + sw);
         while(sw.row > (12 & ~0x3) && sw.south() != null) {
-            //System.out.println(sw + " -> " + sw.south());
+            System.out.println(sw + " -> " + sw.south());
             sw.drives(sw.south(), setup);
             sw = sw.south();
         }
         while(sw.row < (12 & ~0x3) && sw.north() != null) {
-            //System.out.println(sw + " -> " + sw.north());
+            System.out.println(sw + " -> " + sw.north());
             sw.drives(sw.north(), setup);
             sw = sw.north();
         }
@@ -437,7 +449,7 @@ public class AtmelSerial {
         cell.v(L3, setup);
         sw = cell.hwire(L3);
         while(sw.east() != null) {
-            //System.out.println(sw + " -> " + sw.east());
+            System.out.println(sw + " -> " + sw.east());
             sw.drives(sw.east(), setup);
             sw = sw.east();
         }
@@ -532,8 +544,8 @@ public class AtmelSerial {
                 g.drawString("D"+i,  (24*(WIDTH+2))+20, ((23-(i+7))*(HEIGHT+2))+60-HEIGHT/2);
             }
         }
-        public int left(At40k.Cell cell) { return (cell.col)   *(WIDTH+2)+20; }
-        public int top(At40k.Cell cell)  { return (23-cell.row)*(HEIGHT+2)+60; }
+        public static int left(At40k.Cell cell) { return (cell.col)   *(WIDTH+2)+20; }
+        public static int top(At40k.Cell cell)  { return (23-cell.row)*(HEIGHT+2)+60; }
         public void drawSector(Graphics g, At40k.Sector sector) {
             g.setColor(Color.gray);
             ((Graphics2D)g).setStroke(new BasicStroke(1));

diff --git a/src/edu/berkeley/obits/device/atmel/At40k.java b/src/edu/berkeley/obits/device/atmel/At40k.java
index 6a98c5d..50b0882 100644 (file)
--- a/src/edu/berkeley/obits/device/atmel/At40k.java
+++ b/src/edu/berkeley/obits/device/atmel/At40k.java
@@ -52,13 +52,13 @@ public class At40k {
             this.row=!horizontal ? (row & ~0x3) : row;
         }
         private int z(int z)       { return (horizontal ? 0x30 : 0x20) | z; }
-        public int code(boolean left) {
+        public int code(boolean topleft) {
             switch(plane) {
-                case 0: return z(6)+(left?0:1);
-                case 1: return z(8)+(left?0:1);
-                case 2: return z(2*(4-plane))+(left?0:1);
-                case 3: return z(2*(4-plane))+(left?0:1);
-                case 4: return z(2*(4-plane))+(left?0:1);
+                case 0: return z(6)+(topleft?0:1);
+                case 1: return z(8)+(topleft?0:1);
+                case 2: return z(2*(4-plane))+(topleft?0:1);
+                case 3: return z(2*(4-plane))+(topleft?0:1);
+                case 4: return z(2*(4-plane))+(topleft?0:1);
             }
             throw new Error();
         }
@@ -80,15 +80,18 @@ public class At40k {
                 "x"+plane;
         }
 
-        /** returns the ZYX0 coordinate of the byte controlling the switchbox that bridges this wire to <tt>w</tt> */
+        /** returns the ZYX0 coordinate of the byte controlling the switchbox that allows <tt>w</tt> to drive this wire */
         public int switchbox(SectorWire w) {
             if (w.horizontal==horizontal) {
                 if (w.plane!=plane) throw new Error();
                 if (Math.abs(w.coarse()-coarse())!=4) throw new Error(w.coarse() + " -- " + coarse());
-                if (w.coarse() < coarse()) return w.switchbox(this);
-                boolean topleft = w.coarse() < coarse();
+                boolean topleft = horizontal ? (w.coarse() < coarse()) : (w.coarse() > coarse());
+                //if (w.coarse() < coarse()) return w.switchbox(this);
+                //if (topleft) return w.switchbox(this);
                 int col = _col() + (( horizontal && !topleft) ? 1 : 0);
-                int row = _row() + ((!horizontal && !topleft) ? 1 : 0);
+                //if (!horizontal) topleft = !topleft;
+                int row = _row() + ((!horizontal &&  topleft) ? 1 : 0);
+                //if (!horizontal) topleft = !topleft;
                 return (code(topleft) << 24) | (row<<16) | (col<<8);
             }
             throw new Error("not implemented");