mirror of https://github.com/rusefi/rusefi.git
adding simplicity
This commit is contained in:
parent
a08258ba8e
commit
3494f6ff9f
|
@ -23,10 +23,6 @@
|
||||||
|
|
||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include "os_access.h"
|
#include "os_access.h"
|
||||||
#if EFI_SENSOR_CHART
|
|
||||||
#include "sensor_chart.h"
|
|
||||||
#endif
|
|
||||||
#include "engine_configuration.h"
|
|
||||||
#include "trigger_central.h"
|
#include "trigger_central.h"
|
||||||
#include "engine_controller.h"
|
#include "engine_controller.h"
|
||||||
#include "fsio_core.h"
|
#include "fsio_core.h"
|
||||||
|
@ -36,15 +32,9 @@
|
||||||
#include "main_trigger_callback.h"
|
#include "main_trigger_callback.h"
|
||||||
#include "io_pins.h"
|
#include "io_pins.h"
|
||||||
#include "flash_main.h"
|
#include "flash_main.h"
|
||||||
#if EFI_TUNER_STUDIO
|
|
||||||
#include "tunerstudio.h"
|
|
||||||
#endif
|
|
||||||
#include "injector_central.h"
|
#include "injector_central.h"
|
||||||
#include "os_util.h"
|
#include "os_util.h"
|
||||||
#include "engine_math.h"
|
#include "engine_math.h"
|
||||||
#if EFI_LOGIC_ANALYZER
|
|
||||||
#include "logic_analyzer.h"
|
|
||||||
#endif
|
|
||||||
#include "allsensors.h"
|
#include "allsensors.h"
|
||||||
#include "electronic_throttle.h"
|
#include "electronic_throttle.h"
|
||||||
#include "map_averaging.h"
|
#include "map_averaging.h"
|
||||||
|
@ -61,6 +51,18 @@
|
||||||
#include "counter64.h"
|
#include "counter64.h"
|
||||||
#include "perf_trace.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
|
#if HAL_USE_ADC
|
||||||
#include "AdcConfiguration.h"
|
#include "AdcConfiguration.h"
|
||||||
#endif /* HAL_USE_ADC */
|
#endif /* HAL_USE_ADC */
|
||||||
|
@ -703,6 +705,16 @@ void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S
|
||||||
*/
|
*/
|
||||||
initRpmCalculator(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
|
initRpmCalculator(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
|
||||||
#endif /* EFI_SHAFT_POSITION_INPUT */
|
#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
|
#if !EFI_UNIT_TEST
|
||||||
|
@ -735,7 +747,6 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX)
|
||||||
initInjectorCentral(sharedLogger);
|
initInjectorCentral(sharedLogger);
|
||||||
#endif /* EFI_PROD_CODE && EFI_ENGINE_CONTROL */
|
#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
|
// periodic events need to be initialized after fuel&spark pins to avoid a warning
|
||||||
initPeriodicEvents(PASS_ENGINE_PARAMETER_SIGNATURE);
|
initPeriodicEvents(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||||
|
|
||||||
|
@ -773,15 +784,6 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX)
|
||||||
|
|
||||||
initEgoAveraging(PASS_ENGINE_PARAMETER_SIGNATURE);
|
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) {
|
if (engineConfiguration->externalKnockSenseAdc != EFI_ADC_NONE) {
|
||||||
addConsoleAction("knockinfo", getKnockInfo);
|
addConsoleAction("knockinfo", getKnockInfo);
|
||||||
}
|
}
|
||||||
|
|
|
@ -359,7 +359,11 @@ void initMapAveraging(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
|
||||||
#if EFI_SHAFT_POSITION_INPUT
|
#if EFI_SHAFT_POSITION_INPUT
|
||||||
addTriggerEventListener(&mapAveragingTriggerCallback, "MAP averaging", engine);
|
addTriggerEventListener(&mapAveragingTriggerCallback, "MAP averaging", engine);
|
||||||
#endif /* EFI_SHAFT_POSITION_INPUT */
|
#endif /* EFI_SHAFT_POSITION_INPUT */
|
||||||
|
|
||||||
|
#if !EFI_UNIT_TEST
|
||||||
addConsoleAction("faststat", showMapStats);
|
addConsoleAction("faststat", showMapStats);
|
||||||
|
#endif /* EFI_UNIT_TEST */
|
||||||
|
|
||||||
applyMapMinBufferLength(PASS_ENGINE_PARAMETER_SIGNATURE);
|
applyMapMinBufferLength(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
* todo: rename this file
|
* todo: rename this file
|
||||||
*
|
*
|
||||||
* @date Sep 8, 2013
|
* @date Sep 8, 2013
|
||||||
* @author Andrey Belomutskiy, (c) 2012-2017
|
* @author Andrey Belomutskiy, (c) 2012-2019
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "engine.h"
|
#include "global.h"
|
||||||
|
|
||||||
void fanBench(void);
|
void fanBench(void);
|
||||||
void fuelPumpBench(void);
|
void fuelPumpBench(void);
|
||||||
|
|
|
@ -126,8 +126,6 @@ void rusEfiFunctionalTest(void) {
|
||||||
initTriggerCentral(&sharedLogger);
|
initTriggerCentral(&sharedLogger);
|
||||||
initTriggerEmulator(&sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
|
initTriggerEmulator(&sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
|
||||||
|
|
||||||
initMainEventListener(&sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
|
|
||||||
|
|
||||||
startStatusThreads();
|
startStatusThreads();
|
||||||
|
|
||||||
runChprintfTest();
|
runChprintfTest();
|
||||||
|
|
|
@ -57,9 +57,10 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType, configuration_callb
|
||||||
|
|
||||||
initDataStructures(PASS_ENGINE_PARAMETER_SIGNATURE);
|
initDataStructures(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||||
|
|
||||||
|
resetConfigurationExt(NULL, boardCallback, engineType PASS_ENGINE_PARAMETER_SUFFIX);
|
||||||
|
|
||||||
commonInitEngineController(NULL PASS_ENGINE_PARAMETER_SUFFIX);
|
commonInitEngineController(NULL PASS_ENGINE_PARAMETER_SUFFIX);
|
||||||
|
|
||||||
resetConfigurationExt(NULL, boardCallback, engineType PASS_ENGINE_PARAMETER_SUFFIX);
|
|
||||||
prepareShapes(PASS_ENGINE_PARAMETER_SIGNATURE);
|
prepareShapes(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||||
engine->engineConfigurationPtr->mafAdcChannel = TEST_MAF_CHANNEL;
|
engine->engineConfigurationPtr->mafAdcChannel = TEST_MAF_CHANNEL;
|
||||||
engine->engineConfigurationPtr->clt.adcChannel = TEST_CLT_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->periodicSlowCallback(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||||
|
|
||||||
engine->initializeTriggerWaveform(NULL PASS_ENGINE_PARAMETER_SUFFIX);
|
engine->initializeTriggerWaveform(NULL PASS_ENGINE_PARAMETER_SUFFIX);
|
||||||
initMainEventListener(NULL PASS_ENGINE_PARAMETER_SUFFIX);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EngineTestHelper::EngineTestHelper(engine_type_e engineType) : EngineTestHelper(engineType, &emptyCallbackWithConfiguration) {
|
EngineTestHelper::EngineTestHelper(engine_type_e engineType) : EngineTestHelper(engineType, &emptyCallbackWithConfiguration) {
|
||||||
|
|
Loading…
Reference in New Issue