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

Emergency loop for EIM EMUs: emergency brake uses PN+EP

Browse Source
This commit is contained in:
Królik Uszasty
2018-07-08 15:53:48 +02:00
committed by tmj-fstate
parent 80909a2a9d
commit e01f05f57c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DynObj.cpp
View File

@@ -3067,6 +3067,9 @@ bool TDynamicObject::Update(double dt, double dt1)
(MoverParameters->LocalBrakeRatio() < 0.01); (MoverParameters->LocalBrakeRatio() < 0.01);
} }
auto Fzad = amax * MoverParameters->LocalBrakeRatio() * masa; auto Fzad = amax * MoverParameters->LocalBrakeRatio() * masa;
if ((MoverParameters->BrakeCtrlPos == MoverParameters->Handle->GetPos(bh_EB))
&& (MoverParameters->eimc[eimc_p_abed] < 0.001))
Fzad = amax * masa; //pętla bezpieczeństwa - pełne służbowe
if ((MoverParameters->ScndS) && if ((MoverParameters->ScndS) &&
(MoverParameters->Vel > MoverParameters->eimc[eimc_p_Vh1]) && (FmaxED > 0)) (MoverParameters->Vel > MoverParameters->eimc[eimc_p_Vh1]) && (FmaxED > 0))
{ {
@@ -3097,6 +3100,9 @@ bool TDynamicObject::Update(double dt, double dt1)
&& ( MoverParameters->BrakeOpModeFlag & bom_MED ) ) ) { && ( MoverParameters->BrakeOpModeFlag & bom_MED ) ) ) {
FzadED = std::min( Fzad, FmaxED ); FzadED = std::min( Fzad, FmaxED );
} }
if ((MoverParameters->BrakeCtrlPos == MoverParameters->Handle->GetPos(bh_EB))
&& (MoverParameters->eimc[eimc_p_abed] < 0.001))
FzadED = 0; //pętla bezpieczeństwa - bez ED
auto const FzadPN = Fzad - FrED; auto const FzadPN = Fzad - FrED;
//np = 0; //np = 0;
// BUG: likely memory leak, allocation per inner loop, deleted only once outside // BUG: likely memory leak, allocation per inner loop, deleted only once outside