Fixed missing enumerated definitions when two fields use same global

enumeration.
LSTS · Dec 15, 2013 · fd69611 · fd69611
1 parent b2b1715
commit fd69611
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src-generated/pt/lsts/imc/DesiredPath.java b/src-generated/pt/lsts/imc/DesiredPath.java
@@ -86,7 +86,10 @@ public long value() {
 	}
 
 	public enum END_Z_UNITS {
-;
+		NONE(0),
+		DEPTH(1),
+		ALTITUDE(2),
+		HEIGHT(3);
 
 		protected long value;
 

diff --git a/src-generated/pt/lsts/imc/Elevator.java b/src-generated/pt/lsts/imc/Elevator.java
@@ -64,7 +64,10 @@ public long value() {
 	}
 
 	public enum END_Z_UNITS {
-;
+		NONE(0),
+		DEPTH(1),
+		ALTITUDE(2),
+		HEIGHT(3);
 
 		protected long value;
 

diff --git a/src-generated/pt/lsts/imc/PathControlState.java b/src-generated/pt/lsts/imc/PathControlState.java
@@ -65,7 +65,10 @@ public long value() {
 	}
 
 	public enum END_Z_UNITS {
-;
+		NONE(0),
+		DEPTH(1),
+		ALTITUDE(2),
+		HEIGHT(3);
 
 		protected long value;
 

diff --git a/src-generator/pt/lsts/imc/generator/ClassGenerator.java b/src-generator/pt/lsts/imc/generator/ClassGenerator.java
@@ -954,9 +954,11 @@ else if (type.getFieldType(field) == IMCFieldType.TYPE_UINT16
                 bw.write("\tpublic enum " + field.toUpperCase() + " {\n");
                 boolean first = true;
                 for (String name : enum_vals.keySet()) {
-                    if (generatedEnumDefs.contains(name))
-                        continue;
-                    generatedEnumDefs.add(name);
+                    //if (generatedEnumDefs.contains(name)) {
+                    //	System.out.println("Message "+msgName+": "+name);
+                    //    continue;
+                    //}
+                    //generatedEnumDefs.add(name);
                     if (!first)
                         bw.write(",\n");
                     bw.write("\t\t" + name.toUpperCase() + "(" + enum_vals.get(name) + ")");