fix: update DMPS InputChange event handler

In some configurations, the InputChange handler can throw a null reference exception due to a Feedback for the input that triggered the event not existing. The event handler now checks for the existence of a Feedback for the input that triggered the event prior to attempting to call the `FireUpdate` method. Addresses #1136
2026-02-06 16:25:01 +00:00 · 2023-09-25 15:21:42 -05:00
16 changed files with 92 additions and 1077 deletions
--- a/PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleSpaceRoom.cs
+++ b/PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleSpaceRoom.cs
@@ -7,8 +7,7 @@ using PepperDash.Essentials.Room.Config;

 namespace PepperDash.Essentials
 {
-    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasDefaultDisplay, IHasCurrentVolumeControls, IRoomOccupancy,
-        IEmergency, IMicrophonePrivacy
+    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasDefaultDisplay, IHasCurrentVolumeControls
    {
        bool ExcludeFromGlobalFunctions { get; }

--- a/PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleVtc1Room.cs
+++ b/PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleVtc1Room.cs
@@ -8,8 +8,7 @@ using PepperDash.Essentials.Devices.Common.AudioCodec;
 namespace PepperDash.Essentials
 {
    public interface IEssentialsHuddleVtc1Room : IEssentialsRoom, IHasCurrentSourceInfoChange,
-         IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback,
-        IRoomOccupancy, IEmergency, IMicrophonePrivacy
+         IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
    {
        EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; }

--- a/Core/PepperDashEssentialsBase/Bridges/JoinMaps/GenericIrControllerJoinMap.cs
+++ b/Core/PepperDashEssentialsBase/Bridges/JoinMaps/GenericIrControllerJoinMap.cs
@@ -1,827 +0,0 @@
-using PepperDash.Essentials.Core;
-
-namespace PepperDash_Essentials_Core.Bridges.JoinMaps
-{
-		public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
-		{
-			[JoinName("PLAY")]
-			public JoinDataComplete Play = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 1,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "PLAY",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("STOP")]
-			public JoinDataComplete Stop = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 2,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "STOP",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("PAUSE")]
-			public JoinDataComplete Pause = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 3,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "PAUSE",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("FSCAN")]
-			public JoinDataComplete ForwardScan = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 4,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "FSCAN",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("RSCAN")]
-			public JoinDataComplete ReverseScan = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 5,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "RSCAN",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("F_SKIP")]
-			public JoinDataComplete ForwardSkip = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 6,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "F_SKIP",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("R_SKIP")]
-			public JoinDataComplete ReverseSkip = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 7,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "R_SKIP",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("RECORD")]
-			public JoinDataComplete Record = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 8,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					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 = 10,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "0",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("1")]
-			public JoinDataComplete Kp1 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 11,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "1",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("2")]
-			public JoinDataComplete Kp2 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 12,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "2",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("3")]
-			public JoinDataComplete Kp3 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 13,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "3",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("4")]
-			public JoinDataComplete Kp4 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 14,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "4",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("5")]
-			public JoinDataComplete Kp5 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 15,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "5",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("6")]
-			public JoinDataComplete Kp6 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 16,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "6",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("7")]
-			public JoinDataComplete Kp7 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 17,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "7",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("8")]
-			public JoinDataComplete Kp8 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 18,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "8",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("9")]
-			public JoinDataComplete Kp9 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 19,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "9",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			// [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 = 21,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					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 = 24,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "*",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("#")]
-			public JoinDataComplete KpPound = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 25,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "#",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			// [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 = 27,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "POWER_ON",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("POWER_OFF")]
-			public JoinDataComplete PowerOff = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 28,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "POWER_OFF",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("PLAY_PAUSE")]
-			public JoinDataComplete PlayPause = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 29,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "PLAY_PAUSE",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("LAST")]
-			public JoinDataComplete Last = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 30,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "LAST",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("HOME")]
-			public JoinDataComplete Home = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 40,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "HOME",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("BACK")]
-			public JoinDataComplete Back = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 41,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "BACK",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-
-			[JoinName("GUIDE")]
-			public JoinDataComplete Guide = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 42,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "GUIDE",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("INFO")]
-			public JoinDataComplete Info = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 43,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "INFO",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("MENU")]
-			public JoinDataComplete Menu = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 44,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "MENU",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("UP_ARROW")]
-			public JoinDataComplete DpadUp = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 45,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "UP_ARROW",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("DN_ARROW")]
-			public JoinDataComplete DpadDown = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 46,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "DN_ARROW",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("LEFT_ARROW")]
-			public JoinDataComplete DpadLeft = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 47,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "LEFT_ARROW",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("RIGHT_ARROW")]
-			public JoinDataComplete DpadRight = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 48,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "RIGHT_ARROW",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("SELECT")]
-			public JoinDataComplete DpadSelect = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 49,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "SELECT",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					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
-				{
-					JoinNumber = 51,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "RETURN",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("DVR")]
-			public JoinDataComplete Dvr = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 52,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "DVR",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-
-			[JoinName("ON_DEMAND")]
-			public JoinDataComplete OnDemand = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 53,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "ON_DEMAND",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-
-			[JoinName("PAGE_UP")]
-			public JoinDataComplete PageUp = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 54,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "PAGE_UP",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("PAGE_DOWN")]
-			public JoinDataComplete PageDown = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 55,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "PAGE_DOWN",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					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))
-			{
-			}
-	}
-}
--- a/Core/PepperDashEssentialsBase/Comm
+++ b/Core/PepperDashEssentialsBase/Comm
@@ -81,15 +81,6 @@ 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;
 				}				
--- a/Core/PepperDashEssentialsBase/Comm
+++ b/Core/PepperDashEssentialsBase/Comm
@@ -224,18 +224,12 @@ namespace PepperDash.Essentials.Core
 	/// </summary>
 	public class IrOutPortConfig
 	{
-		[JsonProperty("port")]
 		public IROutputPort Port { get; set; }
-		
-		[JsonProperty("fileName")]
 		public string FileName { get; set; }

-		[JsonProperty("useBridgeJoinMap")]
-		public bool UseBridgeJoinMap { get; set; }
-
 		public IrOutPortConfig()
 		{
-			FileName = "";			
+			FileName = "";
 		}
 	}
 }
--- a/Core/PepperDashEssentialsBase/Crestron
+++ b/Core/PepperDashEssentialsBase/Crestron
@@ -1,85 +0,0 @@
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-	/// <summary>
-	/// Wrapper class for CEN-IO-COM-Xxx expander module
-	/// </summary>
-	[Description("Wrapper class for the CEN-IO-COM-102 & CEN-IO-COM-202 expander module")]
-	public class CenIoComController : CrestronGenericBaseDevice, IComPorts
-    {
-        private readonly CenIoCom _cenIoCom;
-
-        public CenIoComController(string key, string name, CenIoCom cenIo)
-			:base(key, name, cenIo)
-        {
-	        _cenIoCom = cenIo;
-        }
-
-        #region Implementation of IComPorts
-
-        public CrestronCollection<ComPort> ComPorts
-        {
-            get { return _cenIoCom.ComPorts; }
-        }
-
-        public int NumberOfComPorts
-        {
-            get { return _cenIoCom.NumberOfComPorts; }
-        }
-
-        #endregion
-
-    }
-
-	public class CenIoCom102ControllerFactory : EssentialsDeviceFactory<CenIoComController>
-	{
-		private const string CenIoCom102Type = "ceniocom102";
-		private const string CenIoCom202Type = "ceniocom202";
-
-        public CenIoCom102ControllerFactory()
-        {
-			TypeNames = new List<string> { CenIoCom102Type, CenIoCom202Type };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new CEN-IO-COM-Xxx Device");
-
-	        var control = CommFactory.GetControlPropertiesConfig(dc);
-	        if (control == null)
-	        {
-				Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, control properties not found");
-				return null;
-	        }
-
-	        var ipid = control.IpIdInt;
-	        if (ipid < 2)
-	        {
-				Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, invalid IP-ID found");
-				return null;
-	        }
-
-	        switch (dc.Type)
-	        {
-				case CenIoCom102Type:
-		        {
-					return new CenIoComController(dc.Key, dc.Name, new CenIoCom102(ipid, Global.ControlSystem));
-		        }
-				case CenIoCom202Type:
-		        {
-					return new CenIoComController(dc.Key, dc.Name, new CenIoCom202(ipid, Global.ControlSystem));
-		        }
-				default:
-		        {
-					Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, invalid type '{0}'", dc.Type);
-					return null;
-		        }
-	        }
-        }
-    }
-}
--- a/Core/PepperDashEssentialsBase/Devices/GenericIRController.cs
+++ b/Core/PepperDashEssentialsBase/Devices/GenericIRController.cs
@@ -1,11 +1,11 @@
-using System.Collections.Generic;
-using System.Linq;
+using System;
+using System.Collections.Generic;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
 using PepperDash.Core;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
-using PepperDash_Essentials_Core.Bridges.JoinMaps;

 namespace PepperDash.Essentials.Core.Devices
 {
@@ -19,11 +19,12 @@ namespace PepperDash.Essentials.Core.Devices

        private readonly IrOutputPortController _port; 

-        public string[] IrCommands {get { return _port.IrFileCommands; }}	    
+        public string[] IrCommands {get { return _port.IrFileCommands; }}

        public GenericIrController(string key, string name, IrOutputPortController irPort) : base(key, name)
        {
            _port = irPort;
+
            if (_port == null)
            {
                Debug.Console(0, this, Debug.ErrorLogLevel.Error, "IR Port is null, device will not function");
@@ -70,65 +71,23 @@ namespace PepperDash.Essentials.Core.Devices
            if (!string.IsNullOrEmpty(joinMapSerialized))
                joinMap = JsonConvert.DeserializeObject<GenericIrControllerJoinMap>(joinMapSerialized);

-	        if (_port.UseBridgeJoinMap)
-	        {
-				Debug.Console(0, this, "Using new IR bridge join map");
+            for (uint i = 0; i < _port.IrFileCommands.Length; i++)
+            {
+                var cmd = _port.IrFileCommands[i];
+                var joinData = new JoinDataComplete(new JoinData {JoinNumber = i, JoinSpan = 1},
+                    new JoinMetadata
+                    {
+                        Description = cmd,
+                        JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                        JoinType = eJoinType.Digital
+                    });

-		        var bridgeJoins = joinMap.Joins.Where((kv) => _port.IrFileCommands.Any(cmd => cmd == kv.Key)).ToDictionary(kv => kv.Key);
-		        if (bridgeJoins == null)
-		        {
-					Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Failed to link new IR bridge join map");
-			        return;
-		        }
+                joinData.SetJoinOffset(joinStart);

-				joinMap.Joins.Clear();
+                joinMap.Joins.Add(cmd,joinData);

-		        foreach (var bridgeJoin in bridgeJoins)
-		        {
-			        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}'", 
-						key,
-						joinDataKey,
-						joinNumber,
-						joinDataValue.Metadata.Description);
-
-
-					joinMap.Joins.Add(key, joinDataValue);
-
-			        trilist.SetBoolSigAction(joinNumber, (b) => Press(key, b));
-		        }
-	        }
-	        else
-	        {
-				Debug.Console(0, this, "Using legacy IR join mapping based on available IR commands");
-
-				joinMap.Joins.Clear();
-
-				for (uint i = 0; i < _port.IrFileCommands.Length; i++)
-				{
-					var cmd = _port.IrFileCommands[i];
-					var joinData = new JoinDataComplete(new JoinData { JoinNumber = i, JoinSpan = 1 },
-						new JoinMetadata
-						{
-							Description = cmd,
-							JoinCapabilities = eJoinCapabilities.FromSIMPL,
-							JoinType = eJoinType.Digital
-						});
-
-					joinData.SetJoinOffset(joinStart);
-
-					joinMap.Joins.Add(cmd, joinData);
-
-					trilist.SetBoolSigAction(joinData.JoinNumber, (b) => Press(cmd, b));
-				}   
-	        }            
+                trilist.SetBoolSigAction(joinData.JoinNumber, (b) => Press(cmd, b));
+            }

            joinMap.PrintJoinMapInfo();

@@ -150,6 +109,13 @@ Value.Metadata.Description-'{3}'",
        }
    }

+    public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
+    {
+        public GenericIrControllerJoinMap(uint joinStart) : base(joinStart)
+        {
+        }
+    }
+
    public class GenericIrControllerFactory : EssentialsDeviceFactory<GenericIrController>
    {
        public GenericIrControllerFactory()
--- a/Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs
+++ b/Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs
@@ -72,10 +72,6 @@ namespace PepperDash.Essentials.Core
    {
        IBasicVolumeControls CurrentVolumeControls { get; }
 		event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-
-        void SetDefaultLevels();
-
-        bool ZeroVolumeWhenSwtichingVolumeDevices { get; }
 	}


--- a/Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs
+++ b/Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs
@@ -29,8 +29,6 @@ namespace PepperDash.Essentials.Core

        public string[] IrFileCommands { get { return IrPort.AvailableStandardIRCmds(IrPortUid); } }

-		public bool UseBridgeJoinMap { get; private set; }
-
 		/// <summary>
 		/// Constructor for IrDevice base class.  If a null port is provided, this class will 
 		/// still function without trying to talk to a port.
@@ -55,10 +53,9 @@ namespace PepperDash.Essentials.Core
 	        : base(key)
 	    {
            DriverLoaded = new BoolFeedback(() => DriverIsLoaded);
-			UseBridgeJoinMap = config.Properties["control"].Value<bool>("useBridgeJoinMap");
            AddPostActivationAction(() =>
            {
-	            IrPort = postActivationFunc(config);
+                IrPort = postActivationFunc(config);

                if (IrPort == null)
                {
@@ -70,8 +67,8 @@ namespace PepperDash.Essentials.Core
                Debug.Console(1, "*************Attempting to load IR file: {0}***************", filePath);

                LoadDriver(filePath);
-                
-				PrintAvailableCommands();
+                    
+                PrintAvailableCommands();
            });
 	    }

--- a/Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
+++ b/Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
@@ -148,20 +148,15 @@ namespace PepperDash.Essentials.Core.Fusion
                    ReadGuidFile(guidFilePath);
                }

-                var occupancyRoom = Room as IRoomOccupancy;
-
-                if (occupancyRoom != null)
+                if (Room.RoomOccupancy != null)
                {
-                    if (occupancyRoom.RoomOccupancy != null)
+                    if (Room.OccupancyStatusProviderIsRemote)
                    {
-                        if (occupancyRoom.OccupancyStatusProviderIsRemote)
-                        {
-                            SetUpRemoteOccupancy();
-                        }
-                        else
-                        {
-                            SetUpLocalOccupancy();
-                        }
+                        SetUpRemoteOccupancy();
+                    }
+                    else
+                    {
+                        SetUpLocalOccupancy();
                    }
                }

@@ -1528,15 +1523,10 @@ namespace PepperDash.Essentials.Core.Fusion
            // Tie to method on occupancy object
            //occSensorShutdownMinutes.OutputSig.UserObject(new Action(ushort)(b => Room.OccupancyObj.SetShutdownMinutes(b));

-            var occRoom = Room as IRoomOccupancy;

-            if (occRoom != null)
-            {
-                occRoom.RoomOccupancy.RoomIsOccupiedFeedback.LinkInputSig(occSensorAsset.RoomOccupied.InputSig);
-                occRoom.RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
-            }
            RoomOccupancyRemoteStringFeedback = new StringFeedback(() => _roomOccupancyRemoteString);
-            
+            Room.RoomOccupancy.RoomIsOccupiedFeedback.LinkInputSig(occSensorAsset.RoomOccupied.InputSig);
+            Room.RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
            RoomOccupancyRemoteStringFeedback.LinkInputSig(occSensorAsset.RoomOccupancyInfo.InputSig);

            //}
--- a/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
+++ b/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
@@ -127,7 +127,6 @@
    <Compile Include="Bridges\IBridge.cs" />
    <Compile Include="Bridges\JoinMaps\AirMediaControllerJoinMap.cs" />
    <Compile Include="Bridges\JoinMaps\AppleTvJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\GenericIrControllerJoinMap.cs" />
    <Compile Include="Bridges\JoinMaps\IAnalogInputJoinMap.cs" />
    <Compile Include="Bridges\JoinMaps\IDigitalOutputJoinMap.cs" />
    <Compile Include="Bridges\JoinMaps\PduJoinMapBase.cs" />
@@ -184,7 +183,6 @@
    </Compile>
    <Compile Include="Crestron IO\Cards\CenCi33Controller.cs" />
    <Compile Include="Crestron IO\Cards\InternalCardCageController.cs" />
-    <Compile Include="Crestron IO\CenIoCom\CenIoComController.cs" />
    <Compile Include="Crestron IO\DinCenCn\DinCenCnController.cs" />
    <Compile Include="Crestron IO\DinCenCn\IHasCresnetBranches.cs" />
    <Compile Include="Crestron IO\DinIo8\DinIo8Controller.cs" />
--- a/Core/PepperDashEssentialsBase/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs
+++ b/Core/PepperDashEssentialsBase/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs
@@ -38,7 +38,7 @@ namespace PepperDash.Essentials.Core

        ScheduledEventGroup FeatureEventGroup;

-        public IRoomOccupancy Room { get; private set; }
+        public IEssentialsRoom Room { get; private set; }

        private Fusion.EssentialsHuddleSpaceFusionSystemControllerBase FusionRoom;

@@ -84,7 +84,7 @@ namespace PepperDash.Essentials.Core
        /// </summary>
        void SetUpDevice()
        {
-            Room = DeviceManager.GetDeviceForKey(PropertiesConfig.RoomKey) as IRoomOccupancy;
+            Room = DeviceManager.GetDeviceForKey(PropertiesConfig.RoomKey) as IEssentialsRoom;

            if (Room != null)
            {
@@ -235,23 +235,12 @@ namespace PepperDash.Essentials.Core

                if (FeatureEnabled)
                {
-                    var essentialsRoom = Room as IEssentialsRoom;
-
-                    if (essentialsRoom != null) {
-                        if (!essentialsRoom.OnFeedback.BoolValue)
-                        {
-                            Debug.Console(1, this, "Powering Room on to default source");
-
-                            var defaultRouteRoom = Room as IRunDefaultPresentRoute;
-
-                            if (defaultRouteRoom != null)
-                            {
-                                defaultRouteRoom.RunDefaultPresentRoute();
-                            }
-                        }
-                    }
                    // Check room power state first
-                    
+                    if (!Room.OnFeedback.BoolValue)
+                    {
+                        Debug.Console(1, this, "Powering Room on to default source");
+                        Room.RunDefaultPresentRoute();
+                    }
                }
            }
        }
--- a/Core/PepperDashEssentialsBase/Room/IEssentialsRoom.cs
+++ b/Core/PepperDashEssentialsBase/Room/IEssentialsRoom.cs
@@ -17,10 +17,15 @@ namespace PepperDash.Essentials.Core
    /// </summary>
    public interface IEssentialsRoom : IKeyName, IReconfigurableDevice, IRunDefaultPresentRoute, IEnvironmentalControls
    {
-        BoolFeedback OnFeedback { get; }        
+        BoolFeedback OnFeedback { get; }
+
+        event EventHandler<EventArgs> RoomOccupancyIsSet;

        BoolFeedback IsWarmingUpFeedback { get; }
-        BoolFeedback IsCoolingDownFeedback { get; }        
+        BoolFeedback IsCoolingDownFeedback { get; }
+
+        IOccupancyStatusProvider RoomOccupancy { get; }
+        bool OccupancyStatusProviderIsRemote { get; }

        bool IsMobileControlEnabled { get; }
        IMobileControlRoomBridge MobileControlRoomBridge { get; }
@@ -30,16 +35,31 @@ namespace PepperDash.Essentials.Core
        SecondsCountdownTimer ShutdownPromptTimer { get; }
        int ShutdownPromptSeconds { get; }
        int ShutdownVacancySeconds { get; }
-        eShutdownType ShutdownType { get; }      
+        eShutdownType ShutdownType { get; }
+
+        EssentialsRoomEmergencyBase Emergency { get; }
+
+        Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; }

        string LogoUrlLightBkgnd { get; }
        string LogoUrlDarkBkgnd { get; }

-        void StartShutdown(eShutdownType type);        
+        eVacancyMode VacancyMode { get; }

-        void Shutdown();        
+        bool ZeroVolumeWhenSwtichingVolumeDevices { get; }

-        void PowerOnToDefaultOrLastSource();               
+        void StartShutdown(eShutdownType type);
+        void StartRoomVacancyTimer(eVacancyMode mode);
+
+        void Shutdown();
+
+        void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes);
+
+        void PowerOnToDefaultOrLastSource();
+
+        void SetDefaultLevels();
+
+        void RoomVacatedForTimeoutPeriod(object o);
    }

 }
--- a/Core/PepperDashEssentialsBase/Room/Interfaces.cs
+++ b/Core/PepperDashEssentialsBase/Room/Interfaces.cs
@@ -41,6 +41,7 @@ namespace PepperDash.Essentials.Core
        void RunRouteAction(string routeKey, string sourceListKey);

        void RunRouteAction(string routeKey, string sourceListKey, Action successCallback);
+
    }

    /// <summary>
@@ -77,30 +78,4 @@ namespace PepperDash.Essentials.Core
        bool HasEnvironmentalControlDevices { get; }
    }

-    public interface IRoomOccupancy:IKeyed
-    {
-        IOccupancyStatusProvider RoomOccupancy { get; }
-        bool OccupancyStatusProviderIsRemote { get; }
-
-        void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes);
-
-        void RoomVacatedForTimeoutPeriod(object o);
-
-        void StartRoomVacancyTimer(eVacancyMode mode);
-
-        eVacancyMode VacancyMode { get; }
-
-        event EventHandler<EventArgs> RoomOccupancyIsSet;
-    }
-
-    public interface IEmergency
-    {
-        EssentialsRoomEmergencyBase Emergency { get; }
-    }
-
-    public interface IMicrophonePrivacy
-    {
-        Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; }
-    }
-
 }
--- a/DM/Essentials_DM/Chassis/DmpsRoutingController.cs
+++ b/DM/Essentials_DM/Chassis/DmpsRoutingController.cs
@@ -991,28 +991,41 @@ namespace PepperDash.Essentials.DM
                    case (DMInputEventIds.OnlineFeedbackEventId):
                        {
                            Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
-                            InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
+
+							if(!InputEndpointOnlineFeedbacks.ContainsKey(args.Number)){
+								break;
+							}
+							InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
                            break;
                        }
                    case (DMInputEventIds.EndpointOnlineEventId):
                        {
                            Debug.Console(2, this, "DM Input EndpointOnlineEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
+
+							if(!InputEndpointOnlineFeedbacks.ContainsKey(args.Number)){
+								break;
+							}
                            InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
                            break;
                        }
                    case (DMInputEventIds.VideoDetectedEventId):
                        {
                            Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
+
+							if(!VideoInputSyncFeedbacks.ContainsKey(args.Number)){
+								break;
+							}
                            VideoInputSyncFeedbacks[args.Number].FireUpdate();
                            break;
                        }
                    case (DMInputEventIds.InputNameEventId):
                        {
                            Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
-                            if(InputNameFeedbacks.ContainsKey(args.Number))
+                            if(!InputNameFeedbacks.ContainsKey(args.Number))
                            {
-                                InputNameFeedbacks[args.Number].FireUpdate();
+								break;
                            }
+							InputNameFeedbacks[args.Number].FireUpdate();
                            break;
                        }
                }
--- a/packages.config
+++ b/packages.config
@@ -1,3 +1,3 @@
 <packages>
-	<package id="PepperDashCore" version="1.3.2-hotfix-378" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
+	<package id="PepperDashCore" version="1.3.1" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
 </packages>