From 302fc025459ba28cdd4a2795bf1dc39bd832615e Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 12 Apr 2020 23:32:22 -0400 Subject: [PATCH] processor progress --- .../src/com/rusefi/VariableRegistry.java | 1 + .../src/com/rusefi/test/ConfigFieldParserTest.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java index c39729375a..cae4d11cbf 100644 --- a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java +++ b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java @@ -55,6 +55,7 @@ public class VariableRegistry extends TreeMap { SystemOut.println("Not redefining " + var); return; } + value = applyVariables(value); SystemOut.println("Registering " + var + " as " + value); put(var, value); 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 a0e2057dcf..7dc0b8cf16 100644 --- a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java +++ b/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java @@ -57,7 +57,7 @@ public class ConfigFieldParserTest { String test = "struct pid_s\n" + "#define ERROR_BUFFER_SIZE 120\n" + "#define ERROR_BUFFER_COUNT 120\n" + - "#define RESULT 120*@@ERROR_BUFFER_COUNT@@\n" + + "#define RESULT @@ERROR_BUFFER_SIZE@@*@@ERROR_BUFFER_COUNT@@\n" + "\tint16_t periodMs;PID dTime;\"ms\", 1, 0, 0, 3000, 0\n" + "end_struct\n" + ""; @@ -68,7 +68,7 @@ public class ConfigFieldParserTest { assertEquals("#define ERROR_BUFFER_COUNT 120\n" + "#define ERROR_BUFFER_SIZE 120\n" + - "#define RESULT 120*@@ERROR_BUFFER_COUNT@@\n", VariableRegistry.INSTANCE.getDefinesSection()); + "#define RESULT 120*120\n", VariableRegistry.INSTANCE.getDefinesSection()); } @Test