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

driving aid brake state tweak

Browse Source
This commit is contained in:
tmj-fstate
2020-06-22 22:55:46 +02:00
parent 0af9e84453
commit 469c797966
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
McZapkie/MOVER.h
View File

@@ -1497,7 +1497,6 @@ public:
bool StLinSwitchOff{ false }; // state of the button forcing motor connectors open bool StLinSwitchOff{ false }; // state of the button forcing motor connectors open
bool ResistorsFlag = false; /*!o jazda rezystorowa*/ bool ResistorsFlag = false; /*!o jazda rezystorowa*/
double RventRot = 0.0; /*!s obroty wentylatorow rozruchowych*/ double RventRot = 0.0; /*!s obroty wentylatorow rozruchowych*/
bool UnBrake = false; /*w EZT - nacisniete odhamowywanie*/
double PantographVoltage{ 0.0 }; // voltage supplied to pantographs double PantographVoltage{ 0.0 }; // voltage supplied to pantographs
double PantPress = 0.0; /*Cisnienie w zbiornikach pantografow*/ 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 bool PantPressSwitchActive{ false }; // state of the pantograph pressure switch. gets primed at defined pressure level in pantograph air system

2
McZapkie/Mover.cpp
View File

@@ -3650,7 +3650,6 @@ bool TMoverParameters::IncLocalBrakeLevel(float const CtrlSpeed)
} }
else else
IBL = false; IBL = false;
UnBrake = true;
return IBL; return IBL;
} }
@@ -3669,7 +3668,6 @@ bool TMoverParameters::DecLocalBrakeLevel(float const CtrlSpeed)
} }
else else
DBL = false; DBL = false;
UnBrake = true;
return DBL; return DBL;
} }

3
driveruipanels.cpp
View File

@@ -111,7 +111,8 @@ drivingaid_panel::update() {
std::snprintf( std::snprintf(
m_buffer.data(), m_buffer.size(), m_buffer.data(), m_buffer.size(),
locale::strings[ locale::string::driver_aid_brakes ].c_str(), 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->LocalBrakePosA * LocalBrakePosNo,
( mover->SlippingWheels ? '!' : ' ' ), ( mover->SlippingWheels ? '!' : ' ' ),
expandedtext.c_str() ); expandedtext.c_str() );