Merge pull request #37 from mcrossley/master

b3058
cumulusmx · Dec 3, 2019 · a653a19 · a653a19
2 parents 698eaae + d6e2230
commit a653a19
Show file tree

Hide file tree

Showing 10 changed files with 1,949 additions and 791 deletions.
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/CumulusMX/Api.cs b/CumulusMX/Api.cs
@@ -134,6 +134,16 @@ public bool EditData()
 
 						case "alltimerecordslogfile.json":
 							return this.JsonResponse(dataEditor.GetAllTimeRecLogFile());
+
+						case "monthlyrecords.json":
+							return this.JsonResponse(dataEditor.GetMonthlyRecData());
+
+						case "monthlyrecordsdayfile.json":
+							return this.JsonResponse(dataEditor.GetMonthlyRecDayFile());
+
+						case "monthlyrecordslogfile.json":
+							return this.JsonResponse(dataEditor.GetMonthlyRecLogFile());
+
 					}
 
 					throw new KeyNotFoundException("Key Not Found: " + lastSegment);
@@ -192,6 +202,10 @@ public bool EditData()
 
 						case "alltime":
 							return this.JsonResponse(dataEditor.EditAllTimeRecs(this));
+
+						case "monthly":
+							return this.JsonResponse(dataEditor.EditMonthlyRecs(this));
+
 					}
 
 					throw new KeyNotFoundException("Key Not Found: " + lastSegment);

diff --git a/CumulusMX/Cumulus.cs b/CumulusMX/Cumulus.cs
@@ -29,8 +29,8 @@ namespace CumulusMX
 	public class Cumulus
 	{
 		/////////////////////////////////
-		public string Version = "3.2.1";
-		public string Build = "3057";
+		public string Version = "3.2.2";
+		public string Build = "3058";
 		/////////////////////////////////
 
 		private static string appGuid = "57190d2e-7e45-4efb-8c09-06a176cef3f3";
@@ -1291,9 +1291,9 @@ public Cumulus(int HTTPport, int WSport)
 			LogMessage("RainDayThreshold=" + RainDayThreshold.ToString("F3"));
 			LogMessage("Offsets and Multipliers:");
 			LogMessage("PO=" + PressOffset.ToString("F3") + " TO=" + TempOffset.ToString("F3") + " HO=" + HumOffset + " WDO=" + WindDirOffset + " ITO=" +
-						InTempoffset.ToString("F3") + "SO=" + SolarOffset.ToString("F3") + " UVO=" + UVOffset.ToString("F3"));
+						InTempoffset.ToString("F3") + " SO=" + SolarOffset.ToString("F3") + " UVO=" + UVOffset.ToString("F3"));
 			LogMessage("PM=" + PressMult.ToString("F3") + " WSM=" + WindSpeedMult.ToString("F3") + " WGM=" + WindGustMult.ToString("F3") + " TM=" + TempMult.ToString("F3") + " TM2=" + TempMult2.ToString("F3") +
-						" HM=" + HumMult.ToString("F3") + " HM2=" + HumMult2.ToString("F3") + " RM=" + RainMult.ToString("F3") + "SM=" + SolarMult.ToString("F3") + " UVM=" + UVMult.ToString("F3"));
+						" HM=" + HumMult.ToString("F3") + " HM2=" + HumMult2.ToString("F3") + " RM=" + RainMult.ToString("F3") + " SM=" + SolarMult.ToString("F3") + " UVM=" + UVMult.ToString("F3"));
 			LogMessage("Spike removal:");
 			LogMessage("TD=" + EWtempdiff.ToString("F3") + " GD=" + EWgustdiff.ToString("F3") + " WD=" + EWwinddiff.ToString("F3") + " HD=" + EWhumiditydiff.ToString("F3") + " PD=" +
 						EWpressurediff.ToString("F3"));

diff --git a/CumulusMX/CumulusMX.csproj b/CumulusMX/CumulusMX.csproj
@@ -24,8 +24,8 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>3057</ApplicationRevision>
-    <ApplicationVersion>3.2.1.3057</ApplicationVersion>
+    <ApplicationRevision>3058</ApplicationRevision>
+    <ApplicationVersion>3.2.2.3058</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <ExcludeDeploymentUrl>true</ExcludeDeploymentUrl>
     <PublishWizardCompleted>true</PublishWizardCompleted>