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

control pressure switch, ground relay state exposed to uart interface, independent brake ai logic tweaks

Browse Source
This commit is contained in:
tmj-fstate
2020-04-21 16:04:22 +02:00
parent f2c1a4dc96
commit f7d2b8bb7f
11 changed files with 104 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DynObj.cpp
View File

@@ -3079,9 +3079,10 @@ bool TDynamicObject::Update(double dt, double dt1)
MEDLogTime = 0;
}
auto FzadED { 0.0 };
if( ( MoverParameters->EpFuse && (MoverParameters->BrakeHandle != TBrakeHandle::MHZ_EN57))
|| ( ( MoverParameters->BrakeHandle == TBrakeHandle::MHZ_EN57 )
&& ( MoverParameters->BrakeOpModeFlag & bom_MED ) ) ) {
if( ( LBR > MoverParameters->MED_MinBrakeReqED )
&& ( MoverParameters->BrakeHandle == TBrakeHandle::MHZ_EN57 ?
( ( MoverParameters->BrakeOpModeFlag & bom_MED ) != 0 ) :
MoverParameters->EpFuse ) ) {
FzadED = std::min( Fzad, FmaxED );
}
if (MoverParameters->EIMCtrlType == 2 && MoverParameters->MainCtrlPos < 2 && MoverParameters->eimic > -0.999)