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

progress towards start/stop

This commit is contained in:
rusefi 2020-03-18 16:32:03 -04:00
parent 482967b8db
commit 1012df4511
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/controllers/core/fsio_impl.cpp
View File

@ -102,7 +102,7 @@ static LEElement * acRelayLogic;
static LEElement * fuelPumpLogic;
static LEElement * radiatorFanLogic;
static LEElement * alternatorLogic;
static LEElement * starterRelayLogic;
static LEElement * starterRelayDisableLogic;
#if EFI_MAIN_RELAY_CONTROL
static LEElement * mainRelayLogic;
@ -467,8 +467,8 @@ void runFsio(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
enginePins.mainRelay.setValue(true);
#endif /* EFI_MAIN_RELAY_CONTROL */
if (CONFIG(starterRelayPin) != GPIO_UNASSIGNED)
setPinState("starter_relay", &enginePins.starterRelay, starterRelayLogic PASS_ENGINE_PARAMETER_SUFFIX);
if (CONFIG(starterRelayDisablePin) != GPIO_UNASSIGNED)
setPinState("starter_relay", &enginePins.starterRelayDisable, starterRelayDisableLogic PASS_ENGINE_PARAMETER_SUFFIX);
/**
* o2 heater is off during cranking
@ -679,8 +679,8 @@ void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
if (CONFIG(mainRelayPin) != GPIO_UNASSIGNED)
mainRelayLogic = sysPool.parseExpression(MAIN_RELAY_LOGIC);
#endif /* EFI_MAIN_RELAY_CONTROL */
if (CONFIG(starterRelayPin) != GPIO_UNASSIGNED)
starterRelayLogic = sysPool.parseExpression(STARTER_RELAY_LOGIC);
if (CONFIG(starterRelayDisablePin) != GPIO_UNASSIGNED)
starterRelayDisableLogic = sysPool.parseExpression(STARTER_RELAY_LOGIC);
#if EFI_PROD_CODE
for (int i = 0; i < FSIO_COMMAND_COUNT; i++) {

6
firmware/controllers/settings.cpp
View File

@ -118,8 +118,8 @@ static void printOutputs(const engine_configuration_s *engineConfiguration) {
scheduleMsg(&logger, "mainRelay: mode %s @ %s", getPin_output_mode_e(engineConfiguration->mainRelayPinMode),
hwPortname(engineConfiguration->mainRelayPin));
scheduleMsg(&logger, "starterRelay: mode %s @ %s", getPin_output_mode_e(engineConfiguration->starterRelayPinMode),
hwPortname(engineConfiguration->starterRelayPin));
scheduleMsg(&logger, "starterRelay: mode %s @ %s", getPin_output_mode_e(engineConfiguration->starterRelayDisableMode),
hwPortname(engineConfiguration->starterRelayDisablePin));
scheduleMsg(&logger, "alternator field: mode %s @ %s",
getPin_output_mode_e(engineConfiguration->alternatorControlPinMode),
@ -680,7 +680,7 @@ static void setMainRelayPin(const char *pinName) {
}
static void setStarterRelayPin(const char *pinName) {
setIndividualPin(pinName, &engineConfiguration->starterRelayPin, "starter relay");
setIndividualPin(pinName, &engineConfiguration->starterRelayDisablePin, "starter disable relay");
}
static void setAlternatorPin(const char *pinName) {

4
firmware/controllers/system/efi_gpio.cpp
View File

@ -146,7 +146,7 @@ void EnginePins::unregisterPins() {
unregisterOutputIfPinOrModeChanged(boostPin, boostControlPin, boostControlPinMode);
unregisterOutputIfPinOrModeChanged(alternatorPin, alternatorControlPin, alternatorControlPinMode);
unregisterOutputIfPinOrModeChanged(mainRelay, mainRelayPin, mainRelayPinMode);
unregisterOutputIfPinOrModeChanged(starterRelayDisable, starterRelayDisablePin, starterRelayDisablePinMode);
unregisterOutputIfPinOrModeChanged(starterRelayDisable, starterRelayDisablePin, starterRelayDisableMode);
#endif /* EFI_PROD_CODE */
}
@ -375,7 +375,7 @@ void initOutputPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
enginePins.fuelPumpRelay.initPin("fuel pump relay", CONFIG(fuelPumpPin), &CONFIG(fuelPumpPinMode));
enginePins.mainRelay.initPin("main relay", CONFIG(mainRelayPin), &CONFIG(mainRelayPinMode));
enginePins.starterRelay.initPin("starter relay", CONFIG(starterRelayPin), &CONFIG(starterRelayPinMode));
enginePins.starterRelayDisable.initPin("starter relay", CONFIG(starterRelayDisablePin), &CONFIG(starterRelayDisableMode));
enginePins.fanRelay.initPin("fan relay", CONFIG(fanPin), &CONFIG(fanPinMode));
enginePins.o2heater.initPin("o2 heater", CONFIG(o2heaterPin));