From d9c3eba4707774f3ca182be7b2b3ed4d90403f61 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Thu, 27 Jun 2019 06:47:13 -0400
Subject: [PATCH] Annotations in C++ code to produce formulas in rusEfi console
 #807

---
 firmware/controllers/core/common_headers.h    |   1 +
 firmware/controllers/sensors/tps.cpp          |   7 +-
 .../com/rusefi/ldmp/generated/TpsMeta.java    |   6 +-
 .../com/rusefi/ui/livedocs/LiveDocPanel.java  |   2 +-
 java_tools/ConfigDefinition.jar               | Bin 107177 -> 110941 bytes
 .../com/rusefi/ldmp/LiveDocsMetaParser.java   |  69 ++++++++++++------
 .../src/com/rusefi/ldmp/MetaInfo.java         |  17 +++++
 .../ldmp/test/LiveDocsMetaParserTest.java     |  35 +++++----
 8 files changed, 95 insertions(+), 42 deletions(-)
 create mode 100644 java_tools/configuration_definition/src/com/rusefi/ldmp/MetaInfo.java

diff --git a/firmware/controllers/core/common_headers.h b/firmware/controllers/core/common_headers.h
index dbdfa40778..034e738c4c 100644
--- a/firmware/controllers/core/common_headers.h
+++ b/firmware/controllers/core/common_headers.h
@@ -37,6 +37,7 @@
 // we use this 'DISPLAY' macro if value is not used by C++ in current context
 #define DISPLAY(x)
 
+#define DISPLAY_TAG(x)
 #define DISPLAY_TEXT(x)
 #define DISPLAY_SENSOR(x) {}
 #define DISPLAY_IF(x) x
diff --git a/firmware/controllers/sensors/tps.cpp b/firmware/controllers/sensors/tps.cpp
index 499c3860d6..d9ca44fe96 100644
--- a/firmware/controllers/sensors/tps.cpp
+++ b/firmware/controllers/sensors/tps.cpp
@@ -79,6 +79,8 @@ float getTpsRateOfChange(void) {
  * */
 percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_SUFFIX) {
 
+	DISPLAY_TAG(TPS_SECTION);
+
 	DISPLAY_TEXT(Analog_MCU_reads);
 	engine->engineState.currentTpsAdc = adc;
 #if !EFI_UNIT_TEST
@@ -197,7 +199,10 @@ percent_t getPedalPosition(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	if (mockPedalPosition != MOCK_UNDEFINED) {
 		return mockPedalPosition;
 	}
-	float voltage = getVoltageDivided("pPS", engineConfiguration->throttlePedalPositionAdcChannel);
+	DISPLAY_TAG(PEGAL_SECTION);
+	DISPLAY_TEXT(Analog_MCU_reads);
+
+	float voltage = getVoltageDivided("pPS", CONFIG(DISPLAY_CONFIG(throttlePedalPositionAdcChannel)));
 	float result = interpolateMsg("pedal", engineConfiguration->throttlePedalUpVoltage, 0, engineConfiguration->throttlePedalWOTVoltage, 100, voltage);
 
 	// this would put the value into the 0-100 range
diff --git a/java_console/ui/src/com/rusefi/ldmp/generated/TpsMeta.java b/java_console/ui/src/com/rusefi/ldmp/generated/TpsMeta.java
index d0bfcb005f..8d4eb185c6 100644
--- a/java_console/ui/src/com/rusefi/ldmp/generated/TpsMeta.java
+++ b/java_console/ui/src/com/rusefi/ldmp/generated/TpsMeta.java
@@ -3,7 +3,11 @@ package com.rusefi.ldmp.generated;
 import com.rusefi.ldmp.*;
 
 public class TpsMeta {
-	public static final Request[] CONTENT = new Request[]{
+	public static final Request[] PEGAL_SECTION = new Request[]{
+			new TextRequest("Analog_MCU_reads"),
+			new ConfigRequest("throttlePedalPositionAdcChannel"),
+	};
+	public static final Request[] TPS_SECTION = new Request[]{
 			new TextRequest("Analog_MCU_reads"),
 			new FieldRequest("tpsVoltageMCU"),
 			new TextRequest("Volts"),
diff --git a/java_console/ui/src/com/rusefi/ui/livedocs/LiveDocPanel.java b/java_console/ui/src/com/rusefi/ui/livedocs/LiveDocPanel.java
index 055b5f0265..721ff8469d 100644
--- a/java_console/ui/src/com/rusefi/ui/livedocs/LiveDocPanel.java
+++ b/java_console/ui/src/com/rusefi/ui/livedocs/LiveDocPanel.java
@@ -172,7 +172,7 @@ public class LiveDocPanel {
                 ThermistorState.VALUES, ThermistorsMeta.CONTENT));
 
         liveDocs.add(getPanel("Throttle Position Sensor", "", Fields.LDS_ENGINE_STATE_INDEX,
-                EngineState.VALUES, TpsMeta.CONTENT));
+                EngineState.VALUES, TpsMeta.TPS_SECTION));
 
         liveDocs.add(getPanel("tCharge", "", Fields.LDS_ENGINE_STATE_INDEX,
                 EngineState.VALUES, SpeedDensityMeta.CONTENT));
diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index 89761f28381d29a3df18cf248a811a86f8b97db9..aed2aaa406762cb2ece4ede942a2a7f8b5967e48 100644
GIT binary patch
delta 19682
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
a2VY4Z9^oGw8vL2b{@j;ziGPX<0sjTH*?Twu

delta 16042
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

diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/LiveDocsMetaParser.java b/java_tools/configuration_definition/src/com/rusefi/ldmp/LiveDocsMetaParser.java
index dac4e70652..7ca5b87f0a 100644
--- a/java_tools/configuration_definition/src/com/rusefi/ldmp/LiveDocsMetaParser.java
+++ b/java_tools/configuration_definition/src/com/rusefi/ldmp/LiveDocsMetaParser.java
@@ -14,6 +14,7 @@ import java.util.stream.Stream;
 import static com.rusefi.ConfigDefinition.EOL;
 
 public class LiveDocsMetaParser {
+    private static final String DISPLAY_TAG = "DISPLAY_TAG";
     private static final String DISPLAY_CONFIG = "DISPLAY_CONFIG";
     private static final String DISPLAY_FIELD = "DISPLAY_FIELD";
     private static final String DISPLAY_TEXT = "DISPLAY_TEXT";
@@ -34,49 +35,62 @@ public class LiveDocsMetaParser {
             throw new IllegalArgumentException("Two arguments expected but " + Arrays.toString(args));
         String fileName = args[0];
         String destinationPath = args[1];
-        SystemOut.println(fileName);
-        if (!new File(fileName).exists())
-            throw new IllegalStateException("Not found " + fileName);
-        String content = readLineByLine(fileName);
-        List<Request> r = parse(content);
-        SystemOut.println(r);
+        MetaInfo metaInfo = getMetaFromFile(fileName);
+        SystemOut.println(metaInfo);
 
         String className = getClassName(fileName);
-        String javaCode = generateJavaCode(r, className);
+        String javaCode = generateJavaCode(metaInfo, className);
         FileWriter fw = new FileWriter(destinationPath + "java_console/ui/src/com/rusefi/ldmp/generated/" + className + ".java");
         fw.write(javaCode);
         fw.close();
     }
 
-    public static List<Request> parse(String string) {
+    private static MetaInfo getMetaFromFile(String fileName) throws IOException {
+        SystemOut.println(fileName);
+        if (!new File(fileName).exists())
+            throw new IllegalStateException("Not found " + fileName);
+        String content = readLineByLine(fileName);
+        return parse(content);
+    }
+
+    public static MetaInfo parse(String string) {
         Stack<List<Request>> stack = new Stack<>();
 
-        List<Request> result = new ArrayList<>();
+
+        MetaInfo meta = new MetaInfo();
+
+        List<Request> result = meta.start("CONTENT");
         string = string.replaceAll("[()>.]", " ");
         SystemOut.println(string);
         Scanner s = new Scanner(string);
         while (s.hasNext()) {
             String token = s.next();
             //SystemOut.println(token);
-            if (DISPLAY_CONFIG.equals(token)) {
+            if (DISPLAY_CONFIG.equalsIgnoreCase(token)) {
                 if (s.hasNext()) {
                     String config = s.next();
                     SystemOut.println("REQ CONF " + config);
                     result.add(new ConfigRequest(config));
                 }
-            } else if (DISPLAY_TEXT.equals(token)) {
+            } else if (DISPLAY_TEXT.equalsIgnoreCase(token)) {
                 if (s.hasNext()) {
                     String config = s.next();
                     SystemOut.println("REQ TEXT " + config);
                     result.add(new TextRequest(config));
                 }
-            } else if (DISPLAY_FIELD.equals(token)) {
+            } else if (DISPLAY_TAG.equalsIgnoreCase(token)) {
+                if (s.hasNext()) {
+                    String tag = s.next();
+                    SystemOut.println("REQ TAG " + tag);
+                    result = meta.start(tag);
+                }
+            } else if (DISPLAY_FIELD.equalsIgnoreCase(token)) {
                 if (s.hasNext()) {
                     String config = s.next();
                     SystemOut.println("REQ FIELD " + config);
                     result.add(new FieldRequest(config));
                 }
-            } else if (DISPLAY_IF.equals(token)) {
+            } else if (DISPLAY_IF.equalsIgnoreCase(token)) {
                 if (s.hasNext()) {
                     stack.push(result);
 
@@ -90,7 +104,7 @@ public class LiveDocsMetaParser {
 
                     result = ifRequest.trueBlock;
                 }
-            } else if (DISPLAY_ELSE.equals(token)) {
+            } else if (DISPLAY_ELSE.equalsIgnoreCase(token)) {
                 if (stack.isEmpty())
                     throw new IllegalStateException("No IF statement on stack");
                 List<Request> onStack = stack.peek();
@@ -102,12 +116,12 @@ public class LiveDocsMetaParser {
                 IfRequest ifRequest = (IfRequest) request;
 
                 result = ifRequest.falseBlock;
-            } else if (DISPLAY_ENDIF.equals(token)) {
+            } else if (DISPLAY_ENDIF.equalsIgnoreCase(token)) {
                 if (stack.isEmpty())
                     throw new IllegalStateException("No IF statement on stack");
                 result = stack.pop();
 
-            } else if (DISPLAY_SENSOR.equals(token)) {
+            } else if (DISPLAY_SENSOR.equalsIgnoreCase(token)) {
                 if (s.hasNext()) {
                     String config = s.next();
                     SystemOut.println("REQ SENSOR " + config);
@@ -118,19 +132,28 @@ public class LiveDocsMetaParser {
 
         if (!stack.isEmpty())
             throw new IllegalStateException("Unfinished");
-        return result;
+        return meta;
     }
 
-    public static String generateJavaCode(List<Request> r, String className) {
+    public static String generateJavaCode(MetaInfo r, String className) {
         StringBuilder java = new StringBuilder("package com.rusefi.ldmp.generated;" + EOL + EOL +
                 "import com.rusefi.ldmp.*;" + EOL + EOL +
-                "public class " + className + " {" + EOL +
-                "\tpublic static final Request[] CONTENT = new Request[]{" + EOL);
+                "public class " + className + " {" + EOL
+        );
 
-        java.append(Request.printList(r));
-        java.append("\t};" + EOL +
-                "}");
+        for (Map.Entry<String, List<Request>> e : r.map.entrySet()) {
+            List<Request> list = e.getValue();
+            if (list.isEmpty())
+                continue;
 
+            java.append("\tpublic static final Request[] " +
+                    e.getKey() +
+                    " = new Request[]{" + EOL);
+            java.append(Request.printList(list));
+            java.append("\t};" + EOL);
+        }
+
+        java.append("}");
         return java.toString();
     }
 
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/MetaInfo.java b/java_tools/configuration_definition/src/com/rusefi/ldmp/MetaInfo.java
new file mode 100644
index 0000000000..7d772aef7a
--- /dev/null
+++ b/java_tools/configuration_definition/src/com/rusefi/ldmp/MetaInfo.java
@@ -0,0 +1,17 @@
+package com.rusefi.ldmp;
+
+import java.util.*;
+
+public class MetaInfo {
+    public Map<String, List<Request>> map = new TreeMap<>();
+
+
+    public List<Request> start(String content) {
+        map.putIfAbsent(content, new ArrayList<>());
+        return map.get(content);
+    }
+
+    public List<Request> first() {
+        return map.values().iterator().next();
+    }
+}
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/test/LiveDocsMetaParserTest.java b/java_tools/configuration_definition/src/com/rusefi/ldmp/test/LiveDocsMetaParserTest.java
index 057e7ca8b4..221afb7874 100644
--- a/java_tools/configuration_definition/src/com/rusefi/ldmp/test/LiveDocsMetaParserTest.java
+++ b/java_tools/configuration_definition/src/com/rusefi/ldmp/test/LiveDocsMetaParserTest.java
@@ -16,34 +16,34 @@ public class LiveDocsMetaParserTest {
 
     @Test
     public void parseConfigElements() {
-        List<Request> r = LiveDocsMetaParser.parse("\t\t// TCHARGE_MODE_RPM_TPS\n" +
+        MetaInfo r = LiveDocsMetaParser.parse("\t\t// TCHARGE_MODE_RPM_TPS\n" +
                 "\t\tfloat minRpmKcurrentTPS = interpolateMsg(\"minRpm\", tpMin, DISPLAY_CONFIG(tChargeMinRpmMinTps), tpMax,\n" +
                 "\t\t\t\t/***display*/CONFIG(tChargeMinRpmMaxTps), tps);\n" +
                 "\t\tfloat maxRpmKcurrentTPS = interpolateMsg(\"maxRpm\", tpMin, DISPLAY_CONFIG(tChargeMaxRpmMinTps), tpMax,\n" +
                 "\t\t\t\tDISPLAY_CONFIG(tChargeMaxRpmMaxTps), tps);\n" +
                 "\n" +
                 "\t\tengine->engineState.Tcharge_coff = interpolateMsg(\"Kcurr\", rpmMin, minRpmKcurrentTPS, rpmMax, maxRpmKcurrentTPS, rpm);\n");
-        assertEquals(3, r.size());
-        assertEquals(new ConfigRequest("tChargeMinRpmMinTps"), r.get(0));
+        assertEquals(3, r.first().size());
+        assertEquals(new ConfigRequest("tChargeMinRpmMinTps"), r.first().get(0));
     }
 
     @Test
     public void parseField() {
-        List<Request> r = LiveDocsMetaParser.parse("\tDISPLAY_TEXT(Analog_MCU_reads);\n" +
+        MetaInfo r = LiveDocsMetaParser.parse("\tDISPLAY_TEXT(Analog_MCU_reads);\n" +
                 "\tengine->engineState.DISPLAY_FIELD(currentTpsAdc) = adc;\n" +
                 "\tDISPLAY_TEXT(ADC_which_equals);\n");
-        assertEquals(3, r.size());
+        assertEquals(3, r.first().size());
     }
 
     @Test
     public void parseDisplayConfig() {
-        List<Request> r = LiveDocsMetaParser.parse("\t\t// DISPLAY_TEXT(interpolate(\")\n" +
+        MetaInfo r = LiveDocsMetaParser.parse("\t\t// DISPLAY_TEXT(interpolate(\")\n" +
                 "+\t\tDISPLAY_SENSOR(RPM) DISPLAY_TEXT(TCHARGE_MODE_RPM_TPS)\n" +
                 "\t\tfloat minRpmKcurrentTPS = interpolateMsg(\"minRpm\", tpMin, DISPLAY_CONFIG(tChargeMinRpmMinTps), tpMax,\n");
-        assertEquals(4, r.size());
+        assertEquals(4, r.first().size());
         // implementation has eaten the bracket :(
-        assertEquals(new TextRequest("interpolate"), r.get(0));
-        assertEquals(new SensorRequest("RPM"), r.get(1));
+        assertEquals(new TextRequest("interpolate"), r.first().get(0));
+        assertEquals(new SensorRequest("RPM"), r.first().get(1));
 
         String javaCode = LiveDocsMetaParser.generateJavaCode(r, "xx");
         assertEquals("package com.rusefi.ldmp.generated;\n" +
@@ -63,21 +63,24 @@ public class LiveDocsMetaParserTest {
 
     @Test
     public void testField() {
-        List<Request> r = LiveDocsMetaParser.parse("tm->DISPLAY_FIELD(voltageMCU) = getVoltage(\"term\", config->adcChannel);");
-        assertEquals(1, r.size());
-        assertEquals(new FieldRequest("voltageMCU"), r.get(0));
+        MetaInfo r = LiveDocsMetaParser.parse("tm->DISPLAY_FIELD(voltageMCU) = getVoltage(\"term\", config->adcChannel);\n" +
+                "DISPLAY_tag(tag) DISPLAY_FIELD(voltageMCU2)");
+        assertEquals(1, r.first().size());
+        assertEquals(new FieldRequest("voltageMCU"), r.first().get(0));
+
+        assertEquals(2, r.map.size());
     }
 
     @Test
     public void parseIf() {
-        List<Request> r = LiveDocsMetaParser.parse("\tDISPLAY_IF(cond)\t// DISPLAY_TEXT(\"interpolate(\")\n" +
+        MetaInfo r = LiveDocsMetaParser.parse("\tDisPLAY_IF(cond)\t// DISPLAY_TEXT(\"interpolate(\")\n" +
                 "+\t\tDISPLAY_SENSOR(RPM)" +
-                "/* DISPLAY_ELSE */ DISPLAY_TEXT(\"TCHARGE_MODE_RPM_TPS\")\n" +
+                "/* DISPLAY_ElsE */ DISPLAY_TEXT(\"TCHARGE_MODE_RPM_TPS\")\n" +
                 "\t\tfloat minRpmKcurrentTPS = interpolateMsg(\"minRpm\", tpMin, DISPLAY_CONFIG(tChargeMinRpmMinTps), tpMax,\n" +
                 "/* DISPLAY_ENDIF */");
 
-        assertEquals(1, r.size());
-        IfRequest ifRequest = (IfRequest) r.get(0);
+        assertEquals(1, r.first().size());
+        IfRequest ifRequest = (IfRequest) r.first().get(0);
         List<Request> trueBlock = ifRequest.trueBlock;
         assertEquals(2, trueBlock.size());
         assertEquals(new SensorRequest("RPM"), trueBlock.get(1));