16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-23 00:29:19 +02:00

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-11-10 23:52:46 +01:00
15 changed files with 659 additions and 473 deletions

View File

@@ -3609,7 +3609,7 @@ void TMoverParameters::UpdatePipePressure(double dt)
Hamulec->PLC( MaxBrakePress[ LoadFlag ] );
else
//(Hamulec as TWest).PLC(TotalMass);
Hamulec->PLC( TotalMass );
Hamulec->PLC( TotalMass-Mred );
break;
}
@@ -3639,7 +3639,7 @@ void TMoverParameters::UpdatePipePressure(double dt)
if( MBPM < 2 )
Hamulec->PLC( MaxBrakePress[ LoadFlag ] );
else
Hamulec->PLC( TotalMass );
Hamulec->PLC( TotalMass-Mred );
break;
}
@@ -3653,7 +3653,7 @@ void TMoverParameters::UpdatePipePressure(double dt)
case TBrakeValve::EP2:
{
Hamulec->PLC( TotalMass );
Hamulec->PLC( TotalMass-Mred );
break;
}
case TBrakeValve::ESt3AL2:
@@ -3666,7 +3666,7 @@ void TMoverParameters::UpdatePipePressure(double dt)
Hamulec->PLC( MaxBrakePress[ LoadFlag ] );
else
//(Hamulec as TNESt3).PLC(TotalMass);
Hamulec->PLC( TotalMass );
Hamulec->PLC( TotalMass-Mred );
LocBrakePress = LocHandle->GetCP();
//(Hamulec as TNESt3).SetLBP(LocBrakePress);
Hamulec->SetLBP( LocBrakePress );
@@ -3682,7 +3682,7 @@ void TMoverParameters::UpdatePipePressure(double dt)
Hamulec->PLC( MaxBrakePress[ LoadFlag ] );
else
//(Hamulec as TKE).PLC(TotalMass);
Hamulec->PLC( TotalMass );
Hamulec->PLC( TotalMass-Mred );
break;
}
default: