From b10da9ce423e9b38fa68ad800965cb609657c1ca Mon Sep 17 00:00:00 2001 From: Andreika Date: Sun, 3 Apr 2022 16:02:30 +0300 Subject: [PATCH] Alphax4ch better config (#4036) * AlphaX-4ch: better yaml * AlphaX-4ch: better config * remove main.yaml --- .../alphax-4chan/board_configuration.cpp | 28 +++++++++++++++++-- firmware/integration/rusefi_config.txt | 8 +++--- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp index dc6324b5d5..b3ef01fb04 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp @@ -19,6 +19,13 @@ static OutputPin alphaTachPullUp; static OutputPin alphaTempPullUp; static OutputPin alphaCrankPPullUp; static OutputPin alphaCrankNPullUp; +static OutputPin alpha2stepPullDown; +static OutputPin alphaCamPullDown; +static OutputPin alphaCamVrPullUp; +static OutputPin alphaD2PullDown; +static OutputPin alphaD3PullDown; +static OutputPin alphaD4PullDown; +static OutputPin alphaD5PullDown; static void setInjectorPins() { engineConfiguration->injectionPins[0] = H144_LS_1; @@ -61,9 +68,9 @@ static void setupEtb() { static void setIgnitionPins() { engineConfiguration->ignitionPins[0] = H144_IGN_1; - engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; - engineConfiguration->ignitionPins[2] = H144_IGN_2; - engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; + engineConfiguration->ignitionPins[1] = H144_IGN_2; + engineConfiguration->ignitionPins[2] = H144_IGN_3; + engineConfiguration->ignitionPins[3] = H144_IGN_4; // disable remainder for (int i = 4; i < MAX_CYLINDER_COUNT; i++) { @@ -123,6 +130,13 @@ void boardInitHardware() { alphaTempPullUp.initPin("a-temp", H144_OUT_IO4); alphaCrankPPullUp.initPin("a-crank-p", H144_OUT_IO2); alphaCrankNPullUp.initPin("a-crank-n", H144_OUT_IO5); + alpha2stepPullDown.initPin("a-2step", H144_OUT_IO7); + alphaCamPullDown.initPin("a-cam", H144_OUT_IO8); + alphaCamVrPullUp.initPin("a-cam-vr", H144_OUT_IO9); + alphaD2PullDown.initPin("a-d2", H144_LS_5); + alphaD3PullDown.initPin("a-d3", H144_LS_6); + alphaD4PullDown.initPin("a-d4", H144_LS_7); + alphaD5PullDown.initPin("a-d5", H144_LS_8); boardOnConfigurationChange(nullptr); } @@ -131,6 +145,14 @@ void boardOnConfigurationChange(engine_configuration_s * /*previousConfiguration alphaTempPullUp.setValue(engineConfiguration->boardUseTempPullUp); alphaCrankPPullUp.setValue(engineConfiguration->boardUseCrankPullUp); alphaCrankNPullUp.setValue(engineConfiguration->boardUseCrankPullUp); + alpha2stepPullDown.setValue(engineConfiguration->boardUse2stepPullDown); + alphaCamPullDown.setValue(engineConfiguration->boardUseCamPullDown); + alphaCamVrPullUp.setValue(engineConfiguration->boardUseCamVrPullUp); + + alphaD2PullDown.setValue(engineConfiguration->boardUseD2PullDown); + alphaD3PullDown.setValue(engineConfiguration->boardUseD3PullDown); + alphaD4PullDown.setValue(engineConfiguration->boardUseD4PullDown); + alphaD5PullDown.setValue(engineConfiguration->boardUseD5PullDown); } void setBoardConfigOverrides() { diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 86f8bf8d24..3bdb67332e 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1026,10 +1026,10 @@ bit launchSparkCutEnable;+This is the Cut Mode normally used bit boardUseCrankPullUp,"Hall","VR" bit boardUseCamPullDown,"With Pull Down","With Pull Up" bit boardUseCamVrPullUp,"Hall","VR" - bit unusedBitWasHere3 - bit unusedBitWasHere4 - bit unusedBitWasHere5 -bit unusedBitHere1 + bit boardUseD2PullDown,"With Pull Down","With Pull Up" + bit boardUseD3PullDown,"With Pull Down","With Pull Up" + bit boardUseD4PullDown,"With Pull Down","With Pull Up" + bit boardUseD5PullDown,"With Pull Down","With Pull Up" bit useFSIO5ForCriticalIssueEngineStop;Sometimes we just have to shut the engine down. Use carefully! bit useFSIO4ForSeriousEngineWarning;Sometimes we have to miss injection on purpose to attract driver's attention bit unusedBitHere2