When using the battery switch two buttons option in combination with a delay:

Engine (
    ORTSBattery (
    Mode ( PushButtons )
    Delay ( 2s )
    DefaultOn ( 1 )
)

battery does not get switched on/off.

Author: sweiland-openrails

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;
             }
         }
     }