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

progress

This commit is contained in:
rusefillc 2023-11-27 14:45:48 -05:00
parent 3bb5de070e
commit 3aab9906ef
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/TuneCanTool.java
View File

@ -173,7 +173,19 @@ public class TuneCanTool {
if (data == null)
continue;
methods.append(data.getCsourceMethod("engineConfiguration"));
String parentReference;
if (cf.getParent().getName().equals("engine_configuration_s")) {
parentReference = "engineConfiguration->";
} else if (cf.getParent().getName().equals("persistent_config_s")) {
parentReference = "config->";
} else {
// todo: for instance map.samplingAngle
//throw new IllegalStateException("Unexpected " + cf.getParent());
System.out.println(" " + cf);
continue;
}
methods.append(data.getCsourceMethod(parentReference));
invokeMethods.append(data.getCinvokeMethod());
continue;
@ -225,12 +237,15 @@ public class TuneCanTool {
}
private static ConfigField findField(ReaderStateImpl state, String name, StringBuffer context) {
return doLook(state, name, context);
ConfigField field = doLook(state, name, context, "engine_configuration_s");
if (field != null)
return field;
return doLook(state, name, context, "persistent_config_s");
}
@Nullable
private static ConfigField doLook(ReaderStateImpl state, String name, StringBuffer context) {
ConfigStructure s = state.getStructures().get("engine_configuration_s");
private static ConfigField doLook(ReaderStateImpl state, String name, StringBuffer context, String parentStructName) {
ConfigStructure s = state.getStructures().get(parentStructName);
// log.info("We have a custom value " + name);
ConfigField cf = s.getTsFieldByName(name);
if (cf != null) {