From 474b99ba604beb25b57a7eb03c9fa2e4a8509eec Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 29 Dec 2016 21:02:50 -0500 Subject: [PATCH] auto-sync --- firmware/console/binary/tunerstudio.cpp | 2 +- firmware/console/binary/tunerstudio_configuration.h | 2 +- firmware/console/binary/tunerstudio_io.h | 4 ++-- firmware/tunerstudio/rusefi.ini | 4 ++-- firmware/tunerstudio/rusefi.input | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index cf4f8b3d7e..0a3b9e43e5 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -86,7 +86,7 @@ #if EFI_TUNER_STUDIO || defined(__DOXYGEN__) -#define TS_OUTPUT_SIZE 356 +#define TS_OUTPUT_SIZE 276 EXTERN_ENGINE ; diff --git a/firmware/console/binary/tunerstudio_configuration.h b/firmware/console/binary/tunerstudio_configuration.h index 32d2b84e87..2bb29f616a 100644 --- a/firmware/console/binary/tunerstudio_configuration.h +++ b/firmware/console/binary/tunerstudio_configuration.h @@ -132,7 +132,7 @@ typedef struct { float debugFloatField6; // 256 float debugFloatField7; // 260 int firmwareVersion; // 264 - int unused3[22]; + int unused3[2]; } TunerStudioOutputChannels; #endif /* TUNERSTUDIO_CONFIGURATION_H_ */ diff --git a/firmware/console/binary/tunerstudio_io.h b/firmware/console/binary/tunerstudio_io.h index baab09b1a6..9282457d4c 100644 --- a/firmware/console/binary/tunerstudio_io.h +++ b/firmware/console/binary/tunerstudio_io.h @@ -35,7 +35,7 @@ typedef enum { // see 'blockingFactor' in rusefi.ini todo: move to rusefi_config.txt // see BLOCKING_FACTOR in java console code -#define BLOCKING_FACTOR 400 +#define BLOCKING_FACTOR 320 typedef struct { BaseChannel * channel; @@ -44,7 +44,7 @@ typedef struct { * we use 'blockingFactor = 320' in rusefi.ini * todo: should we just do (320 + CRC_WRAPPING_SIZE) ? */ - char crcReadBuffer[BLOCKING_FACTOR + 10]; + char crcReadBuffer[BLOCKING_FACTOR + 30]; } ts_channel_s; #define TS_HELLO_COMMAND_DEPRECATED 'H' // 0x48 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 8cbddd2a1f..5223de7fc1 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -42,7 +42,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Dec 28 20:58:35 EST 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Dec 29 19:06:21 EST 2016 pageSize = 16376 page = 1 @@ -805,7 +805,7 @@ fileVersion = { 20161225 } ochGetCommand = "O" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 356 + ochBlockSize = 276 rpm = scalar, U32, 0, "RPM", 1, 0.00000 #if CELSIUS diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 289827bbfb..1324bf2434 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -750,7 +750,7 @@ fileVersion = { 20161225 } ochGetCommand = "O" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 356 + ochBlockSize = 276 rpm = scalar, U32, 0, "RPM", 1, 0.00000 #if CELSIUS