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

REO progress

This commit is contained in:
rusefi 2020-06-21 23:25:39 -04:00
parent 38c3f119b1
commit 6f8f4d0400
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java_console/inifile/src/com/rusefi/tune/xml/Msq.java
View File

@ -3,7 +3,6 @@ package com.rusefi.tune.xml;
import com.opensr5.ConfigurationImage;
import com.opensr5.ini.IniFileModel;
import com.opensr5.ini.field.IniField;
import com.rusefi.config.Field;
import com.rusefi.config.generated.Fields;
import com.rusefi.ui.storage.PersistentConfiguration;
import com.rusefi.xml.XmlUtil;
@ -43,7 +42,7 @@ public class Msq {
public ConfigurationImage asImage(IniFileModel instance) {
ConfigurationImage ci = new ConfigurationImage(Fields.TOTAL_CONFIG_SIZE);
for (Constant constant : getPage().constant) {
for (Constant constant : findPage().constant) {
if (constant.getName().startsWith("UNALLOCATED_SPACE")) {
continue;
}
@ -66,7 +65,7 @@ public class Msq {
public void loadConstant(IniFileModel ini, String key, ConfigurationImage image) {
IniField field = ini.allIniFields.get(key);
String value = field.getValue(image);
getPage().constant.add(new Constant(field.getName(), field.getUnits(), value));
findPage().constant.add(new Constant(field.getName(), field.getUnits(), value));
}
@XmlElement
@ -79,7 +78,7 @@ public class Msq {
return versionInfo;
}
private Page getPage() {
public Page findPage() {
return page.get(1);
}

4
java_tools/ts_plugin/src/com/rusefi/ts_plugin/PluginEntry.java
View File

@ -109,7 +109,7 @@ public class PluginEntry implements TsPluginBody {
Msq tsTune = TsTuneReader.readTsTune(configurationName);
Map<String, Constant> byName = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
for (Constant c : tsTune.getPage().constant) {
for (Constant c : tsTune.findPage().constant) {
byName.put(c.getName(), c);
}
@ -145,7 +145,7 @@ public class PluginEntry implements TsPluginBody {
value = cp.getStringValue();
}
msq.getPage().constant.add(new Constant(parameterName, cp.getUnits(), value));
msq.findPage().constant.add(new Constant(parameterName, cp.getUnits(), value));
}
String fileName = Msq.outputXmlFileName;