diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 79eb52bb6c..ab7a1435ea 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/output/ConfigStructureImpl.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigStructureImpl.java index 092764fd5d..a963a18573 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigStructureImpl.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigStructureImpl.java @@ -17,7 +17,6 @@ import static com.rusefi.ConfigFieldImpl.BOOLEAN_T; */ public class ConfigStructureImpl implements ConfigStructure { public static final String ALIGNMENT_FILL_AT = "alignmentFill_at_"; - public static final String UNUSED_ANYTHING_PREFIX = "unused"; public static final String UNUSED_BIT_PREFIX = "unusedBit_"; private final String name; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java index bcd3f143af..162d389175 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java @@ -23,7 +23,7 @@ public class DataLogConsumer implements ConfigurationConsumer { // https://github.com/rusefi/web_backend/issues/166 private static final int MSQ_LENGTH_LIMIT = 34; - public static final String UNUSED = ConfigStructureImpl.UNUSED_ANYTHING_PREFIX; + public static final String UNUSED = ConfigStructure.UNUSED_ANYTHING_PREFIX; private final String fileName; private final StringBuilder tsWriter = new StringBuilder(); private final TreeSet comments = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsContent.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsContent.java index d564002004..7d753c967d 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsContent.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsContent.java @@ -1,7 +1,6 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ConfigFieldImpl; import com.rusefi.ReaderState; import java.io.IOException; @@ -26,7 +25,7 @@ public class SdCardFieldsContent { private String processOutput(ConfigField configField, String prefix) { if (configField.getName().startsWith(ConfigStructureImpl.ALIGNMENT_FILL_AT)) return ""; - if (configField.getName().startsWith(ConfigStructureImpl.UNUSED_ANYTHING_PREFIX)) + if (configField.getName().startsWith(ConfigStructure.UNUSED_ANYTHING_PREFIX)) return ""; if (configField.isBit()) return ""; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java index 811ab601a2..38b1baf5fb 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java @@ -51,7 +51,7 @@ public class TsOutput { if (!usedNames.add(nameWithPrefix) && !isConstantsSection && !configField.getName().startsWith(ConfigStructureImpl.ALIGNMENT_FILL_AT) - && !configField.getName().startsWith(ConfigStructureImpl.UNUSED_ANYTHING_PREFIX)) { + && !configField.getName().startsWith(ConfigStructure.UNUSED_ANYTHING_PREFIX)) { throw new IllegalStateException(nameWithPrefix + " already present: " + configField); } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/BitState.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/BitState.java similarity index 100% rename from java_tools/configuration_definition/src/main/java/com/rusefi/BitState.java rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/BitState.java diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ConfigField.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ConfigField.java index ff389827a4..fa04cdae2c 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ConfigField.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ConfigField.java @@ -4,6 +4,158 @@ import com.rusefi.core.Pair; import com.rusefi.output.ConfigStructure; public interface ConfigField { + ConfigField VOID = new ConfigField() { + @Override + public ConfigStructure getStructureType() { + return null; + } + + @Override + public boolean isArray() { + return false; + } + + @Override + public String getArraySizeVariableName() { + return null; + } + + @Override + public String getTrueName() { + return null; + } + + @Override + public String getFalseName() { + return null; + } + + @Override + public boolean isBit() { + return false; + } + + @Override + public boolean isDirective() { + return false; + } + + @Override + public int getSize(ConfigField next) { + return 0; + } + + @Override + public int[] getArraySizes() { + return new int[0]; + } + + @Override + public String getComment() { + return null; + } + + @Override + public String getName() { + return null; + } + + @Override + public String getType() { + return null; + } + + @Override + public int getElementSize() { + return 0; + } + + @Override + public boolean isIterate() { + return false; + } + + @Override + public boolean isHasAutoscale() { + return false; + } + + @Override + public ReaderState getState() { + return null; + } + + @Override + public String getTsInfo() { + return null; + } + + @Override + public boolean isFsioVisible() { + return false; + } + + @Override + public String autoscaleSpec() { + return null; + } + + @Override + public double autoscaleSpecNumber() { + return 0; + } + + @Override + public Pair autoscaleSpecPair() { + return null; + } + + @Override + public String[] getTokens() { + return new String[0]; + } + + @Override + public String getUnits() { + return null; + } + + @Override + public double getMin() { + return 0; + } + + @Override + public double getMax() { + return 0; + } + + @Override + public int getDigits() { + return 0; + } + + @Override + public String getIterateOriginalName() { + return null; + } + + @Override + public int getIterateIndex() { + return 0; + } + + @Override + public boolean isFromIterate() { + return false; + } + + @Override + public String getCommentTemplated() { + return null; + } + }; + ConfigStructure getStructureType(); boolean isArray(); diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/ConfigStructure.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/ConfigStructure.java index 785ae8927e..05ccc0fd58 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/ConfigStructure.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/ConfigStructure.java @@ -5,6 +5,8 @@ import com.rusefi.ConfigField; import java.util.List; public interface ConfigStructure { + String UNUSED_ANYTHING_PREFIX = "unused"; + String getName(); int getTotalSize(); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldIterator.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FieldIterator.java similarity index 86% rename from java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldIterator.java rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FieldIterator.java index 6ae22aad71..be0b7b9bf4 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldIterator.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FieldIterator.java @@ -2,7 +2,6 @@ package com.rusefi.output; import com.rusefi.BitState; import com.rusefi.ConfigField; -import com.rusefi.ConfigFieldImpl; import java.util.List; @@ -13,7 +12,7 @@ import java.util.List; public class FieldIterator { private final List fields; BitState bitState = new BitState(); - private ConfigField prev = ConfigFieldImpl.VOID; + private ConfigField prev = ConfigField.VOID; ConfigField next; ConfigField cf; @@ -33,7 +32,7 @@ public class FieldIterator { while (nextIndex < fields.size() && fields.get(nextIndex).isDirective()) nextIndex++; - next = nextIndex >= fields.size() ? ConfigFieldImpl.VOID : fields.get(nextIndex); + next = nextIndex >= fields.size() ? ConfigField.VOID : fields.get(nextIndex); cf = fields.get(index); } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldsStrategy.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FieldsStrategy.java similarity index 96% rename from java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldsStrategy.java rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FieldsStrategy.java index 59e02beec0..0eaf019fe2 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldsStrategy.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FieldsStrategy.java @@ -1,7 +1,6 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ConfigFieldImpl; import com.rusefi.ReaderState; import java.util.List; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/JavaFieldsConsumer.java similarity index 96% rename from java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/output/JavaFieldsConsumer.java index 4f312e8a3b..d09dbe6165 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/JavaFieldsConsumer.java @@ -17,7 +17,7 @@ public abstract class JavaFieldsConsumer implements ConfigurationConsumer { protected final ReaderState state; private final int baseOffset; - public JavaFieldsConsumer(ReaderStateImpl state, int baseOffset) { + public JavaFieldsConsumer(ReaderState state, int baseOffset) { this.state = state; this.baseOffset = baseOffset; } @@ -74,7 +74,7 @@ public abstract class JavaFieldsConsumer implements ConfigurationConsumer { String nameWithPrefix = prefix + configField.getName(); if (configField.isBit()) { - if (!configField.getName().startsWith(DataLogConsumer.UNUSED)) { + if (!configField.getName().startsWith(ConfigStructure.UNUSED_ANYTHING_PREFIX)) { writeJavaFieldName(nameWithPrefix, tsPosition); content.append("FieldType.BIT, " + bitIndex + ")" + terminateField()); }