feat: adds support for hdcp input control and feedback on Airmedia devices

Add default IR join map using Crestron IR File naming conventions

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/AirMediaControllerJoinMap.cs

@@ -20,6 +20,18 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete AutomaticInputRoutingEnabled = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Automatic Input Routing Enable(d)", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        [JoinName("HdmiInHdcpSupportOn")]
+        public JoinDataComplete HdmiInHdcpSupportOn = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+            new JoinMetadata { Description = "Turns on HDCP support for HDMI in.  Reports state as FB", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("HdmiInHdcpSupportOff")]
+        public JoinDataComplete HdmiInHdcpSupportOff = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+            new JoinMetadata { Description = "Turns off HDCP support for HDMI in.  Reports state as FB", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("HdmiInDisabledByHdcp")]
+        public JoinDataComplete HdmiInDisabledByHdcp = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
+            new JoinMetadata { Description = "Reports if ", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
         [JoinName("VideoOut")]
         public JoinDataComplete VideoOut = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Video Route Select / Feedback", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/GenericIrControllerJoinMap.cs

@@ -4,53 +4,11 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 {
 		public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
 		{
-			[JoinName("POWER")]
-			public JoinDataComplete Power = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 1,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "POWER",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("POWER_ON")]
-			public JoinDataComplete PowerOn = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 2,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "POWER_ON",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("POWER_OFF")]
-			public JoinDataComplete PowerOff = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 3,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "POWER_OFF",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
 			[JoinName("PLAY")]
 			public JoinDataComplete Play = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 4,
+					JoinNumber = 1,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -60,25 +18,11 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
-			[JoinName("PLAY_PAUSE")]
-			public JoinDataComplete PlayPause = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 5,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "PLAY_PAUSE",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
 			[JoinName("STOP")]
 			public JoinDataComplete Stop = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 6,
+					JoinNumber = 2,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -92,7 +36,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete Pause = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 7,
+					JoinNumber = 3,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -106,7 +50,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete ForwardScan = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 9,
+					JoinNumber = 4,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -115,40 +59,12 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
-			[JoinName("F_SRCH")]
-			public JoinDataComplete ForwardSearch = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 10,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "F_SRCH",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("F_SKIP")]
-			public JoinDataComplete ForwardSkip = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 11,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "F_SKIP",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
+			
 			[JoinName("RSCAN")]
 			public JoinDataComplete ReverseScan = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 12,
+					JoinNumber = 5,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -158,25 +74,25 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
-			[JoinName("R_SRCH")]
-			public JoinDataComplete ReverseSearch = new JoinDataComplete(
+			[JoinName("F_SKIP")]
+			public JoinDataComplete ForwardSkip = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 13,
+					JoinNumber = 6,
 					JoinSpan = 1
 				},
 				new JoinMetadata
 				{
-					Description = "R_SRCH",
+					Description = "F_SKIP",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
 			[JoinName("R_SKIP")]
 			public JoinDataComplete ReverseSkip = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 14,
+					JoinNumber = 7,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -186,40 +102,39 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
-			[JoinName("TRACK+")]
-			public JoinDataComplete TrackPlus = new JoinDataComplete(
+			[JoinName("RECORD")]
+			public JoinDataComplete Record = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 15,
+					JoinNumber = 8,
 					JoinSpan = 1
 				},
 				new JoinMetadata
 				{
-					Description = "TRACK+",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("TRACK-")]
-			public JoinDataComplete TrackMinus = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 16,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "TRACK-",
+					Description = "RECORD",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+			[JoinName("POWER")]
+			public JoinDataComplete Power = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 9,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "POWER",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
 			
-
 			[JoinName("0")]
 			public JoinDataComplete Kp0 = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 20,
+					JoinNumber = 10,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -233,7 +148,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete Kp1 = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 21,
+					JoinNumber = 11,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -247,7 +162,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete Kp2 = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 22,
+					JoinNumber = 12,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -261,7 +176,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete Kp3 = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 23,
+					JoinNumber = 13,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -275,7 +190,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete Kp4 = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 24,
+					JoinNumber = 14,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -289,7 +204,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete Kp5 = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 25,
+					JoinNumber = 15,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -303,7 +218,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete Kp6 = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 26,
+					JoinNumber = 16,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -317,7 +232,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete Kp7 = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 27,
+					JoinNumber = 17,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -331,7 +246,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete Kp8 = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 28,
+					JoinNumber = 18,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -345,7 +260,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete Kp9 = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 29,
+					JoinNumber = 19,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -355,25 +270,67 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
-			[JoinName("#")]
-			public JoinDataComplete KpPound = new JoinDataComplete(
+			// [JoinName("+10")]
+			// public JoinDataComplete Kp9 = new JoinDataComplete(
+			// 	new JoinData
+			// 	{
+			// 		JoinNumber = 20,
+			// 		JoinSpan = 1
+			// 	},
+			// 	new JoinMetadata
+			// 	{
+			// 		Description = "+10",
+			// 		JoinCapabilities = eJoinCapabilities.FromSIMPL,
+			// 		JoinType = eJoinType.Digital
+			// 	});
+			
+			[JoinName("ENTER")]
+			public JoinDataComplete Enter = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 30,
+					JoinNumber = 21,
 					JoinSpan = 1
 				},
 				new JoinMetadata
 				{
-					Description = "#",
+					Description = "ENTER",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
 
+			[JoinName("CH+")]
+			public JoinDataComplete ChannelUp = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 22,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "CH+",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("CH-")]
+			public JoinDataComplete ChannelDown = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 23,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "CH-",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
 			[JoinName("*")]
 			public JoinDataComplete KpStar = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 31,
+					JoinNumber = 24,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -383,121 +340,106 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
-			[JoinName("A")]
-			public JoinDataComplete KpA = new JoinDataComplete(
+			[JoinName("#")]
+			public JoinDataComplete KpPound = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 32,
+					JoinNumber = 25,
 					JoinSpan = 1
 				},
 				new JoinMetadata
 				{
-					Description = "A",
+					Description = "#",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
 
-			[JoinName("B")]
-			public JoinDataComplete KpB = new JoinDataComplete(
+			// [JoinName(".")]
+			// public JoinDataComplete KpPound = new JoinDataComplete(
+			// 	new JoinData
+			// 	{
+			// 		JoinNumber = 26,
+			// 		JoinSpan = 1
+			// 	},
+			// 	new JoinMetadata
+			// 	{
+			// 		Description = ".",
+			// 		JoinCapabilities = eJoinCapabilities.FromSIMPL,
+			// 		JoinType = eJoinType.Digital
+			// 	});
+
+			[JoinName("POWER_ON")]
+			public JoinDataComplete PowerOn = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 33,
+					JoinNumber = 27,
 					JoinSpan = 1
 				},
 				new JoinMetadata
 				{
-					Description = "B",
+					Description = "POWER_ON",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
 
-			[JoinName("C")]
-			public JoinDataComplete KpC = new JoinDataComplete(
+			[JoinName("POWER_OFF")]
+			public JoinDataComplete PowerOff = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 34,
+					JoinNumber = 28,
 					JoinSpan = 1
 				},
 				new JoinMetadata
 				{
-					Description = "C",
+					Description = "POWER_OFF",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
 
-			[JoinName("D")]
-			public JoinDataComplete KpD = new JoinDataComplete(
+			[JoinName("PLAY_PAUSE")]
+			public JoinDataComplete PlayPause = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 35,
+					JoinNumber = 29,
 					JoinSpan = 1
 				},
 				new JoinMetadata
 				{
-					Description = "D",
+					Description = "PLAY_PAUSE",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
 
-			[JoinName("RED")]
-			public JoinDataComplete KpRed = new JoinDataComplete(
+			[JoinName("LAST")]
+			public JoinDataComplete Last = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 36,
+					JoinNumber = 30,
 					JoinSpan = 1
 				},
 				new JoinMetadata
 				{
-					Description = "RED",
+					Description = "LAST",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
-			[JoinName("GREEN")]
-			public JoinDataComplete KpGreen = new JoinDataComplete(
+			
+			[JoinName("HOME")]
+			public JoinDataComplete Home = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 37,
+					JoinNumber = 40,
 					JoinSpan = 1
 				},
 				new JoinMetadata
 				{
-					Description = "GREEN",
+					Description = "HOME",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
-			[JoinName("YELLOW")]
-			public JoinDataComplete KpYellow = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 38,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "YELLOW",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("BLUE")]
-			public JoinDataComplete KpBlue = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 39,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "BLUE",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-
-			[JoinName("MENU")]
-			public JoinDataComplete Menu = new JoinDataComplete(
+			
+			[JoinName("BACK")]
+			public JoinDataComplete Back = new JoinDataComplete(
 				new JoinData
 				{
 					JoinNumber = 41,
@@ -505,11 +447,12 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 				},
 				new JoinMetadata
 				{
-					Description = "MENU",
+					Description = "BACK",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
 
+
 			[JoinName("GUIDE")]
 			public JoinDataComplete Guide = new JoinDataComplete(
 				new JoinData
@@ -524,8 +467,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
-			[JoinName("DVR")]
-			public JoinDataComplete Dvr = new JoinDataComplete(
+			[JoinName("INFO")]
+			public JoinDataComplete Info = new JoinDataComplete(
 				new JoinData
 				{
 					JoinNumber = 43,
@@ -533,13 +476,13 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 				},
 				new JoinMetadata
 				{
-					Description = "DVR",
+					Description = "INFO",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
 
-			[JoinName("OPTIONS")]
-			public JoinDataComplete Options = new JoinDataComplete(
+			[JoinName("MENU")]
+			public JoinDataComplete Menu = new JoinDataComplete(
 				new JoinData
 				{
 					JoinNumber = 44,
@@ -547,31 +490,16 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 				},
 				new JoinMetadata
 				{
-					Description = "OPTIONS",
+					Description = "MENU",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
 
-			[JoinName("ON_DEMAND")]
-			public JoinDataComplete OnDemand = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 45,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "ON_DEMAND",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-
 			[JoinName("UP_ARROW")]
 			public JoinDataComplete DpadUp = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 46,
+					JoinNumber = 45,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -585,7 +513,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete DpadDown = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 47,
+					JoinNumber = 46,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -599,7 +527,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete DpadLeft = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 48,
+					JoinNumber = 47,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -613,7 +541,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete DpadRight = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 49,
+					JoinNumber = 48,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -627,7 +555,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete DpadSelect = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 50,
+					JoinNumber = 49,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -637,6 +565,20 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
+			[JoinName("OPTIONS")]
+			public JoinDataComplete Options = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 50,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "OPTIONS",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
 			[JoinName("RETURN")]
 			public JoinDataComplete Return = new JoinDataComplete(
 				new JoinData
@@ -650,9 +592,9 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
-			[JoinName("BACK")]
-			public JoinDataComplete Back = new JoinDataComplete(
+			
+			[JoinName("DVR")]
+			public JoinDataComplete Dvr = new JoinDataComplete(
 				new JoinData
 				{
 					JoinNumber = 52,
@@ -660,13 +602,14 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 				},
 				new JoinMetadata
 				{
-					Description = "BACK",
+					Description = "DVR",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
+			
 
-			[JoinName("HOME")]
-			public JoinDataComplete Home = new JoinDataComplete(
+			[JoinName("ON_DEMAND")]
+			public JoinDataComplete OnDemand = new JoinDataComplete(
 				new JoinData
 				{
 					JoinNumber = 53,
@@ -674,58 +617,17 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 				},
 				new JoinMetadata
 				{
-					Description = "HOME",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("CH+")]
-			public JoinDataComplete ChannelUp = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 54,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "CH+",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("CH-")]
-			public JoinDataComplete ChannelDown = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 55,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "CH-",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("LAST")]
-			public JoinDataComplete Last = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 56,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "LAST",
+					Description = "ON_DEMAND",
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
+			
 
 			[JoinName("PAGE_UP")]
 			public JoinDataComplete PageUp = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 57,
+					JoinNumber = 54,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -739,7 +641,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 			public JoinDataComplete PageDown = new JoinDataComplete(
 				new JoinData
 				{
-					JoinNumber = 58,
+					JoinNumber = 55,
 					JoinSpan = 1
 				},
 				new JoinMetadata
@@ -749,6 +651,174 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
+			[JoinName("F_SRCH")]
+			public JoinDataComplete ForwardSearch = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 56,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "F_SRCH",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("R_SRCH")]
+			public JoinDataComplete ReverseSearch = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 57,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "R_SRCH",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("TRACK+")]
+			public JoinDataComplete TrackPlus = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 58,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "TRACK+",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("TRACK-")]
+			public JoinDataComplete TrackMinus = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 59,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "TRACK-",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+			[JoinName("A")]
+			public JoinDataComplete KpA = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 61,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "A",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("B")]
+			public JoinDataComplete KpB = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 62,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "B",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("C")]
+			public JoinDataComplete KpC = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 63,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "C",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("D")]
+			public JoinDataComplete KpD = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 64,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "D",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("RED")]
+			public JoinDataComplete KpRed = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 65,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "RED",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("GREEN")]
+			public JoinDataComplete KpGreen = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 66,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "GREEN",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("YELLOW")]
+			public JoinDataComplete KpYellow = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 67,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "YELLOW",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("BLUE")]
+			public JoinDataComplete KpBlue = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 68,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "BLUE",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
 			public GenericIrControllerJoinMap(uint joinStart)
 				: base(joinStart, typeof(GenericIrControllerJoinMap))
 			{

essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/CommFactory.cs

@@ -81,6 +81,15 @@ namespace PepperDash.Essentials.Core
                         }
 					case eControlMethod.Telnet:
 						break;
+					case eControlMethod.SecureTcpIp:
+						{
+							var secureTcp = new GenericSecureTcpIpClient(deviceConfig.Key + "-secureTcp", c.Address, c.Port, c.BufferSize);
+							secureTcp.AutoReconnect = c.AutoReconnect;
+							if (secureTcp.AutoReconnect)
+								secureTcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+							comm = secureTcp;
+							break;
+						}
 					default:
 						break;
 				}				

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

@@ -80,62 +80,30 @@ namespace PepperDash.Essentials.Core.Devices
 					Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Failed to link new IR bridge join map");
 			        return;
 		        }
+
+				joinMap.Joins.Clear();
+
 		        foreach (var bridgeJoin in bridgeJoins)
 		        {
-					Debug.Console(0, this, @"bridgeJoin: Key-'{0}'
+			        var key = bridgeJoin.Key;
+			        var joinDataKey = bridgeJoin.Value.Key;
+			        var joinDataValue = bridgeJoin.Value.Value;
+			        var joinNumber = bridgeJoin.Value.Value.JoinNumber;					
+
+					Debug.Console(2, this, @"bridgeJoin: Key-'{0}'
 Value.Key-'{1}'
 Value.JoinNumber-'{2}'
 Value.Metadata.Description-'{3}'", 
-						bridgeJoin.Key, 
-						bridgeJoin.Value.Key, 
-						bridgeJoin.Value.Value.JoinNumber, 
-						bridgeJoin.Value.Value.Metadata.Description);
-
-			        var joinNumber = bridgeJoin.Value.Value.JoinNumber;
-			        var joinCmd = bridgeJoin.Key;
-
-			        trilist.SetBoolSigAction(joinNumber, (b) => Press(joinCmd, b));
-		        }		        
-
-		        //foreach (var irFileCommand in _port.IrFileCommands)
-		        //{
-		        //    var cmd = irFileCommand;
-		        //    JoinDataComplete joinDataComplete;
-		        //    if (joinMap.Joins.TryGetValue(cmd, out joinDataComplete))
-		        //    {
-		        //        Debug.Console(0, this, "joinDataComplete: attributeName-'{0}', joinNumber-'{1}', joinSpan-'{2}', metadata.description-'{3}'",
-		        //            joinDataComplete.AttributeName, joinDataComplete.JoinNumber, joinDataComplete.JoinSpan, joinDataComplete.Metadata.Description);				        
-
-		        //        trilist.SetBoolSigAction(joinDataComplete.JoinNumber, (b) => Press(cmd, b));
-		        //    }
-		        //    else
-		        //    {
-		        //        Debug.Console(0, this, "GenericIrController join map does not contain support for IR command '{0}', verify IR file.", cmd);
-		        //    }
+						key,
+						joinDataKey,
+						joinNumber,
+						joinDataValue.Metadata.Description);
 
 
+					joinMap.Joins.Add(key, joinDataValue);
 
-
-		        //    //if (joinMap.Joins.ContainsKey(cmd))
-		        //    //{
-		        //    //    Debug.Console(0, this, "joinData: key-'{0}', joinNumber-'{1}', joinSpan-'{2}', description-'{3}'",
-		        //    //        joinData.Key, joinData.Value.JoinNumber, joinData.Value.JoinSpan, joinData.Value.Metadata.Description);
-		        //    //}
-
-		        //    //Debug.Console(0, this, "_port.IrFileCommand: {0}", irFileCommand);
-		        //    //var joinData = joinMap.Joins.FirstOrDefault(j => j.Key == cmd);			        
-
-		        //    //if (joinData.Value == null) continue;
-
-		        //    //joinData.Value.SetJoinOffset(joinStart);
-
-		        //    //Debug.Console(0, this, "joinData: key-'{0}', joinNumber-'{1}', joinSpan-'{2}', description-'{3}'",
-		        //    //    joinData.Key, joinData.Value.JoinNumber, joinData.Value.JoinSpan, joinData.Value.Metadata.Description);
-
-		        //    //joinMap.Joins.Add(joinData.Key, joinData.Value);
-
-		        //    //trilist.SetBoolSigAction(joinData.Value.JoinNumber, (b) => Press(joinData.Key, b));
-		        //}
+			        trilist.SetBoolSigAction(joinNumber, (b) => Press(key, b));
+		        }
 	        }
 	        else
 	        {

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

@@ -71,7 +71,7 @@ namespace PepperDash.Essentials.Core
 
                 LoadDriver(filePath);
                 
-				if(!UseBridgeJoinMap) PrintAvailableCommands();
+				PrintAvailableCommands();
             });
 	    }
 

essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs

@@ -43,11 +43,12 @@ namespace PepperDash.Essentials.DM.AirMedia
         public BoolFeedback HdmiVideoSyncDetectedFeedback { get; private set; }
         public StringFeedback SerialNumberFeedback { get; private set; }
         public BoolFeedback AutomaticInputRoutingEnabledFeedback { get; private set; }
+        public BoolFeedback HdmiInHdcpSupportOnFeedback { get; private set; }
+        public BoolFeedback HdmiInDisabledByHdcpFeedback { get; private set; }
 
         public AirMediaController(string key, string name, Am3x00 device, DeviceConfig dc, AirMediaPropertiesConfig props)
             : base(key, name, device)
         {
-
             AirMedia = device;
 
             DeviceConfig = dc;
@@ -101,6 +102,8 @@ namespace PepperDash.Essentials.DM.AirMedia
             LoginCodeFeedback = new IntFeedback(() => AirMedia.AirMedia.LoginCodeFeedback.UShortValue);
             ConnectionAddressFeedback = new StringFeedback(() => AirMedia.AirMedia.ConnectionAddressFeedback.StringValue);
             HostnameFeedback = new StringFeedback(() => AirMedia.AirMedia.HostNameFeedback.StringValue);
+            HdmiInHdcpSupportOnFeedback = new BoolFeedback(() => AirMedia.HdmiIn.HdcpSupportOnFeedback.BoolValue);
+            HdmiInDisabledByHdcpFeedback = new BoolFeedback(() => AirMedia.HdmiIn.DisabledByHdcpFeedback.BoolValue);
 
             // TODO: Figure out if we can actually get the TSID/Serial
             SerialNumberFeedback = new StringFeedback(() => "unknown");
@@ -178,6 +181,13 @@ namespace PepperDash.Essentials.DM.AirMedia
             ConnectionAddressFeedback.LinkInputSig(trilist.StringInput[joinMap.ConnectionAddressFB.JoinNumber]);
             HostnameFeedback.LinkInputSig(trilist.StringInput[joinMap.HostnameFB.JoinNumber]);
             SerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.SerialNumberFeedback.JoinNumber]);
+
+            trilist.SetSigFalseAction(joinMap.HdmiInHdcpSupportOn.JoinNumber, () => SetHcdpSupport(true));
+            HdmiInHdcpSupportOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.HdmiInHdcpSupportOn.JoinNumber]);
+            trilist.SetSigFalseAction(joinMap.HdmiInHdcpSupportOff.JoinNumber, () => SetHcdpSupport(false));
+            HdmiInHdcpSupportOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.HdmiInHdcpSupportOff.JoinNumber]);
+
+            HdmiInDisabledByHdcpFeedback.LinkInputSig(trilist.BooleanInput[joinMap.HdmiInDisabledByHdcp.JoinNumber]);
         }
 
         /// <summary>
@@ -248,6 +258,14 @@ namespace PepperDash.Essentials.DM.AirMedia
         {
             if (args.EventId == DMInputEventIds.SourceSyncEventId)
                 HdmiVideoSyncDetectedFeedback.FireUpdate();
+            else if (args.EventId == DMInputEventIds.HdcpSupportOnEventId)
+            {
+                HdmiInHdcpSupportOnFeedback.FireUpdate();
+            }
+            else if (args.EventId == DMInputEventIds.DisabledByHdcpEventId)
+            {
+                HdmiInDisabledByHdcpFeedback.FireUpdate();
+            }
         }
 
         /// <summary>
@@ -296,6 +314,14 @@ namespace PepperDash.Essentials.DM.AirMedia
             AirMedia.DisplayControl.VideoOut = AmX00DisplayControl.eAirMediaX00VideoSource.AirBoard;
         }
 
+        public void SetHcdpSupport(bool on)
+        {
+            if (on)
+                AirMedia.HdmiIn.HdcpSupportOn();
+            else
+                AirMedia.HdmiIn.HdcpSupportOff();
+        }
+
         /// <summary>
         /// Reboots the device
         /// </summary>