From 50d78f648bdf4085801c566090d85a74bc7b098e Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 24 Dec 2019 00:26:23 -0500 Subject: [PATCH] de-coupling things a bit --- firmware/controllers/engine_controller.cpp | 6 +++++- firmware/controllers/engine_cycle/main_trigger_callback.cpp | 6 +----- firmware/controllers/engine_cycle/main_trigger_callback.h | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 5676c4b2f0..92e020649a 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -48,6 +48,8 @@ #include "fuel_math.h" #include "settings.h" #include "aux_pid.h" +#include "spark_logic.h" +#include "aux_valves.h" #include "accelerometer.h" #include "counter64.h" #include "perf_trace.h" @@ -723,9 +725,11 @@ void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S #if (EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT) || EFI_SIMULATOR || EFI_UNIT_TEST if (CONFIG(isEngineControlEnabled)) { + initAuxValves(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX); /** - * This method initialized the main listener which actually runs injectors & ignition + * This method adds trigger listener which actually schedules ignition */ + initSparkLogic(sharedLogger); initMainEventListener(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX); } #endif /* EFI_ENGINE_CONTROL */ diff --git a/firmware/controllers/engine_cycle/main_trigger_callback.cpp b/firmware/controllers/engine_cycle/main_trigger_callback.cpp index 6cc86b1ba0..35ee53e240 100644 --- a/firmware/controllers/engine_cycle/main_trigger_callback.cpp +++ b/firmware/controllers/engine_cycle/main_trigger_callback.cpp @@ -52,7 +52,6 @@ #include "engine.h" #include "perf_trace.h" -#include "aux_valves.h" #include "backup_ram.h" EXTERN_ENGINE @@ -415,7 +414,7 @@ uint32_t *cyccnt = (uint32_t*) &DWT->CYCCNT; * This is the main trigger event handler. * Both injection and ignition are controlled from this method. */ -void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t trgEventIndex DECLARE_ENGINE_PARAMETER_SUFFIX) { +static void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t trgEventIndex DECLARE_ENGINE_PARAMETER_SUFFIX) { ScopePerf perf(PE::MainTriggerCallback); (void) ckpSignalType; @@ -600,9 +599,6 @@ static void showMainInfo(Engine *engine) { void initMainEventListener(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { logger = sharedLogger; efiAssertVoid(CUSTOM_ERR_6631, engine!=NULL, "null engine"); - initSparkLogic(logger); - - initAuxValves(logger PASS_ENGINE_PARAMETER_SUFFIX); #if EFI_PROD_CODE addConsoleActionP("maininfo", (VoidPtr) showMainInfo, engine); diff --git a/firmware/controllers/engine_cycle/main_trigger_callback.h b/firmware/controllers/engine_cycle/main_trigger_callback.h index f72547435d..884ebaf8e2 100644 --- a/firmware/controllers/engine_cycle/main_trigger_callback.h +++ b/firmware/controllers/engine_cycle/main_trigger_callback.h @@ -14,7 +14,6 @@ #include "event_registry.h" void initMainEventListener(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); -void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECLARE_ENGINE_PARAMETER_SUFFIX); void startPrimeInjectionPulse(DECLARE_ENGINE_PARAMETER_SIGNATURE);