Merge pull request #117 from mcrossley/master

v3.12.1
cumulusmx · Aug 11, 2021 · b755814 · b755814
2 parents f55db81 + 6b92008
commit b755814
Show file tree

Hide file tree

Showing 22 changed files with 758 additions and 10,513 deletions.
diff --git a/CumulusMX/AlarmSettings.cs b/CumulusMX/AlarmSettings.cs
@@ -147,7 +147,8 @@ public string GetAlarmSettings()
 					Notify = cumulus.SensorAlarm.Notify,
 					Email = cumulus.SensorAlarm.Email,
 					Latches = cumulus.SensorAlarm.Latch,
-					LatchHrs = cumulus.SensorAlarm.LatchHours
+					LatchHrs = cumulus.SensorAlarm.LatchHours,
+					Threshold = cumulus.SensorAlarm.TriggerThreshold
 				},
 				dataStopped = new JsonAlarmValues()
 				{
@@ -157,7 +158,8 @@ public string GetAlarmSettings()
 					Notify = cumulus.DataStoppedAlarm.Notify,
 					Email = cumulus.DataStoppedAlarm.Email,
 					Latches = cumulus.DataStoppedAlarm.Latch,
-					LatchHrs = cumulus.DataStoppedAlarm.LatchHours
+					LatchHrs = cumulus.DataStoppedAlarm.LatchHours,
+					Threshold = cumulus.DataStoppedAlarm.TriggerThreshold
 				},
 				batteryLow = new JsonAlarmValues()
 				{
@@ -167,7 +169,8 @@ public string GetAlarmSettings()
 					Notify = cumulus.BatteryLowAlarm.Notify,
 					Email = cumulus.BatteryLowAlarm.Email,
 					Latches = cumulus.BatteryLowAlarm.Latch,
-					LatchHrs = cumulus.BatteryLowAlarm.LatchHours
+					LatchHrs = cumulus.BatteryLowAlarm.LatchHours,
+					Threshold = cumulus.BatteryLowAlarm.TriggerThreshold
 				},
 				spike = new JsonAlarmValues()
 				{
@@ -363,6 +366,7 @@ public string UpdateAlarmSettings(IHttpContext context)
 				cumulus.SensorAlarm.Email = settings.contactLost.Email;
 				cumulus.SensorAlarm.Latch = settings.contactLost.Latches;
 				cumulus.SensorAlarm.LatchHours = settings.contactLost.LatchHrs;
+				cumulus.SensorAlarm.TriggerThreshold = settings.contactLost.Threshold;
 
 				cumulus.DataStoppedAlarm.Enabled = settings.dataStopped.Enabled;
 				cumulus.DataStoppedAlarm.Sound = settings.dataStopped.SoundEnabled;
@@ -371,6 +375,7 @@ public string UpdateAlarmSettings(IHttpContext context)
 				cumulus.DataStoppedAlarm.Email = settings.dataStopped.Email;
 				cumulus.DataStoppedAlarm.Latch = settings.dataStopped.Latches;
 				cumulus.DataStoppedAlarm.LatchHours = settings.dataStopped.LatchHrs;
+				cumulus.DataStoppedAlarm.TriggerThreshold = settings.dataStopped.Threshold;
 
 				cumulus.BatteryLowAlarm.Enabled = settings.batteryLow.Enabled;
 				cumulus.BatteryLowAlarm.Sound = settings.batteryLow.SoundEnabled;
@@ -379,6 +384,7 @@ public string UpdateAlarmSettings(IHttpContext context)
 				cumulus.BatteryLowAlarm.Email = settings.batteryLow.Email;
 				cumulus.BatteryLowAlarm.Latch = settings.batteryLow.Latches;
 				cumulus.BatteryLowAlarm.LatchHours = settings.batteryLow.LatchHrs;
+				cumulus.BatteryLowAlarm.TriggerThreshold = settings.batteryLow.Threshold;
 
 				cumulus.SpikeAlarm.Enabled = settings.spike.Enabled;
 				cumulus.SpikeAlarm.Sound = settings.spike.SoundEnabled;

diff --git a/CumulusMX/Api.cs b/CumulusMX/Api.cs
@@ -30,6 +30,8 @@ public static class Api
 		internal static HttpStationWund stationWund;
 		internal static HttpStationEcowitt stationEcowitt;
 		internal static HttpStationEcowitt stationEcowittExtra;
+		internal static HttpStationAmbient stationAmbient;
+		internal static HttpStationAmbient stationAmbientExtra;
 
 
 		private static string EscapeUnicode(string input)
@@ -1113,6 +1115,29 @@ public async Task<bool> GetStation()
 								Response.StatusCode = 500;
 								return await this.StringResponseAsync("HTTP Station (Wunderground) is not running");
 							}
+
+						case "ambient":
+							if (stationAmbient != null)
+							{
+								return await this.StringResponseAsync(stationAmbient.ProcessData(this));
+							}
+							else
+							{
+								Response.StatusCode = 500;
+								return await this.StringResponseAsync("HTTP Station (Ambient) is not running");
+							}
+
+						case "ambientextra":
+							if (stationAmbientExtra != null)
+							{
+								return await this.StringResponseAsync(stationAmbient.ProcessExtraData(this));
+							}
+							else
+							{
+								Response.StatusCode = 500;
+								return await this.StringResponseAsync("HTTP Station (Ambient) is not running");
+							}
+
 					}
 
 					throw new KeyNotFoundException("Key Not Found: " + lastSegment);