default VR curve is needed not just by hellen, we have Proteus adapters with it now!

This commit is contained in:
rusefillc 2022-05-17 17:54:11 -04:00
parent 5e7fc65bd4
commit df7a6d1367
10 changed files with 12 additions and 13 deletions

View File

@ -160,7 +160,6 @@ void setBoardDefaultConfiguration() {
engineConfiguration->clutchDownPinMode = PI_PULLDOWN; engineConfiguration->clutchDownPinMode = PI_PULLDOWN;
engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH; engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH;
// ? engineConfiguration->malfunctionIndicatorPin = Gpio::G4; //1E - Check Engine Light // ? engineConfiguration->malfunctionIndicatorPin = Gpio::G4; //1E - Check Engine Light
setHellenDefaultVrThresholds();
engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6; engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6;
} }

View File

@ -204,7 +204,6 @@ void setBoardDefaultConfiguration() {
engineConfiguration->clutchDownPinMode = PI_PULLDOWN; engineConfiguration->clutchDownPinMode = PI_PULLDOWN;
engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH; engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH;
// ? engineConfiguration->malfunctionIndicatorPin = Gpio::G4; //1E - Check Engine Light // ? engineConfiguration->malfunctionIndicatorPin = Gpio::G4; //1E - Check Engine Light
setHellenDefaultVrThresholds();
engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6; engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6;
engineConfiguration->vrThreshold[1].pin = H144_OUT_PWM4; engineConfiguration->vrThreshold[1].pin = H144_OUT_PWM4;
} }

View File

@ -187,7 +187,6 @@ void setBoardDefaultConfiguration() {
engineConfiguration->clutchDownPinMode = PI_PULLDOWN; engineConfiguration->clutchDownPinMode = PI_PULLDOWN;
engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH; engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH;
// ? engineConfiguration->malfunctionIndicatorPin = Gpio::G4; //1E - Check Engine Light // ? engineConfiguration->malfunctionIndicatorPin = Gpio::G4; //1E - Check Engine Light
setHellenDefaultVrThresholds();
engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6; engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6;
} }

View File

@ -170,7 +170,6 @@ void setBoardDefaultConfiguration() {
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
engineConfiguration->injectionMode = IM_SIMULTANEOUS;//IM_BATCH;// IM_SEQUENTIAL; engineConfiguration->injectionMode = IM_SIMULTANEOUS;//IM_BATCH;// IM_SEQUENTIAL;
setHellenDefaultVrThresholds();
engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6; engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6;
hellenWbo(); hellenWbo();
} }

View File

@ -220,7 +220,6 @@ void setBoardDefaultConfiguration() {
engineConfiguration->throttlePedalSecondaryUpVoltage = 1.34; engineConfiguration->throttlePedalSecondaryUpVoltage = 1.34;
engineConfiguration->throttlePedalSecondaryWOTVoltage = 4.24; engineConfiguration->throttlePedalSecondaryWOTVoltage = 4.24;
setHellenDefaultVrThresholds();
engineConfiguration->vrThreshold[0].pin = Gpio::D14; engineConfiguration->vrThreshold[0].pin = Gpio::D14;
hellenWbo(); hellenWbo();
} }

View File

@ -5,13 +5,6 @@ void hellenWbo() {
engineConfiguration->enableAemXSeries = true; engineConfiguration->enableAemXSeries = true;
} }
void setHellenDefaultVrThresholds() {
for (int i = 0;i<VR_THRESHOLD_COUNT;i++) {
setLinearCurve(engineConfiguration->vrThreshold[i].rpmBins, 600, 7000, 100);
setLinearCurve(engineConfiguration->vrThreshold[i].values, 0.6, 1.2, 0.1);
}
}
void setHellen144LedPins() { void setHellen144LedPins() {
#ifdef EFI_COMMUNICATION_PIN #ifdef EFI_COMMUNICATION_PIN
engineConfiguration->communicationLedPin = EFI_COMMUNICATION_PIN; engineConfiguration->communicationLedPin = EFI_COMMUNICATION_PIN;

View File

@ -8,7 +8,6 @@
#pragma once #pragma once
void hellenWbo(); void hellenWbo();
void setHellenDefaultVrThresholds();
void setHellen144LedPins(); void setHellen144LedPins();
void setHellen176LedPins(); void setHellen176LedPins();

View File

@ -1,6 +1,7 @@
#include "pch.h" #include "pch.h"
#include "defaults.h" #include "defaults.h"
#include "vr_pwm.h"
static void setDefaultAlternatorParameters() { static void setDefaultAlternatorParameters() {
engineConfiguration->alternatorOffAboveTps = 120; engineConfiguration->alternatorOffAboveTps = 120;
@ -78,4 +79,7 @@ void setDefaultBaseEngine() {
#else #else
engineConfiguration->warningPeriod = 0; engineConfiguration->warningPeriod = 0;
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
setDefaultVrThresholds();
} }

View File

@ -46,3 +46,10 @@ void initVrPwm() {
); );
} }
} }
void setDefaultVrThresholds() {
for (int i = 0;i<VR_THRESHOLD_COUNT;i++) {
setLinearCurve(engineConfiguration->vrThreshold[i].rpmBins, 600, 7000, 100);
setLinearCurve(engineConfiguration->vrThreshold[i].values, 0.6, 1.2, 0.1);
}
}

View File

@ -2,3 +2,4 @@
void initVrPwm(); void initVrPwm();
void updateVrPwm(); void updateVrPwm();
void setDefaultVrThresholds();