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

Merge branch 'master' of https://github.com/Xoov/maszyna into milek-dev

This commit is contained in:
milek7
2019-03-23 12:41:34 +01:00
5 changed files with 51 additions and 1 deletions

View File

@@ -457,6 +457,7 @@ dictionary_source *TTrain::GetTrainState() {
dict->insert( "main_ctrl_actual_pos", mover->MainCtrlActualPos );
dict->insert( "scndctrl_pos", mover->ScndCtrlPos );
dict->insert( "scnd_ctrl_actual_pos", mover->ScndCtrlActualPos );
dict->insert( "new_speed", mover->NewSpeed);
// brakes
dict->insert( "manual_brake", ( mvOccupied->ManualBrakePos > 0 ) );
bool const bEP = ( mvControlled->LocHandle->GetCP() > 0.2 ) || ( fEIMParams[ 0 ][ 2 ] > 0.01 );