From 574e72bc9443228d68bc95c08881e9326002df20 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 9 Feb 2017 13:05:40 -0500 Subject: [PATCH] auto-sync --- firmware/console/binary/tunerstudio.cpp | 2 -- firmware/controllers/algo/rusefi_generated.h | 1 + firmware/integration/rusefi_config.txt | 4 ++++ .../io/src/com/rusefi/binaryprotocol/BinaryProtocol.java | 8 +++----- .../io/src/com/rusefi/io/tcp/BinaryProtocolServer.java | 5 +++-- .../rusefi/io/tcp/test/BinaryProtocolServerSandbox.java | 3 ++- java_console/models/src/com/rusefi/config/Fields.java | 3 ++- java_console/ui/src/com/rusefi/Launcher.java | 2 +- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index 206ae8b004..ec917a633e 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -86,8 +86,6 @@ #if EFI_TUNER_STUDIO || defined(__DOXYGEN__) -#define TS_OUTPUT_SIZE 356 - EXTERN_ENGINE ; diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index faa1c87233..1630f2f79d 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1,5 +1,6 @@ #define LE_COMMAND_LENGTH 200 #define FSIO_ADC_COUNT 4 +#define TS_OUTPUT_SIZE 356 #define TS_FILE_VERSION 20161225 #define WARMUP_TARGET_AFR_SIZE 4 #define MAP_ANGLE_SIZE 8 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index e0b0fcf272..b04964c6c1 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -31,6 +31,10 @@ struct_no_prefix engine_configuration_s #define LE_COMMAND_LENGTH 200 #define FSIO_ADC_COUNT 4 + +! this is here so that rusEfi console can access it, too +#define TS_OUTPUT_SIZE 356 + ! ! this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version ! so not forget to change fileVersion in rusefi.ini diff --git a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java index 1bd2f35b39..0c3b3b5a9a 100644 --- a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -2,6 +2,7 @@ package com.rusefi.binaryprotocol; import com.rusefi.*; 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; @@ -28,9 +29,6 @@ import static com.rusefi.binaryprotocol.IoHelper.*; * 3/6/2015 */ public class BinaryProtocol { - // todo: is this auto-synched with rusefi.ini? - public static final int OUTPUT_CHANNELS_SIZE = 276; - // see BLOCKING_FACTOR in firmware code private static final int BLOCKING_FACTOR = 400; private static final byte RESPONSE_OK = 0; @@ -266,7 +264,7 @@ public class BinaryProtocol { logger.trace("Got packet size " + packetSize); if (packetSize < 0) return null; - if (!allowLongResponse && packetSize > Math.max(BLOCKING_FACTOR, OUTPUT_CHANNELS_SIZE) + 10) + if (!allowLongResponse && packetSize > Math.max(BLOCKING_FACTOR, Fields.TS_OUTPUT_SIZE) + 10) return null; isTimeout = incomingData.waitForBytes(packetSize + 4, start, msg + " body"); @@ -481,7 +479,7 @@ public class BinaryProtocol { if (isClosed) return; byte[] response = executeCommand(new byte[]{COMMAND_OUTPUTS}, "output channels", false); - if (response == null || response.length != (OUTPUT_CHANNELS_SIZE + 1) || response[0] != RESPONSE_OK) + if (response == null || response.length != (Fields.TS_OUTPUT_SIZE + 1) || response[0] != RESPONSE_OK) return; currentOutputs = response; diff --git a/java_console/io/src/com/rusefi/io/tcp/BinaryProtocolServer.java b/java_console/io/src/com/rusefi/io/tcp/BinaryProtocolServer.java index 655f343ce0..fd14d25129 100644 --- a/java_console/io/src/com/rusefi/io/tcp/BinaryProtocolServer.java +++ b/java_console/io/src/com/rusefi/io/tcp/BinaryProtocolServer.java @@ -3,6 +3,7 @@ package com.rusefi.io.tcp; import com.rusefi.FileLog; import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.IoHelper; +import com.rusefi.config.Fields; import java.io.*; import java.net.ServerSocket; @@ -122,11 +123,11 @@ public class BinaryProtocolServer { } } else if (command == BinaryProtocol.COMMAND_OUTPUTS) { - byte[] response = new byte[1 + BinaryProtocol.OUTPUT_CHANNELS_SIZE]; + byte[] response = new byte[1 + Fields.TS_OUTPUT_SIZE]; response[0] = (byte) TS_OK.charAt(0); byte[] currentOutputs = BinaryProtocol.currentOutputs; if (currentOutputs != null) - System.arraycopy(currentOutputs, 1, response, 1, BinaryProtocol.OUTPUT_CHANNELS_SIZE); + System.arraycopy(currentOutputs, 1, response, 1, Fields.TS_OUTPUT_SIZE); BinaryProtocol.sendCrcPacket(response, FileLog.LOGGER, stream); } else { FileLog.MAIN.logLine("Error: unknown command " + command); diff --git a/java_console/io/src/com/rusefi/io/tcp/test/BinaryProtocolServerSandbox.java b/java_console/io/src/com/rusefi/io/tcp/test/BinaryProtocolServerSandbox.java index eb31f8c215..37d2f19238 100644 --- a/java_console/io/src/com/rusefi/io/tcp/test/BinaryProtocolServerSandbox.java +++ b/java_console/io/src/com/rusefi/io/tcp/test/BinaryProtocolServerSandbox.java @@ -3,6 +3,7 @@ package com.rusefi.io.tcp.test; import com.rusefi.ConfigurationImage; import com.rusefi.FileLog; import com.rusefi.binaryprotocol.BinaryProtocol; +import com.rusefi.config.Fields; import com.rusefi.io.tcp.BinaryProtocolServer; import com.rusefi.io.tcp.TcpIoStream; @@ -14,7 +15,7 @@ class BinaryProtocolServerSandbox { TcpIoStream stream = new TcpIoStream(new ByteArrayInputStream(new byte[0]), new ByteArrayOutputStream()); BinaryProtocol.instance = new BinaryProtocol(FileLog.LOGGER, stream); BinaryProtocol.instance.setController(new ConfigurationImage(new byte[14008])); - BinaryProtocol.currentOutputs = new byte[1 + BinaryProtocol.OUTPUT_CHANNELS_SIZE]; + BinaryProtocol.currentOutputs = new byte[1 + Fields.TS_OUTPUT_SIZE]; BinaryProtocolServer.start(); } } \ No newline at end of file diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index ca76aceda5..73e78b5fee 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,9 +1,10 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Feb 09 11:38:10 EST 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Feb 09 12:25:50 EST 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; + public static final int TS_OUTPUT_SIZE = 356; public static final int TS_FILE_VERSION = 20161225; public static final int WARMUP_TARGET_AFR_SIZE = 4; public static final int MAP_ANGLE_SIZE = 8; diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index a86d817c86..97e055dfa7 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -44,7 +44,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20170205; + public static final int CONSOLE_VERSION = 20170209; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port";