From 0f5f0a549bcfe4b08cc24e220e7d2cd0d9065c09 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 2 Nov 2020 23:46:41 -0500 Subject: [PATCH 1/6] this stuff is just too dead --- firmware/controllers/system/efi_gpio.cpp | 28 --------------------- firmware/hw_layer/io_pins.h | 31 ------------------------ 2 files changed, 59 deletions(-) diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp index 0c0b20a7fc..f4ea39c9d0 100644 --- a/firmware/controllers/system/efi_gpio.cpp +++ b/firmware/controllers/system/efi_gpio.cpp @@ -434,34 +434,6 @@ void initOutputPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { enginePins.o2heater.initPin("O2 heater", CONFIG(o2heaterPin)); enginePins.acRelay.initPin("A/C relay", CONFIG(acRelayPin), &CONFIG(acRelayPinMode)); - // digit 1 - /* - ledRegister(LED_HUGE_0, GPIOB, 2); - ledRegister(LED_HUGE_1, GPIOE, 7); - ledRegister(LED_HUGE_2, GPIOE, 8); - ledRegister(LED_HUGE_3, GPIOE, 9); - ledRegister(LED_HUGE_4, GPIOE, 10); - ledRegister(LED_HUGE_5, GPIOE, 11); - ledRegister(LED_HUGE_6, GPIOE, 12); - - // digit 2 - ledRegister(LED_HUGE_7, GPIOE, 13); - ledRegister(LED_HUGE_8, GPIOE, 14); - ledRegister(LED_HUGE_9, GPIOE, 15); - ledRegister(LED_HUGE_10, GPIOB, 10); - ledRegister(LED_HUGE_11, GPIOB, 11); - ledRegister(LED_HUGE_12, GPIOB, 12); - ledRegister(LED_HUGE_13, GPIOB, 13); - - // digit 3 - ledRegister(LED_HUGE_14, GPIOE, 0); - ledRegister(LED_HUGE_15, GPIOE, 2); - ledRegister(LED_HUGE_16, GPIOE, 4); - ledRegister(LED_HUGE_17, GPIOE, 6); - ledRegister(LED_HUGE_18, GPIOE, 5); - ledRegister(LED_HUGE_19, GPIOE, 3); - ledRegister(LED_HUGE_20, GPIOE, 1); - */ #endif /* EFI_GPIO_HARDWARE */ } diff --git a/firmware/hw_layer/io_pins.h b/firmware/hw_layer/io_pins.h index c991cb6bce..533d5be6af 100644 --- a/firmware/hw_layer/io_pins.h +++ b/firmware/hw_layer/io_pins.h @@ -19,37 +19,6 @@ } -/** - * these seven segment display pins are related to unused external tachometer code - * I still have the hardware so maybe one day I will fix it, but for now it's just dead code - * See https://www.youtube.com/watch?v=YYiHoN6MBqE - * todo: this should be re-implemented in a smarter way with some sort of multiplexing anyway - */ -/* digit 1 */ -// LED_HUGE_0, // B2 -// LED_HUGE_1, -// LED_HUGE_2, -// LED_HUGE_3, -// LED_HUGE_4, -// LED_HUGE_5, -// LED_HUGE_6, -// /* digit 2 */ -// LED_HUGE_7, -// LED_HUGE_8, -// LED_HUGE_9, // E15 -// LED_HUGE_10, -// LED_HUGE_11, -// LED_HUGE_12, -// LED_HUGE_13, -// /* digit 3 */ -// LED_HUGE_14, -// LED_HUGE_15, -// LED_HUGE_16, -// LED_HUGE_17, -// LED_HUGE_18, -// LED_HUGE_19, -// LED_HUGE_20, - #if EFI_GPIO_HARDWARE EXTERNC void efiSetPadMode(const char *msg, brain_pin_e pin, iomode_t mode); EXTERNC void efiSetPadUnused(brain_pin_e brainPin); From 949b1a379ed38aed2c5a0ed60973bcbdbe7c611d Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Tue, 3 Nov 2020 04:48:42 +0000 Subject: [PATCH 2/6] Auto-generated configs and docs --- .../generated/signature_frankenso_na6.h | 6 +++--- .../controllers/generated/signature_mre_f4.h | 6 +++--- .../controllers/generated/signature_mre_f7.h | 6 +++--- .../generated/signature_prometheus_405.h | 6 +++--- .../generated/signature_prometheus_469.h | 6 +++--- .../generated/signature_proteus_f4.h | 6 +++--- .../generated/signature_proteus_f7.h | 6 +++--- firmware/tunerstudio/generated/cache.zip | Bin 958164 -> 958149 bytes .../generated/rusefi_frankenso_na6.ini | 6 +++--- .../tunerstudio/generated/rusefi_mre_f4.ini | 6 +++--- .../tunerstudio/generated/rusefi_mre_f7.ini | 6 +++--- .../generated/rusefi_prometheus_405.ini | 6 +++--- .../generated/rusefi_prometheus_469.ini | 6 +++--- .../generated/rusefi_proteus_f4.ini | 6 +++--- .../generated/rusefi_proteus_f7.ini | 6 +++--- 15 files changed, 42 insertions(+), 42 deletions(-) diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index bc42c18fbb..1ac2e62e14 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.11.02 -#define SIGNATURE_HASH 1266301096 -#define TS_SIGNATURE "rusEFI 2020.11.02.frankenso_na6.1266301096" +#define SIGNATURE_DATE 2020.11.03 +#define SIGNATURE_HASH 3637298954 +#define TS_SIGNATURE "rusEFI 2020.11.03.frankenso_na6.3637298954" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 6dc9ee3c9e..34c4f11a27 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.11.02 -#define SIGNATURE_HASH 351842662 -#define TS_SIGNATURE "rusEFI 2020.11.02.mre_f4.351842662" +#define SIGNATURE_DATE 2020.11.03 +#define SIGNATURE_HASH 647487135 +#define TS_SIGNATURE "rusEFI 2020.11.03.mre_f4.647487135" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 6610511739..0bb33fe90c 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.11.02 -#define SIGNATURE_HASH 351842662 -#define TS_SIGNATURE "rusEFI 2020.11.02.mre_f7.351842662" +#define SIGNATURE_DATE 2020.11.03 +#define SIGNATURE_HASH 647487135 +#define TS_SIGNATURE "rusEFI 2020.11.03.mre_f7.647487135" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 9a979dad5f..d9bae098a2 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.11.02 -#define SIGNATURE_HASH 3895698543 -#define TS_SIGNATURE "rusEFI 2020.11.02.prometheus_405.3895698543" +#define SIGNATURE_DATE 2020.11.03 +#define SIGNATURE_HASH 207909024 +#define TS_SIGNATURE "rusEFI 2020.11.03.prometheus_405.207909024" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 9d0c630793..2cc15526d2 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.11.02 -#define SIGNATURE_HASH 3895698543 -#define TS_SIGNATURE "rusEFI 2020.11.02.prometheus_469.3895698543" +#define SIGNATURE_DATE 2020.11.03 +#define SIGNATURE_HASH 207909024 +#define TS_SIGNATURE "rusEFI 2020.11.03.prometheus_469.207909024" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 5400846b2e..c4e834aa53 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.11.02 -#define SIGNATURE_HASH 3794303224 -#define TS_SIGNATURE "rusEFI 2020.11.02.proteus_f4.3794303224" +#define SIGNATURE_DATE 2020.11.03 +#define SIGNATURE_HASH 2266381359 +#define TS_SIGNATURE "rusEFI 2020.11.03.proteus_f4.2266381359" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 4b5b98a8f4..996bf035c3 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.11.02 -#define SIGNATURE_HASH 3794303224 -#define TS_SIGNATURE "rusEFI 2020.11.02.proteus_f7.3794303224" +#define SIGNATURE_DATE 2020.11.03 +#define SIGNATURE_HASH 2266381359 +#define TS_SIGNATURE "rusEFI 2020.11.03.proteus_f7.2266381359" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 621d695a6edee98b097c91af0efd7fbe83de8851..3265ad7d9ed9f9623a54a2aa9d8ce1fa0a2f4af6 100644 GIT binary patch delta 4571 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 CoMm|c diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 03736980e3..11a54b5261 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.02.frankenso_na6.1266301096" + signature = "rusEFI 2020.11.03.frankenso_na6.3637298954" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.02.frankenso_na6.1266301096" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.frankenso_na6.3637298954" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 02 03:26:58 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 04:48:14 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 40b2728953..0be1c5edfe 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.02.mre_f4.351842662" + signature = "rusEFI 2020.11.03.mre_f4.647487135" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.02.mre_f4.351842662" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.mre_f4.647487135" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 02 03:26:50 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 04:48:12 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 6b5b6eddfc..d4ac6a2bab 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.02.mre_f7.351842662" + signature = "rusEFI 2020.11.03.mre_f7.647487135" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.02.mre_f7.351842662" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.mre_f7.647487135" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 02 03:26:47 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 04:48:05 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f142220e9e..67b1a4888b 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.02.prometheus_405.3895698543" + signature = "rusEFI 2020.11.03.prometheus_405.207909024" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.02.prometheus_405.3895698543" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.prometheus_405.207909024" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 02 03:27:02 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 04:48:18 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index b84a9298bc..fb0ede9698 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.02.prometheus_469.3895698543" + signature = "rusEFI 2020.11.03.prometheus_469.207909024" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.02.prometheus_469.3895698543" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.prometheus_469.207909024" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 02 03:27:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 04:48:16 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 3719f16615..eb4a7b00f2 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.02.proteus_f4.3794303224" + signature = "rusEFI 2020.11.03.proteus_f4.2266381359" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.02.proteus_f4.3794303224" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.proteus_f4.2266381359" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 02 03:27:06 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 04:48:22 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 6e4ad6fc43..bfe47d5668 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.02.proteus_f7.3794303224" + signature = "rusEFI 2020.11.03.proteus_f7.2266381359" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.02.proteus_f7.3794303224" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.proteus_f7.2266381359" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 02 03:27:04 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 04:48:20 UTC 2020 pageSize = 20000 page = 1 From 13b4b028730f9e053bc16b7d022dfa38d44debee Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 2 Nov 2020 23:52:26 -0500 Subject: [PATCH 3/6] typo --- firmware/controllers/system/efi_gpio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/controllers/system/efi_gpio.h b/firmware/controllers/system/efi_gpio.h index 87f3b55b68..1ff26cf4fd 100644 --- a/firmware/controllers/system/efi_gpio.h +++ b/firmware/controllers/system/efi_gpio.h @@ -155,7 +155,7 @@ public: RegisteredOutputPin mainRelay; // this one cranks engine RegisteredOutputPin starterControl; - // this one prevents driver from cranknig engine + // this one prevents driver from cranking engine RegisteredOutputPin starterRelayDisable; RegisteredOutputPin fanRelay; From 2c322006d84a62fd4cef64ce42b3fb4fbe973210 Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 3 Nov 2020 00:09:42 -0500 Subject: [PATCH 4/6] Output pin init/deinit needs a linked list #1803 --- .../actuators/alternator_controller.cpp | 7 ++----- firmware/controllers/actuators/boost_control.cpp | 3 +-- firmware/controllers/actuators/idle_thread.cpp | 12 ++++++------ firmware/controllers/system/efi_gpio.cpp | 15 +++++++++++---- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/firmware/controllers/actuators/alternator_controller.cpp b/firmware/controllers/actuators/alternator_controller.cpp index 54acc7dfc2..eba8f0a333 100644 --- a/firmware/controllers/actuators/alternator_controller.cpp +++ b/firmware/controllers/actuators/alternator_controller.cpp @@ -161,13 +161,10 @@ void initAlternatorCtrl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { if (CONFIG(alternatorControlPin) == GPIO_UNASSIGNED) return; - if (CONFIG(onOffAlternatorLogic)) { - enginePins.alternatorPin.initPin("Alternator control", CONFIG(alternatorControlPin)); - } else { - startSimplePwmExt(&alternatorControl, + if (!CONFIG(onOffAlternatorLogic)) { + startSimplePwm(&alternatorControl, "Alternator control", &engine->executor, - CONFIG(alternatorControlPin), &enginePins.alternatorPin, engineConfiguration->alternatorPwmFrequency, 0.1, (pwm_gen_callback*)applyAlternatorPinState); } diff --git a/firmware/controllers/actuators/boost_control.cpp b/firmware/controllers/actuators/boost_control.cpp index f8dee33d56..9d859e3770 100644 --- a/firmware/controllers/actuators/boost_control.cpp +++ b/firmware/controllers/actuators/boost_control.cpp @@ -187,11 +187,10 @@ void startBoostPin() { return; } - startSimplePwmExt( + startSimplePwm( &boostPwmControl, "Boost", &engine->executor, - CONFIG(boostControlPin), &enginePins.boostPin, engineConfiguration->boostPwmFrequency, 0.5f diff --git a/firmware/controllers/actuators/idle_thread.cpp b/firmware/controllers/actuators/idle_thread.cpp index e25d37910e..d0de11aee6 100644 --- a/firmware/controllers/actuators/idle_thread.cpp +++ b/firmware/controllers/actuators/idle_thread.cpp @@ -735,21 +735,21 @@ void initIdleHardware(DECLARE_ENGINE_PARAMETER_SIGNATURE) { // todo: even for double-solenoid mode we can probably use same single SimplePWM // todo: open question why do we pass 'OutputPin' into 'startSimplePwmExt' if we have custom applyIdleSolenoidPinState listener anyway? if (!CONFIG(isDoubleSolenoidIdle)) { - startSimplePwmExt(&idleSolenoidOpen, "Idle Valve", + startSimplePwm(&idleSolenoidOpen, "Idle Valve", &engine->executor, - CONFIG(idle).solenoidPin, &enginePins.idleSolenoidPin, + &enginePins.idleSolenoidPin, CONFIG(idle).solenoidFrequency, PERCENT_TO_DUTY(CONFIG(manIdlePosition)), (pwm_gen_callback*)applyIdleSolenoidPinState); } else { - startSimplePwmExt(&idleSolenoidOpen, "Idle Valve Open", + startSimplePwm(&idleSolenoidOpen, "Idle Valve Open", &engine->executor, - CONFIG(idle).solenoidPin, &enginePins.idleSolenoidPin, + &enginePins.idleSolenoidPin, CONFIG(idle).solenoidFrequency, PERCENT_TO_DUTY(CONFIG(manIdlePosition)), (pwm_gen_callback*)applyIdleSolenoidPinState); - startSimplePwmExt(&idleSolenoidClose, "Idle Valve Close", + startSimplePwm(&idleSolenoidClose, "Idle Valve Close", &engine->executor, - CONFIG(secondSolenoidPin), &enginePins.secondIdleSolenoidPin, + &enginePins.secondIdleSolenoidPin, CONFIG(idle).solenoidFrequency, PERCENT_TO_DUTY(CONFIG(manIdlePosition)), (pwm_gen_callback*)applyIdleSolenoidPinState); } diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp index f4ea39c9d0..7970060034 100644 --- a/firmware/controllers/system/efi_gpio.cpp +++ b/firmware/controllers/system/efi_gpio.cpp @@ -83,7 +83,7 @@ void RegisteredOutputPin::unregister() { EnginePins::EnginePins() : - mainRelay("mainRelay", CONFIG_OFFSET(mainRelayPin), CONFIG_OFFSET(mainRelayPinMode)), + mainRelay("mainRelay", CONFIG_PIN_OFFSETS(mainRelay)), starterControl("starterControl", CONFIG_PIN_OFFSETS(starterControl)), starterRelayDisable("starterRelayDisable", CONFIG_PIN_OFFSETS(starterRelayDisable)), fanRelay("fanRelay", CONFIG_PIN_OFFSETS(fan)), @@ -423,16 +423,23 @@ void initOutputPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { enginePins.sdCsPin.initPin("SD CS", CONFIG(sdCardCsPin)); #endif /* HAL_USE_SPI */ - // todo: should we move this code closer to the fuel pump logic? - enginePins.fuelPumpRelay.initPin("Fuel pump", CONFIG(fuelPumpPin), &CONFIG(fuelPumpPinMode)); enginePins.mainRelay.initPin("Main relay", CONFIG(mainRelayPin), &CONFIG(mainRelayPinMode)); enginePins.starterRelayDisable.initPin("Starter disable", CONFIG(starterRelayDisablePin), &CONFIG(starterRelayDisablePinMode)); enginePins.starterControl.initPin("Starter control", CONFIG(starterControlPin)); enginePins.fanRelay.initPin("Fan", CONFIG(fanPin), &CONFIG(fanPinMode)); - enginePins.o2heater.initPin("O2 heater", CONFIG(o2heaterPin)); enginePins.acRelay.initPin("A/C relay", CONFIG(acRelayPin), &CONFIG(acRelayPinMode)); + // todo: should we move this code closer to the fuel pump logic? + enginePins.fuelPumpRelay.initPin("Fuel pump", CONFIG(fuelPumpPin), &CONFIG(fuelPumpPinMode)); + enginePins.boostPin.initPin("Boost", CONFIG(boostControlPin)); + + enginePins.idleSolenoidPin.initPin("Idle Valve", CONFIG(idle).solenoidPin); + enginePins.secondIdleSolenoidPin.initPin("Idle Valve#2", CONFIG(secondSolenoidPin)); + enginePins.alternatorPin.initPin("Alternator control", CONFIG(alternatorControlPin)); + + + enginePins.o2heater.initPin("O2 heater", CONFIG(o2heaterPin)); #endif /* EFI_GPIO_HARDWARE */ } From e5ad8eb5c0a2575fae50776f79144ae8b326b624 Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 3 Nov 2020 00:21:39 -0500 Subject: [PATCH 5/6] Output pin init/deinit needs a linked list #1803 --- firmware/console/status_loop.cpp | 6 ------ firmware/controllers/system/efi_gpio.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 8d38138e0e..694be0dc11 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -330,12 +330,6 @@ static void initStatusLeds(void) { enginePins.warningLedPin.initPin("led: warning status", engineConfiguration->warningLedPin); enginePins.runningLedPin.initPin("led: running status", engineConfiguration->runningLedPin); - - enginePins.debugTriggerSync.initPin("debug: sync", CONFIG(debugTriggerSync)); -#if EFI_GPIO_HARDWARE && EFI_SHAFT_POSITION_INPUT - enginePins.triggerDecoderErrorPin.initPin("led: trigger debug", CONFIG(triggerErrorPin), - &CONFIG(triggerErrorPinMode)); -#endif /* EFI_GPIO_HARDWARE */ } #if EFI_PROD_CODE diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp index 7970060034..49b97ce148 100644 --- a/firmware/controllers/system/efi_gpio.cpp +++ b/firmware/controllers/system/efi_gpio.cpp @@ -438,6 +438,13 @@ void initOutputPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { enginePins.secondIdleSolenoidPin.initPin("Idle Valve#2", CONFIG(secondSolenoidPin)); enginePins.alternatorPin.initPin("Alternator control", CONFIG(alternatorControlPin)); + enginePins.triggerDecoderErrorPin.initPin("led: trigger debug", CONFIG(triggerErrorPin), + &CONFIG(triggerErrorPinMode)); + +#if EFI_SHAFT_POSITION_INPUT + // todo: migrate remaining OutputPin to RegisteredOutputPin in order to get consistent dynamic pin init/deinit + enginePins.debugTriggerSync.initPin("debug: sync", CONFIG(debugTriggerSync)); +#endif // EFI_SHAFT_POSITION_INPUT enginePins.o2heater.initPin("O2 heater", CONFIG(o2heaterPin)); From 7de1fc8e2a4225cc4192192bf04ee2af566c338c Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 3 Nov 2020 00:46:03 -0500 Subject: [PATCH 6/6] Output pin init/deinit needs a linked list #1803 trying to make things more consistent & smarter --- firmware/controllers/engine_controller.cpp | 2 -- firmware/controllers/system/efi_gpio.cpp | 42 ++++++++++++---------- firmware/controllers/system/efi_gpio.h | 12 ++++--- firmware/hw_layer/hardware.cpp | 12 ++++--- 4 files changed, 39 insertions(+), 29 deletions(-) diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index c26f6314c0..b3a7d72928 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -635,8 +635,6 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) addConsoleAction("analoginfo", printAnalogInfo); #if EFI_PROD_CODE && EFI_ENGINE_CONTROL - enginePins.startPins(); - initBenchTest(sharedLogger); #endif /* EFI_PROD_CODE && EFI_ENGINE_CONTROL */ diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp index 49b97ce148..688ff40500 100644 --- a/firmware/controllers/system/efi_gpio.cpp +++ b/firmware/controllers/system/efi_gpio.cpp @@ -170,6 +170,9 @@ bool EnginePins::stopPins() { } void EnginePins::unregisterPins() { + stopInjectionPins(); + stopIgnitionPins(); + #if EFI_ELECTRONIC_THROTTLE_BODY unregisterEtbPins(); #endif /* EFI_ELECTRONIC_THROTTLE_BODY */ @@ -194,9 +197,30 @@ void EnginePins::unregisterPins() { } void EnginePins::startPins() { +#if EFI_ENGINE_CONTROL startInjectionPins(); startIgnitionPins(); startAuxValves(); + + starterRelayDisable.initPin("Starter disable", CONFIG(starterRelayDisablePin), &CONFIG(starterRelayDisablePinMode)); + starterControl.initPin("Starter control", CONFIG(starterControlPin)); +#endif /* EFI_ENGINE_CONTROL */ + + mainRelay.initPin("Main relay", CONFIG(mainRelayPin), &CONFIG(mainRelayPinMode)); + + fanRelay.initPin("Fan", CONFIG(fanPin), &CONFIG(fanPinMode)); + acRelay.initPin("A/C relay", CONFIG(acRelayPin), &CONFIG(acRelayPinMode)); + // todo: should we move this code closer to the fuel pump logic? + fuelPumpRelay.initPin("Fuel pump", CONFIG(fuelPumpPin), &CONFIG(fuelPumpPinMode)); + boostPin.initPin("Boost", CONFIG(boostControlPin)); + + idleSolenoidPin.initPin("Idle Valve", CONFIG(idle).solenoidPin); + secondIdleSolenoidPin.initPin("Idle Valve#2", CONFIG(secondSolenoidPin)); + alternatorPin.initPin("Alternator control", CONFIG(alternatorControlPin)); + + triggerDecoderErrorPin.initPin("led: trigger debug", CONFIG(triggerErrorPin), + &CONFIG(triggerErrorPinMode)); + } void EnginePins::reset() { @@ -423,24 +447,6 @@ void initOutputPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { enginePins.sdCsPin.initPin("SD CS", CONFIG(sdCardCsPin)); #endif /* HAL_USE_SPI */ - - enginePins.mainRelay.initPin("Main relay", CONFIG(mainRelayPin), &CONFIG(mainRelayPinMode)); - enginePins.starterRelayDisable.initPin("Starter disable", CONFIG(starterRelayDisablePin), &CONFIG(starterRelayDisablePinMode)); - enginePins.starterControl.initPin("Starter control", CONFIG(starterControlPin)); - - enginePins.fanRelay.initPin("Fan", CONFIG(fanPin), &CONFIG(fanPinMode)); - enginePins.acRelay.initPin("A/C relay", CONFIG(acRelayPin), &CONFIG(acRelayPinMode)); - // todo: should we move this code closer to the fuel pump logic? - enginePins.fuelPumpRelay.initPin("Fuel pump", CONFIG(fuelPumpPin), &CONFIG(fuelPumpPinMode)); - enginePins.boostPin.initPin("Boost", CONFIG(boostControlPin)); - - enginePins.idleSolenoidPin.initPin("Idle Valve", CONFIG(idle).solenoidPin); - enginePins.secondIdleSolenoidPin.initPin("Idle Valve#2", CONFIG(secondSolenoidPin)); - enginePins.alternatorPin.initPin("Alternator control", CONFIG(alternatorControlPin)); - - enginePins.triggerDecoderErrorPin.initPin("led: trigger debug", CONFIG(triggerErrorPin), - &CONFIG(triggerErrorPinMode)); - #if EFI_SHAFT_POSITION_INPUT // todo: migrate remaining OutputPin to RegisteredOutputPin in order to get consistent dynamic pin init/deinit enginePins.debugTriggerSync.initPin("debug: sync", CONFIG(debugTriggerSync)); diff --git a/firmware/controllers/system/efi_gpio.h b/firmware/controllers/system/efi_gpio.h index 1ff26cf4fd..c186a8af31 100644 --- a/firmware/controllers/system/efi_gpio.h +++ b/firmware/controllers/system/efi_gpio.h @@ -147,11 +147,6 @@ public: void reset(); bool stopPins(); void unregisterPins(); - void startInjectionPins(); - void startIgnitionPins(); - void startAuxValves(); - void stopInjectionPins(); - void stopIgnitionPins(); RegisteredOutputPin mainRelay; // this one cranks engine RegisteredOutputPin starterControl; @@ -192,6 +187,13 @@ public: InjectorOutputPin injectors[INJECTION_PIN_COUNT]; IgnitionOutputPin coils[IGNITION_PIN_COUNT]; NamedOutputPin auxValve[AUX_DIGITAL_VALVE_COUNT]; +private: + void startInjectionPins(); + void startIgnitionPins(); + void startAuxValves(); + + void stopInjectionPins(); + void stopIgnitionPins(); }; #endif /* __cplusplus */ diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 3cfef24204..e1ddcc4b24 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -313,8 +313,6 @@ void applyNewHardwareSettings(void) { stopJoystickPins(); #endif /* HAL_USE_PAL && EFI_JOYSTICK */ - enginePins.stopInjectionPins(); - enginePins.stopIgnitionPins(); #if EFI_CAN_SUPPORT stopCanPins(); #endif /* EFI_CAN_SUPPORT */ @@ -377,6 +375,8 @@ void applyNewHardwareSettings(void) { ButtonDebounce::startConfigurationList(); + + #if EFI_SHAFT_POSITION_INPUT startTriggerInputPins(); #endif /* EFI_SHAFT_POSITION_INPUT */ @@ -389,8 +389,7 @@ void applyNewHardwareSettings(void) { startHD44780_pins(); #endif /* #if EFI_HD44780_LCD */ - enginePins.startInjectionPins(); - enginePins.startIgnitionPins(); + enginePins.startPins(); #if EFI_CAN_SUPPORT startCanPins(); @@ -535,6 +534,11 @@ void initHardware(Logging *l) { // output pins potentially depend on 'initSmartGpio' initOutputPins(PASS_ENGINE_PARAMETER_SIGNATURE); +#if EFI_PROD_CODE && EFI_ENGINE_CONTROL + enginePins.startPins(); + +#endif /* EFI_PROD_CODE && EFI_ENGINE_CONTROL */ + #if EFI_MC33816 initMc33816(sharedLogger);