diff --git a/java_console/inifile/src/com/rusefi/tune/xml/Msq.java b/java_console/inifile/src/com/rusefi/tune/xml/Msq.java index 1688be97b8..1e991bf7ad 100644 --- a/java_console/inifile/src/com/rusefi/tune/xml/Msq.java +++ b/java_console/inifile/src/com/rusefi/tune/xml/Msq.java @@ -3,6 +3,7 @@ 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; @@ -12,13 +13,15 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.annotation.*; import java.io.File; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; @XmlRootElement public class Msq { public static final String outputXmlFileName = PersistentConfiguration.RUSEFI_SETTINGS_FOLDER + File.separator + "output.msq"; - private Page page = new Page(); + public List page = new ArrayList<>(); private final VersionInfo versionInfo; @@ -30,6 +33,8 @@ public class Msq { public static Msq valueOf(ConfigurationImage image) { IniFileModel ini = IniFileModel.getInstance(); Msq tune = new Msq(); + tune.page.add(new Page(null, null)); + tune.page.add(new Page(0, Fields.TOTAL_CONFIG_SIZE)); for (String key : ini.allIniFields.keySet()) tune.loadConstant(ini, key, image); return tune; @@ -74,13 +79,8 @@ public class Msq { return versionInfo; } - @XmlElement - public Page getPage() { - return page; - } - - public void setPage(Page page) { - this.page = page; + private Page getPage() { + return page.get(1); } @XmlElement diff --git a/java_console/inifile/src/com/rusefi/tune/xml/Page.java b/java_console/inifile/src/com/rusefi/tune/xml/Page.java index 7932ce9b49..112f6d7690 100644 --- a/java_console/inifile/src/com/rusefi/tune/xml/Page.java +++ b/java_console/inifile/src/com/rusefi/tune/xml/Page.java @@ -1,21 +1,48 @@ package com.rusefi.tune.xml; -import com.rusefi.config.generated.Fields; - import javax.xml.bind.annotation.XmlAttribute; import java.util.ArrayList; import java.util.List; public class Page { public final List constant = new ArrayList<>(); + public final List pcVariable = new ArrayList<>(); - @XmlAttribute - public int getNumber() { - return 0; + private Integer number; + private Integer size; + + public Page() { + } + + public Page(Integer number, Integer size) { + this.number = number; + this.size = size; } @XmlAttribute - public int getSize() { - return Fields.TOTAL_CONFIG_SIZE; + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + @XmlAttribute + public Integer getSize() { + return size; + } + + public void setSize(Integer size) { + this.size = size; + } + + @Override + public String toString() { + return "Page{" + + "constant.size=" + constant.size() + + ", number=" + number + + ", size=" + size + + '}'; } } diff --git a/java_console/inifile/src/com/rusefi/tune/xml/PcVariable.java b/java_console/inifile/src/com/rusefi/tune/xml/PcVariable.java new file mode 100644 index 0000000000..0e054e70c9 --- /dev/null +++ b/java_console/inifile/src/com/rusefi/tune/xml/PcVariable.java @@ -0,0 +1,35 @@ +package com.rusefi.tune.xml; + +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlValue; + +public class PcVariable { + private String name; + private String value; + + @XmlAttribute + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @XmlValue + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + @Override + public String toString() { + return "PcVariable{" + + "name='" + name + '\'' + + ", value='" + value + '\'' + + '}'; + } +} diff --git a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java index e1e50862b2..9f93a1130c 100644 --- a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java +++ b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java @@ -74,7 +74,7 @@ public class ConsoleTools { public static void main(String[] args) throws Exception { System.out.println(Arrays.toString(new File(".").list())); System.setProperty("ini_file_path", "../firmware/tunerstudio"); - calcBinaryImageTuneCrc(null, "current_configuration.rusefi_binary"); +// calcBinaryImageTuneCrc(null, "current_configuration.rusefi_binary"); calcXmlImageTuneCrc(null, "CurrentTune.msq"); }