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

just a rename & hiding unit test method

This commit is contained in:
rusefillc 2022-09-15 23:07:08 -04:00
parent 45d88f1d26
commit 3104538022
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/controllers/trigger/trigger_central.cpp
View File

@ -933,7 +933,7 @@ void onConfigurationChangeTriggerCallback() {
#endif /* EFI_DEFAILED_LOGGING */ #endif /* EFI_DEFAILED_LOGGING */
// we do not want to miss two updates in a row // we do not want to miss two updates in a row
getTriggerCentral()->triggerConfigChanged = getTriggerCentral()->triggerConfigChanged || changed; getTriggerCentral()->triggerConfigChangedOnLastConfigurationChange = getTriggerCentral()->triggerConfigChangedOnLastConfigurationChange || changed;
} }
static void initVvtShape(TriggerWaveform& shape, const TriggerConfiguration& config, TriggerDecoderBase &initState) { static void initVvtShape(TriggerWaveform& shape, const TriggerConfiguration& config, TriggerDecoderBase &initState) {
@ -1005,14 +1005,17 @@ void TriggerCentral::updateWaveform() {
* @returns true if configuration just changed, and if that change has affected trigger * @returns true if configuration just changed, and if that change has affected trigger
*/ */
bool TriggerCentral::checkIfTriggerConfigChanged() { bool TriggerCentral::checkIfTriggerConfigChanged() {
bool result = triggerVersion.isOld(engine->getGlobalConfigurationVersion()) && triggerConfigChanged; // we want to make sure that configuration has changed AND that change has changed trigger specifically
triggerConfigChanged = false; // whoever has called the method is supposed to react to changes bool result = triggerVersion.isOld(engine->getGlobalConfigurationVersion()) && triggerConfigChangedOnLastConfigurationChange;
triggerConfigChangedOnLastConfigurationChange = false; // whoever has called the method is supposed to react to changes
return result; return result;
} }
#if EFI_UNIT_TEST
bool TriggerCentral::isTriggerConfigChanged() { bool TriggerCentral::isTriggerConfigChanged() {
return triggerConfigChanged; return triggerConfigChangedOnLastConfigurationChange;
} }
#endif // EFI_UNIT_TEST
void validateTriggerInputs() { void validateTriggerInputs() {
if (engineConfiguration->triggerInputPins[0] == Gpio::Unassigned && engineConfiguration->triggerInputPins[1] != Gpio::Unassigned) { if (engineConfiguration->triggerInputPins[0] == Gpio::Unassigned && engineConfiguration->triggerInputPins[1] != Gpio::Unassigned) {

4
firmware/controllers/trigger/trigger_central.h
View File

@ -99,10 +99,12 @@ public:
* true if a recent configuration change has changed any of the trigger settings which * true if a recent configuration change has changed any of the trigger settings which
* we have not adjusted for yet * we have not adjusted for yet
*/ */
bool triggerConfigChanged = false; bool triggerConfigChangedOnLastConfigurationChange = false;
bool checkIfTriggerConfigChanged(); bool checkIfTriggerConfigChanged();
#if EFI_UNIT_TEST
bool isTriggerConfigChanged(); bool isTriggerConfigChanged();
#endif // EFI_UNIT_TEST
bool isTriggerDecoderError(); bool isTriggerDecoderError();