From b46912a9f32047d2d3c76c372bed5cf111e4c846 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 5 Jul 2017 22:22:24 -0400 Subject: [PATCH] hopefully bugfix --- firmware/controllers/trigger/trigger_central.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 5923bb05b0..831d298031 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -80,6 +80,9 @@ uint32_t triggerMaxDuration = 0; static bool isInsideTriggerHandler = false; +/** + * true if most recent configuration change has changed any of the trigger settings + */ static bool isTriggerConfigChanged = false; efitick_t previousVvtCamTime = 0; @@ -565,16 +568,18 @@ void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfig COMPARE_CONFIG_PARAMS(bc.nb2ratioFrom) || COMPARE_CONFIG_PARAMS(bc.nb2ratioTo) || COMPARE_CONFIG_PARAMS(nbVvtIndex); - isTriggerConfigChanged = true; #endif /* EFI_PROD_CODE */ } +/** + * @returns true if configuration just changed, and if that change has affected trigger + */ bool checkIfTriggerConfigChanged(void) { -//#if EFI_PROD_CODE || EFI_SIMULATOR || defined(__DOXYGEN__) -// return isTriggerConfigChanged; -//#else +#if EFI_PROD_CODE || EFI_SIMULATOR || defined(__DOXYGEN__) + return triggerVersion.isOld() && isTriggerConfigChanged; +#else return triggerVersion.isOld(); -//#endif /* EFI_PROD_CODE */ +#endif /* EFI_PROD_CODE */ } void initTriggerCentral(Logging *sharedLogger) {