From 5cf0d645eb9eae450f6d7239fc101ee15899a45c Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 3 Oct 2016 22:03:22 -0400 Subject: [PATCH] auto-sync --- firmware/console/binary/tunerstudio.cpp | 4 ++-- firmware/controllers/algo/obd_error_codes.h | 2 +- firmware/rusefi.cpp | 2 +- firmware/tunerstudio/rusefi.input | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index 0d739f8260..95c3e9ac5f 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -243,9 +243,9 @@ void handlePageSelectCommand(ts_channel_s *tsChannel, ts_response_format_e mode, static void onlineTuneBytes(int currentPageId, int offset, int count) { if (offset > sizeof(engine_configuration_s)) { - int maxSize = sizeof(engine_configuration_s) - offset; + int maxSize = sizeof(persistent_config_s) - offset; if (count > maxSize) { - warning(CUSTOM_OBD_99, "TS overflow %d %d", offset, count); + warning(CUSTOM_TS_OVERFLOW, "TS overflow %d %d", offset, count); return; } scheduleMsg(&tsLogger, "applying soft change from %d length %d", offset, count); diff --git a/firmware/controllers/algo/obd_error_codes.h b/firmware/controllers/algo/obd_error_codes.h index 81ab2543ad..9436704064 100644 --- a/firmware/controllers/algo/obd_error_codes.h +++ b/firmware/controllers/algo/obd_error_codes.h @@ -1772,7 +1772,7 @@ typedef enum { CUSTOM_OBD_96 = 6096, CUSTOM_OBD_97 = 6097, CUSTOM_OBD_98 = 6098, - CUSTOM_OBD_99 = 6099, + CUSTOM_TS_OVERFLOW = 6099, // this is needed for proper enum size, this matters for malfunction_central diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 176250285c..bad29a428e 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -293,5 +293,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20161002; + return 20161003; } diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index c0466e4f3e..f324689525 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1141,7 +1141,7 @@ fileVersion = { 20160702 } debugIntField3Gauge = debugIntField3, "debug i3", "%", 0, 100, 0, 0, 100, 100, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "speed2rpm", "", 0, 100, 0, 0, 100, 100, 4, 4 warningCounterGauge = warningCounter, "warn", "", 0, 100, 0, 0, 100, 100, 0, 0 - lastErrorCodeGauge = lastErrorCode, "error", "", 0, 100, 0, 0, 100, 100, 0, 0 + lastErrorCodeGauge = lastErrorCode, "error", "", 0, 8000, 0, 0, 8000, 8000, 0, 0 internalMcuTemperatureGauge = internalMcuTemperature, "internal temperature", "C", 0, 100, 0, 0, 100, 100, 0, 0 vvtPositionGauge = vvtPosition, "VVT position", "deg", 0, 100, 0, 0, 720, 720, 0, 0