feat: Deprecate IHasCamerasMessenger; introduce new controls

Mark IHasCamerasMessenger as obsolete and replace it with
IHasCamerasWithControlMessenger, which adds functionality
for devices with camera controls. A new state message class,
IHasCamerasWithControlsStateMessage, has been added to
encapsulate camera state. Update MobileControlSystemController
to use the new messenger implementation.

src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs

@@ -2,59 +2,54 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
 using PepperDash.Core;
+using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
-using Serilog.Events;
 
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
-    [Description("Wrapper class for Digital Input")]
+
     /// <summary>
     /// Represents a GenericDigitalInputDevice
     /// </summary>
-    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput
+    /// [Description("Wrapper class for Digital Input")]
+    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IHasFeedback
     {
-        /// <summary>
-        /// Gets or sets the InputPort
-        /// </summary>
-        public DigitalInput InputPort { get; private set; }
+        private DigitalInput inputPort;
 
         /// <summary>
         /// Gets or sets the InputStateFeedback
         /// </summary>
         public BoolFeedback InputStateFeedback { get; private set; }
 
-        Func<bool> InputStateFeedbackFunc
-        {
-            get
-            {
-                return () => InputPort.State;
-            }
-        }
-
+        /// <inheritdoc />
+        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericDigitalInputDevice"/> class.
+        /// </summary>
+        /// <param name="key">key for device</param>
+        /// <param name="name">name for device</param>
+        /// <param name="postActivationFunc">function to call after activation. Should return the DigitalInput</param>
+        /// <param name="config">config for device</param>
         public GenericDigitalInputDevice(string key, string name, Func<IOPortConfig, DigitalInput> postActivationFunc,
             IOPortConfig config)
             : base(key, name)
         {
-            InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
+            InputStateFeedback = new BoolFeedback("inputState", () => inputPort.State);
 
             AddPostActivationAction(() =>
             {
-                InputPort = postActivationFunc(config);
+                inputPort = postActivationFunc(config);
 
-                InputPort.Register();
-
-                InputPort.StateChange += InputPort_StateChange;
+                inputPort.Register();
 
+                inputPort.StateChange += InputPort_StateChange;
             });
         }
 
@@ -71,41 +66,31 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         private static DigitalInput GetDigitalInput(IOPortConfig dc)
         {
-            IDigitalInputPorts ioPortDevice;
 
             if (dc.PortDeviceKey.Equals("processor"))
             {
                 if (!Global.ControlSystem.SupportsDigitalInput)
                 {
-                    Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Processor does not support Digital Inputs");
+                    Debug.LogError("GetDigitalInput: Processor does not support Digital Inputs");
                     return null;
                 }
-                ioPortDevice = Global.ControlSystem;
+
+                return Global.ControlSystem.DigitalInputPorts[dc.PortNumber];
             }
-            else
+
+            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IDigitalInputPorts ioPortDevice))
             {
-                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IDigitalInputPorts;
-                if (ioPortDev == null)
-                {
-                    Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device {0} is not a valid device", dc.PortDeviceKey);
-                    return null;
-                }
-                ioPortDevice = ioPortDev;
-            }
-            if (ioPortDevice == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device '0' is not a valid IDigitalInputPorts Device", dc.PortDeviceKey);
+                Debug.LogError("GetDigitalInput: Device {key} is not a valid device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfDigitalInputPorts)
             {
-                Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogError("GetDigitalInput: Device {key} does not contain a digital input port {port}", dc.PortDeviceKey, dc.PortNumber);
+                return null;
             }
 
             return ioPortDevice.DigitalInputPorts[dc.PortNumber];
-
-
         }
 
         #endregion
@@ -131,20 +116,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
             }
             catch (Exception e)
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
-                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
+                this.LogError("Unable to link device {key}.  {message}", Key, e.Message);
+                this.LogDebug(e, "Stack Trace: ");
             }
         }
 
@@ -153,22 +138,22 @@ namespace PepperDash.Essentials.Core.CrestronIO
         #region Factory
 
         /// <summary>
-        /// Represents a GenericDigitalInputDeviceFactory
+        /// Factory for creating GenericDigitalInputDevice devices
         /// </summary>
         public class GenericDigitalInputDeviceFactory : EssentialsDeviceFactory<GenericDigitalInputDevice>
         {
+            /// <summary>
+            /// Constructor for GenericDigitalInputDeviceFactory
+            /// </summary>
             public GenericDigitalInputDeviceFactory()
             {
                 TypeNames = new List<string>() { "digitalinput" };
             }
 
-            /// <summary>
-            /// BuildDevice method
-            /// </summary>
             /// <inheritdoc />
             public override EssentialsDevice BuildDevice(DeviceConfig dc)
             {
-                Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Digital Input Device");
+                Debug.LogDebug("Factory Attempting to create new Generic Digital Input Device");
 
                 var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs

@@ -2,66 +2,64 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Bridges;
-
-
 using Newtonsoft.Json;
-using Serilog.Events;
+using PepperDash.Core;
+using PepperDash.Core.Logging;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
     /// <summary>
     /// Represents a generic digital input deviced tied to a versiport
     /// </summary>
-    public class GenericVersiportAnalogInputDevice : EssentialsBridgeableDevice, IAnalogInput
+    public class GenericVersiportAnalogInputDevice : EssentialsBridgeableDevice, IAnalogInput, IHasFeedback
     {
-        public Versiport InputPort { get; private set; }
+        private Versiport inputPort;
 
+        /// <inheritdoc />
         public IntFeedback InputValueFeedback { get; private set; }
+
+        /// <summary>
+        /// Get the InputMinimumChangeFeedback
+        /// </summary>
+        /// <remarks>
+        /// Updates when the analog input minimum change value changes
+        /// </remarks>
         public IntFeedback InputMinimumChangeFeedback { get; private set; }
 
-        Func<int> InputValueFeedbackFunc
-        {
-            get
-            {
-                return () => InputPort.AnalogIn;
-            }
-        }
-
-        Func<int> InputMinimumChangeFeedbackFunc
-        {
-            get { return () => InputPort.AnalogMinChange; }
-        } 
+        /// <inheritdoc />
+        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericVersiportAnalogInputDevice"/> class.
+        /// </summary>
+        /// <param name="key">key for the device</param>
+        /// <param name="name">name for the device</param>
+        /// <param name="postActivationFunc">function to call after activation</param>
+        /// <param name="config">IO port configuration</param>
         public GenericVersiportAnalogInputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
             base(key, name)
         {
-            InputValueFeedback = new IntFeedback(InputValueFeedbackFunc);
-            InputMinimumChangeFeedback = new IntFeedback(InputMinimumChangeFeedbackFunc);
+            InputValueFeedback = new IntFeedback("inputValue", () => inputPort.AnalogIn);
+            InputMinimumChangeFeedback = new IntFeedback("inputMinimumChange", () => inputPort.AnalogMinChange);
 
             AddPostActivationAction(() =>
             {
-                InputPort = postActivationFunc(config);
+                inputPort = postActivationFunc(config);
 
-                InputPort.Register();
+                inputPort.Register();
 
-                InputPort.SetVersiportConfiguration(eVersiportConfiguration.AnalogInput);
-                InputPort.AnalogMinChange = (ushort)(config.MinimumChange > 0 ? config.MinimumChange : 655);
+                inputPort.SetVersiportConfiguration(eVersiportConfiguration.AnalogInput);
+                inputPort.AnalogMinChange = (ushort)(config.MinimumChange > 0 ? config.MinimumChange : 655);
                 if (config.DisablePullUpResistor)
-                    InputPort.DisablePullUpResistor = true;
+                    inputPort.DisablePullUpResistor = true;
 
-                InputPort.VersiportChange += InputPort_VersiportChange;
-
-                Debug.LogMessage(LogEventLevel.Debug, this, "Created GenericVersiportAnalogInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
+                inputPort.VersiportChange += InputPort_VersiportChange;
 
+                this.LogDebug("Created GenericVersiportAnalogInputDevice on port {port}.  DisablePullUpResistor: {pullUpResistorDisabled}", config.PortNumber, inputPort.DisablePullUpResistor);
             });
 
         }
@@ -69,20 +67,17 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// <summary>
         /// Set minimum voltage change for device to update voltage changed method
         /// </summary>
-        /// <param name="value">valid values range from 0 - 65535, representing the full 100% range of the processor voltage source.  Check processor documentation for details</param>
-        /// <summary>
-        /// SetMinimumChange method
-        /// </summary>
+        /// <param name="value">valid values range from 0 - 65535, representing the full 100% range of the processor voltage source.  Check processor documentation for details</param>        
         public void SetMinimumChange(ushort value)
         {
-            InputPort.AnalogMinChange = value;
+            inputPort.AnalogMinChange = value;
         }
 
         void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
+            this.LogDebug("Versiport change: {event}", args.Event);
 
-            if(args.Event == eVersiportEvent.AnalogInChange)
+            if (args.Event == eVersiportEvent.AnalogInChange)
                 InputValueFeedback.FireUpdate();
             if (args.Event == eVersiportEvent.AnalogMinChangeChange)
                 InputMinimumChangeFeedback.FireUpdate();
@@ -91,9 +86,6 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         #region Bridge Linking
 
-        /// <summary>
-        /// LinkToApi method
-        /// </summary>
         /// <inheritdoc />
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
@@ -110,12 +102,12 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                this.LogDebug("Linking to Trilist '{trilistId}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputValueFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputValue.JoinNumber]);
@@ -125,8 +117,8 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             catch (Exception e)
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
-                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
+                this.LogError("Unable to link device {key}: {message}", Key, e.Message);
+                this.LogDebug(e, "Stack Trace: ");
             }
 
             trilist.OnlineStatusChange += (d, args) =>
@@ -138,11 +130,6 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         }
 
-        void trilist_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            throw new NotImplementedException();
-        }
-
         #endregion
 
 
@@ -151,70 +138,55 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// </summary>
         public static Versiport GetVersiportDigitalInput(IOPortConfig dc)
         {
-         
-            IIOPorts ioPortDevice;
-
             if (dc.PortDeviceKey.Equals("processor"))
             {
                 if (!Global.ControlSystem.SupportsVersiport)
                 {
-                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Processor does not support Versiports");
+                    Debug.LogError("GetVersiportAnalogInput: Processor does not support Versiports");
                     return null;
                 }
-                ioPortDevice = Global.ControlSystem;
+                return Global.ControlSystem.VersiPorts[dc.PortNumber];
             }
-            else
+
+            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IIOPorts ioPortDevice))
             {
-                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
-                if (ioPortDev == null)
-                {
-                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device {0} is not a valid device", dc.PortDeviceKey);
-                    return null;
-                }
-                ioPortDevice = ioPortDev;
-            }
-            if (ioPortDevice == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
+                Debug.LogError("GetVersiportAnalogInput: Device {key} is not a valid device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
             {
-                Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogError("GetVersiportAnalogInput: Device {key} does not contain a port {port}", dc.PortDeviceKey, dc.PortNumber);
                 return null;
             }
-            if(!ioPortDevice.VersiPorts[dc.PortNumber].SupportsAnalogInput)
+            if (!ioPortDevice.VersiPorts[dc.PortNumber].SupportsAnalogInput)
             {
-                Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device {0} does not support AnalogInput on port {1}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogError("GetVersiportAnalogInput: Device {key} does not support AnalogInput on port {port}", dc.PortDeviceKey, dc.PortNumber);
                 return null;
             }
 
-
             return ioPortDevice.VersiPorts[dc.PortNumber];
-
-
         }
     }
 
 
     /// <summary>
-    /// Represents a GenericVersiportAbalogInputDeviceFactory
+    /// Factory for creating GenericVersiportAnalogInputDevice devices
     /// </summary>
-    public class GenericVersiportAbalogInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportAnalogInputDevice>
+    public class GenericVersiportAnalogInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportAnalogInputDevice>
     {
-        public GenericVersiportAbalogInputDeviceFactory()
+        /// <summary>
+        /// Constructor for GenericVersiportAnalogInputDeviceFactory
+        /// </summary>
+        public GenericVersiportAnalogInputDeviceFactory()
         {
             TypeNames = new List<string>() { "versiportanaloginput" };
         }
 
-        /// <summary>
-        /// BuildDevice method
-        /// </summary>
         /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
+            Debug.LogDebug("Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs

@@ -2,78 +2,82 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Bridges;
-
-
 using Newtonsoft.Json;
-using Serilog.Events;
+using PepperDash.Core;
+using PepperDash.Core.Logging;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
     /// <summary>
     /// Represents a generic digital input deviced tied to a versiport
     /// </summary>
-    public class GenericVersiportDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IPartitionStateProvider
+    public class GenericVersiportDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IPartitionStateProvider, IHasFeedback
     {
-        public Versiport InputPort { get; private set; }
+        private Versiport inputPort;
 
+        /// <summary>
+        /// Gets or sets the InputStateFeedback
+        /// </summary>
         public BoolFeedback InputStateFeedback { get; private set; }
 
-        Func<bool> InputStateFeedbackFunc
-        {
-            get
-            {
-                return () => InputPort.DigitalIn;
-            }
-        }
+        /// <inheritdoc />
+        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
 
         /// <summary>
         /// Gets or sets the PartitionPresentFeedback
         /// </summary>
         public BoolFeedback PartitionPresentFeedback { get; }
 
-        public bool PartitionPresent => !InputStateFeedbackFunc();
+        /// <summary>
+        /// Get partition state
+        /// </summary>
+        public bool PartitionPresent => !inputPort.DigitalIn;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericVersiportDigitalInputDevice"/> class.
+        /// </summary>
+        /// <param name="key">key for device</param>
+        /// <param name="name">name for device</param>
+        /// <param name="postActivationFunc">function to call after activation. Should return the Versiport</param>
+        /// <param name="config">config for device</param>
         public GenericVersiportDigitalInputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
             base(key, name)
         {
-            InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
-            PartitionPresentFeedback = new BoolFeedback(() => !InputStateFeedbackFunc());
+            InputStateFeedback = new BoolFeedback("inputState", () => inputPort.DigitalIn);
+            PartitionPresentFeedback = new BoolFeedback("partitionPresent", () => !inputPort.DigitalIn);
 
             AddPostActivationAction(() =>
             {
-                InputPort = postActivationFunc(config);
+                inputPort = postActivationFunc(config);
 
-                InputPort.Register();
+                inputPort.Register();
 
-                InputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalInput);
+                inputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalInput);
                 if (config.DisablePullUpResistor)
-                    InputPort.DisablePullUpResistor = true;
+                    inputPort.DisablePullUpResistor = true;
 
-                InputPort.VersiportChange += InputPort_VersiportChange;
+                inputPort.VersiportChange += InputPort_VersiportChange;
 
                 InputStateFeedback.FireUpdate();
                 PartitionPresentFeedback.FireUpdate();
 
-                Debug.LogMessage(LogEventLevel.Debug, this, "Created GenericVersiportDigitalInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
+                this.LogDebug("Created GenericVersiportDigitalInputDevice for port {port}.  DisablePullUpResistor: {pullUpResistorDisable}", config.PortNumber, inputPort.DisablePullUpResistor);
 
             });
 
+            Feedbacks.Add(InputStateFeedback);
+            Feedbacks.Add(PartitionPresentFeedback);
         }
 
         void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
+            this.LogDebug("Versiport change: {0}", args.Event);
 
-            if(args.Event == eVersiportEvent.DigitalInChange)
+            if (args.Event == eVersiportEvent.DigitalInChange)
             {
                 InputStateFeedback.FireUpdate();
                 PartitionPresentFeedback.FireUpdate();
@@ -102,20 +106,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
             }
             catch (Exception e)
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
-                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
+                this.LogError("Unable to link device {key}.  Input is null. {message}", Key, e.Message);
+                this.LogDebug(e, "Stack Trace: ");
             }
         }
 
@@ -127,63 +131,50 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// </summary>
         public static Versiport GetVersiportDigitalInput(IOPortConfig dc)
         {
-         
-            IIOPorts ioPortDevice;
-
             if (dc.PortDeviceKey.Equals("processor"))
             {
                 if (!Global.ControlSystem.SupportsVersiport)
                 {
-                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Processor does not support Versiports");
+                    Debug.LogError("GetVersiportDigitalInput: Processor does not support Versiports");
                     return null;
                 }
-                ioPortDevice = Global.ControlSystem;
+                return Global.ControlSystem.VersiPorts[dc.PortNumber];
             }
-            else
+
+            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IIOPorts ioPortDevice))
             {
-                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
-                if (ioPortDev == null)
-                {
-                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device {0} is not a valid device", dc.PortDeviceKey);
-                    return null;
-                }
-                ioPortDevice = ioPortDev;
-            }
-            if (ioPortDevice == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
+                Debug.LogError("GetVersiportDigitalInput: Device {key} is not a valid device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
             {
-                Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogError("GetVersiportDigitalInput: Device {key} does not contain versiport {port}", dc.PortDeviceKey, dc.PortNumber);
+                return null;
             }
 
             return ioPortDevice.VersiPorts[dc.PortNumber];
-
-
         }
     }
 
 
     /// <summary>
-    /// Represents a GenericVersiportDigitalInputDeviceFactory
+    /// Factory class for GenericVersiportDigitalInputDevice
     /// </summary>
     public class GenericVersiportDigitalInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportDigitalInputDevice>
     {
+        /// <summary>
+        /// Constructor for GenericVersiportDigitalInputDeviceFactory
+        /// </summary>
         public GenericVersiportDigitalInputDeviceFactory()
         {
             TypeNames = new List<string>() { "versiportinput" };
         }
 
-        /// <summary>
-        /// BuildDevice method
-        /// </summary>
         /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
+            Debug.LogDebug("Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs

@@ -2,18 +2,13 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Bridges;
-
-
 using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Core.Logging;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.CrestronIO
@@ -21,76 +16,68 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// <summary>
     /// Represents a generic digital input deviced tied to a versiport
     /// </summary>
-    public class GenericVersiportDigitalOutputDevice : EssentialsBridgeableDevice, IDigitalOutput
+    public class GenericVersiportDigitalOutputDevice : EssentialsBridgeableDevice, IDigitalOutput, IHasFeedback
     {
-        public Versiport OutputPort { get; private set; }
+        private Versiport outputPort;
 
+        /// <summary>
+        /// Gets or sets the OutputStateFeedback
+        /// </summary>
         public BoolFeedback OutputStateFeedback { get; private set; }
 
-        Func<bool> OutputStateFeedbackFunc
-        {
-            get
-            {
-                return () => OutputPort.DigitalOut;
-            }
-        }
+        /// <inheritdoc />
+        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericVersiportDigitalOutputDevice"/> class.
+        /// </summary>
         public GenericVersiportDigitalOutputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
             base(key, name)
         {
-            OutputStateFeedback = new BoolFeedback(OutputStateFeedbackFunc);
+            OutputStateFeedback = new BoolFeedback("outputState", () => outputPort.DigitalOut);
 
             AddPostActivationAction(() =>
             {
-                OutputPort = postActivationFunc(config);
+                outputPort = postActivationFunc(config);
 
-                OutputPort.Register();
+                outputPort.Register();
 
 
-                if (!OutputPort.SupportsDigitalOutput)
+                if (!outputPort.SupportsDigitalOutput)
                 {
-                    Debug.LogMessage(LogEventLevel.Information, this, "Device does not support configuration as a Digital Output");
+                    this.LogError("Device does not support configuration as a Digital Output");
                     return;
                 }
 
-                OutputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalOutput);
+                outputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalOutput);
 
 
-                OutputPort.VersiportChange += OutputPort_VersiportChange;
+                outputPort.VersiportChange += OutputPort_VersiportChange;
 
             });
-
         }
 
         void OutputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
+            this.LogDebug("Versiport change: {event}", args.Event);
 
-            if(args.Event == eVersiportEvent.DigitalOutChange)
+            if (args.Event == eVersiportEvent.DigitalOutChange)
                 OutputStateFeedback.FireUpdate();
         }
 
         /// <summary>
         /// Set value of the versiport digital output
         /// </summary>
-        /// <param name="state">value to set the output to</param>
-        /// <summary>
-        /// SetOutput method
-        /// </summary>
+        /// <param name="state">value to set the output to</param>        
         public void SetOutput(bool state)
         {
-                if (OutputPort.SupportsDigitalOutput)
-                {
-                    Debug.LogMessage(LogEventLevel.Information, this, "Passed the Check");
-
-                    OutputPort.DigitalOut = state;
-
-                }
-                else
-                {
-                    Debug.LogMessage(LogEventLevel.Information, this, "Versiport does not support Digital Output Mode");
-                }
+            if (!outputPort.SupportsDigitalOutput)
+            {
+                this.LogError("Versiport does not support Digital Output Mode");
+                return;
+            }
 
+            outputPort.DigitalOut = state;
         }
 
         #region Bridge Linking
@@ -114,12 +101,12 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 OutputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.OutputState.JoinNumber]);
@@ -127,8 +114,8 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             catch (Exception e)
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
-                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
+                this.LogError("Unable to link device: {message}", e.Message);
+                this.LogDebug(e, "Stack Trace: ");
             }
         }
 
@@ -140,41 +127,28 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// </summary>
         public static Versiport GetVersiportDigitalOutput(IOPortConfig dc)
         {
-
-                IIOPorts ioPortDevice;
-
-                if (dc.PortDeviceKey.Equals("processor"))
+            if (dc.PortDeviceKey.Equals("processor"))
+            {
+                if (!Global.ControlSystem.SupportsVersiport)
                 {
-                    if (!Global.ControlSystem.SupportsVersiport)
-                    {
-                        Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Processor does not support Versiports");
-                        return null;
-                    }
-                    ioPortDevice = Global.ControlSystem;
-                }
-                else
-                {
-                    var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
-                    if (ioPortDev == null)
-                    {
-                        Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Device {0} is not a valid device", dc.PortDeviceKey);
-                        return null;
-                    }
-                    ioPortDevice = ioPortDev;
-                }
-                if (ioPortDevice == null)
-                {
-                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Device '0' is not a valid IOPorts Device", dc.PortDeviceKey);
+                    Debug.LogError("GetVersiportDigitalOutput: Processor does not support Versiports");
                     return null;
                 }
+                return Global.ControlSystem.VersiPorts[dc.PortNumber];
+            }
 
-                if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
-                {
-                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
-                }
-                var port = ioPortDevice.VersiPorts[dc.PortNumber];
-                return port;
+            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IIOPorts ioPortDevice))
+            {
+                Debug.LogError("GetVersiportDigitalOutput: Device {key} is not a valid device", dc.PortDeviceKey);
+                return null;
+            }
 
+            if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOutput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+                return null;
+            }
+            return ioPortDevice.VersiPorts[dc.PortNumber];
         }
     }
 
@@ -184,18 +158,18 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// </summary>
     public class GenericVersiportDigitalOutputDeviceFactory : EssentialsDeviceFactory<GenericVersiportDigitalInputDevice>
     {
+        /// <summary>
+        /// Initialize a new instance of the <see cref="GenericVersiportDigitalOutputDeviceFactory"/> class.
+        /// </summary>
         public GenericVersiportDigitalOutputDeviceFactory()
         {
             TypeNames = new List<string>() { "versiportoutput" };
         }
 
-        /// <summary>
-        /// BuildDevice method
-        /// </summary>
         /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
+            Debug.LogDebug("Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/IAnalogInput.cs

@@ -12,6 +12,12 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// </summary>
     public interface IAnalogInput
     {
+        /// <summary>
+        /// Get the InputValueFeedback.
+        /// </summary>
+        /// <remarks>
+        /// Updates when the analog input value changes
+        /// </remarks>
         IntFeedback InputValueFeedback { get; }
     }
 }

src/PepperDash.Essentials.Core/CrestronIO/IOPortConfig.cs

@@ -14,25 +14,28 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// </summary>
     public class IOPortConfig
     {
-        [JsonProperty("portDeviceKey")]
         /// <summary>
         /// Gets or sets the PortDeviceKey
         /// </summary>
+        [JsonProperty("portDeviceKey")]
         public string PortDeviceKey { get; set; }
-        [JsonProperty("portNumber")]
+
         /// <summary>
         /// Gets or sets the PortNumber
         /// </summary>
+        [JsonProperty("portNumber")]
         public uint PortNumber { get; set; }
-        [JsonProperty("disablePullUpResistor")]
+
         /// <summary>
         /// Gets or sets the DisablePullUpResistor
         /// </summary>
+        [JsonProperty("disablePullUpResistor")]
         public bool DisablePullUpResistor { get; set; }
-        [JsonProperty("minimumChange")]
+
         /// <summary>
         /// Gets or sets the MinimumChange
         /// </summary>
+        [JsonProperty("minimumChange")]
         public int MinimumChange { get; set; }
     }
 }

src/PepperDash.Essentials.Core/Devices/EssentialsDeviceFactory.cs

@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Core
     public List<string> TypeNames { get; protected set; }
 
     /// <summary>
-    /// The method that will build the device
+    /// Build the device using the configuration
     /// </summary>
     /// <param name="dc">The device config</param>
     /// <returns>An instance of the device</returns>

src/PepperDash.Essentials.Core/Devices/IHasFeedbacks.cs

@@ -12,7 +12,7 @@ namespace PepperDash.Essentials.Core
 	public interface IHasFeedback : IKeyed
 	{
 		/// <summary>
-		/// This method shall return a list of all Output objects on a device,
+		/// This method returns a list of all Output objects on a device,
 		/// including all "aggregate" devices.
 		/// </summary>
 		FeedbackCollection<Feedback> Feedbacks { get; }

src/PepperDash.Essentials.Devices.Common/Cameras/CameraControl.cs

@@ -1,326 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Enum for camera control modes
-    /// </summary>
-    public enum eCameraControlMode
-    {
-        /// <summary>
-        /// Manual control mode, where the camera is controlled directly by the user or system
-        /// </summary>
-        Manual = 0,
-        /// <summary>
-        /// Off control mode, where the camera is turned off or disabled
-        /// </summary>
-        Off,
-        /// <summary>
-        ///  Auto control mode, where the camera automatically adjusts settings based on the environment or conditions
-        /// </summary>
-        Auto
-    }
-
-
-    /// <summary>
-    /// Interface for devices that have cameras
-    /// </summary>
-    public interface IHasCameras : IKeyName
-    {
-        /// <summary>
-        /// Event that is raised when a camera is selected
-        /// </summary>
-        event EventHandler<CameraSelectedEventArgs> CameraSelected;
-
-        /// <summary>
-        /// List of cameras on the device.  This should be a list of CameraBase objects
-        /// </summary>
-        List<CameraBase> Cameras { get; }
-
-        /// <summary>
-        /// The currently selected camera.  This should be a CameraBase object
-        /// </summary>
-        CameraBase SelectedCamera { get; }
-
-        /// <summary>
-        /// Feedback that indicates the currently selected camera
-        /// </summary>
-        StringFeedback SelectedCameraFeedback { get; }
-
-        /// <summary>
-        /// Selects a camera from the list of available cameras based on the provided key.
-        /// </summary>
-        /// <param name="key">The unique identifier or name of the camera to select.</param>
-        void SelectCamera(string key);
-    }
-
-    /// <summary>
-    /// Defines the contract for IHasCodecCameras
-    /// </summary>
-    public interface IHasCodecCameras : IHasCameras, IHasFarEndCameraControl
-    {
-
-    }
-
-    /// <summary>
-    /// To be implmented on codecs that can disable their camera(s) to blank the near end video
-    /// </summary>
-    public interface IHasCameraOff
-    {
-        /// <summary>
-        /// Feedback that indicates whether the camera is off
-        /// </summary>
-        BoolFeedback CameraIsOffFeedback { get; }
-
-        /// <summary>
-        /// Turns the camera off, blanking the near end video
-        /// </summary>
-        void CameraOff();
-    }
-
-    /// <summary>
-    /// Describes the ability to mute and unmute camera video
-    /// </summary>
-    public interface IHasCameraMute
-    {
-        /// <summary>
-        /// Feedback that indicates whether the camera is muted
-        /// </summary>
-        BoolFeedback CameraIsMutedFeedback { get; }
-
-        /// <summary>
-        /// Mutes the camera video, preventing it from being sent to the far end
-        /// </summary>
-        void CameraMuteOn();
-
-        /// <summary>
-        /// Unmutes the camera video, allowing it to be sent to the far end
-        /// </summary>
-        void CameraMuteOff();
-
-        /// <summary>
-        /// Toggles the camera mute state. If the camera is muted, it will be unmuted, and vice versa.
-        /// </summary>
-        void CameraMuteToggle();
-    }
-
-    /// <summary>
-    /// Interface for devices that can mute and unmute their camera video, with an event for unmute requests
-    /// </summary>
-    public interface IHasCameraMuteWithUnmuteReqeust : IHasCameraMute
-    {
-        /// <summary>
-        /// Event that is raised when a video unmute is requested, typically by the far end
-        /// </summary>
-        event EventHandler VideoUnmuteRequested;
-    }
-
-    /// <summary>
-    /// Event arguments for the CameraSelected event
-    /// </summary>
-    public class CameraSelectedEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Gets or sets the SelectedCamera
-        /// </summary>
-        public CameraBase SelectedCamera { get; private set; }
-
-        /// <summary>
-        /// Constructor for CameraSelectedEventArgs
-        /// </summary>
-        /// <param name="camera"></param>
-        public CameraSelectedEventArgs(CameraBase camera)
-        {
-            SelectedCamera = camera;
-        }
-    }
-
-    /// <summary>
-    /// Interface for devices that have a far end camera control
-    /// </summary>
-    public interface IHasFarEndCameraControl
-    {
-        /// <summary>
-        /// Gets the far end camera, which is typically a CameraBase object that represents the camera at the far end of a call
-        /// </summary>
-        CameraBase FarEndCamera { get; }
-
-        /// <summary>
-        /// Feedback that indicates whether the far end camera is being controlled
-        /// </summary>
-        BoolFeedback ControllingFarEndCameraFeedback { get; }
-
-    }
-
-    /// <summary>
-    /// Defines the contract for IAmFarEndCamera
-    /// </summary>
-    public interface IAmFarEndCamera
-    {
-
-    }
-
-    /// <summary>
-    /// Interface for devices that have camera controls
-    /// </summary>
-    public interface IHasCameraControls
-    {
-    }
-
-    /// <summary>
-    /// Defines the contract for IHasCameraPtzControl
-    /// </summary>
-    public interface IHasCameraPtzControl : IHasCameraPanControl, IHasCameraTiltControl, IHasCameraZoomControl
-    {
-        /// <summary>
-        /// Resets the camera position
-        /// </summary>
-        void PositionHome();
-    }
-
-    /// <summary>
-    /// Interface for camera pan control
-    /// </summary>
-    public interface IHasCameraPanControl : IHasCameraControls
-    {
-        /// <summary>
-        /// Pans the camera left
-        /// </summary>
-        void PanLeft();
-
-        /// <summary>
-        /// Pans the camera right
-        /// </summary>
-        void PanRight();
-
-        /// <summary>
-        /// Stops the camera pan movement
-        /// </summary>
-        void PanStop();
-    }
-
-    /// <summary>
-    /// Defines the contract for IHasCameraTiltControl
-    /// </summary>
-    public interface IHasCameraTiltControl : IHasCameraControls
-    {
-        /// <summary>
-        /// Tilts the camera down
-        /// </summary>
-        void TiltDown();
-
-        /// <summary>
-        /// Tilts the camera up
-        /// </summary>
-        void TiltUp();
-
-        /// <summary>
-        /// Stops the camera tilt movement
-        /// </summary>
-        void TiltStop();
-    }
-
-    /// <summary>
-    /// Defines the contract for IHasCameraZoomControl
-    /// </summary>
-    public interface IHasCameraZoomControl : IHasCameraControls
-    {
-        /// <summary>
-        /// Zooms the camera in
-        /// </summary>
-        void ZoomIn();
-
-        /// <summary>
-        /// Zooms the camera out
-        /// </summary>
-        void ZoomOut();
-
-        /// <summary>
-        /// Stops the camera zoom movement
-        /// </summary>
-        void ZoomStop();
-    }
-
-    /// <summary>
-    /// Defines the contract for IHasCameraFocusControl
-    /// </summary>
-    public interface IHasCameraFocusControl : IHasCameraControls
-    {
-        /// <summary>
-        /// Focuses the camera near
-        /// </summary>
-        void FocusNear();
-
-        /// <summary>
-        /// Focuses the camera far
-        /// </summary>
-        void FocusFar();
-
-        /// <summary>
-        /// Stops the camera focus movement
-        /// </summary>
-        void FocusStop();
-
-        /// <summary>
-        /// Triggers the camera's auto focus functionality, if available.
-        /// </summary>
-        void TriggerAutoFocus();
-    }
-
-    /// <summary>
-    /// Interface for devices that have auto focus mode control
-    /// </summary>
-    public interface IHasAutoFocusMode
-    {
-        /// <summary>
-        /// Sets the focus mode to auto or manual, or toggles between them.
-        /// </summary>
-        void SetFocusModeAuto();
-
-        /// <summary>
-        /// Sets the focus mode to manual, allowing for manual focus adjustments.
-        /// </summary>
-        void SetFocusModeManual();
-
-        /// <summary>
-        /// Toggles the focus mode between auto and manual.
-        /// </summary>
-        void ToggleFocusMode();
-    }
-
-    /// <summary>
-    /// Interface for devices that have camera auto mode control
-    /// </summary>
-    public interface IHasCameraAutoMode : IHasCameraControls
-    {
-        /// <summary>
-        /// Enables or disables the camera's auto mode, which may include automatic adjustments for focus, exposure, and other settings.
-        /// </summary>
-        void CameraAutoModeOn();
-
-        /// <summary>
-        /// Disables the camera's auto mode, allowing for manual control of camera settings.
-        /// </summary>
-        void CameraAutoModeOff();
-
-        /// <summary>
-        /// Toggles the camera's auto mode state. If the camera is in auto mode, it will switch to manual mode, and vice versa.
-        /// </summary>
-        void CameraAutoModeToggle();
-
-        /// <summary>
-        /// Feedback that indicates whether the camera's auto mode is currently enabled.
-        /// </summary>
-        BoolFeedback CameraAutoModeIsOnFeedback { get; }
-    }
-
-
-
-
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/CameraSelectedEventArgs.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Event arguments for the CameraSelected event
+    /// </summary>
+    [Obsolete("Use CameraSelectedEventArgs<T> instead. This class will be removed in a future version")]
+    public class CameraSelectedEventArgs : EventArgs
+    {
+        /// Gets or sets the SelectedCamera
+        /// </summary>
+        public CameraBase SelectedCamera { get; private set; }
+
+        /// <summary>
+        /// Constructor for CameraSelectedEventArgs
+        /// </summary>
+        /// <param name="camera"></param>
+        public CameraSelectedEventArgs(CameraBase camera)
+        {
+            SelectedCamera = camera;
+        }
+    }
+
+    /// <summary>
+    /// Event arguments for the CameraSelected event
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class CameraSelectedEventArgs<T> : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the SelectedCamera
+        /// </summary>
+        public T SelectedCamera { get; private set; }
+
+        /// <summary>
+        /// Constructor for CameraSelectedEventArgs
+        /// </summary>
+        /// <param name="camera"></param>
+        public CameraSelectedEventArgs(T camera)
+        {
+            SelectedCamera = camera;
+        }
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IAmFarEndCamera.cs

@@ -0,0 +1,12 @@
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Defines the contract for IAmFarEndCamera
+    /// </summary>
+    public interface IAmFarEndCamera : IKeyName
+    {
+
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasAutoFocusMode.cs

@@ -0,0 +1,24 @@
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Interface for devices that have auto focus mode control
+    /// </summary>
+    public interface IHasAutoFocusMode : IHasCameraControls
+    {
+        /// <summary>
+        /// Sets the focus mode to auto or manual, or toggles between them.
+        /// </summary>
+        void SetFocusModeAuto();
+
+        /// <summary>
+        /// Sets the focus mode to manual, allowing for manual focus adjustments.
+        /// </summary>
+        void SetFocusModeManual();
+
+        /// <summary>
+        /// Toggles the focus mode between auto and manual.
+        /// </summary>
+        void ToggleFocusMode();
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraAutoMode.cs

@@ -0,0 +1,31 @@
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+
+    /// <summary>
+    /// Interface for devices that have camera auto mode control
+    /// </summary>
+    public interface IHasCameraAutoMode : IHasCameraControls
+    {
+        /// <summary>
+        /// Enables or disables the camera's auto mode, which may include automatic adjustments for focus, exposure, and other settings.
+        /// </summary>
+        void CameraAutoModeOn();
+
+        /// <summary>
+        /// Disables the camera's auto mode, allowing for manual control of camera settings.
+        /// </summary>
+        void CameraAutoModeOff();
+
+        /// <summary>
+        /// Toggles the camera's auto mode state. If the camera is in auto mode, it will switch to manual mode, and vice versa.
+        /// </summary>
+        void CameraAutoModeToggle();
+
+        /// <summary>
+        /// Feedback that indicates whether the camera's auto mode is currently enabled.
+        /// </summary>
+        BoolFeedback CameraAutoModeIsOnFeedback { get; }
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraControls.cs

@@ -0,0 +1,13 @@
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+
+    /// <summary>
+    /// Interface for devices that have camera controls
+    /// </summary>
+    public interface IHasCameraControls : IKeyName
+    {
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraFocusControl.cs

@@ -0,0 +1,29 @@
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Defines the contract for IHasCameraFocusControl
+    /// </summary>
+    public interface IHasCameraFocusControl : IHasCameraControls
+    {
+        /// <summary>
+        /// Focuses the camera near
+        /// </summary>
+        void FocusNear();
+
+        /// <summary>
+        /// Focuses the camera far
+        /// </summary>
+        void FocusFar();
+
+        /// <summary>
+        /// Stops the camera focus movement
+        /// </summary>
+        void FocusStop();
+
+        /// <summary>
+        /// Triggers the camera's auto focus functionality, if available.
+        /// </summary>
+        void TriggerAutoFocus();
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraMute.cs

@@ -0,0 +1,31 @@
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Describes the ability to mute and unmute camera video
+    /// </summary>
+    public interface IHasCameraMute : IKeyName
+    {
+        /// <summary>
+        /// Feedback that indicates whether the camera is muted
+        /// </summary>
+        BoolFeedback CameraIsMutedFeedback { get; }
+
+        /// <summary>
+        /// Mutes the camera video, preventing it from being sent to the far end
+        /// </summary>
+        void CameraMuteOn();
+
+        /// <summary>
+        /// Unmutes the camera video, allowing it to be sent to the far end
+        /// </summary>
+        void CameraMuteOff();
+
+        /// <summary>
+        /// Toggles the camera mute state. If the camera is muted, it will be unmuted, and vice versa.
+        /// </summary>
+        void CameraMuteToggle();
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraMuteWithUnmuteRequest.cs

@@ -0,0 +1,16 @@
+using System;
+
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Interface for devices that can mute and unmute their camera video, with an event for unmute requests
+    /// </summary>
+    public interface IHasCameraMuteWithUnmuteReqeust : IHasCameraMute
+    {
+        /// <summary>
+        /// Event that is raised when a video unmute is requested, typically by the far end
+        /// </summary>
+        event EventHandler VideoUnmuteRequested;
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraOff.cs

@@ -0,0 +1,27 @@
+using PepperDash.Essentials.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+
+
+    /// <summary>
+    /// To be implmented on codecs that can disable their camera(s) to blank the near end video
+    /// </summary>
+    public interface IHasCameraOff : IHasCameraControls
+    {
+        /// <summary>
+        /// Feedback that indicates whether the camera is off
+        /// </summary>
+        BoolFeedback CameraIsOffFeedback { get; }
+
+        /// <summary>
+        /// Turns the camera off, blanking the near end video
+        /// </summary>
+        void CameraOff();
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraPanControl.cs

@@ -0,0 +1,24 @@
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Interface for camera pan control
+    /// </summary>
+    public interface IHasCameraPanControl : IHasCameraControls
+    {
+        /// <summary>
+        /// Pans the camera left
+        /// </summary>
+        void PanLeft();
+
+        /// <summary>
+        /// Pans the camera right
+        /// </summary>
+        void PanRight();
+
+        /// <summary>
+        /// Stops the camera pan movement
+        /// </summary>
+        void PanStop();
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraPtzControl.cs

@@ -0,0 +1,14 @@
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Defines the contract for IHasCameraPtzControl
+    /// </summary>
+    public interface IHasCameraPtzControl : IHasCameraPanControl, IHasCameraTiltControl, IHasCameraZoomControl
+    {
+        /// <summary>
+        /// Resets the camera position
+        /// </summary>
+        void PositionHome();
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraTiltControl.cs

@@ -0,0 +1,24 @@
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Defines the contract for IHasCameraTiltControl
+    /// </summary>
+    public interface IHasCameraTiltControl : IHasCameraControls
+    {
+        /// <summary>
+        /// Tilts the camera down
+        /// </summary>
+        void TiltDown();
+
+        /// <summary>
+        /// Tilts the camera up
+        /// </summary>
+        void TiltUp();
+
+        /// <summary>
+        /// Stops the camera tilt movement
+        /// </summary>
+        void TiltStop();
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraZoomControl.cs

@@ -0,0 +1,24 @@
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Defines the contract for IHasCameraZoomControl
+    /// </summary>
+    public interface IHasCameraZoomControl : IHasCameraControls
+    {
+        /// <summary>
+        /// Zooms the camera in
+        /// </summary>
+        void ZoomIn();
+
+        /// <summary>
+        /// Zooms the camera out
+        /// </summary>
+        void ZoomOut();
+
+        /// <summary>
+        /// Stops the camera zoom movement
+        /// </summary>
+        void ZoomStop();
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameras.cs

@@ -0,0 +1,40 @@
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Interface for devices that have cameras
+    /// </summary>
+    [Obsolete("Use IHasCamerasWithControls instead. This interface will be removed in a future version")]
+    public interface IHasCameras : IKeyName
+    {
+        /// <summary>
+        /// Event that is raised when a camera is selected
+        /// </summary>
+        event EventHandler<CameraSelectedEventArgs> CameraSelected;
+
+        /// <summary>
+        /// List of cameras on the device.  This should be a list of CameraBase objects
+        /// </summary>
+        List<CameraBase> Cameras { get; }
+
+        /// <summary>
+        /// The currently selected camera.  This should be a CameraBase object
+        /// </summary>
+        CameraBase SelectedCamera { get; }
+
+        /// <summary>
+        /// Feedback that indicates the currently selected camera
+        /// </summary>
+        StringFeedback SelectedCameraFeedback { get; }
+
+        /// <summary>
+        /// Selects a camera from the list of available cameras based on the provided key.
+        /// </summary>
+        /// <param name="key">The unique identifier or name of the camera to select.</param>
+        void SelectCamera(string key);
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCamerasWithControls.cs

@@ -0,0 +1,39 @@
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Interface for devices that have cameras with controls
+    /// </summary>
+    public interface IHasCamerasWithControls : IKeyName, IKeyed
+    {
+        /// <summary>
+        /// List of cameras on the device. This should be a list of IHasCameraControls objects
+        /// </summary>
+        List<IHasCameraControls> Cameras { get; }
+
+        /// <summary>
+        /// The currently selected camera. This should be an IHasCameraControls object
+        /// </summary>
+        IHasCameraControls SelectedCamera { get; }
+
+        /// <summary>
+        /// Feedback that indicates the currently selected camera
+        /// </summary>
+        StringFeedback SelectedCameraFeedback { get; }
+
+        /// <summary>
+        /// Event that is raised when a camera is selected
+        /// </summary>
+        event EventHandler<CameraSelectedEventArgs<IHasCameraControls>> CameraSelected;
+
+        /// <summary>
+        /// Selects a camera from the list of available cameras based on the provided key.
+        /// </summary>
+        /// <param name="key"></param>
+        void SelectCamera(string key);
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCodecCameras.cs

@@ -0,0 +1,13 @@
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+
+    /// <summary>
+    /// Defines the contract for IHasCodecCameras
+    /// </summary>
+    public interface IHasCodecCameras : IHasCameras, IHasFarEndCameraControl
+    {
+
+    }
+
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasFarEndCameraControl.cs

@@ -0,0 +1,23 @@
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Interface for devices that have a far end camera control
+    /// </summary>
+    public interface IHasFarEndCameraControl : IKeyName
+    {
+        /// <summary>
+        /// Gets the far end camera, which is typically a CameraBase object that represents the camera at the far end of a call
+        /// </summary>
+        CameraBase FarEndCamera { get; }
+
+        /// <summary>
+        /// Feedback that indicates whether the far end camera is being controlled
+        /// </summary>
+        BoolFeedback ControllingFarEndCameraFeedback { get; }
+
+    }
+}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/eCameraControlMode.cs

@@ -0,0 +1,24 @@
+
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Enum for camera control modes
+    /// </summary>
+    public enum eCameraControlMode
+    {
+        /// <summary>
+        /// Manual control mode, where the camera is controlled directly by the user or system
+        /// </summary>
+        Manual = 0,
+        /// <summary>
+        /// Off control mode, where the camera is turned off or disabled
+        /// </summary>
+        Off,
+        /// <summary>
+        ///  Auto control mode, where the camera automatically adjusts settings based on the environment or conditions
+        /// </summary>
+        Auto
+    }
+
+}

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceVolumeMessenger.cs

@@ -3,6 +3,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
+using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.AppServer.Messengers
@@ -12,7 +13,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class DeviceVolumeMessenger : MessengerBase
     {
-        private readonly IBasicVolumeWithFeedback _localDevice;
+        private readonly IBasicVolumeControls device;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DeviceVolumeMessenger"/> class.
@@ -20,27 +21,32 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// <param name="key">The key.</param>
         /// <param name="messagePath">The message path.</param>
         /// <param name="device">The device.</param>
-        public DeviceVolumeMessenger(string key, string messagePath, IBasicVolumeWithFeedback device)
+        public DeviceVolumeMessenger(string key, string messagePath, IBasicVolumeControls device)
             : base(key, messagePath, device as IKeyName)
         {
-            _localDevice = device;
+            this.device = device;
         }
 
         private void SendStatus(string id = null)
         {
             try
             {
+                if (!(device is IBasicVolumeWithFeedback feedbackDevice))
+                {
+                    return;
+                }
+
                 var messageObj = new VolumeStateMessage
                 {
                     Volume = new Volume
                     {
-                        Level = _localDevice?.VolumeLevelFeedback.IntValue ?? -1,
-                        Muted = _localDevice?.MuteFeedback.BoolValue ?? false,
+                        Level = feedbackDevice?.VolumeLevelFeedback.IntValue ?? -1,
+                        Muted = feedbackDevice?.MuteFeedback.BoolValue ?? false,
                         HasMute = true,  // assume all devices have mute for now
                     }
                 };
 
-                if (_localDevice is IBasicVolumeWithFeedbackAdvanced volumeAdvanced)
+                if (device is IBasicVolumeWithFeedbackAdvanced volumeAdvanced)
                 {
                     messageObj.Volume.RawValue = volumeAdvanced.RawVolumeLevel.ToString();
                     messageObj.Volume.Units = volumeAdvanced.Units;
@@ -59,6 +65,44 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// <inheritdoc />
         protected override void RegisterActions()
         {
+            AddAction("/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) =>
+                        {
+                            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume up with {value}", DeviceKey, b);
+                            try
+                            {
+                                device.VolumeUp(b);
+                            }
+                            catch (Exception ex)
+                            {
+                                Debug.LogMessage(ex, "Got exception during volume up: {Exception}", null, ex);
+                            }
+                        }));
+
+            AddAction("/muteToggle", (id, content) =>
+                        {
+                            device.MuteToggle();
+                        });
+
+            AddAction("/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) =>
+            {
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume down with {value}", DeviceKey, b);
+
+                try
+                {
+                    device.VolumeDown(b);
+                }
+                catch (Exception ex)
+                {
+                    Debug.LogMessage(ex, "Got exception during volume down: {Exception}", null, ex);
+                }
+            }));
+
+            if (!(device is IBasicVolumeWithFeedback feedback))
+            {
+                this.LogDebug("Skipping feedback methods for {deviceKey}", (device as IKeyName)?.Key);
+                return;
+            }
+
             AddAction("/fullStatus", (id, content) => SendStatus(id));
 
             AddAction("/volumeStatus", (id, content) => SendStatus(id));
@@ -67,54 +111,24 @@ namespace PepperDash.Essentials.AppServer.Messengers
             {
                 var volume = content.ToObject<MobileControlSimpleContent<ushort>>();
 
-                _localDevice.SetVolume(volume.Value);
+                feedback.SetVolume(volume.Value);
             });
 
-            AddAction("/muteToggle", (id, content) =>
-            {
-                _localDevice.MuteToggle();
-            });
+
 
             AddAction("/muteOn", (id, content) =>
             {
-                _localDevice.MuteOn();
+                feedback.MuteOn();
             });
 
             AddAction("/muteOff", (id, content) =>
             {
-                _localDevice.MuteOff();
+                feedback.MuteOff();
             });
 
-            AddAction("/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) =>
-            {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume up with {value}", DeviceKey, b);
-                try
-                {
-                    _localDevice.VolumeUp(b);
-                }
-                catch (Exception ex)
-                {
-                    Debug.LogMessage(ex, "Got exception during volume up: {Exception}", null, ex);
-                }
-            }));
 
 
-
-            AddAction("/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) =>
-            {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume down with {value}", DeviceKey, b);
-
-                try
-                {
-                    _localDevice.VolumeDown(b);
-                }
-                catch (Exception ex)
-                {
-                    Debug.LogMessage(ex, "Got exception during volume down: {Exception}", null, ex);
-                }
-            }));
-
-            _localDevice.MuteFeedback.OutputChange += (sender, args) =>
+            feedback.MuteFeedback.OutputChange += (sender, args) =>
             {
                 PostStatusMessage(JToken.FromObject(
                         new
@@ -127,10 +141,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 );
             };
 
-            _localDevice.VolumeLevelFeedback.OutputChange += (sender, args) =>
+            feedback.VolumeLevelFeedback.OutputChange += (sender, args) =>
             {
                 var rawValue = "";
-                if (_localDevice is IBasicVolumeWithFeedbackAdvanced volumeAdvanced)
+                if (feedback is IBasicVolumeWithFeedbackAdvanced volumeAdvanced)
                 {
                     rawValue = volumeAdvanced.RawVolumeLevel.ToString();
                 }
@@ -146,8 +160,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
                 PostStatusMessage(JToken.FromObject(message));
             };
-
-
         }
 
         #endregion

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCamerasMessenger.cs

@@ -1,17 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
 using PepperDash.Essentials.Devices.Common.Cameras;
+using System;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
     /// <summary>
     /// Messenger for devices that implement the IHasCameras interface.
     /// </summary>
+    [Obsolete("Use IHasCamerasWithControlsMessenger instead. This class will be removed in a future version")]
     public class IHasCamerasMessenger : MessengerBase
     {
         /// <summary>

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCamerasWithControlMessenger.cs

@@ -0,0 +1,99 @@
+using Newtonsoft.Json;
+using PepperDash.Essentials.Devices.Common.Cameras;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    /// <summary>
+    /// Messenger for devices that implement the IHasCameras interface.
+    /// </summary>
+    public class IHasCamerasWithControlMessenger : MessengerBase
+    {
+        /// <summary>
+        /// Device being bridged that implements IHasCameras interface.
+        /// </summary>
+        public IHasCamerasWithControls CameraController { get; private set; }
+
+        /// <summary>
+        /// Messenger for devices that implement IHasCameras interface.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="cameraController"></param>
+        /// <param name="messagePath"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public IHasCamerasWithControlMessenger(string key, string messagePath, IHasCamerasWithControls cameraController)
+            : base(key, messagePath, cameraController)
+        {
+            CameraController = cameraController ?? throw new ArgumentNullException("cameraController");
+            CameraController.CameraSelected += CameraController_CameraSelected;
+        }
+
+        private void CameraController_CameraSelected(object sender, CameraSelectedEventArgs<IHasCameraControls> e)
+        {
+            PostStatusMessage(new IHasCamerasWithControlsStateMessage
+            {
+                SelectedCamera = e.SelectedCamera
+            });
+        }
+
+        /// <summary>
+        /// Registers the actions for this messenger.
+        /// </summary>
+        /// <exception cref="ArgumentException"></exception>
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, context) => SendFullStatus(id));
+
+            AddAction("/cameraListStatus", (id, content) => SendFullStatus(id));
+
+            AddAction("/selectCamera", (id, content) =>
+            {
+                var cameraKey = content?.ToObject<string>();
+
+                if (!string.IsNullOrEmpty(cameraKey))
+                {
+                    CameraController.SelectCamera(cameraKey);
+                }
+                else
+                {
+                    throw new ArgumentException("Content must be a string representing the camera key");
+                }
+            });
+        }
+
+        private void SendFullStatus(string clientId)
+        {
+            var state = new IHasCamerasWithControlsStateMessage
+            {
+                CameraList = CameraController.Cameras,
+                SelectedCamera = CameraController.SelectedCamera
+            };
+
+            PostStatusMessage(state, clientId);
+        }
+
+
+    }
+
+    /// <summary>
+    /// State message for devices that implement the IHasCameras interface.
+    /// </summary>
+    public class IHasCamerasWithControlsStateMessage : DeviceStateMessageBase
+    {
+        /// <summary>
+        /// List of cameras available in the device.
+        /// </summary>
+        [JsonProperty("cameraList", NullValueHandling = NullValueHandling.Ignore)]
+        public List<IHasCameraControls> CameraList { get; set; }
+
+        /// <summary>
+        /// The currently selected camera on the device.
+        /// </summary>
+        [JsonProperty("selectedCamera", NullValueHandling = NullValueHandling.Ignore)]
+        public IHasCameraControls SelectedCamera { get; set; }
+
+    }
+}

src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs

@@ -499,15 +499,15 @@ namespace PepperDash.Essentials
                         messengerAdded = true;
                     }
 
-                    if (device is IBasicVolumeWithFeedback)
+                    if (device is IBasicVolumeControls)
                     {
                         var deviceKey = device.Key;
                         this.LogVerbose(
-                            "Adding IBasicVolumeControlWithFeedback for {deviceKey}",
+                            "Adding IBasicVolumeControls for {deviceKey}",
                             deviceKey
                         );
 
-                        var volControlDevice = device as IBasicVolumeWithFeedback;
+                        var volControlDevice = device as IBasicVolumeControls;
                         var messenger = new DeviceVolumeMessenger(
                             $"{device.Key}-volume-{Key}",
                             string.Format("/device/{0}", deviceKey),
@@ -975,6 +975,19 @@ namespace PepperDash.Essentials
                         messengerAdded = true;
                     }
 
+                    if (device is IHasCamerasWithControls cameras2)
+                    {
+                        this.LogVerbose("Adding IHasCamerasMessenger for {deviceKey}", device.Key
+                        );
+                        var messenger = new IHasCamerasWithControlMessenger(
+                            $"{device.Key}-cameras-{Key}",
+                            $"/device/{device.Key}",
+                            cameras2
+                        );
+                        AddDefaultDeviceMessenger(messenger);
+                        messengerAdded = true;
+                    }
+
                     this.LogVerbose("Trying to cast to generic device for device: {key}", device.Key);
 
                     if (device is EssentialsDevice)
@@ -2233,8 +2246,21 @@ namespace PepperDash.Essentials
                 return;
             }
 
+            if (_roomCombiner.CurrentScenario == null)
+            {
+                var message = new MobileControlMessage
+                {
+                    Type = "/system/roomKey",
+                    ClientId = clientId,
+                    Content = roomKey
+                };
+                SendMessageObject(message);
+                return;
+            }
+
             if (!_roomCombiner.CurrentScenario.UiMap.ContainsKey(roomKey))
             {
+
                 this.LogWarning(
                     "Unable to find correct roomKey for {roomKey} in current scenario. Returning {roomKey} as roomKey", roomKey);
 

src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs

@@ -203,10 +203,18 @@ namespace PepperDash.Essentials.Touchpanel
                 this.csSubnetMask = IPAddress.Parse(csSubnetMask);
                 this.csIpAddress = IPAddress.Parse(csIpAddress);
             }
-            catch
+            catch (ArgumentException)
             {
                 Debug.LogInformation("This processor does not have a CS LAN", this);
             }
+            catch (InvalidOperationException)
+            {
+                Debug.LogInformation("This processor does not have a CS LAN", this);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogError($"Unexpected exception when checking CS LAN: {ex}", this);
+            }
         }
 
         /// <summary>