diff --git a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp index 3b68160913..fa968e9df9 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp @@ -66,10 +66,7 @@ static void setupDefaultSensorInputs() { setTPS1Inputs(H144_IN_TPS, H144_IN_AUX1); engineConfiguration->useETBforIdleControl = true; - engineConfiguration->throttlePedalUpVoltage = 0.73; - engineConfiguration->throttlePedalWOTVoltage = 4.0; - engineConfiguration->throttlePedalSecondaryUpVoltage = 0.34; - engineConfiguration->throttlePedalSecondaryWOTVoltage = 1.86; + setPPSCalibration(0.73, 4.0, 0.34, 1.86); setPPSInputs(EFI_ADC_3, EFI_ADC_14); engineConfiguration->mafAdcChannel = EFI_ADC_NONE; @@ -214,9 +211,5 @@ void setBoardDefaultConfiguration() { engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; engineConfiguration->injectionMode = IM_SIMULTANEOUS;//IM_BATCH;// IM_SEQUENTIAL; - engineConfiguration->tpsMin = 98; - engineConfiguration->tpsMax = 926; - - engineConfiguration->tps1SecondaryMin = 891; - engineConfiguration->tps1SecondaryMax = 69; + setTPS1Calibration(98, 926, 891, 69); } diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp index 5a64b4d000..4fb068bbd9 100644 --- a/firmware/controllers/algo/defaults/default_base_engine.cpp +++ b/firmware/controllers/algo/defaults/default_base_engine.cpp @@ -107,6 +107,14 @@ void setTPS1Inputs(adc_channel_e tps1, adc_channel_e tps2) { engineConfiguration->tps1_2AdcChannel = tps2; } +void setTPS1Calibration(uint16_t tpsMin, uint16_t tpsMax, uint16_t tps1SecondaryMin, uint16_t tps1SecondaryMax) { + engineConfiguration->tpsMin = tpsMin; + engineConfiguration->tpsMax = tpsMax; + + engineConfiguration->tps1SecondaryMin = tps1SecondaryMin; + engineConfiguration->tps1SecondaryMax = tps1SecondaryMax; +} + void setPPSCalibration(float primaryUp, float primaryDown, float secondaryUp, float secondaryDown) { engineConfiguration->throttlePedalUpVoltage = primaryUp; engineConfiguration->throttlePedalWOTVoltage = primaryDown; diff --git a/firmware/controllers/algo/defaults/defaults.h b/firmware/controllers/algo/defaults/defaults.h index feeba81dde..e84d11a832 100644 --- a/firmware/controllers/algo/defaults/defaults.h +++ b/firmware/controllers/algo/defaults/defaults.h @@ -7,6 +7,9 @@ void setDefaultBaseEngine(); void setDefaultFuel(); void setDefaultIgnition(); void setDefaultCranking(); + void setPPSInputs(adc_channel_e pps1, adc_channel_e pps2); -void setTPS1Inputs(adc_channel_e tps1, adc_channel_e tps2); void setPPSCalibration(float primaryUp, float primaryDown, float secondaryUp, float secondaryDown); + +void setTPS1Inputs(adc_channel_e tps1, adc_channel_e tps2); +void setTPS1Calibration(uint16_t tpsMin, uint16_t tpsMax, uint16_t tps1SecondaryMin, uint16_t tps1SecondaryMax); \ No newline at end of file