andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flexibility for ptr vs. ref live data

This commit is contained in:
Matthew Kennedy 2023-07-01 21:39:10 -04:00 committed by rusefillc
parent 0bc3a91638
commit 1a5a7b1c91
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java
View File

@ -83,7 +83,7 @@ public class LiveDataProcessor {
} }
interface EntryHandler { interface EntryHandler {
void onEntry(String name, String javaName, String folder, String prepend, boolean withCDefines, String[] outputNames, String constexpr, String conditional, String engineModule) throws IOException; void onEntry(String name, String javaName, String folder, String prepend, boolean withCDefines, String[] outputNames, String constexpr, String conditional, String engineModule, Boolean isPtr) throws IOException;
} }
private int handleYaml(Map<String, Object> data) throws IOException { private int handleYaml(Map<String, Object> data) throws IOException {
@ -99,7 +99,7 @@ public class LiveDataProcessor {
EntryHandler handler = new EntryHandler() { EntryHandler handler = new EntryHandler() {
@Override @Override
public void onEntry(String name, String javaName, String folder, String prepend, boolean withCDefines, String[] outputNames, String constexpr, String conditional, String engineModule) throws IOException { public void onEntry(String name, String javaName, String folder, String prepend, boolean withCDefines, String[] outputNames, String constexpr, String conditional, String engineModule, Boolean isPtr) throws IOException {
// TODO: use outputNames // TODO: use outputNames
int startingPosition = javaSensorsConsumer.sensorTsPosition; int startingPosition = javaSensorsConsumer.sensorTsPosition;
@ -129,6 +129,7 @@ public class LiveDataProcessor {
if (constexpr != null) { if (constexpr != null) {
sdCardFieldsConsumer.home = constexpr; sdCardFieldsConsumer.home = constexpr;
sdCardFieldsConsumer.conditional = conditional; sdCardFieldsConsumer.conditional = conditional;
sdCardFieldsConsumer.isPtr = isPtr;
state.addDestination((state1, structure) -> sdCardFieldsConsumer.handleEndStruct(state1, structure)); state.addDestination((state1, structure) -> sdCardFieldsConsumer.handleEndStruct(state1, structure));
outputValueConsumer.currentSectionPrefix = constexpr; outputValueConsumer.currentSectionPrefix = constexpr;
@ -140,6 +141,7 @@ public class LiveDataProcessor {
outputValueConsumer.currentEngineModule = engineModule; outputValueConsumer.currentEngineModule = engineModule;
outputValueConsumer.moduleMode = true; outputValueConsumer.moduleMode = true;
outputValueConsumer.conditional = conditional; outputValueConsumer.conditional = conditional;
outputValueConsumer.isPtr = isPtr;
state.addDestination((state1, structure) -> outputValueConsumer.handleEndStruct(state1, structure)); state.addDestination((state1, structure) -> outputValueConsumer.handleEndStruct(state1, structure));
} }
state.addDestination(new ConfigurationConsumer() { state.addDestination(new ConfigurationConsumer() {
@ -171,8 +173,10 @@ public class LiveDataProcessor {
String engineModule = (String) entry.get("engineModule"); String engineModule = (String) entry.get("engineModule");
String conditional = (String) entry.get("conditional_compilation"); String conditional = (String) entry.get("conditional_compilation");
Boolean withCDefines = (Boolean) entry.get("withCDefines"); Boolean withCDefines = (Boolean) entry.get("withCDefines");
Boolean isPtr = (Boolean) entry.get("isPtr");
// Defaults to false if not specified // Defaults to false if not specified
withCDefines = withCDefines != null && withCDefines; withCDefines = withCDefines != null && withCDefines;
isPtr = isPtr != null && isPtr;
Object outputNames = entry.get("output_name"); Object outputNames = entry.get("output_name");
@ -188,7 +192,7 @@ public class LiveDataProcessor {
nameList.toArray(outputNamesArr); nameList.toArray(outputNamesArr);
} }
handler.onEntry(name, java, folder, prepend, withCDefines, outputNamesArr, constexpr, conditional, engineModule); handler.onEntry(name, java, folder, prepend, withCDefines, outputNamesArr, constexpr, conditional, engineModule, isPtr);
String enumName = "LDS_" + name; String enumName = "LDS_" + name;
String type = name + "_s"; // convention String type = name + "_s"; // convention

3
java_tools/configuration_definition_base/src/main/java/com/rusefi/output/GetOutputValueConsumer.java
View File

@ -30,6 +30,7 @@ public class GetOutputValueConsumer implements ConfigurationConsumer {
public boolean moduleMode; public boolean moduleMode;
public String currentEngineModule; public String currentEngineModule;
public String conditional; public String conditional;
public Boolean isPtr = false;
public GetOutputValueConsumer(String fileName) { public GetOutputValueConsumer(String fileName) {
this.fileName = fileName; this.fileName = fileName;
@ -59,7 +60,7 @@ public class GetOutputValueConsumer implements ConfigurationConsumer {
if (moduleMode) { if (moduleMode) {
javaName = "engine->module<" + currentEngineModule + ">()->" + prefix; javaName = "engine->module<" + currentEngineModule + ">()->" + prefix;
} else { } else {
javaName = currentSectionPrefix + "." + prefix; javaName = currentSectionPrefix + (isPtr ? "->" : ".") + prefix;
} }
getterPairs.add(new VariableRecord(userName, javaName + cf.getName(), null, conditional)); getterPairs.add(new VariableRecord(userName, javaName + cf.getName(), null, conditional));

3
java_tools/configuration_definition_base/src/main/java/com/rusefi/output/SdCardFieldsContent.java
View File

@ -12,6 +12,7 @@ public class SdCardFieldsContent {
public String home = "engine->outputChannels"; public String home = "engine->outputChannels";
public String conditional; public String conditional;
public Boolean isPtr = false;
public void handleEndStruct(ReaderState state, ConfigStructure structure) throws IOException { public void handleEndStruct(ReaderState state, ConfigStructure structure) throws IOException {
if (state.isStackEmpty()) { if (state.isStackEmpty()) {
@ -52,7 +53,7 @@ public class SdCardFieldsContent {
String after = conditional == null ? "" : "#endif\n"; String after = conditional == null ? "" : "#endif\n";
return before return before
+ "\t{" + home + "." + name + + "\t{" + home + (isPtr ? "->" : ".") + name +
", " ", "
+ DataLogConsumer.getHumanGaugeName(prefix, configField) + + DataLogConsumer.getHumanGaugeName(prefix, configField) +
", " + ", " +