From 332530643b3b20b959c9fbc2ddde5ff0d7f21b93 Mon Sep 17 00:00:00 2001 From: Hirek Date: Sat, 28 Dec 2024 00:22:15 +0100 Subject: [PATCH] Add HideDirStatusSpeed parameter --- McZapkie/MOVER.h | 3 ++- McZapkie/Mover.cpp | 4 +++- Train.cpp | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index c550b76f..73a9df50 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1196,7 +1196,8 @@ public: bool ReleaseParkingBySpringBrakeWhenDoorIsOpen{ false }; bool SpringBrakeCutsOffDrive { true }; 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; int EmergencyBrakeWarningSignal{ 0 }; // combined with basic WarningSignal when manual emergency brake is active TUniversalCtrlTable UniCtrlList; /*lista pozycji uniwersalnego nastawnika*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 66a78eff..1b9bfbfe 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -10576,7 +10576,9 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { extract_value( SpringBrakeCutsOffDrive, "SpringBrakeCutsOffDrive", line, ""); extract_value( SpringBrakeDriveEmergencyVel, "SpringBrakeDriveEmergencyVel", line, ""); - extract_value(HideDirStatusWhenMoving "HideDirStatusWhenMoving", line, ""); + extract_value(HideDirStatusWhenMoving, "HideDirStatusWhenMoving", line, ""); + extract_value(HideDirStatusSpeed, "HideDirStatusSpeed", line, ""); + std::map starts { { "Disabled", start_t::disabled }, { "Manual", start_t::manual }, diff --git a/Train.cpp b/Train.cpp index e05903df..3584f2c0 100644 --- a/Train.cpp +++ b/Train.cpp @@ -7509,7 +7509,9 @@ bool TTrain::Update( double const Deltatime ) btLampkaNapNastHam.Turn((mvControlled->DirActive != 0) && (mvOccupied->EpFuse)); // napiecie na nastawniku hamulcowym // Wylaczanie lampek kierunku gdy jedziemy // 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); btLampkaBackward.Turn(false); }