16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 08:09:19 +02:00

electro-pneumatic brake operation ai logic tweak, pantograph compressor valve state commands, automatic material update switch, train lights state readout for python scripts, minor bug fixes

This commit is contained in:
tmj-fstate
2020-04-21 16:09:30 +02:00
parent f7d2b8bb7f
commit 17b545e88a
13 changed files with 145 additions and 61 deletions

View File

@@ -4240,8 +4240,12 @@ void TMoverParameters::UpdatePipePressure(double dt)
temp = Handle->GetCP();
else
temp = 0.0;
if (temp < 0.001)
DynamicBrakeEMUStatus = true;
DynamicBrakeEMUStatus = (
temp > 0.001 ?
ConverterFlag :
true );
double temp1 = temp;
if ((DCEMUED_EP_max_Vel > 0.001) && (Vel > DCEMUED_EP_max_Vel) && (DynamicBrakeEMUStatus))
temp1 = 0;
@@ -8063,8 +8067,9 @@ TMoverParameters::update_doors( double const Deltatime ) {
// revoke permit if...
door.open_permit =
( true == door.open_permit ) // ...we already have one...
&& ( false == Doors.is_locked ) // ...and the door lock is engaged...
&& ( false == door.remote_close );// ...or about to be closed
&& ( ( false == Doors.permit_presets.empty() ) // ...there's no preset switch controlling permit state...
|| ( ( false == Doors.is_locked ) // ...and the door lock is engaged...
&& ( false == door.remote_close ) ) );// ...or the door is about to be closed
door.is_open =
( door.position >= Doors.range )