diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index a1f76501..4bee3a02 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3456,7 +3456,7 @@ void TMoverParameters::UpdatePipePressure(double dt) temp = 0.0; // odetnij else temp = 1.0; // połącz - Pipe->Flow(temp * Hamulec->GetPF(temp * PipePress, dt, Vel) + GetDVc(dt)); + Pipe->Flow( temp * Hamulec->GetPF( temp * PipePress, dt, Vel ) + GetDVc( dt ) ); if (ASBType == 128) Hamulec->ASB(int(SlippingWheels)); diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index ef433d64..8ae37298 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/McZapkie/Oerlikon_ESt.cpp @@ -435,8 +435,6 @@ void TNESt3::ForceEmptiness() Miedzypoj->CreatePress(0); CntrlRes->CreatePress(0); - BrakeStatus = 0; - ValveRes->Act(); BrakeRes->Act(); Miedzypoj->Act(); diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index 06e45445..8c76e06a 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -413,6 +413,7 @@ void TBrake::ForceEmptiness() { ValveRes->CreatePress(0); BrakeRes->CreatePress(0); + ValveRes->Act(); BrakeRes->Act(); } @@ -757,6 +758,17 @@ double TESt::GetCRP() return CntrlRes->P(); } +void TESt::ForceEmptiness() { + + ValveRes->CreatePress( 0 ); + BrakeRes->CreatePress( 0 ); + CntrlRes->CreatePress( 0 ); + + ValveRes->Act(); + BrakeRes->Act(); + CntrlRes->Act(); +} + //---EP2--- void TEStEP2::Init( double const PP, double const HPP, double const LPP, double const BP, int const BDF ) @@ -1721,6 +1733,17 @@ double TCV1::GetCRP() return CntrlRes->P(); } +void TCV1::ForceEmptiness() { + + ValveRes->CreatePress( 0 ); + BrakeRes->CreatePress( 0 ); + CntrlRes->CreatePress( 0 ); + + ValveRes->Act(); + BrakeRes->Act(); + CntrlRes->Act(); +} + //---CV1-L-TR--- void TCV1L_TR::SetLBP( double const P ) @@ -2090,6 +2113,21 @@ void TKE::SetLBP( double const P ) LBP = P; } +void TKE::ForceEmptiness() { + + ValveRes->CreatePress( 0 ); + BrakeRes->CreatePress( 0 ); + CntrlRes->CreatePress( 0 ); + ImplsRes->CreatePress( 0 ); + Brak2Res->CreatePress( 0 ); + + ValveRes->Act(); + BrakeRes->Act(); + CntrlRes->Act(); + ImplsRes->Act(); + Brak2Res->Act(); +} + //---KRANY--- double TDriverHandle::GetPF(double const i_bcp, double PP, double HP, double dt, double ep) diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index b23c6c06..805d53d3 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -260,6 +260,7 @@ class TESt : public TBrake { void CheckReleaser(double dt); //odluzniacz double CVs(double BP); //napelniacz sterujacego double BVs(double BCP); //napelniacz pomocniczego + void ForceEmptiness() /*override*/; // wymuszenie bycia pustym inline TESt(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TBrake( i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) @@ -410,6 +411,7 @@ public: void CheckState( double const BCP, double &dV1 ); double CVs( double const BP ); double BVs( double const BCP ); + void ForceEmptiness() /*override*/; // wymuszenie bycia pustym inline TCV1(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TBrake( i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) @@ -482,6 +484,7 @@ class TKE : public TBrake { //Knorr Einheitsbauart — jeden do wszystkiego void PLC( double const mass ); //wspolczynnik cisnienia przystawki wazacej void SetLP( double const TM, double const LM, double const TBP ); //parametry przystawki wazacej void SetLBP( double const P ); //cisnienie z hamulca pomocniczego + void ForceEmptiness() /*override*/; // wymuszenie bycia pustym inline TKE(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TBrake( i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa)