Alphax4ch better config (#4036)

* AlphaX-4ch: better yaml

* AlphaX-4ch: better config

* remove main.yaml
This commit is contained in:
Andreika 2022-04-03 16:02:30 +03:00 committed by GitHub
parent 289122c0b7
commit 21a12eb9d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 7 deletions

View File

@ -19,6 +19,13 @@ static OutputPin alphaTachPullUp;
static OutputPin alphaTempPullUp; static OutputPin alphaTempPullUp;
static OutputPin alphaCrankPPullUp; static OutputPin alphaCrankPPullUp;
static OutputPin alphaCrankNPullUp; 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() { static void setInjectorPins() {
engineConfiguration->injectionPins[0] = H144_LS_1; engineConfiguration->injectionPins[0] = H144_LS_1;
@ -61,9 +68,9 @@ static void setupEtb() {
static void setIgnitionPins() { static void setIgnitionPins() {
engineConfiguration->ignitionPins[0] = H144_IGN_1; engineConfiguration->ignitionPins[0] = H144_IGN_1;
engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; engineConfiguration->ignitionPins[1] = H144_IGN_2;
engineConfiguration->ignitionPins[2] = H144_IGN_2; engineConfiguration->ignitionPins[2] = H144_IGN_3;
engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; engineConfiguration->ignitionPins[3] = H144_IGN_4;
// disable remainder // disable remainder
for (int i = 4; i < MAX_CYLINDER_COUNT; i++) { for (int i = 4; i < MAX_CYLINDER_COUNT; i++) {
@ -123,6 +130,13 @@ void boardInitHardware() {
alphaTempPullUp.initPin("a-temp", H144_OUT_IO4); alphaTempPullUp.initPin("a-temp", H144_OUT_IO4);
alphaCrankPPullUp.initPin("a-crank-p", H144_OUT_IO2); alphaCrankPPullUp.initPin("a-crank-p", H144_OUT_IO2);
alphaCrankNPullUp.initPin("a-crank-n", H144_OUT_IO5); 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); boardOnConfigurationChange(nullptr);
} }
@ -131,6 +145,14 @@ void boardOnConfigurationChange(engine_configuration_s * /*previousConfiguration
alphaTempPullUp.setValue(engineConfiguration->boardUseTempPullUp); alphaTempPullUp.setValue(engineConfiguration->boardUseTempPullUp);
alphaCrankPPullUp.setValue(engineConfiguration->boardUseCrankPullUp); alphaCrankPPullUp.setValue(engineConfiguration->boardUseCrankPullUp);
alphaCrankNPullUp.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() { void setBoardConfigOverrides() {

View File

@ -1026,10 +1026,10 @@ bit launchSparkCutEnable;+This is the Cut Mode normally used
bit boardUseCrankPullUp,"Hall","VR" bit boardUseCrankPullUp,"Hall","VR"
bit boardUseCamPullDown,"With Pull Down","With Pull Up" bit boardUseCamPullDown,"With Pull Down","With Pull Up"
bit boardUseCamVrPullUp,"Hall","VR" bit boardUseCamVrPullUp,"Hall","VR"
bit unusedBitWasHere3 bit boardUseD2PullDown,"With Pull Down","With Pull Up"
bit unusedBitWasHere4 bit boardUseD3PullDown,"With Pull Down","With Pull Up"
bit unusedBitWasHere5 bit boardUseD4PullDown,"With Pull Down","With Pull Up"
bit unusedBitHere1 bit boardUseD5PullDown,"With Pull Down","With Pull Up"
bit useFSIO5ForCriticalIssueEngineStop;Sometimes we just have to shut the engine down. Use carefully! 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 useFSIO4ForSeriousEngineWarning;Sometimes we have to miss injection on purpose to attract driver's attention
bit unusedBitHere2 bit unusedBitHere2