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

only:refactoring

This commit is contained in:
rusefi 2023-10-29 17:04:30 -04:00
parent 8c4a06bc10
commit d12bb15f8d
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/controllers/can/can_bench_test.cpp
View File

@ -103,13 +103,13 @@ void sendRawAnalogValues() {
// send the first packet // send the first packet
{ {
CanTxMessage msg(CanCategory::BENCH_TEST, (int)bench_test_packet_ids_e::RAW_ANALOG_1, 8, /*bus*/0, /*isExtended*/true); CanTxMessage msg(CanCategory::BENCH_TEST, (int)bench_test_packet_ids_e::RAW_ANALOG_1, 8, /*bus*/0, /*isExtended*/true);
for (int valueIdx = 0; valueIdx < efi::size(values_1); valueIdx++) { for (size_t valueIdx = 0; valueIdx < efi::size(values_1); valueIdx++) {
msg[valueIdx] = RAW_TO_BYTE(values_1[valueIdx]); msg[valueIdx] = RAW_TO_BYTE(values_1[valueIdx]);
} }
} }
{ {
CanTxMessage msg(CanCategory::BENCH_TEST, (int)bench_test_packet_ids_e::RAW_ANALOG_2, 8, /*bus*/0, /*isExtended*/true); CanTxMessage msg(CanCategory::BENCH_TEST, (int)bench_test_packet_ids_e::RAW_ANALOG_2, 8, /*bus*/0, /*isExtended*/true);
for (int valueIdx = 0; valueIdx < efi::size(values_2); valueIdx++) { for (size_t valueIdx = 0; valueIdx < efi::size(values_2); valueIdx++) {
msg[valueIdx] = RAW_TO_BYTE(values_2[valueIdx]); msg[valueIdx] = RAW_TO_BYTE(values_2[valueIdx]);
} }
} }
@ -191,35 +191,34 @@ void processCanBenchTest(const CANRxFrame& frame) {
if (frame.data8[0] != (int)bench_test_magic_numbers_e::BENCH_HEADER) { if (frame.data8[0] != (int)bench_test_magic_numbers_e::BENCH_HEADER) {
return; return;
} }
uint8_t command = frame.data8[1]; bench_test_io_control_e command = (bench_test_io_control_e)frame.data8[1];
if (command == (uint8_t)bench_test_io_control_e::CAN_BENCH_GET_COUNT) { if (command == bench_test_io_control_e::CAN_BENCH_GET_COUNT) {
sendOutBoardMeta(); sendOutBoardMeta();
} else if (command == (uint8_t)bench_test_io_control_e::CAN_QC_OUTPUT_CONTROL_SET) { } else if (command == bench_test_io_control_e::CAN_QC_OUTPUT_CONTROL_SET) {
qcDirectPinControlMode = true; qcDirectPinControlMode = true;
setPin(frame, 1); setPin(frame, 1);
} else if (command == (uint8_t)bench_test_io_control_e::CAN_QC_OUTPUT_CONTROL_CLEAR) { } else if (command == bench_test_io_control_e::CAN_QC_OUTPUT_CONTROL_CLEAR) {
qcDirectPinControlMode = true; qcDirectPinControlMode = true;
setPin(frame, 0); setPin(frame, 0);
} else if (command == (uint8_t)bench_test_io_control_e::CAN_BENCH_SET_ENGINE_TYPE) { } else if (command == bench_test_io_control_e::CAN_BENCH_SET_ENGINE_TYPE) {
int eType = frame.data8[2]; int eType = frame.data8[2];
// todo: fix firmware for 'false' to be possible - i.e. more of properties should be applied on the fly // todo: fix firmware for 'false' to be possible - i.e. more of properties should be applied on the fly
setEngineType(eType, true); setEngineType(eType, true);
#if EFI_PROD_CODE #if EFI_PROD_CODE
scheduleReboot(); scheduleReboot();
#endif // EFI_PROD_CODE #endif // EFI_PROD_CODE
} else if (command == (uint8_t)bench_test_io_control_e::CAN_BENCH_START_PIN_TEST) { } else if (command == bench_test_io_control_e::CAN_BENCH_START_PIN_TEST) {
bench_mode_e benchModePinIdx = (bench_mode_e)frame.data8[2]; bench_mode_e benchModePinIdx = (bench_mode_e)frame.data8[2];
// ignore previous pin state and stats // ignore previous pin state and stats
resetPinStats(benchModePinIdx); resetPinStats(benchModePinIdx);
} else if (command == (uint8_t)bench_test_io_control_e::CAN_BENCH_END_PIN_TEST) { } else if (command == bench_test_io_control_e::CAN_BENCH_END_PIN_TEST) {
sendSavedBenchStatePackets(); sendSavedBenchStatePackets();
} else if (command == (uint8_t)bench_test_io_control_e::CAN_BENCH_EXECUTE_BENCH_TEST) { } else if (command == bench_test_io_control_e::CAN_BENCH_EXECUTE_BENCH_TEST) {
int benchCommandIdx = frame.data8[2]; int benchCommandIdx = frame.data8[2];
handleBenchCategory(benchCommandIdx); handleBenchCategory(benchCommandIdx);
} else if (command == (uint8_t)bench_test_io_control_e::CAN_BENCH_QUERY_PIN_STATE) { } else if (command == bench_test_io_control_e::CAN_BENCH_QUERY_PIN_STATE) {
bench_mode_e benchModePinIdx = (bench_mode_e)frame.data8[2]; bench_mode_e benchModePinIdx = (bench_mode_e)frame.data8[2];
sendPinStatePackets(benchModePinIdx); sendPinStatePackets(benchModePinIdx);
} }
} }
#endif // EFI_CAN_SUPPORT #endif // EFI_CAN_SUPPORT