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

Add HideDirStatusSpeed parameter

Browse Source
This commit is contained in:
Hirek
2024-12-28 00:22:15 +01:00
parent 0522d12cd3
commit efeaaf6235
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
McZapkie/MOVER.h
View File

@@ -1196,7 +1196,8 @@ public:
bool ReleaseParkingBySpringBrakeWhenDoorIsOpen{ false }; bool ReleaseParkingBySpringBrakeWhenDoorIsOpen{ false };
bool SpringBrakeCutsOffDrive { true }; bool SpringBrakeCutsOffDrive { true };
double SpringBrakeDriveEmergencyVel { -1 }; double SpringBrakeDriveEmergencyVel { -1 };
bool HideDirStatusWhenMoving { false }; bool HideDirStatusWhenMoving { false }; // Czy gasic lampki kierunku powyzej predkosci zdefiniowanej przez HideDirStatusSpeed
int HideDirStatusSpeed{ 1 }; // Predkosc od ktorej lampki kierunku sa wylaczane
TSecuritySystem SecuritySystem; TSecuritySystem SecuritySystem;
int EmergencyBrakeWarningSignal{ 0 }; // combined with basic WarningSignal when manual emergency brake is active int EmergencyBrakeWarningSignal{ 0 }; // combined with basic WarningSignal when manual emergency brake is active
TUniversalCtrlTable UniCtrlList; /*lista pozycji uniwersalnego nastawnika*/ TUniversalCtrlTable UniCtrlList; /*lista pozycji uniwersalnego nastawnika*/

4
McZapkie/Mover.cpp
View File

@@ -10576,7 +10576,9 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) {
extract_value( SpringBrakeCutsOffDrive, "SpringBrakeCutsOffDrive", line, ""); extract_value( SpringBrakeCutsOffDrive, "SpringBrakeCutsOffDrive", line, "");
extract_value( SpringBrakeDriveEmergencyVel, "SpringBrakeDriveEmergencyVel", line, ""); extract_value( SpringBrakeDriveEmergencyVel, "SpringBrakeDriveEmergencyVel", line, "");
extract_value(HideDirStatusWhenMoving "HideDirStatusWhenMoving", line, ""); extract_value(HideDirStatusWhenMoving, "HideDirStatusWhenMoving", line, "");
extract_value(HideDirStatusSpeed, "HideDirStatusSpeed", line, "");
std::map<std::string, start_t> starts { std::map<std::string, start_t> starts {
{ "Disabled", start_t::disabled }, { "Disabled", start_t::disabled },
{ "Manual", start_t::manual }, { "Manual", start_t::manual },

4
Train.cpp
View File

@@ -7539,7 +7539,9 @@ bool TTrain::Update( double const Deltatime )
btLampkaNapNastHam.Turn((mvControlled->DirActive != 0) && (mvOccupied->EpFuse)); // napiecie na nastawniku hamulcowym btLampkaNapNastHam.Turn((mvControlled->DirActive != 0) && (mvOccupied->EpFuse)); // napiecie na nastawniku hamulcowym
// Wylaczanie lampek kierunku gdy jedziemy // Wylaczanie lampek kierunku gdy jedziemy
// Feature uruchamiany z fiz z sekcji Ctrl. wpisem HideDirStatusWhenMoving=Yes (domyslnie No) // Feature uruchamiany z fiz z sekcji Ctrl. wpisem HideDirStatusWhenMoving=Yes (domyslnie No)
if (mvOccupied->HideDirStatusWhenMoving && mvOccupied->Vel > 1) { if (mvOccupied->HideDirStatusWhenMoving && // Czy ta funkcja jest w ogole wlaczona
mvOccupied->Vel > mvOccupied->HideDirStatusSpeed) // Uzaleznienie od predkosci
{
btLampkaForward.Turn(false); btLampkaForward.Turn(false);
btLampkaBackward.Turn(false); btLampkaBackward.Turn(false);
} }