X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fslipway%2Fgui%2FGui.java;h=c218649765da9a92d8262d32dd14a78aea0bf1e9;hb=daff49a8da20b577ab7af4a2e52b5901fbcbf9a9;hp=37bfaf54248095f42c98d1d6bb0eb8ca6699b551;hpb=57f6ad104a6e2bf0433a86f5c8e1f31c1715dab9;p=slipway.git

diff --git a/src/edu/berkeley/slipway/gui/Gui.java b/src/edu/berkeley/slipway/gui/Gui.java
index 37bfaf5..c218649 100644
--- a/src/edu/berkeley/slipway/gui/Gui.java
+++ b/src/edu/berkeley/slipway/gui/Gui.java
@@ -60,11 +60,17 @@ public class Gui extends ZoomingPanel implements KeyListener, MouseMotionListene
         this.drone = drone;
         for(int i=0; i<ca.length; i++)
             ca[i] = new Cell[128];
-        for(int x=7; x<17; x++)
-            for(int y=7; y<17; y++)
-                new Cell(x-7,y-7, at40k.cell(x, y));
+        for(int x=9; x<14; x++)
+            for(int y=19; y<at40k.getHeight(); y++)
+                new Cell(x,y, at40k.cell(x, y));
+
+
+        new Thread() {
+            public void run() {
+                while(true) scan();
+            }
+        }.start();
 
-        scan();
         /*
         Fpslic.Cell c = at40k.cell(0,0);
         for(int i=0; i<256; i++) {
@@ -77,6 +83,7 @@ public class Gui extends ZoomingPanel implements KeyListener, MouseMotionListene
     public class Cell {
         Fpslic.Cell cell;
         boolean in = false;
+        public boolean scanme = false;
         public boolean xon = false;
         public boolean yon = false;
         public boolean xknown = false;
@@ -90,7 +97,7 @@ public class Gui extends ZoomingPanel implements KeyListener, MouseMotionListene
             cells.add(this);
         }
         public void clear() {
-            gg.color(in ? selectedcell : nonselectedcell);
+            gg.color(in ? selectedcell : (scanme ? new Color(0xbb, 0xbb, 0xbb) : nonselectedcell));
             g.fillRect(0, 0, SIZE, SIZE);
         }
         public void draw() {
@@ -713,16 +720,16 @@ public class Gui extends ZoomingPanel implements KeyListener, MouseMotionListene
     }
 
     public void scan() {
-        System.out.println("scan");
-        for(int x=2; x<6; x++)
-            for(int y=2; y<6; y++)
+        for(int x=0; x<at40k.getWidth(); x++)
+            for(int y=0; y<at40k.getHeight(); y++)
                 if (ca[x][y] != null)
-                    scan(ca[x][y]);
+                    if (ca[x][y].scanme)
+                        scan(ca[x][y]);
     }
     public void scan(final Gui.Cell c) {
         try {
             final Fpslic.Cell cell = c.cell;
-            Demo.scan(at40k, cell, NONE, true);
+            scan(at40k, cell, NONE, true);
             boolean safe = !cell.fb_relevant();
             if (cell.xo()) safe = false;
             if (cell.yo()) safe = false;
@@ -734,25 +741,117 @@ public class Gui extends ZoomingPanel implements KeyListener, MouseMotionListene
                 if (cell.xlut_relevant()) {
                     cell.c(XLUT);
                     drone.readBus(new BCB(c, XLUT));
+                } else {
+                    c.xknown = false;
                 }
                 if (cell.ylut_relevant()) {
                     cell.c(YLUT);
                     drone.readBus(new BCB(c, YLUT));
+                } else {
+                    c.yknown = false;
                 }
                 cell.c(oldc);
             } else {
                 switch(cell.c()) {
-                    case XLUT: if (cell.xlut_relevant()) drone.readBus(new BCB(c, XLUT)); break;
-                    case YLUT: if (cell.ylut_relevant()) drone.readBus(new BCB(c, YLUT)); break;
+                    case XLUT:
+                        if (!cell.xlut_relevant()) {
+                            c.xknown = false;
+                        } else {
+                            drone.readBus(new BCB(c, XLUT));
+                        }
+                        for(Fpslic.Cell c2 : new Fpslic.Cell[] { cell.north(), cell.south(), cell.east(), cell.west() })
+                            if (c2!=null && !c2.relevant()) {
+                                scan(at40k, cell, NONE, false);
+                                c2.yo(cell);
+                                scan(at40k, c2, NONE, true);
+                                c2.c(YLUT);
+                                drone.readBus(new BCB(c, YLUT));
+                                scan(at40k, c2, NONE, false);
+                                c2.yi(NONE);
+                                return;
+                            }
+                        c.yknown = false;
+                        break;
+                    case YLUT:
+                        if (!cell.ylut_relevant()) {
+                            c.yknown = false;
+                        } else {
+                            drone.readBus(new BCB(c, YLUT));
+                        }
+                        for(Fpslic.Cell c2 : new Fpslic.Cell[] { cell.nw(), cell.sw(), cell.ne(), cell.se() })
+                            if (c2!=null && !c2.relevant()) {
+                                scan(at40k, cell, NONE, false);
+                                c2.xo(cell);
+                                scan(at40k, c2, NONE, true);
+                                c2.c(XLUT);
+                                drone.readBus(new BCB(c, XLUT));
+                                scan(at40k, c2, NONE, false);
+                                c2.xi(NONE);
+                                return;
+                            }
+                        c.xknown = false;
+                        break;
                 }
                 
             }
-            Demo.scan(at40k, cell, NONE, false);
+            scan(at40k, cell, NONE, false);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
     }
 
+    public static void scan(Fpslic dev, Fpslic.Cell cell, int source, boolean setup) {
+        if (setup) {
+            if (source != NONE) cell.c(source);
+            if (cell.b()) cell.b(false);
+            if (cell.f()) cell.f(false);
+        }
+        if (cell.out(L3)!=setup) cell.out(L3, setup);
+        if (cell.vx(L3)!=setup) cell.v(L3, setup);
+
+        Fpslic.SectorWire sw = cell.vwire(L3);
+        //System.out.println("wire is: " + sw);
+
+        if (sw.row > (12 & ~0x3) && sw.north()!=null && sw.north().drives(sw))
+            sw.north().drives(sw, false);
+        while(sw.row > (12 & ~0x3) && sw.south() != null) {
+            //System.out.println(sw + " -> " + sw.south());
+            if (sw.drives(sw.south())!=setup) sw.drives(sw.south(), setup);
+            sw = sw.south();
+        }
+        if (sw.row < (12 & ~0x3) && sw.south() != null && sw.south().drives(sw))
+            sw.north().drives(sw, false);
+        while(sw.row < (12 & ~0x3) && sw.north() != null) {
+            //System.out.println(sw + " -> " + sw.north());
+            if (sw.drives(sw.north())!=setup) sw.drives(sw.north(), setup);
+            sw = sw.north();
+        }
+
+        //cell = dev.cell(19, 15);
+        cell = dev.cell(cell.col, 15);
+        /*
+        System.out.println("cell is " + cell);
+        cell.xlut(0xff);
+        cell.ylut(0xff);
+        cell.b(false);
+        cell.f(false);
+        cell.c(XLUT);
+        cell.out(L3, true);
+        cell.oe(NONE);
+        */
+        if (cell.hx(L3) != setup) cell.h(L3, setup);
+        if (cell.vx(L3) != setup) cell.v(L3, setup);
+        sw = cell.hwire(L3);
+
+        if (sw.west()!=null && sw.west().drives(sw)) { sw.west().drives(sw, false); }
+        while(sw.east() != null) {
+            //System.out.println(sw + " -> " + sw.east());
+            if (sw.drives(sw.east())!=setup) sw.drives(sw.east(), setup);
+            sw = sw.east();
+        }
+
+    }
+
 
     int made = 0;
     private class BCB extends FtdiBoard.ByteCallback {
@@ -761,13 +860,9 @@ public class Gui extends ZoomingPanel implements KeyListener, MouseMotionListene
         public BCB(Gui.Cell c, int who) {
             this.who = who; this.c = c;
             made++;
-            System.out.println("made="+made);
         }
         public void call(byte b) throws Exception {
-            System.out.println("callback: " + b);
             boolean on = (b & 0x80) != 0;
-            c.xknown = false;
-            c.yknown = false;
             switch(who) {
                 case YLUT:
                     c.yknown = true;
@@ -781,8 +876,6 @@ public class Gui extends ZoomingPanel implements KeyListener, MouseMotionListene
                     break;
             }
             made--;
-            System.out.println("made="+made);
-            if (made==0) scan();
         }
     }