From d2b54428c0ad7fc7beacf59571e760e4ffa6af88 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Mon, 23 Aug 2021 22:19:03 -0700 Subject: [PATCH] cleanup missing fsio stuff (#3189) --- firmware/config/engines/ford_festiva.cpp | 2 -- firmware/controllers/algo/engine.cpp | 7 ------- firmware/controllers/algo/engine.h | 2 -- firmware/controllers/algo/engine_parts.h | 2 -- firmware/controllers/core/fsio_impl.cpp | 4 ---- firmware/controllers/limp_manager.cpp | 2 +- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.input | 3 --- 8 files changed, 2 insertions(+), 22 deletions(-) diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index 6a2a7ffb41..47343d11ce 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -276,8 +276,6 @@ void setFordEscortGt(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // we wanted to have a timinig table adjustment switch here // engineConfiguration->fsioAdc[0] = EFI_ADC_12; // PC2 - strcpy(config->fsioFormulas[15], ANALOG_CONDITION); - // end of Ford Escort GT config } diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index 45131c01a3..0633e0f790 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -649,13 +649,6 @@ operation_mode_e Engine::getOperationMode(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return doesTriggerImplyOperationMode(engineConfiguration->trigger.type) ? triggerCentral.triggerShape.getOperationMode() : engineConfiguration->ambiguousOperationMode; } -int Engine::getRpmHardLimit(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - if (engineConfiguration->useFSIO6ForRevLimiter) { - return fsioState.fsioRpmHardLimit; - } - return CONFIG(rpmHardLimit); -} - /** * The idea of this method is to execute all heavy calculations in a lower-priority thread, * so that trigger event handler/IO scheduler tasks are faster. diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h index 94169f3e35..e960486c7a 100644 --- a/firmware/controllers/algo/engine.h +++ b/firmware/controllers/algo/engine.h @@ -293,8 +293,6 @@ public: bool isRunningPwmTest = false; - int getRpmHardLimit(DECLARE_ENGINE_PARAMETER_SIGNATURE); - FsioState fsioState; /** diff --git a/firmware/controllers/algo/engine_parts.h b/firmware/controllers/algo/engine_parts.h index 7cddb82222..60ee24c560 100644 --- a/firmware/controllers/algo/engine_parts.h +++ b/firmware/controllers/algo/engine_parts.h @@ -75,8 +75,6 @@ public: FsioState(); float fsioLastValue[FSIO_COMMAND_COUNT]; - float fsioRpmHardLimit; - #if EFI_UNIT_TEST float mockFan = 0; float mockRpm = 0; diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp index 8c06e25950..a736303184 100644 --- a/firmware/controllers/core/fsio_impl.cpp +++ b/firmware/controllers/core/fsio_impl.cpp @@ -490,10 +490,6 @@ void runFsio(DECLARE_ENGINE_PARAMETER_SIGNATURE) { } } #endif /* EFI_ENABLE_CRITICAL_ENGINE_STOP */ - - if (engineConfiguration->useFSIO6ForRevLimiter) { - updateValueOrWarning(6, "rpm limit", &ENGINE(fsioState.fsioRpmHardLimit) PASS_ENGINE_PARAMETER_SUFFIX); - } } diff --git a/firmware/controllers/limp_manager.cpp b/firmware/controllers/limp_manager.cpp index ecbc1588ab..41f47f4bc4 100644 --- a/firmware/controllers/limp_manager.cpp +++ b/firmware/controllers/limp_manager.cpp @@ -7,7 +7,7 @@ void LimpManager::updateState(int rpm, efitick_t nowNt) { Clearable allowSpark = CONFIG(isIgnitionEnabled); // User-configured hard RPM limit - if (rpm > engine->getRpmHardLimit(PASS_ENGINE_PARAMETER_SIGNATURE)) { + if (rpm > CONFIG(rpmHardLimit)) { if (CONFIG(cutFuelOnHardLimit)) { allowFuel.clear(); } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 823395e1a2..2583163aa4 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1135,7 +1135,7 @@ bit useFSIO5ForCriticalIssueEngineStop;Sometimes we just have to shut the engine bit useFSIO4ForSeriousEngineWarning;Sometimes we have to miss injection on purpose to attract driver's attention bit unusedBitHere2 bit unusedBitHere3 -bit useFSIO6ForRevLimiter +bit unusedBitHere4 adc_channel_e hipOutputChannel; switch_input_pin_e acSwitch;A/C button input; diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 9706adefcb..1cd3a10688 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -3305,10 +3305,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 - field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 - field = "#7", fsioFormulas7 - field = "#8", fsioFormulas8 dialog = fsioInputsDialog, "FSIO inputs" field = "ADC #1", fsioAdc1