checkpoint

diff --git a/src/com/atmel/fpslic/Fpslic.java b/src/com/atmel/fpslic/Fpslic.java
index 8ad7175..f066858 100644 (file)
--- a/src/com/atmel/fpslic/Fpslic.java
+++ b/src/com/atmel/fpslic/Fpslic.java
@@ -20,53 +20,6 @@ public abstract class Fpslic {
         }
     }
     
-    public static class Constants {
-        public static final int NONE  = -1;
-        public static final int L0    = 0;
-        public static final int L1    = 1;
-        public static final int L2    = 2;
-        public static final int L3    = 3;
-        public static final int L4    = 4;
-
-        public static final int NORTH = 8;
-        public static final int WEST  = 9;
-        public static final int SOUTH = 10;
-        public static final int EAST  = 11;
-
-        public static final int XLUT  = 12;
-        public static final int YLUT  = 13;
-        public static final int ZMUX  = 14;
-
-        public static final int H4    = 15;
-        public static final int V4    = 16;
-
-        public static final int NW    = 20;
-        public static final int SW    = 21;
-        public static final int NE    = 22;
-        public static final int SE    = 23;
-
-        public static final int SLOW   = 24;
-        public static final int MEDIUM = 25;
-        public static final int FAST   = 26;
-
-        public static final int ALWAYS_ON  = 27;
-        public static final int ALWAYS_OFF = 28;
-
-        public static final int FB    = 29;
-
-        public static final int LUT_SELF  = 0xAA;
-        public static final int LUT_Z     = 0xF0;
-        public static final int LUT_OTHER = 0xCC;
-
-        public static final int TMUX_W_AND_Z   = 0x00001001;
-        public static final int TMUX_W         = 0x00001002;
-        public static final int TMUX_Z         = 0x00001004;
-        public static final int TMUX_W_AND_FB  = 0x00001008;
-        public static final int TMUX_FB        = 0x00001010;
-
-
-    }
-
     /** issue a command to the device in Mode4 format; see Gosset's documentation for further details */
     public int getWidth() { return 24; }
     public int getHeight() { return 24; }

diff --git a/src/edu/berkeley/obits/AtmelSerial.java b/src/edu/berkeley/obits/AtmelSerial.java
index dd37793..3457c66 100644 (file)
--- a/src/edu/berkeley/obits/AtmelSerial.java
+++ b/src/edu/berkeley/obits/AtmelSerial.java
@@ -1,7 +1,7 @@
 package edu.berkeley.obits;
 
 import edu.berkeley.slipway.*;
-import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.FpslicConstants.*;
 import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.device.atmel.*;
 import edu.berkeley.obits.gui.*;

diff --git a/src/edu/berkeley/obits/device/atmel/At40k.java b/src/edu/berkeley/obits/device/atmel/At40k.java
index 350f3fb..5aaa308 100644 (file)
--- a/src/edu/berkeley/obits/device/atmel/At40k.java
+++ b/src/edu/berkeley/obits/device/atmel/At40k.java
@@ -1,7 +1,7 @@
 package edu.berkeley.obits.device.atmel;
 
 import com.atmel.fpslic.*;
-import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.FpslicConstants.*;
 import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.*;
 import org.ibex.util.*;

diff --git a/src/edu/berkeley/obits/gui/G.java b/src/edu/berkeley/obits/gui/G.java
index d5103d8..3150823 100644 (file)
--- a/src/edu/berkeley/obits/gui/G.java
+++ b/src/edu/berkeley/obits/gui/G.java
@@ -1,6 +1,6 @@
 package edu.berkeley.obits.gui;
 
-import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.FpslicConstants.*;
 import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.*;
 import edu.berkeley.obits.device.atmel.*;

diff --git a/src/edu/berkeley/obits/gui/Gui.java b/src/edu/berkeley/obits/gui/Gui.java
index f5d5f71..83676cb 100644 (file)
--- a/src/edu/berkeley/obits/gui/Gui.java
+++ b/src/edu/berkeley/obits/gui/Gui.java
@@ -1,6 +1,6 @@
 package edu.berkeley.obits.gui;
 
-import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.FpslicConstants.*;
 import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.*;
 import edu.berkeley.obits.device.atmel.*;

diff --git a/src/edu/berkeley/obits/gui/GuiConstants.java b/src/edu/berkeley/obits/gui/GuiConstants.java
index 2fcdfae..af0458e 100644 (file)
--- a/src/edu/berkeley/obits/gui/GuiConstants.java
+++ b/src/edu/berkeley/obits/gui/GuiConstants.java
@@ -1,7 +1,7 @@
 package edu.berkeley.obits.gui;
 
 import com.atmel.fpslic.*;
-import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.FpslicConstants.*;
 import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.*;
 import edu.berkeley.obits.device.atmel.*;

diff --git a/src/edu/berkeley/obits/gui/P.java b/src/edu/berkeley/obits/gui/P.java
index e0b8e4c..b308d2d 100644 (file)
--- a/src/edu/berkeley/obits/gui/P.java
+++ b/src/edu/berkeley/obits/gui/P.java
@@ -1,6 +1,6 @@
 package edu.berkeley.obits.gui;
 
-import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.FpslicConstants.*;
 import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.*;
 import edu.berkeley.obits.device.atmel.*;

diff --git a/src/edu/berkeley/obits/gui/ZoomingPanel.java b/src/edu/berkeley/obits/gui/ZoomingPanel.java
index 23c6b47..ef44c2c 100644 (file)
--- a/src/edu/berkeley/obits/gui/ZoomingPanel.java
+++ b/src/edu/berkeley/obits/gui/ZoomingPanel.java
@@ -1,6 +1,6 @@
 package edu.berkeley.obits.gui;
 
-import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.FpslicConstants.*;
 import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.*;
 import edu.berkeley.obits.device.atmel.*;