Merge pull request #159 from mcrossley/master

v3.21.2
cumulusmx · Sep 23, 2022 · d7932e2 · d7932e2
2 parents d6cdc94 + bb6683c
commit d7932e2
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 deletions.
diff --git a/CumulusMX/HttpStationEcowitt.cs b/CumulusMX/HttpStationEcowitt.cs
@@ -295,9 +295,12 @@ public string ApplyData(string dataString, bool main, DateTime? ts = null)
 					if ((recDate.Minute % 20) == 0 || lastMinute == -1 && data["runtime"] != null)
 					{
 						var runtime = Convert.ToInt32(data["runtime"]);
-						var uptime = TimeSpan.FromSeconds(runtime);
+						if (runtime > 0)
+						{
+							var uptime = TimeSpan.FromSeconds(runtime);
 
-						cumulus.LogMessage($"Ecowitt Gateway uptime = {runtime} secs - {uptime:c}");
+							cumulus.LogMessage($"Ecowitt Gateway uptime = {runtime} secs - {uptime:c}");
+						}
 					}
 
 					lastMinute = recDate.Minute;

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("Version 3.21.1 - Build 3205")]
+[assembly: AssemblyDescription("Version 3.21.2 - Build 3206")]
 [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.21.1.3205")]
-[assembly: AssemblyFileVersion("3.21.1.3205")]
+[assembly: AssemblyVersion("3.21.2.3206")]
+[assembly: AssemblyFileVersion("3.21.2.3206")]
diff --git a/CumulusMX/WeatherStation.cs b/CumulusMX/WeatherStation.cs
@@ -6288,14 +6288,19 @@ public void DoTrendValues(DateTime ts, bool rollover = false)
 				}
 				else
 				{
+					if (TempReadyToPlot)
+					{
+						// calculate and display the temp trend
+						temptrendval = (OutdoorTemperature - retVals[0].OutsideTemp) / 3.0F;
+						cumulus.TempChangeAlarm.CheckAlarm(temptrendval);
+					}
 
-					// calculate and display the temp trend
-					temptrendval = (OutdoorTemperature - retVals[0].OutsideTemp) / 3.0F;
-					cumulus.TempChangeAlarm.CheckAlarm(temptrendval);
-
-					// calculate and display the pressure trend
-					presstrendval = (Pressure - retVals[0].Pressure) / 3.0;
-					cumulus.PressChangeAlarm.CheckAlarm(presstrendval);
+					if (PressReadyToPlot)
+					{
+						// calculate and display the pressure trend
+						presstrendval = (Pressure - retVals[0].Pressure) / 3.0;
+						cumulus.PressChangeAlarm.CheckAlarm(presstrendval);
+					}
 
 					// Convert for display
 					//trendval = ConvertPressMBToUser(presstrendval);

diff --git a/Updates.txt b/Updates.txt
@@ -1,6 +1,13 @@
+3.21.2 - b3206
+——————————————
+Fixed
+- Pressure/Temperature trend alarms triggering before the first data has been received
+
+
 3.21.1 - b3205
 ——————————————
-Fixed: Custom MySQL settings
+Fixed
+- Custom MySQL settings
 
 
 3.21.0 - b3204