rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

occasional tunerstudio CRC errors #1943 

getting ready for unit test
This commit is contained in:
rusefillc 2020-11-15 11:55:26 -05:00
parent 30a0082ed2
commit 286fa10b15
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/console/binary/tunerstudio_io.cpp
View File

@ -55,9 +55,9 @@ static CANConfig tsCanConfig = { CAN_MCR_ABOM | CAN_MCR_AWUM | CAN_MCR_TXFP, CAN
void startTsPort(ts_channel_s *tsChannel) { void startTsPort(ts_channel_s *tsChannel) {
tsChannel->channel = (BaseChannel *) NULL;
#if EFI_PROD_CODE #if EFI_PROD_CODE
tsChannel->channel = (BaseChannel *) NULL;
#if defined(TS_USB_DEVICE) #if defined(TS_USB_DEVICE)
#if defined(TS_UART_DEVICE) #if defined(TS_UART_DEVICE)
#error "cannot have TS_UART_DEVICE and TS_USB_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; //tsChannel->channel = (BaseChannel *) &TS_CAN_DEVICE;
} }
#endif /* TS_CAN_DEVICE */ #endif /* TS_CAN_DEVICE */
#else /* EFI_PROD_CODE */ #elif EFI_SIMULATOR /* EFI_PROD_CODE */
tsChannel->channel = (BaseChannel *) TS_SIMULATOR_PORT; tsChannel->channel = (BaseChannel *) TS_SIMULATOR_PORT;
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
} }
@ -148,6 +148,15 @@ bool stopTsPort(ts_channel_s *tsChannel) {
#endif /* EFI_PROD_CODE */ #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) { void sr5WriteData(ts_channel_s *tsChannel, const uint8_t * buffer, int size) {
efiAssertVoid(CUSTOM_ERR_6570, getCurrentRemainingStack() > 64, "tunerStudioWriteData"); efiAssertVoid(CUSTOM_ERR_6570, getCurrentRemainingStack() > 64, "tunerStudioWriteData");
#if EFI_SIMULATOR #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) { int sr5ReadData(ts_channel_s *tsChannel, uint8_t * buffer, int size) {
return sr5ReadDataTimeout(tsChannel, buffer, size, SR5_READ_TIMEOUT); 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) { static void sr5WriteCrcPacketSmall(ts_channel_s* tsChannel, uint8_t responseCode, const uint8_t* buf, size_t size) {
auto scratchBuffer = tsChannel->scratchBuffer; auto scratchBuffer = tsChannel->scratchBuffer;

2
unit_tests/Makefile
View File

@ -104,6 +104,7 @@ include $(PROJECT_DIR)/config/engines/engines.mk
include $(PROJECT_DIR)/controllers/controllers.mk include $(PROJECT_DIR)/controllers/controllers.mk
include $(PROJECT_DIR)/development/development.mk include $(PROJECT_DIR)/development/development.mk
include $(PROJECT_DIR)/console/console.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/hw_layer.mk
include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
@ -143,6 +144,7 @@ CPPSRC = $(UTILSRC_CPP) \
$(TESTS_SRC_CPP) \ $(TESTS_SRC_CPP) \
$(SYSTEMSRC_CPP) \ $(SYSTEMSRC_CPP) \
$(HW_LAYER_EMS_CPP) \ $(HW_LAYER_EMS_CPP) \
$(TUNERSTUDIO_SRC_CPP) \
$(HW_SENSORS_SRC) \ $(HW_SENSORS_SRC) \
$(TRIGGER_SRC_CPP) \ $(TRIGGER_SRC_CPP) \
$(INIT_SRC_CPP) \ $(INIT_SRC_CPP) \