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

Small fix for parking brake

Browse Source
This commit is contained in:
Królik Uszasty
2020-10-18 17:18:16 +02:00
committed by tmj-fstate
parent b0d46b9ddc
commit 3d5bc7ab05
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DynObj.cpp
View File

@@ -3157,7 +3157,7 @@ bool TDynamicObject::Update(double dt, double dt1)
&& ( MoverParameters->Doors.instances[ side::left ].open_permit && ( MoverParameters->Doors.instances[ side::left ].open_permit
|| MoverParameters->Doors.instances[ side::right ].open_permit ) ) }; || MoverParameters->Doors.instances[ side::right ].open_permit ) ) };
if ((MoverParameters->Vel < 0.5) && (MoverParameters->BrakePress > 0.2 || doorisopen)) if ((MoverParameters->Vel < 0.5) && (eimic < 0 || doorisopen || MoverParameters->Hamulec->GetEDBCP()))
{ {
MoverParameters->ShuntMode = true; MoverParameters->ShuntMode = true;
} }
@@ -3182,8 +3182,8 @@ bool TDynamicObject::Update(double dt, double dt1)
{ {
Fzad = std::min(LBR * FmaxED, FfulED); Fzad = std::min(LBR * FmaxED, FfulED);
} }
if (((MoverParameters->ShuntMode) && (Frj < 0.0015 * masa)) || if (((MoverParameters->ShuntMode) && (eimic <= 0)) /*||
(MoverParameters->V * MoverParameters->DirAbsolute < -0.2)) (MoverParameters->V * MoverParameters->DirAbsolute < -0.2)*/)
{ {
auto const sbd { ( ( MoverParameters->SpringBrake.IsActive && MoverParameters->ReleaseParkingBySpringBrake ) ? 0.0 : MoverParameters->StopBrakeDecc ) }; auto const sbd { ( ( MoverParameters->SpringBrake.IsActive && MoverParameters->ReleaseParkingBySpringBrake ) ? 0.0 : MoverParameters->StopBrakeDecc ) };
Fzad = std::max( Fzad, sbd * masa ); Fzad = std::max( Fzad, sbd * masa );