Merge pull request #192 from mcrossley/master

v3.28.6
cumulusmx · Mar 21, 2024 · e0a1c73 · e0a1c73
2 parents ea1308a + 70023fd
commit e0a1c73
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/CumulusMX/CumulusMX.csproj b/CumulusMX/CumulusMX.csproj
@@ -76,7 +76,7 @@
     <StartupObject>CumulusMX.Program</StartupObject>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Copyright>Copyright ©  2015-$([System.DateTime]::Now.ToString('yyyy')) Cumulus MX</Copyright>
-    <Version>3.28.5.3282</Version>
+    <Version>3.28.6.3283</Version>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>

diff --git a/CumulusMX/DavisCloudStation.cs b/CumulusMX/DavisCloudStation.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
-using System.Linq;
 using System.Net.Http;
 using System.Text;
 using System.Threading;
@@ -2137,7 +2136,8 @@ private void DecodeCurrent(List<WlCurrentSensor> sensors)
 								case 1:
 								case 2:
 									{
-										var data = sensor.data.FromJsv<WLCurrentSensordDataType1_2>();
+										// VP2 sensor data is sent as an array of one, so we will strip off the enclosing [ ]
+										var data = sensor.data.Substring(1, sensor.data.Length - 2).FromJsv<WLCurrentSensordDataType1_2>();
 
 										try
 										{

diff --git a/CumulusMX/EcowittCloudStation.cs b/CumulusMX/EcowittCloudStation.cs
@@ -87,15 +87,15 @@ public EcowittCloudStation(Cumulus cumulus, WeatherStation station = null) : bas
 				DataTimeoutMins = 2;
 			}
 
-			if (main || (!main && cumulus.EcowittExtraUseAQI))
+			if (main || cumulus.EcowittExtraUseAQI)
 			{
 				cumulus.Units.AirQualityUnitText = "µg/m³";
 			}
-			if (main || (!main && cumulus.EcowittExtraUseSoilMoist))
+			if (main || cumulus.EcowittExtraUseSoilMoist)
 			{
 				cumulus.Units.SoilMoistureUnitText = "%";
 			}
-			if (main || (!main && cumulus.EcowittExtraUseSoilMoist))
+			if (main || cumulus.EcowittExtraUseSoilMoist)
 			{
 				cumulus.Units.LeafWetnessUnitText = "%";
 			}

diff --git a/CumulusMX/WeatherStation.cs b/CumulusMX/WeatherStation.cs
@@ -24,8 +24,6 @@
 
 using SQLite;
 
-using static System.Net.Mime.MediaTypeNames;
-
 using Timer = System.Timers.Timer;
 
 namespace CumulusMX
@@ -14384,7 +14382,7 @@ public string GetAllDegreeDaysGraphData(bool local)
 					// make all series the same year so they plot together
 					// 2000 was a leap year, so make sure February falls in 2000
 					// for Southern hemisphere this means the start year must be 1999
-					if (cumulus.GrowingYearStarts > 2 && plotYear == 1999 && DayFile[i].Date.Month == 1)
+					if (cumulus.GrowingYearStarts > 2 && plotYear == 1999 && DayFile[i].Date.Month < cumulus.GrowingYearStarts)
 					{
 						plotYear++;
 					}
@@ -14575,7 +14573,7 @@ public string GetAllTempSumGraphData(bool local)
 					// make all series the same year so they plot together
 					// 2000 was a leap year, so make sure February falls in 2000
 					// for Southern hemisphere this means the start year must be 1999
-					if (cumulus.TempSumYearStarts > 2 && plotYear == 1999 && DayFile[i].Date.Month == 1)
+					if (cumulus.TempSumYearStarts > 2 && plotYear == 1999 && DayFile[i].Date.Month < cumulus.TempSumYearStarts)
 					{
 						plotYear++;
 					}

diff --git a/Updates.txt b/Updates.txt
@@ -1,3 +1,9 @@
+3.28.6 - b3283
+——————————————
+- Fix davis Cloud station decode of VP2 sensor current data (again)
+- Fix crash in Growing Degree Days & Temperature Sum graphs for a particular circumstances
+
+
 3.28.5 - b3282
 ——————————————
 Fixed