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

Implemented HideDirStatusWhenMoving entry

Browse Source
This commit is contained in:
Hirek
2024-12-28 00:15:36 +01:00
parent 532c5ecf8f
commit c7e78b8e0c
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
McZapkie/MOVER.h
View File

@@ -1196,6 +1196,7 @@ public:
bool ReleaseParkingBySpringBrakeWhenDoorIsOpen{ false }; bool ReleaseParkingBySpringBrakeWhenDoorIsOpen{ false };
bool SpringBrakeCutsOffDrive { true }; bool SpringBrakeCutsOffDrive { true };
double SpringBrakeDriveEmergencyVel { -1 }; double SpringBrakeDriveEmergencyVel { -1 };
bool HideDirStatusWhenMoving { false };
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*/

1
McZapkie/Mover.cpp
View File

@@ -10576,6 +10576,7 @@ 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, "");
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 },

12
Train.cpp
View File

@@ -7507,8 +7507,16 @@ bool TTrain::Update( double const Deltatime )
btLampkaDoorLockOff.Turn( false == mvOccupied->Doors.lock_enabled ); btLampkaDoorLockOff.Turn( false == mvOccupied->Doors.lock_enabled );
btLampkaDepartureSignal.Turn( mvControlled->DepartureSignal ); btLampkaDepartureSignal.Turn( mvControlled->DepartureSignal );
btLampkaNapNastHam.Turn((mvControlled->DirActive != 0) && (mvOccupied->EpFuse)); // napiecie na nastawniku hamulcowym btLampkaNapNastHam.Turn((mvControlled->DirActive != 0) && (mvOccupied->EpFuse)); // napiecie na nastawniku hamulcowym
btLampkaForward.Turn(mvControlled->DirActive > 0); // jazda do przodu // Wylaczanie lampek kierunku gdy jedziemy
btLampkaBackward.Turn(mvControlled->DirActive < 0); // jazda do tyłu // Feature uruchamiany z fiz z sekcji Ctrl. wpisem HideDirStatusWhenMoving=Yes (domyslnie No)
if (mvOccupied->HideDirStatusWhenMoving && mvOccupied->Vel > 1) {
btLampkaForward.Turn(false);
btLampkaBackward.Turn(false);
}
else {
btLampkaForward.Turn(mvControlled->DirActive > 0); // jazda do przodu
btLampkaBackward.Turn(mvControlled->DirActive < 0); // jazda do tyłu
}
btLampkaED.Turn(mvControlled->DynamicBrakeFlag); // hamulec ED btLampkaED.Turn(mvControlled->DynamicBrakeFlag); // hamulec ED
btLampkaBrakeProfileG.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_G ) ); btLampkaBrakeProfileG.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_G ) );
btLampkaBrakeProfileP.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_P ) ); btLampkaBrakeProfileP.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_P ) );