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

only:Improve toolset for default tune canned tune generation #4871

This commit is contained in:
rusefillc 2023-06-18 21:21:36 -04:00
parent d135c5cf30
commit c84b615dd5
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,12 @@ public class TuneCanTool {
RootHolder.ROOT = "../firmware/"; RootHolder.ROOT = "../firmware/";
String fileName = "C:\\Users\\Dell2019\\Downloads\\1258.msq"; // 3A92 "La Mitsubicha"
// String fileName = "C:\\Users\\Dell2019\\Downloads\\1258.msq";
// Scion 1NZ-FE "xB Chinita auto"
// String fileName = "C:\\Users\\Dell2019\\Downloads\\1448.msq";
// 4g93
String fileName = "C:\\Users\\Dell2019\\Downloads\\1425.msq";
Msq custom = Msq.readTune(fileName); Msq custom = Msq.readTune(fileName);
@ -95,7 +100,7 @@ public class TuneCanTool {
} }
if (cf.getType().equals("boolean")) { if (cf.getType().equals("boolean")) {
sb.append(TuneTools.getAssignmentCode(customValue.getName(), unquote(customValue.getValue()))); sb.append(TuneTools.getAssignmentCode(defaultValue, customValue.getName(), unquote(customValue.getValue())));
continue; continue;
} }
@ -125,11 +130,11 @@ public class TuneCanTool {
System.out.println(cf + " " + sourceCodeEnum + " " + customEnum + " " + ordinal); System.out.println(cf + " " + sourceCodeEnum + " " + customEnum + " " + ordinal);
String sourceCodeValue = sourceCodeEnum.findByValue(ordinal); String sourceCodeValue = sourceCodeEnum.findByValue(ordinal);
sb.append(TuneTools.getAssignmentCode(customValue.getName(), sourceCodeValue)); sb.append(TuneTools.getAssignmentCode(defaultValue, customValue.getName(), sourceCodeValue));
continue; continue;
} }
sb.append(TuneTools.getAssignmentCode(customValue.getName(), customValue.getValue())); sb.append(TuneTools.getAssignmentCode(defaultValue, customValue.getName(), customValue.getValue()));
} }
} }
return sb; return sb;

6
java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/TuneTools.java
View File

@ -1,5 +1,6 @@
package com.rusefi.tools.tune; package com.rusefi.tools.tune;
import com.rusefi.tune.xml.Constant;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class TuneTools { public class TuneTools {
@ -20,7 +21,8 @@ public class TuneTools {
} }
@NotNull @NotNull
public static String getAssignmentCode(String name, String value) { public static String getAssignmentCode(Constant defaultValue, String name, String value) {
return "\tengineConfiguration->" + name + " = " + value + ";\n"; return //"\t // default " + defaultValue.getValue() + "\n" +
"\tengineConfiguration->" + name + " = " + value + ";\n";
} }
} }