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

build 200908. minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2020-09-08 22:50:38 +02:00
parent 5247e6c224
commit 1ac0e8a16a
5 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
McZapkie/Mover.cpp
View File

@@ -5969,16 +5969,17 @@ double TMoverParameters::TractionForce( double dt ) {
SpeedCtrlUnit.IsActive = ( SpeedCtrlValue > 0 );
}
double edBCP = Hamulec->GetEDBCP();
auto const localbrakeactive { ( CabOccupied != 0 ) && ( LocHandle->GetCP() > 0.25 ) };
if( ( false == Doors.instances[ side::left ].is_closed )
|| ( false == Doors.instances[ side::right ].is_closed )
|| ( Doors.permit_needed && ( Doors.instances[ side::left ].open_permit || Doors.instances[ side::right ].open_permit ) ) ) {
DynamicBrakeFlag = true;
}
else if (((edBCP < 0.25) && (LocHandle->GetCP() < 0.25) && (AnPos < 0.01)) ||
((edBCP < 0.25) && (ShuntModeAllow) && (LocalBrakePosA < 0.01)))
else if (((edBCP < 0.25) && (false == localbrakeactive) && (AnPos < 0.01))
|| ((edBCP < 0.25) && (ShuntModeAllow) && (LocalBrakePosA < 0.01)))
DynamicBrakeFlag = false;
else if ((((BrakePress > 0.25) && (edBCP > 0.25) || (LocHandle->GetCP() > 0.25))) ||
(AnPos > 0.02))
else if ((((BrakePress > 0.25) && (edBCP > 0.25) || localbrakeactive))
|| (AnPos > 0.02))
DynamicBrakeFlag = true;
edBCP = Hamulec->GetEDBCP() * eimc[eimc_p_abed]; // stala napedu
if ((DynamicBrakeFlag))