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

start/stop progress

This commit is contained in:
rusefi 2020-03-31 01:06:19 -04:00
parent cd41449459
commit dc52d039e7
3 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
firmware/controllers/engine_controller.cpp
View File

@ -257,10 +257,15 @@ void onStartStopButtonToggle(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
if (engine->rpmCalculator.isStopped(PASS_ENGINE_PARAMETER_SIGNATURE)) {
engine->startStopStateLastPushTime = getTimeNowNt();
} else if (engine->rpmCalculator.isRunning(PASS_ENGINE_PARAMETER_SIGNATURE)) {
// todo: request engine stop here
}
bool wasStarterEngaged = enginePins.starterControl.getAndSet(1);
if (!wasStarterEngaged) {
scheduleMsg(&logger, "Let's crank this engine!");
}
} else if (engine->rpmCalculator.isRunning(PASS_ENGINE_PARAMETER_SIGNATURE)) {
scheduleMsg(&logger, "Let's stop this engine!");
scheduleStopEngine();
}
}
static void slowStartStopButtonCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
@ -276,16 +281,27 @@ static void slowStartStopButtonCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
#endif /* EFI_PROD_CODE */
}
if (engine->startStopStateLastPushTime == 0) {
// nothing is going on with startStop button
return;
}
// todo: should this be simply FSIO?
if (engine->rpmCalculator.isRunning(PASS_ENGINE_PARAMETER_SIGNATURE)) {
// turn starter off once engine is running
enginePins.starterControl.setValue(0);
bool wasStarterEngaged = enginePins.starterControl.getAndSet(0);
if (wasStarterEngaged) {
scheduleMsg(&logger, "Engine runs we can disengage the starter");
}
engine->startStopStateLastPushTime = 0;
}
if (engine->startStopStateLastPushTime != 0 &&
getTimeNowNt() - engine->startStopStateLastPushTime > NT_PER_SECOND * CONFIG(startCrankingDuration)) {
enginePins.starterControl.setValue(0);
if (getTimeNowNt() - engine->startStopStateLastPushTime > NT_PER_SECOND * CONFIG(startCrankingDuration)) {
bool wasStarterEngaged = enginePins.starterControl.getAndSet(0);
if (wasStarterEngaged) {
scheduleMsg(&logger, "Cranking timeout");
}
engine->startStopStateLastPushTime = 0;
}
}
@ -744,6 +760,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0)
return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20200330;
return 20200331;
}
#endif /* EFI_UNIT_TEST */

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

@ -320,8 +320,14 @@ bool OutputPin::isInitialized() {
void OutputPin::toggle() {
setValue(!getLogicValue());
}
bool OutputPin::getAndSet(int logicValue) {
bool oldValue = currentLogicValue;
setValue(logicValue);
return oldValue;
}
void OutputPin::setValue(int logicValue) {
ScopePerf perf(PE::OutputPinSetValue);

1
firmware/controllers/system/efi_gpio.h
View File

@ -45,6 +45,7 @@ public:
bool isInitialized();
bool getAndSet(int logicValue);
void setValue(int logicValue);
void toggle();
bool getLogicValue() const;