diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index b04811e9e2..359f50a77c 100644 Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ diff --git a/java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java b/java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java index 4f6fb98847..1556fe8f0a 100644 --- a/java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java +++ b/java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java @@ -54,9 +54,8 @@ public class TSProjectConsumer implements ConfigurationConsumer { } if (configField.isBit()) { - tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH)); - tsHeader.write("= bits, U32, "); - tsHeader.write("\t" + tsPosition + ", ["); + tsHeader.write(nameWithPrefix + " = bits, U32,"); + tsHeader.write(" " + tsPosition + ", ["); tsHeader.write(bitIndex + ":" + bitIndex); tsHeader.write("], \"" + configField.getFalseName() + "\", \"" + configField.getTrueName() + "\""); tsHeader.write(EOL); @@ -71,29 +70,25 @@ public class TSProjectConsumer implements ConfigurationConsumer { bits = handleTsInfo(bits, 5); } - tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH)); - int size = configField.getState().tsCustomSize.get(configField.getType()); -// tsHeader.headerWrite("\t" + size + ","); - // tsHeader.headerWrite("\t" + tsPosition + ","); bits = bits.replaceAll("@OFFSET@", "" + tsPosition); - tsHeader.write("\t = " + bits); + tsHeader.write(nameWithPrefix + " = " + bits); - tsPosition += size; + tsPosition += configField.getState().tsCustomSize.get(configField.getType()); } else if (configField.getTsInfo() == null) { throw new IllegalArgumentException("Need TS info for " + configField.getName() + " at "+ prefix); } else if (configField.getArraySize() != 1) { - tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH) + "\t\t= array, "); + tsHeader.write(nameWithPrefix + " = array, "); tsHeader.write(TypesHelper.convertToTs(configField.getType()) + ","); - tsHeader.write("\t" + tsPosition + ","); - tsHeader.write("\t[" + configField.getArraySize() + "],"); - tsHeader.write("\t" + handleTsInfo(configField.getTsInfo(), 1)); + tsHeader.write(" " + tsPosition + ","); + tsHeader.write(" [" + configField.getArraySize() + "],"); + tsHeader.write(" " + handleTsInfo(configField.getTsInfo(), 1)); tsPosition += configField.getArraySize() * configField.getElementSize(); } else { - tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH) + "\t\t= scalar, "); + tsHeader.write(nameWithPrefix + " = scalar, "); tsHeader.write(TypesHelper.convertToTs(configField.getType()) + ","); - tsHeader.write("\t" + tsPosition + ","); - tsHeader.write("\t" + handleTsInfo(configField.getTsInfo(), 1)); + tsHeader.write(" " + tsPosition + ","); + tsHeader.write(" " + handleTsInfo(configField.getTsInfo(), 1)); tsPosition += configField.getArraySize() * configField.getElementSize(); } tsHeader.write(EOL); @@ -264,15 +259,4 @@ public class TSProjectConsumer implements ConfigurationConsumer { VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", totalTsSize); } } - - - private static String addTabsUpTo(String name, int length) { - StringBuilder result = new StringBuilder(name); - int currentLength = name.length(); - while (currentLength < length) { - result.append("\t"); - currentLength += 4; - } - return result.toString(); - } } diff --git a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java b/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java index e36b7ff978..3b45c65660 100644 --- a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java +++ b/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java @@ -49,7 +49,7 @@ public class ConfigFieldParserTest { CharArrayWriter writer = new CharArrayWriter(); TestTSProjectConsumer javaFieldsConsumer = new TestTSProjectConsumer(writer, "", state); state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer)); - assertEquals("\tafr_type\t\t\t\t\t = bits, S32, 0, [0:1], \"BPSX\", \"Innovate\", \"14Point7\", \"INVALID\"\n" + + assertEquals("afr_type = bits, S32, 0, [0:1], \"BPSX\", \"Innovate\", \"14Point7\", \"INVALID\"\n" + "; total TS size = 4\n", new String(writer.toCharArray())); } @@ -119,9 +119,9 @@ public class ConfigFieldParserTest { state.readBufferedReader(reader, Collections.singletonList(javaFieldsConsumer)); - assertEquals("\tperiodMs\t\t\t\t\t\t= scalar, S16,\t0,\t\"ms\", 0.1, 0, 0, 3000, 0\n" + - "\tperiodMs2\t\t\t\t\t\t= scalar, S16,\t2,\t\"ms\", 1.0, 0, 0, 3000, 0\n" + - "\tafrTable\t\t\t\t\t = array, U08, 4, [4x4],\"deg\", 0.1, 0, 0, 25.0, 1\n" + + assertEquals("periodMs = scalar, S16, 0, \"ms\", 0.1, 0, 0, 3000, 0\n" + + "periodMs2 = scalar, S16, 2, \"ms\", 1.0, 0, 0, 3000, 0\n" + + "afrTable = array, U08, 4, [4x4],\"deg\", 0.1, 0, 0, 25.0, 1\n" + "; total TS size = 20\n", new String(writer.toCharArray())); }