1.1.16 - Add MQTT audio support

excaliburpartners · May 4, 2024 · 73f504c · 73f504c
1 parent 800242a
commit 73f504c
Show file tree

Hide file tree

Showing 31 changed files with 708 additions and 74 deletions.
diff --git a/OmniLinkBridge/Global.cs b/OmniLinkBridge/Global.cs
@@ -34,6 +34,7 @@ public abstract class Global
         public static bool verbose_unit;
         public static bool verbose_message;
         public static bool verbose_lock;
+        public static bool verbose_audio;
 
         // mySQL Logging
         public static bool mysql_logging;
@@ -59,6 +60,8 @@ public abstract class Global
         public static HashSet<int> mqtt_discovery_area_code_required;
         public static ConcurrentDictionary<int, MQTT.OverrideZone> mqtt_discovery_override_zone;
         public static ConcurrentDictionary<int, MQTT.OverrideUnit> mqtt_discovery_override_unit;
+        public static Type mqtt_discovery_button_type;
+        public static bool mqtt_audio_local_mute;
 
         // Notifications
         public static bool notify_area;

diff --git a/OmniLinkBridge/MQTT/HomeAssistant/Alarm.cs b/OmniLinkBridge/MQTT/HomeAssistant/Alarm.cs
@@ -1,10 +1,14 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 
 namespace OmniLinkBridge.MQTT.HomeAssistant
 {
     public class Alarm : Device
     {
+        public Alarm(DeviceRegistry deviceRegistry) : base(deviceRegistry)
+        {
+
+        }
+
         public string command_topic { get; set; }
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]

diff --git a/OmniLinkBridge/MQTT/HomeAssistant/BinarySensor.cs b/OmniLinkBridge/MQTT/HomeAssistant/BinarySensor.cs
@@ -5,6 +5,11 @@ namespace OmniLinkBridge.MQTT.HomeAssistant
 {
     public class BinarySensor : Device
     {
+        public BinarySensor(DeviceRegistry deviceRegistry) : base(deviceRegistry)
+        {
+
+        }
+
         [JsonConverter(typeof(StringEnumConverter))]
         public enum DeviceClass
         {

diff --git a/OmniLinkBridge/MQTT/HomeAssistant/Button.cs b/OmniLinkBridge/MQTT/HomeAssistant/Button.cs
@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+
+namespace OmniLinkBridge.MQTT.HomeAssistant
+{
+    public class Button : Device
+    {
+        public Button(DeviceRegistry deviceRegistry) : base(deviceRegistry)
+        {
+
+        }
+
+        public string command_topic { get; set; }
+
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public string payload_press { get; set; }
+    }
+}
diff --git a/OmniLinkBridge/MQTT/HomeAssistant/Climate.cs b/OmniLinkBridge/MQTT/HomeAssistant/Climate.cs
@@ -4,6 +4,11 @@ namespace OmniLinkBridge.MQTT.HomeAssistant
 {
     public class Climate : Device
     {
+        public Climate(DeviceRegistry deviceRegistry) : base(deviceRegistry)
+        {
+
+        }
+
         public string status { get; set; }
 
         public string action_topic { get; set; }

diff --git a/OmniLinkBridge/MQTT/HomeAssistant/Device.cs b/OmniLinkBridge/MQTT/HomeAssistant/Device.cs
@@ -1,12 +1,16 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using OmniLinkBridge.Modules;
 using System.Collections.Generic;
 
 namespace OmniLinkBridge.MQTT.HomeAssistant
 {
     public class Device
     {
+        public Device(DeviceRegistry deviceRegistry)
+        {
+            device = deviceRegistry;
+        }
+
         [JsonConverter(typeof(StringEnumConverter))]
         public enum AvailabilityMode
         {
@@ -19,6 +23,9 @@ public enum AvailabilityMode
 
         public string name { get; set; }
 
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public string icon { get; set; }
+
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public string state_topic { get; set; }
 
@@ -32,6 +39,6 @@ public enum AvailabilityMode
         public AvailabilityMode? availability_mode { get; set; }
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public DeviceRegistry device { get; set; } = MQTTModule.MqttDeviceRegistry;
+        public DeviceRegistry device { get; set; }
     }
 }
diff --git a/OmniLinkBridge/MQTT/HomeAssistant/Light.cs b/OmniLinkBridge/MQTT/HomeAssistant/Light.cs
@@ -2,6 +2,11 @@
 {
     public class Light : Device
     {
+        public Light(DeviceRegistry deviceRegistry) : base(deviceRegistry)
+        {
+
+        }
+
         public string command_topic { get; set; }
 
         public string brightness_state_topic { get; set; }

diff --git a/OmniLinkBridge/MQTT/HomeAssistant/Lock.cs b/OmniLinkBridge/MQTT/HomeAssistant/Lock.cs
@@ -4,6 +4,11 @@ namespace OmniLinkBridge.MQTT.HomeAssistant
 {
     public class Lock : Device
     {
+        public Lock(DeviceRegistry deviceRegistry) : base(deviceRegistry)
+        {
+
+        }
+
         public string command_topic { get; set; }
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]

diff --git a/OmniLinkBridge/MQTT/HomeAssistant/Number.cs b/OmniLinkBridge/MQTT/HomeAssistant/Number.cs
@@ -4,10 +4,12 @@ namespace OmniLinkBridge.MQTT.HomeAssistant
 {
     public class Number : Device
     {
-        public string command_topic { get; set; }
+        public Number(DeviceRegistry deviceRegistry) : base(deviceRegistry)
+        {
 
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public string icon { get; set; }
+        }
+
+        public string command_topic { get; set; }
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public int? min { get; set; } 

diff --git a/OmniLinkBridge/MQTT/HomeAssistant/Select.cs b/OmniLinkBridge/MQTT/HomeAssistant/Select.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace OmniLinkBridge.MQTT.HomeAssistant
+{
+    public class Select : Device
+    {
+        public Select(DeviceRegistry deviceRegistry) : base(deviceRegistry)
+        {
+
+        }
+
+        public string command_topic { get; set; }
+
+        public List<string> options { get; set; } = null;
+    }
+}
diff --git a/OmniLinkBridge/MQTT/HomeAssistant/Sensor.cs b/OmniLinkBridge/MQTT/HomeAssistant/Sensor.cs
@@ -5,6 +5,11 @@ namespace OmniLinkBridge.MQTT.HomeAssistant
 {
     public class Sensor : Device
     {
+        public Sensor(DeviceRegistry deviceRegistry) : base(deviceRegistry)
+        {
+
+        }
+
         [JsonConverter(typeof(StringEnumConverter))]
         public enum DeviceClass
         {
@@ -15,9 +20,6 @@ public enum DeviceClass
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public DeviceClass? device_class { get; set; }
 
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public string icon { get; set; }
-
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public string unit_of_measurement { get; set; }
 

diff --git a/OmniLinkBridge/MQTT/HomeAssistant/Switch.cs b/OmniLinkBridge/MQTT/HomeAssistant/Switch.cs
@@ -4,6 +4,11 @@ namespace OmniLinkBridge.MQTT.HomeAssistant
 {
     public class Switch : Device
     {
+        public Switch(DeviceRegistry deviceRegistry) : base(deviceRegistry)
+        {
+
+        }
+
         public string command_topic { get; set; }
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]