From d5aa951a49a22f2d8eb959f026d9f80a03e577b5 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 8 Feb 2021 23:21:34 -0500 Subject: [PATCH] trying to help kinetis by reducing RAM usage back to where it was --- .../config/boards/kinetis/config/gen_config.sh | 2 +- .../tunerstudio/generated/kinetis_prefix.txt | 0 firmware/integration/rusefi_config.txt | 1 + .../com/rusefi/test/VariableRegistryTest.java | 18 ++++++++++++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) delete mode 100644 firmware/config/boards/kinetis/config/tunerstudio/generated/kinetis_prefix.txt diff --git a/firmware/config/boards/kinetis/config/gen_config.sh b/firmware/config/boards/kinetis/config/gen_config.sh index 4382153199..3e8fb7d9f9 100644 --- a/firmware/config/boards/kinetis/config/gen_config.sh +++ b/firmware/config/boards/kinetis/config/gen_config.sh @@ -34,6 +34,6 @@ java \ -enumInputFile controllers/algo/rusefi_enums.h \ -enumInputFile controllers/algo/rusefi_hw_enums.h \ -board kinetis \ - -prepend config/boards/kinetis/config/tunerstudio/generated/kinetis_prefix.txt + -prepend config/boards/kinetis/config/rusefi_config_kinetis.txt [ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for kinetis"; exit 1; } diff --git a/firmware/config/boards/kinetis/config/tunerstudio/generated/kinetis_prefix.txt b/firmware/config/boards/kinetis/config/tunerstudio/generated/kinetis_prefix.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 119260e7a8..903bf08138 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1937,3 +1937,4 @@ end_struct #define show_Frankenso_presets true #define show_microRusEFI_presets true #define show_Proteus_presets true + diff --git a/java_tools/configuration_definition/src/com/rusefi/test/VariableRegistryTest.java b/java_tools/configuration_definition/src/com/rusefi/test/VariableRegistryTest.java index d0c0bc99b1..b58e134adc 100644 --- a/java_tools/configuration_definition/src/com/rusefi/test/VariableRegistryTest.java +++ b/java_tools/configuration_definition/src/com/rusefi/test/VariableRegistryTest.java @@ -37,4 +37,22 @@ public class VariableRegistryTest { assertEquals("ab'r'", registry.applyVariables("ab@@SD_r@@")); assertEquals("abr", registry.applyVariables("ab@@SD_r" + CHAR_SUFFIX + "@@")); } + + @Test + public void testPrepend() { + VariableRegistry registry = new VariableRegistry(); + registry.register("key_string", "value_1"); + assertEquals("value_1", registry.get("key_string")); + + registry.register("key_string", "value_2"); + assertEquals("value_1", registry.get("key_string")); + + registry.register("key_int", 1); + assertEquals("1", registry.get("key_int")); + assertEquals("1", registry.get("key_int" + _HEX_SUFFIX)); + + registry.register("key_int", 2); + assertEquals("1", registry.get("key_int")); + assertEquals("1", registry.get("key_int" + _HEX_SUFFIX)); + } }