From 059b4cd82fb858f33b5934e7fef03967ec2ad8a2 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 29 Jul 2023 00:02:05 -0400 Subject: [PATCH] https://github.com/rusefi/alphax-4chan/issues/151 --- .../boards/hellen/alphax-4chan/board_configuration.cpp | 8 ++------ firmware/config/boards/hellen/hellen_common.cpp | 6 +++--- firmware/config/boards/hellen_meta.h | 1 + 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp index 2b58a6bd6f..1f3536aa7f 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp @@ -12,7 +12,6 @@ #include "hellen_meta.h" #include "defaults.h" -static OutputPin alphaEn; static OutputPin alphaTachPullUp; static OutputPin alphaTempPullUp; static OutputPin alphaCrankPPullUp; @@ -106,9 +105,6 @@ static bool is_F_OrOlder() { } void boardInitHardware() { - alphaEn.initPin("a-EN", H144_OUT_IO3); - alphaEn.setValue(1); - alphaTachPullUp.initPin("a-tach", H144_OUT_IO1); alphaTempPullUp.initPin("a-temp", H144_OUT_IO4); alphaCrankPPullUp.initPin("a-crank-p", H144_OUT_IO2); @@ -149,12 +145,12 @@ void boardOnConfigurationChange(engine_configuration_s * /*previousConfiguration void setBoardConfigOverrides() { setupVbatt(); - // todo: do we need this conditional on boardId or not really? - setHellenMegaEnPin(); if (is_F_OrOlder()) { + setHellenEnPin(H144_OUT_IO3); setHellenSdCardSpi2(); } else { + setHellenMegaEnPin(); // rev G and newer uses hellen mega-module setHellenSdCardSpi1(); configureHellenMegaAccCS2Pin(); diff --git a/firmware/config/boards/hellen/hellen_common.cpp b/firmware/config/boards/hellen/hellen_common.cpp index 8179fcbef2..f2a92ff515 100644 --- a/firmware/config/boards/hellen/hellen_common.cpp +++ b/firmware/config/boards/hellen/hellen_common.cpp @@ -17,7 +17,7 @@ void setHellen64Can() { static OutputPin megaEn; -static void setHellenMegaEnPin(Gpio pin) { +void setHellenEnPin(Gpio pin) { static bool initialized = false; if (!initialized) { initialized = true; @@ -27,11 +27,11 @@ static void setHellenMegaEnPin(Gpio pin) { } void setHellenMegaEnPin() { - setHellenMegaEnPin(H144_GP8); // OUT_PWR_EN + setHellenEnPin(H144_GP8); // OUT_PWR_EN } void setHellen64MegaEnPin() { - setHellenMegaEnPin(H64_IO1); // OUT_PWR_EN + setHellenEnPin(H64_IO1); // OUT_PWR_EN } void hellenBoardStandBy() { diff --git a/firmware/config/boards/hellen_meta.h b/firmware/config/boards/hellen_meta.h index d0387832f6..105a028557 100644 --- a/firmware/config/boards/hellen_meta.h +++ b/firmware/config/boards/hellen_meta.h @@ -24,6 +24,7 @@ void hellenWbo(); void setHellenMegaEnPin(); +void setHellenEnPin(Gpio pin); void setHellen64MegaEnPin(); void hellenBoardStandBy(); void configureHellenMegaAccCS2Pin();