18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-19 19:14:59 +01:00

feat: SM42 vigilance device switched off in the shunt mode (eu07/maszyna#457)

The shunt mode of the diesel-electrics (ShuntMode=1: SM42, SP42, SU42) now
suspends their vigilance device (CA): no alerter while running, no alarm for the
button held too long, and an alarm already on goes out. The cab signalling (SHP)
stays as it was. Back in the line mode the CA works as before.
This commit is contained in:
jerrrrycho
2026-11-07 20:13:46 +01:00
parent a86bcb1ef5
commit 329dc4e42e
3 changed files with 59 additions and 4 deletions

View File

@@ -152,11 +152,22 @@ void TSecuritySystem::update(double dt, double vel, bool pwr, int cab)
velocity = vel;
cabactive = cab;
if (vigilance_enabled && velocity > AwareMinSpeed)
vigilance_timer += dt;
if (vigilance_suspended)
{
// the vigilance device is switched off: neither the alerter nor the button held too long, its alarm gone with it
vigilance_timer = 0.0;
press_timer = 0.0;
if (!cabsignal_active)
alert_timer = 0.0;
}
else
{
if (vigilance_enabled && velocity > AwareMinSpeed)
vigilance_timer += dt;
if (pressed && (!is_sifa || velocity > AwareMinSpeed))
press_timer += dt;
if (pressed && (!is_sifa || velocity > AwareMinSpeed))
press_timer += dt;
}
if (vigilance_timer > AwareDelay || press_timer > MaxHoldTime || cabsignal_active)
alert_timer += dt;
@@ -231,6 +242,11 @@ void TSecuritySystem::set_cabsignal_lock(bool v)
cabsignal_lock = v;
}
void TSecuritySystem::set_vigilance_suspended(bool const Suspended)
{
vigilance_suspended = Suspended;
}
bool TSecuritySystem::is_engine_blocked() const
{
if (!is_sifa)
@@ -3142,6 +3158,8 @@ void TMoverParameters::SecuritySystemReset(void) // zbijanie czuwaka/SHP
void TMoverParameters::SecuritySystemCheck(double dt)
{
bool isPower = Power24vIsAvailable || Power110vIsAvailable;
// the shunt mode of the SM42/SP42 switches their vigilance device (CA) off (eu07/maszyna#457)
SecuritySystem.set_vigilance_suspended(EngineType == TEngineType::DieselElectric && ShuntMode);
SecuritySystem.update(dt, Vel, isPower, CabActive);
if (!Battery || !Radio)