From cdf94718fd896fdd4f3b5cb6f3641b166f5691ea Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 19 Nov 2017 14:26:21 -0500 Subject: [PATCH] #495 --- firmware/rusefi.cpp | 2 +- .../io/src/com/rusefi/binaryprotocol/BinaryProtocol.java | 8 ++++---- .../rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 61dde505c9..862ef233e5 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -248,7 +248,7 @@ void chDbgStackOverflowPanic(thread_t *otp) { static char UNUSED_RAM_SIZE[8000]; -static char UNUSED_CCM_SIZE[12000] CCM_OPTIONAL; +static char UNUSED_CCM_SIZE[14000] CCM_OPTIONAL; int getRusEfiVersion(void) { if (UNUSED_RAM_SIZE[0] != 0) diff --git a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java index 80991e20de..3af64bb89e 100644 --- a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -3,15 +3,15 @@ package com.rusefi.binaryprotocol; import com.opensr5.ConfigurationImage; import com.opensr5.Logger; import com.opensr5.io.DataListener; -import com.rusefi.*; +import com.rusefi.ConfigurationImageDiff; +import com.rusefi.FileLog; +import com.rusefi.Timeouts; import com.rusefi.config.FieldType; import com.rusefi.config.Fields; import com.rusefi.core.Pair; import com.rusefi.core.Sensor; import com.rusefi.core.SensorCentral; import com.rusefi.io.*; -import com.rusefi.io.serial.SerialIoStream; -import jssc.SerialPort; import jssc.SerialPortException; import java.io.EOFException; @@ -122,7 +122,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { */ public boolean connectAndReadConfiguration(DataListener listener) { switchToBinaryProtocol(); - readImage(TsPageSize.IMAGE_SIZE); + readImage(Fields.TOTAL_CONFIG_SIZE); if (isClosed) return false; diff --git a/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java b/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java index 17a4872435..84662d31bd 100644 --- a/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java +++ b/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java @@ -5,8 +5,8 @@ import com.opensr5.Logger; import com.opensr5.io.ConfigurationImageFile; import com.romraider.editor.ecu.ECUEditor; import com.rusefi.RomRaiderWrapper; -import com.rusefi.TsPageSize; import com.rusefi.UploadChanges; +import com.rusefi.config.Fields; import com.rusefi.io.serial.PortHolder; import com.rusefi.io.serial.SerialIoStream; import jssc.SerialPort; @@ -39,7 +39,7 @@ public class BinaryProtocolCmdSandbox { logger.info("Binary looks good!"); bp.switchToBinaryProtocol(); - bp.readImage(TsPageSize.IMAGE_SIZE); + bp.readImage(Fields.TOTAL_CONFIG_SIZE); // // image.saveToFile("rusefi_configuration.bin"); //