From 0785bc6e86ebfe81d98fff6b25e8199df189dea0 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 16 Aug 2022 22:32:21 -0400 Subject: [PATCH] romraider is gone part 3 --- .../cypress/config/java_console/rusefi.xml | 240 ------------------ .../kinetis/config/java_console/rusefi.xml | 240 ------------------ firmware/gen_config_common.sh | 2 - firmware/integration/rusefi_template.xml | 213 ---------------- java_console/rusefi.xml | 213 ---------------- .../java/com/rusefi/ConfigDefinition.java | 15 -- .../src/main/java/com/rusefi/ExtraUtil.java | 23 -- 7 files changed, 946 deletions(-) delete mode 100644 firmware/config/boards/cypress/config/java_console/rusefi.xml delete mode 100644 firmware/config/boards/kinetis/config/java_console/rusefi.xml delete mode 100644 firmware/integration/rusefi_template.xml delete mode 100644 java_console/rusefi.xml diff --git a/firmware/config/boards/cypress/config/java_console/rusefi.xml b/firmware/config/boards/cypress/config/java_console/rusefi.xml deleted file mode 100644 index a604cc82b4..0000000000 --- a/firmware/config/boards/cypress/config/java_console/rusefi.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - RUSEFI - 0 - OPEN_SR5_0.1 - RUSEFI - rusEfi - rusEfi - 19988 - - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - - - -
- -
- - - - -
- -
- - - - -
- -
- - - - - -
- -
- - - - -
- -
- - - - diff --git a/firmware/config/boards/kinetis/config/java_console/rusefi.xml b/firmware/config/boards/kinetis/config/java_console/rusefi.xml deleted file mode 100644 index a604cc82b4..0000000000 --- a/firmware/config/boards/kinetis/config/java_console/rusefi.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - RUSEFI - 0 - OPEN_SR5_0.1 - RUSEFI - rusEfi - rusEfi - 19988 - - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - - - -
- -
- - - - -
- -
- - - - -
- -
- - - - - -
- -
- - - - -
- -
- - - - diff --git a/firmware/gen_config_common.sh b/firmware/gen_config_common.sh index 83746e00fd..57a8a7ec2c 100755 --- a/firmware/gen_config_common.sh +++ b/firmware/gen_config_common.sh @@ -12,11 +12,9 @@ COMMON_GEN_CONFIG=" -ts_destination tunerstudio \ -firing_order controllers/algo/firing_order.h \ -triggerInputFolder ../unit_tests \ - -romraider_input_file integration/rusefi_template.xml \ -with_c_defines false \ -field_lookup_file controllers/lua/generated/value_lookup_generated.cpp \ -java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/Fields.java \ - -romraider_destination ../java_console/rusefi.xml \ -initialize_to_zero false \ -prepend console/binary/generated/total_live_data_generated.h \ -signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \ diff --git a/firmware/integration/rusefi_template.xml b/firmware/integration/rusefi_template.xml deleted file mode 100644 index 20c521ac05..0000000000 --- a/firmware/integration/rusefi_template.xml +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - RUSEFI - 0 - OPEN_SR5_0.1 - RUSEFI - rusEfi - rusEfi - @@TOTAL_CONFIG_SIZE@@ - - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - - - -
- -
- - - - -
- -
- - - - -
- -
- - - - -
- -
- - - - \ No newline at end of file diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml deleted file mode 100644 index 7be4f9087e..0000000000 --- a/java_console/rusefi.xml +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - RUSEFI - 0 - OPEN_SR5_0.1 - RUSEFI - rusEfi - rusEfi - 21300 - - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - -
- - - - -
- -
- - - - -
- -
- - - - -
- -
- - - - -
- -
- - - - -
- -
- - - - diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java index d23a072c5a..5e2c3f67f9 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java @@ -19,13 +19,11 @@ public class ConfigDefinition { public static final String SIGNATURE_HASH = "SIGNATURE_HASH"; private static final String KEY_DEFINITION = "-definition"; - private static final String KEY_ROMRAIDER_INPUT = "-romraider_input_file"; private static final String KEY_TS_DESTINATION = "-ts_destination"; private static final String KEY_C_DESTINATION = "-c_destination"; private static final String KEY_C_DEFINES = "-c_defines"; public static final String KEY_WITH_C_DEFINES = "-with_c_defines"; private static final String KEY_JAVA_DESTINATION = "-java_destination"; - private static final String KEY_ROMRAIDER_DESTINATION = "-romraider_destination"; private static final String KEY_FIRING = "-firing_order"; public static final String KEY_PREPEND = "-prepend"; private static final String KEY_SIGNATURE = "-signature"; @@ -66,9 +64,7 @@ public class ConfigDefinition { String tsInputFileFolder = null; String destCDefinesFileName = null; - String romRaiderDestination = null; // we postpone reading so that in case of cache hit we do less work - String romRaiderInputFile = null; String firingEnumFileName = null; String triggersInputFolder = null; String signatureDestination = null; @@ -134,9 +130,6 @@ public class ConfigDefinition { case "-triggerInputFolder": triggersInputFolder = args[i + 1]; break; - case KEY_ROMRAIDER_DESTINATION: - romRaiderDestination = args[i + 1]; - break; case KEY_PREPEND: state.addPrepend(args[i + 1].trim()); break; @@ -154,10 +147,6 @@ public class ConfigDefinition { case "-ts_output_name": state.tsFileOutputName = args[i + 1]; break; - case KEY_ROMRAIDER_INPUT: - romRaiderInputFile = args[i + 1]; - state.inputFiles.add(romRaiderInputFile); - break; case KEY_BOARD_NAME: String boardName = args[i + 1]; pinoutLogic = PinoutLogic.create(boardName, PinoutLogic.CONFIG_BOARDS); @@ -247,9 +236,5 @@ public class ConfigDefinition { if (destCDefinesFileName != null) { ExtraUtil.writeDefinesToFile(state.variableRegistry, destCDefinesFileName, state.definitionInputFile); } - - if (romRaiderDestination != null && romRaiderInputFile != null) { - ExtraUtil.processTextTemplate(state, romRaiderInputFile, romRaiderDestination); - } } } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ExtraUtil.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ExtraUtil.java index 1300cff47d..b3384f6b30 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ExtraUtil.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ExtraUtil.java @@ -5,11 +5,7 @@ import com.rusefi.newparse.parsing.Definition; import com.rusefi.util.LazyFile; import com.rusefi.util.SystemOut; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; import java.io.IOException; -import java.util.Date; public class ExtraUtil { static void handleFiringOrder(String firingEnumFileName, VariableRegistry variableRegistry, ParseState parseState) throws IOException { @@ -21,25 +17,6 @@ public class ExtraUtil { } } - static void processTextTemplate(ReaderState state, String inputFileName, String outputFileName) throws IOException { - SystemOut.println("Reading from " + inputFileName); - SystemOut.println("Writing to " + outputFileName); - - state.variableRegistry.put("generator_message", ToolUtil.getGeneratedAutomaticallyTag() + new Date()); - - File inputFile = new File(inputFileName); - - BufferedReader fr = new BufferedReader(new FileReader(inputFile)); - LazyFile fw = new LazyFile(outputFileName); - - String line; - while ((line = fr.readLine()) != null) { - line = state.variableRegistry.applyVariables(line); - fw.write(line + ToolUtil.EOL); - } - fw.close(); - } - public static void writeDefinesToFile(VariableRegistry variableRegistry, String fileName, String headerComment) throws IOException { SystemOut.println("Writing to " + fileName);