Skip to content

Commit 076c77a

Browse files
committed
Adding CUBIC_M_S as valid cabview unit, documentation improvements
1 parent 22312be commit 076c77a

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

Source/Documentation/Manual/appendices.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ Voltage volt V
5858
Mass Flow g/h
5959
\ kg/h
6060
\ lb/h lb/h lb/h
61+
Volumetric Flow m^3/s air flow m^3/s
62+
meters
63+
\ ft^3/min
64+
\ L/s
6165
Speed m/s other m/s m/s meter per second
6266
\ km/h
6367
\ kph kph kilometer per hour

Source/Documentation/Manual/cabs.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,8 @@ Here is an example implementation of ORTS_AIR_FLOW_METER as an analog dial::
706706
DirIncrease ( 0 )
707707
)
708708

709-
Applicable user-defined units are CUBIC_FT_MIN and LITRES_S. Cubic meters per second will be
710-
used if no units are specified.
709+
Applicable user-defined units are CUBIC_FT_MIN, LITRES_S, and CUBIC_M_S. Cubic meters per
710+
second will be used if no units are specified.
711711

712712

713713
Animated 2D Wipers

Source/Orts.Formats.Msts/CabViewFile.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,8 @@ public enum CABViewControlUnits
335335

336336
CUBIC_FT_MIN,
337337
LITRES_S,
338-
LITERS_S
338+
LITERS_S,
339+
CUBIC_M_S
339340
}
340341

341342
public enum DiscreteStates

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5429,6 +5429,7 @@ public virtual float GetDataOf(CabViewControl cvc)
54295429
data = this.FilteredBrakePipeFlowM3pS * 1000.0f;
54305430
break;
54315431

5432+
case CABViewControlUnits.CUBIC_M_S:
54325433
default:
54335434
data = this.FilteredBrakePipeFlowM3pS;
54345435
break;

0 commit comments

Comments
 (0)