Merge pull request #163 from mcrossley/master

v3.22.3
cumulusmx · Nov 3, 2022 · 096c15f · 096c15f
2 parents cc8173d + 9afc3c2
commit 096c15f
Show file tree

Hide file tree

Showing 11 changed files with 152 additions and 89 deletions.
diff --git a/CumulusMX/Alarm.cs b/CumulusMX/Alarm.cs
@@ -68,7 +68,7 @@ private void doTriggered(bool value)
 					// If we were not set before, so we need to send an email?
 					if (!triggered && Enabled)
 					{
-						cumulus.LogMessage($"Alarm ({Name}): Triggered");
+						cumulus.LogMessage($"Alarm ({Name}): Triggered, value = {Value}");
 
 						if (Email && cumulus.SmtpOptions.Enabled && cumulus.emailer != null)
 						{
@@ -202,7 +202,7 @@ private void doUpTriggered(bool value)
 				// If we were not set before, so we need to send an email etc?
 				if (!upTriggered && Enabled)
 				{
-					cumulus.LogMessage($"Alarm ({Name}): Up triggered");
+					cumulus.LogMessage($"Alarm ({Name}): Up triggered, value = {Value}");
 
 					if (Email && cumulus.SmtpOptions.Enabled && cumulus.emailer != null)
 					{
@@ -268,7 +268,7 @@ private void doDownTriggered(bool value)
 				// If we were not set before, so we need to send an email?
 				if (!downTriggered && Enabled)
 				{
-					cumulus.LogMessage($"Alarm ({Name}): Down triggered");
+					cumulus.LogMessage($"Alarm ({Name}): Down triggered, value = {Value}");
 
 					if (Email && cumulus.SmtpOptions.Enabled && cumulus.emailer != null)
 					{

diff --git a/CumulusMX/Api.cs b/CumulusMX/Api.cs
@@ -383,25 +383,25 @@ public async Task GetGraphData(string req)
 						switch (req)
 						{
 							case "tempdata.json":
-								await writer.WriteAsync(Station.GetTempGraphData());
+								await writer.WriteAsync(Station.GetTempGraphData(DateTime.Now));
 								break;
 							case "winddata.json":
-								await writer.WriteAsync(Station.GetWindGraphData());
+								await writer.WriteAsync(Station.GetWindGraphData(DateTime.Now));
 								break;
 							case "raindata.json":
-								await writer.WriteAsync(Station.GetRainGraphData());
+								await writer.WriteAsync(Station.GetRainGraphData(DateTime.Now));
 								break;
 							case "pressdata.json":
-								await writer.WriteAsync(Station.GetPressGraphData());
+								await writer.WriteAsync(Station.GetPressGraphData(DateTime.Now));
 								break;
 							case "wdirdata.json":
-								await writer.WriteAsync(Station.GetWindDirGraphData());
+								await writer.WriteAsync(Station.GetWindDirGraphData(DateTime.Now));
 								break;
 							case "humdata.json":
-								await writer.WriteAsync(Station.GetHumGraphData());
+								await writer.WriteAsync(Station.GetHumGraphData(DateTime.Now));
 								break;
 							case "solardata.json":
-								await writer.WriteAsync(Station.GetSolarGraphData());
+								await writer.WriteAsync(Station.GetSolarGraphData(DateTime.Now));
 								break;
 							case "dailyrain.json":
 								await writer.WriteAsync(Station.GetDailyRainGraphData());
@@ -419,7 +419,7 @@ public async Task GetGraphData(string req)
 								await writer.WriteAsync(Station.GetGraphConfig());
 								break;
 							case "airqualitydata.json":
-								await writer.WriteAsync(Station.GetAqGraphData());
+								await writer.WriteAsync(Station.GetAqGraphData(DateTime.Now));
 								break;
 							case "availabledata.json":
 								await writer.WriteAsync(Station.GetAvailGraphData());

diff --git a/CumulusMX/Cumulus.cs b/CumulusMX/Cumulus.cs
@@ -2185,6 +2185,8 @@ private void WebTimerTick(object sender, ElapsedEventArgs e)
 				return;
 			}
 
+			var now = DateTime.Now;
+
 			if (WebUpdating == 1)
 			{
 				LogMessage("Warning, previous web update is still in progress, first chance, skipping this interval");
@@ -2197,13 +2199,13 @@ private void WebTimerTick(object sender, ElapsedEventArgs e)
 					ftpThread.Abort();
 				LogMessage("Trying new web update");
 				WebUpdating = 1;
-				ftpThread = new Thread(DoHTMLFiles) { IsBackground = true };
+				ftpThread = new Thread(() => DoHTMLFiles(now)) { IsBackground = true };
 				ftpThread.Start();
 			}
 			else
 			{
 				WebUpdating = 1;
-				ftpThread = new Thread(DoHTMLFiles) { IsBackground = true };
+				ftpThread = new Thread(() => DoHTMLFiles(now)) { IsBackground = true };
 				ftpThread.Start();
 			}
 		}
@@ -8317,7 +8319,7 @@ public void ExecuteProgram(string externalProgram, string externalParams)
 			Process.Start(start);
 		}
 
-		public void DoHTMLFiles()
+		public void DoHTMLFiles(DateTime ts)
 		{
 			try
 			{
@@ -8339,7 +8341,7 @@ public void DoHTMLFiles()
 				LogDebugMessage("Done creating standard Data file");
 
 				LogDebugMessage("Creating graph data files");
-				station.CreateGraphDataFiles();
+				station.CreateGraphDataFiles(ts);
 				LogDebugMessage("Done creating graph data files");
 
 				//LogDebugMessage("Creating extra files");

diff --git a/CumulusMX/CumulusMX.csproj b/CumulusMX/CumulusMX.csproj
@@ -110,8 +110,8 @@
     <Reference Include="MimeKit, Version=3.4.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
       <HintPath>..\packages\MimeKit.3.4.1\lib\net48\MimeKit.dll</HintPath>
     </Reference>
-    <Reference Include="MQTTnet, Version=4.1.0.247, Culture=neutral, PublicKeyToken=fdb7629f2e364a63, processorArchitecture=MSIL">
-      <HintPath>..\packages\MQTTnet.4.1.0.247\lib\net461\MQTTnet.dll</HintPath>
+    <Reference Include="MQTTnet, Version=4.1.1.318, Culture=neutral, PublicKeyToken=fdb7629f2e364a63, processorArchitecture=MSIL">
+      <HintPath>..\packages\MQTTnet.4.1.1.318\lib\net461\MQTTnet.dll</HintPath>
     </Reference>
     <Reference Include="MySqlConnector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
       <HintPath>..\packages\MySqlConnector.2.1.13\lib\net471\MySqlConnector.dll</HintPath>

diff --git a/CumulusMX/DataEditor.cs b/CumulusMX/DataEditor.cs
@@ -812,13 +812,13 @@ internal string GetRecordsLogFile(string recordType)
 							}
 
 							// low chill
-							if (rec.WindChill > Cumulus.DefaultHiVal && rec.WindChill < lowWindChill.Value)
+							if (rec.WindChill < lowWindChill.Value)
 							{
 								lowWindChill.Value = rec.WindChill;
 								lowWindChill.Ts = rec.Date;
 							}
 							// hi heat
-							if (rec.HeatIndex > Cumulus.DefaultHiVal && rec.HeatIndex > highHeatInd.Value)
+							if (rec.HeatIndex > highHeatInd.Value)
 							{
 								highHeatInd.Value = rec.HeatIndex;
 								highHeatInd.Ts = rec.Date;
@@ -853,13 +853,10 @@ internal string GetRecordsLogFile(string recordType)
 							}
 
 							// hi/low humidex
-							if (rec.Humidex > Cumulus.DefaultHiVal)
+							if (rec.Humidex > highHumidex.Value)
 							{
-								if (rec.Humidex > highHumidex.Value)
-								{
-									highHumidex.Value = rec.Humidex;
-									highHumidex.Ts = rec.Date;
-								}
+								highHumidex.Value = rec.Humidex;
+								highHumidex.Ts = rec.Date;
 							}
 
 							// hi temp
@@ -2321,19 +2318,19 @@ internal string GetMonthlyRecLogFile()
 							}
 
 							// low chill
-							if (rec.WindChill > -9999 && rec.WindChill < lowWindChill[monthOffset].Value)
+							if (rec.WindChill < lowWindChill[monthOffset].Value)
 							{
 								lowWindChill[monthOffset].Value = rec.WindChill;
 								lowWindChill[monthOffset].Ts = rec.Date;
 							}
 							// hi heat
-							if (rec.HeatIndex > -9999 && rec.HeatIndex > highHeatInd[monthOffset].Value)
+							if (rec.HeatIndex > highHeatInd[monthOffset].Value)
 							{
 								highHeatInd[monthOffset].Value = rec.HeatIndex;
 								highHeatInd[monthOffset].Ts = rec.Date;
 							}
 
-							if (rec.ApparentTemperature > -9999)
+							if (rec.ApparentTemperature > Cumulus.DefaultHiVal)
 							{
 								// hi appt
 								if (rec.ApparentTemperature > highAppTemp[monthOffset].Value)
@@ -2349,7 +2346,7 @@ internal string GetMonthlyRecLogFile()
 								}
 							}
 
-							if (rec.FeelsLike > -9999)
+							if (rec.FeelsLike > Cumulus.DefaultHiVal)
 							{
 								// hi feels like
 								if (rec.FeelsLike > highFeelsLike[monthOffset].Value)
@@ -2366,7 +2363,7 @@ internal string GetMonthlyRecLogFile()
 							}
 
 							// hi humidex
-							if (rec.Humidex > -9999 && rec.Humidex > highHumidex[monthOffset].Value)
+							if (rec.Humidex > highHumidex[monthOffset].Value)
 							{
 								highHumidex[monthOffset].Value = rec.Humidex;
 								highHumidex[monthOffset].Ts = rec.Date;

diff --git a/CumulusMX/DavisWllStation.cs b/CumulusMX/DavisWllStation.cs
@@ -3258,6 +3258,7 @@ private void GetAvailableSensors()
 			catch (Exception ex)
 			{
 				cumulus.LogDebugMessage("GetAvailableSensors: WeatherLink API exception: " + ex.Message);
+				return;
 			}
 
 			// Sensor types we are interested in...

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.22.2 - Build 3213")]
+[assembly: AssemblyDescription("Version 3.22.3 - Build 3214")]
 [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.22.2.3213")]
-[assembly: AssemblyFileVersion("3.22.2.3213")]
+[assembly: AssemblyVersion("3.22.3.3214")]
+[assembly: AssemblyFileVersion("3.22.3.3214")]
diff --git a/CumulusMX/StationSettings.cs b/CumulusMX/StationSettings.cs
@@ -1373,6 +1373,7 @@ internal string FtpNow(IHttpContext context)
 			{
 				var data = new StreamReader(context.Request.InputStream).ReadToEnd();
 				var json = WebUtility.UrlDecode(data);
+				var now = DateTime.Now;
 
 				// Dead simple (dirty), there is only one setting at present!
 				var includeGraphs = json.Contains("true");
@@ -1401,15 +1402,15 @@ internal string FtpNow(IHttpContext context)
 						cumulus.GraphDataFiles[i].CopyRequired = true;
 					}
 					cumulus.LogDebugMessage("FTP Now: Re-Generating the graph data files, if required");
-					station.CreateGraphDataFiles();
+					station.CreateGraphDataFiles(now);
 
 					// (re)generate the daily graph data files, and upload if required
 					cumulus.LogDebugMessage("FTP Now: Generating the daily graph data files, if required");
 					station.CreateEodGraphDataFiles();
 
 					cumulus.LogMessage("FTP Now: Trying new web update");
 					cumulus.WebUpdating = 1;
-					cumulus.ftpThread = new Thread(cumulus.DoHTMLFiles) { IsBackground = true };
+					cumulus.ftpThread = new Thread(() => cumulus.DoHTMLFiles(now)) { IsBackground = true };
 					cumulus.ftpThread.Start();
 					return "An existing FTP process was aborted, and a new FTP process invoked";
 				}
@@ -1422,14 +1423,14 @@ internal string FtpNow(IHttpContext context)
 					cumulus.GraphDataFiles[i].CopyRequired = true;
 				}
 				cumulus.LogDebugMessage("FTP Now: Re-Generating the graph data files, if required");
-				station.CreateGraphDataFiles();
+				station.CreateGraphDataFiles(now);
 
 				// (re)generate the daily graph data files, and upload if required
 				cumulus.LogDebugMessage("FTP Now: Generating the daily graph data files, if required");
 				station.CreateEodGraphDataFiles();
 
 				cumulus.WebUpdating = 1;
-				cumulus.ftpThread = new Thread(cumulus.DoHTMLFiles) { IsBackground = true };
+				cumulus.ftpThread = new Thread(() => cumulus.DoHTMLFiles(now)) { IsBackground = true };
 				cumulus.ftpThread.Start();
 				return "FTP process invoked";
 			}
-Original file line number
+Diff line change
@@ Expand Up / @@ -3258,6 +3258,7 @@ private void GetAvailableSensors() @@
     			catch (Exception ex)
     			{
     				cumulus.LogDebugMessage("GetAvailableSensors: WeatherLink API exception: " + ex.Message);
+    				return;
     			}
     			// Sensor types we are interested in...
@@ Expand Down @@