From aeca0e25ee5d72fb7f22eae5c831bed9dd68914b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sat, 1 Jan 2022 20:51:11 +0100 Subject: [PATCH] =?UTF-8?q?Przygotowanie=20do=20wska=C5=BAnika=20zahamowan?= =?UTF-8?q?ia=20EP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- McZapkie/MOVER.h | 1 + McZapkie/Mover.cpp | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 1daac212..c2c2139b 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1051,6 +1051,7 @@ public: bool Battery = false; /*Czy sa zalaczone baterie*/ start_t BatteryStart = start_t::manual; bool EpFuse = true; /*Czy sa zalavzone baterie*/ + double EpForce = 0.0; /*Poziom zadanej sily EP*/ bool Signalling = false; /*Czy jest zalaczona sygnalizacja hamowania ostatniego wagonu*/ bool Radio = false; /*Czy jest zalaczony radiotelefon*/ float NominalBatteryVoltage = 0.f; /*Winger - baterie w elektrykach*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 6313505d..0f3ac21e 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4004,17 +4004,16 @@ bool TMoverParameters::UniversalBrakeButton(int button, int state) bool TMoverParameters::SwitchEPBrake(int state) { bool OK; - double temp; OK = false; if ((BrakeHandle == TBrakeHandle::St113) && (CabOccupied != 0)) { if (state > 0) - temp = Handle->GetEP(); // TODO: przetlumaczyc + EpForce = Handle->GetEP(); // TODO: przetlumaczyc else - temp = 0; - Hamulec->SetEPS(temp); - SendCtrlToNext("Brake", temp, CabActive); + EpForce = 0; + Hamulec->SetEPS(EpForce); + SendCtrlToNext("Brake", EpForce, CabActive); } // OK:=SetFlag(BrakeStatus,((2*State-1)*b_epused)); // SendCtrlToNext('Brake',(state*(2*BrakeCtrlPos-1)),CabActive); @@ -4572,25 +4571,25 @@ void TMoverParameters::UpdatePipePressure(double dt) && (DirActive != 0) && (EpFuse)) // tu powinien byc jeszcze bezpiecznik EP i baterie - // temp = (Handle as TFVel6).GetCP - temp = Handle->GetEP(); + EpForce = Handle->GetEP(); else - temp = 0.0; + EpForce = 0.0; DynamicBrakeEMUStatus = ( - temp > 0.001 ? + EpForce > 0.001 ? Power110vIsAvailable : true ); - double temp1 = temp; + double temp1 = EpForce; if ((DCEMUED_EP_max_Vel > 0.001) && (Vel > DCEMUED_EP_max_Vel) && (DynamicBrakeEMUStatus)) temp1 = 0; if ((DCEMUED_EP_min_Im > 0.001) && (abs(Im) > DCEMUED_EP_min_Im) && (DynamicBrakeEMUStatus)) temp1 = 0; Hamulec->SetEPS(temp1); - TUHEX_StageActual = temp; + TUHEX_StageActual = EpForce; TUHEX_Active = TUHEX_StageActual > 0; // Ra 2014-11: na tym siÄ™ wysypuje, ale nie wiem, w jakich warunkach - SendCtrlToNext("Brake", temp, CabActive); + SendCtrlToNext("Brake", EpForce, CabActive); } Pipe->Act();