X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fslipway%2FDemo.java;h=3df2767aa662e2646d56ebe7d621536e5313f76e;hb=daff49a8da20b577ab7af4a2e52b5901fbcbf9a9;hp=4fb97ac6b4b6918b53b530dff9bb394718c94b14;hpb=304b5fd54ac37294709cf761e5d69b8731b878a8;p=slipway.git

diff --git a/src/edu/berkeley/slipway/Demo.java b/src/edu/berkeley/slipway/Demo.java
index 4fb97ac..3df2767 100644
--- a/src/edu/berkeley/slipway/Demo.java
+++ b/src/edu/berkeley/slipway/Demo.java
@@ -15,29 +15,76 @@ import gnu.io.*;
 
 public class Demo {
 
-    //public static boolean mullers = false;
     public static boolean mullers = true;
     public static int masterx = 1;
-    public static SerialPort detectObitsPort() throws Exception {
-        Enumeration e = CommPortIdentifier.getPortIdentifiers();
-        while(e.hasMoreElements()) {
-            CommPortIdentifier cpi = (CommPortIdentifier)e.nextElement();
-            Log.info(Demo.class, "trying " + cpi.getName());
-            if (cpi.getName().startsWith("/dev/cu.usbserial-"))
-                return new RXTXPort(cpi.getName());
-            if (cpi.getName().startsWith("/dev/ttyS0"))
-                return new RXTXPort(cpi.getName());
-        }
-        Log.info(Demo.class, "returning null...");
-        return null;
-    }
+
     public static int PIPELEN=20;
+
     public static void main(String[] s) throws Exception {
         FtdiBoard device = new FtdiBoard();
         Fpslic at40k = device;
+
+        long begin = System.currentTimeMillis();
+        //FpslicUtil.readMode4(new ProgressInputStream("configuring fabric", System.in, 111740), device);
+        long end = System.currentTimeMillis();
+        Log.info(Demo.class, "finished in " + ((end-begin)/1000) + "s");
+        Thread.sleep(1000);
+        Log.info(Demo.class, "issuing command");
+
+        for(int i=0; i<24; i++) {
+            at40k.iob_bot(i, true).enableOutput(NORTH);
+            at40k.iob_bot(i, false).enableOutput(NW);
+            at40k.cell(i, 0).xlut(0xff);
+            at40k.cell(i, 0).ylut(0xff);
+        }
+
+        at40k.cell(23,15).h(3, true);
+        at40k.cell(23,15).yi(L3);
+        at40k.cell(23,15).ylut(0xAA);
+        at40k.iob_right(15, true).enableOutput(WEST);
+
+        device.flush();
+
+        Fpslic.Cell root = at40k.cell(10,20);
+            
+        root.yo(root.north());
+        root.ylut(~LUT_SELF);
+        root.c(YLUT);
+        root = root.north();
+
+        root.yo(root.east());
+        root.ylut(~LUT_SELF);
+        root.c(YLUT);
+        root = root.east();
+
+        root.yo(root.south());
+        root.ylut(~LUT_SELF);
+        root.c(YLUT);
+        root = root.south();
+
+        root.yo(root.west());
+        root.c(YLUT);
+        root = root.west();
+
+        Gui vis = new Gui(at40k, device);
+        Frame fr = new Frame();
+        fr.addKeyListener(vis);
+        fr.setLayout(new BorderLayout());
+        fr.add(vis, BorderLayout.CENTER);
+        fr.pack();
+        fr.setSize(900, 900);
+        vis.repaint();
+        fr.repaint();
+        fr.show();
+        synchronized(Demo.class) { Demo.class.wait(); }
+    }
+
+    public static void mainw(String[] s) throws Exception {
+        FtdiBoard device = new FtdiBoard();
+        Fpslic at40k = device;
         try {
             long begin = System.currentTimeMillis();
-            FpslicUtil.readMode4(new ProgressInputStream("configuring fabric", System.in, 111740), device);
+            //FpslicUtil.readMode4(new ProgressInputStream("configuring fabric", System.in, 111740), device);
             long end = System.currentTimeMillis();
             Log.info(Demo.class, "finished in " + ((end-begin)/1000) + "s");
             Thread.sleep(1000);
@@ -50,85 +97,85 @@ public class Demo {
             // this command confirmed to turn *on* led0
             //at40k.iob_top(1, false).output(0);
             /*
-            for(int i=0; i<20; i++) {
-                at40k.iob_bot(i, false).output(0);
-                at40k.iob_bot(i, true).output(0);
-            }
+              for(int i=0; i<20; i++) {
+              at40k.iob_bot(i, false).output(0);
+              at40k.iob_bot(i, true).output(0);
+              }
             */
 
             //System.out.println("tick");
-                //Thread.sleep(3000);
-                //System.out.println("tick");
-                //at40k.cell(0x01, 0x17).xlut((byte)0x);
+            //Thread.sleep(3000);
+            //System.out.println("tick");
+            //at40k.cell(0x01, 0x17).xlut((byte)0x);
 
             /*
-            System.out.println(Integer.toString(0xff & at40k.cell(0x01, 0x17).xlut(), 16));
-            System.out.println(Integer.toString(0xff & at40k.cell(0x01, 0x17).ylut(), 16));
-            at40k.cell(0x01, 0x17).ylut((byte)0xff);
+              System.out.println(Integer.toString(0xff & at40k.cell(0x01, 0x17).xlut(), 16));
+              System.out.println(Integer.toString(0xff & at40k.cell(0x01, 0x17).ylut(), 16));
+              at40k.cell(0x01, 0x17).ylut((byte)0xff);
             */
 
             //at40k.cell(0x01, 0x17).wi(L1);
             /*
-            System.out.println("a: " + at40k.new SectorWire(true, 0, 4, 0x17).driverRight());
-            System.out.println("b: " + at40k.new SectorWire(true, 1, 4, 0x17).driverRight());
-            Fpslic.SectorWire h0p0 = at40k.new SectorWire(true, 0, 0, 0x17);
-            Fpslic.SectorWire h0p1 = at40k.new SectorWire(true, 1, 0, 0x17);
-            Fpslic.SectorWire h0p2 = at40k.new SectorWire(true, 2, 0, 0x17);
-            Fpslic.SectorWire h4p0 = at40k.new SectorWire(true, 0, 4, 0x17);
-            Fpslic.SectorWire h4p1 = at40k.new SectorWire(true, 1, 4, 0x17);
-            Fpslic.SectorWire h4p2 = at40k.new SectorWire(true, 2, 4, 0x17);
-
-            //h4p1.drives(h0p1, false);
-            //at40k.cell(0x04, 0x17).out(L1, false);
-            //at40k.cell(0x04, 0x17).h(L0, false);
-
-            for(int plane=0; plane<5; plane++) {
-                at40k.new SectorWire(true, plane,     4, 0x17).drives(at40k.new SectorWire(true, plane,     0, 0x17), false);
-                at40k.cell(0x04, 0x17).out(plane, false);
-                at40k.cell(0x04, 0x17).h(plane, false);
-                at40k.cell(0x01, 0x17).h(plane, false);
-            }
-            try { Thread.sleep(2000); } catch (Exception e) { }
-
-            int plane=0;
-            at40k.new SectorWire(true, plane, 4, 0x17).drives(at40k.new SectorWire(true, plane, 0, 0x17), true);
-            at40k.cell(0x04, 0x17).out(plane, true);
-            at40k.cell(0x04, 0x17).h(plane, true);
-            at40k.cell(0x01, 0x17).h(plane, true);
-            at40k.cell(0x01, 0x17).wi(plane);
+              System.out.println("a: " + at40k.new SectorWire(true, 0, 4, 0x17).driverRight());
+              System.out.println("b: " + at40k.new SectorWire(true, 1, 4, 0x17).driverRight());
+              Fpslic.SectorWire h0p0 = at40k.new SectorWire(true, 0, 0, 0x17);
+              Fpslic.SectorWire h0p1 = at40k.new SectorWire(true, 1, 0, 0x17);
+              Fpslic.SectorWire h0p2 = at40k.new SectorWire(true, 2, 0, 0x17);
+              Fpslic.SectorWire h4p0 = at40k.new SectorWire(true, 0, 4, 0x17);
+              Fpslic.SectorWire h4p1 = at40k.new SectorWire(true, 1, 4, 0x17);
+              Fpslic.SectorWire h4p2 = at40k.new SectorWire(true, 2, 4, 0x17);
+
+              //h4p1.drives(h0p1, false);
+              //at40k.cell(0x04, 0x17).out(L1, false);
+              //at40k.cell(0x04, 0x17).h(L0, false);
+
+              for(int plane=0; plane<5; plane++) {
+              at40k.new SectorWire(true, plane,     4, 0x17).drives(at40k.new SectorWire(true, plane,     0, 0x17), false);
+              at40k.cell(0x04, 0x17).out(plane, false);
+              at40k.cell(0x04, 0x17).h(plane, false);
+              at40k.cell(0x01, 0x17).h(plane, false);
+              }
+              try { Thread.sleep(2000); } catch (Exception e) { }
+
+              int plane=0;
+              at40k.new SectorWire(true, plane, 4, 0x17).drives(at40k.new SectorWire(true, plane, 0, 0x17), true);
+              at40k.cell(0x04, 0x17).out(plane, true);
+              at40k.cell(0x04, 0x17).h(plane, true);
+              at40k.cell(0x01, 0x17).h(plane, true);
+              at40k.cell(0x01, 0x17).wi(plane);
 
             */
 
             /*
-            System.out.println("xlut is " + hex(at40k.cell(0x04, 0x17).xlut()));
-            System.out.println("ylut is " + hex(at40k.cell(0x04, 0x17).ylut()));
-            Fpslic.Cell cell = at40k.cell(0x04, 0x17);
-            //cell.xlut(0xff);
-            //cell.f(false);
-            System.out.println(cell.c());
-            cell.c(YLUT);
-            cell.ylut(0x4D);
-            cell.xlut(0x00);
-
-            cell.b(false);
-            cell.f(false);
-            //cell.t(false, false, true);
-            cell.t(false, true, false);
-            cell.out(L3, true);
-            cell.wi(L3);
-
-            cell.yo(false);
-            cell.h(L0, false);
-            cell.h(L1, false);
-            cell.h(L2, false);
-            cell.h(L3, false);
-            cell.h(L4, false);
-
-            for(int i=3; i>=1; i--) {
-                at40k.cell(i, 0x17).yi(EAST);
-                at40k.cell(i, 0x17).ylut(0x55);
-                at40k.cell(i, 0x17).yo(false);
-            }
+              System.out.println("xlut is " + hex(at40k.cell(0x04, 0x17).xlut()));
+              System.out.println("ylut is " + hex(at40k.cell(0x04, 0x17).ylut()));
+              Fpslic.Cell cell = at40k.cell(0x04, 0x17);
+              //cell.xlut(0xff);
+              //cell.f(false);
+              System.out.println(cell.c());
+              cell.c(YLUT);
+              cell.ylut(0x4D);
+              cell.xlut(0x00);
+
+              cell.b(false);
+              cell.f(false);
+              //cell.t(false, false, true);
+              cell.t(false, true, false);
+              cell.out(L3, true);
+              cell.wi(L3);
+
+              cell.yo(false);
+              cell.h(L0, false);
+              cell.h(L1, false);
+              cell.h(L2, false);
+              cell.h(L3, false);
+              cell.h(L4, false);
+
+              for(int i=3; i>=1; i--) {
+              at40k.cell(i, 0x17).yi(EAST);
+              at40k.cell(i, 0x17).ylut(0x55);
+              at40k.cell(i, 0x17).yo(false);
+              }
             */
 
             //System.out.println("reading port status: " + Integer.toString(device.readBus() & 0xff, 16));
@@ -136,10 +183,10 @@ public class Demo {
 
             // blank these out
             /*
-            at40k.cell(23, 8).ylut(0xff);
-            at40k.cell(23, 11).ylut(0xff);
-            at40k.iob_right(8, true).enableOutput();
-            at40k.iob_right(11, true).enableOutput();
+              at40k.cell(23, 8).ylut(0xff);
+              at40k.cell(23, 11).ylut(0xff);
+              at40k.iob_right(8, true).enableOutput();
+              at40k.iob_right(11, true).enableOutput();
             */
             //for(int x=4;  x<=22; x++) swap(at40k.cell(x, 22), NW, NORTH);
 
@@ -150,86 +197,110 @@ public class Demo {
             //at40k.cell(4,23).ylut(at40k.cell(4,23).xlut());
             //at40k.cell(4,23).xo(false);
             /*
-            at40k.cell(4,23).xlut(0x55);
-            at40k.cell(4,23).ylut(0x55);
+              at40k.cell(4,23).xlut(0x55);
+              at40k.cell(4,23).ylut(0x55);
             */
             /*
-            at40k.cell(4,23).xlut(0x71);
-            at40k.cell(4,23).ylut(0x44);
-            at40k.cell(4,23).c(YLUT);
-            at40k.cell(4,23).f(false);
-            at40k.cell(4,23).t(false, false, true);
+              at40k.cell(4,23).xlut(0x71);
+              at40k.cell(4,23).ylut(0x44);
+              at40k.cell(4,23).c(YLUT);
+              at40k.cell(4,23).f(false);
+              at40k.cell(4,23).t(false, false, true);
             */
 
             //for(int x=6;  x<=23; x++) copy(at40k.cell(x, 23), NW, WEST);  // top row copies to the right
             /*
-            copy(at40k.cell(5, 22), NW, NORTH);
-            for(int x=6;  x<=22; x++) copy(at40k.cell(x, 22), NW, WEST);  // second top row copies to the right
-            //for(int y=22; y>=10; y--) copy(at40k.cell(23, y), NW, NORTH); // right edge copies down
-            for(int y=21; y>=9;  y--) copy(at40k.cell(22, y), NW, NORTH); // second right edge copies down
-            copy(at40k.cell(23, 9), NW, WEST);                            // second output
+              copy(at40k.cell(5, 22), NW, NORTH);
+              for(int x=6;  x<=22; x++) copy(at40k.cell(x, 22), NW, WEST);  // second top row copies to the right
+              //for(int y=22; y>=10; y--) copy(at40k.cell(23, y), NW, NORTH); // right edge copies down
+              for(int y=21; y>=9;  y--) copy(at40k.cell(22, y), NW, NORTH); // second right edge copies down
+              copy(at40k.cell(23, 9), NW, WEST);                            // second output
             */
             /*
-            handshaker(at40k.cell(4,23));
-            at40k.cell(4,23).xi(NW);
-            at40k.cell(4,23).yi(SOUTH);
-
-            //handshaker(at40k.cell(5,23));
-            //at40k.cell(5,23).yi(NORTH);
-
-            at40k.cell(5,23).yi(NORTH);
-            at40k.cell(5,23).xlut(0x55);
-            at40k.cell(5,23).xi(SW);
-            at40k.cell(5,23).ylut(0x55);
-            at40k.cell(5,22).yi(NORTH);
-            at40k.cell(5,22).xlut(0x55);
-
-            bounce(at40k.cell(4,22));
-
-            // cell southeast of entry cell
-            at40k.cell(3,22).xi(NE);      // NW->xin
-            at40k.cell(3,22).ylut(0x33);  // xin->y
-            at40k.cell(3,22).yo(false);   // y->yout
-            copy(at40k.cell(3, 21), NW, NORTH);  // second top row copies to the right
-            copy(at40k.cell(4, 21), NW, EAST);  // second top row copies to the right
-            copy(at40k.cell(5, 21), NW, EAST);  // second top row copies to the right
-            copy(at40k.cell(6, 21), NW, EAST);  // second top row copies to the right
-            copy(at40k.cell(6, 22), NW, SOUTH);  // second top row copies to the right
+              handshaker(at40k.cell(4,23));
+              at40k.cell(4,23).xi(NW);
+              at40k.cell(4,23).yi(SOUTH);
+
+              //handshaker(at40k.cell(5,23));
+              //at40k.cell(5,23).yi(NORTH);
+
+              at40k.cell(5,23).yi(NORTH);
+              at40k.cell(5,23).xlut(0x55);
+              at40k.cell(5,23).xi(SW);
+              at40k.cell(5,23).ylut(0x55);
+              at40k.cell(5,22).yi(NORTH);
+              at40k.cell(5,22).xlut(0x55);
+
+              bounce(at40k.cell(4,22));
+
+              // cell southeast of entry cell
+              at40k.cell(3,22).xi(NE);      // NW->xin
+              at40k.cell(3,22).ylut(0x33);  // xin->y
+              at40k.cell(3,22).yo(false);   // y->yout
+              copy(at40k.cell(3, 21), NW, NORTH);  // second top row copies to the right
+              copy(at40k.cell(4, 21), NW, EAST);  // second top row copies to the right
+              copy(at40k.cell(5, 21), NW, EAST);  // second top row copies to the right
+              copy(at40k.cell(6, 21), NW, EAST);  // second top row copies to the right
+              copy(at40k.cell(6, 22), NW, SOUTH);  // second top row copies to the right
             */
             /*
-            at40k.cell(05,22).xlut(0xff);
-            at40k.cell(05,22).ylut(0xff);
-            at40k.cell(05,22).c(XLUT);
-            at40k.cell(05,22).f(false);
-            at40k.cell(05,22).b(false);
-            at40k.cell(05,22).oe(NONE);
-            at40k.cell(05,22).v(L3, true);
-            at40k.cell(05,22).out(L3, true);
+              at40k.cell(05,22).xlut(0xff);
+              at40k.cell(05,22).ylut(0xff);
+              at40k.cell(05,22).c(XLUT);
+              at40k.cell(05,22).f(false);
+              at40k.cell(05,22).b(false);
+              at40k.cell(05,22).oe(NONE);
+              at40k.cell(05,22).v(L3, true);
+              at40k.cell(05,22).out(L3, true);
             */
             /*
-            at40k.cell(4,23).ylut(~0xCC);
-            at40k.cell(4,23).xlut(~0xAA);
-            at40k.cell(5,23).ylut(~0xAA);
-            at40k.cell(5,23).xlut(~0xAA);
-            for(int i=6; i<PIPELEN+2; i++) {
-                at40k.cell(i, 23).ylut(0xAA);
-                at40k.cell(i, 23).xlut(0xCC);
-                at40k.cell(i, 23).yi(WEST);
-            }
+              at40k.cell(4,23).ylut(~0xCC);
+              at40k.cell(4,23).xlut(~0xAA);
+              at40k.cell(5,23).ylut(~0xAA);
+              at40k.cell(5,23).xlut(~0xAA);
+              for(int i=6; i<PIPELEN+2; i++) {
+              at40k.cell(i, 23).ylut(0xAA);
+              at40k.cell(i, 23).xlut(0xCC);
+              at40k.cell(i, 23).yi(WEST);
+              }
             */
 
             /* LAST
-            System.out.println("doit");
-            if (mullers) doitx(at40k, device);
-            //System.out.println("counter");
-            //counter(at40k, device);
+               System.out.println("doit");
+               if (mullers) doitx(at40k, device);
+               //System.out.println("counter");
+               //counter(at40k, device);
 
-            at40k.cell(21,15).yi(WEST);
-            at40k.cell(21,15).ylut(0xAA);
+               at40k.cell(21,15).yi(WEST);
+               at40k.cell(21,15).ylut(0xAA);
 
-            at40k.cell(22,15).yi(WEST);
-            at40k.cell(22,15).ylut(0xAA);
+               at40k.cell(22,15).yi(WEST);
+               at40k.cell(22,15).ylut(0xAA);
             */
+
+            Fpslic.Cell root = at40k.cell(10,20);
+            
+            root.yo(root.north());
+            root.ylut(~LUT_SELF);
+            root.c(YLUT);
+            root = root.north();
+
+            root.yo(root.east());
+            root.ylut(~LUT_SELF);
+            root.c(YLUT);
+            root = root.east();
+
+            root.yo(root.south());
+            root.ylut(~LUT_SELF);
+            root.c(YLUT);
+            root = root.south();
+
+            root.yo(root.west());
+            root.c(YLUT);
+            root = root.west();
+
+            //////////////////////////////////////////////////////////////////////////////
+
             at40k.cell(23,15).h(3, true);
             at40k.cell(23,15).yi(L3);
             at40k.cell(23,15).ylut(0xAA);
@@ -343,14 +414,14 @@ public class Demo {
 
             // catch a rising transition
             /*
-            c = c.west();
-            c.v(L2, false);
-            c.h(L2, true);
-            c.out(L2, true);
-            c.f(false);
-            c.b(false);
-            c.oe(NONE);
-            c.c(YLUT);
+              c = c.west();
+              c.v(L2, false);
+              c.h(L2, true);
+              c.out(L2, true);
+              c.f(false);
+              c.b(false);
+              c.oe(NONE);
+              c.c(YLUT);
             */
             c.hwire(L2).west().drives(c.hwire(L2), false);
             c.hwire(L2).east().drives(c.hwire(L2), false);
@@ -410,60 +481,60 @@ public class Demo {
             //}
 
             /*
-            at40k.cell(22,11).ylut(0xff);
-            at40k.cell(23,11).yi(L3);
-            //at40k.cell(23,11).yi(WEST);
-            //at40k.cell(23,11).xi(L1);
-            at40k.cell(23,11).ylut(0xAA);
-            at40k.iob_right(11, true).enableOutput(WEST);
-            at40k.cell(23,11).v(L3, true);
-            at40k.cell(23,11).yo(false);
-            //at40k.flush();
-            */
+              at40k.cell(22,11).ylut(0xff);
+              at40k.cell(23,11).yi(L3);
+              //at40k.cell(23,11).yi(WEST);
+              //at40k.cell(23,11).xi(L1);
+              at40k.cell(23,11).ylut(0xAA);
+              at40k.iob_right(11, true).enableOutput(WEST);
+              at40k.cell(23,11).v(L3, true);
+              at40k.cell(23,11).yo(false);
+              //at40k.flush();
+              */
             int vx=04;
             int vv=23;
             /*
-            System.out.println("correct: " + at40k.cell(19,15).hwire(L3) + " drives " + at40k.cell(20,15).hwire(L3));
-            System.out.println("correct: " + at40k.cell(15,15).hwire(L3) + " drives " + at40k.cell(19,15).hwire(L3));
-            System.out.println("correct: " + at40k.cell(11,15).hwire(L3) + " drives " + at40k.cell(15,15).hwire(L3));
-            System.out.println("correct: " + at40k.cell(07,15).hwire(L3) + " drives " + at40k.cell(11,15).hwire(L3));
-
-            at40k.cell(19,15).hwire(L3).drives(at40k.cell(20,15).hwire(L3), true);
-            at40k.cell(15,15).hwire(L3).drives(at40k.cell(19,15).hwire(L3), true);
-            at40k.cell(11,15).hwire(L3).drives(at40k.cell(15,15).hwire(L3), true);
-            at40k.cell(07,15).hwire(L3).drives(at40k.cell(11,15).hwire(L3), true);
+              System.out.println("correct: " + at40k.cell(19,15).hwire(L3) + " drives " + at40k.cell(20,15).hwire(L3));
+              System.out.println("correct: " + at40k.cell(15,15).hwire(L3) + " drives " + at40k.cell(19,15).hwire(L3));
+              System.out.println("correct: " + at40k.cell(11,15).hwire(L3) + " drives " + at40k.cell(15,15).hwire(L3));
+              System.out.println("correct: " + at40k.cell(07,15).hwire(L3) + " drives " + at40k.cell(11,15).hwire(L3));
+
+              at40k.cell(19,15).hwire(L3).drives(at40k.cell(20,15).hwire(L3), true);
+              at40k.cell(15,15).hwire(L3).drives(at40k.cell(19,15).hwire(L3), true);
+              at40k.cell(11,15).hwire(L3).drives(at40k.cell(15,15).hwire(L3), true);
+              at40k.cell(07,15).hwire(L3).drives(at40k.cell(11,15).hwire(L3), true);
             */
             //at40k.cell(05,vv).xlut(0xff);
             //at40k.cell(05,vv).ylut(0xff);
             /*
-            at40k.cell(vx,vv).c(YLUT);
-            at40k.cell(vx,vv).f(false);
-            at40k.cell(vx,vv).b(false);
-            at40k.cell(vx,vv).oe(NONE);
-            at40k.cell(vx,vv).v(L3, true);
-            at40k.cell(vx,vv).out(L3, true);
+              at40k.cell(vx,vv).c(YLUT);
+              at40k.cell(vx,vv).f(false);
+              at40k.cell(vx,vv).b(false);
+              at40k.cell(vx,vv).oe(NONE);
+              at40k.cell(vx,vv).v(L3, true);
+              at40k.cell(vx,vv).out(L3, true);
             */
             /*
-            at40k.cell(vx,15).v(L3, true);
-            at40k.cell(vx,15).h(L3, true);
-            at40k.cell(vx,19).vwire(L3).drives(at40k.cell(vx,15).vwire(L3), true);
-            at40k.cell(vx,23).vwire(L3).drives(at40k.cell(vx,19).vwire(L3), true);
+              at40k.cell(vx,15).v(L3, true);
+              at40k.cell(vx,15).h(L3, true);
+              at40k.cell(vx,19).vwire(L3).drives(at40k.cell(vx,15).vwire(L3), true);
+              at40k.cell(vx,23).vwire(L3).drives(at40k.cell(vx,19).vwire(L3), true);
             */
 
             //at40k.cell(5,23).ylut(0x00);
             //at40k.cell(6,22).ylut(0xff);
             //at40k.cell(22,11).ylut(0xff);
             /*
-            Fpslic.Cell cell = at40k.cell(4, 16);
-            cell.xlut(0xff);
-            cell.ylut(0xff);
-            cell.b(false);
-            cell.f(false);
-            cell.c(XLUT);
-            cell.h(L3, true);
-            cell.v(L3, true);
-            cell.out(L3, true);
-            cell.oe(NONE);
+              Fpslic.Cell cell = at40k.cell(4, 16);
+              cell.xlut(0xff);
+              cell.ylut(0xff);
+              cell.b(false);
+              cell.f(false);
+              cell.c(XLUT);
+              cell.h(L3, true);
+              cell.v(L3, true);
+              cell.out(L3, true);
+              cell.oe(NONE);
             */
             //scan(at40k, cell, YLUT, true);
             //scan(at40k, cell, YLUT, false);
@@ -516,35 +587,36 @@ public class Demo {
 
 
 
-            Visualizer v = new Visualizer(at40k, device);
-            v.show();
-            v.setSize(1380, 1080);
-            Fpslic.Cell cell = at40k.cell(4, 23);
-
-            Image img = v.createImage(v.getWidth(), v.getHeight());
             /*
-            int x = 1;
-            int y = 14;
-            cell = at40k.cell(x,y);
-            scan(at40k, cell, YLUT, true);
-            cell.c(YLUT);
-            cell.b(false);
-            cell.f(false);
-            cell.oe(NONE);
-            cell.ylut(0xff);
+              Visualizer v = new Visualizer(at40k, device);
+              v.show();
+              v.setSize(1380, 1080);
+              Fpslic.Cell cell = at40k.cell(4, 23);
+            */
+            //Image img = v.createImage(v.getWidth(), v.getHeight());
+            /*
+              int x = 1;
+              int y = 14;
+              cell = at40k.cell(x,y);
+              scan(at40k, cell, YLUT, true);
+              cell.c(YLUT);
+              cell.b(false);
+              cell.f(false);
+              cell.oe(NONE);
+              cell.ylut(0xff);
             */
             //int x = 5;
             //int y = 11;
 
             //selfTest(device, at40k, v);
-            System.out.println("save: " + FtdiBoard.save + " of " + (FtdiBoard.saveof*5));
+            //System.out.println("save: " + FtdiBoard.save + " of " + (FtdiBoard.saveof*5));
 
             at40k.iob_top(0, true).enableInput();
             copy(at40k.cell(0, 23), NORTH, NORTH);
             at40k.iob_bot(0, true).enableOutput(NORTH);
 
             for(int i=0; i<10000; i++) {
-                v.refresh();
+                //v.refresh();
                 try { Thread.sleep(100); } catch (Exception e) { }
             }
             //cell.ylut(0x09);
@@ -559,130 +631,79 @@ public class Demo {
             //at40k.cell(0x04, 0x17).xo();
 
             /*
-            at40k.cell(0x01, 0x17).xi(L0);
-            at40k.cell(0x01, 0x17).h(L0, true);
+              at40k.cell(0x01, 0x17).xi(L0);
+              at40k.cell(0x01, 0x17).h(L0, true);
             */
             /*
-            at40k.cell(0x03, 0x17).xlut((byte)0x55);
-            at40k.cell(0x03, 0x17).ylut((byte)0x55);
-            at40k.cell(0x03, 0x17).yi(EAST);
-            at40k.cell(0x03, 0x17).ylut((byte)0x55);
-            at40k.cell(0x03, 0x17).yo(true);
-
-            at40k.cell(0x03, 0x17).f(false);
-            at40k.cell(0x03, 0x17).c(XLUT);
-            at40k.cell(0x03, 0x17).oe(NONE);
-            at40k.cell(0x03, 0x17).out(L0, true);
-
-            at40k.cell(0x02, 0x17).yi(EAST);
-            at40k.cell(0x02, 0x17).ylut((byte)0x55);
-            at40k.cell(0x02, 0x17).yo(false);
-
-            at40k.cell(0x01, 0x17).yi(EAST);
-            at40k.cell(0x01, 0x17).ylut((byte)0x55);
-            at40k.cell(0x01, 0x17).yo(false);
-
-            at40k.cell(0x01, 0x17).h(L0, true);
-            at40k.cell(0x01, 0x17).v(L0, false);
+              at40k.cell(0x03, 0x17).xlut((byte)0x55);
+              at40k.cell(0x03, 0x17).ylut((byte)0x55);
+              at40k.cell(0x03, 0x17).yi(EAST);
+              at40k.cell(0x03, 0x17).ylut((byte)0x55);
+              at40k.cell(0x03, 0x17).yo(true);
+
+              at40k.cell(0x03, 0x17).f(false);
+              at40k.cell(0x03, 0x17).c(XLUT);
+              at40k.cell(0x03, 0x17).oe(NONE);
+              at40k.cell(0x03, 0x17).out(L0, true);
+
+              at40k.cell(0x02, 0x17).yi(EAST);
+              at40k.cell(0x02, 0x17).ylut((byte)0x55);
+              at40k.cell(0x02, 0x17).yo(false);
+
+              at40k.cell(0x01, 0x17).yi(EAST);
+              at40k.cell(0x01, 0x17).ylut((byte)0x55);
+              at40k.cell(0x01, 0x17).yo(false);
+
+              at40k.cell(0x01, 0x17).h(L0, true);
+              at40k.cell(0x01, 0x17).v(L0, false);
             */
             //at40k.cell(0x01, 0x17).yi(L0);
             //at40k.cell(0x01, 0x17).xi(L0);
             //at40k.cell(0x01, 0x17).ylut((byte)0x33);
 
             /*
-            at40k.cell(0x03, 0x17).h(L0, true);
-            at40k.cell(0x03, 0x17).out(L0, true);
-            at40k.cell(0x03, 0x17).c(XLUT);
-            at40k.cell(0x03, 0x17).f(false);
+              at40k.cell(0x03, 0x17).h(L0, true);
+              at40k.cell(0x03, 0x17).out(L0, true);
+              at40k.cell(0x03, 0x17).c(XLUT);
+              at40k.cell(0x03, 0x17).f(false);
             */
             /*
-            at40k.cell(0x01, 0x17).xin(4);
-            at40k.cell(0x01, 0x17).yin(4);
-            at40k.cell(0x01, 0x16).ylut((byte)0x00);
-            device.mode4(2, 0x17, 0x01, 0);
-
-            for(int i=0; i<10; i++) {
-                Thread.sleep(3000);
-                System.out.println("tick");
-                //at40k.cell(0x01, 0x17).xlut((byte)0xFF);
-                at40k.cell(0x00, 0x17).ylut((byte)0x00);
-                device.flush();
-                Thread.sleep(3000);
-                System.out.println("tick");
-                //at40k.cell(0x01, 0x17).xlut((byte)0x00);
-                at40k.cell(0x00, 0x17).ylut((byte)0xFF);
-                device.flush();
-            }
+              at40k.cell(0x01, 0x17).xin(4);
+              at40k.cell(0x01, 0x17).yin(4);
+              at40k.cell(0x01, 0x16).ylut((byte)0x00);
+              device.mode4(2, 0x17, 0x01, 0);
+
+              for(int i=0; i<10; i++) {
+              Thread.sleep(3000);
+              System.out.println("tick");
+              //at40k.cell(0x01, 0x17).xlut((byte)0xFF);
+              at40k.cell(0x00, 0x17).ylut((byte)0x00);
+              device.flush();
+              Thread.sleep(3000);
+              System.out.println("tick");
+              //at40k.cell(0x01, 0x17).xlut((byte)0x00);
+              at40k.cell(0x00, 0x17).ylut((byte)0xFF);
+              device.flush();
+              }
             */
 
 
             /*
-            at40k.iob_top(0, true).output(0);
-            at40k.iob_top(0, true).oe(false);
-            at40k.iob_top(0, true).pullup();
-            device.flush();
-            Thread.sleep(3000);
-
-            Log.info(Demo.class, "issuing command");
-            at40k.iob_top(1, true).pulldown();
-            device.flush();
+              at40k.iob_top(0, true).output(0);
+              at40k.iob_top(0, true).oe(false);
+              at40k.iob_top(0, true).pullup();
+              device.flush();
+              Thread.sleep(3000);
+
+              Log.info(Demo.class, "issuing command");
+              at40k.iob_top(1, true).pulldown();
+              device.flush();
             */
             Log.info(Demo.class, "done");
             System.exit(0);
         } catch (Exception e) { e.printStackTrace(); }
     }
 
-    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();
-        }
-
-    }
 
     public static void copy(Fpslic.Cell c, int xdir, int ydir) {
         switch(xdir) {
@@ -728,419 +749,6 @@ public class Demo {
         cell.t(false, false, true);
     }
 
-    public static class Visualizer extends Frame implements KeyListener, MouseMotionListener, MouseListener {
-        public static final int WIDTH = 40;
-        public static final int HEIGHT = 40;
-        public static final int LW = 15;
-        public static final int LH = 15;
-        public static final Color RED  = new Color(0xaa, 0x55, 0x55);
-        public static final Color BLUE = new Color(0x55, 0x55, 0xaa);
-        private final Fpslic dev;
-        private final FtdiBoard drone;
-        int selx = -1;
-        int sely = -1;
-        public Visualizer(final Fpslic dev, final FtdiBoard drone) {
-            this.dev = dev;
-            this.drone = drone;
-            show();
-            addMouseMotionListener(this);
-            addMouseListener(this);
-            addKeyListener(this);
-            new Thread() {
-                public void run() {
-                    try {
-                        while(true) {
-                            Thread.sleep(500);
-                            if (!enabled) continue;
-                            /*
-                            Fpslic.Cell cell = dev.cell(21, 22);
-                            cell.xlut(0xff);
-                            cell.ylut(0xff);
-                            */
-                            keyPressed(null);
-                            /*
-                            cell.xlut(0x00);
-                            cell.ylut(0x00);
-                            */
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }.start();
-        }
-        public boolean enabled = false;
-        public void mouseClicked(MouseEvent e) { }
-        public void mouseEntered(MouseEvent e) { }
-        public void mouseExited(MouseEvent e) { }
-        public void mouseReleased(MouseEvent e) {
-        }
-        public void keyTyped(KeyEvent k) {
-        }
-        public void keyReleased(KeyEvent k) {
-        }
-        public void keyPressed(KeyEvent keyevent) {
-            boolean scan = false;
-            switch(keyevent==null ? '_' : keyevent.getKeyChar()) {
-                case '1': {
-                    if (selx==-1 || sely==-1) break;
-                    Fpslic.Cell cell = dev.cell(selx, sely);
-                    cell.xlut(0xff);
-                    cell.ylut(0xff);
-                    drawCell(getGraphics(), selx, sely);
-                    drone.flush();
-                    break;
-                }
-                case 'i': {
-                    System.out.println("interrupt_count: " + drone.readCount());
-                    break;
-                }
-                case 'x': {
-                    masterx+=2;
-                    if (mullers) {
-                        if (masterx <= 22) {
-                            int mx = masterx;
-                            System.out.println("low => " + mx);
-                            copy(dev.cell(mx, yofs-2), NORTH, NORTH);
-                            copy(dev.cell(mx, yofs-3), NORTH, NORTH);
-                            //dev.cell(mx, yofs-3).ylut(~dev.cell(mx, yofs-3).ylut());
-                            //dev.cell(mx, yofs-3).xlut(~dev.cell(mx, yofs-3).xlut());
-                        } else {
-                            int mx = 23-(masterx-23);
-                            System.out.println("high => " + mx);
-                            copy(dev.cell(mx, yofs), NW, NW);//NORTH, NORTH);
-                            copy(dev.cell(mx, yofs-1), NORTH, NORTH);
-                            //for(int x=mx-1; x>=1; x--)
-                            //copy(dev.cell(x, yofs), EAST, EAST);
-                            for(int y=yofs+1; y<=23; y++)
-                                copy(dev.cell(1, y), SOUTH, SOUTH);
-                            //dev.cell(mx, yofs-1).ylut(~dev.cell(mx, yofs-1).ylut());
-                            //dev.cell(mx, yofs-1).xlut(~dev.cell(mx, yofs-1).xlut());
-                        }
-                    } else {
-                        if (masterx <= 22) {
-                            int mx = masterx;
-                            System.out.println("low => " + mx);
-                            copy(dev.cell(mx, yofs-2), SOUTH, SOUTH);
-                            copy(dev.cell(mx, yofs-3), NORTH, NORTH);
-                            dev.cell(mx, yofs-3).ylut(~dev.cell(mx, yofs-3).ylut());
-                            dev.cell(mx, yofs-3).xlut(~dev.cell(mx, yofs-3).xlut());
-                        } else {
-                            int mx = 23-(masterx-23);
-                            System.out.println("high => " + mx);
-                            copy(dev.cell(mx, yofs), SOUTH, SOUTH);
-                            /*
-                            copy(dev.cell(mx, yofs-1), NORTH, NORTH);
-                            */
-                            copy(dev.cell(mx, yofs-1), NORTH, SW);
-                            boolean left = true;
-                            Fpslic.Cell lc = null;
-                            for(int k=0; k<10; k++) {
-                                int y = yofs-2-(k*2);
-                                copy(dev.cell(left?(mx-1):mx, y),        SOUTH, left?NE:NW);
-                                copy(lc = dev.cell(left?(mx-1):mx, y-1), NORTH, left?SE:SW); 
-                                left = !left;
-                            }
-                            copy(lc, NORTH, NORTH);
-
-                            //for(int x=mx-1; x>=1; x--)
-                            //copy(dev.cell(x, yofs), EAST, EAST);
-                            //for(int y=yofs+1; y<=23; y++)
-                            //copy(dev.cell(1, y), SOUTH, SOUTH);
-
-                            if (mx<21) {
-                                dev.cell(mx+2, yofs).ylut(0x00);
-                                dev.cell(mx+2, yofs).xlut(0x00);
-                            }
-
-                            /*
-                            dev.cell(mx, yofs-1).ylut(~LUT_Z);
-                            dev.cell(mx, yofs-1).xlut(LUT_Z);
-                            loopback(dev.cell(mx, yofs-1), YLUT);
-                            */
-                            dev.cell(mx, yofs).ylut(~LUT_SELF);
-                            dev.cell(mx, yofs).xlut(~LUT_OTHER);
-                        }
-                    }
-                    break;
-                }
-                case ' ': {
-                    //enabled = !enabled;
-                    scan = true;
-                    break;
-                }
-                case '4': {
-                    //enabled = !enabled;
-                    try {
-                        for(int cap=0; cap<15; cap++) {
-                            drain(dev, drone);
-                            try { Thread.sleep(100); } catch (Exception e) { }
-                            //showit(dev, drone, this);
-                            fill(dev, drone, cap);
-                            drone.readCount();
-                            long now = System.currentTimeMillis();
-                            try { Thread.sleep(4000); } catch (Exception e) { }
-                            int count = drone.readCount();
-                            long now2 = System.currentTimeMillis();
-                            System.out.println(cap + " ,  " + (((float)count * (2*2*2*2*2*2*2*2*2*1000))/(now2-now)));
-                        }
-                    } catch (Exception e) { e.printStackTrace(); }
-                    break;
-                }
-                case 'C': {
-                    if (selx==-1 || sely==-1) break;
-                    Fpslic.Cell cell = dev.cell(selx, sely);
-                    cell.ylut(0xB2);
-                    drawCell(getGraphics(), selx, sely);
-                    break;
-                }
-                case '0': {
-                    if (selx==-1 || sely==-1) break;
-                    Fpslic.Cell cell = dev.cell(selx, sely);
-                    cell.xlut(0x00);
-                    cell.ylut(0x00);
-                    drawCell(getGraphics(), selx, sely);
-                    drone.flush();
-                    break;
-                }
-            } 
-            if (!scan) return;
-            showit(dev, drone, this);
-        }
-        public void mousePressed(MouseEvent e) {
-            final Fpslic.Cell cell = dev.cell(selx, sely);
-            if (cell==null) return;
-            final int old = cell.c();
-            FtdiBoard.ByteCallback bc = new FtdiBoard.ByteCallback() {
-                    public void call(byte b) throws Exception {
-                        boolean y = (b & 0x80) != 0;
-                        //cell.c(old);
-                        Graphics g = getGraphics();
-                        g.setFont(new Font("sansserif", Font.BOLD, 14));
-                        g.setColor(Color.white);
-                        //g.drawString("X=0", left(cell) + 10, top(cell) + 20);
-                        //g.drawString("X=1", left(cell) + 10, top(cell) + 20);
-                        //g.setColor(Color.white);
-                        //g.drawString("Y=0", left(cell) + 8, top(cell) + 35);
-                        //g.drawString("Y=1", left(cell) + 8, top(cell) + 35);
-                        //g.setColor(RED);
-                        //g.drawString("X="+(x?"1":"0"), left(cell) + 10, top(cell) + 20);
-                        String v = (cell.c()==YLUT ? "Y" : cell.c()==XLUT ? "X" : "C");
-                        g.drawString(v+"="+(y?"0":"1"), left(cell) + 8, top(cell) + 35);
-                        g.setColor(BLUE);
-                        g.drawString(v+"="+(y?"1":"0"), left(cell) + 8, top(cell) + 35);
-                    } };
-            try {
-                scan(dev, cell, NONE, true);
-                drone.readBus(bc);
-                //scan(dev, cell, XLUT, true);
-                //boolean x = (drone.readBus() & 0x80) != 0;
-                scan(dev, cell, NONE, false);
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            }
-        }
-
-        public void mouseMoved(MouseEvent e) {
-            int x = e.getX();
-            int y = e.getY();
-            if (selx >= 0 && selx < 24 && sely >= 0 && sely < 24) {
-                int cx = selx;
-                int cy = sely;
-                Fpslic.Cell cell = dev.cell(cx, cy);
-                selx = -1;
-                sely = -1;
-                /*
-                drawCell(getGraphics(), cx, cy);
-                drawSector(getGraphics(), dev.cell(cx, cy).sector());
-                */
-            }
-            selx = (x-20)/(WIDTH+2);
-            sely = (23 - (y-20)/(HEIGHT+2))+1;
-            /*
-            Fpslic.Cell cell = dev.cell(selx, sely);
-            if (selx >= 0 && selx < 24 && sely >= 0 && sely < 24) {
-                drawCell(getGraphics(), selx, sely);
-                drawSector(getGraphics(), dev.cell(selx, sely).sector());
-            }
-            */
-        }
-        public void mouseDragged(MouseEvent e) { mousePressed(e); }
-        public void paint(Graphics g) {
-            System.out.println("paintall");
-            g.setColor(Color.white);
-            g.fillRect(0, 0, getWidth(), getHeight());
-            g.setFont(new Font("sansserif", Font.BOLD, 24));
-            for(int x=0; x<24; x++)
-                for(int y=0; y<24; y++)
-                    drawCell(g,x,y);
-            for(int x=0; x<=23; x+=4)
-                for(int y=23; y>=0; y-=4) 
-                    drawSector(g, dev.cell(x, y).sector());
-            /*
-            g.setColor(BLUE);
-            g.drawString("Ready", (5*(WIDTH+2))+20, 40);
-            g.setColor(RED);
-            g.drawString("Send",  (3*(WIDTH+2))+20, 40);
-            g.setColor(BLUE);
-            */
-            refresh();
-        }
-        public void refresh() {
-            Graphics g = getGraphics();
-            /*
-            int data = drone.readBus() & 0xff;
-            for(int i=0; i<8; i++) {
-                g.setColor((data & (1<<i))==0 ? Color.black : Color.green);
-                g.drawString("D"+i,  (24*(WIDTH+2))+20, ((23-(i+7))*(HEIGHT+2))+60-HEIGHT/2);
-            }
-            */
-        }
-        public static int left(Fpslic.Cell cell) { return (cell.col)   *(WIDTH+2)+20; }
-        public static int top(Fpslic.Cell cell)  { return (23-cell.row)*(HEIGHT+2)+60; }
-        public void drawSector(Graphics g, Fpslic.Sector sector) {
-            g.setColor(Color.gray);
-            ((Graphics2D)g).setStroke(new BasicStroke(1));
-            int px = ((sector.col)*(WIDTH+2))+20-1;
-            int py = ((23-(sector.row+3))*(HEIGHT+2))+60-1;
-            g.drawRect(px, py, (WIDTH+2)*4+2, (HEIGHT+2)*4+2);
-            /*
-            for(int dir=0; dir<2; dir++) {
-                boolean h = dir==0;
-                for(int y=h?sector.row:sector.col; y<(h?sector.row+4:sector.col+4); y++)
-                    for(int plane=0; plane<=4; plane++) {
-                        Fpslic.Cell cell      = h ? dev.cell(sector.col,   y) : dev.cell(y, sector.row);
-                        Fpslic.Cell cell_east = h ? dev.cell(sector.col-1, y) : dev.cell(y, sector.row-1);
-                        Fpslic.Cell cell_west = h ? dev.cell(sector.col+4, y) : dev.cell(y, sector.row+4);
-                        boolean draw = false;
-                        if (h) {
-                            if (cell_east!=null &&
-                                (cell_east.hwire(plane).drives(cell.hwire(plane)) ||
-                                 cell_east.hwire(plane).drives(cell.hwire(plane))))
-                                draw = true;
-                            if (cell_west!=null &&
-                                (cell_west.hwire(plane).drives(cell.hwire(plane)) ||
-                                 cell_west.hwire(plane).drives(cell.hwire(plane))))
-                                draw = true;
-                        } else {
-                            if (cell_east!=null &&
-                                (cell_east.vwire(plane).drives(cell.vwire(plane)) ||
-                                 cell_east.vwire(plane).drives(cell.vwire(plane))))
-                                draw = true;
-                            if (cell_west!=null &&
-                                (cell_west.vwire(plane).drives(cell.vwire(plane)) ||
-                                 cell_west.vwire(plane).drives(cell.vwire(plane))))
-                                draw = true;
-                        }
-                        if (!draw)
-                            for(int x=h?sector.col:sector.row; x<(h?sector.col+4:sector.row+4); x++)
-                                if (((h ? dev.cell(x,y).hx(plane) : dev.cell(y,x).vx(plane))) ||
-                                    (h?dev.cell(x,y).out(plane):dev.cell(y,x).out(plane)))
-                                    draw = true;
-                        if (draw) {
-                            g.setColor(new Color(0xff, 0x00, 0xff));
-                            if (h) {
-                                g.drawLine(left(cell),
-                                           top(cell)+3,
-                                           left(cell) + 4*(WIDTH+2),
-                                           top(cell)+3
-                                           );
-                            } else {
-                                g.drawLine(left(cell)+3,
-                                           top(cell) + (HEIGHT+2),
-                                           left(cell)+3,
-                                           top(cell) - 3*(HEIGHT+2)
-                                           );
-                            }
-                        }
-                    }
-            }
-            */
-        }
-        public void drawCell(Graphics g, int cx, int cy) {
-            int x = (cx*(WIDTH+2))+20;
-            int y = ((23-cy)*(HEIGHT+2))+60;
-            if (g.getClipBounds() != null && !g.getClipBounds().intersects(new Rectangle(x, y, x+WIDTH, y+HEIGHT))) return;
-            drawCell(g, cx, cy, Color.white);
-        }
-        public void drawCell(Graphics g, int cx, int cy, Color bg) {
-            int x = (cx*(WIDTH+2))+20;
-            int y = ((23-cy)*(HEIGHT+2))+60;
-
-            //System.out.println("drawcell " + cx + "," + cy);
-            Fpslic.Cell cell = dev.cell(cx, cy);
-            g.setColor(bg);
-            g.fillRect(x, y, WIDTH, HEIGHT);
-
-            g.setColor((selx==cx && sely==cy) ? Color.red : Color.black);
-            g.drawRect(x, y, WIDTH, HEIGHT);
-
-            //g.setColor((selx==cx && sely==cy) ? Color.red : Color.gray);
-            //g.drawRect(x+(WIDTH-(LW*2))/2-1,    y+(HEIGHT-LW)/2-1, LW*2+1, LH+1);
-
-            //g.setColor(RED);
-            //g.fillRect(x+(WIDTH-(LW*2))/2,    y+(HEIGHT-LW)/2, LW,   LH);
-            //g.setColor(Color.white);
-            //g.drawString("1", x+(WIDTH-(LW*2))/2,    y+(HEIGHT-LW)/2);
-
-            //g.setColor(BLUE);
-            //g.fillRect(x+(WIDTH-(LW*2))/2+LW, y+(HEIGHT-LW)/2, LW,   LH);
-            //g.setColor(Color.white);
-            //g.drawString("0", x+(WIDTH-(LW*2))/2+LW,    y+(HEIGHT-LW)/2);
-
-            /*
-              g.setColor(BLUE);
-            ((Graphics2D)g).setStroke(new BasicStroke((float)1));
-            switch(cell.yi()) {
-                case NORTH: g.drawLine(x+WIDTH/2+5,  y-10,        x+WIDTH/2+5, y+HEIGHT/2); break;
-                case SOUTH: g.drawLine(x+WIDTH/2-5,  y+HEIGHT+10, x+WIDTH/2-5, y+HEIGHT/2); break;
-                case EAST:  g.drawLine(x+WIDTH+10, y+HEIGHT/2+5,  x+WIDTH/2, y+HEIGHT/2+5); break;
-                case WEST:  g.drawLine(x-10,       y+HEIGHT/2-5,  x+WIDTH/2, y+HEIGHT/2-5); break;
-                case NONE:  break;
-            }
-            g.setColor(RED);
-            ((Graphics2D)g).setStroke(new BasicStroke((float)1));
-            switch(cell.xi()) {
-                case NW: g.drawLine(x-10+3,       y-10,        x+WIDTH/2+3, y+HEIGHT/2); break;
-                case SW: g.drawLine(x-10-3,       y+HEIGHT+10, x+WIDTH/2-3, y+HEIGHT/2); break;
-                case NE: g.drawLine(x+WIDTH+10+3, y-10,        x+WIDTH/2+3, y+HEIGHT/2); break;
-                case SE: g.drawLine(x+WIDTH+10-3, y+HEIGHT+10, x+WIDTH/2-3, y+HEIGHT/2); break;
-                case NONE:  break;
-            }
-            ((Graphics2D)g).setStroke(new BasicStroke(1));
-            */
-            /*
-            if (selx==cx && sely==cy) {
-                int xp = 23 * (WIDTH+2) + 100;
-                int yp = 100;
-                g.setColor(Color.white);
-                g.fillRect(xp, yp, 300, 1000);
-                g.setColor(Color.black);
-                g.drawString("Cell " + cx + "," + cy,       xp, (yp+=15));
-                //g.drawString("X-Lut: " + bin8(cell.xlut()), xp, (yp+=15));
-                g.drawString("X-Lut: " + cell.printXLut(), xp, (yp+=15));
-                //g.drawString("Y-Lut: " + bin8(cell.ylut()), xp, (yp+=15));
-                g.drawString("Y-Lut: " + cell.printYLutX(), xp, (yp+=15));
-            }
-            */
-            if ((cell.ylut()&0xff)==0xff && (cell.xlut()&0xff)==0xff) {
-                g.setColor(new Color(0x00, 0x00, 0xff));
-                g.drawString("1", left(cell) + 12, top(cell) + 30);
-            }
-            if ((cell.ylut()&0xff)==0x00 && (cell.xlut()&0xff)==0x00) {
-                g.setColor(new Color(0x00, 0x00, 0xff));
-                g.drawString("0", left(cell) + 12, top(cell) + 30);
-            }
-            if ((cell.ylut()&0xff)==0xB2) {
-                //System.out.println("muller @ " + cell);
-                //g.setColor(RED);
-                //g.drawString("X="+(x?"1":"0"), left(cell) + 10, top(cell) + 20);
-                g.setColor(new Color(0x00, 0xaa, 0x00));
-                g.drawString("C", left(cell) + 12, top(cell) + 30);
-            }
-
-        }
-    }
 
     private static String pad(int i, String s) { if (s.length()>i) return s; return "0"+pad((i-1),s); }
     public static String bin8(byte b) {
@@ -1151,40 +759,6 @@ public class Demo {
         return ret;
     }
 
-    public static void selfTest(FtdiBoard device, Fpslic at40k, Visualizer v) {
-        /*
-            int fail = 0;
-            long now = System.currentTimeMillis();
-            for(int x=0; x<24; x++)
-                for(int y=0; y<24; y++) {
-                    Fpslic.Cell cell = at40k.cell(x,y);
-                    scan(at40k, cell, YLUT, true);
-                    //v.paint(img.getGraphics());
-                    //v.getGraphics().drawImage(img, 0, 0, null);
-                    cell.ylut(0xff);
-                    boolean a = (device.readBus() & 0x80)!=0;
-                    cell.ylut(0x00);
-                    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("failures: " + fail);
-            System.out.println("scan time: " + (System.currentTimeMillis()-now) + "ms");
-        */
-    }
-    
     public static void bounce(Fpslic.Cell cell, int xi, int yi) {
         cell.xlut((byte)0xCC);
         cell.ylut((byte)0xCC);
@@ -1248,6 +822,7 @@ public class Demo {
         cell.xo(false);
         cell.c(cin);
     }
+
     public static void doit(Fpslic at40k, FtdiBoard device) throws Exception {
 
         Fpslic.Cell led = at40k.cell(1, 23);
@@ -1367,39 +942,39 @@ public class Demo {
         c = at40k.cell(13, 22);
         c.xlut(0x00);
         c.xlut(LUT_OTHER);// | 0xF0);
-*/
+        */
         //c = at40k.cell(13, 22);
         //copy(c, NW, EAST);
         /*
-        c.ylut(0x00);
-        c.c(YLUT);
-        c.f(false);
-        c.b(false);
-        c.t(false, false, true);
-        c.xi(SE);
-        c.yi(NORTH);
-        c.yo(false);
-        c.xo(false);
-        c.ylut(0x54);  // (x || z) & !y
+          c.ylut(0x00);
+          c.c(YLUT);
+          c.f(false);
+          c.b(false);
+          c.t(false, false, true);
+          c.xi(SE);
+          c.yi(NORTH);
+          c.yo(false);
+          c.xo(false);
+          c.ylut(0x54);  // (x || z) & !y
         */
 
         /*        
-        c = at40k.cell(2, 21);
-        c.ylut(0x00);
-        c.c(YLUT);
-        c.f(false);
-        c.b(false);
-        c.t(false, false, true);
-        c.xi(SE);
-        c.yi(WEST);
-        c.yo(false);
-        c.xo(false);
-        c.ylut(0xE8);
+                  c = at40k.cell(2, 21);
+                  c.ylut(0x00);
+                  c.c(YLUT);
+                  c.f(false);
+                  c.b(false);
+                  c.t(false, false, true);
+                  c.xi(SE);
+                  c.yi(WEST);
+                  c.yo(false);
+                  c.xo(false);
+                  c.ylut(0xE8);
  
-       //at40k.cell(2, 21).xlut(0xF0);
+                  //at40k.cell(2, 21).xlut(0xF0);
 
-        at40k.cell(3, 22).ylut(LUT_OTHER);
-        at40k.cell(3, 22).xi(SW);
+                  at40k.cell(3, 22).ylut(LUT_OTHER);
+                  at40k.cell(3, 22).xi(SW);
         */
         //at40k.iob_top(5, true).enableOutput(SOUTH);
         //at40k.iob_top(5, false).enableOutput(SE);
@@ -1446,6 +1021,7 @@ public class Demo {
         //at40k.iob_top(1, false).slew(SLOW);
 
     }
+
     public static void fill(Fpslic at40k, FtdiBoard device, int num) throws Exception {
         //muller(at40k.cell(PIPELEN,22), NE, WEST);
         Fpslic.Cell a = at40k.cell(10,22);
@@ -1463,40 +1039,7 @@ public class Demo {
         b.ylut(0xB2);
         a.ylut(0xB2);
     }
-    public static void showit(Fpslic dev, FtdiBoard drone, final Visualizer vis) {
-        final long then = System.currentTimeMillis();
-        final Graphics g = vis.getGraphics();
-        g.setFont(new Font("sansserif", Font.BOLD, 24));
-        final Color red = new Color(0xff, 0x99, 0x99);
-        final Color green = new Color(0x99, 0xff, 0x99);
-        for(int xx=0; xx<=22; xx++) {
-            for(int yy=23; yy>=0; yy--) {
-                //for(int xx=5; xx<=PIPELEN-1; xx++) {
-                //for(int yy=21; yy<=22; yy++) {
-                final int x = xx;
-                final int y = yy;
-                final Fpslic.Cell cell = dev.cell(x, y);
-                if ((cell.ylut()&0xff)!=0xB2) continue;
-                FtdiBoard.ByteCallback bc = new FtdiBoard.ByteCallback() {
-                        public void call(byte b) throws Exception {
-                            boolean v = (b & 0x80) != 0;
-                            vis.drawCell(g, x, y, v?red:green);
-                            //if (x==PIPELEN-1 && y==22) System.out.println("time: " + (System.currentTimeMillis()-then));
-                        }
-                    };
-                scan(dev, cell, NONE, true);
-                try {
-                    drone.readBus(bc);
-                    //scan(dev, cell, YLUT, false);
-                    cell.v(L3, false);
-                    dev.cell(x, 15).h(L3, false);
-                    dev.cell(x, 15).v(L3, false);
-                } catch (IOException ex) {
-                    throw new RuntimeException(ex);
-                }
-            }
-        }
-    }
+
     public static void drain(Fpslic at40k, FtdiBoard device) throws Exception {
         Fpslic.Cell a = at40k.cell(10,22);
         Fpslic.Cell b = at40k.cell(11,22);
@@ -1514,6 +1057,7 @@ public class Demo {
         b.ylut(0xB2);
         a.ylut(0xB2);
     }
+
     public static void doitx(Fpslic at40k, FtdiBoard device) throws Exception {
         for(int i=5; i<PIPELEN+1; i++) bounce(at40k.cell(i, 23), SE,                     SOUTH);
         for(int x=5; x<PIPELEN;   x++) muller(at40k.cell(x, 22), x==PIPELEN-1 ? SE : NE, WEST);
@@ -1531,20 +1075,20 @@ public class Demo {
         muller(at40k.cell(5, 22), NE, SOUTH);
         muller(at40k.cell(5, 21), NW, EAST);
         /*
-        for(int x=4; x>=0; x--) {
-            at40k.cell(x, 21).ylut(0xAA);
-            at40k.cell(x, 21).yi(EAST);
-            at40k.cell(x, 21).yo(false);
-        }
-
-        at40k.cell(0, 22).ylut(0xAA);
-        at40k.cell(0, 22).yi(SOUTH);
-        at40k.cell(0, 22).yo(false);
-
-        at40k.cell(0, 23).ylut(~0xAA);
-        at40k.cell(0, 23).xlut(~0xcc);
-        at40k.cell(0, 23).yi(SOUTH);
-        at40k.cell(0, 23).yo(false);
+          for(int x=4; x>=0; x--) {
+          at40k.cell(x, 21).ylut(0xAA);
+          at40k.cell(x, 21).yi(EAST);
+          at40k.cell(x, 21).yo(false);
+          }
+
+          at40k.cell(0, 22).ylut(0xAA);
+          at40k.cell(0, 22).yi(SOUTH);
+          at40k.cell(0, 22).yo(false);
+
+          at40k.cell(0, 23).ylut(~0xAA);
+          at40k.cell(0, 23).xlut(~0xcc);
+          at40k.cell(0, 23).yi(SOUTH);
+          at40k.cell(0, 23).yo(false);
         */
         for(int x=3; x<=23; x+=2) {
             pulse_detect(at40k.cell(x-1, 19), SW,    false);