Finalize CallStatusMessenger implementation - remove test files and verify clean implementation

Co-authored-by: ngenovese11 <23391587+ngenovese11@users.noreply.github.com>

.gitignore

@@ -395,4 +395,3 @@ essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/Pepp
 _site/
 api/
 *.DS_Store
-/._PepperDash.Essentials.4Series.sln

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.15.1-local</Version>
+    <Version>2.12.1-local</Version>
     <InformationalVersion>$(Version)</InformationalVersion>
     <Authors>PepperDash Technology</Authors>
     <Company>PepperDash Technology</Company>

src/PepperDash.Core/Comm/eControlMethods.cs

@@ -74,10 +74,6 @@ namespace PepperDash.Core
         /// <summary>
         /// Secure TCP/IP
         /// </summary>
-        SecureTcpIp,
+        SecureTcpIp
-        /// <summary>
-        /// Used when comms needs to be handled in SIMPL and bridged opposite the normal direction
-        /// </summary>
-        ComBridge
     }
 }

src/PepperDash.Essentials.Core/Bridges/IBridge.cs

@@ -7,13 +7,6 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public interface IBridgeAdvanced
     {
-        /// <summary>
-        /// Links the bridge to the API using the provided trilist, join start, join map key, and bridge.
-        /// </summary>
-        /// <param name="trilist">The trilist to link to.</param>
-        /// <param name="joinStart">The starting join number.</param>
-        /// <param name="joinMapKey">The key for the join map.</param>
-        /// <param name="bridge">The EISC API bridge.</param>
         void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
     }
 }

src/PepperDash.Essentials.Core/Comm and IR/CommBridge.cs

@@ -1,138 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Crestron.SimplSharp.CrestronSockets;
-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 PepperDash.Essentials.Core.Devices;
-
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Implements IBasicCommunication and sends all communication through an EISC
-    /// </summary>
-    [Description("Generic communication wrapper class for any IBasicCommunication type")]
-    public class CommBridge : EssentialsBridgeableDevice, IBasicCommunication
-    {
-        private EiscApiAdvanced eisc;
-
-        private IBasicCommunicationJoinMap joinMap;
-
-        /// <summary>
-        /// Event triggered when text is received through the communication bridge.
-        /// </summary>
-        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
-
-        /// <summary>
-        /// Event triggered when bytes are received through the communication bridge.
-        /// </summary>
-        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
-
-        /// <summary>
-        /// Indicates whether the communication bridge is currently connected.
-        /// </summary>
-        public bool IsConnected { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommBridge"/> class.
-        /// </summary>
-        /// <param name="key">The unique key for the communication bridge.</param>
-        /// <param name="name">The display name for the communication bridge.</param>
-        public CommBridge(string key, string name)
-            : base(key, name)
-        {
-
-        }
-
-        /// <summary>
-        /// Sends a byte array through the communication bridge.
-        /// </summary>
-        /// <param name="bytes">The byte array to send.</param>
-        public void SendBytes(byte[] bytes)
-        {
-            if (eisc == null)
-            {
-                this.LogWarning("EISC is null, cannot send bytes.");
-                return;
-            }
-            eisc.Eisc.SetString(joinMap.SendText.JoinNumber, Encoding.ASCII.GetString(bytes, 0, bytes.Length));
-        }
-
-        /// <summary>
-        /// Sends a text string through the communication bridge.
-        /// </summary>
-        /// <param name="text">The text string to send.</param>
-        public void SendText(string text)
-        {
-            if (eisc == null)
-            {
-                this.LogWarning("EISC is null, cannot send text.");
-                return;
-            }
-            eisc.Eisc.SetString(joinMap.SendText.JoinNumber, text);
-        }
-
-        /// <summary>
-        /// Initiates a connection through the communication bridge.
-        /// </summary>
-        public void Connect()
-        {
-            if (eisc == null)
-            {
-                this.LogWarning("EISC is null, cannot connect.");
-                return;
-            }
-            eisc.Eisc.SetBool(joinMap.Connect.JoinNumber, true);
-        }
-
-        /// <summary>
-        /// Terminates the connection through the communication bridge.
-        /// </summary>
-        public void Disconnect()
-        {
-            if (eisc == null)
-            {
-                this.LogWarning("EISC is null, cannot disconnect.");
-                return;
-            }
-            eisc.Eisc.SetBool(joinMap.Connect.JoinNumber, false);
-        }
-
-        /// <inheritdoc />
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            joinMap = new IBasicCommunicationJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<IBasicCommunicationJoinMap>(joinMapSerialized);
-
-            if (bridge != null)
-            {
-                bridge.AddJoinMap(Key, joinMap);
-            }
-            else
-            {
-                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
-
-            this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            eisc = bridge;
-
-            trilist.SetBoolSigAction(joinMap.Connected.JoinNumber, (b) => IsConnected = b);
-
-            trilist.SetStringSigAction(joinMap.TextReceived.JoinNumber, (s) =>
-            {
-                TextReceived?.Invoke(this, new GenericCommMethodReceiveTextArgs(s));
-                BytesReceived?.Invoke(this, new GenericCommMethodReceiveBytesArgs(Encoding.ASCII.GetBytes(s)));
-            });
-        }
-    }
-}

src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs

@@ -1,9 +1,11 @@
 
 
 using System;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DM;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
@@ -36,9 +38,9 @@ namespace PepperDash.Essentials.Core
 		/// Returns a comm method of either com port, TCP, SSH, and puts this into the DeviceManager
 		/// </summary>
 		/// <param name="deviceConfig">The Device config object</param>
-		/// <summary>
+  /// <summary>
-		/// CreateCommForDevice method
+  /// CreateCommForDevice method
-		/// </summary>
+  /// </summary>
 		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
 		{
 			EssentialsControlPropertiesConfig controlConfig = GetControlPropertiesConfig(deviceConfig);
@@ -54,38 +56,35 @@ namespace PepperDash.Essentials.Core
 					case eControlMethod.Com:
 						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams.Value, controlConfig);
 						break;
-					case eControlMethod.ComBridge:
+                    case eControlMethod.Cec:
-						comm = new CommBridge(deviceConfig.Key + "-simpl", deviceConfig.Name + " Simpl");
+                        comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
-						break;
+                        break;
-					case eControlMethod.Cec:
-						comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
-						break;
 					case eControlMethod.IR:
 						break;
-					case eControlMethod.Ssh:
+                    case eControlMethod.Ssh:
-						{
+                        {
-							var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
+                            var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
-							ssh.AutoReconnect = c.AutoReconnect;
+                            ssh.AutoReconnect = c.AutoReconnect;
-							if (ssh.AutoReconnect)
+                            if(ssh.AutoReconnect)
-								ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                                ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-							comm = ssh;
+                            comm = ssh;
-							break;
+                            break;
-						}
+                        }
-					case eControlMethod.Tcpip:
+                    case eControlMethod.Tcpip:
-						{
+                        {
-							var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
+                            var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
-							tcp.AutoReconnect = c.AutoReconnect;
+                            tcp.AutoReconnect = c.AutoReconnect;
-							if (tcp.AutoReconnect)
+                            if (tcp.AutoReconnect)
-								tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                                tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-							comm = tcp;
+                            comm = tcp;
-							break;
+                            break;
-						}
+                        }
-					case eControlMethod.Udp:
+                    case eControlMethod.Udp:
-						{
+                        {
-							var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
+                            var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
-							comm = udp;
+                            comm = udp;
-							break;
+                            break;
-						}
+                        }
 					case eControlMethod.Telnet:
 						break;
 					case eControlMethod.SecureTcpIp:
@@ -108,14 +107,15 @@ namespace PepperDash.Essentials.Core
 			}
 
 			// put it in the device manager if it's the right flavor
-			if (comm is Device comDev)
+			var comDev = comm as Device;
+			if (comDev != null)
 				DeviceManager.AddDevice(comDev);
 			return comm;
 		}
 
-		/// <summary>
+  /// <summary>
-		/// GetComPort method
+  /// GetComPort method
-		/// </summary>
+  /// </summary>
 		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
 		{
 			var comPar = config.ComParams;
@@ -126,74 +126,74 @@ namespace PepperDash.Essentials.Core
 			return null;
 		}
 
-		/// <summary>
+        /// <summary>
-		///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
+        ///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
-		/// </summary>
+        /// </summary>
-		/// <param name="config"></param>
+        /// <param name="config"></param>
-		/// <returns></returns>
+        /// <returns></returns>
-		/// <summary>
+        /// <summary>
-		/// GetCecPort method
+        /// GetCecPort method
-		/// </summary>
+        /// </summary>
-		public static ICec GetCecPort(ControlPropertiesConfig config)
+        public static ICec GetCecPort(ControlPropertiesConfig config)
-		{
+        {
-			try
+	        try
-			{
+	        {
-				var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
+		        var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
 
-				Debug.LogMessage(LogEventLevel.Information, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null
+		        Debug.LogMessage(LogEventLevel.Information, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null
-					? "is not valid, failed to get cec port"
+			        ? "is not valid, failed to get cec port"
-					: "found in device manager, attempting to get cec port");
+			        : "found in device manager, attempting to get cec port");
 
-				if (dev == null)
+		        if (dev == null)
-					return null;
+			        return null;
 
-				if (String.IsNullOrEmpty(config.ControlPortName))
+		        if (String.IsNullOrEmpty(config.ControlPortName))
-				{
+		        {
-					Debug.LogMessage(LogEventLevel.Information, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
+			        Debug.LogMessage(LogEventLevel.Information, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
-					return null;
+			        return null;
-				}
+		        }
 
 
-				var inputsOutputs = dev as IRoutingInputsOutputs;
+		        var inputsOutputs = dev as IRoutingInputsOutputs;
-				if (inputsOutputs == null)
+		        if (inputsOutputs == null)
-				{
+		        {
 					Debug.LogMessage(LogEventLevel.Information, "GetCecPort: Device '{0}' does not support IRoutingInputsOutputs, failed to get CEC port called '{1}'",
 						config.ControlPortDevKey, config.ControlPortName);
 
-					return null;
+			        return null;
-				}
+		        }
 
 				var inputPort = inputsOutputs.InputPorts[config.ControlPortName];
-				if (inputPort != null && inputPort.Port is ICec)
+		        if (inputPort != null && inputPort.Port is ICec)
 					return inputPort.Port as ICec;
 		        
 
-				var outputPort = inputsOutputs.OutputPorts[config.ControlPortName];
+		        var outputPort = inputsOutputs.OutputPorts[config.ControlPortName];
-				if (outputPort != null && outputPort.Port is ICec)
+		        if (outputPort != null && outputPort.Port is ICec)
 					return outputPort.Port as ICec;		        
-			}
+	        }
-			catch (Exception ex)
+	        catch (Exception ex)
-			{
+	        {
-				Debug.LogMessage(LogEventLevel.Debug, "GetCecPort Exception Message: {0}", ex.Message);
+		        Debug.LogMessage(LogEventLevel.Debug, "GetCecPort Exception Message: {0}", ex.Message);
-				Debug.LogMessage(LogEventLevel.Verbose, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
+		        Debug.LogMessage(LogEventLevel.Verbose, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
-				if (ex.InnerException != null)
+		        if (ex.InnerException != null)
-					Debug.LogMessage(LogEventLevel.Information, "GetCecPort Exception InnerException: {0}", ex.InnerException);
+			        Debug.LogMessage(LogEventLevel.Information, "GetCecPort Exception InnerException: {0}", ex.InnerException);				
-			}
+	        }
 
 			Debug.LogMessage(LogEventLevel.Information, "GetCecPort: Device '{0}' does not have a CEC port called '{1}'",
 					config.ControlPortDevKey, config.ControlPortName);
 
 			return null;
-		}
+        }
 
 		/// <summary>
 		/// Helper to grab the IComPorts device for this PortDeviceKey. Key "controlSystem" will
 		/// return the ControlSystem object from the Global class.
 		/// </summary>
 		/// <returns>IComPorts device or null if the device is not found or does not implement IComPorts</returns>
-		/// <summary>
+  /// <summary>
-		/// GetIComPortsDeviceFromManagedDevice method
+  /// GetIComPortsDeviceFromManagedDevice method
-		/// </summary>
+  /// </summary>
 		public static IComPorts GetIComPortsDeviceFromManagedDevice(string ComPortDevKey)
 		{
 			if ((ComPortDevKey.Equals("controlSystem", System.StringComparison.OrdinalIgnoreCase)
@@ -210,81 +210,81 @@ namespace PepperDash.Essentials.Core
 		}
 	}
 
-	/// <summary>
+    /// <summary>
-	/// Represents a EssentialsControlPropertiesConfig
+    /// Represents a EssentialsControlPropertiesConfig
-	/// </summary>
+    /// </summary>
-	public class EssentialsControlPropertiesConfig :
+    public class EssentialsControlPropertiesConfig :
-			ControlPropertiesConfig
+        ControlPropertiesConfig
-	{
+    {
 
-		[JsonProperty("comParams", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonProperty("comParams", NullValueHandling = NullValueHandling.Ignore)]
-		[JsonConverter(typeof(ComSpecJsonConverter))]
+        [JsonConverter(typeof(ComSpecJsonConverter))]
-		public ComPort.ComPortSpec? ComParams { get; set; }
+        public ComPort.ComPortSpec? ComParams { get; set; }
 
-		[JsonProperty("cresnetId", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonProperty("cresnetId", NullValueHandling = NullValueHandling.Ignore)]
-		public string CresnetId { get; set; }
+        public string CresnetId { get; set; }
 
-		/// <summary>
+        /// <summary>
-		/// Attempts to provide uint conversion of string CresnetId
+        /// Attempts to provide uint conversion of string CresnetId
-		/// </summary>
+        /// </summary>
-		[JsonIgnore]
+        [JsonIgnore]
-		public uint CresnetIdInt
+        public uint CresnetIdInt
-		{
+        {
-			get
+            get
-			{
+            {
-				try
+                try
-				{
+                {
-					return Convert.ToUInt32(CresnetId, 16);
+                    return Convert.ToUInt32(CresnetId, 16);
-				}
+                }
-				catch (Exception)
+                catch (Exception)
-				{
+                {
-					throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
+                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
-				}
+                }
-			}
+            }
-		}
+        }
 
-		[JsonProperty("infinetId", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonProperty("infinetId", NullValueHandling = NullValueHandling.Ignore)]
-		/// <summary>
+        /// <summary>
-		/// Gets or sets the InfinetId
+        /// Gets or sets the InfinetId
-		/// </summary>
+        /// </summary>
-		public string InfinetId { get; set; }
+        public string InfinetId { get; set; }
 
-		/// <summary>
+        /// <summary>
-		/// Attepmts to provide uiont conversion of string InifinetId
+        /// Attepmts to provide uiont conversion of string InifinetId
-		/// </summary>
+        /// </summary>
-		[JsonIgnore]
+        [JsonIgnore]
-		public uint InfinetIdInt
+        public uint InfinetIdInt
-		{
+        {
-			get
+            get
-			{
+            {
-				try
+                try
-				{
+                {
-					return Convert.ToUInt32(InfinetId, 16);
+                    return Convert.ToUInt32(InfinetId, 16);
-				}
+                }
-				catch (Exception)
+                catch (Exception)
-				{
+                {
-					throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
+                    throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
-				}
+                }
-			}
+            }
-		}
+        }
-	}
+    }
 
-	/// <summary>
+    /// <summary>
-	/// Represents a IrControlSpec
+    /// Represents a IrControlSpec
-	/// </summary>
+    /// </summary>
-	public class IrControlSpec
+    public class IrControlSpec
-	{
+    {
-		/// <summary>
+        /// <summary>
-		/// Gets or sets the PortDeviceKey
+        /// Gets or sets the PortDeviceKey
-		/// </summary>
+        /// </summary>
-		public string PortDeviceKey { get; set; }
+        public string PortDeviceKey { get; set; }
-		/// <summary>
+        /// <summary>
-		/// Gets or sets the PortNumber
+        /// Gets or sets the PortNumber
-		/// </summary>
+        /// </summary>
-		public uint PortNumber { get; set; }
+        public uint PortNumber { get; set; }
-		/// <summary>
+        /// <summary>
-		/// Gets or sets the File
+        /// Gets or sets the File
-		/// </summary>
+        /// </summary>
-		public string File { get; set; }
+        public string File { get; set; }
-	}
+    }
 }

src/PepperDash.Essentials.Core/Config/BaseStreamingDeviceProperties.cs

@@ -19,11 +19,5 @@ namespace PepperDash.Essentials.Core.Config
     /// </summary>
     [JsonProperty("multicastAudioAddress", NullValueHandling = NullValueHandling.Ignore)]
     public string MulticastAudioAddress { get; set; }
-
-    /// <summary>
-    /// The URL for the streaming device's media stream.
-    /// </summary>
-    [JsonProperty("streamUrl", NullValueHandling = NullValueHandling.Ignore)]
-    public string StreamUrl { get; set; }
   }
 }

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

@@ -3,29 +3,16 @@ using PepperDash.Essentials.Core.Bridges;
 
 namespace PepperDash.Essentials.Core
 {
-    /// <summary>
+    public abstract class EssentialsBridgeableDevice:EssentialsDevice, IBridgeAdvanced
-    /// Base class for devices that can be bridged to an EISC API.
-    /// </summary>
-    public abstract class EssentialsBridgeableDevice : EssentialsDevice, IBridgeAdvanced
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EssentialsBridgeableDevice"/> class with the specified key.
-        /// </summary>
-        /// <param name="key">The unique key for the device.</param>
         protected EssentialsBridgeableDevice(string key) : base(key)
         {
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EssentialsBridgeableDevice"/> class with the specified key and name.
-        /// </summary>
-        /// <param name="key">The unique key for the device.</param>
-        /// <param name="name">The display name for the device.</param>
         protected EssentialsBridgeableDevice(string key, string name) : base(key, name)
         {
         }
 
-        /// <inheritdoc />
         public abstract void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
     }
 }

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

@@ -0,0 +1,221 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Core.Logging;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common.Codec;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    /// <summary>
+    /// Provides a messaging bridge for devices that implement call status interfaces
+    /// without requiring VideoCodecBase inheritance
+    /// </summary>
+    public class CallStatusMessenger : MessengerBase
+    {
+        /// <summary>
+        /// Device with dialer capabilities
+        /// </summary>
+        protected IHasDialer Dialer { get; private set; }
+
+        /// <summary>
+        /// Device with content sharing capabilities (optional)
+        /// </summary>
+        protected IHasContentSharing ContentSharing { get; private set; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="dialer"></param>
+        /// <param name="messagePath"></param>
+        public CallStatusMessenger(string key, IHasDialer dialer, string messagePath)
+            : base(key, messagePath, dialer as IKeyName)
+        {
+            Dialer = dialer ?? throw new ArgumentNullException(nameof(dialer));
+            dialer.CallStatusChange += Dialer_CallStatusChange;
+
+            // Check for optional content sharing interface
+            if (dialer is IHasContentSharing contentSharing)
+            {
+                ContentSharing = contentSharing;
+                contentSharing.SharingContentIsOnFeedback.OutputChange += SharingContentIsOnFeedback_OutputChange;
+                contentSharing.SharingSourceFeedback.OutputChange += SharingSourceFeedback_OutputChange;
+            }
+        }
+
+        /// <summary>
+        /// Handles call status changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Dialer_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
+        {
+            try
+            {
+                SendFullStatus();
+            }
+            catch (Exception ex)
+            {
+                this.LogError(ex, "Error handling call status change: {error}", ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// Handles content sharing status changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SharingContentIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            PostStatusMessage(JToken.FromObject(new
+            {
+                sharingContentIsOn = e.BoolValue
+            }));
+        }
+
+        /// <summary>
+        /// Handles sharing source changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SharingSourceFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            PostStatusMessage(JToken.FromObject(new
+            {
+                sharingSource = e.StringValue
+            }));
+        }
+
+        /// <summary>
+        /// Gets active calls from the dialer
+        /// </summary>
+        /// <returns></returns>
+        private object GetActiveCalls()
+        {
+            // Try to get active calls if the dialer has an ActiveCalls property
+            var dialerType = Dialer.GetType();
+            var activeCallsProperty = dialerType.GetProperty("ActiveCalls");
+            
+            if (activeCallsProperty != null && activeCallsProperty.PropertyType == typeof(System.Collections.Generic.List<CodecActiveCallItem>))
+            {
+                var activeCalls = activeCallsProperty.GetValue(Dialer) as System.Collections.Generic.List<CodecActiveCallItem>;
+                return activeCalls ?? new System.Collections.Generic.List<CodecActiveCallItem>();
+            }
+            
+            // Return basic call status if no ActiveCalls property
+            return new { isInCall = Dialer.IsInCall };
+        }
+
+        /// <summary>
+        /// Sends full status message
+        /// </summary>
+        public void SendFullStatus()
+        {
+            var status = new
+            {
+                isInCall = Dialer.IsInCall,
+                calls = GetActiveCalls()
+            };
+
+            // Add content sharing status if available
+            if (ContentSharing != null)
+            {
+                var statusWithSharing = new
+                {
+                    isInCall = Dialer.IsInCall,
+                    calls = GetActiveCalls(),
+                    sharingContentIsOn = ContentSharing.SharingContentIsOnFeedback.BoolValue,
+                    sharingSource = ContentSharing.SharingSourceFeedback.StringValue
+                };
+                PostStatusMessage(JToken.FromObject(statusWithSharing));
+            }
+            else
+            {
+                PostStatusMessage(JToken.FromObject(status));
+            }
+        }
+
+        /// <summary>
+        /// Registers actions for call control
+        /// </summary>
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+            
+            // Basic call control actions
+            AddAction("/dial", (id, content) =>
+            {
+                var msg = content.ToObject<MobileControlSimpleContent<string>>();
+                Dialer.Dial(msg.Value);
+            });
+
+            AddAction("/endAllCalls", (id, content) => Dialer.EndAllCalls());
+
+            AddAction("/dtmf", (id, content) =>
+            {
+                var msg = content.ToObject<MobileControlSimpleContent<string>>();
+                Dialer.SendDtmf(msg.Value);
+            });
+
+            // Call-specific actions (if active calls are available)
+            AddAction("/endCallById", (id, content) =>
+            {
+                var msg = content.ToObject<MobileControlSimpleContent<string>>();
+                var call = GetCallWithId(msg.Value);
+                if (call != null)
+                    Dialer.EndCall(call);
+            });
+
+            AddAction("/acceptById", (id, content) =>
+            {
+                var msg = content.ToObject<MobileControlSimpleContent<string>>();
+                var call = GetCallWithId(msg.Value);
+                if (call != null)
+                    Dialer.AcceptCall(call);
+            });
+
+            AddAction("/rejectById", (id, content) =>
+            {
+                var msg = content.ToObject<MobileControlSimpleContent<string>>();
+                var call = GetCallWithId(msg.Value);
+                if (call != null)
+                    Dialer.RejectCall(call);
+            });
+
+            // Content sharing actions if available
+            if (ContentSharing != null)
+            {
+                AddAction("/startSharing", (id, content) => ContentSharing.StartSharing());
+                AddAction("/stopSharing", (id, content) => ContentSharing.StopSharing());
+            }
+        }
+
+        /// <summary>
+        /// Finds a call by ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        private CodecActiveCallItem GetCallWithId(string id)
+        {
+            // Try to get call using reflection for ActiveCalls property
+            var dialerType = Dialer.GetType();
+            var activeCallsProperty = dialerType.GetProperty("ActiveCalls");
+            
+            if (activeCallsProperty != null && activeCallsProperty.PropertyType == typeof(System.Collections.Generic.List<CodecActiveCallItem>))
+            {
+                var activeCalls = activeCallsProperty.GetValue(Dialer) as System.Collections.Generic.List<CodecActiveCallItem>;
+                if (activeCalls != null)
+                {
+                    return activeCalls.FirstOrDefault(c => c.Id.Equals(id));
+                }
+            }
+            
+            return null;
+        }
+    }
+}

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

@@ -140,19 +140,17 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
             if (Camera is IHasCameraPresets presetsCamera)
             {
-                AddAction("/recallPreset", (id, content) =>
+                for (int i = 1; i <= 6; i++)
                 {
-                    var msg = content.ToObject<MobileControlSimpleContent<int>>();
+                    var preset = i;
+                    AddAction("/cameraPreset" + i, (id, content) =>
+                    {
+                        var msg = content.ToObject<MobileControlSimpleContent<int>>();
 
-                    presetsCamera.PresetSelect(msg.Value);
+                        presetsCamera.PresetSelect(msg.Value);
-                });
+                    });
 
-                AddAction("/storePreset", (id, content) =>
+                }
-                {
-                    var msg = content.ToObject<MobileControlSimpleContent<int>>();
-
-                    presetsCamera.PresetStore(msg.Value, string.Empty);
-                });
             }
         }
 
@@ -166,8 +164,9 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 return;
             }
 
-            timerHandler(Camera.Key, cameraAction);
+            timerHandler(state.Value, cameraAction);
 
+            cameraAction(state.Value.Equals("true", StringComparison.InvariantCultureIgnoreCase));
         }
 
         /// <summary>

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

@@ -1,77 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using System.Collections.Generic;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    /// <summary>
-    /// Represents a IBasicVideoMuteWithFeedbackMessenger
-    /// </summary>
-    public class IBasicVideoMuteWithFeedbackMessenger : MessengerBase
-    {
-        private readonly IBasicVideoMuteWithFeedback device;
-
-        public IBasicVideoMuteWithFeedbackMessenger(string key, string messagePath, IBasicVideoMuteWithFeedback device)
-            : base(key, messagePath, device as IKeyName)
-        {
-            this.device = device;
-        }
-
-        /// <summary>
-        /// SendFullStatus method
-        /// </summary>
-        public void SendFullStatus()
-        {
-            var messageObj = new IBasicVideoMuteWithFeedbackMessage
-            {
-                VideoMuteState = device.VideoMuteIsOn.BoolValue
-            };
-
-            PostStatusMessage(messageObj);
-        }
-
-        protected override void RegisterActions()
-        {
-            base.RegisterActions();
-
-            AddAction("/fullStatus", (id, content) => SendFullStatus());
-
-            AddAction("/videoMuteToggle", (id, content) =>
-            {
-                device.VideoMuteToggle();
-            });
-
-            AddAction("/videoMuteOn", (id, content) =>
-            {
-                device.VideoMuteOn();
-            });
-
-            AddAction("/videoMuteOff", (id, content) =>
-            {
-                device.VideoMuteOff();
-            });
-
-            device.VideoMuteIsOn.OutputChange += VideoMuteIsOnFeedback_OutputChange;
-        }
-
-        private void VideoMuteIsOnFeedback_OutputChange(object sender, FeedbackEventArgs args)
-        {
-            PostStatusMessage(JToken.FromObject(new
-            {
-                videoMuteState = args.BoolValue
-            })
-            );
-        }
-    }
-
-    /// <summary>
-    /// Represents a IBasicVideoMuteWithFeedbackMessage
-    /// </summary>
-    public class IBasicVideoMuteWithFeedbackMessage : DeviceStateMessageBase
-    {
-        [JsonProperty("videoMuteState")]
-        public bool VideoMuteState { get; set; }
-    }
-}

src/PepperDash.Essentials.MobileControl/MobileControlConfig.cs

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using Newtonsoft.Json;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials
 {
@@ -9,34 +9,25 @@ namespace PepperDash.Essentials
     /// </summary>
     public class MobileControlConfig
     {
-        /// <summary>
-        /// Gets or sets the ServerUrl
-        /// </summary>
         [JsonProperty("serverUrl")]
         public string ServerUrl { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ClientAppUrl
-        /// </summary>
         [JsonProperty("clientAppUrl")]
         public string ClientAppUrl { get; set; }
 
-        /// <summary>
-        /// Gets or sets the DirectServer
-        /// </summary>
         [JsonProperty("directServer")]
         public MobileControlDirectServerPropertiesConfig DirectServer { get; set; }
 
+        [JsonProperty("applicationConfig")]
         /// <summary>
         /// Gets or sets the ApplicationConfig
         /// </summary>
-        [JsonProperty("applicationConfig")]
         public MobileControlApplicationConfig ApplicationConfig { get; set; } = null;
 
+        [JsonProperty("enableApiServer")]
         /// <summary>
         /// Gets or sets the EnableApiServer
         /// </summary>
-        [JsonProperty("enableApiServer")]
         public bool EnableApiServer { get; set; } = true;
     }
 
@@ -45,42 +36,27 @@ namespace PepperDash.Essentials
     /// </summary>
     public class MobileControlDirectServerPropertiesConfig
     {
+        [JsonProperty("enableDirectServer")]
         /// <summary>
         /// Gets or sets the EnableDirectServer
         /// </summary>
-        [JsonProperty("enableDirectServer")]
         public bool EnableDirectServer { get; set; }
 
+        [JsonProperty("port")]
         /// <summary>
         /// Gets or sets the Port
         /// </summary>
-        [JsonProperty("port")]
         public int Port { get; set; }
 
+        [JsonProperty("logging")]
         /// <summary>
         /// Gets or sets the Logging
         /// </summary>
-        [JsonProperty("logging")]
         public MobileControlLoggingConfig Logging { get; set; }
 
-        /// <summary>
-        /// Gets or sets the AutomaticallyForwardPortToCSLAN
-        /// </summary>
         [JsonProperty("automaticallyForwardPortToCSLAN")]
         public bool? AutomaticallyForwardPortToCSLAN { get; set; }
 
-        /// <summary>
-        /// Gets or sets the CSLanUiDeviceKeys
-        /// </summary>
-        /// <remarks>
-        /// A list of device keys for the CS LAN UI. These devices will get the CS LAN IP address instead of the LAN IP Address
-        /// </remarks>
-        [JsonProperty("csLanUiDeviceKeys")]
-        public List<string> CSLanUiDeviceKeys { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the MobileControlDirectServerPropertiesConfig class.
-        /// </summary>
         public MobileControlDirectServerPropertiesConfig()
         {
             Logging = new MobileControlLoggingConfig();
@@ -92,26 +68,26 @@ namespace PepperDash.Essentials
     /// </summary>
     public class MobileControlLoggingConfig
     {
-
+        [JsonProperty("enableRemoteLogging")]
         /// <summary>
         /// Gets or sets the EnableRemoteLogging
         /// </summary>
-        [JsonProperty("enableRemoteLogging")]
         public bool EnableRemoteLogging { get; set; }
 
-
+        [JsonProperty("host")]
         /// <summary>
         /// Gets or sets the Host
         /// </summary>
-        [JsonProperty("host")]
         public string Host { get; set; }
 
-
+        [JsonProperty("port")]
         /// <summary>
         /// Gets or sets the Port
         /// </summary>
-        [JsonProperty("port")]
         public int Port { get; set; }
+
+
+
     }
 
     /// <summary>
@@ -119,16 +95,16 @@ namespace PepperDash.Essentials
     /// </summary>
     public class MobileControlRoomBridgePropertiesConfig
     {
+        [JsonProperty("key")]
         /// <summary>
         /// Gets or sets the Key
         /// </summary>
-        [JsonProperty("key")]
         public string Key { get; set; }
 
+        [JsonProperty("roomKey")]
         /// <summary>
         /// Gets or sets the RoomKey
         /// </summary>
-        [JsonProperty("roomKey")]
         public string RoomKey { get; set; }
     }
 
@@ -137,71 +113,53 @@ namespace PepperDash.Essentials
     /// </summary>
     public class MobileControlSimplRoomBridgePropertiesConfig
     {
+        [JsonProperty("eiscId")]
         /// <summary>
         /// Gets or sets the EiscId
         /// </summary>
-        [JsonProperty("eiscId")]
         public string EiscId { get; set; }
     }
 
-    /// <summary>
-    /// Represents a MobileControlApplicationConfig
-    /// </summary>
     public class MobileControlApplicationConfig
     {
-        /// <summary>
-        /// Gets or sets the ApiPath
-        /// </summary>
         [JsonProperty("apiPath")]
         public string ApiPath { get; set; }
 
+        [JsonProperty("gatewayAppPath")]
         /// <summary>
         /// Gets or sets the GatewayAppPath
         /// </summary>
-        [JsonProperty("gatewayAppPath")]
         public string GatewayAppPath { get; set; }
 
-        /// <summary>
-        /// Gets or sets the EnableDev
-        /// </summary>
         [JsonProperty("enableDev")]
         public bool? EnableDev { get; set; }
 
+        [JsonProperty("logoPath")]
         /// <summary>
         /// Gets or sets the LogoPath
         /// </summary>
-        [JsonProperty("logoPath")]
         public string LogoPath { get; set; }
 
-        /// <summary>
-        /// Gets or sets the IconSet
-        /// </summary>
         [JsonProperty("iconSet")]
         [JsonConverter(typeof(StringEnumConverter))]
         public MCIconSet? IconSet { get; set; }
 
-        /// <summary>
-        /// Gets or sets the LoginMode
-        /// </summary>
         [JsonProperty("loginMode")]
         public string LoginMode { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Modes
-        /// </summary>
         [JsonProperty("modes")]
         public Dictionary<string, McMode> Modes { get; set; }
 
+        [JsonProperty("enableRemoteLogging")]
         /// <summary>
         /// Gets or sets the Logging
         /// </summary>
-        [JsonProperty("enableRemoteLogging")]
         public bool Logging { get; set; }
 
+        [JsonProperty("partnerMetadata", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the PartnerMetadata
         /// </summary>
-        [JsonProperty("partnerMetadata", NullValueHandling = NullValueHandling.Ignore)]
         public List<MobileControlPartnerMetadata> PartnerMetadata { get; set; }
     }
 
@@ -210,22 +168,22 @@ namespace PepperDash.Essentials
     /// </summary>
     public class MobileControlPartnerMetadata
     {
+        [JsonProperty("role")]
         /// <summary>
         /// Gets or sets the Role
         /// </summary>
-        [JsonProperty("role")]
         public string Role { get; set; }
 
+        [JsonProperty("description")]
         /// <summary>
         /// Gets or sets the Description
         /// </summary>
-        [JsonProperty("description")]
         public string Description { get; set; }
 
+        [JsonProperty("logoPath")]
         /// <summary>
         /// Gets or sets the LogoPath
         /// </summary>
-        [JsonProperty("logoPath")]
         public string LogoPath { get; set; }
     }
 
@@ -234,22 +192,21 @@ namespace PepperDash.Essentials
     /// </summary>
     public class McMode
     {
+        [JsonProperty("listPageText")]
         /// <summary>
         /// Gets or sets the ListPageText
         /// </summary>
-        [JsonProperty("listPageText")]
         public string ListPageText { get; set; }
-
+        [JsonProperty("loginHelpText")]
         /// <summary>
         /// Gets or sets the LoginHelpText
         /// </summary>
-        [JsonProperty("loginHelpText")]
         public string LoginHelpText { get; set; }
 
+        [JsonProperty("passcodePageText")]
         /// <summary>
         /// Gets or sets the PasscodePageText
         /// </summary>
-        [JsonProperty("passcodePageText")]
         public string PasscodePageText { get; set; }
     }
 
@@ -258,19 +215,8 @@ namespace PepperDash.Essentials
     /// </summary>
     public enum MCIconSet
     {
-        /// <summary>
-        /// Google icon set
-        /// </summary>
         GOOGLE,
-
-        /// <summary>
-        /// Habanero icon set
-        /// </summary>
         HABANERO,
-
-        /// <summary>
-        /// Neo icon set
-        /// </summary>
         NEO
     }
 }

src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs

@@ -27,6 +27,7 @@ using PepperDash.Essentials.Core.Shades;
 using PepperDash.Essentials.Core.Web;
 using PepperDash.Essentials.Devices.Common.AudioCodec;
 using PepperDash.Essentials.Devices.Common.Cameras;
+using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.Displays;
 using PepperDash.Essentials.Devices.Common.Lighting;
 using PepperDash.Essentials.Devices.Common.SoftCodec;
@@ -505,25 +506,6 @@ namespace PepperDash.Essentials
                         messengerAdded = true;
                     }
 
-                    if (device is IBasicVideoMuteWithFeedback)
-                    {
-                        var deviceKey = device.Key;
-                        this.LogVerbose(
-                            "Adding IBasicVideoMuteWithFeedback for {deviceKey}",
-                            deviceKey
-                        );
-
-                        var videoMuteControlDevice = device as IBasicVideoMuteWithFeedback;
-                        var messenger = new IBasicVideoMuteWithFeedbackMessenger(
-                            $"{device.Key}-videoMute-{Key}",
-                            string.Format("/device/{0}", deviceKey),
-                            videoMuteControlDevice
-                        );
-                        AddDefaultDeviceMessenger(messenger);
-
-                        messengerAdded = true;
-                    }
-
                     if (device is ILightingScenes || device is LightingBase)
                     {
                         var deviceKey = device.Key;
@@ -579,6 +561,21 @@ namespace PepperDash.Essentials
 
                         messengerAdded = true;
                     }
+                    else if (device is IHasDialer dialer && !messengerAdded)
+                    {
+                        this.LogVerbose(
+                            "Adding CallStatusMessenger for {deviceKey}", device.Key);
+
+                        var messenger = new CallStatusMessenger(
+                            $"{device.Key}-callStatus-{Key}",
+                            dialer,
+                            $"/device/{device.Key}"
+                        );
+
+                        AddDefaultDeviceMessenger(messenger);
+
+                        messengerAdded = true;
+                    }
 
                     if (device is AudioCodecBase audioCodec)
                     {

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

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.UI;
@@ -108,11 +106,6 @@ namespace PepperDash.Essentials.Touchpanel
 
         public ReadOnlyCollection<ConnectedIpInformation> ConnectedIps => Panel.ConnectedIpList;
 
-        private System.Net.IPAddress csIpAddress;
-
-        private System.Net.IPAddress csSubnetMask;
-
-
         /// <summary>
         /// Initializes a new instance of the MobileControlTouchpanelController class.
         /// </summary>
@@ -189,13 +182,6 @@ namespace PepperDash.Essentials.Touchpanel
             };
 
             RegisterForExtenders();
-
-            var csAdapterId = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(EthernetAdapterType.EthernetCSAdapter);
-            var csSubnetMask = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, csAdapterId);
-            var csIpAddress = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, csAdapterId);
-
-            this.csSubnetMask = System.Net.IPAddress.Parse(csSubnetMask);
-            this.csIpAddress = System.Net.IPAddress.Parse(csIpAddress);
         }
 
         /// <summary>
@@ -395,81 +381,19 @@ namespace PepperDash.Essentials.Touchpanel
             McServerUrlFeedback.LinkInputSig(Panel.StringInput[3]);
             UserCodeFeedback.LinkInputSig(Panel.StringInput[4]);
 
-            Panel.IpInformationChange += (sender, args) =>
-            {
-                if (args.Connected)
-                {
-                    this.LogVerbose("Connection from IP: {ip}", args.DeviceIpAddress);
-                    this.LogInformation("Sending {appUrl} on join 1", AppUrlFeedback.StringValue);
-
-                    var appUrl = GetUrlWithCorrectIp(_appUrl);
-                    Panel.StringInput[1].StringValue = appUrl;
-
-                    SetAppUrl(appUrl);
-                }
-                else
-                {
-                    this.LogVerbose("Disconnection from IP: {ip}", args.DeviceIpAddress);
-                }
-            };
-
             Panel.OnlineStatusChange += (sender, args) =>
             {
+                UpdateFeedbacks();
+
                 this.LogInformation("Sending {appUrl} on join 1", AppUrlFeedback.StringValue);
 
-                UpdateFeedbacks();
+                Panel.StringInput[1].StringValue = AppUrlFeedback.StringValue;
-                Panel.StringInput[1].StringValue = _appUrl;
                 Panel.StringInput[2].StringValue = QrCodeUrlFeedback.StringValue;
                 Panel.StringInput[3].StringValue = McServerUrlFeedback.StringValue;
                 Panel.StringInput[4].StringValue = UserCodeFeedback.StringValue;
             };
         }
 
-        /// <summary>
-        /// Gets the URL with the correct IP address based on the connected devices and the Crestron processor's IP address.
-        /// </summary>
-        /// <param name="url"></param>
-        /// <returns></returns>
-        private string GetUrlWithCorrectIp(string url)
-        {
-            var lanAdapterId = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(EthernetAdapterType.EthernetLANAdapter);
-
-            var processorIp = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, lanAdapterId);
-
-            if(csIpAddress == null || csSubnetMask == null || url == null)
-            {
-                this.LogWarning("CS IP Address Subnet Mask or url is null, cannot determine correct IP for URL");
-                return url;
-            }
-
-            this.LogVerbose("Processor IP: {processorIp}, CS IP: {csIpAddress}, CS Subnet Mask: {csSubnetMask}", processorIp, csIpAddress, csSubnetMask);
-            this.LogVerbose("Connected IP Count: {connectedIps}", ConnectedIps.Count);
-
-            var ip = ConnectedIps.Any(ipInfo =>
-            {
-                if (System.Net.IPAddress.TryParse(ipInfo.DeviceIpAddress, out var parsedIp))
-                {
-                    return csIpAddress.IsInSameSubnet(parsedIp, csSubnetMask);
-                }
-                this.LogWarning("Invalid IP address: {deviceIpAddress}", ipInfo.DeviceIpAddress);
-                return false;
-            }) ? csIpAddress.ToString() : processorIp;
-
-            var match = Regex.Match(url, @"^http://([^:/]+):\d+/mc/app\?token=.+$");
-            if (match.Success)
-            {
-                string ipa = match.Groups[1].Value;
-                // ip will be "192.168.1.100"
-            }
-
-            // replace ipa with ip but leave the rest of the string intact
-            var updatedUrl = Regex.Replace(url, @"^http://[^:/]+", $"http://{ip}");
-
-            this.LogVerbose("Updated URL: {updatedUrl}", updatedUrl);
-
-            return updatedUrl;
-        }
-
         private void SubscribeForMobileControlUpdates()
         {
             foreach (var dev in DeviceManager.AllDevices)
@@ -519,8 +443,7 @@ namespace PepperDash.Essentials.Touchpanel
         /// </summary>
         public void SetAppUrl(string url)
         {
-            _appUrl = GetUrlWithCorrectIp(url);
+            _appUrl = url;
-
             AppUrlFeedback.FireUpdate();
         }
 

src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.WebScripting;
-using Microsoft.SqlServer.Server;
 using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Core.Logging;
@@ -43,14 +41,8 @@ namespace PepperDash.Essentials.WebSocketServer
 
         private HttpServer _server;
 
-        /// <summary>
-        /// Gets the HttpServer instance
-        /// </summary>
         public HttpServer Server => _server;
 
-        /// <summary>
-        /// Gets the collection of UI client contexts
-        /// </summary>
         public Dictionary<string, UiClientContext> UiClients { get; private set; }
 
         private readonly MobileControlSystemController _parent;
@@ -69,20 +61,17 @@ namespace PepperDash.Essentials.WebSocketServer
             }
         }
 
-        private string LanIpAddress => CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(EthernetAdapterType.EthernetLANAdapter));
+        private string lanIpAddress => CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(EthernetAdapterType.EthernetLANAdapter));
 
-        private readonly System.Net.IPAddress csIpAddress;
+        private System.Net.IPAddress csIpAddress;
 
-        private readonly System.Net.IPAddress csSubnetMask;
+        private System.Net.IPAddress csSubnetMask;
 
         /// <summary>
         /// The path for the WebSocket messaging
         /// </summary>
         private readonly string _wsPath = "/mc/api/ui/join/";
 
-        /// <summary>
-        /// Gets the WebSocket path
-        /// </summary>
         public string WsPath => _wsPath;
 
         /// <summary>
@@ -100,9 +89,6 @@ namespace PepperDash.Essentials.WebSocketServer
         /// </summary>
         public int Port { get; private set; }
 
-        /// <summary>
-        /// Gets the user app URL prefix
-        /// </summary>
         public string UserAppUrlPrefix
         {
             get
@@ -115,9 +101,6 @@ namespace PepperDash.Essentials.WebSocketServer
             }
         }
 
-        /// <summary>
-        /// Gets the count of connected UI clients
-        /// </summary>
         public int ConnectedUiClientsCount
         {
             get
@@ -136,9 +119,6 @@ namespace PepperDash.Essentials.WebSocketServer
             }
         }
 
-        /// <summary>
-        /// Initializes a new instance of the MobileControlWebsocketServer class.
-        /// </summary>
         public MobileControlWebsocketServer(string key, int customPort, MobileControlSystemController parent)
             : base(key)
         {
@@ -347,26 +327,17 @@ namespace PepperDash.Essentials.WebSocketServer
                 }
 
                 string ip = processorIp;
-
+                if (touchpanel.Touchpanel is IMobileControlCrestronTouchpanelController crestronTouchpanel && csIpAddress != null)
-                // Moved to the MobileControlTouchpanelController class in the GetUrlWithCorrectIp method
-                // triggered by the Panel.IpInformationChange event so that we know we have the necessary info
-                // to make the determination of which IP to use.
-                //if (touchpanel.Touchpanel is IMobileControlCrestronTouchpanelController crestronTouchpanel && csIpAddress != null)
-                //{
-                //    ip = crestronTouchpanel.ConnectedIps.Any(ipInfo =>
-                //    {
-                //        if (System.Net.IPAddress.TryParse(ipInfo.DeviceIpAddress, out var parsedIp))
-                //        {
-                //            return csIpAddress.IsInSameSubnet(parsedIp, csSubnetMask);
-                //        }
-                //        this.LogWarning("Invalid IP address: {deviceIpAddress}", ipInfo.DeviceIpAddress);
-                //        return false;
-                //    }) ? csIpAddress.ToString() : processorIp;
-                //}
-
-                if (_parent.Config.DirectServer.CSLanUiDeviceKeys != null && _parent.Config.DirectServer.CSLanUiDeviceKeys.Any(k => k.Equals(touchpanel.Touchpanel.Key, StringComparison.InvariantCultureIgnoreCase)) && csIpAddress != null)
                 {
-                    ip = csIpAddress.ToString();
+                    ip = crestronTouchpanel.ConnectedIps.Any(ipInfo =>
+                    {
+                        if (System.Net.IPAddress.TryParse(ipInfo.DeviceIpAddress, out var parsedIp))
+                        {
+                            return csIpAddress.IsInSameSubnet(parsedIp, csSubnetMask);
+                        }
+                        this.LogWarning("Invalid IP address: {deviceIpAddress}", ipInfo.DeviceIpAddress);
+                        return false;
+                    }) ? csIpAddress.ToString() : processorIp;
                 }
 
                 var appUrl = $"http://{ip}:{_parent.Config.DirectServer.Port}/mc/app?token={touchpanel.Key}";
@@ -650,9 +621,6 @@ namespace PepperDash.Essentials.WebSocketServer
             CrestronConsole.ConsoleCommandResponse($"Token: {token}");
         }
 
-        /// <summary>
-        /// Validates the grant code against the room key
-        /// </summary>
         public (string, string) ValidateGrantCode(string grantCode, string roomKey)
         {
             var bridge = _parent.GetRoomBridge(roomKey);
@@ -666,9 +634,6 @@ namespace PepperDash.Essentials.WebSocketServer
             return ValidateGrantCode(grantCode, bridge);
         }
 
-        /// <summary>
-        /// Validates the grant code against the room key
-        /// </summary>
         public (string, string) ValidateGrantCode(string grantCode, MobileControlBridgeBase bridge)
         {
             // TODO: Authenticate grant code passed in
@@ -690,9 +655,6 @@ namespace PepperDash.Essentials.WebSocketServer
             }
         }
 
-        /// <summary>
-        /// Generates a new client token for the specified bridge
-        /// </summary>
         public (string, string) GenerateClientToken(MobileControlBridgeBase bridge, string touchPanelKey = "")
         {
             var key = Guid.NewGuid().ToString();

src/PepperDash.Essentials/ControlSystem.cs

@@ -1,5 +1,5 @@
-using System;
+
-using System.IO.Compression;
+using System;
 using System.Linq;
 using System.Reflection;
 using Crestron.SimplSharp;
@@ -41,6 +41,29 @@ namespace PepperDash.Essentials
             SystemMonitor.ProgramInitialization.ProgramInitializationUnderUserControl = true;
 
             Debug.SetErrorLogMinimumDebugLevel(CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? LogEventLevel.Warning : LogEventLevel.Verbose);
+
+            // AppDomain.CurrentDomain.AssemblyResolve += CurrentDomainOnAssemblyResolve;
+        }
+
+        private Assembly CurrentDomainOnAssemblyResolve(object sender, ResolveEventArgs args)
+        {
+            var assemblyName = new AssemblyName(args.Name).Name;
+            if (assemblyName == "PepperDash_Core")
+            {
+                return Assembly.LoadFrom("PepperDashCore.dll");
+            }
+
+            if (assemblyName == "PepperDash_Essentials_Core")
+            {
+                return Assembly.LoadFrom("PepperDash.Essentials.Core.dll");
+            }
+
+            if (assemblyName == "Essentials Devices Common")
+            {
+                return Assembly.LoadFrom("PepperDash.Essentials.Devices.Common.dll");
+            }
+
+            return null;
         }
 
         /// <summary>
@@ -244,8 +267,6 @@ namespace PepperDash.Essentials
                 // _ = new ProcessorExtensionDeviceFactory();
                 // _ = new MobileControlFactory();
 
-                LoadAssets();
-
                 Debug.LogMessage(LogEventLevel.Information, "Starting Essentials load from configuration");
 
                 var filesReady = SetupFilesystem();
@@ -547,142 +568,5 @@ namespace PepperDash.Essentials
                 return false;
             }
         }
-
-        private static void LoadAssets()
-        {
-            var applicationDirectory = new DirectoryInfo(Global.ApplicationDirectoryPathPrefix);
-            Debug.LogMessage(LogEventLevel.Information, "Searching: {applicationDirectory:l} for embedded assets - {Destination}", applicationDirectory.FullName, Global.FilePathPrefix);
-
-            var zipFiles = applicationDirectory.GetFiles("assets*.zip");
-
-            if (zipFiles.Length > 1)
-            {
-                throw new Exception("Multiple assets zip files found. Cannot continue.");
-            }
-
-            if (zipFiles.Length == 1)
-            {
-                var zipFile = zipFiles[0];
-                var assetsRoot = System.IO.Path.GetFullPath(Global.FilePathPrefix);
-                if (!assetsRoot.EndsWith(Path.DirectorySeparatorChar.ToString()) && !assetsRoot.EndsWith(Path.AltDirectorySeparatorChar.ToString()))
-                {
-                    assetsRoot += Path.DirectorySeparatorChar;
-                }
-                Debug.LogMessage(LogEventLevel.Information, "Found assets zip file: {zipFile:l}... Unzipping...", zipFile.FullName);
-                using (var archive = ZipFile.OpenRead(zipFile.FullName))
-                {
-                    foreach (var entry in archive.Entries)
-                    {
-                        var destinationPath = Path.Combine(Global.FilePathPrefix, entry.FullName);
-                        var fullDest = System.IO.Path.GetFullPath(destinationPath);
-                        if (!fullDest.StartsWith(assetsRoot, StringComparison.OrdinalIgnoreCase))
-                            throw new InvalidOperationException($"Entry '{entry.FullName}' is trying to extract outside of the target directory.");
-
-                        if (string.IsNullOrEmpty(entry.Name))
-                        {
-                            Directory.CreateDirectory(destinationPath);
-                            continue;
-                        }
-
-                        // If a directory exists where a file should go, delete it
-                        if (Directory.Exists(destinationPath))
-                            Directory.Delete(destinationPath, true);
-
-                        Directory.CreateDirectory(Path.GetDirectoryName(destinationPath));
-                        entry.ExtractToFile(destinationPath, true);
-                        Debug.LogMessage(LogEventLevel.Information, "Extracted: {entry:l} to {Destination}", entry.FullName, destinationPath);
-                    }
-                }
-            }
-
-            // cleaning up zip files
-            foreach (var file in zipFiles)
-            {
-                File.Delete(file.FullName);
-            }
-
-            var htmlZipFiles = applicationDirectory.GetFiles("htmlassets*.zip");
-
-            if (htmlZipFiles.Length > 1)
-            {
-                throw new Exception("Multiple htmlassets zip files found in application directory. Please ensure only one htmlassets*.zip file is present and retry.");
-            }
-
-
-            if (htmlZipFiles.Length == 1)
-            {
-                var htmlZipFile = htmlZipFiles[0];
-                var programDir = new DirectoryInfo(Global.FilePathPrefix.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar));
-                var userOrNvramDir = programDir.Parent;
-                var rootDir = userOrNvramDir?.Parent;
-                if (rootDir == null)
-                {
-                    throw new Exception($"Unable to determine root directory for html extraction. Current path: {Global.FilePathPrefix}");
-                }
-                var htmlDir = Path.Combine(rootDir.FullName, "html");
-                var htmlRoot = System.IO.Path.GetFullPath(htmlDir);
-                if (!htmlRoot.EndsWith(Path.DirectorySeparatorChar.ToString()) &&
-                    !htmlRoot.EndsWith(Path.AltDirectorySeparatorChar.ToString()))
-                {
-                    htmlRoot += Path.DirectorySeparatorChar;
-                }
-                Debug.LogMessage(LogEventLevel.Information, "Found htmlassets zip file: {zipFile:l}... Unzipping...", htmlZipFile.FullName);
-                using (var archive = ZipFile.OpenRead(htmlZipFile.FullName))
-                {
-                    foreach (var entry in archive.Entries)
-                    {
-                        var destinationPath = Path.Combine(htmlDir, entry.FullName);
-                        var fullDest = System.IO.Path.GetFullPath(destinationPath);
-                        if (!fullDest.StartsWith(htmlRoot, StringComparison.OrdinalIgnoreCase))
-                            throw new InvalidOperationException($"Entry '{entry.FullName}' is trying to extract outside of the target directory.");
-
-                        if (string.IsNullOrEmpty(entry.Name))
-                        {
-                            Directory.CreateDirectory(destinationPath);
-                            continue;
-                        }
-
-                        // Only delete the file if it exists and is a file, not a directory
-                        if (File.Exists(destinationPath))
-                            File.Delete(destinationPath);
-
-                        var parentDir = Path.GetDirectoryName(destinationPath);
-                        if (!string.IsNullOrEmpty(parentDir))
-                            Directory.CreateDirectory(parentDir);
-
-                        entry.ExtractToFile(destinationPath, true);
-                        Debug.LogMessage(LogEventLevel.Information, "Extracted: {entry:l} to {Destination}", entry.FullName, destinationPath);
-                    }
-                }
-            }
-
-            // cleaning up html zip files
-            foreach (var file in htmlZipFiles)
-            {
-                File.Delete(file.FullName);
-            }
-
-            var jsonFiles = applicationDirectory.GetFiles("*configurationFile*.json");
-
-            if (jsonFiles.Length > 1)
-            {
-                throw new Exception("Multiple configuration files found. Cannot continue.");
-            }
-
-            if (jsonFiles.Length == 1)
-            {
-                var jsonFile = jsonFiles[0];
-                var finalPath = Path.Combine(Global.FilePathPrefix, jsonFile.Name);
-                Debug.LogMessage(LogEventLevel.Information, "Found configuration file: {jsonFile:l}... Moving to: {Destination}", jsonFile.FullName, finalPath);
-
-                if (File.Exists(finalPath))
-                {
-                    Debug.LogMessage(LogEventLevel.Information, "Removing existing configuration file: {Destination}", finalPath);
-                    File.Delete(finalPath);
-                }
-
-                jsonFile.MoveTo(finalPath);
-            }
-        }
     }
 }

src/PepperDash.Essentials/PepperDash.Essentials.csproj

@@ -49,7 +49,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.90" />
-    <PackageReference Include="System.IO.Compression" Version="4.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PepperDash.Core\PepperDash.Core.csproj" />