make it work for WBO too!

FOME-Tech · Dec 9, 2024 · 48ee208 · 48ee208
1 parent b5562c3
commit 48ee208
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 13 deletions.
diff --git a/firmware/controllers/sensors/wideband_state.txt b/firmware/controllers/sensors/wideband_state.txt
@@ -1,10 +1,10 @@
 struct_no_prefix wideband_state_s
-	uint8_t faultCode;WBO: Fault code
+	uint8_t faultCode;Fault code
 
-	uint8_t heaterDuty;WBO: Heater duty;"%", 1, 0, 0, 100, 0
-	uint8_t pumpDuty;WBO: Pump duty;"%", 1, 0, 0, 100, 0
+	uint8_t heaterDuty;Heater duty;"%", 1, 0, 0, 100, 0
+	uint8_t pumpDuty;Pump duty;"%", 1, 0, 0, 100, 0
 
-	uint16_t tempC;WBO: Temperature;"C", 1, 0, 500, 1000, 0
-	uint16_t autoscale nernstVoltage;WBO: Nernst Voltage;"V", 0.001, 0, 0, 1, 3
-	uint16_t esr;WBO: ESR;"ohm", 1, 0, 0, 10000, 0
+	uint16_t tempC;Temperature;"C", 1, 0, 500, 1000, 0
+	uint16_t autoscale nernstVoltage;Nernst Voltage;"V", 0.001, 0, 0, 1, 3
+	uint16_t esr;ESR;"ohm", 1, 0, 0, 10000, 0
 end_struct
diff --git a/firmware/integration/LiveData.yaml b/firmware/integration/LiveData.yaml
@@ -126,7 +126,7 @@ Usages:
 
   - name: wideband_state
     folder: controllers/sensors/
-    # output_name: [ "wb1", "wb2" ]
+    output_name: [ "WBO 1", "WBO 2" ]
 
   - name: dc_motors
     folder: controllers/actuators

diff --git a/...ls/configuration_definition/src/main/java/com/rusefi/newparse/outputs/DatalogVisitor.java b/...ls/configuration_definition/src/main/java/com/rusefi/newparse/outputs/DatalogVisitor.java
@@ -5,7 +5,11 @@
 import java.io.PrintStream;
 
 public class DatalogVisitor extends OutputChannelVisitorBase {
-    private static void writeDatalogName(PrintStream ps, String name, String comment) {
+    public DatalogVisitor(String nameReplace) {
+        super(nameReplace);
+    }
+
+    private void writeDatalogName(PrintStream ps, String name, String comment) {
         ps.print(buildDatalogName(name, comment));
     }
 

diff --git a/...figuration_definition/src/main/java/com/rusefi/newparse/outputs/OutputChannelVisitor.java b/...figuration_definition/src/main/java/com/rusefi/newparse/outputs/OutputChannelVisitor.java
@@ -6,6 +6,10 @@
 import java.io.PrintStream;
 
 public class OutputChannelVisitor extends OutputChannelVisitorBase {
+    public OutputChannelVisitor(String nameReplace) {
+        super(nameReplace);
+    }
+
     @Override
     public void visit(EnumLayout e, PrintStream ps, StructNamePrefixer prefixer, int offsetAdd, int[] arrayDims) {
         // Output an enum as a scalar, since there's no TS support for enum output channels

diff --git a/...ration_definition/src/main/java/com/rusefi/newparse/outputs/OutputChannelVisitorBase.java b/...ration_definition/src/main/java/com/rusefi/newparse/outputs/OutputChannelVisitorBase.java
@@ -6,8 +6,14 @@
 import java.io.PrintStream;
 
 public class OutputChannelVisitorBase extends ILayoutVisitor {
-    public static String buildDatalogName(String name, String comment) {
-        String text = (comment == null || comment.isEmpty()) ? name : comment;
+    protected final NameReplacer nameReplacer;
+
+    public OutputChannelVisitorBase(String nameReplace) {
+        this.nameReplacer = new NameReplacer(nameReplace);
+    }
+
+    public String buildDatalogName(String name, String comment) {
+        String text = (comment == null || comment.isEmpty()) ? name : nameReplacer.replace(comment);
 
         // Delete anything after a newline
         return text.split("\\\\n")[0];
@@ -27,4 +33,20 @@ public void visit(StructLayout struct, PrintStream ps, StructNamePrefixer prefix
             throw new IllegalStateException("Output channels don't support multi dimension arrays");
         }
     }
+
+    protected class NameReplacer {
+        public final String name;
+
+        public NameReplacer(String name) {
+            this.name = name;
+        }
+
+        public String replace(String input) {
+            if (name == null || name.isEmpty()) {
+                return input;
+            }
+
+            return name + ": " + input;
+        }
+    }
 }
diff --git a/...nfiguration_definition/src/main/java/com/rusefi/newparse/outputs/OutputChannelWriter.java b/...nfiguration_definition/src/main/java/com/rusefi/newparse/outputs/OutputChannelWriter.java
@@ -37,13 +37,13 @@ public void writeOutputChannels(ParseState parser, String namePrefix) {
         StructNamePrefixer prefixer = new StructNamePrefixer('_');
 
         if (namePrefix != null) {
-            prefixer.push(namePrefix);
+            prefixer.push(namePrefix.replace(" ", "_"));
         }
 
-        OutputChannelVisitor v = new OutputChannelVisitor();
+        OutputChannelVisitor v = new OutputChannelVisitor(namePrefix);
         sl.visit(v, ps, prefixer, cumulativeSize, new int[0]);
 
-        DatalogVisitor dlv = new DatalogVisitor();
+        DatalogVisitor dlv = new DatalogVisitor(namePrefix);
         sl.visit(dlv, psDatalog, prefixer, cumulativeSize, new int[0]);
 
         cumulativeSize += sl.getSize();