From 24a9bbe107b610f2406d39c14cb98fc9e1f0aae6 Mon Sep 17 00:00:00 2001
From: rusefi <rusefi@users.noreply.github.com>
Date: Sun, 26 Mar 2017 18:09:37 -0400
Subject: [PATCH] #382 non-numeric defines into C sources

---
 java_tools/ConfigDefinition.jar               | Bin 32229 -> 32247 bytes
 .../src/com/rusefi/VariableRegistry.java      |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index e87a405b361efd02197d2446fc0a52f3e25e3289..24ff841dfe70e0b8acc342bec119a25f085c3ea6 100644
GIT binary patch
delta 3926
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

delta 3878
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
Vqx8?L3IM==z7w(lKt{|~_b(!9Hx2**

diff --git a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java
index 9c918ea1f0..b764a46baa 100644
--- a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java
+++ b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java
@@ -20,7 +20,7 @@ public class VariableRegistry extends TreeMap<String, String> {
 
     public Map<String, Integer> intValues = new HashMap<>();
 
-    private final StringBuilder cNumbericDefinitions = new StringBuilder();
+    private final StringBuilder cAllDefinitions = new StringBuilder();
     private final StringBuilder javaNumbericDefinitions = new StringBuilder();
 
     private VariableRegistry() {
@@ -47,6 +47,7 @@ public class VariableRegistry extends TreeMap<String, String> {
         System.out.println("Registering " + var + " as " + value);
         put(var, value);
 
+        cAllDefinitions.append("#define " + var + " " + value + "\r\n");
         tryToRegisterAsInteger(var, value);
     }
 
@@ -58,7 +59,6 @@ public class VariableRegistry extends TreeMap<String, String> {
             if (intValues.containsKey(var))
                 throw new IllegalStateException("Not allowed to redefine: " + var);
             intValues.put(var, intValue);
-            cNumbericDefinitions.append("#define " + var + " " + intValue + "\r\n");
             javaNumbericDefinitions.append("\tpublic static final int " + var + " = " + intValue + ";\r\n");
         } catch (NumberFormatException e) {
             System.out.println("Not an integer: " + value);
@@ -75,7 +75,7 @@ public class VariableRegistry extends TreeMap<String, String> {
         System.out.println("Writing to " + fileName);
         BufferedWriter cHeader = new BufferedWriter(new FileWriter(fileName));
 
-        cHeader.write(cNumbericDefinitions.toString());
+        cHeader.write(cAllDefinitions.toString());
         cHeader.close();
     }