diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index a4a5dec428..c8d5e1bf40 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -341,5 +341,6 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 0 int16_t autoscale rawBattery;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 5, 3 + pid_status_s[CAM_INPUTS_COUNT iterate] vvtStatus uint8_t[160] unusedAtTheEnd;;"",1, 0, 0, 0, 0 end_struct diff --git a/firmware/gen_config.sh b/firmware/gen_config.sh index c4d8ada997..2498e4e898 100755 --- a/firmware/gen_config.sh +++ b/firmware/gen_config.sh @@ -62,6 +62,9 @@ done config/boards/kinetis/config/gen_kinetis_config.sh [ $? -eq 0 ] || { echo "ERROR generating board kinetis kin"; exit 1; } +# nasty: undo effects of custom kinetis generated files +gen_live_documentation.sh + config/boards/hellen/cypress/config/gen_cypress_config.sh [ $? -eq 0 ] || { echo "ERROR generating board hellen_cypress hellen_cypress"; exit 1; } diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 4f22998e94..ef3cf051e6 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/ldmp/UsagesReader.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java index a13fa59407..4a4080049f 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java @@ -3,10 +3,6 @@ package com.rusefi.ldmp; import com.devexperts.logging.Logging; import com.rusefi.ConfigDefinition; import com.rusefi.ReaderState; -import com.rusefi.RusefiParseErrorStrategy; -import com.rusefi.newparse.ParseState; -import com.rusefi.newparse.outputs.OutputChannelWriter; -import com.rusefi.newparse.parsing.Definition; import com.rusefi.output.*; import org.yaml.snakeyaml.Yaml; @@ -37,6 +33,8 @@ public class UsagesReader { private final StringBuilder fragmentsContent = new StringBuilder(header); + private static final String EXTRA_PREPEND = System.getProperty("UsagesReader.prepend"); + public static void main(String[] args) throws IOException { if (args.length != 1) { System.err.println("One parameter expected: name of live data yaml input file"); @@ -78,7 +76,7 @@ public class UsagesReader { JavaSensorsConsumer javaSensorsConsumer = new JavaSensorsConsumer(); String tsOutputsDestination = "console/binary/"; - OutputChannelWriter outputChannelWriter = new OutputChannelWriter(tsOutputsDestination + File.separator + "generated/output_channels.ini"); + ConfigurationConsumer outputsSections = new OutputsSectionConsumer(tsOutputsDestination + File.separator + "generated/output_channels.ini"); ConfigurationConsumer dataLogConsumer = new DataLogConsumer(tsOutputsDestination + File.separator + "generated/data_logs.ini"); @@ -91,41 +89,25 @@ public class UsagesReader { log.info("Starting " + name + " at " + startingPosition); ReaderState state = new ReaderState(); - String definitionInputFile = folder + File.separator + name + ".txt"; - state.setDefinitionInputFile(definitionInputFile); + state.setDefinitionInputFile(folder + File.separator + name + ".txt"); state.withC_Defines = withCDefines; state.addDestination(javaSensorsConsumer, + outputsSections, dataLogConsumer ); FragmentDialogConsumer fragmentDialogConsumer = new FragmentDialogConsumer(name); state.addDestination(fragmentDialogConsumer); + if (EXTRA_PREPEND != null) { + System.out.println("EXTRA_PREPEND=" + EXTRA_PREPEND); + state.addPrepend(EXTRA_PREPEND); + } state.addPrepend(prepend); state.addCHeaderDestination(folder + File.separator + name + "_generated.h"); state.addJavaDestination("../java_console/models/src/main/java/com/rusefi/config/generated/" + javaName); state.doJob(); - { - ParseState parseState = new ParseState(state.enumsReader); - - parseState.setDefinitionPolicy(Definition.OverwritePolicy.NotAllowed); - - if (prepend != null && !prepend.isEmpty()) { - RusefiParseErrorStrategy.parseDefinitionFile(parseState.getListener(), prepend); - } - - RusefiParseErrorStrategy.parseDefinitionFile(parseState.getListener(), definitionInputFile); - - // if (outputNames.length == 0) { - outputChannelWriter.writeOutputChannels(parseState, null); - // } else { - // for (int i = 0; i < outputNames.length; i++) { - // outputChannelWriter.writeOutputChannels(parseState, outputNames[i]); - // } - // } - } - fancyNewStuff.append(fragmentDialogConsumer.getContent()); fancyNewMenu.append(fragmentDialogConsumer.menuLine());