rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code style

This commit is contained in:
rusefillc 2021-01-31 21:45:01 -05:00
parent c838539c2e
commit 73085b3914
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
firmware/hw_layer/digital_input/trigger/trigger_input.cpp
View File

@ -67,31 +67,35 @@ static int turnOnTriggerInputPin(const char *msg, int index, bool isTriggerShaft
brain_pin_e brainPin = isTriggerShaft ?
CONFIG(triggerInputPins)[index] : engineConfiguration->camInputs[index];
if (isTriggerShaft)
if (isTriggerShaft) {
shaftTriggerType[index] = TRIGGER_NONE;
else
} else {
camTriggerType[index] = TRIGGER_NONE;
}
if (!isBrainPinValid(brainPin))
if (!isBrainPinValid(brainPin)) {
return 0;
}
/* try ICU first */
#if EFI_ICU_INPUTS
if (icuTriggerTurnOnInputPin(msg, index, isTriggerShaft) >= 0) {
if (isTriggerShaft)
if (isTriggerShaft) {
shaftTriggerType[index] = TRIGGER_ICU;
else
} else {
camTriggerType[index] = TRIGGER_ICU;
}
return 0;
}
#endif
/* ... then EXTI */
if (extiTriggerTurnOnInputPin(msg, index, isTriggerShaft) >= 0) {
if (isTriggerShaft)
if (isTriggerShaft) {
shaftTriggerType[index] = TRIGGER_EXTI;
else
} else {
camTriggerType[index] = TRIGGER_EXTI;
}
return 0;
}
@ -106,20 +110,24 @@ static void turnOffTriggerInputPin(int index, bool isTriggerShaft) {
if (isTriggerShaft) {
#if EFI_ICU_INPUTS
if (shaftTriggerType[index] == TRIGGER_ICU)
if (shaftTriggerType[index] == TRIGGER_ICU) {
icuTriggerTurnOffInputPin(brainPin);
}
#endif
if (shaftTriggerType[index] == TRIGGER_EXTI)
if (shaftTriggerType[index] == TRIGGER_EXTI) {
extiTriggerTurnOffInputPin(brainPin);
}
shaftTriggerType[index] = TRIGGER_NONE;
} else {
#if EFI_ICU_INPUTS
if (camTriggerType[index] == TRIGGER_ICU)
if (camTriggerType[index] == TRIGGER_ICU) {
icuTriggerTurnOffInputPin(brainPin);
}
#endif
if (camTriggerType[index] == TRIGGER_EXTI)
if (camTriggerType[index] == TRIGGER_EXTI) {
extiTriggerTurnOffInputPin(brainPin);
}
camTriggerType[index] = TRIGGER_NONE;
}