feat: Organize UdmCws classes

Main -> Development

PepperDash.Essentials.4Series.sln

@@ -36,49 +36,149 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{02EA681E-C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Core", "src\PepperDash.Core\PepperDash.Core.csproj", "{E5336563-1194-501E-BC4A-79AD9283EF90}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UdmCws", "src\UdmCws\UdmCws.csproj", "{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug 4.7.2|Any CPU = Debug 4.7.2|Any CPU
+		Debug 4.7.2|x64 = Debug 4.7.2|x64
+		Debug 4.7.2|x86 = Debug 4.7.2|x86
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug 4.7.2|Any CPU.ActiveCfg = Debug 4.7.2|Any CPU
 		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug 4.7.2|Any CPU.Build.0 = Debug 4.7.2|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug 4.7.2|x64.ActiveCfg = Debug 4.7.2|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug 4.7.2|x64.Build.0 = Debug 4.7.2|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug 4.7.2|x86.ActiveCfg = Debug 4.7.2|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug 4.7.2|x86.Build.0 = Debug 4.7.2|Any CPU
 		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug|x64.Build.0 = Debug|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug|x86.Build.0 = Debug|Any CPU
 		{53E204B7-97DD-441D-A96C-721DF014DF82}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{53E204B7-97DD-441D-A96C-721DF014DF82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Release|x64.ActiveCfg = Release|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Release|x64.Build.0 = Release|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Release|x86.ActiveCfg = Release|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Release|x86.Build.0 = Release|Any CPU
 		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug 4.7.2|Any CPU.ActiveCfg = Debug 4.7.2|Any CPU
 		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug 4.7.2|Any CPU.Build.0 = Debug 4.7.2|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug 4.7.2|x64.ActiveCfg = Debug 4.7.2|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug 4.7.2|x64.Build.0 = Debug 4.7.2|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug 4.7.2|x86.ActiveCfg = Debug 4.7.2|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug 4.7.2|x86.Build.0 = Debug 4.7.2|Any CPU
 		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug|x64.Build.0 = Debug|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug|x86.Build.0 = Debug|Any CPU
 		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Release|x64.ActiveCfg = Release|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Release|x64.Build.0 = Release|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Release|x86.ActiveCfg = Release|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Release|x86.Build.0 = Release|Any CPU
 		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug 4.7.2|Any CPU.ActiveCfg = Debug 4.7.2|Any CPU
 		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug 4.7.2|Any CPU.Build.0 = Debug 4.7.2|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug 4.7.2|x64.ActiveCfg = Debug 4.7.2|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug 4.7.2|x64.Build.0 = Debug 4.7.2|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug 4.7.2|x86.ActiveCfg = Debug 4.7.2|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug 4.7.2|x86.Build.0 = Debug 4.7.2|Any CPU
 		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug|x64.Build.0 = Debug|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug|x86.Build.0 = Debug|Any CPU
 		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Release|x64.ActiveCfg = Release|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Release|x64.Build.0 = Release|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Release|x86.ActiveCfg = Release|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Release|x86.Build.0 = Release|Any CPU
 		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug 4.7.2|Any CPU.ActiveCfg = Debug|Any CPU
 		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug 4.7.2|Any CPU.Build.0 = Debug|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug 4.7.2|x64.ActiveCfg = Debug 4.7.2|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug 4.7.2|x64.Build.0 = Debug 4.7.2|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug 4.7.2|x86.ActiveCfg = Debug 4.7.2|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug 4.7.2|x86.Build.0 = Debug 4.7.2|Any CPU
 		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug|x64.Build.0 = Debug|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug|x86.Build.0 = Debug|Any CPU
 		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Release|x64.ActiveCfg = Release|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Release|x64.Build.0 = Release|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Release|x86.ActiveCfg = Release|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Release|x86.Build.0 = Release|Any CPU
 		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug 4.7.2|Any CPU.ActiveCfg = Debug|Any CPU
 		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug 4.7.2|Any CPU.Build.0 = Debug|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug 4.7.2|x64.ActiveCfg = Debug 4.7.2|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug 4.7.2|x64.Build.0 = Debug 4.7.2|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug 4.7.2|x86.ActiveCfg = Debug 4.7.2|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug 4.7.2|x86.Build.0 = Debug 4.7.2|Any CPU
 		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug|x64.Build.0 = Debug|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug|x86.Build.0 = Debug|Any CPU
 		{B438694F-8FF7-464A-9EC8-10427374471F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B438694F-8FF7-464A-9EC8-10427374471F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Release|x64.ActiveCfg = Release|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Release|x64.Build.0 = Release|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Release|x86.ActiveCfg = Release|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Release|x86.Build.0 = Release|Any CPU
 		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug 4.7.2|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug 4.7.2|Any CPU.Build.0 = Debug|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug 4.7.2|x64.ActiveCfg = Debug 4.7.2|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug 4.7.2|x64.Build.0 = Debug 4.7.2|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug 4.7.2|x86.ActiveCfg = Debug 4.7.2|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug 4.7.2|x86.Build.0 = Debug 4.7.2|Any CPU
 		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug|x86.Build.0 = Debug|Any CPU
 		{E5336563-1194-501E-BC4A-79AD9283EF90}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5336563-1194-501E-BC4A-79AD9283EF90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Release|x64.Build.0 = Release|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Release|x86.Build.0 = Release|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Debug 4.7.2|Any CPU.ActiveCfg = Debug 4.7.2|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Debug 4.7.2|Any CPU.Build.0 = Debug 4.7.2|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Debug 4.7.2|x64.ActiveCfg = Debug 4.7.2|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Debug 4.7.2|x64.Build.0 = Debug 4.7.2|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Debug 4.7.2|x86.ActiveCfg = Debug 4.7.2|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Debug 4.7.2|x86.Build.0 = Debug 4.7.2|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Debug|x64.Build.0 = Debug|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Debug|x86.Build.0 = Debug|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Release|x64.ActiveCfg = Release|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Release|x64.Build.0 = Release|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Release|x86.ActiveCfg = Release|Any CPU
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -90,6 +190,7 @@ Global
 		{F6D362DE-2256-44B1-927A-8CE4705D839A} = {B24989D7-32B5-48D5-9AE1-5F3B17D25206}
 		{B438694F-8FF7-464A-9EC8-10427374471F} = {B24989D7-32B5-48D5-9AE1-5F3B17D25206}
 		{E5336563-1194-501E-BC4A-79AD9283EF90} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{6F6D69E5-77AD-49C9-BB92-67EC49F957A4} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6907A4BF-7201-47CF-AAB1-3597F3B8E1C3}

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

@@ -91,13 +91,17 @@ namespace PepperDash.Essentials.Core
 				return;
 			}
 
-			var result = Port.Register();
-			if (result != eDeviceRegistrationUnRegistrationResponse.Success)
+
+			if (Port.Parent is CrestronControlSystem || Port.Parent is CenIoCom102)
 			{
-				this.LogError($"Cannot register {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {result})");
-				return;
+				var result = Port.Register();
+				if (result != eDeviceRegistrationUnRegistrationResponse.Success)
+				{
+					this.LogError($"Cannot register {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {result})");
+					return;
+				}
+				this.LogInformation($"Successfully registered {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {result})");
 			}
-			this.LogInformation($"Successfully registered {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {result})");
 
 			var specResult = Port.SetComPortSpec(Spec);
 			if (specResult != 0)
@@ -107,38 +111,6 @@ namespace PepperDash.Essentials.Core
 			}
 			this.LogInformation($"Successfully set comspec for {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {specResult})");
 
-
-			// TODO [ ] - Remove debug logging once verified working
-			// if (Port.Parent is CenIoCom102)
-			// {
-			// 	Port.PropertyChanged += (s, e) =>
-			// 	{
-			// 		this.LogInformation($@"RegisterAndConfigureComPort: PropertyChanged Fired >> 
-			// 			comPort-'{Port.ID}', 
-			// 			Property Changed-'{e.Property}', 
-			// 			Value Changed-'{e.Value}',
-			// 			deviceName-'{Port.DeviceName}', 
-			// 			parentDevice-'{Port.ParentDevice}', 
-			// 			parent-`{Port.Parent}`, 
-			// 			online-`{Port.IsOnline}`, 
-			// 			present-`{Port.Present}`, 
-			// 			supportedBaudRates-'{Port.SupportedBaudRates}'");
-			// 	};
-			// 	Port.ExtendedInformationChanged += (s, e) =>
-			// 	{
-
-			// 		this.LogInformation($@"RegisterAndConfigureComPort: ExtendedInformationChanged Fired >> 
-			// 			comPort-'{Port.ID}', 
-			// 			{e.Protocol},
-			// 			{e.BaudRate},
-			// 			{e.Parity},
-			// 			{e.DataBits},
-			// 			{e.StopBits}, 
-			// 			HW Handshake-'{e.HardwareHandshakeSetting}', 
-			// 			SW Handshake-'{e.SoftwareHandshakeSetting}'");
-			// 	};
-			// }
-
 			Port.SerialDataReceived += Port_SerialDataReceived;
 		}
 

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

@@ -11,11 +11,11 @@ using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.Config
 {
-	/// <summary>
-	/// Loads the ConfigObject from the file
-	/// </summary>
-	public class EssentialsConfig : BasicConfig
-	{
+    /// <summary>
+    /// Loads the ConfigObject from the file
+    /// </summary>
+    public class EssentialsConfig : BasicConfig
+    {
         /// <summary>
         /// Gets or sets the SystemUrl
         /// </summary>
@@ -32,24 +32,33 @@ namespace PepperDash.Essentials.Core.Config
         /// Gets the SystemUuid extracted from the SystemUrl
         /// </summary>
 		[JsonProperty("systemUuid")]
-		public string SystemUuid
+        public string SystemUuid
         {
             get
             {
-				if (string.IsNullOrEmpty(SystemUrl))
-					return "missing url";
+                string uuid;
 
-				if (SystemUrl.Contains("#"))
-				{
-					var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
-					string uuid = result.Groups[1].Value;
-					return uuid;
-				} else
-				{
-                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/.*");
-                    string uuid = result.Groups[1].Value;
-                    return uuid;
+                if (string.IsNullOrEmpty(SystemUrl))
+                {
+                    uuid = "missing url";
                 }
+                else if (SystemUrl.Contains("#"))
+                {
+                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
+                    uuid = result.Groups[1].Value;
+                }
+                else if (SystemUrl.Contains("detail"))
+                {
+                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/detail\/(.*)\/.*");
+                    uuid = result.Groups[1].Value;
+                }
+                else
+                {
+                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/.*");
+                    uuid = result.Groups[1].Value;
+                }
+
+                return uuid;
             }
         }
 
@@ -57,24 +66,33 @@ namespace PepperDash.Essentials.Core.Config
         /// Gets the TemplateUuid extracted from the TemplateUrl
         /// </summary>
 		[JsonProperty("templateUuid")]
-		public string TemplateUuid
+        public string TemplateUuid
         {
             get
             {
-				if (string.IsNullOrEmpty(TemplateUrl))
-					return "missing template url";
+                string uuid;
 
-				if (TemplateUrl.Contains("#"))
-				{
-					var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
-					string uuid = result.Groups[1].Value;
-					return uuid;
-				} else
-				{
-                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/(.*)\/system-template-versions\/(.*)\/.*");
-                    string uuid = result.Groups[2].Value;
-                    return uuid;
+                if (string.IsNullOrEmpty(TemplateUrl))
+                {
+                    uuid = "missing template url";
                 }
+                else if (TemplateUrl.Contains("#"))
+                {
+                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
+                    uuid = result.Groups[1].Value;
+                }
+                else if (TemplateUrl.Contains("detail"))
+                {
+                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/detail\/(.*)\/system-template-versions\/detail\/(.*)\/.*");
+                    uuid = result.Groups[2].Value;
+                }
+                else
+                {
+                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/(.*)\/system-template-versions\/(.*)\/.*");
+                    uuid = result.Groups[2].Value;
+                }
+
+                return uuid;
             }
         }
 
@@ -97,7 +115,7 @@ namespace PepperDash.Essentials.Core.Config
         {
             Rooms = new List<DeviceConfig>();
         }
-	}
+    }
 
     /// <summary>
     /// Represents version data for Essentials and its packages
@@ -147,7 +165,7 @@ namespace PepperDash.Essentials.Core.Config
     /// Represents a SystemTemplateConfigs
     /// </summary>
     public class SystemTemplateConfigs
-	{
+    {
         /// <summary>
         /// Gets or sets the System
         /// </summary>
@@ -157,5 +175,5 @@ namespace PepperDash.Essentials.Core.Config
         /// Gets or sets the Template
         /// </summary>
 		public EssentialsConfig Template { get; set; }
-	}
+    }
 }

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

@@ -77,9 +77,6 @@ namespace PepperDash.Essentials.Core
         /// A name that will override the source's name on the UI
         /// </summary>
         [JsonProperty("name")]
-        /// <summary>
-        /// Gets or sets the Name
-        /// </summary>
         public string Name { get; set; }
 
         /// <summary>

src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionController.cs

@@ -14,13 +14,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Timers;
 
 namespace PepperDash.Essentials.Core.Fusion
 {
     /// <summary>
     /// Represents a EssentialsHuddleSpaceFusionSystemControllerBase
     /// </summary>
-    public class IEssentialsRoomFusionController : EssentialsDevice, IOccupancyStatusProvider, IFusionHelpRequest
+    public class IEssentialsRoomFusionController : EssentialsDevice, IOccupancyStatusProvider, IFusionHelpRequest, IHasFeedback
     {
         private IEssentialsRoomFusionControllerPropertiesConfig _config;
 
@@ -87,15 +88,17 @@ namespace PepperDash.Essentials.Core.Fusion
         /// <inheritdoc />
         public StringFeedback HelpRequestStatusFeedback { get; private set; }
 
+        private Timer _helpRequestTimeoutTimer;
 
-        #region System Info Sigs
+        /// <summary>
+        /// Gets the DefaultHelpRequestTimeoutMs
+        /// </summary>
+        public int HelpRequestTimeoutMs => _config.HelpRequestTimeoutMs;
 
-        //StringSigData SystemName;
-        //StringSigData Model;
-        //StringSigData SerialNumber;
-        //StringSigData Uptime;
-
-        #endregion
+        /// <summary>
+        /// Gets whether to use a timer for help requests
+        /// </summary>
+        public bool UseHelpRequestTimer => _config.UseTimeoutForHelpRequests;
 
         #region Processor Info Sigs
 
@@ -240,6 +243,19 @@ namespace PepperDash.Essentials.Core.Fusion
 
                 this.LogDebug("Occupancy setup complete");
 
+                HelpRequestResponseFeedback = new StringFeedback("HelpRequestResponse", () => FusionRoom.Help.OutputSig.StringValue);
+
+                HelpRequestSentFeedback = new BoolFeedback("HelpRequestSent", () => _helpRequestSent);
+                HelpRequestStatusFeedback = new StringFeedback("HelpRequestStatus", () => _helpRequestStatus.ToString());
+
+                Feedbacks.Add(HelpRequestResponseFeedback);
+                Feedbacks.Add(HelpRequestSentFeedback);
+                Feedbacks.Add(HelpRequestStatusFeedback);
+                if (RoomOccupancyRemoteStringFeedback != null)
+                    Feedbacks.Add(RoomOccupancyRemoteStringFeedback);
+                if (RoomIsOccupiedFeedback != null)
+                    Feedbacks.Add(RoomIsOccupiedFeedback);
+
             }
             catch (Exception e)
             {
@@ -303,10 +319,6 @@ namespace PepperDash.Essentials.Core.Fusion
 
             FusionRVI.GenerateFileForAllFusionDevices();
 
-            HelpRequestResponseFeedback = new StringFeedback("HelpRequestResponse", () => FusionRoom.Help.OutputSig.StringValue);
-
-            HelpRequestSentFeedback = new BoolFeedback("HelpRequestSent", () => _helpRequestSent);
-            HelpRequestStatusFeedback = new StringFeedback("HelpRequestStatus", () => _helpRequestStatus.ToString());
         }
 
         /// <summary>
@@ -339,6 +351,11 @@ namespace PepperDash.Essentials.Core.Fusion
 
         #endregion
 
+
+        /// <inheritdoc />
+        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
+
+
         /// <summary>
         /// ScheduleChange event
         /// </summary>
@@ -1772,7 +1789,7 @@ namespace PepperDash.Essentials.Core.Fusion
         {
             if (args.EventId == FusionEventIds.HelpMessageReceivedEventId)
             {
-                this.LogInformation( "Help message received from Fusion for room '{0}'",
+                this.LogInformation("Help message received from Fusion for room '{0}'",
              Room.Name);
 
                 this.LogDebug("Help message content: {0}", FusionRoom.Help.OutputSig.StringValue);
@@ -1791,7 +1808,7 @@ namespace PepperDash.Essentials.Core.Fusion
                             break;
                         case "Please call the helpdesk.":
                             // this.LogInformation("Please call the helpdesk.");
-                            // _helpRequestStatus = eFusionHelpResponse.CallHelpDesk;
+                            _helpRequestStatus = eFusionHelpResponse.CallHelpDesk;
                             break;
                         case "Please wait, I will reschedule your meeting to a different room.":
                             // this.LogInformation("Please wait, I will reschedule your meeting to a different room.",
@@ -1818,13 +1835,21 @@ namespace PepperDash.Essentials.Core.Fusion
                     _helpRequestStatus = eFusionHelpResponse.None;
                 }
 
-                if(_helpRequestStatus == eFusionHelpResponse.None)
+                if (_helpRequestStatus == eFusionHelpResponse.None)
                 {
                     _helpRequestSent = false;
                     HelpRequestSentFeedback.FireUpdate();
                 }
-                
+
                 HelpRequestStatusFeedback.FireUpdate();
+
+                if (_helpRequestTimeoutTimer != null)
+                {
+                    _helpRequestTimeoutTimer.Stop();
+                    _helpRequestTimeoutTimer.Elapsed -= OnTimedEvent;
+                    _helpRequestTimeoutTimer.Dispose();
+                    _helpRequestTimeoutTimer = null;
+                }
             }
 
 
@@ -1895,10 +1920,34 @@ namespace PepperDash.Essentials.Core.Fusion
             _helpRequestSent = true;
             HelpRequestSentFeedback.FireUpdate();
 
+            if (UseHelpRequestTimer)
+            {
+                if (_helpRequestTimeoutTimer == null)
+                {
+                    _helpRequestTimeoutTimer = new Timer(HelpRequestTimeoutMs);
+                    _helpRequestTimeoutTimer.AutoReset = false;
+                    _helpRequestTimeoutTimer.Enabled = true;
+
+                    _helpRequestTimeoutTimer.Elapsed += OnTimedEvent;
+                }
+
+                _helpRequestTimeoutTimer.Interval = HelpRequestTimeoutMs;
+                _helpRequestTimeoutTimer.Start();
+
+                this.LogDebug("Help request timeout timer started for room '{0}' with timeout of {1} ms.",
+    Room.Name, HelpRequestTimeoutMs);
+            }
+
             _helpRequestStatus = eFusionHelpResponse.HelpRequested;
             HelpRequestStatusFeedback.FireUpdate();
         }
 
+        private void OnTimedEvent(object source, ElapsedEventArgs e)
+        {
+            this.LogInformation("Help request timeout reached for room '{0}'. Cancelling help request.", Room.Name);
+            CancelHelpRequest();
+        }
+
         /// <inheritdoc />
         public void CancelHelpRequest()
         {
@@ -1909,7 +1958,16 @@ namespace PepperDash.Essentials.Core.Fusion
                 HelpRequestSentFeedback.FireUpdate();
                 _helpRequestStatus = eFusionHelpResponse.None;
                 HelpRequestStatusFeedback.FireUpdate();
-                Debug.LogMessage(LogEventLevel.Information, this, "Help request cancelled in Fusion for room '{0}'", Room.Name);
+                Debug.LogMessage(LogEventLevel.Information, this, "Help request cancelled for room '{0}'", Room.Name);
+            }
+
+            if (_helpRequestTimeoutTimer != null)
+            {
+                _helpRequestTimeoutTimer.Stop();
+                _helpRequestTimeoutTimer.Elapsed -= OnTimedEvent;
+                _helpRequestTimeoutTimer.Dispose();
+                _helpRequestTimeoutTimer = null;
+                this.LogDebug("Help request timeout timer stopped for room '{0}'.", Room.Name);
             }
         }
 

src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionControllerPropertiesConfig.cs

@@ -56,4 +56,16 @@ public class IEssentialsRoomFusionControllerPropertiesConfig
     /// </summary>
     [JsonProperty("use24HourTimeFormat")]
     public bool Use24HourTimeFormat { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets whether to use a timeout for help requests
+    /// </summary>
+    [JsonProperty("useTimeoutForHelpRequests")]
+    public bool UseTimeoutForHelpRequests { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets the timeout duration for help requests in milliseconds
+    /// </summary>
+    [JsonProperty("helpRequestTimeoutMs")]
+    public int HelpRequestTimeoutMs { get; set; } = 30000;
 }

src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs

@@ -105,12 +105,21 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomPropertiesConfig
     {
+        /// <summary>
+        /// Gets or sets the Addresses
+        /// </summary>
         [JsonProperty("addresses")]
         public EssentialsRoomAddressPropertiesConfig Addresses { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Description
+        /// </summary>
         [JsonProperty("description")]
         public string Description { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Emergency
+        /// </summary>
         [JsonProperty("emergency")]
         public EssentialsRoomEmergencyConfig Emergency { get; set; }
 
@@ -226,11 +235,11 @@ namespace PepperDash.Essentials.Room.Config
         /// Indicates if this room represents a combination of other rooms
         /// </summary>
         [JsonProperty("isRoomCombinationScenario")]
-        /// <summary>
-        /// Gets or sets the IsRoomCombinationScenario
-        /// </summary>
         public bool IsRoomCombinationScenario { get; set; }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
         public EssentialsRoomPropertiesConfig()
         {
             LogoLight = new EssentialsLogoPropertiesConfig();
@@ -243,10 +252,10 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomUiBehaviorConfig
     {
-        [JsonProperty("disableActivityButtonsWhileWarmingCooling")]
         /// <summary>
         /// Gets or sets the DisableActivityButtonsWhileWarmingCooling
         /// </summary>
+        [JsonProperty("disableActivityButtonsWhileWarmingCooling")]
         public bool DisableActivityButtonsWhileWarmingCooling { get; set; }
     }
 
@@ -255,74 +264,86 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsAvRoomPropertiesConfig : EssentialsRoomPropertiesConfig
     {
-        [JsonProperty("defaultAudioKey")]
         /// <summary>
         /// Gets or sets the DefaultAudioKey
         /// </summary>
+        [JsonProperty("defaultAudioKey")]
         public string DefaultAudioKey { get; set; }
-        [JsonProperty("sourceListKey")]
+
+        /// <summary>
+        /// Gets or sets the DefaultOnDspPresetKey
+        /// </summary>
+        [JsonProperty("defaultOnDspPresetKey")]
+        public string DefaultOnDspPresetKey { get; set; }
+
+        /// <summary>
+        /// Gets or sets the DefaultOffDspPresetKey
+        /// </summary>
+        [JsonProperty("defaultOffDspPresetKey")]
+        public string DefaultOffDspPresetKey { get; set; }
+
         /// <summary>
         /// Gets or sets the SourceListKey
         /// </summary>
+        /// </summary>
+        [JsonProperty("sourceListKey")]
         public string SourceListKey { get; set; }
-        [JsonProperty("destinationListKey")]
         /// <summary>
         /// Gets or sets the DestinationListKey
         /// </summary>
+        [JsonProperty("destinationListKey")]
         public string DestinationListKey { get; set; }
-        [JsonProperty("audioControlPointListKey")]
         /// <summary>
         /// Gets or sets the AudioControlPointListKey
         /// </summary>
+        [JsonProperty("audioControlPointListKey")]
         public string AudioControlPointListKey { get; set; }
-        [JsonProperty("cameraListKey")]
         /// <summary>
         /// Gets or sets the CameraListKey
         /// </summary>
+        [JsonProperty("cameraListKey")]
         public string CameraListKey { get; set; }
 
 
-        [JsonProperty("defaultSourceItem")]
         /// <summary>
         /// Gets or sets the DefaultSourceItem
         /// </summary>
+        [JsonProperty("defaultSourceItem")]
         public string DefaultSourceItem { get; set; }
         /// <summary>
         /// Indicates if the room supports advanced sharing
         /// </summary>
         [JsonProperty("supportsAdvancedSharing")]
-        /// <summary>
-        /// Gets or sets the SupportsAdvancedSharing
-        /// </summary>
         public bool SupportsAdvancedSharing { get; set; }
+
         /// <summary>
         /// Indicates if non-tech users can change the share mode
         /// </summary>
         [JsonProperty("userCanChangeShareMode")]
-        /// <summary>
-        /// Gets or sets the UserCanChangeShareMode
-        /// </summary>
         public bool UserCanChangeShareMode { get; set; }
 
 
-        [JsonProperty("matrixRoutingKey", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the MatrixRoutingKey
         /// </summary>
+        [JsonProperty("matrixRoutingKey", NullValueHandling = NullValueHandling.Ignore)]
         public string MatrixRoutingKey { get; set; }
     }
 
+    /// <summary>
+    /// Represents a EssentialsConferenceRoomPropertiesConfig
+    /// </summary>
     public class EssentialsConferenceRoomPropertiesConfig : EssentialsAvRoomPropertiesConfig
     {
-        [JsonProperty("videoCodecKey")]
         /// <summary>
         /// Gets or sets the VideoCodecKey
         /// </summary>
+        [JsonProperty("videoCodecKey")]
         public string VideoCodecKey { get; set; }
-        [JsonProperty("audioCodecKey")]
         /// <summary>
         /// Gets or sets the AudioCodecKey
         /// </summary>
+        [JsonProperty("audioCodecKey")]
         public string AudioCodecKey { get; set; }
 
     }
@@ -337,12 +358,15 @@ namespace PepperDash.Essentials.Room.Config
         /// </summary>
         public bool Enabled { get; set; }
 
-        [JsonProperty("deviceKeys")]
         /// <summary>
         /// Gets or sets the DeviceKeys
         /// </summary>
+        [JsonProperty("deviceKeys")]
         public List<string> DeviceKeys { get; set; }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
         public EssentialsEnvironmentPropertiesConfig()
         {
             DeviceKeys = new List<string>();
@@ -355,6 +379,9 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomFusionConfig
     {
+        /// <summary>
+        /// Gets the the IpId as a UInt16
+        /// </summary>
         public uint IpIdInt
         {
             get
@@ -371,16 +398,16 @@ namespace PepperDash.Essentials.Room.Config
             }
         }
 
-        [JsonProperty("ipId")]
         /// <summary>
         /// Gets or sets the IpId
         /// </summary>
+        [JsonProperty("ipId")]
         public string IpId { get; set; }
 
-        [JsonProperty("joinMapKey")]
         /// <summary>
         /// Gets or sets the JoinMapKey
         /// </summary>
+        [JsonProperty("joinMapKey")]
         public string JoinMapKey { get; set; }
 
     }
@@ -390,16 +417,16 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomMicrophonePrivacyConfig
     {
-        [JsonProperty("deviceKey")]
         /// <summary>
         /// Gets or sets the DeviceKey
         /// </summary>
+        [JsonProperty("deviceKey")]
         public string DeviceKey { get; set; }
 
-        [JsonProperty("behaviour")]
         /// <summary>
         /// Gets or sets the Behaviour
         /// </summary>
+        [JsonProperty("behaviour")]
         public string Behaviour { get; set; }
     }
 
@@ -408,12 +435,15 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsHelpPropertiesConfig
     {
-        [JsonProperty("message")]
         /// <summary>
         /// Gets or sets the Message
         /// </summary>
+        [JsonProperty("message")]
         public string Message { get; set; }
 
+        /// <summary>
+        /// Gets or sets the ShowCallButton
+        /// </summary>
         [JsonProperty("showCallButton")]
         public bool ShowCallButton { get; set; }
 
@@ -421,11 +451,11 @@ namespace PepperDash.Essentials.Room.Config
         /// Defaults to "Call Help Desk"
         /// </summary>
         [JsonProperty("callButtonText")]
-        /// <summary>
-        /// Gets or sets the CallButtonText
-        /// </summary>
         public string CallButtonText { get; set; }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
         public EssentialsHelpPropertiesConfig()
         {
             CallButtonText = "Call Help Desk";
@@ -437,22 +467,28 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsOneButtonMeetingPropertiesConfig
     {
-        [JsonProperty("enable")]
         /// <summary>
         /// Gets or sets the Enable
         /// </summary>
+        [JsonProperty("enable")]
         public bool Enable { get; set; }
     }
 
+    /// <summary>
+    /// Represents a EssentialsRoomAddressPropertiesConfig
+    /// </summary>
     public class EssentialsRoomAddressPropertiesConfig
     {
+        /// <summary>
+        /// Gets or sets the PhoneNumber
+        /// </summary>
         [JsonProperty("phoneNumber")]
         public string PhoneNumber { get; set; }
 
-        [JsonProperty("sipAddress")]
         /// <summary>
         /// Gets or sets the SipAddress
         /// </summary>
+        [JsonProperty("sipAddress")]
         public string SipAddress { get; set; }
     }
 
@@ -462,14 +498,18 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsLogoPropertiesConfig
     {
-        [JsonProperty("type")]
         /// <summary>
         /// Gets or sets the Type
         /// </summary>
+        [JsonProperty("type")]
         public string Type { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Url
+        /// </summary>
         [JsonProperty("url")]
         public string Url { get; set; }
+
         /// <summary>
         /// GetLogoUrlLight method
         /// </summary>
@@ -502,22 +542,28 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomOccSensorConfig
     {
-        [JsonProperty("deviceKey")]
         /// <summary>
         /// Gets or sets the DeviceKey
         /// </summary>
+        [JsonProperty("deviceKey")]
         public string DeviceKey { get; set; }
 
+        /// <summary>
+        /// Gets or sets the TimeoutMinutes
+        /// </summary>
         [JsonProperty("timeoutMinutes")]
         public int TimeoutMinutes { get; set; }
     }
 
+    /// <summary>
+    /// Represents a EssentialsRoomTechConfig
+    /// </summary>
     public class EssentialsRoomTechConfig
     {
-        [JsonProperty("password")]
         /// <summary>
         /// Gets or sets the Password
         /// </summary>
+        [JsonProperty("password")]
         public string Password { get; set; }
     }
 }

src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs

@@ -98,7 +98,7 @@ namespace PepperDash.Essentials.Core.Routing
         /// <param name="inputPort">The currently selected input port on the destination device.</param>
         private void UpdateDestination(IRoutingSinkWithSwitching destination, RoutingInputPort inputPort)
         {            
-            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Updating destination {destination} with inputPort {inputPort}", this,destination?.Key, inputPort?.Key);
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Updating destination {destination} with inputPort {inputPort}", this, destination?.Key, inputPort?.Key);
 
             if(inputPort == null)
             {

src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using PepperDash.Core;
+using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
@@ -9,7 +10,7 @@ namespace PepperDash.Essentials.Devices.Common.Generic
     /// <summary>
     /// Represents a GenericSink
     /// </summary>
-    public class GenericSink : EssentialsDevice, IRoutingSinkWithInputPort
+    public class GenericSink : EssentialsDevice, IRoutingSinkWithSwitchingWithInputPort
     {
         /// <summary>
         /// Initializes a new instance of the GenericSink class
@@ -20,7 +21,7 @@ namespace PepperDash.Essentials.Devices.Common.Generic
         {
             InputPorts = new RoutingPortCollection<RoutingInputPort>();
 
-            var inputPort = new RoutingInputPort(RoutingPortNames.AnyVideoIn, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, null, this);
+            var inputPort = new RoutingInputPort(RoutingPortNames.AnyVideoIn, eRoutingSignalType.AudioVideo | eRoutingSignalType.SecondaryAudio, eRoutingPortConnectionType.Hdmi, null, this);
 
             InputPorts.Add(inputPort);
         }
@@ -66,6 +67,15 @@ namespace PepperDash.Essentials.Devices.Common.Generic
         /// Event fired when the current source changes
         /// </summary>
         public event SourceInfoChangeHandler CurrentSourceChange;
+
+        /// <inheritdoc />
+        public event InputChangedEventHandler InputChanged;
+
+        /// <inheritdoc />
+        public void ExecuteSwitch(object inputSelector)
+        {
+            this.LogDebug("GenericSink Executing Switch to: {inputSelector}", inputSelector);
+        }
     }
 
     /// <summary>

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

@@ -194,7 +194,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             if (!enableMessengerSubscriptions)
             {
-                this.LogWarning("Messenger subscriptions not enabled");
                 return;
             }
 
@@ -218,7 +217,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             if (!enableMessengerSubscriptions)
             {
-                this.LogWarning("Messenger subscriptions not enabled");
                 return;
             }
 
@@ -238,7 +236,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 return;
             }
 
-            this.LogInformation("Client with ID {clientId} unsubscribed", clientId);
+            this.LogDebug("Client with ID {clientId} unsubscribed", clientId);
         }
 
         /// <summary>
@@ -272,7 +270,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
             }
             catch (Exception ex)
             {
-                this.LogError(ex, "Exception posting status message for {messagePath} to {clientId}", MessagePath, clientId ?? "all clients");
+                this.LogError("Exception posting status message for {messagePath} to {clientId}: {message}", MessagePath, clientId ?? "all clients", ex.Message);
+                this.LogDebug(ex, "Stack trace: ");
             }
         }
 
@@ -301,7 +300,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
             }
             catch (Exception ex)
             {
-                this.LogError(ex, "Exception posting status message for {type} to {clientId}", type, clientId ?? "all clients");
+                this.LogError("Exception posting status message for {type} to {clientId}: {message}", type, clientId ?? "all clients", ex.Message);
+                this.LogDebug(ex, "Stack trace: ");
             }
         }
 

src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs

@@ -1312,6 +1312,11 @@ namespace PepperDash.Essentials
         /// <inheritdoc />
         public override void Initialize()
         {
+            if (!Config.EnableMessengerSubscriptions)
+            {
+                this.LogWarning("Messenger subscriptions disabled. add \"enableMessengerSubscriptions\": true to config for {key} to enable.", Key);
+            }
+
             foreach (var messenger in _messengers)
             {
                 try

src/UdmCws/Interfaces/IUdmApi.cs

@@ -0,0 +1,8 @@
+
+namespace UdmCws
+{
+    public interface IUdmApi
+    {
+        bool SetDeviceProperty(DeviceKeys DeviceKey, DeviceStatus DeviceStatus );
+    }
+}

src/UdmCws/Models/CustomProperties.cs

@@ -0,0 +1,15 @@
+using Newtonsoft.Json;
+
+namespace UdmCws
+{
+
+    public class CustomProperties
+    {
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("value")]
+        public string Value { get; set; }
+    }
+
+}

src/UdmCws/Models/DeviceStatus.cs

@@ -0,0 +1,29 @@
+using Newtonsoft.Json;
+
+namespace UdmCws
+{
+    public class DeviceStatus
+    {
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("status")]
+        public string Status { get; set; }
+
+        [JsonProperty("description")]
+        public string Description { get; set; }
+
+        [JsonProperty("videoSource")]
+        public string VideoSource { get; set; }
+
+        [JsonProperty("audioSource")]
+        public string AudioSource { get; set; }
+
+        [JsonProperty("usage")]
+        public int Usage { get; set; }
+
+        [JsonProperty("error")]
+        public string Error { get; set; }
+    }
+
+}

src/UdmCws/Models/RoomResponse.cs

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace UdmCws
+{
+    /// <summary>
+    /// Represents the complete room response for UDM API
+    /// </summary>
+    public class RoomResponse
+    {
+        /// <summary>
+        /// API version string
+        /// </summary>
+        [JsonProperty("apiVersion")]
+        public string ApiVersion { get; private set; }
+
+        /// <summary>
+        /// Standard room properties
+        /// </summary>
+        [JsonProperty("standard")]
+        public StandardProperties Standard { get; set; }
+
+        /// <summary>
+        /// Status information including devices
+        /// </summary>
+        [JsonProperty("status")]
+        public StatusProperties Status { get; set; }
+
+        /// <summary>
+        /// Custom properties dictionary
+        /// </summary>
+        [JsonProperty("custom")]
+        public Dictionary<string, CustomProperties> Custom { get; set; }
+    }
+}

src/UdmCws/Models/StandardProperties.cs

@@ -0,0 +1,26 @@
+using Newtonsoft.Json;
+
+namespace UdmCws
+{
+    public class StandardProperties
+    {
+        [JsonProperty("version")]
+        public string Version { get; set; }
+
+        [JsonProperty("state")]
+        public string State { get; set; }
+
+        [JsonProperty("error")]
+        public string Error { get; set; }
+
+        [JsonProperty("occupancy")]
+        public bool Occupancy { get; set; }
+
+        [JsonProperty("helpRequest")]
+        public string HelpRequest { get; set; }
+
+        [JsonProperty("activity")]
+        public string Activity { get; set; }
+    }
+
+}

src/UdmCws/Models/StatusProperties.cs

@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace UdmCws
+{
+    public class StatusProperties
+    {
+        /// <summary>
+        /// Dictionary of device statuses keyed by device identifier
+        /// </summary>
+        [JsonProperty("devices")]
+        public Dictionary<string, DeviceStatus> Devices { get; set; }
+    }
+}

src/UdmCws/UdmCws.csproj

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Configurations>Debug;Release;Debug 4.7.2</Configurations>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <AssemblyName>UdmCws</AssemblyName>
+    <RootNamespace>UdmCws</RootNamespace>
+    <Title>UDM CWS API</Title>
+    <PackageId>UdmCws</PackageId>
+    <InformationalVersion>$(Version)</InformationalVersion>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 4.7.2|AnyCPU'">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <DocumentationFile>bin\$(Configuration)\UdmCws.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+  </ItemGroup>
+</Project>

src/UdmCws/enums/CustomPropertyEnums.cs

@@ -0,0 +1,30 @@
+namespace UdmCws
+{
+    /// <summary>
+    /// Enumeration of valid custom property identifiers for UDM API.
+    /// Property keys must be in the format "property1" through "property20".
+    /// </summary>
+    public enum PropertyKeys
+    {
+        property1,
+        property2,
+        property3,
+        property4,
+        property5,
+        property6,
+        property7,
+        property8,
+        property9,
+        property10,
+        property11,
+        property12,
+        property13,
+        property14,
+        property15,
+        property16,
+        property17,
+        property18,
+        property19,
+        property20
+    }
+}

src/UdmCws/enums/DeviceEnums.cs

@@ -0,0 +1,30 @@
+namespace UdmCws
+{
+        /// <summary>
+        /// Enumeration of valid device identifiers for UDM API status properties.
+        /// Device keys must be in the format "device1" through "device20".
+        /// </summary>
+        public enum DeviceKeys
+        {
+            device1,
+            device2,
+            device3,
+            device4,
+            device5,
+            device6,
+            device7,
+            device8,
+            device9,
+            device10,
+            device11,
+            device12,
+            device13,
+            device14,
+            device15,
+            device16,
+            device17,
+            device18,
+            device19,
+            device20
+        }
+}