From 3494f6ff9fe06f68aaf497b22a16ec57441f578f Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 23 Dec 2019 23:25:08 -0500 Subject: [PATCH] adding simplicity --- firmware/controllers/engine_controller.cpp | 42 ++++++++++--------- .../engine_cycle/map_averaging.cpp | 4 ++ firmware/controllers/injector_central.h | 4 +- simulator/simulator/rusEfiFunctionalTest.cpp | 2 - unit_tests/engine_test_helper.cpp | 4 +- 5 files changed, 30 insertions(+), 26 deletions(-) diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 653ac31876..48d73a4eef 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -23,10 +23,6 @@ #include "global.h" #include "os_access.h" -#if EFI_SENSOR_CHART -#include "sensor_chart.h" -#endif -#include "engine_configuration.h" #include "trigger_central.h" #include "engine_controller.h" #include "fsio_core.h" @@ -36,15 +32,9 @@ #include "main_trigger_callback.h" #include "io_pins.h" #include "flash_main.h" -#if EFI_TUNER_STUDIO -#include "tunerstudio.h" -#endif #include "injector_central.h" #include "os_util.h" #include "engine_math.h" -#if EFI_LOGIC_ANALYZER -#include "logic_analyzer.h" -#endif #include "allsensors.h" #include "electronic_throttle.h" #include "map_averaging.h" @@ -61,6 +51,18 @@ #include "counter64.h" #include "perf_trace.h" +#if EFI_SENSOR_CHART +#include "sensor_chart.h" +#endif + +#if EFI_TUNER_STUDIO +#include "tunerstudio.h" +#endif + +#if EFI_LOGIC_ANALYZER +#include "logic_analyzer.h" +#endif + #if HAL_USE_ADC #include "AdcConfiguration.h" #endif /* HAL_USE_ADC */ @@ -703,6 +705,16 @@ void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S */ initRpmCalculator(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX); #endif /* EFI_SHAFT_POSITION_INPUT */ + +#if (EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT) || EFI_SIMULATOR || EFI_UNIT_TEST + if (CONFIG(isEngineControlEnabled)) { + /** + * This method initialized the main listener which actually runs injectors & ignition + */ + initMainEventListener(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX); + } +#endif /* EFI_ENGINE_CONTROL */ + } #if !EFI_UNIT_TEST @@ -735,7 +747,6 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) initInjectorCentral(sharedLogger); #endif /* EFI_PROD_CODE && EFI_ENGINE_CONTROL */ -// multiple issues with this initMapAdjusterThread(); // periodic events need to be initialized after fuel&spark pins to avoid a warning initPeriodicEvents(PASS_ENGINE_PARAMETER_SIGNATURE); @@ -773,15 +784,6 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) initEgoAveraging(PASS_ENGINE_PARAMETER_SIGNATURE); -#if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT - if (CONFIG(isEngineControlEnabled)) { - /** - * This method initialized the main listener which actually runs injectors & ignition - */ - initMainEventListener(sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); - } -#endif /* EFI_ENGINE_CONTROL */ - if (engineConfiguration->externalKnockSenseAdc != EFI_ADC_NONE) { addConsoleAction("knockinfo", getKnockInfo); } diff --git a/firmware/controllers/engine_cycle/map_averaging.cpp b/firmware/controllers/engine_cycle/map_averaging.cpp index cdb19ca60c..6e7b354b35 100644 --- a/firmware/controllers/engine_cycle/map_averaging.cpp +++ b/firmware/controllers/engine_cycle/map_averaging.cpp @@ -359,7 +359,11 @@ void initMapAveraging(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { #if EFI_SHAFT_POSITION_INPUT addTriggerEventListener(&mapAveragingTriggerCallback, "MAP averaging", engine); #endif /* EFI_SHAFT_POSITION_INPUT */ + +#if !EFI_UNIT_TEST addConsoleAction("faststat", showMapStats); +#endif /* EFI_UNIT_TEST */ + applyMapMinBufferLength(PASS_ENGINE_PARAMETER_SIGNATURE); } diff --git a/firmware/controllers/injector_central.h b/firmware/controllers/injector_central.h index de9cdc0c2c..b66dd85fa8 100644 --- a/firmware/controllers/injector_central.h +++ b/firmware/controllers/injector_central.h @@ -5,12 +5,12 @@ * todo: rename this file * * @date Sep 8, 2013 - * @author Andrey Belomutskiy, (c) 2012-2017 + * @author Andrey Belomutskiy, (c) 2012-2019 */ #pragma once -#include "engine.h" +#include "global.h" void fanBench(void); void fuelPumpBench(void); diff --git a/simulator/simulator/rusEfiFunctionalTest.cpp b/simulator/simulator/rusEfiFunctionalTest.cpp index 5b060058b7..2ded97c9a6 100644 --- a/simulator/simulator/rusEfiFunctionalTest.cpp +++ b/simulator/simulator/rusEfiFunctionalTest.cpp @@ -126,8 +126,6 @@ void rusEfiFunctionalTest(void) { initTriggerCentral(&sharedLogger); initTriggerEmulator(&sharedLogger PASS_ENGINE_PARAMETER_SUFFIX); - initMainEventListener(&sharedLogger PASS_ENGINE_PARAMETER_SUFFIX); - startStatusThreads(); runChprintfTest(); diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index e3e4e11424..0933acbde1 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -57,9 +57,10 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType, configuration_callb initDataStructures(PASS_ENGINE_PARAMETER_SIGNATURE); + resetConfigurationExt(NULL, boardCallback, engineType PASS_ENGINE_PARAMETER_SUFFIX); + commonInitEngineController(NULL PASS_ENGINE_PARAMETER_SUFFIX); - resetConfigurationExt(NULL, boardCallback, engineType PASS_ENGINE_PARAMETER_SUFFIX); prepareShapes(PASS_ENGINE_PARAMETER_SIGNATURE); engine->engineConfigurationPtr->mafAdcChannel = TEST_MAF_CHANNEL; engine->engineConfigurationPtr->clt.adcChannel = TEST_CLT_CHANNEL; @@ -75,7 +76,6 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType, configuration_callb engine->periodicSlowCallback(PASS_ENGINE_PARAMETER_SIGNATURE); engine->initializeTriggerWaveform(NULL PASS_ENGINE_PARAMETER_SUFFIX); - initMainEventListener(NULL PASS_ENGINE_PARAMETER_SUFFIX); } EngineTestHelper::EngineTestHelper(engine_type_e engineType) : EngineTestHelper(engineType, &emptyCallbackWithConfiguration) {