Skip to content

Commit cb3f1c0

Browse files
committed
Adding liters per minute as a cabview unit
1 parent 076c77a commit cb3f1c0

File tree

5 files changed

+11
-1
lines changed

5 files changed

+11
-1
lines changed

Source/Documentation/Manual/appendices.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Mass Flow g/h
6161
Volumetric Flow m^3/s air flow m^3/s
6262
meters
6363
\ ft^3/min
64+
\ L/min
6465
\ L/s
6566
Speed m/s other m/s m/s meter per second
6667
\ km/h

Source/Documentation/Manual/cabs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ 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, LITRES_S, and CUBIC_M_S. Cubic meters per
709+
Applicable user-defined units are CUBIC_FT_MIN, LITERS_S, LITERS_MIN, and CUBIC_M_S. Cubic meters per
710710
second will be used if no units are specified.
711711

712712

Source/ORTS.Common/Conversions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ public static class FormatStrings
550550
public static string inhg = Catalog.GetString("inHg");
551551
public static string kgfpcm2 = Catalog.GetString("kgf/cm²");
552552
public static string lps = Catalog.GetString("L/s");
553+
public static string lpm = Catalog.GetString("L/min");
553554
public static string cfm = Catalog.GetString("cfm");
554555
public static string kg = Catalog.GetString("kg");
555556
public static string t = Catalog.GetString("t");

Source/Orts.Formats.Msts/CabViewFile.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ public enum CABViewControlUnits
321321
KILO_LBS,
322322
METRES_PER_SEC,
323323
LITRES,
324+
LITERS,
324325
GALLONS,
325326
INCHES_OF_MERCURY,
326327
MILI_AMPS,
@@ -334,6 +335,8 @@ public enum CABViewControlUnits
334335
YARDS,
335336

336337
CUBIC_FT_MIN,
338+
LITRES_MIN,
339+
LITERS_MIN,
337340
LITRES_S,
338341
LITERS_S,
339342
CUBIC_M_S

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

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

5432+
case CABViewControlUnits.LITRES_MIN:
5433+
case CABViewControlUnits.LITERS_MIN:
5434+
data = this.FilteredBrakePipeFlowM3pS * 1000.0f * 60.0f;
5435+
break;
5436+
54325437
case CABViewControlUnits.CUBIC_M_S:
54335438
default:
54345439
data = this.FilteredBrakePipeFlowM3pS;

0 commit comments

Comments
 (0)