Management of EOT devices https://blueprints.launchpad.net/or/+spec/eot

Author: Csantucci

Source/ORTS.Common/Input/UserCommand.cs

@@ -47,6 +47,7 @@ public enum UserCommand
         [GetString("Display Next Station Window")] DisplayNextStationWindow,
         [GetString("Display Compass Window")] DisplayCompassWindow,
         [GetString("Display Train List Window")] DisplayTrainListWindow,
+        [GetString("Display EOT List Window")] DisplayEOTListWindow,
 
         [GetString("Debug Speed Up")] DebugSpeedUp,
         [GetString("Debug Speed Down")] DebugSpeedDown,
@@ -144,6 +145,7 @@ public enum UserCommand
         [GetString("Control Brake Hose Disconnect")] ControlBrakeHoseDisconnect,
         [GetString("Control Alerter")] ControlAlerter,
         [GetString("Control Emergency Push Button")] ControlEmergencyPushButton,
+        [GetString("Control EOT Emergency Brake")] ControlEOTEmergencyBrake,
         [GetString("Control Sander")] ControlSander,
         [GetString("Control Sander Toggle")] ControlSanderToggle,
         [GetString("Control Wiper")] ControlWiper,

Source/ORTS.Settings/InputSettings.cs

@@ -375,6 +375,7 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.ControlDynamicBrakeIncrease] = new UserCommandKeyInput(0x34);
             Commands[(int)UserCommand.ControlElectricTrainSupply] = new UserCommandKeyInput(0x30, KeyModifiers.Alt);
             Commands[(int)UserCommand.ControlEmergencyPushButton] = new UserCommandKeyInput(0x0E);
+            Commands[(int)UserCommand.ControlEOTEmergencyBrake] = new UserCommandKeyInput(0x0E, KeyModifiers.Control);
             Commands[(int)UserCommand.ControlEngineBrakeDecrease] = new UserCommandKeyInput(0x1A);
             Commands[(int)UserCommand.ControlEngineBrakeIncrease] = new UserCommandKeyInput(0x1B);
             Commands[(int)UserCommand.ControlBrakemanBrakeDecrease] = new UserCommandKeyInput(0x1A, KeyModifiers.Alt);
@@ -486,6 +487,7 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.DisplayTrackMonitorWindow] = new UserCommandModifiableKeyInput(0x3E, Commands[(int)UserCommand.DisplayNextWindowTab]);
             Commands[(int)UserCommand.DisplayTrainOperationsWindow] = new UserCommandKeyInput(0x43);
             Commands[(int)UserCommand.DisplayTrainDpuWindow] = new UserCommandKeyInput(0x43, KeyModifiers.Shift);
+            Commands[(int)UserCommand.DisplayEOTListWindow] = new UserCommandKeyInput(0x43, KeyModifiers.Control);
 
             Commands[(int)UserCommand.GameAutopilotMode] = new UserCommandKeyInput(0x1E, KeyModifiers.Alt);
             Commands[(int)UserCommand.GameChangeCab] = new UserCommandKeyInput(0x12, KeyModifiers.Control);

Source/Orts.Formats.Msts/ActivityFile.cs

@@ -1300,6 +1300,7 @@ public TrainCfg(STFReader stf) {
                 new STFReader.TokenProcessor("durability", ()=>{ Durability = stf.ReadFloatBlock(STFReader.UNITS.None, null); }),
                 new STFReader.TokenProcessor("wagon", ()=>{ WagonList.Add(new Wagon(stf)); }),
                 new STFReader.TokenProcessor("engine", ()=>{ WagonList.Add(new Wagon(stf)); }),
+                new STFReader.TokenProcessor("ortseot", ()=>{ WagonList.Add(new Wagon(stf)); }),
                 new STFReader.TokenProcessor("ortstraincontrolsystemparameters", () => TcsParametersFileName = stf.ReadStringBlock(null)),
             });
         }
@@ -1310,6 +1311,7 @@ public class Wagon {
         public string Name;
         public int UiD;
         public bool IsEngine;
+        public bool IsEOT;
         public bool Flip;
 
         public Wagon(STFReader stf) {
@@ -1319,6 +1321,7 @@ public Wagon(STFReader stf) {
                 new STFReader.TokenProcessor("flip", ()=>{ stf.MustMatch("("); stf.MustMatch(")"); Flip = true; }),
                 new STFReader.TokenProcessor("enginedata", ()=>{ stf.MustMatch("("); Name = stf.ReadString(); Folder = stf.ReadString(); stf.MustMatch(")"); IsEngine = true; }),
                 new STFReader.TokenProcessor("wagondata", ()=>{ stf.MustMatch("("); Name = stf.ReadString(); Folder = stf.ReadString(); stf.MustMatch(")"); }),
+                new STFReader.TokenProcessor("eotdata", ()=>{ stf.MustMatch("("); Name = stf.ReadString(); Folder = stf.ReadString(); stf.MustMatch(")"); IsEOT = true;  }),
             });
         }
 

Source/Orts.Formats.Msts/CabViewFile.cs

@@ -206,6 +206,13 @@ public enum CABViewControlTypes
         ORTS_GENERIC_ITEM2,
         ORTS_SCREEN_SELECT,
         ORTS_STATIC_DISPLAY,
+        ORTS_EOT_BRAKE_PIPE,
+        ORTS_EOT_STATE_DISPLAY,
+        ORTS_EOT_ID,
+        ORTS_EOT_COMM_TEST,
+        ORTS_EOT_DISARM,
+        ORTS_EOT_ARM_TWO_WAY,
+        ORTS_EOT_EMERGENCY_BRAKE,
 
         // TCS Controls
         ORTS_TCS1,