noisymime
/
speeduino
mirror of https://github.com/noisymime/speeduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
speeduino/speeduino/TS_CommandButtonHandler.ino

383 lines
16 KiB
Arduino
Raw Normal View History

Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
/** \file
* Header file for the TunerStudio command handler
* The command handler manages all the inputs FROM TS which are issued when a command button is clicked by the user
*/
#include "TS_CommandButtonHandler.h"
#include "globals.h"
Add tx buffer check for tooth and composite logs
2020-08-22 03:53:42 -07:00
#include "utilities.h"
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
#include "scheduledIO.h"
VSS calibration routines (untested)
2020-04-23 03:34:31 -07:00
#include "sensors.h"
Most of the remaining VSS parts
2020-05-11 19:14:37 -07:00
#include "storage.h"
Add button to format SD card
2021-12-23 18:30:14 -08:00
#include "SD_logger.h"
Enable the use of the 50% hardware test modes
2020-05-03 22:08:45 -07:00
#ifdef USE_MC33810
#include "acc_mc33810.h"
#endif
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
Refactor comms: save 130+ bytes RAM (#906) * Remove serialCRC - only used within parseSerial() Also hoist the CRC read into a function. * Minimize global variable visibility * Encapsulate write of multi-byte primitives * Factor out sendBufferAndCrc() * Push safety test into TS_CommandButtonsHandler() * Extract writePage() * Simpler parsing * Remove some functions from public interface * Store constant arrays in progmem * Centralize high speed logger start/stop code * Factor out loadO2Calibration() * Factor out temperature calibration table update functions * Remove dead code * Fix sendToothLog() * Fix sendCompositeLog() * Replace tooth log send booleans with an enum Saves a byte * Remove sendBufferAndCrcProgMem() Use serialPayload to send * Whitespace clean up * Optimize comms.cpp for size * Replace global unsigned long with bool Saves 2 bytes * Replace 2 global bools with an enum Saves a byte, reads better. * Remove global FastCRC instance * Make sendSerialReturnCode blocking. It was using non-blocking functions but was never re-entered. Rename to make blocking & non-blocking calls more obvious. * Use one uint16_t to track RX/TX byte count * Simplify new comms log tx API * Extract loadPageToBuffer function * All endianess changes use the same code * Doxygen comments and code organization * Remove serialWriteUpdateCrc() & updateTmpCalibration() * Combine SerialStatus & logSendStatus enums. Makes sense since we can only be doing one thing at a time. * Remove global inProgressCompositeTime Only used when sending composite log * Replace 3 global bools with expanded SerialStatus enum * Remove unused global tsCanId * Limit scope of some comms globals. * Remove isMap global - replace witth function * Reduce the serial API to only 2 calls transmit & receive * Tidy up #define visibility * Fix Black* build errors * Workaround Teensy code race condition availableForWrite() is not reliable. * Prevent race condition Was pematurely setting the serialStatusFlag to SERIAL_INACTIVE before final CRC ws read from serial. * Use post write buffer availability checks Remove buffer size check prior to writing. * Write multi-byte values as single bytes. (attempt to fix Teensy 3.5 issue) * Only use Serial.available() as a boolean test (Teensy fix) * writeNonBlocking checks Serial.write() return value * Non-blocking CRC write In sendBufferAndCrcNonBlocking(). * Fix compile warning * Set serial status flag prior to transmitting! * Reliable blocking byte writes. * Fix timeout code: not firing under some conditions * MISRA fixes
2023-02-20 17:55:54 -08:00
static bool commandRequiresStoppedEngine(uint16_t buttonCommand)
{
return ((buttonCommand >= TS_CMD_INJ1_ON) && (buttonCommand <= TS_CMD_IGN8_50PC))
|| ((buttonCommand == TS_CMD_TEST_ENBL) || (buttonCommand == TS_CMD_TEST_DSBL));
}
VSS calibration routines (untested)
2020-04-23 03:34:31 -07:00
/**
* @brief
*
* @param buttonCommand The command number of the button that was clicked. See TS_CommendButtonHandler.h for a list of button IDs
*/
Refactor comms: save 130+ bytes RAM (#906) * Remove serialCRC - only used within parseSerial() Also hoist the CRC read into a function. * Minimize global variable visibility * Encapsulate write of multi-byte primitives * Factor out sendBufferAndCrc() * Push safety test into TS_CommandButtonsHandler() * Extract writePage() * Simpler parsing * Remove some functions from public interface * Store constant arrays in progmem * Centralize high speed logger start/stop code * Factor out loadO2Calibration() * Factor out temperature calibration table update functions * Remove dead code * Fix sendToothLog() * Fix sendCompositeLog() * Replace tooth log send booleans with an enum Saves a byte * Remove sendBufferAndCrcProgMem() Use serialPayload to send * Whitespace clean up * Optimize comms.cpp for size * Replace global unsigned long with bool Saves 2 bytes * Replace 2 global bools with an enum Saves a byte, reads better. * Remove global FastCRC instance * Make sendSerialReturnCode blocking. It was using non-blocking functions but was never re-entered. Rename to make blocking & non-blocking calls more obvious. * Use one uint16_t to track RX/TX byte count * Simplify new comms log tx API * Extract loadPageToBuffer function * All endianess changes use the same code * Doxygen comments and code organization * Remove serialWriteUpdateCrc() & updateTmpCalibration() * Combine SerialStatus & logSendStatus enums. Makes sense since we can only be doing one thing at a time. * Remove global inProgressCompositeTime Only used when sending composite log * Replace 3 global bools with expanded SerialStatus enum * Remove unused global tsCanId * Limit scope of some comms globals. * Remove isMap global - replace witth function * Reduce the serial API to only 2 calls transmit & receive * Tidy up #define visibility * Fix Black* build errors * Workaround Teensy code race condition availableForWrite() is not reliable. * Prevent race condition Was pematurely setting the serialStatusFlag to SERIAL_INACTIVE before final CRC ws read from serial. * Use post write buffer availability checks Remove buffer size check prior to writing. * Write multi-byte values as single bytes. (attempt to fix Teensy 3.5 issue) * Only use Serial.available() as a boolean test (Teensy fix) * writeNonBlocking checks Serial.write() return value * Non-blocking CRC write In sendBufferAndCrcNonBlocking(). * Fix compile warning * Set serial status flag prior to transmitting! * Reliable blocking byte writes. * Fix timeout code: not firing under some conditions * MISRA fixes
2023-02-20 17:55:54 -08:00
bool TS_CommandButtonsHandler(uint16_t buttonCommand)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
{
Refactor comms: save 130+ bytes RAM (#906) * Remove serialCRC - only used within parseSerial() Also hoist the CRC read into a function. * Minimize global variable visibility * Encapsulate write of multi-byte primitives * Factor out sendBufferAndCrc() * Push safety test into TS_CommandButtonsHandler() * Extract writePage() * Simpler parsing * Remove some functions from public interface * Store constant arrays in progmem * Centralize high speed logger start/stop code * Factor out loadO2Calibration() * Factor out temperature calibration table update functions * Remove dead code * Fix sendToothLog() * Fix sendCompositeLog() * Replace tooth log send booleans with an enum Saves a byte * Remove sendBufferAndCrcProgMem() Use serialPayload to send * Whitespace clean up * Optimize comms.cpp for size * Replace global unsigned long with bool Saves 2 bytes * Replace 2 global bools with an enum Saves a byte, reads better. * Remove global FastCRC instance * Make sendSerialReturnCode blocking. It was using non-blocking functions but was never re-entered. Rename to make blocking & non-blocking calls more obvious. * Use one uint16_t to track RX/TX byte count * Simplify new comms log tx API * Extract loadPageToBuffer function * All endianess changes use the same code * Doxygen comments and code organization * Remove serialWriteUpdateCrc() & updateTmpCalibration() * Combine SerialStatus & logSendStatus enums. Makes sense since we can only be doing one thing at a time. * Remove global inProgressCompositeTime Only used when sending composite log * Replace 3 global bools with expanded SerialStatus enum * Remove unused global tsCanId * Limit scope of some comms globals. * Remove isMap global - replace witth function * Reduce the serial API to only 2 calls transmit & receive * Tidy up #define visibility * Fix Black* build errors * Workaround Teensy code race condition availableForWrite() is not reliable. * Prevent race condition Was pematurely setting the serialStatusFlag to SERIAL_INACTIVE before final CRC ws read from serial. * Use post write buffer availability checks Remove buffer size check prior to writing. * Write multi-byte values as single bytes. (attempt to fix Teensy 3.5 issue) * Only use Serial.available() as a boolean test (Teensy fix) * writeNonBlocking checks Serial.write() return value * Non-blocking CRC write In sendBufferAndCrcNonBlocking(). * Fix compile warning * Set serial status flag prior to transmitting! * Reliable blocking byte writes. * Fix timeout code: not firing under some conditions * MISRA fixes
2023-02-20 17:55:54 -08:00
if (commandRequiresStoppedEngine(buttonCommand) && currentStatus.RPM != 0)
{
return false;
}
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
switch (buttonCommand)
{
Enable the use of the 50% hardware test modes
2020-05-03 22:08:45 -07:00
case TS_CMD_TEST_DSBL: // cmd is stop
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
BIT_CLEAR(currentStatus.testOutputs, 1);
endCoil1Charge();
endCoil2Charge();
endCoil3Charge();
endCoil4Charge();
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
#if IGN_CHANNELS >= 5
endCoil5Charge();
#endif
#if IGN_CHANNELS >= 6
endCoil6Charge();
#endif
#if IGN_CHANNELS >= 7
endCoil7Charge();
#endif
#if IGN_CHANNELS >= 8
endCoil8Charge();
#endif
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
closeInjector1();
closeInjector2();
closeInjector3();
closeInjector4();
#if INJ_CHANNELS >= 5
closeInjector5();
#endif
#if INJ_CHANNELS >= 6
closeInjector6();
#endif
#if INJ_CHANNELS >= 7
closeInjector7();
#endif
#if INJ_CHANNELS >= 8
closeInjector8();
#endif
Enable the use of the 50% hardware test modes
2020-05-03 22:08:45 -07:00
HWTest_INJ_50pc = 0;
HWTest_IGN_50pc = 0;
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
Enable the use of the 50% hardware test modes
2020-05-03 22:08:45 -07:00
case TS_CMD_TEST_ENBL: // cmd is enable
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
// currentStatus.testactive = 1;
BIT_SET(currentStatus.testOutputs, 1);
break;
case TS_CMD_INJ1_ON: // cmd group is for injector1 on actions
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ openInjector1(); }
break;
case TS_CMD_INJ1_OFF: // cmd group is for injector1 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ closeInjector1(); BIT_CLEAR(HWTest_INJ_50pc, INJ1_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ1_50PC: // cmd group is for injector1 50% dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_INJ_50pc, INJ1_CMD_BIT); }
if(!BIT_CHECK(HWTest_INJ_50pc, INJ1_CMD_BIT)) { closeInjector1(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ2_ON: // cmd group is for injector2 on actions
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ openInjector2(); }
break;
case TS_CMD_INJ2_OFF: // cmd group is for injector2 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ closeInjector2(); BIT_CLEAR(HWTest_INJ_50pc, INJ2_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ2_50PC: // cmd group is for injector2 50%dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_INJ_50pc, INJ2_CMD_BIT); }
if(!BIT_CHECK(HWTest_INJ_50pc, INJ2_CMD_BIT)) { closeInjector2(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ3_ON: // cmd group is for injector3 on actions
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ openInjector3(); }
break;
case TS_CMD_INJ3_OFF: // cmd group is for injector3 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ closeInjector3(); BIT_CLEAR(HWTest_INJ_50pc, INJ3_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ3_50PC: // cmd group is for injector3 50%dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_INJ_50pc, INJ3_CMD_BIT); }
if(!BIT_CHECK(HWTest_INJ_50pc, INJ3_CMD_BIT)) { closeInjector3(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ4_ON: // cmd group is for injector4 on actions
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ openInjector4(); }
break;
case TS_CMD_INJ4_OFF: // cmd group is for injector4 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ closeInjector4(); BIT_CLEAR(HWTest_INJ_50pc, INJ4_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ4_50PC: // cmd group is for injector4 50% dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_INJ_50pc, INJ4_CMD_BIT); }
if(!BIT_CHECK(HWTest_INJ_50pc, INJ4_CMD_BIT)) { closeInjector4(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ5_ON: // cmd group is for injector5 on actions
Remove channel checks from the hardware test outputs
2020-05-21 05:20:37 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ openInjector5(); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ5_OFF: // cmd group is for injector5 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ closeInjector5(); BIT_CLEAR(HWTest_INJ_50pc, INJ5_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ5_50PC: // cmd group is for injector5 50%dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_INJ_50pc, INJ5_CMD_BIT); }
if(!BIT_CHECK(HWTest_INJ_50pc, INJ5_CMD_BIT)) { closeInjector5(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ6_ON: // cmd group is for injector6 on actions
Remove channel checks from the hardware test outputs
2020-05-21 05:20:37 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ openInjector6(); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ6_OFF: // cmd group is for injector6 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ closeInjector6(); BIT_CLEAR(HWTest_INJ_50pc, INJ6_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ6_50PC: // cmd group is for injector6 50% dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_INJ_50pc, INJ6_CMD_BIT); }
if(!BIT_CHECK(HWTest_INJ_50pc, INJ6_CMD_BIT)) { closeInjector6(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ7_ON: // cmd group is for injector7 on actions
Remove channel checks from the hardware test outputs
2020-05-21 05:20:37 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ openInjector7(); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ7_OFF: // cmd group is for injector7 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ closeInjector7(); BIT_CLEAR(HWTest_INJ_50pc, INJ7_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ7_50PC: // cmd group is for injector7 50%dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_INJ_50pc, INJ7_CMD_BIT); }
if(!BIT_CHECK(HWTest_INJ_50pc, INJ7_CMD_BIT)) { closeInjector7(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ8_ON: // cmd group is for injector8 on actions
Remove channel checks from the hardware test outputs
2020-05-21 05:20:37 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ openInjector8(); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ8_OFF: // cmd group is for injector8 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ closeInjector8(); BIT_CLEAR(HWTest_INJ_50pc, INJ8_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_INJ8_50PC: // cmd group is for injector8 50% dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_INJ_50pc, INJ8_CMD_BIT); }
if(!BIT_CHECK(HWTest_INJ_50pc, INJ8_CMD_BIT)) { closeInjector8(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN1_ON: // cmd group is for spark1 on actions
Further work unifying the MC33810 build. Complete but needs testing
2020-11-30 23:12:39 -08:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ){ beginCoil1Charge(); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN1_OFF: // cmd group is for spark1 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { endCoil1Charge(); BIT_CLEAR(HWTest_IGN_50pc, IGN1_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN1_50PC: // cmd group is for spark1 50%dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_IGN_50pc, IGN1_CMD_BIT); }
Further work unifying the MC33810 build. Complete but needs testing
2020-11-30 23:12:39 -08:00
if(!BIT_CHECK(HWTest_IGN_50pc, IGN1_CMD_BIT)) { endCoil1Charge(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN2_ON: // cmd group is for spark2 on actions
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { beginCoil2Charge(); }
break;
case TS_CMD_IGN2_OFF: // cmd group is for spark2 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { endCoil2Charge(); BIT_CLEAR(HWTest_IGN_50pc, IGN2_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN2_50PC: // cmd group is for spark2 50%dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_IGN_50pc, IGN2_CMD_BIT); }
Further work unifying the MC33810 build. Complete but needs testing
2020-11-30 23:12:39 -08:00
if(!BIT_CHECK(HWTest_IGN_50pc, IGN2_CMD_BIT)) { endCoil2Charge(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN3_ON: // cmd group is for spark3 on actions
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { beginCoil3Charge(); }
break;
case TS_CMD_IGN3_OFF: // cmd group is for spark3 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { endCoil3Charge(); BIT_CLEAR(HWTest_IGN_50pc, IGN3_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN3_50PC: // cmd group is for spark3 50%dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_IGN_50pc, IGN3_CMD_BIT); }
Further work unifying the MC33810 build. Complete but needs testing
2020-11-30 23:12:39 -08:00
if(!BIT_CHECK(HWTest_IGN_50pc, IGN3_CMD_BIT)) { endCoil3Charge(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN4_ON: // cmd group is for spark4 on actions
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { beginCoil4Charge(); }
break;
case TS_CMD_IGN4_OFF: // cmd group is for spark4 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { endCoil4Charge(); BIT_CLEAR(HWTest_IGN_50pc, IGN4_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN4_50PC: // cmd group is for spark4 50%dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_IGN_50pc, IGN4_CMD_BIT); }
Further work unifying the MC33810 build. Complete but needs testing
2020-11-30 23:12:39 -08:00
if(!BIT_CHECK(HWTest_IGN_50pc, IGN4_CMD_BIT)) { endCoil4Charge(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN5_ON: // cmd group is for spark5 on actions
Remove channel checks from the hardware test outputs
2020-05-21 05:20:37 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { beginCoil5Charge(); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN5_OFF: // cmd group is for spark5 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { endCoil5Charge(); BIT_CLEAR(HWTest_IGN_50pc, IGN5_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN5_50PC: // cmd group is for spark4 50%dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_IGN_50pc, IGN5_CMD_BIT); }
Further work unifying the MC33810 build. Complete but needs testing
2020-11-30 23:12:39 -08:00
if(!BIT_CHECK(HWTest_IGN_50pc, IGN5_CMD_BIT)) { endCoil5Charge(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN6_ON: // cmd group is for spark6 on actions
Remove channel checks from the hardware test outputs
2020-05-21 05:20:37 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { beginCoil6Charge(); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN6_OFF: // cmd group is for spark6 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { endCoil6Charge(); BIT_CLEAR(HWTest_IGN_50pc, IGN6_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN6_50PC: // cmd group is for spark6 50%dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_IGN_50pc, IGN6_CMD_BIT); }
Further work unifying the MC33810 build. Complete but needs testing
2020-11-30 23:12:39 -08:00
if(!BIT_CHECK(HWTest_IGN_50pc, IGN6_CMD_BIT)) { endCoil6Charge(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN7_ON: // cmd group is for spark7 on actions
Remove channel checks from the hardware test outputs
2020-05-21 05:20:37 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { beginCoil7Charge(); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN7_OFF: // cmd group is for spark7 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { endCoil7Charge(); BIT_CLEAR(HWTest_IGN_50pc, IGN7_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN7_50PC: // cmd group is for spark7 50%dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_IGN_50pc, IGN7_CMD_BIT); }
Further work unifying the MC33810 build. Complete but needs testing
2020-11-30 23:12:39 -08:00
if(!BIT_CHECK(HWTest_IGN_50pc, IGN7_CMD_BIT)) { endCoil7Charge(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN8_ON: // cmd group is for spark8 on actions
Remove channel checks from the hardware test outputs
2020-05-21 05:20:37 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { beginCoil8Charge(); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN8_OFF: // cmd group is for spark8 off actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { endCoil8Charge(); BIT_CLEAR(HWTest_IGN_50pc, IGN8_CMD_BIT); }
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
case TS_CMD_IGN8_50PC: // cmd group is for spark8 50%dc actions
Minor corrections on HW test modes
2020-06-04 16:30:06 -07:00
if( BIT_CHECK(currentStatus.testOutputs, 1) ) { BIT_TOGGLE(HWTest_IGN_50pc, IGN8_CMD_BIT); }
Further work unifying the MC33810 build. Complete but needs testing
2020-11-30 23:12:39 -08:00
if(!BIT_CHECK(HWTest_IGN_50pc, IGN8_CMD_BIT)) { endCoil8Charge(); } //Ensure this output is turned off (Otherwise the output may stay on permanently)
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
VSS calibration routines (untested)
2020-04-23 03:34:31 -07:00
//VSS Calibration routines
case TS_CMD_VSS_60KMH:
{
Faster VSS reads and gear detection
2021-09-14 04:45:44 -07:00
//Calibrate the actual pulses per distance
uint32_t calibrationGap = vssGetPulseGap(0);
if( calibrationGap > 0 )
VSS calibration routines (untested)
2020-04-23 03:34:31 -07:00
{
Faster VSS reads and gear detection
2021-09-14 04:45:44 -07:00
configPage2.vssPulsesPerKm = 60000000UL / calibrationGap;
Most of the remaining VSS parts
2020-05-11 19:14:37 -07:00
writeConfig(1); // Need to manually save the new config value as it will not trigger a burn in tunerStudio due to use of ControllerPriority
BIT_SET(currentStatus.status3, BIT_STATUS3_VSS_REFRESH); //Set the flag to trigger the UI reset
VSS calibration routines (untested)
2020-04-23 03:34:31 -07:00
}
}
break;
//Calculate the RPM to speed ratio for each gear
case TS_CMD_VSS_RATIO1:
if(currentStatus.vss > 0)
{
Most of the remaining VSS parts
2020-05-11 19:14:37 -07:00
configPage2.vssRatio1 = (currentStatus.vss * 10000UL) / currentStatus.RPM;
writeConfig(1); // Need to manually save the new config value as it will not trigger a burn in tunerStudio due to use of ControllerPriority
BIT_SET(currentStatus.status3, BIT_STATUS3_VSS_REFRESH); //Set the flag to trigger the UI reset
VSS calibration routines (untested)
2020-04-23 03:34:31 -07:00
}
break;
case TS_CMD_VSS_RATIO2:
if(currentStatus.vss > 0)
{
Most of the remaining VSS parts
2020-05-11 19:14:37 -07:00
configPage2.vssRatio2 = (currentStatus.vss * 10000UL) / currentStatus.RPM;
writeConfig(1); // Need to manually save the new config value as it will not trigger a burn in tunerStudio due to use of ControllerPriority
BIT_SET(currentStatus.status3, BIT_STATUS3_VSS_REFRESH); //Set the flag to trigger the UI reset
VSS calibration routines (untested)
2020-04-23 03:34:31 -07:00
}
break;
case TS_CMD_VSS_RATIO3:
if(currentStatus.vss > 0)
{
Most of the remaining VSS parts
2020-05-11 19:14:37 -07:00
configPage2.vssRatio3 = (currentStatus.vss * 10000UL) / currentStatus.RPM;
writeConfig(1); // Need to manually save the new config value as it will not trigger a burn in tunerStudio due to use of ControllerPriority
BIT_SET(currentStatus.status3, BIT_STATUS3_VSS_REFRESH); //Set the flag to trigger the UI reset
VSS calibration routines (untested)
2020-04-23 03:34:31 -07:00
}
break;
case TS_CMD_VSS_RATIO4:
if(currentStatus.vss > 0)
{
Most of the remaining VSS parts
2020-05-11 19:14:37 -07:00
configPage2.vssRatio4 = (currentStatus.vss * 10000UL) / currentStatus.RPM;
writeConfig(1); // Need to manually save the new config value as it will not trigger a burn in tunerStudio due to use of ControllerPriority
BIT_SET(currentStatus.status3, BIT_STATUS3_VSS_REFRESH); //Set the flag to trigger the UI reset
VSS calibration routines (untested)
2020-04-23 03:34:31 -07:00
}
break;
case TS_CMD_VSS_RATIO5:
if(currentStatus.vss > 0)
{
Most of the remaining VSS parts
2020-05-11 19:14:37 -07:00
configPage2.vssRatio5 = (currentStatus.vss * 10000UL) / currentStatus.RPM;
writeConfig(1); // Need to manually save the new config value as it will not trigger a burn in tunerStudio due to use of ControllerPriority
BIT_SET(currentStatus.status3, BIT_STATUS3_VSS_REFRESH); //Set the flag to trigger the UI reset
VSS calibration routines (untested)
2020-04-23 03:34:31 -07:00
}
break;
case TS_CMD_VSS_RATIO6:
if(currentStatus.vss > 0)
{
Most of the remaining VSS parts
2020-05-11 19:14:37 -07:00
configPage2.vssRatio6 = (currentStatus.vss * 10000UL) / currentStatus.RPM;
writeConfig(1); // Need to manually save the new config value as it will not trigger a burn in tunerStudio due to use of ControllerPriority
BIT_SET(currentStatus.status3, BIT_STATUS3_VSS_REFRESH); //Set the flag to trigger the UI reset
VSS calibration routines (untested)
2020-04-23 03:34:31 -07:00
}
break;
STM32 jump to DFU bootloader (#485) * STM32 jump to DFU This enable jumping to hardware bootloader with software command. Based on @iLeeeZi previous work. Co-Authored-By: iLeeeZi <3372213+iLeeeZi@users.noreply.github.com> Co-Authored-By: Pasi Kemppainen <48950874+pazi88@users.noreply.github.com> * lowercase functions fixes Co-authored-by: iLeeeZi <3372213+iLeeeZi@users.noreply.github.com> Co-authored-by: Pasi Kemppainen <48950874+pazi88@users.noreply.github.com>
2020-12-02 14:24:15 -08:00
//STM32 Commands
case TS_CMD_STM32_REBOOT: //
doSystemReset();
break;
case TS_CMD_STM32_BOOTLOADER: //
jumpToBootloader();
break;
Show all log files on SD card, not just the first page
2021-12-23 20:30:37 -08:00
#ifdef SD_LOGGING
Add button to format SD card
2021-12-23 18:30:14 -08:00
case TS_CMD_SD_FORMAT: //Format SD card
formatExFat();
break;
Show all log files on SD card, not just the first page
2021-12-23 20:30:37 -08:00
#endif
Add button to format SD card
2021-12-23 18:30:14 -08:00
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
default:
Refactor comms: save 130+ bytes RAM (#906) * Remove serialCRC - only used within parseSerial() Also hoist the CRC read into a function. * Minimize global variable visibility * Encapsulate write of multi-byte primitives * Factor out sendBufferAndCrc() * Push safety test into TS_CommandButtonsHandler() * Extract writePage() * Simpler parsing * Remove some functions from public interface * Store constant arrays in progmem * Centralize high speed logger start/stop code * Factor out loadO2Calibration() * Factor out temperature calibration table update functions * Remove dead code * Fix sendToothLog() * Fix sendCompositeLog() * Replace tooth log send booleans with an enum Saves a byte * Remove sendBufferAndCrcProgMem() Use serialPayload to send * Whitespace clean up * Optimize comms.cpp for size * Replace global unsigned long with bool Saves 2 bytes * Replace 2 global bools with an enum Saves a byte, reads better. * Remove global FastCRC instance * Make sendSerialReturnCode blocking. It was using non-blocking functions but was never re-entered. Rename to make blocking & non-blocking calls more obvious. * Use one uint16_t to track RX/TX byte count * Simplify new comms log tx API * Extract loadPageToBuffer function * All endianess changes use the same code * Doxygen comments and code organization * Remove serialWriteUpdateCrc() & updateTmpCalibration() * Combine SerialStatus & logSendStatus enums. Makes sense since we can only be doing one thing at a time. * Remove global inProgressCompositeTime Only used when sending composite log * Replace 3 global bools with expanded SerialStatus enum * Remove unused global tsCanId * Limit scope of some comms globals. * Remove isMap global - replace witth function * Reduce the serial API to only 2 calls transmit & receive * Tidy up #define visibility * Fix Black* build errors * Workaround Teensy code race condition availableForWrite() is not reliable. * Prevent race condition Was pematurely setting the serialStatusFlag to SERIAL_INACTIVE before final CRC ws read from serial. * Use post write buffer availability checks Remove buffer size check prior to writing. * Write multi-byte values as single bytes. (attempt to fix Teensy 3.5 issue) * Only use Serial.available() as a boolean test (Teensy fix) * writeNonBlocking checks Serial.write() return value * Non-blocking CRC write In sendBufferAndCrcNonBlocking(). * Fix compile warning * Set serial status flag prior to transmitting! * Reliable blocking byte writes. * Fix timeout code: not firing under some conditions * MISRA fixes
2023-02-20 17:55:54 -08:00
return false;
Introduce command button handler and expand the hardware testing to 8 channels
2020-04-21 18:02:35 -07:00
break;
}
Refactor comms: save 130+ bytes RAM (#906) * Remove serialCRC - only used within parseSerial() Also hoist the CRC read into a function. * Minimize global variable visibility * Encapsulate write of multi-byte primitives * Factor out sendBufferAndCrc() * Push safety test into TS_CommandButtonsHandler() * Extract writePage() * Simpler parsing * Remove some functions from public interface * Store constant arrays in progmem * Centralize high speed logger start/stop code * Factor out loadO2Calibration() * Factor out temperature calibration table update functions * Remove dead code * Fix sendToothLog() * Fix sendCompositeLog() * Replace tooth log send booleans with an enum Saves a byte * Remove sendBufferAndCrcProgMem() Use serialPayload to send * Whitespace clean up * Optimize comms.cpp for size * Replace global unsigned long with bool Saves 2 bytes * Replace 2 global bools with an enum Saves a byte, reads better. * Remove global FastCRC instance * Make sendSerialReturnCode blocking. It was using non-blocking functions but was never re-entered. Rename to make blocking & non-blocking calls more obvious. * Use one uint16_t to track RX/TX byte count * Simplify new comms log tx API * Extract loadPageToBuffer function * All endianess changes use the same code * Doxygen comments and code organization * Remove serialWriteUpdateCrc() & updateTmpCalibration() * Combine SerialStatus & logSendStatus enums. Makes sense since we can only be doing one thing at a time. * Remove global inProgressCompositeTime Only used when sending composite log * Replace 3 global bools with expanded SerialStatus enum * Remove unused global tsCanId * Limit scope of some comms globals. * Remove isMap global - replace witth function * Reduce the serial API to only 2 calls transmit & receive * Tidy up #define visibility * Fix Black* build errors * Workaround Teensy code race condition availableForWrite() is not reliable. * Prevent race condition Was pematurely setting the serialStatusFlag to SERIAL_INACTIVE before final CRC ws read from serial. * Use post write buffer availability checks Remove buffer size check prior to writing. * Write multi-byte values as single bytes. (attempt to fix Teensy 3.5 issue) * Only use Serial.available() as a boolean test (Teensy fix) * writeNonBlocking checks Serial.write() return value * Non-blocking CRC write In sendBufferAndCrcNonBlocking(). * Fix compile warning * Set serial status flag prior to transmitting! * Reliable blocking byte writes. * Fix timeout code: not firing under some conditions * MISRA fixes
2023-02-20 17:55:54 -08:00
return true;
couple of signed overflow fixes (#519) * the TS_CMD_VSS_RATIO* id values overflow signed 16 bit int on avr switch to unsigned 16 bit value define TS_CMD_VSS_60KMH 39168 //0x99x00 define TS_CMD_VSS_RATIO1 39169 define TS_CMD_VSS_RATIO2 39170 define TS_CMD_VSS_RATIO3 39171 define TS_CMD_VSS_RATIO4 39172 define TS_CMD_VSS_RATIO5 39173 define TS_CMD_VSS_RATIO6 39174 * make sure we don't overflow and accidentally set negative timing currentStatus.advance can only hold a signed 8 bit value * make sure we can't have a negative multiplier
2021-02-03 18:10:35 -08:00
}