eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 07:39:19 +02:00
Code Issues 121 Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-04-19 23:20:22 +02:00
parent c248b5bdf4 6349a13425
commit 345bf7ec6c
9 changed files with 103 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Driver.cpp
View File

@@ -2340,16 +2340,19 @@ bool TController::PrepareEngine()
else
OK = false;
OK = OK && ( mvOccupied->ActiveDir != 0 ) && ( mvControlling->ScndPipePress > 4.5 ) && ( workingtemperature );
if (OK)
{
if (eStopReason == stopSleep) // jeśli dotychczas spał
eStopReason = stopNone; // teraz nie ma powodu do stania
if( ( true == OK )
&& ( mvOccupied->ActiveDir != 0 )
&& ( true == workingtemperature )
&& ( ( mvControlling->ScndPipePress > 4.5 ) || ( mvControlling->VeselVolume == 0.0 ) ) ) {
if( eStopReason == stopSleep ) {
// jeśli dotychczas spał teraz nie ma powodu do stania
eStopReason = stopNone;
}
iEngineActive = 1;
return true;
}
else
{
else {
iEngineActive = 0;
return false;
}