From be5b4fb3c60ce6c4ded4fd9de2c60c1bcbde30d8 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 2 Apr 2020 00:32:03 -0400 Subject: [PATCH] less ETB in case of critical --- .../actuators/electronic_throttle.cpp | 20 +++++++++++-------- .../actuators/electronic_throttle.h | 1 - firmware/controllers/engine_controller.cpp | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp index de4345f1a0..b2dbf6c0a3 100644 --- a/firmware/controllers/actuators/electronic_throttle.cpp +++ b/firmware/controllers/actuators/electronic_throttle.cpp @@ -535,14 +535,7 @@ void unregisterEtbPins() { // todo: we probably need an implementation here?! } -void initElectronicThrottle(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - for (int i = 0; i < ETB_COUNT; i++) { - engine->etbControllers[i] = &etbControllers[i]; - } - doInitElectronicThrottle(PASS_ENGINE_PARAMETER_SIGNATURE); -} - -void doInitElectronicThrottle(DECLARE_ENGINE_PARAMETER_SIGNATURE) { +static void doInitElectronicThrottle(DECLARE_ENGINE_PARAMETER_SIGNATURE) { efiAssertVoid(OBD_PCM_Processor_Fault, engine->etbControllers != NULL, "etbControllers NULL"); #if EFI_PROD_CODE addConsoleAction("ethinfo", showEthInfo); @@ -634,6 +627,17 @@ void doInitElectronicThrottle(DECLARE_ENGINE_PARAMETER_SIGNATURE) { } } +void initElectronicThrottle(DECLARE_ENGINE_PARAMETER_SIGNATURE) { + if (hasFirmwareError()) { + return; + } + + for (int i = 0; i < ETB_COUNT; i++) { + engine->etbControllers[i] = &etbControllers[i]; + } + doInitElectronicThrottle(PASS_ENGINE_PARAMETER_SIGNATURE); +} + #endif /* EFI_ELECTRONIC_THROTTLE_BODY */ diff --git a/firmware/controllers/actuators/electronic_throttle.h b/firmware/controllers/actuators/electronic_throttle.h index 3a90a12846..d86e0f553b 100644 --- a/firmware/controllers/actuators/electronic_throttle.h +++ b/firmware/controllers/actuators/electronic_throttle.h @@ -51,7 +51,6 @@ private: }; void initElectronicThrottle(DECLARE_ENGINE_PARAMETER_SIGNATURE); -void doInitElectronicThrottle(DECLARE_ENGINE_PARAMETER_SIGNATURE); void setDefaultEtbBiasCurve(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setDefaultEtbParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index dc1405b7f5..adbc45c686 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -705,6 +705,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20200401; + return 20200402; } #endif /* EFI_UNIT_TEST */