diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index 69df6d99a..499294ebf 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.17.705.0")] -[assembly: AssemblyFileVersion("2.17.705.0")] +[assembly: AssemblyVersion("2.17.736.0")] +[assembly: AssemblyFileVersion("2.17.736.0")] diff --git a/Config/Units.cs b/Config/Units.cs index 84a34c6dc..b6111c514 100644 --- a/Config/Units.cs +++ b/Config/Units.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2016 Sensus Metering Systems +/// Copyright (c) 2016-2017 Sensus Slovensko a.s. /// using System; using System.Reflection; @@ -12,6 +12,7 @@ namespace Config [Description("---")] None, [Description("l")] l, /// * 1 liter + [Description("dm3")] dm3, /// 1 dm3 = 1 liter [Description("m3")] m3, /// 1000 l [Description("gal(UK)")] gal_UK, /// 1 gal(UK) = 4.54609 l [Description("gal(US)")] gal_US, /// 1 gal(US) = 3.78541178 l @@ -178,6 +179,7 @@ namespace Config switch (units) { case Unit.l: + case Unit.dm3: case Unit.m3: case Unit.gal_UK: case Unit.gal_US: @@ -269,6 +271,7 @@ namespace Config switch (units) { /// Volume: internal representation in l + case Unit.dm3: case Unit.l: return v; /// 1 liter case Unit.m3: return 0.001 * v; /// 1 m3 = 1000 l case Unit.gal_UK: return 0.21996925 * v; /// 1 gal(UK) = 4.54609 l @@ -335,6 +338,7 @@ namespace Config switch (units) { /// Volume: internal representation in l + case Unit.dm3: case Unit.l: return v; /// 1 liter case Unit.m3: return 1000 * v; /// 1000 l case Unit.gal_UK: return 4.54609 * v; /// 1 gal(UK) = 4.54609 l diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 4c1c78388..6a0dc6f66 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.17.735.0")] -[assembly: AssemblyFileVersion("2.17.735.0")] +[assembly: AssemblyVersion("2.17.736.0")] +[assembly: AssemblyFileVersion("2.17.736.0")]