diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 75c62cb02d..3b3a25f251 100644 Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java index d89cab2e93..825612d9ac 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java @@ -83,9 +83,6 @@ public class ParseState implements DefinitionsState { if (stringValueMap == null) return null; for (Value value : stringValueMap.values()) { - if (value.isForceSize()) - continue; - if (isNumeric(value.getValue())) { valueNameById.put(value.getIntValue(), value.getName()); } else { diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java b/java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java index 61253793e8..32722a4f47 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java @@ -15,10 +15,6 @@ import java.util.Map; * produces java enum class from an enum defined in a C/C++ header */ public class ToJavaEnum { - - public static final String FORCE_2_BYTES_SIZE = "Force_2_bytes_size"; - public static final String FORCE_4_BYTES_SIZE = "Force_4_bytes_size"; - public static void main(String[] args) throws IOException { InvokeReader invokeReader = new InvokeReader(args).invoke(); String outputPath = invokeReader.getOutputPath(); @@ -64,9 +60,7 @@ public class ToJavaEnum { int index = 0; for (Value value : sorted) { int numericValue = value.getIntValueMaybeResolve(registry); - if (index != numericValue - && !value.getName().startsWith(FORCE_2_BYTES_SIZE) - && !value.getName().startsWith(FORCE_4_BYTES_SIZE)) + if (index != numericValue) throw new IllegalStateException("Got explicit ordinal " + numericValue + " instead of ordinal " + index + " in " + value); sb.append("\t" + value.getName() + ",\n"); index++; diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java b/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java index 213d6cef14..7d1c54fff1 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java @@ -110,8 +110,6 @@ public class VariableRegistry { TreeMap valueNameById = new TreeMap<>(); for (Value value : stringValueMap.values()) { - if (value.isForceSize()) - continue; if (isNumeric(value.getValue())) { valueNameById.put(value.getIntValue(), value.getName()); diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java b/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java index 182f2dec2f..c418bc1e9e 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java @@ -4,9 +4,6 @@ import com.rusefi.VariableRegistry; import java.util.Objects; -import static com.rusefi.ToJavaEnum.FORCE_2_BYTES_SIZE; -import static com.rusefi.ToJavaEnum.FORCE_4_BYTES_SIZE; - public class Value implements Comparable { private final String name; private final String value; @@ -16,10 +13,6 @@ public class Value implements Comparable { this.value = value; } - public boolean isForceSize() { - return getName().startsWith(FORCE_2_BYTES_SIZE) || getName().startsWith(FORCE_4_BYTES_SIZE); - } - public String getName() { return name; }