diff --git a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp index 186e67279c..b62332b4d6 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp @@ -15,10 +15,6 @@ #include "custom_engine.h" #include "hellen_meta.h" -static void hellenWbo() { - engineConfiguration->enableAemXSeries = true; -} - static void setInjectorPins() { engineConfiguration->injectionPins[0] = H144_LS_1; engineConfiguration->injectionPins[1] = H144_LS_2; diff --git a/firmware/config/boards/hellen/hellen121vag/board.mk b/firmware/config/boards/hellen/hellen121vag/board.mk index 3b27ed5826..5f0438d62e 100644 --- a/firmware/config/boards/hellen/hellen121vag/board.mk +++ b/firmware/config/boards/hellen/hellen121vag/board.mk @@ -1,7 +1,8 @@ # Combine the related files for a specific platform and MCU. # Target ECU board design -BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen121vag/board_configuration.cpp +BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen121vag/board_configuration.cpp \ + $(BOARDS_DIR)/hellen/hellen_common.cpp BOARDINC = $(BOARDS_DIR)/hellen/hellen121vag # Set this if you want a default engine type other than normal hellen121vag diff --git a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp index 3bfe4c0abf..129a6cbc86 100644 --- a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp @@ -16,10 +16,6 @@ #include "electronic_throttle_impl.h" #include "hellen_meta.h" -static void hellenWbo() { - engineConfiguration->enableAemXSeries = true; -} - static void setInjectorPins() { engineConfiguration->injectionPins[0] = GPIOG_7; // 96 - INJ_1 engineConfiguration->injectionPins[1] = GPIOG_8; diff --git a/firmware/config/boards/hellen/hellen128/board.mk b/firmware/config/boards/hellen/hellen128/board.mk index b180f2f582..00a304fd13 100644 --- a/firmware/config/boards/hellen/hellen128/board.mk +++ b/firmware/config/boards/hellen/hellen128/board.mk @@ -1,7 +1,9 @@ # Combine the related files for a specific platform and MCU. # Target ECU board design -BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen128/board_configuration.cpp +BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen128/board_configuration.cpp \ + $(BOARDS_DIR)/hellen/hellen_common.cpp + BOARDINC = $(BOARDS_DIR)/hellen/hellen128 # Set this if you want a default engine type other than normal hellen128 diff --git a/firmware/config/boards/hellen/hellen128/board_configuration.cpp b/firmware/config/boards/hellen/hellen128/board_configuration.cpp index 5daa968c8e..fb4771a658 100644 --- a/firmware/config/boards/hellen/hellen128/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen128/board_configuration.cpp @@ -15,10 +15,6 @@ #include "custom_engine.h" #include "hellen_meta.h" -static void hellenWbo() { - engineConfiguration->enableAemXSeries = true; -} - static void setInjectorPins() { engineConfiguration->injectionPins[0] = H176_LS_1; engineConfiguration->injectionPins[1] = H176_LS_2; @@ -182,7 +178,7 @@ void setBoardDefaultConfiguration(void) { engineConfiguration->throttlePedalSecondaryUpVoltage = 1.34; engineConfiguration->throttlePedalSecondaryWOTVoltage = 4.24; - + setHellenDefaultVrThresholds(); hellenWbo(); } diff --git a/firmware/config/boards/hellen/hellen72/board.mk b/firmware/config/boards/hellen/hellen72/board.mk index d83e197a94..b5a120f55a 100644 --- a/firmware/config/boards/hellen/hellen72/board.mk +++ b/firmware/config/boards/hellen/hellen72/board.mk @@ -1,7 +1,9 @@ # Combine the related files for a specific platform and MCU. # Target ECU board design -BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen72/board_configuration.cpp +BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen72/board_configuration.cpp \ + $(BOARDS_DIR)/hellen/hellen_common.cpp + BOARDINC = $(BOARDS_DIR)/hellen/hellen72 # Set this if you want a default engine type other than normal Hellen72 diff --git a/firmware/config/boards/hellen/hellen72/board_configuration.cpp b/firmware/config/boards/hellen/hellen72/board_configuration.cpp index 5005d56746..9efa88afae 100644 --- a/firmware/config/boards/hellen/hellen72/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen72/board_configuration.cpp @@ -14,10 +14,6 @@ #include "fsio_impl.h" #include "custom_engine.h" -static void hellenWbo() { - engineConfiguration->enableAemXSeries = true; -} - static void setInjectorPins() { engineConfiguration->injectionPins[0] = GPIOG_7; engineConfiguration->injectionPins[1] = GPIOG_8; diff --git a/firmware/config/boards/hellen/hellen88bmw/board.mk b/firmware/config/boards/hellen/hellen88bmw/board.mk index 59f73ce517..5f3ec6c091 100644 --- a/firmware/config/boards/hellen/hellen88bmw/board.mk +++ b/firmware/config/boards/hellen/hellen88bmw/board.mk @@ -1,7 +1,8 @@ # Combine the related files for a specific platform and MCU. # Target ECU board design -BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen88bmw/board_configuration.cpp +BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen88bmw/board_configuration.cpp \ + $(BOARDS_DIR)/hellen/hellen_common.cpp BOARDINC = $(BOARDS_DIR)/hellen/hellen88bmw # Set this if you want a default engine type other than normal hellen88bmw diff --git a/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp b/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp index 206bbe76ab..79bacae0dc 100644 --- a/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp @@ -15,10 +15,6 @@ #include "custom_engine.h" #include "hellen_meta.h" -static void hellenWbo() { - engineConfiguration->enableAemXSeries = true; -} - static void setInjectorPins() { engineConfiguration->injectionPins[0] = H144_LS_1; engineConfiguration->injectionPins[1] = H144_LS_2; diff --git a/firmware/config/boards/hellen/hellen_common.cpp b/firmware/config/boards/hellen/hellen_common.cpp new file mode 100644 index 0000000000..a9d85f6083 --- /dev/null +++ b/firmware/config/boards/hellen/hellen_common.cpp @@ -0,0 +1,12 @@ +#include "pch.h" + +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); + } +} diff --git a/firmware/config/boards/hellen_meta.h b/firmware/config/boards/hellen_meta.h index 585d4b5619..252a177106 100644 --- a/firmware/config/boards/hellen_meta.h +++ b/firmware/config/boards/hellen_meta.h @@ -7,6 +7,9 @@ #pragma once +void hellenWbo(); +void setHellenDefaultVrThresholds(); + #define H144_LS_1 GPIOG_7 #define H144_LS_2 GPIOG_8 #define H144_LS_3 GPIOD_11 diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index e844eef342..7ede8b62ce 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -720,19 +720,6 @@ void setBoschHDEV_5_injectors() { engineConfiguration->mc33_hpfp_max_hold = 10; // this value in ms not us } -/** - * set engine_type 108 - */ -void setVrThresholdTest() { - engineConfiguration->trigger.type = TT_HONDA_1_24; - - setHellenDefaultVrThresholds(); - engineConfiguration->vrThreshold[0].pin = GPIOB_4; - - engineConfiguration->triggerInputPins[0] = GPIOA_5; - engineConfiguration->triggerInputPins[1] = GPIOC_6; -} - /** * set engine_type 107 */ @@ -802,19 +789,6 @@ void setTest33816EngineConfiguration() { setBoschHDEV_5_injectors(); } -void setHellen72etb() { - engineConfiguration->etbIo[0].directionPin1 = GPIOC_6; - engineConfiguration->etbIo[0].directionPin2 = GPIOC_7; - engineConfiguration->etb_use_two_wires = true; -} - -void setHellenDefaultVrThresholds() { - for (int i = 0;ivrThreshold[i].rpmBins, 600, 7000, 100); - setLinearCurve(engineConfiguration->vrThreshold[i].values, 0.6, 1.2, 0.1); - } -} - /** * set engine_type 6 */ diff --git a/firmware/config/engines/custom_engine.h b/firmware/config/engines/custom_engine.h index f4ee989319..98bc3cd33f 100644 --- a/firmware/config/engines/custom_engine.h +++ b/firmware/config/engines/custom_engine.h @@ -8,7 +8,6 @@ #pragma once #include "engine_configuration.h" -void setHellenDefaultVrThresholds(); void setFrankensoConfiguration(); void setFrankenso_01_LCD(engine_configuration_s *engineConfiguration); void disableLCD(engine_configuration_s *engineConfiguration); diff --git a/firmware/config/engines/mercedes.cpp b/firmware/config/engines/mercedes.cpp index 2d1a5ec4ec..74d4371ca7 100644 --- a/firmware/config/engines/mercedes.cpp +++ b/firmware/config/engines/mercedes.cpp @@ -12,7 +12,6 @@ #endif // HW_HELLEN static void common() { - setHellenDefaultVrThresholds(); engineConfiguration->vrThreshold[0].pin = GPIOD_14; } diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 4fce8b2145..b77ac5f07d 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -847,8 +847,8 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e */ switch (engineType) { case UNUSED60: -// todo: is it time to replace MICRO_RUS_EFI, PROTEUS, PROMETHEUS_DEFAULTS with MINIMAL_PINS? maybe rename MINIMAL_PINS to DEFAULT? case UNUSED61: + case HELLEN72_ETB: case UNUSED100: case MINIMAL_PINS: // all basic settings are already set in prepareVoidConfiguration(), no need to set anything here @@ -968,9 +968,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case HELLEN_NA8_96: setHellenNB1(); break; - case HELLEN72_ETB: - setHellen72etb(); - break; case HELLEN_121_NISSAN_4_CYL: setHellen121nissanQR(); break; @@ -1118,8 +1115,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e setTest33816EngineConfiguration(); break; case TEST_108: - setVrThresholdTest(); - break; case TEST_109: case TEST_110: case TEST_ROTARY: