From df7a6d1367aae0ad7275c825c182d2ce96588ae9 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 17 May 2022 17:54:11 -0400 Subject: [PATCH] default VR curve is needed not just by hellen, we have Proteus adapters with it now! --- .../boards/hellen/alphax-2chan/board_configuration.cpp | 1 - .../boards/hellen/alphax-4chan/board_configuration.cpp | 1 - .../config/boards/hellen/harley81/board_configuration.cpp | 1 - .../boards/hellen/hellen121vag/board_configuration.cpp | 1 - .../config/boards/hellen/hellen128/board_configuration.cpp | 1 - firmware/config/boards/hellen/hellen_common.cpp | 7 ------- firmware/config/boards/hellen_meta.h | 1 - firmware/controllers/algo/defaults/default_base_engine.cpp | 4 ++++ firmware/controllers/sensors/vr_pwm.cpp | 7 +++++++ firmware/controllers/sensors/vr_pwm.h | 1 + 10 files changed, 12 insertions(+), 13 deletions(-) diff --git a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp index d59c3874ba..e3fdd5ff17 100644 --- a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp @@ -160,7 +160,6 @@ void setBoardDefaultConfiguration() { engineConfiguration->clutchDownPinMode = PI_PULLDOWN; engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH; // ? engineConfiguration->malfunctionIndicatorPin = Gpio::G4; //1E - Check Engine Light - setHellenDefaultVrThresholds(); engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6; } diff --git a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp index 5c7e981e7a..2744cdc757 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp @@ -204,7 +204,6 @@ void setBoardDefaultConfiguration() { engineConfiguration->clutchDownPinMode = PI_PULLDOWN; engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH; // ? engineConfiguration->malfunctionIndicatorPin = Gpio::G4; //1E - Check Engine Light - setHellenDefaultVrThresholds(); engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6; engineConfiguration->vrThreshold[1].pin = H144_OUT_PWM4; } diff --git a/firmware/config/boards/hellen/harley81/board_configuration.cpp b/firmware/config/boards/hellen/harley81/board_configuration.cpp index 07eb273244..be664064f5 100644 --- a/firmware/config/boards/hellen/harley81/board_configuration.cpp +++ b/firmware/config/boards/hellen/harley81/board_configuration.cpp @@ -187,7 +187,6 @@ void setBoardDefaultConfiguration() { engineConfiguration->clutchDownPinMode = PI_PULLDOWN; engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH; // ? engineConfiguration->malfunctionIndicatorPin = Gpio::G4; //1E - Check Engine Light - setHellenDefaultVrThresholds(); engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6; } diff --git a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp index 622d9a4795..631331792a 100644 --- a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp @@ -170,7 +170,6 @@ void setBoardDefaultConfiguration() { engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; engineConfiguration->injectionMode = IM_SIMULTANEOUS;//IM_BATCH;// IM_SEQUENTIAL; - setHellenDefaultVrThresholds(); engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6; hellenWbo(); } diff --git a/firmware/config/boards/hellen/hellen128/board_configuration.cpp b/firmware/config/boards/hellen/hellen128/board_configuration.cpp index 3083c006a6..7a26c38363 100644 --- a/firmware/config/boards/hellen/hellen128/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen128/board_configuration.cpp @@ -220,7 +220,6 @@ void setBoardDefaultConfiguration() { engineConfiguration->throttlePedalSecondaryUpVoltage = 1.34; engineConfiguration->throttlePedalSecondaryWOTVoltage = 4.24; - setHellenDefaultVrThresholds(); engineConfiguration->vrThreshold[0].pin = Gpio::D14; hellenWbo(); } diff --git a/firmware/config/boards/hellen/hellen_common.cpp b/firmware/config/boards/hellen/hellen_common.cpp index 6d111f8b9d..883e14f361 100644 --- a/firmware/config/boards/hellen/hellen_common.cpp +++ b/firmware/config/boards/hellen/hellen_common.cpp @@ -5,13 +5,6 @@ void hellenWbo() { engineConfiguration->enableAemXSeries = true; } -void setHellenDefaultVrThresholds() { - for (int i = 0;ivrThreshold[i].rpmBins, 600, 7000, 100); - setLinearCurve(engineConfiguration->vrThreshold[i].values, 0.6, 1.2, 0.1); - } -} - void setHellen144LedPins() { #ifdef EFI_COMMUNICATION_PIN engineConfiguration->communicationLedPin = EFI_COMMUNICATION_PIN; diff --git a/firmware/config/boards/hellen_meta.h b/firmware/config/boards/hellen_meta.h index ab9d0a977e..708d94d6fa 100644 --- a/firmware/config/boards/hellen_meta.h +++ b/firmware/config/boards/hellen_meta.h @@ -8,7 +8,6 @@ #pragma once void hellenWbo(); -void setHellenDefaultVrThresholds(); void setHellen144LedPins(); void setHellen176LedPins(); diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp index 95259939a9..58ed7e7f12 100644 --- a/firmware/controllers/algo/defaults/default_base_engine.cpp +++ b/firmware/controllers/algo/defaults/default_base_engine.cpp @@ -1,6 +1,7 @@ #include "pch.h" #include "defaults.h" +#include "vr_pwm.h" static void setDefaultAlternatorParameters() { engineConfiguration->alternatorOffAboveTps = 120; @@ -78,4 +79,7 @@ void setDefaultBaseEngine() { #else engineConfiguration->warningPeriod = 0; #endif /* EFI_PROD_CODE */ + + setDefaultVrThresholds(); + } diff --git a/firmware/controllers/sensors/vr_pwm.cpp b/firmware/controllers/sensors/vr_pwm.cpp index aec7b4dc0a..f3996ea12f 100644 --- a/firmware/controllers/sensors/vr_pwm.cpp +++ b/firmware/controllers/sensors/vr_pwm.cpp @@ -46,3 +46,10 @@ void initVrPwm() { ); } } + +void setDefaultVrThresholds() { + for (int i = 0;ivrThreshold[i].rpmBins, 600, 7000, 100); + setLinearCurve(engineConfiguration->vrThreshold[i].values, 0.6, 1.2, 0.1); + } +} diff --git a/firmware/controllers/sensors/vr_pwm.h b/firmware/controllers/sensors/vr_pwm.h index b77f4f8987..5ebfd5e587 100644 --- a/firmware/controllers/sensors/vr_pwm.h +++ b/firmware/controllers/sensors/vr_pwm.h @@ -2,3 +2,4 @@ void initVrPwm(); void updateVrPwm(); +void setDefaultVrThresholds();