diff --git a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp index 9bf2a6c6a5..27f3ac304f 100644 --- a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp @@ -97,8 +97,9 @@ void boardOnConfigurationChange(engine_configuration_s * /*previousConfiguration alphaCamPullDown.setValue(engineConfiguration->boardUseCamPullDown); } +#include "hellen_leds_144.cpp" + void setBoardConfigOverrides() { - setHellen144LedPins(); // todo: do we need this conditional on boardId or not really? setHellenMegaEnPin(); setupVbatt(); diff --git a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp index 2a2769a87e..cfc4afb8d8 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp @@ -140,8 +140,9 @@ void boardOnConfigurationChange(engine_configuration_s * /*previousConfiguration alphaD5PullDown.setValue(engineConfiguration->boardUseD5PullDown); } +#include "hellen_leds_144.cpp" + void setBoardConfigOverrides() { - setHellen144LedPins(); setupVbatt(); // todo: do we need this conditional on boardId or not really? setHellenMegaEnPin(); diff --git a/firmware/config/boards/hellen/alphax-8chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-8chan/board_configuration.cpp index 0ea4cae404..5ff31a21b8 100644 --- a/firmware/config/boards/hellen/alphax-8chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-8chan/board_configuration.cpp @@ -145,8 +145,9 @@ void boardOnConfigurationChange(engine_configuration_s * /*previousConfiguration //alphaD5PullDown.setValue(engineConfiguration->boardUseD5PullDown); } +#include "hellen_leds_144.cpp" + void setBoardConfigOverrides() { - setHellen144LedPins(); setupVbatt(); setHellenSdCardSpi2(); diff --git a/firmware/config/boards/hellen/harley81/board_configuration.cpp b/firmware/config/boards/hellen/harley81/board_configuration.cpp index cc763667ad..4754b84ac9 100644 --- a/firmware/config/boards/hellen/harley81/board_configuration.cpp +++ b/firmware/config/boards/hellen/harley81/board_configuration.cpp @@ -105,8 +105,9 @@ void boardInitHardware() { void boardOnConfigurationChange(engine_configuration_s * /*previousConfiguration*/) { } +#include "hellen_leds_144.cpp" + void setBoardConfigOverrides() { - setHellen144LedPins(); setupVbatt(); setHellenSdCardSpi2(); diff --git a/firmware/config/boards/hellen/hellen-gm-e67/board_configuration.cpp b/firmware/config/boards/hellen/hellen-gm-e67/board_configuration.cpp index 2285c94743..bfff19d954 100644 --- a/firmware/config/boards/hellen/hellen-gm-e67/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-gm-e67/board_configuration.cpp @@ -78,8 +78,9 @@ static void setupDefaultSensorInputs() { engineConfiguration->iat.adcChannel = H144_IN_IAT; } +#include "hellen_leds_144.cpp" + void setBoardConfigOverrides() { - setHellen144LedPins(); setupVbatt(); setHellenSdCardSpi2(); diff --git a/firmware/config/boards/hellen/hellen-honda-k/board_configuration.cpp b/firmware/config/boards/hellen/hellen-honda-k/board_configuration.cpp index dd396b971f..3e4acccf1d 100644 --- a/firmware/config/boards/hellen/hellen-honda-k/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-honda-k/board_configuration.cpp @@ -62,8 +62,9 @@ void onBoardStandBy() { hellenBoardStandBy(); } +#include "hellen_leds_144.cpp" + void setBoardConfigOverrides() { - setHellen144LedPins(); setHellenMegaEnPin(); setupVbatt(); diff --git a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp index cfeac5ffe1..b029f09ee5 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp @@ -68,8 +68,9 @@ static void setupDefaultSensorInputs() { engineConfiguration->iat.adcChannel = H144_IN_IAT; } +#include "hellen_leds_144.cpp" + void setBoardConfigOverrides() { - setHellen144LedPins(); setupVbatt(); setHellenSdCardSpi2(); diff --git a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp index 3e3d5ae890..836a9b01cc 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp @@ -74,8 +74,9 @@ static void setupDefaultSensorInputs() { engineConfiguration->iat.adcChannel = H144_IN_IAT; } +#include "hellen_leds_144.cpp" + void setBoardConfigOverrides() { - setHellen144LedPins(); setupVbatt(); setHellenSdCardSpi3(); diff --git a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp index 5c474c5a7e..3a4ab8f00a 100644 --- a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp @@ -73,8 +73,9 @@ static void setupDefaultSensorInputs() { engineConfiguration->iat.adcChannel = H144_IN_IAT; } +#include "hellen_leds_176.cpp" + void setBoardConfigOverrides() { - setHellen176LedPins(); setupVbatt(); setHellenSdCardSpi3(); diff --git a/firmware/config/boards/hellen/hellen128/board_configuration.cpp b/firmware/config/boards/hellen/hellen128/board_configuration.cpp index 449b9eb621..68f04be063 100644 --- a/firmware/config/boards/hellen/hellen128/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen128/board_configuration.cpp @@ -129,8 +129,9 @@ static void setHellen128ETBConfig() { } } +#include "hellen_leds_176.cpp" + void setBoardConfigOverrides() { - setHellen176LedPins(); setupVbatt(); setHellenSdCardSpi2(); diff --git a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp index ede3fe66cd..c101799810 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp @@ -67,10 +67,11 @@ static void setupDefaultSensorInputs() { engineConfiguration->iat.adcChannel = H144_IN_IAT; } +#include "hellen_leds_144.cpp" + static bool isFirstInvocation = true; void setBoardConfigOverrides() { - setHellen144LedPins(); setupVbatt(); setHellenSdCardSpi2(); 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 25a40128d2..e747e0d029 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp @@ -68,8 +68,9 @@ static void setupDefaultSensorInputs() { engineConfiguration->iat.adcChannel = H144_IN_IAT; } +#include "hellen_leds_176.cpp" + void setBoardConfigOverrides() { - setHellen176LedPins(); setupVbatt(); setHellenSdCardSpi2(); diff --git a/firmware/config/boards/hellen/hellen72/board_configuration.cpp b/firmware/config/boards/hellen/hellen72/board_configuration.cpp index 7715a2d34b..0c1a3800e6 100644 --- a/firmware/config/boards/hellen/hellen72/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen72/board_configuration.cpp @@ -64,8 +64,9 @@ static void setupDefaultSensorInputs() { engineConfiguration->iat.adcChannel = H144_IN_IAT; } +#include "hellen_leds_176.cpp" + void setBoardConfigOverrides() { - setHellen176LedPins(); setupVbatt(); if (engine->engineState.hellenBoardId == -1) { diff --git a/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp b/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp index 36ab0d917b..e0e0ad97e1 100644 --- a/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp @@ -69,8 +69,9 @@ static void setupDefaultSensorInputs() { engineConfiguration->iat.adcChannel = H144_IN_IAT; } +#include "hellen_leds_144.cpp" + void setBoardConfigOverrides() { - setHellen144LedPins(); setupVbatt(); // hellen88bmw uses L6205PD diff --git a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp b/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp index 3d227e2106..32d78ba58d 100644 --- a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp @@ -68,8 +68,9 @@ static void setupDefaultSensorInputs() { engineConfiguration->iat.adcChannel = H144_IN_IAT; } +#include "hellen_leds_144.cpp" + void setBoardConfigOverrides() { - setHellen144LedPins(); setupVbatt(); setHellenSdCardSpi2(); diff --git a/firmware/config/boards/hellen/hellen_common.cpp b/firmware/config/boards/hellen/hellen_common.cpp index f4cbbcf038..9503667eae 100644 --- a/firmware/config/boards/hellen/hellen_common.cpp +++ b/firmware/config/boards/hellen/hellen_common.cpp @@ -5,31 +5,11 @@ void hellenWbo() { engineConfiguration->enableAemXSeries = true; } -void setHellen144LedPins() { -#ifdef EFI_COMMUNICATION_PIN - engineConfiguration->communicationLedPin = EFI_COMMUNICATION_PIN; -#else - engineConfiguration->communicationLedPin = H144_LED3; -#endif /* EFI_COMMUNICATION_PIN */ - engineConfiguration->runningLedPin = H144_LED2; - engineConfiguration->warningLedPin = H144_LED4; -} - void setHellenCan() { engineConfiguration->canTxPin = Gpio::D1; engineConfiguration->canRxPin = Gpio::D0; } -void setHellen176LedPins() { -#ifdef EFI_COMMUNICATION_PIN - engineConfiguration->communicationLedPin = EFI_COMMUNICATION_PIN; -#else - engineConfiguration->communicationLedPin = Gpio::H10; -#endif /* EFI_COMMUNICATION_PIN */ - engineConfiguration->runningLedPin = Gpio::H9; // green - engineConfiguration->warningLedPin = Gpio::H11; // yellow -} - void setHellenMegaEnPin() { static bool initialized = false; static OutputPin megaEn; diff --git a/firmware/config/boards/hellen/hellen_leds_144.cpp b/firmware/config/boards/hellen/hellen_leds_144.cpp new file mode 100644 index 0000000000..2980fad497 --- /dev/null +++ b/firmware/config/boards/hellen/hellen_leds_144.cpp @@ -0,0 +1,11 @@ +Gpio getCommunicationLedPin() { + return H144_LED3; // blue +} + +Gpio getRunningLedPin() { + return H144_LED2; // green +} + +Gpio getWarningLedPin() { + return H144_LED4; // yellow +} diff --git a/firmware/config/boards/hellen/hellen_leds_176.cpp b/firmware/config/boards/hellen/hellen_leds_176.cpp new file mode 100644 index 0000000000..c6526c6b26 --- /dev/null +++ b/firmware/config/boards/hellen/hellen_leds_176.cpp @@ -0,0 +1,11 @@ +Gpio getCommunicationLedPin() { + return Gpio::H10; // blue +} + +Gpio getRunningLedPin() { + return Gpio::H9; // green +} + +Gpio getWarningLedPin() { + return Gpio::H11; // yellow +} diff --git a/firmware/config/boards/hellen_meta.h b/firmware/config/boards/hellen_meta.h index d52c09328b..2b73ce3600 100644 --- a/firmware/config/boards/hellen_meta.h +++ b/firmware/config/boards/hellen_meta.h @@ -23,8 +23,6 @@ void hellenWbo(); -void setHellen144LedPins(); -void setHellen176LedPins(); void setHellenMegaEnPin(); void hellenBoardStandBy(); void configureHellenMegaAccCS2Pin();