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

Merge with TMJ

This commit is contained in:
Królik Uszasty
2019-05-08 21:47:05 +02:00
7 changed files with 73 additions and 40 deletions

View File

@@ -450,10 +450,10 @@ dictionary_source *TTrain::GetTrainState() {
// reverser
dict->insert( "direction", mover->ActiveDir );
// throttle
dict->insert( "mainctrl_pos", mover->MainCtrlPos );
dict->insert( "main_ctrl_actual_pos", mover->MainCtrlActualPos );
dict->insert( "scndctrl_pos", mover->ScndCtrlPos );
dict->insert( "scnd_ctrl_actual_pos", mover->ScndCtrlActualPos );
dict->insert( "mainctrl_pos", mvControlled->MainCtrlPos );
dict->insert( "main_ctrl_actual_pos", mvControlled->MainCtrlActualPos );
dict->insert( "scndctrl_pos", mvControlled->ScndCtrlPos );
dict->insert( "scnd_ctrl_actual_pos", mvControlled->ScndCtrlActualPos );
dict->insert( "new_speed", mover->NewSpeed);
// brakes
dict->insert( "manual_brake", ( mvOccupied->ManualBrakePos > 0 ) );