Automatic merge of T1.5.1-376-g885592329 and 12 pull requests

- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 2451991: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at 001e285: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 73b637f: Allow independent drive axles for locomotives
- Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay

Author: openrails-bot

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/BatterySwitch.cs

@@ -1,4 +1,4 @@
-// COPYRIGHT 2020 by the Open Rails project.
+// COPYRIGHT 2020 by the Open Rails project.
 // 
 // This file is part of Open Rails.
 // 
@@ -211,6 +211,7 @@ public virtual void Update(float elapsedClockSeconds)
                             if (Timer.Triggered)
                             {
                                 On = false;
+                                CommandButtonOff = false;
                                 Wagon.SignalEvent(Event.BatterySwitchOff);
                                 Timer.Stop();
                             }
@@ -235,6 +236,7 @@ public virtual void Update(float elapsedClockSeconds)
                             if (Timer.Triggered)
                             {
                                 On = true;
+                                CommandButtonOn = false;
                                 Wagon.SignalEvent(Event.BatterySwitchOn);
                                 Timer.Stop();
                             }
@@ -279,29 +281,13 @@ public virtual void HandleEvent(PowerSupplyEvent evt)
                     }
                     break;
 
-                case PowerSupplyEvent.CloseBatterySwitchButtonReleased:
-                    if (Mode == ModeType.PushButtons && CommandButtonOn)
-                    {
-                        CommandButtonOn = false;
-                        Wagon.SignalEvent(Event.BatterySwitchCommandOff);
-                    }
-                    break;
-
                 case PowerSupplyEvent.OpenBatterySwitchButtonPressed:
                     if (Mode == ModeType.PushButtons && !CommandButtonOff)
                     {
                         CommandButtonOff = true;
                         Wagon.SignalEvent(Event.BatterySwitchCommandOn);
                     }
                     break;
-
-                case PowerSupplyEvent.OpenBatterySwitchButtonReleased:
-                    if (Mode == ModeType.PushButtons && CommandButtonOff)
-                    {
-                        CommandButtonOff = false;
-                        Wagon.SignalEvent(Event.BatterySwitchCommandOff);
-                    }
-                    break;
             }
         }
     }