Automatic merge of T1.5.1-535-g2f57132ee and 10 pull requests

- Pull request #757 at 98dd1a7: Unify RailDriver code implementations
- Pull request #821 at cc3af66: Adds suppression of safety valves
- Pull request #831 at 61bbf43: poor mans switch panel on tablet
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows
- Pull request #853 at a9760ec: Notify out of focus
- Pull request #855 at b39e5d8: Adds new route from TrainSimulations
- Pull request #856 at ce66076: Add Alternate Syntax for Confusing Tokens
- Pull request #857 at 22312be: Adding Air Flow Meters
- Pull request #858 at bbaeeba: Fix wheel animation problems

Author: openrails-bot

Source/Orts.Formats.Msts/CabViewFile.cs

@@ -342,7 +342,8 @@ public enum CABViewControlUnits
         YARDS,
 
         CUBIC_FT_MIN,
-        LITRES_S
+        LITRES_S,
+        LITERS_S
     }
 
     public enum DiscreteStates

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -5433,6 +5433,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                                 break;
 
                             case CABViewControlUnits.LITRES_S:
+                            case CABViewControlUnits.LITERS_S:
                                 data = this.FilteredBrakePipeFlowM3pS * 1000.0f;
                                 break;
 
@@ -5566,7 +5567,6 @@ public virtual float GetDataOf(CabViewControl cvc)
 
                                 }
                             }
-
                         }
                         else
                         {

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSBrakeController.cs

@@ -415,7 +415,7 @@ static void IncreasePressure(ref float pressureBar, float targetBar, float rateB
             {
                 float dp = rateBarpS * elapsedSeconds;
                 if (targetBar - pressureBar < 0.5f) // Slow down increase when nearing target to simulate chokes in brake valve
-                    dp *= Math.Min((targetBar - pressureBar) / 0.5f + 0.1f, 1.0f);
+                    dp *= Math.Min(((targetBar - pressureBar) / 0.5f) + 0.1f, 1.0f);
                 pressureBar += dp;
                 if (pressureBar > targetBar)
                     pressureBar = targetBar;
@@ -428,7 +428,7 @@ static void DecreasePressure(ref float pressureBar, float targetBar, float rateB
             {
                 float dp = rateBarpS * elapsedSeconds;
                 if (pressureBar - targetBar < 0.5f) // Slow down decrease when nearing target to simulate chokes in brake valve
-                    dp *= Math.Min((pressureBar - targetBar) / 0.5f + 0.1f, 1.0f);
+                    dp *= Math.Min(((pressureBar - targetBar) / 0.5f) + 0.1f, 1.0f);
                 pressureBar -= dp;
                 if (pressureBar < targetBar)
                     pressureBar = targetBar;