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

minor bugfix in theoretical case of two consequitive changes

This commit is contained in:
rusefi 2018-02-03 12:47:37 -05:00
parent 70180a7eb9
commit 86f7a89412
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/engine_configuration.cpp
View File

@ -174,7 +174,7 @@ void incrementGlobalConfigurationVersion(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
#endif /* EFI_IDLE_CONTROL */ #endif /* EFI_IDLE_CONTROL */
#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
onConfigurationChangeTriggerCallback(&activeConfiguration); onConfigurationChangeTriggerCallback(&activeConfiguration PASS_ENGINE_PARAMETER_SUFFIX);
#endif /* EFI_SHAFT_POSITION_INPUT */ #endif /* EFI_SHAFT_POSITION_INPUT */
#if EFI_EMULATE_POSITION_SENSORS || defined(__DOXYGEN__) #if EFI_EMULATE_POSITION_SENSORS || defined(__DOXYGEN__)
onConfigurationChangeRpmEmulatorCallback(&activeConfiguration); onConfigurationChangeRpmEmulatorCallback(&activeConfiguration);

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

@ -83,12 +83,13 @@ uint32_t triggerMaxDuration = 0;
static bool isInsideTriggerHandler = false; static bool isInsideTriggerHandler = false;
/** /**
* true if most recent configuration change has changed any of the trigger settings * true if a recent configuration change has changed any of the trigger settings which
* we have not adjusted for yet
*/ */
static bool isTriggerConfigChanged = false; static bool isTriggerConfigChanged = false;
efitick_t previousVvtCamTime = 0; static efitick_t previousVvtCamTime = 0;
efitick_t previousVvtCamDuration = 0; static efitick_t previousVvtCamDuration = 0;
void hwHandleVvtCamSignal(trigger_value_e front) { void hwHandleVvtCamSignal(trigger_value_e front) {
if (ENGINE(isEngineChartEnabled)) { if (ENGINE(isEngineChartEnabled)) {
@ -555,9 +556,8 @@ static void resetRunningTriggerCounters() {
#define COMPARE_CONFIG_PARAMS(param) (engineConfiguration->param != previousConfiguration->param) #define COMPARE_CONFIG_PARAMS(param) (engineConfiguration->param != previousConfiguration->param)
void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfiguration) { void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfiguration DECLARE_ENGINE_PARAMETER_SUFFIX) {
#if EFI_PROD_CODE || EFI_SIMULATOR || defined(__DOXYGEN__) bool changedNow = COMPARE_CONFIG_PARAMS(trigger.type) ||
isTriggerConfigChanged = COMPARE_CONFIG_PARAMS(trigger.type) ||
COMPARE_CONFIG_PARAMS(operationMode) || COMPARE_CONFIG_PARAMS(operationMode) ||
COMPARE_CONFIG_PARAMS(useOnlyRisingEdgeForTrigger) || COMPARE_CONFIG_PARAMS(useOnlyRisingEdgeForTrigger) ||
COMPARE_CONFIG_PARAMS(globalTriggerAngleOffset) || COMPARE_CONFIG_PARAMS(globalTriggerAngleOffset) ||
@ -574,7 +574,7 @@ void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfig
COMPARE_CONFIG_PARAMS(bc.nb2ratioFrom) || COMPARE_CONFIG_PARAMS(bc.nb2ratioFrom) ||
COMPARE_CONFIG_PARAMS(bc.nb2ratioTo) || COMPARE_CONFIG_PARAMS(bc.nb2ratioTo) ||
COMPARE_CONFIG_PARAMS(nbVvtIndex); COMPARE_CONFIG_PARAMS(nbVvtIndex);
#endif /* EFI_PROD_CODE */ isTriggerConfigChanged = isTriggerConfigChanged || changedNow;
} }
/** /**

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

@ -63,7 +63,7 @@ void addTriggerEventListener(ShaftPositionListener handler, const char *name, En
int isSignalDecoderError(void); int isSignalDecoderError(void);
void resetMaxValues(); void resetMaxValues();
void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfiguration); void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfiguration DECLARE_ENGINE_PARAMETER_SUFFIX);
bool checkIfTriggerConfigChanged(void); bool checkIfTriggerConfigChanged(void);
#endif /* TRIGGER_CENTRAL_H_ */ #endif /* TRIGGER_CENTRAL_H_ */