rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add set wideband index buttons (#2455) 

* update wideband firmware

* implement index set

* bench test, error on failure

* guard wideband
This commit is contained in:
Matthew Kennedy 2021-03-14 14:20:50 -07:00 committed by GitHub
parent 1a45379bb9
commit 831d272be3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
firmware/controllers/bench_test.cpp
View File

@ -435,6 +435,11 @@ void executeTSCommand(uint16_t subsystem, uint16_t index) {
case CMD_TS_X14:
handleCommandX14(index);
break;
#ifdef EFI_WIDEBAND_FIRMWARE_UPDATE
case 0x15:
setWidebandOffset(logger, index);
break;
#endif // EFI_WIDEBAND_FIRMWARE_UPDATE
case CMD_TS_BENCH_CATEGORY:
handleBenchCategory(index);
break;
@ -498,7 +503,11 @@ void initBenchTest(Logging *sharedLogger) {
addConsoleAction("fanbench", fanBench);
addConsoleAction("mainrelaybench", mainRelayBench);
addConsoleActionS("fanbench2", fanBenchExt);
#if EFI_WIDEBAND_FIRMWARE_UPDATE
addConsoleAction("update_wideband", []() { widebandUpdatePending = true; });
addConsoleActionI("set_wideband_index", [](int index) { setWidebandOffset(logger, index); });
#endif // EFI_WIDEBAND_FIRMWARE_UPDATE
addConsoleAction(CMD_STARTER_BENCH, starterRelayBench);
addConsoleAction(CMD_MIL_BENCH, milBench);

2
firmware/controllers/can/can.h
View File

@ -29,6 +29,8 @@ void registerCanSensor(CanSensorBase& sensor);
void handleWidebandBootloaderAck();
// Update the firmware on any connected wideband controller
void updateWidebandFirmware(Logging*);
// Set the CAN index offset of any attached wideband controller
void setWidebandOffset(Logging* logging, uint8_t index);
class CanWrite final : public PeriodicController<512> {
public:

24
firmware/controllers/can/wideband_bootloader.cpp
View File

@ -95,4 +95,28 @@ void updateWidebandFirmware(Logging* logging) {
waitingBootloaderThread = nullptr;
}
void setWidebandOffset(Logging* logging, uint8_t index) {
// Clear any pending acks for this thread
chEvtGetAndClearEvents(EVT_BOOTLOADER_ACK);
// Send messages to the current thread when acks come in
waitingBootloaderThread = chThdGetSelfX();
scheduleMsg(logging, "***************************************");
scheduleMsg(logging, " WIDEBAND INDEX SET");
scheduleMsg(logging, "***************************************");
scheduleMsg(logging, "Setting all connected widebands to index %d...", index);
{
CanTxMessage m(0xEF4'0000, 1, true);
m[0] = index;
}
if (!waitAck()) {
firmwareError(OBD_PCM_Processor_Fault, "Wideband index set failed: no controller detected!");
}
waitingBootloaderThread = nullptr;
}
#endif // EFI_WIDEBAND_FIRMWARE_UPDATE && HAL_USE_CAN

2
firmware/controllers/can/wideband_firmware

@ -1 +1 @@
Subproject commit ab8c24564f40162b08599831b03eec3568a9c953
Subproject commit 374b9aaf11657469f4f1df7b51545db79b791ad0

11
firmware/tunerstudio/rusefi.input
View File

@ -1663,6 +1663,9 @@ cmb_etb_auto_calibrate_2 = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x11"
cmd_wideband_firmare_update = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x12"
cmd_enable_ext_stim = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x13"
cmd_set_wideband_idx_0 = "@@TS_IO_TEST_COMMAND_char@@\x00\x15\x00\x00"
cmd_set_wideband_idx_1 = "@@TS_IO_TEST_COMMAND_char@@\x00\x15\x00\x01"
cmd_cj125_calibrate = "@@TS_IO_TEST_COMMAND_char@@\x00\x18\x00\x00"
cmd_call_from_pit = "@@TS_IO_TEST_COMMAND_char@@\x00\x20\x34\x56"
cmd_stop_engine = "@@TS_IO_TEST_COMMAND_char@@\x00\x79\x00\x00"
@ -3357,9 +3360,13 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
panel = testMisc
dialog = widebandConfig, "rusEFI Wideband Config"
field = "!Please connect exactly one wideband controller before pressing this button!"
field = "!Please connect exactly one wideband controller before pressing these buttons!"
commandButton = "Update Firmware", cmd_wideband_firmare_update
field = "!These buttons will set ALL connected controllers to the specified index."
field = "!Disconnect all controllers you don't want to set!"
commandButton = "Set Index 0", cmd_set_wideband_idx_0
commandButton = "Set Index 1", cmd_set_wideband_idx_1
dialog = engineTypeDialog, "Popular vehicles"
field = "!These buttons send a command to rusEFI controller to apply preset values"
field = "!Once you send the command, please reconnect to rusEFI controller in order to read fresh values"