diff --git a/java_console/inifile/src/main/java/com/opensr5/ini/field/ArrayIniField.java b/java_console/inifile/src/main/java/com/opensr5/ini/field/ArrayIniField.java index 73cf9c0e24..4b06da4cb2 100644 --- a/java_console/inifile/src/main/java/com/opensr5/ini/field/ArrayIniField.java +++ b/java_console/inifile/src/main/java/com/opensr5/ini/field/ArrayIniField.java @@ -3,7 +3,6 @@ package com.opensr5.ini.field; import com.opensr5.ConfigurationImage; import com.rusefi.config.Field; import com.rusefi.config.FieldType; -import com.rusefi.tune.xml.Constant; import java.nio.ByteBuffer; import java.util.LinkedList; @@ -65,21 +64,6 @@ public class ArrayIniField extends IniField { return getOffset() + (rowIndex * cols + colIndex) * getType().getStorageSize(); } - @Override - public void setValue(ConfigurationImage image, Constant constant) { - String[] values = constant.getValue().trim().split("\\s+"); - if (values.length != getRows() * getCols()) - throw new IllegalStateException(values.length + " values while expecting " + getRows() + " by " + getCols() + " total " + getRows() * getCols()); - - for (int rowIndex = 0; rowIndex < rows; rowIndex++) { - for (int colIndex = 0; colIndex < cols; colIndex++) { - String value = values[rowIndex * cols + colIndex]; - ByteBuffer wrapped = image.getByteBuffer(getOffset(rowIndex, colIndex), type.getStorageSize()); - ScalarIniField.setValue(wrapped, type, value, Field.NO_BIT_OFFSET, multiplier); - } - } - } - @Override public String toString() { return "ArrayIniField{" + diff --git a/java_console/inifile/src/main/java/com/opensr5/ini/field/EnumIniField.java b/java_console/inifile/src/main/java/com/opensr5/ini/field/EnumIniField.java index 02ec8dc4ae..1d9d7a2c44 100644 --- a/java_console/inifile/src/main/java/com/opensr5/ini/field/EnumIniField.java +++ b/java_console/inifile/src/main/java/com/opensr5/ini/field/EnumIniField.java @@ -2,7 +2,6 @@ package com.opensr5.ini.field; import com.opensr5.ConfigurationImage; import com.rusefi.config.FieldType; -import com.rusefi.tune.xml.Constant; import org.jetbrains.annotations.NotNull; import javax.management.ObjectName; @@ -66,17 +65,6 @@ public class EnumIniField extends IniField { return (len >= 2 && q.charAt(0) == '"' && q.charAt(len - 1) == '"'); } - @Override - public void setValue(ConfigurationImage image, Constant constant) { - String v = constant.getValue(); - int ordinal = enums.indexOf(isQuoted(v) ? ObjectName.unquote(v) : v); - if (ordinal == -1) - throw new IllegalArgumentException("Not found " + v); - int value = getByteBuffer(image).getInt(); - value = setBitRange(value, ordinal, bitPosition, bitSize0 + 1); - getByteBuffer(image).putInt(value); - } - @Override public String toString() { return "EnumIniField{" + diff --git a/java_console/inifile/src/main/java/com/opensr5/ini/field/IniField.java b/java_console/inifile/src/main/java/com/opensr5/ini/field/IniField.java index f204e84cf9..7a7842c6a4 100644 --- a/java_console/inifile/src/main/java/com/opensr5/ini/field/IniField.java +++ b/java_console/inifile/src/main/java/com/opensr5/ini/field/IniField.java @@ -1,7 +1,6 @@ package com.opensr5.ini.field; import com.opensr5.ConfigurationImage; -import com.rusefi.tune.xml.Constant; public abstract class IniField { private final String name; @@ -47,8 +46,4 @@ public abstract class IniField { public String getValue(ConfigurationImage image) { return null; } - - public void setValue(ConfigurationImage image, Constant constant) { - throw new UnsupportedOperationException("On " + getClass()); - } } diff --git a/java_console/inifile/src/main/java/com/opensr5/ini/field/ScalarIniField.java b/java_console/inifile/src/main/java/com/opensr5/ini/field/ScalarIniField.java index b588c1c3bc..f936d26bd1 100644 --- a/java_console/inifile/src/main/java/com/opensr5/ini/field/ScalarIniField.java +++ b/java_console/inifile/src/main/java/com/opensr5/ini/field/ScalarIniField.java @@ -3,7 +3,6 @@ package com.opensr5.ini.field; import com.opensr5.ConfigurationImage; import com.rusefi.config.Field; import com.rusefi.config.FieldType; -import com.rusefi.tune.xml.Constant; import java.nio.ByteBuffer; import java.util.LinkedList; @@ -55,11 +54,10 @@ public class ScalarIniField extends IniField { } } - @Override - public void setValue(ConfigurationImage image, Constant constant) { + public void setValue(ConfigurationImage image, String value) { Field f = new Field(getName(), getOffset(), getType()); ByteBuffer wrapped = image.getByteBuffer(getOffset(), type.getStorageSize()); - setValue(wrapped, type, constant.getValue(), f.getBitOffset(), multiplier); + setValue(wrapped, type, value, f.getBitOffset(), multiplier); } public static void setValue(ByteBuffer wrapped, FieldType type, String value, int bitOffset, double multiplier) { diff --git a/java_console/inifile/src/main/java/com/opensr5/ini/field/StringIniField.java b/java_console/inifile/src/main/java/com/opensr5/ini/field/StringIniField.java index 96ec2e0410..607cd0105e 100644 --- a/java_console/inifile/src/main/java/com/opensr5/ini/field/StringIniField.java +++ b/java_console/inifile/src/main/java/com/opensr5/ini/field/StringIniField.java @@ -1,7 +1,6 @@ package com.opensr5.ini.field; import com.opensr5.ConfigurationImage; -import com.rusefi.tune.xml.Constant; import java.util.LinkedList; @@ -25,13 +24,6 @@ public class StringIniField extends IniField { return value; } - @Override - public void setValue(ConfigurationImage image, Constant constant) { - String value = constant.getValue(); - for (int i = 0; i < value.length(); i++) - image.getContent()[getOffset() + i] = (byte) value.charAt(i); - } - public static IniField parse(LinkedList list) { String name = list.get(0); int offset = Integer.parseInt(list.get(3)); diff --git a/java_console/inifile/src/main/java/com/rusefi/tune/xml/Constant.java b/java_console/inifile/src/main/java/com/rusefi/tune/xml/Constant.java deleted file mode 100644 index a0c06a47e1..0000000000 --- a/java_console/inifile/src/main/java/com/rusefi/tune/xml/Constant.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.rusefi.tune.xml; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlValue; - -public class Constant { - private String name; - private String units; - private String value; - private String digits; - private String rows; - private String cols; - - public Constant() { - } - - public Constant(String name, String units, String value, String digits) { - this.name = name; - this.units = units; - this.value = value; - this.digits = digits; - } - - @XmlAttribute - public String getName() { - return name; - } - - @XmlAttribute - public String getUnits() { - return units; - } - - @XmlValue - public String getValue() { - return value; - } - - @XmlAttribute - public String getDigits() { - return digits; - } - - @XmlAttribute - public String getRows() { - return rows; - } - - @XmlAttribute - public String getCols() { - return cols; - } - - public void setCols(String cols) { - this.cols = cols; - } - - public void setRows(String rows) { - this.rows = rows; - } - - public void setDigits(String digits) { - this.digits = digits; - } - - public void setName(String name) { - this.name = name; - } - - public void setUnits(String units) { - this.units = units; - } - - public void setValue(String value) { - this.value = value; - } -} diff --git a/java_console/inifile/src/main/java/com/rusefi/tune/xml/VersionInfo.java b/java_console/inifile/src/main/java/com/rusefi/tune/xml/VersionInfo.java deleted file mode 100644 index e0d710090c..0000000000 --- a/java_console/inifile/src/main/java/com/rusefi/tune/xml/VersionInfo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.rusefi.tune.xml; - -import javax.xml.bind.annotation.XmlAttribute; -import java.util.Objects; - -public class VersionInfo { - private String firmwareInfo; - private String signature; - - public VersionInfo() { - } - - public VersionInfo(String firmwareInfo) { - this.firmwareInfo = firmwareInfo; - } - - @XmlAttribute - public String getVersion() { - return "5.0"; - } - - @XmlAttribute - public String getNPages() { - return "1"; - } - - @XmlAttribute - public String getFirmwareInfo() { - return firmwareInfo; - } - - @XmlAttribute - public String getSignature() { - return signature; - } - - public void setFirmwareInfo(String firmwareInfo) { - this.firmwareInfo = firmwareInfo; - } - - public void setSignature(String signature) { - this.signature = signature; - } - - public void validate() { - Objects.requireNonNull(signature, "signature"); - } -} diff --git a/java_console/inifile/src/main/java/com/rusefi/tune/xml/package-info.java b/java_console/inifile/src/main/java/com/rusefi/tune/xml/package-info.java deleted file mode 100644 index 6a84e494fa..0000000000 --- a/java_console/inifile/src/main/java/com/rusefi/tune/xml/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -@XmlSchema( - namespace = "http://www.msefi.com/:msq", - elementFormDefault = XmlNsForm.QUALIFIED -) -package com.rusefi.tune.xml; - -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; diff --git a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/BinaryProtocolServerSandbox.java b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/BinaryProtocolServerSandbox.java index 5d6fe65335..46e044fd39 100644 --- a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/BinaryProtocolServerSandbox.java +++ b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/BinaryProtocolServerSandbox.java @@ -8,7 +8,6 @@ import com.rusefi.config.generated.Fields; import com.rusefi.io.LinkConnector; import com.rusefi.io.LinkManager; import com.rusefi.io.tcp.BinaryProtocolServer; -import com.rusefi.tune.xml.Constant; /** * Starts a fake device with TCP connector at {@link BinaryProtocolServer#DEFAULT_PROXY_PORT} port @@ -23,8 +22,6 @@ class BinaryProtocolServerSandbox { BinaryProtocolState state = new BinaryProtocolState(); ConfigurationImage controller = new ConfigurationImage(new byte[Fields.TOTAL_CONFIG_SIZE]); - ScalarIniField iniField = TestHelper.createIniField(Fields.TWOSTROKE); - iniField.setValue(controller, new Constant(iniField.getName(), "", "1", iniField.getDigits())); state.setController(controller); state.setCurrentOutputs(new byte[1 + Fields.TS_TOTAL_OUTPUT_SIZE]); diff --git a/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java b/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java index 667df2bdef..76ddaf6a6d 100644 --- a/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java +++ b/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java @@ -12,7 +12,6 @@ import com.rusefi.io.LinkManager; import com.rusefi.io.tcp.BinaryProtocolServer; import com.rusefi.io.tcp.TcpIoStream; import com.rusefi.core.FileUtil; -import com.rusefi.tune.xml.Constant; import org.jetbrains.annotations.NotNull; import java.io.IOException; @@ -44,7 +43,7 @@ public class TestHelper { public static ConfigurationImage prepareImage(int input, ScalarIniField scalarIniField) { ConfigurationImage ci = new ConfigurationImage(Fields.TOTAL_CONFIG_SIZE); - scalarIniField.setValue(ci, new Constant(scalarIniField.getName(), "", Integer.toString(input), scalarIniField.getDigits())); + scalarIniField.setValue(ci, Integer.toString(input)); return ci; } 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 7455bd57c1..7479edf866 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 @@ -20,7 +20,6 @@ import com.rusefi.io.tcp.BinaryProtocolServer; import com.rusefi.maintenance.ExecHelper; import org.jetbrains.annotations.Nullable; -import javax.xml.bind.JAXBException; import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -203,7 +202,7 @@ public class ConsoleTools { return autoDetectedPort; } - private static void convertBinaryToXml(String[] args) throws IOException, JAXBException { + private static void convertBinaryToXml(String[] args) throws IOException { if (args.length < 2) { System.err.println("Binary file input expected"); System.exit(-1);