UAEFI crash if set to daihatsu 4cyl trigger #6079

hiding EFI_TS_SCATTER
This commit is contained in:
rusefillc 2024-03-01 10:03:44 -05:00
parent b0fb1f1a84
commit 761eff22cc
2 changed files with 9 additions and 1 deletions

View File

View File

@ -212,6 +212,7 @@ void TunerStudio::handleCrc32Check(TsChannelBase *tsChannel, ts_response_format_
return;
}
#if EFI_TS_SCATTER
/*
* highSpeedOffsets is noMsqSave, but located on settings page,
* zero highSpeedOffsets as TS expect all noMsqSave data to be zero during CRC matching
@ -224,6 +225,7 @@ void TunerStudio::handleCrc32Check(TsChannelBase *tsChannel, ts_response_format_
* Support settings pages!
*/
memset(engineConfiguration->highSpeedOffsets, 0x00, sizeof(engineConfiguration->highSpeedOffsets));
#endif // EFI_TS_SCATTER
const uint8_t* start = getWorkingPageAddr() + offset;
@ -231,6 +233,7 @@ void TunerStudio::handleCrc32Check(TsChannelBase *tsChannel, ts_response_format_
tsChannel->sendResponse(mode, (const uint8_t *) &crc, 4);
}
#if EFI_TS_SCATTER
void TunerStudio::handleScatteredReadCommand(TsChannelBase* tsChannel) {
int totalResponseSize = 0;
for (int i = 0; i < HIGH_SPEED_COUNT; i++) {
@ -274,6 +277,7 @@ void TunerStudio::handleScatteredReadCommand(TsChannelBase* tsChannel) {
tsChannel->write(reinterpret_cast<uint8_t*>(dataBuffer), 4, true);
tsChannel->flush();
}
#endif // EFI_TS_SCATTER
/**
* 'Write' command receives a single value at a given offset
@ -379,7 +383,9 @@ static bool isKnownCommand(char command) {
#if EFI_SIMULATOR
|| command == TS_SIMULATE_CAN
#endif // EFI_SIMULATOR
#if EFI_TS_SCATTER
|| command == TS_GET_SCATTERED_GET_COMMAND
#endif
|| command == TS_SET_LOGGER_SWITCH
|| command == TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY
|| command == TS_GET_TEXT
@ -716,9 +722,11 @@ int TunerStudio::handleCrcCommand(TsChannelBase* tsChannel, char *data, int inco
handleWriteValueCommand(tsChannel, TS_CRC, offset, value);
}
break;
#if EFI_TS_SCATTER
case TS_GET_SCATTERED_GET_COMMAND:
handleScatteredReadCommand(tsChannel);
break;
#endif // EFI_TS_SCATTER
case TS_CRC_CHECK_COMMAND:
handleCrc32Check(tsChannel, TS_CRC, offset, count);
break;
@ -882,7 +890,7 @@ void startTunerStudioConnectivity(void) {
addConsoleAction("tsinfo", printTsStats);
addConsoleAction("reset_ts", resetTs);
addConsoleActionI("set_ts_speed", setTsSpeed);
#if EFI_BLUETOOTH_SETUP
// module initialization start (it waits for disconnect and then communicates to the module)
// Usage: "bluetooth_hc06 <baud> <name> <pincode>"