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

securitysystem workarounds

Browse Source
This commit is contained in:
milek7
2020-11-01 22:53:34 +01:00
parent cad3bbadc7
commit 54812e8346
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
McZapkie/Mover.cpp
View File

@@ -192,6 +192,9 @@ bool TSecuritySystem::is_cabsignal_beeping() const {
} }
bool TSecuritySystem::is_braking() const { bool TSecuritySystem::is_braking() const {
if (!enabled)
return false;
if (!power && (vigilance_enabled || cabsignal_enabled)) if (!power && (vigilance_enabled || cabsignal_enabled))
return true; return true;
@@ -4297,7 +4300,7 @@ void TMoverParameters::UpdatePipePressure(double dt)
|| ( true == AlarmChainFlag ) || ( true == AlarmChainFlag )
|| (( true == EIMCtrlEmergency) || (( true == EIMCtrlEmergency)
&& (LocalBrakePosA >= 1.0)) && (LocalBrakePosA >= 1.0))
|| SecuritySystem.is_braking()) && CabOccupied ) || SecuritySystem.is_braking()))
/* /*
// NOTE: disabled because 32 is 'load destroyed' flag, what does this have to do with emergency brake? // NOTE: disabled because 32 is 'load destroyed' flag, what does this have to do with emergency brake?
// (if it's supposed to be broken coupler, such event sets alarmchainflag instead when appropriate) // (if it's supposed to be broken coupler, such event sets alarmchainflag instead when appropriate)