From df24230d47bcf323bb410436d2f8cbf92c5a0d18 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 24 Jul 2017 22:26:41 -0400 Subject: [PATCH] fix #307 --- firmware/console/binary/tunerstudio.cpp | 18 +++++++++++++++--- firmware/controllers/algo/rusefi_enums.h | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index 945704c24d..527dcb88a4 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -229,12 +229,16 @@ int getTunerStudioPageSize(int pageIndex) { return 0; } +static void sendOkResponse(ts_channel_s *tsChannel, ts_response_format_e mode) { + sr5SendResponse(tsChannel, mode, NULL, 0); +} + void handlePageSelectCommand(ts_channel_s *tsChannel, ts_response_format_e mode, uint16_t pageId) { tsState.pageCommandCounter++; currentPageId = pageId; scheduleMsg(&tsLogger, "PAGE %d", currentPageId); - sr5SendResponse(tsChannel, mode, NULL, 0); + sendOkResponse(tsChannel, mode); } static void onlineTuneBytes(int currentPageId, uint32_t offset, int count) { @@ -286,7 +290,7 @@ void handleWriteChunkCommand(ts_channel_s *tsChannel, ts_response_format_e mode, memcpy(addr, content, count); onlineTuneBytes(currentPageId, offset, count); - sr5SendResponse(tsChannel, mode, NULL, 0); + sendOkResponse(tsChannel, mode); } void handleCrc32Check(ts_channel_s *tsChannel, ts_response_format_e mode, uint16_t pageId, uint16_t offset, @@ -821,9 +825,17 @@ int tunerStudioHandleCrcCommand(ts_channel_s *tsChannel, char *data, int incomin uint16_t subsystem = SWAP_UINT16(*(short*)&data[0]); uint16_t index = SWAP_UINT16(*(short*)&data[2]); + if (engineConfiguration->debugMode == DBG_BENCH_TEST) { + tsOutputChannels.debugIntField1++; + tsOutputChannels.debugIntField2 = subsystem; + tsOutputChannels.debugIntField3 = index; + + } + #if EFI_PROD_CODE || defined(__DOXYGEN__) runIoTest(subsystem, index); -#endif +#endif /* EFI_PROD_CODE */ + sendOkResponse(tsChannel, TS_CRC); } else { tunerStudioError("ERROR: ignoring unexpected command"); return false; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index ac707ac739..20b4fb776c 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -692,7 +692,7 @@ typedef enum { DBG_TRIGGER_SYNC = 16, DBG_ELECTRONIC_THROTTLE = 17, DBG_EXECUTOR = 18, - DM_19 = 19, + DBG_BENCH_TEST = 19, DM_20 = 20, DM_21 = 21, DM_22 = 22,