Fix GW1000 station dew point calculation incorrect on the first packe…

…t read at start-up
cumulusmx · Dec 29, 2020 · 1dd9636 · 1dd9636
1 parent 3d2f4f9
commit 1dd9636
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/CumulusMX/Cumulus.cs b/CumulusMX/Cumulus.cs
@@ -2258,7 +2258,7 @@ internal async void UpdateOpenWeatherMap(DateTime timestamp)
 						HttpResponseMessage response = await client.PostAsync(url, data);
 						var responseBodyAsText = await response.Content.ReadAsStringAsync();
 						var status = response.StatusCode == HttpStatusCode.NoContent ? "OK" : "Error";  // Returns a 204 reponse for OK!
-						LogDebugMessage($"OpenWeatherMap: Response code = {status} - {response.StatusCode}");
+						LogMessage($"OpenWeatherMap: Response code = {status} - {response.StatusCode}");
 						if (response.StatusCode != HttpStatusCode.NoContent)
 							LogDataMessage($"OpenWeatherMap: Response data = {responseBodyAsText}");
 					}

diff --git a/CumulusMX/GW1000Station.cs b/CumulusMX/GW1000Station.cs
@@ -577,6 +577,7 @@ private void GetLiveData()
 
 					double windSpeedLast = -999, rainRateLast = -999, rainLast = -999, gustLast = -999, gustLastCal = -999;
 					int windDirLast = -999;
+					double outdoortemp = -999;
 
 					bool batteryLow = false;
 
@@ -592,7 +593,8 @@ private void GetLiveData()
 								break;
 							case 0x02: //Outdoor Temperature (℃)
 								tempInt16 = ConvertBigEndianInt16(data, idx);
-								DoOutdoorTemp(ConvertTempCToUser(tempInt16 / 10.0), dateTime);
+								// do not process temperature here as if "MX calculates DP" is enabled, we have not yet read the humidity value. Have to do it at the end.
+								outdoortemp = tempInt16 / 10.0;
 								idx += 2;
 								break;
 							case 0x03: //Dew point (℃)
@@ -869,6 +871,10 @@ private void GetLiveData()
 						}
 					} while (idx < size);
 
+					// Process outdoor temperature here, as GW1000 currently does not supply Dew Point so we have to calculate it in DoOutdoorTemp()
+					if (outdoortemp > -999)
+						DoOutdoorTemp(ConvertTempCToUser(outdoortemp), dateTime);
+
 					if (tenMinuteChanged) tenMinuteChanged = false;
 
 					// Now do the stuff that requires more than one input parameter

diff --git a/CumulusMX/InternetSettings.cs b/CumulusMX/InternetSettings.cs
@@ -222,8 +222,8 @@ public string UpdateInternetConfig(IHttpContext context)
 					cumulus.WCloud.SendUV = settings.weathercloud.includeuv;
 					cumulus.WCloud.SynchronisedUpdate = (60 % cumulus.WCloud.Interval == 0);
 
-					//cumulus.WCloudTimer.Interval = cumulus.WCloudInterval * 60 * 1000;
-					//cumulus.WCloudTimer.Enabled = cumulus.WCloudEnabled && !cumulus.SynchronisedWCloudUpdate && !String.IsNullOrWhiteSpace(cumulus.WCloudWid) && !String.IsNullOrWhiteSpace(cumulus.WCloudKey);
+					cumulus.WCloudTimer.Interval = cumulus.WCloud.Interval * 60 * 1000;
+					cumulus.WCloudTimer.Enabled = cumulus.WCloud.Enabled && !cumulus.WCloud.SynchronisedUpdate && !String.IsNullOrWhiteSpace(cumulus.WCloud.ID) && !String.IsNullOrWhiteSpace(cumulus.WCloud.PW);
 				}
 				catch (Exception ex)
 				{
@@ -312,7 +312,8 @@ public string UpdateInternetConfig(IHttpContext context)
 					cumulus.OpenWeatherMap.Interval = settings.openweathermap.interval;
 					cumulus.OpenWeatherMap.SynchronisedUpdate = (60 % cumulus.OpenWeatherMap.Interval == 0);
 
-					cumulus.OpenWeatherMap.Enabled = cumulus.OpenWeatherMap.Enabled && !string.IsNullOrWhiteSpace(cumulus.OpenWeatherMap.PW);
+					cumulus.OpenWeatherMapTimer.Interval = cumulus.OpenWeatherMap.Interval * 60 * 1000;
+					cumulus.OpenWeatherMapTimer.Enabled = cumulus.OpenWeatherMap.Enabled && !string.IsNullOrWhiteSpace(cumulus.OpenWeatherMap.PW);
 				}
 				catch (Exception ex)
 				{

diff --git a/Updates.txt b/Updates.txt
@@ -5,6 +5,7 @@
 - Fix: Historic charts wind run tooltip suffix
 - Fix: High Min Temp and Low Max Temp records editors were not displaying and allowing input of the time
 - Fix: This Month/This Year records editors were showing records for the entire day file rather than the specific period
+- Fix: GW1000 station dewpoint calculation incorrect on first packet read at start-up
 
 - New: Settings page: Program Settings. Moved Debug/Data logging options and Prevent Second Instance to here from Station Settings.
 	Note: These settings still remain in the [Station] section of the Cumulus.ini file for backwards compatibility