diff --git a/firmware/.gitignore b/firmware/.gitignore index 7827f12ed2..4b45e40617 100644 --- a/firmware/.gitignore +++ b/firmware/.gitignore @@ -2,3 +2,5 @@ openocd benchmark.txt gen_*.log deliver/ +rusefi_tool.log + diff --git a/java_console/.idea/runConfigurations/Launcher_convert_binary_configuration_to_xml.xml b/java_console/.idea/runConfigurations/Launcher_convert_binary_configuration_to_xml.xml new file mode 100644 index 0000000000..3c5da12298 --- /dev/null +++ b/java_console/.idea/runConfigurations/Launcher_convert_binary_configuration_to_xml.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/java_console/inifile/src/com/opensr5/ini/field/ArrayIniField.java b/java_console/inifile/src/com/opensr5/ini/field/ArrayIniField.java index 3539bd22e8..95237da29c 100644 --- a/java_console/inifile/src/com/opensr5/ini/field/ArrayIniField.java +++ b/java_console/inifile/src/com/opensr5/ini/field/ArrayIniField.java @@ -1,5 +1,7 @@ package com.opensr5.ini.field; +import com.opensr5.ConfigurationImage; +import com.rusefi.config.Field; import com.rusefi.config.FieldType; import java.util.LinkedList; @@ -28,6 +30,21 @@ public class ArrayIniField extends IniField { return rows; } + @Override + public String getValue(ConfigurationImage image) { + StringBuilder sb = new StringBuilder(); + for (int rowIndex = 0; rowIndex < rows; rowIndex++) { + sb.append("\n\t"); + for (int colIndex = 0; colIndex < cols; colIndex++) { + Field f = new Field("", getOffset() + rowIndex * getType().getStorageSize(), getType()); + sb.append(' '); + sb.append(f.getAnyValue(image)); + } + } + sb.append("\n"); + return sb.toString(); + } + public static IniField parse(LinkedList list) { String name = list.get(0); FieldType type = FieldType.parseTs(list.get(2)); diff --git a/java_console/ui/src/com/rusefi/tools/ConsoleTools.java b/java_console/ui/src/com/rusefi/tools/ConsoleTools.java index e6289fc24c..e3f79b0a77 100644 --- a/java_console/ui/src/com/rusefi/tools/ConsoleTools.java +++ b/java_console/ui/src/com/rusefi/tools/ConsoleTools.java @@ -39,7 +39,7 @@ public class ConsoleTools { TOOLS.put("functional_test", ConsoleTools::runFunctionalTest); TOOLS.put("compile_fsio_file", ConsoleTools::runCompileTool); TOOLS.put("firing_order", ConsoleTools::runFiringOrderTool); - TOOLS.put("fun_convert", ConsoleTools::convertBinaryToXml); + TOOLS.put("convert_binary_configuration_to_xml", ConsoleTools::convertBinaryToXml); TOOLS.put("reboot_ecu", args -> sendCommand(Fields.CMD_REBOOT)); TOOLS.put(Fields.CMD_REBOOT_DFU, args -> sendCommand(Fields.CMD_REBOOT_DFU)); }