From dd65b81754ee652ac2c1073f3a25f6b4877d2091 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Mon, 13 Mar 2023 16:25:45 -0400 Subject: [PATCH] a bit of dead code --- .../controllers/algo/engine_configuration.cpp | 2 -- firmware/controllers/engine_controller.cpp | 4 +--- firmware/controllers/settings.cpp | 18 ------------------ firmware/integration/rusefi_config.txt | 2 +- 4 files changed, 2 insertions(+), 24 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 01898a0268..693b333b2f 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -636,8 +636,6 @@ static void setDefaultEngineConfiguration() { engineConfiguration->mapErrorDetectionTooHigh = 410; engineConfiguration->hip9011Gain = 1; - - engineConfiguration->isEngineControlEnabled = true; #endif // EFI_ENGINE_CONTROL #include "default_script.lua" } diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 012ec3f9d4..ac436cd0f6 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -479,9 +479,7 @@ void commonInitEngineController() { #endif /* EFI_UNIT_TEST */ #if (EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT) || EFI_SIMULATOR || EFI_UNIT_TEST - if (engineConfiguration->isEngineControlEnabled) { - initAuxValves(); - } + initAuxValves(); #endif /* EFI_ENGINE_CONTROL */ initTachometer(); diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 9372747ff2..9d62f939bd 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -626,14 +626,6 @@ static void enableOrDisable(const char *param, bool isEnabled) { engine->etbAutoTune = isEnabled; } else if (strEqualCaseInsensitive(param, "verboseKLine")) { engineConfiguration->verboseKLine = isEnabled; - } else if (strEqualCaseInsensitive(param, "step1limimter")) { - engineConfiguration->enabledStep1Limiter = isEnabled; -#if EFI_PROD_CODE - } else if (strEqualCaseInsensitive(param, "auto_idle")) { -#if EFI_IDLE_CONTROL - setIdleMode(isEnabled ? IM_MANUAL : IM_AUTO); -#endif // EFI_IDLE_CONTROL -#endif // EFI_PROD_CODE } else if (strEqualCaseInsensitive(param, "stepperidle")) { engineConfiguration->useStepperIdle = isEnabled; } else if (strEqualCaseInsensitive(param, "two_wire_batch_injection")) { @@ -692,16 +684,6 @@ static void enableOrDisable(const char *param, bool isEnabled) { disableTriggerStimulator(); } #endif // EFI_EMULATE_POSITION_SENSORS - } else if (strEqualCaseInsensitive(param, "engine_control")) { - engineConfiguration->isEngineControlEnabled = isEnabled; - } else if (strEqualCaseInsensitive(param, "map_avg")) { - engineConfiguration->isMapAveragingEnabled = isEnabled; - } else if (strEqualCaseInsensitive(param, "logic_analyzer")) { - engineConfiguration->isWaveAnalyzerEnabled = isEnabled; - } else if (strEqualCaseInsensitive(param, "manual_spinning")) { - engineConfiguration->isManualSpinningMode = isEnabled; - } else if (strEqualCaseInsensitive(param, "cylinder_cleanup")) { - engineConfiguration->isCylinderCleanupEnabled = isEnabled; } else { efiPrintf("unexpected [%s]", param); return; // well, MISRA would not like this 'return' here :( diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index f0f6ea73a4..3946d0ddee 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -711,7 +711,7 @@ bit is_enabled_spi_2 bit is_enabled_spi_3 bit isSdCardEnabled;enable sd/disable sd bit rusefiVerbose29b,"29 bit","11 bit";Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format. - bit isEngineControlEnabled + bit unusedIsEngineControlEnabled bit isHip9011Enabled bit isVerboseAlternator bit verboseQuad