From 33c5983da2a6c69faf72bfeacb58d48a5f68414d Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 29 Oct 2022 23:46:54 -0400 Subject: [PATCH] refactoring: helper method --- .../boards/hellen/alphax-2chan/board_configuration.cpp | 1 - .../boards/hellen/alphax-4chan/board_configuration.cpp | 5 ++--- .../config/boards/hellen/harley81/board_configuration.cpp | 1 - .../config/boards/hellen/hellen-nb1/board_configuration.cpp | 1 - .../boards/hellen/hellen121nissan/board_configuration.cpp | 5 ++--- .../config/boards/hellen/hellen128/board_configuration.cpp | 5 ++--- .../hellen/hellen64_miataNA6_94/board_configuration.cpp | 1 - .../config/boards/hellen/hellen72/board_configuration.cpp | 1 - .../config/boards/hellen/hellen88bmw/board_configuration.cpp | 5 ++--- .../boards/hellen/hellenNA8_96/board_configuration.cpp | 1 - firmware/config/engines/mercedes.cpp | 1 - firmware/config/engines/vw_b6.cpp | 1 - 12 files changed, 8 insertions(+), 20 deletions(-) diff --git a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp index ef54657578..d182e93f83 100644 --- a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp @@ -11,7 +11,6 @@ */ #include "pch.h" -#include "custom_engine.h" #include "hellen_meta.h" static OutputPin alphaEn; diff --git a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp index c1ffec03cf..d9cb6b5f51 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp @@ -11,8 +11,8 @@ */ #include "pch.h" -#include "custom_engine.h" #include "hellen_meta.h" +#include "defaults.h" static OutputPin alphaEn; static OutputPin alphaTachPullUp; @@ -103,8 +103,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->tps1_2AdcChannel = H144_IN_AUX1; engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE; - engineConfiguration->throttlePedalPositionAdcChannel = H144_IN_PPS; - engineConfiguration->throttlePedalPositionSecondAdcChannel = H144_IN_AUX2; + setPPSInputs(H144_IN_PPS, H144_IN_AUX2); // random values to have valid config engineConfiguration->tps1SecondaryMin = 1000; diff --git a/firmware/config/boards/hellen/harley81/board_configuration.cpp b/firmware/config/boards/hellen/harley81/board_configuration.cpp index f1616efbba..f646366d2a 100644 --- a/firmware/config/boards/hellen/harley81/board_configuration.cpp +++ b/firmware/config/boards/hellen/harley81/board_configuration.cpp @@ -11,7 +11,6 @@ */ #include "pch.h" -#include "custom_engine.h" #include "hellen_meta.h" #include "defaults.h" diff --git a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp index 3b964e5a38..78997df458 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp @@ -11,7 +11,6 @@ */ #include "pch.h" -#include "custom_engine.h" #include "hellen_meta.h" static void setInjectorPins() { diff --git a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp index bd5f3362f8..03a4b78c68 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp @@ -12,7 +12,7 @@ */ #include "pch.h" -#include "custom_engine.h" +#include "defaults.h" #include "hellen_meta.h" static void setInjectorPins() { @@ -74,8 +74,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->tps1_1AdcChannel = H144_IN_TPS; engineConfiguration->tps1_2AdcChannel = H144_IN_AUX1; - engineConfiguration->throttlePedalPositionAdcChannel = H144_IN_PPS; - engineConfiguration->throttlePedalPositionSecondAdcChannel = EFI_ADC_14; + setPPSInputs(H144_IN_PPS, EFI_ADC_14); engineConfiguration->mafAdcChannel = EFI_ADC_10; engineConfiguration->map.sensor.hwChannel = H144_IN_MAP2; diff --git a/firmware/config/boards/hellen/hellen128/board_configuration.cpp b/firmware/config/boards/hellen/hellen128/board_configuration.cpp index 34f81bdb62..e797e519ba 100644 --- a/firmware/config/boards/hellen/hellen128/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen128/board_configuration.cpp @@ -12,9 +12,9 @@ */ #include "pch.h" -#include "custom_engine.h" #include "hellen_meta.h" #include "i2c_bb.h" +#include "defaults.h" static void setInjectorPins() { engineConfiguration->injectionPins[0] = H176_LS_1; @@ -205,8 +205,7 @@ void setBoardDefaultConfiguration() { * md_sanci latest tune * https://rusefi.com/online/view.php?msq=630 */ - engineConfiguration->throttlePedalPositionAdcChannel = H144_IN_PPS; - engineConfiguration->throttlePedalPositionSecondAdcChannel = EFI_ADC_14; + setPPSInputs(H144_IN_PPS, EFI_ADC_14); engineConfiguration->throttlePedalUpVoltage = 1.49; engineConfiguration->throttlePedalWOTVoltage = 4.72; engineConfiguration->throttlePedalSecondaryUpVoltage = 1.34; diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp b/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp index 0586a1b427..06b6df6345 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp @@ -11,7 +11,6 @@ */ #include "pch.h" -#include "custom_engine.h" #include "hellen_meta.h" static void setInjectorPins() { diff --git a/firmware/config/boards/hellen/hellen72/board_configuration.cpp b/firmware/config/boards/hellen/hellen72/board_configuration.cpp index 90778c77bd..e8534bb200 100644 --- a/firmware/config/boards/hellen/hellen72/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen72/board_configuration.cpp @@ -11,7 +11,6 @@ */ #include "pch.h" -#include "custom_engine.h" #include "hellen_meta.h" static void setInjectorPins() { diff --git a/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp b/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp index 954f6b3515..01418a224a 100644 --- a/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp @@ -11,8 +11,8 @@ */ #include "pch.h" -#include "custom_engine.h" #include "hellen_meta.h" +#include "defaults.h" static void setInjectorPins() { engineConfiguration->injectionPins[0] = H144_LS_1; @@ -70,8 +70,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->tps1_1AdcChannel = H144_IN_TPS; engineConfiguration->tps1_2AdcChannel = H144_IN_AUX1; - engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_3; - engineConfiguration->throttlePedalPositionSecondAdcChannel = EFI_ADC_14; + setPPSInputs(EFI_ADC_3, EFI_ADC_14); engineConfiguration->mafAdcChannel = EFI_ADC_10; engineConfiguration->map.sensor.hwChannel = EFI_ADC_11; diff --git a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp b/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp index 8105247e82..ee1e32858c 100644 --- a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp @@ -11,7 +11,6 @@ */ #include "pch.h" -#include "custom_engine.h" #include "hellen_meta.h" static void setInjectorPins() { diff --git a/firmware/config/engines/mercedes.cpp b/firmware/config/engines/mercedes.cpp index 7b32c84dcb..9b6ebc9edb 100644 --- a/firmware/config/engines/mercedes.cpp +++ b/firmware/config/engines/mercedes.cpp @@ -6,7 +6,6 @@ */ #include "pch.h" -#include "custom_engine.h" #if HW_HELLEN #include "hellen_meta.h" #endif // HW_HELLEN diff --git a/firmware/config/engines/vw_b6.cpp b/firmware/config/engines/vw_b6.cpp index cf847e4fdd..660d0f33a9 100644 --- a/firmware/config/engines/vw_b6.cpp +++ b/firmware/config/engines/vw_b6.cpp @@ -8,7 +8,6 @@ #include "pch.h" #include "vw_b6.h" -#include "custom_engine.h" #include "table_helper.h" #include "electronic_throttle_impl.h" #include "mre_meta.h"