diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index f9b4e238e2..bbf46b0ebb 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -3816,3 +3816,5 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif + + diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index db9ec00614..fa92e05b9f 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/TSProjectConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java index d85e5470a1..4096a88ab2 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java @@ -46,12 +46,12 @@ public class TSProjectConsumer implements ConfigurationConsumer { return tsPosition; } - if (configField.getComment() != null && configField.getComment().trim().length() > 0) { + ConfigStructure cs = configField.getState().structures.get(configField.getType()); + if (configField.getComment() != null && configField.getComment().trim().length() > 0 && cs == null) { settingContextHelp.append("\t" + nameWithPrefix + " = \"" + configField.getCommentContent() + "\"" + EOL); } state.variableRegistry.register(nameWithPrefix + "_offset", tsPosition); - ConfigStructure cs = configField.getState().structures.get(configField.getType()); if (cs != null) { String extraPrefix = cs.withPrefix ? configField.getName() + "_" : ""; return writeTunerStudio(cs, prefix + extraPrefix, tsHeader, tsPosition); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserTest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserTest.java index 6056e6d7ce..5432c9f1dc 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserTest.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserTest.java @@ -437,7 +437,7 @@ public class ConfigFieldParserTest { assertEquals("pid_afr_type = scalar, F32, 0, \"ms\", 1, 0, 0, 3000, 0\n" + "pid_afr_typet = scalar, F32, 4, \"ms\", 1, 0, 0, 3000, 0\n" + "; total TS size = 8\n", new String(writer.toCharArray())); - assertEquals("\tpid = \"comment\"\n" + + assertEquals( "\tpid_afr_type = \"PID dTime\"\n" + "\tpid_afr_typet = \"PID dTime\"\n", tsProjectConsumer.getSettingContextHelp().toString()); }