From 53bcd448cf2f012e13a85d596f582c542c52911b Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 15 Nov 2020 11:55:26 -0500 Subject: [PATCH] occasional tunerstudio CRC errors #1943 getting ready for unit test --- firmware/console/binary/tunerstudio_io.cpp | 14 ++++++++++++-- unit_tests/Makefile | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/firmware/console/binary/tunerstudio_io.cpp b/firmware/console/binary/tunerstudio_io.cpp index 74961a790e..5928ccf165 100644 --- a/firmware/console/binary/tunerstudio_io.cpp +++ b/firmware/console/binary/tunerstudio_io.cpp @@ -55,9 +55,9 @@ static CANConfig tsCanConfig = { CAN_MCR_ABOM | CAN_MCR_AWUM | CAN_MCR_TXFP, CAN void startTsPort(ts_channel_s *tsChannel) { - tsChannel->channel = (BaseChannel *) NULL; #if EFI_PROD_CODE + tsChannel->channel = (BaseChannel *) NULL; #if defined(TS_USB_DEVICE) #if defined(TS_UART_DEVICE) #error "cannot have TS_UART_DEVICE and TS_USB_DEVICE" @@ -114,7 +114,7 @@ void startTsPort(ts_channel_s *tsChannel) { //tsChannel->channel = (BaseChannel *) &TS_CAN_DEVICE; } #endif /* TS_CAN_DEVICE */ - #else /* EFI_PROD_CODE */ + #elif EFI_SIMULATOR /* EFI_PROD_CODE */ tsChannel->channel = (BaseChannel *) TS_SIMULATOR_PORT; #endif /* EFI_PROD_CODE */ } @@ -148,6 +148,15 @@ bool stopTsPort(ts_channel_s *tsChannel) { #endif /* EFI_PROD_CODE */ } +#if EFI_UNIT_TEST +void sr5WriteData(ts_channel_s *tsChannel, const uint8_t * buffer, int size) { + +} +#endif // EFI_UNIT_TEST + + + +#if EFI_PROD_CODE || EFI_SIMULATOR void sr5WriteData(ts_channel_s *tsChannel, const uint8_t * buffer, int size) { efiAssertVoid(CUSTOM_ERR_6570, getCurrentRemainingStack() > 64, "tunerStudioWriteData"); #if EFI_SIMULATOR @@ -223,6 +232,7 @@ int sr5ReadDataTimeout(ts_channel_s *tsChannel, uint8_t * buffer, int size, int int sr5ReadData(ts_channel_s *tsChannel, uint8_t * buffer, int size) { return sr5ReadDataTimeout(tsChannel, buffer, size, SR5_READ_TIMEOUT); } +#endif // EFI_PROD_CODE || EFI_SIMULATOR static void sr5WriteCrcPacketSmall(ts_channel_s* tsChannel, uint8_t responseCode, const uint8_t* buf, size_t size) { auto scratchBuffer = tsChannel->scratchBuffer; diff --git a/unit_tests/Makefile b/unit_tests/Makefile index a01f6cd03b..d1da8c3cfd 100644 --- a/unit_tests/Makefile +++ b/unit_tests/Makefile @@ -104,6 +104,7 @@ include $(PROJECT_DIR)/config/engines/engines.mk include $(PROJECT_DIR)/controllers/controllers.mk include $(PROJECT_DIR)/development/development.mk include $(PROJECT_DIR)/console/console.mk +include $(PROJECT_DIR)/console/binary/tunerstudio.mk include $(PROJECT_DIR)/hw_layer/hw_layer.mk include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk @@ -143,6 +144,7 @@ CPPSRC = $(UTILSRC_CPP) \ $(TESTS_SRC_CPP) \ $(SYSTEMSRC_CPP) \ $(HW_LAYER_EMS_CPP) \ + $(TUNERSTUDIO_SRC_CPP) \ $(HW_SENSORS_SRC) \ $(TRIGGER_SRC_CPP) \ $(INIT_SRC_CPP) \