From 2befa9b9cc9528bbf53fc70e446f6bca7f1a1746 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 15 Sep 2016 09:02:04 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/algo/engine.cpp | 6 ------ firmware/controllers/algo/engine_configuration.cpp | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index eee57f8162..121b86478a 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -84,12 +84,7 @@ void Engine::onTriggerEvent(efitick_t nowNt) { lastTriggerEventTimeNt = nowNt; } -static void invokeEnginePreCalculate(Engine *engine) { - engine->preCalculate(); -} - void Engine::addConfigurationListener(configuration_callback_t callback) { - configurationListeners.registerCallback((VoidInt)invokeEnginePreCalculate, this); } Engine::Engine(persistent_config_s *config) { @@ -130,7 +125,6 @@ Engine::Engine(persistent_config_s *config) { clutchDownState = clutchUpState = false; memset(&m, 0, sizeof(m)); - addConfigurationListener(invokeEnginePreCalculate); } EngineState::EngineState() { diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index a15d38fdda..43f9ef79dd 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -143,6 +143,7 @@ void incrementGlobalConfigurationVersion(DECLARE_ENGINE_PARAMETER_F) { #if EFI_PROD_CODE || defined(__DOXYGEN__) applyNewHardwareSettings(); #endif /* EFI_PROD_CODE */ + engine->preCalculate(); rememberCurrentConfiguration(); }