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

Added complex speedctrl for EIM

Browse Source
This commit is contained in:
Królik Uszasty
2019-10-15 21:30:41 +02:00
committed by tmj-fstate
parent 0b2193c7d3
commit f8275acbb9
3 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Train.cpp
View File

@@ -501,7 +501,9 @@ dictionary_source *TTrain::GetTrainState() {
dict->insert( "scnd_ctrl_actual_pos", mvControlled->ScndCtrlActualPos );
dict->insert( "new_speed", mvOccupied->NewSpeed);
dict->insert( "speedctrl", mvOccupied->SpeedCtrlValue);
dict->insert( "speedctrlpower", mvOccupied->SpeedCtrlUnit.DesiredPower);
dict->insert( "speedctrlpower", mvOccupied->SpeedCtrlUnit.DesiredPower );
dict->insert( "speedctrlactive", mvOccupied->SpeedCtrlUnit.IsActive );
dict->insert( "speedctrlstandby", mvOccupied->SpeedCtrlUnit.Standby );
// brakes
dict->insert( "manual_brake", ( mvOccupied->ManualBrakePos > 0 ) );
bool const bEP = ( mvControlled->LocHandle->GetCP() > 0.2 ) || ( fEIMParams[ 0 ][ 2 ] > 0.01 );