Merge tag '1.13.3-hotfix-2156' into feature/DmHdcpEnhancements

Update PD Core to 1.2.1 DEV

.github/workflows/add-issues-to-project.yml

@@ -0,0 +1,37 @@
+name: Add bugs to bugs project
+
+on:
+  issues:
+    types:
+      - opened
+      - labeled
+      
+jobs:
+  check-secret:
+    runs-on: ubuntu-latest
+    outputs:
+      my-key: ${{ steps.my-key.outputs.defined }}
+    steps:
+        - id: my-key
+          if: "${{ env.MY_KEY != '' }}"
+          run: echo "::set-output name=defined::true"
+          env:
+              MY_KEY: ${{ secrets.PROJECT_URL }}
+  throw-error: 
+    name: Check
+    runs-on: ubuntu-latest
+    needs: [check-secret]
+    if: needs.check-secret.outputs.my-key != 'true'
+    steps:
+      - run: echo "The Project URL Repo Secret is empty"
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    needs: [check-secret]
+    if: needs.check-secret.outputs.my-key == 'true'
+    steps:
+      - uses: actions/add-to-project@main
+        with:
+          project-url: ${{ secrets.PROJECT_URL }}
+          github-token: ${{ secrets.GH_PROJECTS_PASSWORD }}
+

PepperDashEssentials/ControlSystem.cs

@@ -93,28 +93,27 @@ namespace PepperDash.Essentials
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 foreach (var tl in TieLineCollection.Default)
-                    CrestronConsole.ConsoleCommandResponse("  {0}{1}", tl, CrestronEnvironment.NewLine);
+                    CrestronConsole.ConsoleCommandResponse("  {0}\r\n", tl);
             },
             "listtielines", "Prints out all tie lines", ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 CrestronConsole.ConsoleCommandResponse
-                    ("Current running configuration. This is the merged system and template configuration" + CrestronEnvironment.NewLine);
+                    ("Current running configuration. This is the merged system and template configuration");
                 CrestronConsole.ConsoleCommandResponse(Newtonsoft.Json.JsonConvert.SerializeObject
                     (ConfigReader.ConfigObject, Newtonsoft.Json.Formatting.Indented));
             }, "showconfig", "Shows the current running merged config", ConsoleAccessLevelEnum.AccessOperator);
 
-            CrestronConsole.AddNewConsoleCommand(s =>
+            CrestronConsole.AddNewConsoleCommand(s => 
                 CrestronConsole.ConsoleCommandResponse(
-                "This system can be found at the following URLs:{2}" +
-                "System URL:   {0}{2}" +
-                "Template URL: {1}{2}",
-                ConfigReader.ConfigObject.SystemUrl,
-                ConfigReader.ConfigObject.TemplateUrl,
-                CrestronEnvironment.NewLine),
-                "portalinfo",
-                "Shows portal URLS from configuration",
+                "This system can be found at the following URLs:\r\n" +
+                "System URL:   {0}\r\n" +
+                "Template URL: {1}", 
+                ConfigReader.ConfigObject.SystemUrl, 
+                ConfigReader.ConfigObject.TemplateUrl), 
+                "portalinfo", 
+                "Shows portal URLS from configuration", 
                 ConsoleAccessLevelEnum.AccessOperator);
 
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs

@@ -165,7 +165,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
                 Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
 
-                if (!typeof(IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
+                if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
                 {
                     Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
                         "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
@@ -409,7 +409,7 @@ namespace PepperDash.Essentials.Core.Bridges
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
         [JsonProperty("rooms")]
-        public List<ApiRoomPropertiesConfig> Rooms { get; set; }
+        public List<ApiRoomPropertiesConfig> Rooms { get; set; } 
 
 
         public class ApiDevicePropertiesConfig
@@ -442,7 +442,7 @@ namespace PepperDash.Essentials.Core.Bridges
     {
         public EiscApiAdvancedFactory()
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient",  "vceiscapiadv", "vceiscapiadvanced" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -457,34 +457,34 @@ namespace PepperDash.Essentials.Core.Bridges
             {
                 case "eiscapiadv":
                 case "eiscapiadvanced":
-                    {
-                        eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
-                            controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                        break;
-                    }
+                {
+                    eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
+                        controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                    break;
+                }
                 case "eiscapiadvancedserver":
-                    {
-                        eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
-                        break;
-                    }
+                {
+                    eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
+                    break;
+                }
                 case "eiscapiadvancedclient":
-                    {
-                        eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                        break;
-                    }
+                {
+                    eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                    break;
+                }
                 case "vceiscapiadv":
                 case "vceiscapiadvanced":
+                {
+                    if (string.IsNullOrEmpty(controlProperties.RoomId))
                     {
-                        if (string.IsNullOrEmpty(controlProperties.RoomId))
-                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
-                            eisc = null;
-                            break;
-                        }
-                        eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
-                            Global.ControlSystem);
+                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
+                        eisc = null;
                         break;
                     }
+                    eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
+                        Global.ControlSystem);
+                    break;
+                }
                 default:
                     eisc = null;
                     break;

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceManager.cs

@@ -379,28 +379,28 @@ namespace PepperDash.Essentials.Core
         /// Prints a list of routing inputs and outputs by device key.
         /// </summary>
         /// <param name="s">Device key from which to report data</param>
-        public static void GetRoutingPorts(string s)
-        {
-            var device = GetDeviceForKey(s);
+	    public static void GetRoutingPorts(string s)
+	    {
+	        var device = GetDeviceForKey(s);
 
             if (device == null) return;
             var inputPorts = ((device as IRoutingInputs) != null) ? (device as IRoutingInputs).InputPorts : null;
             var outputPorts = ((device as IRoutingOutputs) != null) ? (device as IRoutingOutputs).OutputPorts : null;
-            if (inputPorts != null)
-            {
-                CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Input Ports:{2}", s, inputPorts.Count, CrestronEnvironment.NewLine);
-                foreach (var routingInputPort in inputPorts)
-                {
-                    CrestronConsole.ConsoleCommandResponse("{0}{1}", routingInputPort.Key, CrestronEnvironment.NewLine);
-                }
-            }
+	        if (inputPorts != null)
+	        {
+                CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Input Ports:", s, inputPorts.Count);
+	            foreach (var routingInputPort in inputPorts)
+	            {
+                    CrestronConsole.ConsoleCommandResponse("{0}", routingInputPort.Key);
+	            }
+	        }
             if (outputPorts == null) return;
-            CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Output Ports:{2}", s, outputPorts.Count, CrestronEnvironment.NewLine);
+            CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Output Ports:", s, outputPorts.Count);
             foreach (var routingOutputPort in outputPorts)
             {
-                CrestronConsole.ConsoleCommandResponse("{0}{1}", routingOutputPort.Key, CrestronEnvironment.NewLine);
+                CrestronConsole.ConsoleCommandResponse("{0}", routingOutputPort.Key);
             }
-        }
+	    }
 
         /// <summary>
         /// Attempts to set the debug level of a device

essentials-framework/Essentials Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs

@@ -175,8 +175,8 @@ namespace PepperDash.Essentials.Core
         /// <param name="filter"></param>
         public static void GetDeviceFactoryTypes(string filter)
         {
-            var types = !string.IsNullOrEmpty(filter)
-                ? FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value)
+            var types = !string.IsNullOrEmpty(filter) 
+                ? FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value) 
                 : FactoryMethods;
 
             CrestronConsole.ConsoleCommandResponse("Device Types:");
@@ -186,12 +186,12 @@ namespace PepperDash.Essentials.Core
                 var description = type.Value.Description;
                 var cType = "Not Specified by Plugin";
 
-                if (type.Value.CType != null)
+                if(type.Value.CType != null)
                 {
                     cType = type.Value.CType.FullName;
                 }
 
-                CrestronConsole.ConsoleCommandResponse(
+                CrestronConsole.ConsoleCommandResponse( 
                     @"Type: '{0}' 
                     CType: '{1}' 
                     Description: {2}", type.Key, cType, description);

essentials-framework/Essentials Core/PepperDashEssentialsBase/File/FileIO.cs

@@ -9,18 +9,18 @@ using Crestron.SimplSharpPro.CrestronThread;
 
 namespace PepperDash.Essentials.Core
 {
-    public static class FileIO
-    {
+	public static class FileIO
+	{
 
-        static CCriticalSection fileLock = new CCriticalSection();
-        public delegate void GotFileEventHandler(object sender, FileEventArgs e);
-        public static event GotFileEventHandler GotFileEvent;
+		static CCriticalSection fileLock = new CCriticalSection();
+		public delegate void GotFileEventHandler(object sender, FileEventArgs e);
+		public static event GotFileEventHandler GotFileEvent;
 
-        /// <summary>
-        /// Get the full file info from a path/filename, can include wildcards.
-        /// </summary>
-        /// <param name="fileName"></param>
-        /// <returns></returns>
+		/// <summary>
+		/// Get the full file info from a path/filename, can include wildcards.
+		/// </summary>
+		/// <param name="fileName"></param>
+		/// <returns></returns>
         public static FileInfo[] GetFiles(string fileName)
         {
             string fullFilePath = Global.FilePathPrefix + fileName;
@@ -54,228 +54,228 @@ namespace PepperDash.Essentials.Core
         }
 
 
-        /// <summary>
-        /// Get the data from string path/filename
-        /// </summary>
-        /// <param name="fileName"></param>
-        /// <returns></returns>
-        public static string ReadDataFromFile(string fileName)
-        {
-            try
-            {
-                return ReadDataFromFile(GetFile(fileName));
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-                return "";
-            }
-        }
+		/// <summary>
+		/// Get the data from string path/filename
+		/// </summary>
+		/// <param name="fileName"></param>
+		/// <returns></returns>
+		public static string ReadDataFromFile(string fileName)
+		{
+			try
+			{
+				return ReadDataFromFile(GetFile(fileName));
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
+				return "";
+			}
+		}
 
-        /// <summary>
-        /// Get the data with fileInfo object 
-        /// </summary>
-        /// <param name="fileName"></param>
-        /// <returns></returns>
-        public static string ReadDataFromFile(FileInfo file)
-        {
-            try
-            {
-                if (fileLock.TryEnter())
-                {
-                    DirectoryInfo dirInfo = new DirectoryInfo(file.DirectoryName);
-                    Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
+		/// <summary>
+		/// Get the data with fileInfo object 
+		/// </summary>
+		/// <param name="fileName"></param>
+		/// <returns></returns>
+		public static string ReadDataFromFile(FileInfo file)
+		{
+			try
+			{
+				if (fileLock.TryEnter())
+				{
+					DirectoryInfo dirInfo = new DirectoryInfo(file.DirectoryName);
+					Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
 
-                    if (File.Exists(file.FullName))
-                    {
-                        using (StreamReader r = new StreamReader(file.FullName))
-                        {
-                            return r.ReadToEnd();
-                        }
-                    }
-                    else
-                    {
-                        Debug.Console(2, "File {0} does not exsist", file.FullName);
-                        return "";
-                    }
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
-                    return "";
-                }
+					if (File.Exists(file.FullName))
+					{
+						using (StreamReader r = new StreamReader(file.FullName))
+						{
+							return r.ReadToEnd();
+						}
+					}
+					else
+					{
+						Debug.Console(2, "File {0} does not exsist", file.FullName);
+						return "";
+					}
+				}
+				else
+				{
+					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
+					return "";
+				}
+				
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
+				return "";
+			}
+			finally
+			{
+				if (fileLock != null && !fileLock.Disposed)
+					fileLock.Leave();
 
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-                return "";
-            }
-            finally
-            {
-                if (fileLock != null && !fileLock.Disposed)
-                    fileLock.Leave();
-
-            }
-        }
+			}
+		}
 
 
-        public static void ReadDataFromFileASync(string fileName)
-        {
-            try
-            {
-                ReadDataFromFileASync(GetFile(fileName));
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-            }
-        }
+		public static void ReadDataFromFileASync(string fileName)
+		{
+			try
+			{
+				ReadDataFromFileASync(GetFile(fileName));
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
+			}
+		}
 
-        public static void ReadDataFromFileASync(FileInfo file)
-        {
-            try
-            {
-                CrestronInvoke.BeginInvoke(o => _ReadDataFromFileASync(file));
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-            }
-        }
+		public static void ReadDataFromFileASync(FileInfo file)
+		{
+			try
+			{
+				CrestronInvoke.BeginInvoke(o => _ReadDataFromFileASync(file));
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
+			}
+		}
 
-        private static void _ReadDataFromFileASync(FileInfo file)
-        {
-            string data;
-            try
-            {
-                if (fileLock.TryEnter())
-                {
-                    DirectoryInfo dirInfo = new DirectoryInfo(file.Name);
-                    Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
+		private static void _ReadDataFromFileASync(FileInfo file)
+		{
+			string data;
+			try
+			{
+				if (fileLock.TryEnter())
+				{
+					DirectoryInfo dirInfo = new DirectoryInfo(file.Name);
+					Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
 
 
-                    if (File.Exists(file.FullName))
-                    {
-                        using (StreamReader r = new StreamReader(file.FullName))
-                        {
-                            data = r.ReadToEnd();
-                        }
-                    }
-                    else
-                    {
-                        Debug.Console(2, "File {0} Does not exsist", file.FullName);
-                        data = "";
-                    }
-                    GotFileEvent.Invoke(null, new FileEventArgs(data));
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
-                }
+					if (File.Exists(file.FullName))
+					{
+						using (StreamReader r = new StreamReader(file.FullName))
+						{
+							data = r.ReadToEnd();
+						}
+					}
+					else
+					{
+						Debug.Console(2, "File {0} Does not exsist", file.FullName);
+						data = "";
+					}
+					GotFileEvent.Invoke(null, new FileEventArgs(data));
+				}
+				else
+				{
+					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
+				}
 
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-                data = "";
-            }
-            finally
-            {
-                if (fileLock != null && !fileLock.Disposed)
-                    fileLock.Leave();
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
+				data = "";
+			}
+			finally
+			{
+				if (fileLock != null && !fileLock.Disposed)
+					fileLock.Leave();
 
-            }
+			}
 
 
 
-        }
+		}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="data"></param>
-        /// <param name="filePath"></param>
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="data"></param>
-        /// <param name="filePath"></param>
-        public static void WriteDataToFile(string data, string filePath)
-        {
-            Thread _WriteFileThread;
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="data"></param>
+		/// <param name="filePath"></param>
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="data"></param>
+		/// <param name="filePath"></param>
+		public static void WriteDataToFile(string data, string filePath)
+		{
+			Thread _WriteFileThread;
             _WriteFileThread = new Thread((O) => _WriteFileMethod(data, Global.FilePathPrefix + "/" + filePath), null, Thread.eThreadStartOptions.CreateSuspended);
-            _WriteFileThread.Priority = Thread.eThreadPriority.LowestPriority;
-            _WriteFileThread.Start();
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WriteFile Thread");
+			_WriteFileThread.Priority = Thread.eThreadPriority.LowestPriority;
+			_WriteFileThread.Start();
+			Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WriteFile Thread");
 
-        }
+		}
 
-        static object _WriteFileMethod(string data, string filePath)
-        {
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write file: '{0}'", filePath);
+		static object _WriteFileMethod(string data, string filePath)
+		{
+			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write file: '{0}'", filePath);
 
-            try
-            {
-                if (fileLock.TryEnter())
-                {
+			try
+			{
+				if (fileLock.TryEnter())
+				{
 
                     using (StreamWriter sw = new StreamWriter(filePath))
-                    {
-                        sw.Write(data);
-                        sw.Flush();
-                    }
+					{
+						sw.Write(data);
+						sw.Flush();
+					}
 
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
-                }
+				}
+				else
+				{
+					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
+				}
 
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO write failed: \r{0}", e);
-            }
-            finally
-            {
-                if (fileLock != null && !fileLock.Disposed)
-                    fileLock.Leave();
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO write failed: \r{0}", e);
+			}
+			finally
+			{
+				if (fileLock != null && !fileLock.Disposed)
+					fileLock.Leave();
 
-            }
-            return null;
+			}
+			return null;
 
-        }
+		}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public static bool FileIoUnitTest()
-        {
-            var testData = "Testing FileIO";
-            FileIO.WriteDataToFile(testData, "\\user\\FileIOTest.pdt");
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <returns></returns>
+		public static bool FileIoUnitTest()
+		{
+			var testData = "Testing FileIO";
+			FileIO.WriteDataToFile(testData, "\\user\\FileIOTest.pdt");
 
-            var file = FileIO.GetFile("\\user\\*FileIOTest*");
+			var file = FileIO.GetFile("\\user\\*FileIOTest*");
+			
+			var readData = FileIO.ReadDataFromFile(file);
+			Debug.Console(0, "Returned {0}", readData);
+			File.Delete(file.FullName);
+			if (testData == readData)
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
 
-            var readData = FileIO.ReadDataFromFile(file);
-            Debug.Console(0, "Returned {0}", readData);
-            File.Delete(file.FullName);
-            if (testData == readData)
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
+	}
+	public class FileEventArgs
+	{
+		public FileEventArgs(string data) { Data = data; }
+		public string Data { get; private set; } // readonly
 
-    }
-    public class FileEventArgs
-    {
-        public FileEventArgs(string data) { Data = data; }
-        public string Data { get; private set; } // readonly
-
-    }
+	}
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs

@@ -195,12 +195,13 @@ namespace PepperDash.Essentials
         public static void ReportAssemblyVersions(string command)
         {
 
-            CrestronConsole.ConsoleCommandResponse("Loaded Assemblies:" + CrestronEnvironment.NewLine);
+            CrestronConsole.ConsoleCommandResponse("Loaded Assemblies:");
             foreach (var assembly in LoadedAssemblies)
             {
-                CrestronConsole.ConsoleCommandResponse("{0} Version: {1}" + CrestronEnvironment.NewLine, assembly.Name, assembly.Version);
+                CrestronConsole.ConsoleCommandResponse("{0} Version: {1}", assembly.Name, assembly.Version);
             }
         }
+
         /// <summary>
         /// Moves any .dll assemblies not already loaded from the plugins folder to loadedPlugins folder
         /// </summary>

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmBladeChassisController.cs

@@ -22,7 +22,7 @@ namespace PepperDash.Essentials.DM
     /// Builds a controller for basic DM-RMCs with Com and IR ports and no control functions
     /// 
     /// </summary>
-	public class DmBladeChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitchWithEndpointOnlineFeedback, IRoutingNumericWithFeedback
+    public class DmBladeChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitch, IRoutingNumericWithFeedback
     {
         private const string NonePortKey = "inputCard0--None";
 

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs

@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.DM
     /// 
     /// </summary>
     [Description("Wrapper class for all DM-MD chassis variants from 8x8 to 32x32")]
-    public class DmChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitchWithEndpointOnlineFeedback, IRoutingNumericWithFeedback
+    public class DmChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitch, IRoutingNumericWithFeedback
     {
         private const string NonePortKey = "inputCard0--None";
         public DMChassisPropertiesConfig PropertiesConfig { get; set; }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs

@@ -436,9 +436,9 @@ namespace PepperDash.Essentials.DM
                 }
                 return rx;
             }
-            else if (parentDev is IDmSwitchWithEndpointOnlineFeedback)
+            else if (parentDev is DmChassisController)
             {
-                var controller = parentDev as IDmSwitchWithEndpointOnlineFeedback;
+                var controller = parentDev as DmChassisController;
                 var chassis = controller.Chassis;
                 var num = props.ParentOutputNumber;
                 Debug.Console(1, "Creating DM Chassis device '{0}'. Output number '{1}'.", key, num);

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs

@@ -121,7 +121,7 @@ namespace PepperDash.Essentials.DM
 
             Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
             Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
-            Tx.DisplayPortInput.InputStreamChange += InputStreamChangeEvent;
+            Tx.DisplayPortInput.InputStreamChange += DisplayPortInputStreamChange;
             Tx.BaseEvent += Tx_BaseEvent;
             Tx.OnlineStatusChange += Tx_OnlineStatusChange;
 
@@ -131,7 +131,8 @@ namespace PepperDash.Essentials.DM
             HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => (int)tx.HdmiInputs[1].HdcpCapabilityFeedback);
 
             HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability", () => (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
-            DisplayPortInHdcpCapabilityFeedback = new IntFeedback("DisplayPortInHdcpCapability",
+
+            DisplayPortInHdcpCapabilityFeedback = new IntFeedback("DisplayPortHdcpCapability",
                 () => (int)tx.DisplayPortInput.HdcpCapabilityFeedback);
 
 
@@ -170,19 +171,13 @@ namespace PepperDash.Essentials.DM
                     (ActualActiveVideoInput == eVst.Hdmi1
                     && tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
                     || (ActualActiveVideoInput == eVst.Hdmi2
-                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.DisplayPort
-                    && tx.DisplayPortInput.VideoAttributes.HdcpActiveFeedback.BoolValue),
+                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
 
                 HdcpStateFeedbackFunc = () =>
                 {
                     if (ActualActiveVideoInput == eVst.Hdmi1)
-                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString(); 
-                    if (ActualActiveVideoInput == eVst.Hdmi2)
-                        return tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString();
-                    return ActualActiveVideoInput == eVst.DisplayPort
-                        ? tx.DisplayPortInput.VideoAttributes.HdcpStateFeedback.ToString()
-                        : "";
+                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
+                    return ActualActiveVideoInput == eVst.Hdmi2 ? tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString() : "";
                 },
 
                 VideoResolutionFeedbackFunc = () =>
@@ -191,8 +186,6 @@ namespace PepperDash.Essentials.DM
                         return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
                     if (ActualActiveVideoInput == eVst.Hdmi2)
                         return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
-                    if (ActualActiveVideoInput == eVst.DisplayPort)
-                        return tx.DisplayPortInput.VideoAttributes.GetVideoResolutionString();
                     return ActualActiveVideoInput == eVst.Vga ? tx.DisplayPortInput.VideoAttributes.GetVideoResolutionString() : "";
                 },
                 VideoSyncFeedbackFunc = () =>
@@ -200,8 +193,6 @@ namespace PepperDash.Essentials.DM
                     && tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
                     || (ActualActiveVideoInput == eVst.Hdmi2
                     && tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.DisplayPort
-                    && tx.DisplayPortInput.SyncDetectedFeedback.BoolValue)
                     || (ActualActiveVideoInput == eVst.Vga
                     && tx.DisplayPortInput.SyncDetectedFeedback.BoolValue)
 
@@ -220,15 +211,28 @@ namespace PepperDash.Essentials.DM
                 AnyVideoInput.VideoStatus.HasVideoStatusFeedback, AnyVideoInput.VideoStatus.HdcpActiveFeedback,
                 AnyVideoInput.VideoStatus.HdcpStateFeedback, AnyVideoInput.VideoStatus.VideoResolutionFeedback,
                 AnyVideoInput.VideoStatus.VideoSyncFeedback, HdmiIn1HdcpCapabilityFeedback, HdmiIn2HdcpCapabilityFeedback,
-                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback, DisplayPortVideoSyncFeedback, DisplayPortInHdcpCapabilityFeedback);
+                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback, DisplayPortVideoSyncFeedback);
 
+            // Set Ports for CEC
             HdmiIn1.Port = Tx.HdmiInputs[1];
             HdmiIn2.Port = Tx.HdmiInputs[2];
-            DisplayPortIn.Port = Tx.DisplayPortInput;
             HdmiLoopOut.Port = Tx.HdmiOutput;
             DmOut.Port = Tx.DmOutput;
         }
 
+        void DisplayPortInputStreamChange(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
+        {
+            Debug.Console(2, "{0} event {1} stream {2}", Tx.ToString(), inputStream.ToString(), args.EventId.ToString());
+
+            switch (args.EventId)
+            {
+                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
+                    DisplayPortVideoSyncFeedback.FireUpdate();
+                    break;
+            }
+        }
+
+
 
         public override bool CustomActivate()
         {
@@ -340,17 +344,11 @@ namespace PepperDash.Essentials.DM
                 case EndpointInputStreamEventIds.HdcpCapabilityFeedbackEventId:
                     if (inputStream == Tx.HdmiInputs[1]) HdmiIn1HdcpCapabilityFeedback.FireUpdate();
                     if (inputStream == Tx.HdmiInputs[2]) HdmiIn2HdcpCapabilityFeedback.FireUpdate();
-                    if (inputStream == Tx.DisplayPortInput) DisplayPortInHdcpCapabilityFeedback.FireUpdate();
-
-                    Debug.Console(2, this, "DisplayPortHDCP Mode Trigger = {0}",
-                        DisplayPortInHdcpCapabilityFeedback.IntValue);
-
                     HdcpStateFeedback.FireUpdate();
                     break;
                 case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
                     if (inputStream == Tx.HdmiInputs[1]) Hdmi1VideoSyncFeedback.FireUpdate();
                     if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
-                    if (inputStream == Tx.DisplayPortInput) DisplayPortVideoSyncFeedback.FireUpdate();
                     break;
             }
         }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
@@ -42,7 +44,7 @@ namespace PepperDash.Essentials.DM
             if (typeName.StartsWith("dmtx401"))
                 return new DmTx401CController(key, name, new DmTx401C(dmInput), true);
             if (typeName.StartsWith("hdbasettx"))
-                return new HDBaseTTxController(key, name, new HDTx3CB(dmInput));
+                new HDBaseTTxController(key, name, new HDTx3CB(dmInput));
 
             return null;
         }
@@ -81,7 +83,6 @@ namespace PepperDash.Essentials.DM
         /// <param name="key"></param>
         /// <param name="name"></param>
         /// <param name="props"></param>
-        /// <param name="typeName"></param>
         /// <returns></returns>
         public static BasicDmTxControllerBase GetDmTxController(string key, string name, string typeName, DmTxPropertiesConfig props)
         {
@@ -127,10 +128,10 @@ namespace PepperDash.Essentials.DM
             BasicDmTxControllerBase tx;
             bool useChassisForOfflineFeedback = false;
 
-            if (parentDev is IDmSwitchWithEndpointOnlineFeedback)
+            if (parentDev is DmChassisController)
             {
                 // Get the Crestron chassis and link stuff up
-                var switchDev = (parentDev as IDmSwitchWithEndpointOnlineFeedback);
+                var switchDev = (parentDev as DmChassisController);
                 var chassis = switchDev.Chassis;
 
                 //Check that the input is within range of this chassis' possible inputs
@@ -179,8 +180,7 @@ namespace PepperDash.Essentials.DM
                     return null;
                 }
             }
-
-            if (parentDev is DmpsRoutingController)
+            else if (parentDev is DmpsRoutingController)
             {
                 // Get the DMPS chassis and link stuff up
                 var dmpsDev = (parentDev as DmpsRoutingController);
@@ -237,8 +237,11 @@ namespace PepperDash.Essentials.DM
                 }
             }
 
-            Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a processor, DM Chassis or DMPS.", key, pKey);
-            return null;
+            else
+            {
+                Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a processor, DM Chassis or DMPS.", key, pKey);
+                return null;
+            }
         }
     }
 
@@ -333,6 +336,8 @@ namespace PepperDash.Essentials.DM
                 txR.VideoSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.VideoInput.JoinNumber]);
                 txR.AudioSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.AudioInput.JoinNumber]);
 
+                trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber].UShortValue = (ushort)tx.HdcpSupportCapability;
+
                 if (txR.InputPorts[DmPortName.HdmiIn] != null)
                 {
                     var inputPort = txR.InputPorts[DmPortName.HdmiIn];
@@ -379,7 +384,7 @@ namespace PepperDash.Essentials.DM
                     {
                         var intFeedback = tx.Feedbacks["HdmiIn2HdcpCapability"] as IntFeedback;
                         if (intFeedback != null)
-                            intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port2HdcpState.JoinNumber]);
+                            intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port1HdcpState.JoinNumber]);
                     }
 
                     if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
@@ -396,17 +401,16 @@ namespace PepperDash.Essentials.DM
 
                     if (tx.Feedbacks["DisplayPortInHdcpCapability"] != null)
                     {
-
                         var intFeedback = tx.Feedbacks["DisplayPortInHdcpCapability"] as IntFeedback;
                         if (intFeedback != null)
-
                             intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port3HdcpState.JoinNumber]);
+                    }
 
-                        if (inputPort.ConnectionType == eRoutingPortConnectionType.DisplayPort && inputPort.Port != null)
-                        {
-                            var port = inputPort.Port as EndpointDisplayPortInput;
-                            SetHdcpCapabilityAction(port, joinMap.Port3HdcpState.JoinNumber, trilist);
-                        }
+                    if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
+                    {
+                        var port = inputPort.Port as EndpointDisplayPortInput;
+
+                        SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port3HdcpState.JoinNumber, trilist);
                     }
                 }
 
@@ -463,7 +467,7 @@ namespace PepperDash.Essentials.DM
                     });
             }
             else
-            { 
+            {
                 trilist.SetUShortSigAction(join,
                         s =>
                         {
@@ -472,15 +476,17 @@ namespace PepperDash.Essentials.DM
             }
         }
 
-        private void SetHdcpCapabilityAction(EndpointDisplayPortInput port, uint join,
+        private void SetHdcpCapabilityAction(bool hdcpTypeSimple, EndpointDisplayPortInput port, uint join,
             BasicTriList trilist)
         {
+
+
             trilist.SetUShortSigAction(join,
                 s =>
                 {
-                    Debug.Console(0, this, "Trying to set HDCP to {0} on port {1}", s, port.ToString());
-                    port.HdcpCapability = (eHdcpCapabilityType) s;
+                    port.HdcpCapability = (eHdcpCapabilityType)s;
                 });
+
         }
 
     }
@@ -489,22 +495,8 @@ namespace PepperDash.Essentials.DM
     {
         public DmTxControllerFactory()
         {
-            TypeNames = new List<string>
-            {
-                "dmtx200c",
-                "dmtx201c",
-                "dmtx201s",
-                "dmtx4k100c",
-                "dmtx4k202c",
-                "dmtx4kz202c",
-                "dmtx4k302c",
-                "dmtx4kz302c",
-                "dmtx401c",
-                "dmtx401s",
-                "dmtx4k100c1g",
-                "dmtx4kz100c1g",
-                "hdbasettx"
-            };
+            TypeNames = new List<string>() { "dmtx200c", "dmtx201c", "dmtx201s", "dmtx4k100c", "dmtx4k202c", "dmtx4kz202c", "dmtx4k302c", "dmtx4kz302c",
+                "dmtx401c", "dmtx401s", "dmtx4k100c1g", "dmtx4kz100c1g", "hdbasettx" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -514,8 +506,8 @@ namespace PepperDash.Essentials.DM
             Debug.Console(1, "Factory Attempting to create new DM-TX Device");
 
             var props = JsonConvert.DeserializeObject
-                <DmTxPropertiesConfig>(dc.Properties.ToString());
-            return DmTxHelper.GetDmTxController(dc.Key, dc.Name, type, props);
+                <PepperDash.Essentials.DM.Config.DmTxPropertiesConfig>(dc.Properties.ToString());
+            return PepperDash.Essentials.DM.DmTxHelper.GetDmTxController(dc.Key, dc.Name, type, props);
         }
     }
 

essentials-framework/Essentials DM/Essentials_DM/IDmSwitch.cs

@@ -16,17 +16,10 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.DM.Config;
 
 namespace PepperDash.Essentials.DM {
-    public interface IDmSwitch
-	{
+    public interface IDmSwitch {
         Switch Chassis { get; }
 
         Dictionary<uint, string> TxDictionary { get; }
         Dictionary<uint, string> RxDictionary { get; }
     }
-
-	public interface IDmSwitchWithEndpointOnlineFeedback : IDmSwitch
-	{
-		Dictionary<uint, BoolFeedback> InputEndpointOnlineFeedbacks { get; }
-		Dictionary<uint, BoolFeedback> OutputEndpointOnlineFeedbacks { get; }
-	}
 }