From 469c7979667d2c1c1fe2f0d640d2e5a34dbd493a Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 22 Jun 2020 22:55:46 +0200 Subject: [PATCH] driving aid brake state tweak --- McZapkie/MOVER.h | 1 - McZapkie/Mover.cpp | 2 -- driveruipanels.cpp | 3 ++- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index cc95aa54..bd05fead 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1497,7 +1497,6 @@ public: bool StLinSwitchOff{ false }; // state of the button forcing motor connectors open bool ResistorsFlag = false; /*!o jazda rezystorowa*/ double RventRot = 0.0; /*!s obroty wentylatorow rozruchowych*/ - bool UnBrake = false; /*w EZT - nacisniete odhamowywanie*/ double PantographVoltage{ 0.0 }; // voltage supplied to pantographs double PantPress = 0.0; /*Cisnienie w zbiornikach pantografow*/ bool PantPressSwitchActive{ false }; // state of the pantograph pressure switch. gets primed at defined pressure level in pantograph air system diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index d7e973eb..6d621758 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3650,7 +3650,6 @@ bool TMoverParameters::IncLocalBrakeLevel(float const CtrlSpeed) } else IBL = false; - UnBrake = true; return IBL; } @@ -3669,7 +3668,6 @@ bool TMoverParameters::DecLocalBrakeLevel(float const CtrlSpeed) } else DBL = false; - UnBrake = true; return DBL; } diff --git a/driveruipanels.cpp b/driveruipanels.cpp index 4c8c7b37..bc2d89d2 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -111,7 +111,8 @@ drivingaid_panel::update() { std::snprintf( m_buffer.data(), m_buffer.size(), locale::strings[ locale::string::driver_aid_brakes ].c_str(), - ( mover->EIMCtrlType == 0 ? basicbraking : mover->EIMCtrlType == 3 ? ( mover->UniCtrlIntegratedBrakeCtrl ? eimicbraking : basicbraking ) : eimicbraking ), +// ( mover->EIMCtrlType == 0 ? basicbraking : mover->EIMCtrlType == 3 ? ( mover->UniCtrlIntegratedBrakeCtrl ? eimicbraking : basicbraking ) : eimicbraking ), + ( mover->UniCtrlIntegratedBrakeCtrl ? eimicbraking : basicbraking ), mover->LocalBrakePosA * LocalBrakePosNo, ( mover->SlippingWheels ? '!' : ' ' ), expandedtext.c_str() );