Merge pull request #102 from mcrossley/master

v3.10.1
cumulusmx · Feb 26, 2021 · a89549f · a89549f
2 parents 76375b8 + a7bc57e
commit a89549f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/CumulusMX/Properties/AssemblyInfo.cs b/CumulusMX/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Cumulus MX")]
-[assembly: AssemblyDescription("Build 3115")]
+[assembly: AssemblyDescription("Build 3116")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Cumulus MX")]
@@ -32,5 +32,5 @@
 // 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("3.10.0.3115")]
-[assembly: AssemblyFileVersion("3.10.0.3115")]
+[assembly: AssemblyVersion("3.10.1.3116")]
+[assembly: AssemblyFileVersion("3.10.1.3116")]
diff --git a/CumulusMX/WeatherStation.cs b/CumulusMX/WeatherStation.cs
@@ -2608,7 +2608,7 @@ private string APRStemp(double temp)
 			// and return three digits
 			int num;
 
-			if (cumulus.Units.Rain == 0)
+			if (cumulus.Units.Temp == 0)
 			{
 				num = Convert.ToInt32(((temp * 1.8) + 32));
 			}
@@ -5532,7 +5532,7 @@ protected int BCDchartoint(int c)
 		/// <returns>Temp in configured units</returns>
 		public double ConvertTempCToUser(double value)
 		{
-			if (cumulus.Units.Rain == 1)
+			if (cumulus.Units.Temp == 1)
 			{
 				return MeteoLib.CToF(value);
 			}
@@ -5550,7 +5550,7 @@ public double ConvertTempCToUser(double value)
 		/// <returns>Temp in configured units</returns>
 		public double ConvertTempFToUser(double value)
 		{
-			if (cumulus.Units.Rain == 0)
+			if (cumulus.Units.Temp == 0)
 			{
 				return MeteoLib.FtoC(value);
 			}
@@ -5568,7 +5568,7 @@ public double ConvertTempFToUser(double value)
 		/// <returns>Temp in C</returns>
 		public double ConvertUserTempToC(double value)
 		{
-			if (cumulus.Units.Rain == 1)
+			if (cumulus.Units.Temp == 1)
 			{
 				return MeteoLib.FtoC(value);
 			}
@@ -5586,7 +5586,7 @@ public double ConvertUserTempToC(double value)
 		/// <returns>Temp in F</returns>
 		public double ConvertUserTempToF(double value)
 		{
-			if (cumulus.Units.Rain == 1)
+			if (cumulus.Units.Temp == 1)
 			{
 				return value;
 			}

diff --git a/Updates.txt b/Updates.txt
@@ -1,3 +1,9 @@
+3.10.1 - b3116
+——————————————
+- Fix: Bug in temperature conversions introduced in v3.10.0
+
+
+
 3.10.0 - b3115
 ——————————————
 - Fix: Catch error creating System Uptime counter on Windows