Allow several buttons associated to a single command

Author: cesarBLG

Source/RunActivity/Viewer3D/UserInputExternal.cs

@@ -30,38 +30,67 @@ namespace Orts.Viewer3D
     public class ExternalDeviceState
     {
         public Dictionary<(CabViewControlType,int), ExternalDeviceCabControl> CabControls;
-        public Dictionary<UserCommand, ExternalDeviceButton> Commands;
+        public Dictionary<UserCommand, List<ExternalDeviceButton>> Commands;
         public ExternalDeviceState()
         {
-            Commands = new Dictionary<UserCommand, ExternalDeviceButton>();
+            Commands = new Dictionary<UserCommand, List<ExternalDeviceButton>>();
             CabControls = new Dictionary<(CabViewControlType,int), ExternalDeviceCabControl>();
         }
 
         public virtual void Handled()
         {
-            foreach (var button in Commands.Values)
+            foreach (var buttonList in Commands.Values)
             {
-                button.Changed = false;
+                foreach (var button in buttonList)
+                {
+                    button.Changed = false;
+                }
             }
             foreach (var control in CabControls.Values)
             {
                 control.Changed = false;
             }
         }
+        public void RegisterCommand(UserCommand command, ExternalDeviceButton button)
+        {
+            if (!Commands.ContainsKey(command)) Commands[command] = new List<ExternalDeviceButton>();
+            Commands[command].Add(button);
+        }
 
         public bool IsPressed(UserCommand command)
 		{
-            return Commands.TryGetValue(command, out var button) && button.IsPressed;
+            if (Commands.TryGetValue(command, out var buttons))
+            {
+                foreach (var button in buttons)
+                {
+                    if (button.IsPressed) return true;
+                }
+            }
+            return false;
 		}
 
 		public bool IsReleased(UserCommand command)
 		{
-            return Commands.TryGetValue(command, out var button) && button.IsReleased;
+            if (Commands.TryGetValue(command, out var buttons))
+            {
+                foreach (var button in buttons)
+                {
+                    if (button.IsReleased) return true;
+                }
+            }
+            return false;
 		}
 
 		public bool IsDown(UserCommand command)
 		{
-            return Commands.TryGetValue(command, out var button) && button.IsDown;
+            if (Commands.TryGetValue(command, out var buttons))
+            {
+                foreach (var button in buttons)
+                {
+                    if (button.IsDown) return true;
+                }
+            }
+            return false;
 		}
     }
     public class ExternalDeviceButton

Source/RunActivity/Viewer3D/UserInputRailDriver.cs

@@ -48,7 +48,8 @@ public class RailDriverState : ExternalDeviceState
         public ExternalDeviceCabControl TrainBrake = new ExternalDeviceCabControl();     // 0 (release) to 100 (CS), does not include emergency
         public ExternalDeviceCabControl EngineBrake = new ExternalDeviceCabControl();    // 0 to 100
         public ExternalDeviceCabControl Lights = new ExternalDeviceCabControl();                  // lights rotary, 1 off, 2 dim, 3 full
-
+        ExternalDeviceButton BailOff;
+        ExternalDeviceButton Wiper;
         public RailDriverState(Game game)
         {
             try
@@ -119,8 +120,16 @@ public RailDriverState(Game game)
 
                     for (int i=0; i<settings.UserCommands.Length; i++)
                     {
-                        byte command = settings.UserCommands[i];
-                        if (command >= 0 && command != byte.MaxValue) Commands.Add((UserCommand)i, new RailDriverButton(command));
+                        var userCommand = (UserCommand)i;
+                        byte button = settings.UserCommands[i];
+                        if (button >= 0 && button != byte.MaxValue)
+                        {
+                            RegisterCommand(userCommand, new RailDriverButton(button));
+                            if (userCommand == UserCommand.ControlHorn || userCommand == UserCommand.ControlEmergencyPushButton)
+                            {
+                                RegisterCommand(userCommand, new RailDriverButton((byte)(button+1)));
+                            }
+                        }
                     }
                 }
             }
@@ -130,8 +139,10 @@ public RailDriverState(Game game)
                 Trace.WriteLine(error);
             }
 
-            Commands[UserCommand.ControlBailOff] = new ExternalDeviceButton();
-            Commands[UserCommand.ControlWiper] = new ExternalDeviceButton();
+            BailOff = new ExternalDeviceButton();
+            Wiper = new ExternalDeviceButton();
+            RegisterCommand(UserCommand.ControlBailOff, BailOff);
+            RegisterCommand(UserCommand.ControlWiper, Wiper);
 
             CabControls[(new CabViewControlType(CABViewControlTypes.DIRECTION), -1)] = Direction;
             CabControls[(new CabViewControlType(CABViewControlTypes.THROTTLE), -1)] = Throttle;
@@ -159,13 +170,16 @@ public void Update()
                     float a = EngineBrake.Value;
                     float calOff = (1 - a) * bailoffDisengaged.Item1 + a * bailoffDisengaged.Item2;
                     float calOn = (1 - a) * bailoffEngaged.Item1 + a * bailoffEngaged.Item2;
-                    Commands[UserCommand.ControlBailOff].IsDown = Percentage(readBuffer[5], calOff, calOn) > 50;
-                    Commands[UserCommand.ControlWiper].IsDown = (int)(.01 * Percentage(readBuffer[6], wipers) + 2.5) != 1;
+                    BailOff.IsDown = Percentage(readBuffer[5], calOff, calOn) > 50;
+                    Wiper.IsDown = (int)(.01 * Percentage(readBuffer[6], wipers) + 2.5) != 1;
                     Lights.Value = (int)(.01 * Percentage(readBuffer[7], headlight) + 2.5);
 
-                    foreach (var button in Commands.Values)
+                    foreach (var buttonList in Commands.Values)
                     {
-                        if (button is RailDriverButton rd) rd.Update(readBuffer);
+                        foreach (var button in buttonList)
+                        {
+                            if (button is RailDriverButton rd) rd.Update(readBuffer);
+                        }
                     }
                 }
             }
@@ -275,10 +289,10 @@ public class RailDriverButton : ExternalDeviceButton
     {
         int Index;
         byte Mask;
-        public RailDriverButton(byte command)
+        public RailDriverButton(byte button)
         {
-            Index = 8 + command / 8;
-            Mask = (byte)(1 << (command % 8));
+            Index = 8 + button / 8;
+            Mask = (byte)(1 << (button % 8));
         }
         public void Update(byte[] data)
         {