take both xo/yo from center column when using XLUT (YLUT behavior unchanged)

[slipway.git] / src / edu / berkeley / slipway / AsyncPaperDemo.java

diff --git a/src/edu/berkeley/slipway/AsyncPaperDemo.java b/src/edu/berkeley/slipway/AsyncPaperDemo.java
index 9cef233..5bb2650 100644 (file)
--- a/src/edu/berkeley/slipway/AsyncPaperDemo.java
+++ b/src/edu/berkeley/slipway/AsyncPaperDemo.java
@@ -33,7 +33,7 @@ public class AsyncPaperDemo {
             fpslic.readCount();
 
         //System.in.read();
-        for(int i=256; ; i+=2) {
+        for(int i=0; i<400; i+=2) {
             go(i);
         }
         //System.out.println("done");
@@ -127,8 +127,15 @@ public class AsyncPaperDemo {
             if (rc!=0) { System.err.println("flush() failed REALLY BADLY => " + rc); continue; }
             
             reconfigTopLeft();
-            
+            for(int x=0; x<24; x++)
+                for(int y=0; y<24; y++)
+                    fpslic.cell(x,y).wi(L0);
+            fpslic.flush();
+            for(int x=0; x<24; x++)
+                for(int y=0; y<24; y++)
+                    fpslic.cell(x,y).wi(NONE);
             fpslic.flush();
+            
             fpslic.readCount();
             try { Thread.sleep(100); } catch (Exception e) { }
             rc = fpslic.readCount();
@@ -327,8 +334,6 @@ public class AsyncPaperDemo {
     private Fpslic.Cell micropipelineStage(Fpslic.Cell c, Fpslic.Cell prev, Fpslic.Cell next, boolean configDir) {
         c.b(false);
         c.f(false);
-        c.yo(false);
-        c.xo(false);
         switch(c.dir(next)) {
             case NORTH: case SOUTH: case EAST: case WEST:
                 switch (c.dir(prev)) {
@@ -339,6 +344,9 @@ public class AsyncPaperDemo {
                     c.xi(prev);
                 }
 
+        c.yo(false);
+        c.xo(true);
+
                 c.c(YLUT);
                 c.ylut(0x00);
                 c.xlut(0x00);
@@ -361,7 +369,12 @@ public class AsyncPaperDemo {
                     c.yi(prev);
                 }
 
-                c.c(XLUT);
+        c.yo(true);
+        c.xo(true);
+        c.c(ZMUX);
+        c.zi(NONE);
+
+        //c.c(XLUT);
                 c.xlut(0x00);
                 c.ylut(0x00);
                 c.wi(L0);