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

output channels: isFuelPumpOn vs isPumpOn, remove second one (#4490)

This commit is contained in:
Andrey G 2022-08-27 21:28:33 +03:00 committed by GitHub
parent b2e8341ac5
commit 9997bf95e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/output_channels.txt
View File

@ -14,7 +14,7 @@ bit isIgnitionEnabledIndicator;
bit isInjectionEnabledIndicator;
bit sd_logging_internal
bit unusedb4;
bit isFuelPumpOn;
bit unusedb5;
bit isFanOn;radiator fan
bit isO2HeaterOn;
bit checkEngine;

1
firmware/console/status_loop.cpp
View File

@ -685,7 +685,6 @@ static void updateFlags() {
#endif // EFI_USB_SERIAL
engine->outputChannels.isMainRelayOn = enginePins.mainRelay.getLogicValue();
engine->outputChannels.isFuelPumpOn = enginePins.fuelPumpRelay.getLogicValue();
engine->outputChannels.isFanOn = enginePins.fanRelay.getLogicValue();
engine->outputChannels.isFan2On = enginePins.fanRelay2.getLogicValue();
engine->outputChannels.isO2HeaterOn = enginePins.o2heater.getLogicValue();

8
firmware/controllers/actuators/fuel_pump.cpp
View File

@ -16,13 +16,9 @@ void FuelPumpController::onSlowCallback() {
// If there was a trigger event recently, turn on the pump, the engine is running!
engineTurnedRecently = engine->triggerCentral.engineMovedRecently();
isPumpOn = isPrime || engineTurnedRecently;
isFuelPumpOn = isPrime || engineTurnedRecently;
enginePins.fuelPumpRelay.setValue(isPumpOn);
#if EFI_TUNER_STUDIO
engine->outputChannels.isFuelPumpOn = isPumpOn;
#endif
enginePins.fuelPumpRelay.setValue(isFuelPumpOn);
}
void FuelPumpController::onIgnitionStateChanged(bool ignitionOnParam) {

2
firmware/controllers/actuators/fuel_pump_control.txt
View File

@ -1,6 +1,6 @@
struct_no_prefix fuel_pump_control_s
bit isPrime
bit engineTurnedRecently
bit isPumpOn
bit isFuelPumpOn
bit ignitionOn
end_struct

1
firmware/tunerstudio/rusefi.input
View File

@ -1368,7 +1368,6 @@ gaugeCategory = Outputs
indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black
indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black
indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black
indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black
indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black
; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error