1
0
Эх сурвалжийг харах

Update PAL name print command line help

Baglio Tabifata 4 жил өмнө
parent
commit
f904dd14cd

+ 12 - 1
src/main/java/info/hkzlab/dupal/analyzer/App.java

@@ -1,6 +1,8 @@
 package info.hkzlab.dupal.analyzer;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
 
 import org.slf4j.*;
 
@@ -8,6 +10,9 @@ import info.hkzlab.dupal.analyzer.board.boardio.*;
 import info.hkzlab.dupal.analyzer.devices.*;
 
 public class App {
+    public static volatile String[] palTypes = { PAL10L8Specs.PAL_TYPE, PAL12L6Specs.PAL_TYPE, PAL16L8Specs.PAL_TYPE, 
+                                                PAL16R4Specs.PAL_TYPE, PAL16R6Specs.PAL_TYPE, PAL16R8Specs.PAL_TYPE };
+
     private final static Logger logger = LoggerFactory.getLogger(DuPALManager.class);
 
     private final static String version = App.class.getPackage().getImplementationVersion();
@@ -21,9 +26,15 @@ public class App {
         System.out.println("DuPAL Analyzer " + version);
 
         if (args.length < 3) {
+            StringBuffer supportedPALs = new StringBuffer();
+
+            for(String palT : palTypes) {
+                supportedPALs.append("\t"+palT+"\n");
+            }
+
             logger.error("Wrong number of arguments passed.\n"
                     + "dupal_analyzer <serial_port> <pal_type> <output_dir> [hex_output_mask]\n"
-                    + "Where <pal_type> can be: 16R8, 16R6, 16R4, 16L8\n");
+                    + "Where <pal_type> can be:\n" + supportedPALs.toString() + "\n");
 
             return;
         }

+ 4 - 2
src/main/java/info/hkzlab/dupal/analyzer/devices/PAL10L8Specs.java

@@ -1,12 +1,14 @@
 package info.hkzlab.dupal.analyzer.devices;
 
 public class PAL10L8Specs implements PALSpecs {
+
+    public static final String PAL_TYPE = "10L8";
+
     private static final String[] ROUT_PIN_NAMES = { };
     private static final String[] IN_PIN_NAMES = { "i1", "i2", "i3", "i4", "i5", "i6", "i7", "i8", "i9", "i11" };
     private static final String[] IO_PIN_NAMES = { };
     private static final String[] OUT_PIN_NAMES = { "o18", "o17", "o16", "o15", "o14", "o13", "o19", "o12" };
 
-
     @Override
     public int getNumINPins() {
         return 10;
@@ -74,7 +76,7 @@ public class PAL10L8Specs implements PALSpecs {
 
     @Override
     public String toString() {
-        return "PAL10L8";
+        return "PAL"+PAL_TYPE;
     }
 
     @Override

+ 4 - 2
src/main/java/info/hkzlab/dupal/analyzer/devices/PAL12L6Specs.java

@@ -1,12 +1,14 @@
 package info.hkzlab.dupal.analyzer.devices;
 
 public class PAL12L6Specs implements PALSpecs {
+
+    public static final String PAL_TYPE = "12L6";
+
     private static final String[] ROUT_PIN_NAMES = { };
     private static final String[] IN_PIN_NAMES = { "i1", "i2", "i3", "i4", "i5", "i6", "i7", "i8", "i9", "i11", null, null, null, null, null, null, "i19", "i12"};
     private static final String[] IO_PIN_NAMES = { };
     private static final String[] OUT_PIN_NAMES = { "o18", "o17", "o16", "o15", "o14", "o13", null, null };
 
-
     @Override
     public int getNumINPins() {
         return 12;
@@ -74,7 +76,7 @@ public class PAL12L6Specs implements PALSpecs {
 
     @Override
     public String toString() {
-        return "PAL12L6";
+        return "PAL"+PAL_TYPE;
     }
 
     @Override

+ 4 - 2
src/main/java/info/hkzlab/dupal/analyzer/devices/PAL16L8Specs.java

@@ -1,12 +1,14 @@
 package info.hkzlab.dupal.analyzer.devices;
 
 public class PAL16L8Specs implements PALSpecs {
+
+    public static final String PAL_TYPE = "16L8";
+
     private static final String[] ROUT_PIN_NAMES = { };
     private static final String[] IN_PIN_NAMES = { "i1", "i2", "i3", "i4", "i5", "i6", "i7", "i8", "i9", "i11" };
     private static final String[] IO_PIN_NAMES = { "io18", "io17", "io16", "io15", "io14", "io13", null, null };
     private static final String[] OUT_PIN_NAMES = { null, null, null, null, null, null, "o19", "o12" };
 
-
     @Override
     public int getNumINPins() {
         return 10;
@@ -74,7 +76,7 @@ public class PAL16L8Specs implements PALSpecs {
 
     @Override
     public String toString() {
-        return "PAL16L8";
+        return "PAL"+PAL_TYPE;
     }
 
     @Override

+ 4 - 2
src/main/java/info/hkzlab/dupal/analyzer/devices/PAL16R4Specs.java

@@ -1,12 +1,14 @@
 package info.hkzlab.dupal.analyzer.devices;
 
 public class PAL16R4Specs implements PALSpecs {
+
+    public static final String PAL_TYPE = "16R4";
+
     private static final String[] ROUT_PIN_NAMES = { "ro14", "ro15", "ro16", "ro17" };
     private static final String[] IN_PIN_NAMES = { null, "i2", "i3", "i4", "i5", "i6", "i7", "i8", "i9" };
     private static final String[] IO_PIN_NAMES = { "io18", null, null, null, null, "io13", "io19", "io12" };
     private static final String[] OUT_PIN_NAMES = { };
 
-
     @Override
     public int getNumINPins() {
         return 8;
@@ -74,7 +76,7 @@ public class PAL16R4Specs implements PALSpecs {
 
     @Override
     public String toString() {
-        return "PAL16R4";
+        return "PAL"+PAL_TYPE;
     }
 
     @Override

+ 4 - 1
src/main/java/info/hkzlab/dupal/analyzer/devices/PAL16R6Specs.java

@@ -1,6 +1,9 @@
 package info.hkzlab.dupal.analyzer.devices;
 
 public class PAL16R6Specs implements PALSpecs {
+
+    public static final String PAL_TYPE = "16R6";
+
     private static final String[] ROUT_PIN_NAMES = { "ro13", "ro14", "ro15", "ro16", "ro17", "ro18" };
     private static final String[] IN_PIN_NAMES = { null, "i2", "i3", "i4", "i5", "i6", "i7", "i8", "i9" };
     private static final String[] IO_PIN_NAMES = { null, null, null, null, null, null, "io19", "io12" };
@@ -73,7 +76,7 @@ public class PAL16R6Specs implements PALSpecs {
 
     @Override
     public String toString() {
-        return "PAL16R6";
+        return "PAL"+PAL_TYPE;
     }
 
     @Override

+ 4 - 2
src/main/java/info/hkzlab/dupal/analyzer/devices/PAL16R8Specs.java

@@ -1,12 +1,14 @@
 package info.hkzlab.dupal.analyzer.devices;
 
 public class PAL16R8Specs implements PALSpecs {
+
+    public static final String PAL_TYPE = "16R8";
+
     private static final String[] ROUT_PIN_NAMES = { "ro12", "ro19" ,"ro13", "ro14", "ro15", "ro16", "ro17", "ro18" };
     private static final String[] IN_PIN_NAMES = { null, "i2", "i3", "i4", "i5", "i6", "i7", "i8", "i9" };
     private static final String[] IO_PIN_NAMES = { };
     private static final String[] OUT_PIN_NAMES = { };
 
-
     @Override
     public int getNumINPins() {
         return 8;
@@ -74,7 +76,7 @@ public class PAL16R8Specs implements PALSpecs {
 
     @Override
     public String toString() {
-        return "PAL16R8";
+        return "PAL"+PAL_TYPE;
     }
 
     @Override