Merge remote-tracking branch 'upstream/master'

Chris Jakeman · Chris Jakeman · commit 26b8587196d9 · 2022-02-01T15:10:51.000Z
diff --git a/Source/Documentation/Manual/physics.rst b/Source/Documentation/Manual/physics.rst
@@ -160,11 +160,17 @@ however if the modeler desires greater accuracy the following parameters can be
 WAG/ENG file in the wagon section:
 
 ``ORTSLengthBogieCentre`` - length between bogie centres.
-``ORTSLengthCarBody`` - Length between car ends.
+
+``ORTSLengthCarBody`` - Length between car ends (typically measured between the coupler pivot points).
+
 ``ORTSLengthCouplerFace`` - length between coupler faces.
 
-``ORTSNumAxles`` - number of axles on the car.
-``ORTSNumBogies`` - number of bogies on the car.
+``ORTSNumberAxles`` - number of axles on the car.
+
+``ORTSNumberDriveAxles`` - number of driven axles on the locomotive. NB: Total axles on locomotive will be 
+``ORTSNumberAxles`` + ``ORTSNumberDriveAxles``.
+
+``ORTSNumberBogies`` - number of bogies on the car.
 
 .. _physics-adhesion:
 
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -5208,7 +5208,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                     break;
 
                 case CABViewControlTypes.ORTS_BATTERY_SWITCH_COMMAND_BUTTON_OPEN:
-                    data = LocomotivePowerSupply.BatterySwitch.CommandButtonOn ? 1 : 0;
+                    data = LocomotivePowerSupply.BatterySwitch.CommandButtonOff ? 1 : 0;
                     break;
 
                 case CABViewControlTypes.ORTS_BATTERY_SWITCH_ON:
diff --git a/Source/RunActivity/Viewer3D/WebServices/Web/HUD/index.html b/Source/RunActivity/Viewer3D/WebServices/Web/HUD/index.html
@@ -30,15 +30,16 @@
 
 <body onload="setInterval (ApiHeadUpDisplay, 500)">
   <ul>
-    <li><a id="common">Common</a></li>
-    <li><a id="consist">Consist</a></li>
-    <li><a id="locomotive">Locomotive</a></li>
-    <li><a id="power supply">Power Supply</a></li>
-    <li><a id="brake">Brake</a></li>
-    <li><a id="force">Force</a></li>
-    <li><a id="dispatcher">Dispatcher</a></li>
-    <li><a id="weather">Weather</a></li>
-    <li><a id="debug">Debug</a></li>
+	<li><a id="common">Common</a></li>
+	<li><a id="consist">Consist</a></li>
+	<li><a id="locomotive">Locomotive</a></li>
+	<li><a id="distributed power">Distributed Power</a></li>
+	<li><a id="power supply">Power Supply</a></li>
+	<li><a id="brake">Brake</a></li>
+	<li><a id="force">Force</a></li>
+	<li><a id="dispatcher">Dispatcher</a></li>
+	<li><a id="weather">Weather</a></li>
+	<li><a id="debug">Debug</a></li>
   </ul>
   <div id=menu><a href="/">Back to Menu</a></div>
   <h2>Open Rails - Head Up Display</h2>
@@ -57,23 +58,26 @@ <h2>Open Rails - Head Up Display</h2>
 document.getElementById("locomotive").onclick = function (){
 	pageNo = 2;
 }
+document.getElementById("distributed power").onclick = function () {
+    pageNo = 3;
+}
 document.getElementById("power supply").onclick = function (){
-	pageNo = 3;
+	pageNo = 4;
 }
 document.getElementById("brake").onclick = function (){
-	pageNo = 4;
+	pageNo = 5;
 }
 document.getElementById("force").onclick = function (){
-	pageNo = 5;
+	pageNo = 6;
 }
 document.getElementById("dispatcher").onclick = function (){
-	pageNo = 6;
+	pageNo = 7;
 }
 document.getElementById("weather").onclick = function (){
-	pageNo = 7;
+	pageNo = 8;
 }
 document.getElementById("debug").onclick = function (){
-	pageNo = 8;
+	pageNo = 9;
 }
 </script>
 </body>
