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

securitysystem tweaks

Browse Source
This commit is contained in:
milek7
2020-10-22 02:05:12 +02:00
parent 79fca6a087
commit 0380f832fb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
McZapkie/Mover.cpp
View File

@@ -2910,7 +2910,7 @@ void TMoverParameters::SecuritySystemReset(void) // zbijanie czuwaka/SHP
// ************************************************************************************************* // *************************************************************************************************
void TMoverParameters::SecuritySystemCheck(double dt) void TMoverParameters::SecuritySystemCheck(double dt)
{ {
SecuritySystem.update(dt, Vel, Battery || ConverterFlag); SecuritySystem.update(dt, Vel, Power24vIsAvailable || Power110vIsAvailable);
if (!Battery || !Radio) if (!Battery || !Radio)
{ // wyłączenie baterii deaktywuje sprzęt { // wyłączenie baterii deaktywuje sprzęt
@@ -4273,11 +4273,11 @@ void TMoverParameters::UpdatePipePressure(double dt)
auto const lowvoltagepower { Power24vIsAvailable || Power110vIsAvailable }; auto const lowvoltagepower { Power24vIsAvailable || Power110vIsAvailable };
if( ( true == RadioStopFlag ) if( (( true == RadioStopFlag )
|| ( true == AlarmChainFlag ) || ( true == AlarmChainFlag )
|| (( true == EIMCtrlEmergency) || (( true == EIMCtrlEmergency)
&& (LocalBrakePosA >= 1.0)) && (LocalBrakePosA >= 1.0))
|| SecuritySystem.is_braking() ) || SecuritySystem.is_braking()) && CabOccupied )
/* /*
// 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)