Adds active hold support

Author: i8beef

src/HomeAutio.Mqtt.Ecobee/EcobeeMqttService.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -111,7 +112,8 @@ protected override async void Mqtt_MqttMsgPublishReceived(MqttApplicationMessage
             // Desired Cool - desiredCool/set
             var request = new ThermostatUpdateRequest
             {
-                Selection = new Selection {
+                Selection = new Selection
+                {
                     SelectionType = "thermostats",
                     SelectionMatch = thermostatId
                 }
@@ -314,9 +316,10 @@ private async Task RefreshThermostatAsync(RevisionStatus revisionStatus)
                     SelectionType = "thermostats",
                     SelectionMatch = revisionStatus.ThermostatIdentifier,
                     IncludeEquipmentStatus = true,
-                    IncludeSettings = true,
+                    IncludeEvents = true,
                     IncludeRuntime = true,
                     IncludeSensors = true,
+                    IncludeSettings = true,
                     IncludeWeather = true
                 }
             };
@@ -403,6 +406,21 @@ private async Task UpdateState(Thermostat thermostat)
                 }
             }
 
+            // Hold
+            var holdEvent = thermostat.Events.FirstOrDefault(x => x.Type == "hold");
+            if (holdEvent != null && holdEvent.Running)
+            {
+                thermostatStatus.ActiveHold["running"] = holdEvent.Running.ToString();
+                thermostatStatus.ActiveHold["startTime"] = DateTime.Parse($"{holdEvent.StartDate} {holdEvent.StartTime}").ToString();
+                thermostatStatus.ActiveHold["endTime"] = DateTime.Parse($"{holdEvent.EndDate} {holdEvent.EndTime}").ToString();
+                thermostatStatus.ActiveHold["coldHoldTemp"] = (holdEvent.CoolHoldTemp / 10m).ToString();
+                thermostatStatus.ActiveHold["heatHoldTemp"] = (holdEvent.HeatHoldTemp / 10m).ToString();
+                thermostatStatus.ActiveHold["fan"] = holdEvent.Fan;
+                thermostatStatus.ActiveHold["fanMinOnTime"] = holdEvent.FanMinOnTime.ToString();
+                thermostatStatus.ActiveHold["vent"] = holdEvent.Vent;
+                thermostatStatus.ActiveHold["ventilatorMinOnTime"] = holdEvent.VentilatorMinOnTime.ToString();
+            }
+
             if (_thermostatStatus.ContainsKey(thermostat.Identifier))
             {
                 // Publish updates
@@ -434,6 +452,21 @@ await MqttClient.PublishAsync(new MqttApplicationMessageBuilder()
                     }
                 }
 
+                // Hold status
+                foreach (var holdStatus in thermostatStatus.ActiveHold)
+                {
+                    if (holdStatus.Value != _thermostatStatus[thermostat.Identifier].ActiveHold[holdStatus.Key])
+                    {
+                        await MqttClient.PublishAsync(new MqttApplicationMessageBuilder()
+                            .WithTopic($"{TopicRoot}/{thermostat.Identifier}/hold/{holdStatus.Key}")
+                            .WithPayload(holdStatus.Value)
+                            .WithAtLeastOnceQoS()
+                            .WithRetainFlag()
+                            .Build())
+                            .ConfigureAwait(false);
+                    }
+                }
+
                 // Publish everything for new sensors, new capabilities, and changes in existing ability values
                 foreach (var sensor in thermostatStatus.Sensors)
                 {
@@ -497,6 +530,21 @@ await MqttClient.PublishAsync(new MqttApplicationMessageBuilder()
                         .ConfigureAwait(false);
                 }
 
+                // Hold status
+                foreach (var holdStatus in thermostatStatus.ActiveHold)
+                {
+                    if (holdStatus.Value != _thermostatStatus[thermostat.Identifier].ActiveHold[holdStatus.Key])
+                    {
+                        await MqttClient.PublishAsync(new MqttApplicationMessageBuilder()
+                            .WithTopic($"{TopicRoot}/{thermostat.Identifier}/hold/{holdStatus.Key}")
+                            .WithPayload(holdStatus.Value)
+                            .WithAtLeastOnceQoS()
+                            .WithRetainFlag()
+                            .Build())
+                            .ConfigureAwait(false);
+                    }
+                }
+
                 foreach (var sensor in thermostatStatus.Sensors)
                 {
                     foreach (var sensorCapability in sensor.Value)

src/HomeAutio.Mqtt.Ecobee/ThermostatStatus.cs

@@ -16,6 +16,19 @@ public ThermostatStatus()
 
             Status = new Dictionary<string, string>();
 
+            ActiveHold = new Dictionary<string, string>
+            {
+                { "running", "false" },
+                { "startTime", null },
+                { "endTime", null },
+                { "coldHoldTemp", null },
+                { "heatHoldTemp", null },
+                { "fan", null },
+                { "fanMinOnTime", null },
+                { "vent", null },
+                { "ventilatorMinOnTime", null }
+            };
+
             EquipmentStatus = new Dictionary<string, string>
             {
                 { "heatPump", "off" },
@@ -36,6 +49,16 @@ public ThermostatStatus()
             };
         }
 
+        /// <summary>
+        /// Running event.
+        /// </summary>
+        public IDictionary<string, string> ActiveHold { get; }
+
+        /// <summary>
+        /// Equipment statuses.
+        /// </summary>
+        public IDictionary<string, string> EquipmentStatus { get; }
+
         /// <summary>
         /// Sensor statuses.
         /// </summary>
@@ -45,10 +68,5 @@ public ThermostatStatus()
         /// Thermostat statuses.
         /// </summary>
         public IDictionary<string, string> Status { get; }
-
-        /// <summary>
-        /// Equipment statuses.
-        /// </summary>
-        public IDictionary<string, string> EquipmentStatus { get; }
     }
 }