Merge pull request #1121 from PepperDash/hotfix/vtc-room-activation-deactivation-changes

Hotfix/vtc room activation deactivation changes
Merge branch 'development' into hotfix/vtc-room-activation-deactivation-changes
2026-01-30 12:54:54 +00:00 · 2023-08-17 10:44:58 -06:00 · 2023-08-15 12:50:19 -06:00 · 2023-08-15 12:50:07 -06:00 · 2023-08-15 12:25:49 -06:00 · 2023-08-15 10:59:46 -06:00
27 changed files with 534 additions and 1381 deletions
--- a/PepperDashEssentials/ControlSystem.cs
+++ b/PepperDashEssentials/ControlSystem.cs
@@ -401,21 +401,20 @@ namespace PepperDash.Essentials
                        }
                        else if (this.ControllerPrompt.IndexOf("mpc3", StringComparison.OrdinalIgnoreCase) > -1)
                        {
-							Debug.Console(2, "MPC3 processor type detected.  Adding Mpc3TouchpanelController.");
+                            Debug.Console(2, "MPC3 processor type detected.  Adding Mpc3TouchpanelController.");

-							var butToken = devConf.Properties["buttons"];
-							if (butToken == null)
-							{
-								Debug.Console(0, Debug.ErrorLogLevel.Error,
-									"Error: Unable to deserialize buttons collection for device: {0}", devConf.Key);
-								continue;
-							}
-
-							var buttons = butToken.ToObject<Dictionary<string, Essentials.Core.Touchpanels.KeypadButton>>();
-							var tpController = new Core.Touchpanels.Mpc3TouchpanelController(
-									string.Format("{0}-keypadButtons", devConf.Key), devConf.Name, Global.ControlSystem, buttons);
-
-							DeviceManager.AddDevice(tpController);	
+                            var butToken = devConf.Properties["buttons"];
+                            if (butToken != null)
+                            {
+                                var buttons = butToken.ToObject<Dictionary<string, Essentials.Core.Touchpanels.KeypadButton>>();
+                                var tpController = new Essentials.Core.Touchpanels.Mpc3TouchpanelController(devConf.Key, devConf.Name, Global.ControlSystem, buttons);
+                                DeviceManager.AddDevice(tpController);
+                            }
+                            else
+                            {
+                                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Unable to deserialize buttons collection for device: {0}", devConf.Key);
+                            }
+                            
                        }
                        else
                        {
--- 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/Bridges/JoinMaps/PduJoinMapBase.cs
+++ b/Core/PepperDashEssentialsBase/Bridges/JoinMaps/PduJoinMapBase.cs
@@ -10,7 +10,7 @@ namespace PepperDash.Essentials.Core.Bridges

        [JoinName("Online")]
        public JoinDataComplete Online = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "PDU Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

        [JoinName("OutletCount")]
        public JoinDataComplete OutletCount = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
--- 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/Device
+++ b/Core/PepperDashEssentialsBase/Device
@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using PepperDash.Core;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Core.DeviceInfo
+{
+    public static class NetworkDeviceHelpers
+    {
+        /// <summary>
+        /// Event raised when ArpTable changes
+        /// </summary>
+        public static event ArpTableEventHandler ArpTableUpdated;
+
+        /// <summary>
+        /// Delegate called by ArpTableUpdated
+        /// </summary>
+        /// <param name="args">contains the entire ARP table and a bool to note if there was an error in retrieving the data</param>
+        public delegate void ArpTableEventHandler(ArpTableEventArgs args);
+
+        private static readonly char NewLineSplitter = CrestronEnvironment.NewLine.ToCharArray().First();
+        private static readonly string NewLine = CrestronEnvironment.NewLine;
+
+        private static readonly CCriticalSection Lock = new CCriticalSection();
+
+        /// <summary>
+        /// Last resolved ARP table - it is recommended to refresh the arp before using this.
+        /// </summary>
+        public static List<ArpEntry> ArpTable { get; private set; }
+
+        /// <summary>
+        /// Force recheck of ARP table
+        /// </summary>
+        public static void RefreshArp()
+        {
+            var error = false;
+            try
+            {
+                Lock.Enter();
+                var consoleResponse = string.Empty;
+                if (!CrestronConsole.SendControlSystemCommand("showarptable", ref consoleResponse)) return;
+                if (string.IsNullOrEmpty(consoleResponse))
+                {
+                    error = true;
+                    return;
+                }
+                ArpTable.Clear();
+
+                Debug.Console(2, "ConsoleResponse of 'showarptable' : {0}{1}", NewLine, consoleResponse);
+
+                var myLines =
+                    consoleResponse.Split(NewLineSplitter)
+                        .ToList()
+                        .Where(o => (o.Contains(':') && !o.Contains("Type", StringComparison.OrdinalIgnoreCase)))
+                        .ToList();
+                foreach (var line in myLines)
+                {
+                    var item = line;
+                    var seperator = item.Contains('\t') ? '\t' : ' ';
+                    var dataPoints = item.Split(seperator);
+                    if (dataPoints == null || dataPoints.Length < 2) continue;
+                    var ipAddress = SanitizeIpAddress(dataPoints.First().TrimAll());
+                    var macAddress = dataPoints.Last();
+                    ArpTable.Add(new ArpEntry(ipAddress, macAddress));
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, "Exception in \"RefreshArp\" : {0}", ex.Message);
+                error = true;
+            }
+            finally
+            {
+                Lock.Leave();
+                OnArpTableUpdated(new ArpTableEventArgs(ArpTable, error));
+            }
+        }
+
+
+        private static void OnArpTableUpdated(ArpTableEventArgs args)
+        {
+            if (args == null) return;
+            var handler = ArpTableUpdated;
+            if (handler == null) return;
+            handler.Invoke(args);
+        }
+
+        static NetworkDeviceHelpers()
+        {
+            ArpTable = new List<ArpEntry>();
+        }
+
+        /// <summary>
+        /// Removes leading zeros, leading whitespace, and trailing whitespace from an IPAddress string
+        /// </summary>
+        /// <param name="ipAddressIn">Ip Address to Santitize</param>
+        /// <returns>Sanitized Ip Address</returns>
+        public static string SanitizeIpAddress(string ipAddressIn)
+        {
+            try
+            {
+                var ipAddress = IPAddress.Parse(ipAddressIn.TrimStart('0'));
+                return ipAddress.ToString();
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, "Unable to Santize Ip : {0}", ex.Message);
+                return ipAddressIn;
+            }
+        }
+
+        /// <summary>
+        /// Resolves a hostname by IP Address using DNS
+        /// </summary>
+        /// <param name="ipAddress">IP Address to resolve from</param>
+        /// <returns>Resolved Hostname - on failure to determine hostname, will return IP Address</returns>
+        public static string ResolveHostnameFromIp(string ipAddress)
+        {
+            try
+            {
+                var santitizedIp = SanitizeIpAddress(ipAddress);
+                var hostEntry = Dns.GetHostEntry(santitizedIp);
+                return hostEntry == null ? ipAddress : hostEntry.HostName;
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, "Exception Resolving Hostname from IP Address : {0}", ex.Message);
+                return ipAddress;
+            }
+        }
+
+        /// <summary>
+        /// Resolves an IP Address by hostname using DNS
+        /// </summary>
+        /// <param name="hostName">Hostname to resolve from</param>
+        /// <returns>Resolved IP Address - on a failure to determine IP Address, will return hostname</returns>
+        public static string ResolveIpFromHostname(string hostName)
+        {
+            try
+            {
+                var hostEntry = Dns.GetHostEntry(hostName);
+                return hostEntry == null ? hostName : hostEntry.AddressList.First().ToString();
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, "Exception Resolving IP Address from Hostname : {0}", ex.Message);
+                return hostName;
+            }
+        }
+
+    }
+
+    /// <summary>
+    /// Object to hold data about an arp entry
+    /// </summary>
+    public class ArpEntry
+    {
+        public readonly IPAddress IpAddress;
+        public readonly string MacAddress;
+
+        /// <summary>
+        /// Constructs new ArpEntry object
+        /// </summary>
+        /// <param name="ipAddress">string formatted as ipv4 address</param>
+        /// <param name="macAddress">mac address string - format is unimportant</param>
+        public ArpEntry(string ipAddress, string macAddress)
+        {
+            if (string.IsNullOrEmpty(ipAddress))
+            {
+                throw new ArgumentException("\"ipAddress\" cannot be null or empty");
+            }
+            if (string.IsNullOrEmpty(macAddress))
+            {
+                throw new ArgumentException("\"macAddress\" cannot be null or empty");
+            }
+            IpAddress = IPAddress.Parse(ipAddress.TrimStart().TrimStart('0').TrimEnd());
+            MacAddress = macAddress;
+        }
+    }
+
+    /// <summary>
+    /// Arguments passed by the ArpTableUpdated event
+    /// </summary>
+    public class ArpTableEventArgs : EventArgs
+    {
+        /// <summary>
+        /// The retrieved ARP Table
+        /// </summary>
+        public readonly List<ArpEntry> ArpTable;
+        /// <summary>
+        /// True if there was a problem retrieving the ARP Table
+        /// </summary>
+        public readonly bool Error;
+
+        /// <summary>
+        /// Constructor for ArpTableEventArgs
+        /// </summary>
+        /// <param name="arpTable">The entirety of the retrieved ARP table</param>
+        /// <param name="error">True of an error was encountered updating the ARP table</param>
+        public ArpTableEventArgs(List<ArpEntry> arpTable, bool error)
+        {
+            ArpTable = arpTable;
+            Error = error;
+        }
+
+        /// <summary>
+        /// Constructor for ArpTableEventArgs - assumes no error encountered in retrieving ARP Table
+        /// </summary>
+        /// <param name="arpTable">The entirety of the retrieved ARP table</param>
+        public ArpTableEventArgs(List<ArpEntry> arpTable)
+        {
+            ArpTable = arpTable;
+            Error = false;
+        }
+    }
+}
--- 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/Extensions/StringExtensions.cs
+++ b/Core/PepperDashEssentialsBase/Extensions/StringExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,17 +9,70 @@ namespace PepperDash.Essentials.Core
 {
    public static class StringExtensions
    {
+        /// <summary>
+        /// Returns null if a string is empty, otherwise returns the string
+        /// </summary>
+        /// <param name="s">string input</param>
+        /// <returns>null if the string is emtpy, otherwise returns the string</returns>
        public static string NullIfEmpty(this string s)
        {
            return string.IsNullOrEmpty(s) ? null : s;
        }
+
+        /// <summary>
+        /// Returns null if a string is empty or made of only whitespace characters, otherwise returns the string
+        /// </summary>
+        /// <param name="s">string input</param>
+        /// <returns>null if the string is wempty or made of only whitespace characters, otherwise returns the string</returns>
        public static string NullIfWhiteSpace(this string s)
        {
            return string.IsNullOrEmpty(s.Trim()) ? null : s;
        }
+
+        /// <summary>
+        /// Returns a replacement string if the input string is empty or made of only whitespace characters, otherwise returns the input string
+        /// </summary>
+        /// <param name="s">input string</param>
+        /// <param name="newString">string to replace with if input string is empty or whitespace</param>
+        /// <returns>returns newString if s is null, emtpy, or made of whitespace characters, otherwise returns s</returns>
        public static string ReplaceIfNullOrEmpty(this string s, string newString)
        {
            return string.IsNullOrEmpty(s) ? newString : s;
        }
+
+        /// <summary>
+        /// Overload for Contains that allows setting an explicit String Comparison
+        /// </summary>
+        /// <param name="source">Source String</param>
+        /// <param name="toCheck">String to check in Source String</param>
+        /// <param name="comp">Comparison parameters</param>
+        /// <returns>true of string contains "toCheck"</returns>
+        public static bool Contains(this string source, string toCheck, StringComparison comp)
+        {
+            if (string.IsNullOrEmpty(source)) return false;
+            return source.IndexOf(toCheck, comp) >= 0;
+        }
+
+        /// <summary>
+        /// Performs TrimStart() and TrimEnd() on source string
+        /// </summary>
+        /// <param name="source">String to Trim</param>
+        /// <returns>Trimmed String</returns>
+        public static string TrimAll(this string source)
+        {
+            return string.IsNullOrEmpty(source) ? string.Empty : source.TrimStart().TrimEnd();
+        }
+
+        /// <summary>
+        /// Performs TrimStart(chars char[]) and TrimEnd(chars char[]) on source string.
+        /// </summary>
+        /// <param name="source">String to Trim</param>
+        /// <param name="chars">Char Array to trim from string</param>
+        /// <returns>Trimmed String</returns>
+        public static string TrimAll(this string source, char[] chars)
+        {
+            return string.IsNullOrEmpty(source) ? string.Empty : source.TrimStart(chars).TrimEnd(chars);
+        }
+
    }
 }
--- 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/JoinMaps/JoinMapBase.cs
+++ b/Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs
@@ -356,18 +356,16 @@ namespace PepperDash.Essentials.Core
        {
            foreach (var customJoinData in joinData)
            {
-                JoinDataComplete join;
-
-                if (!Joins.TryGetValue(customJoinData.Key, out join))
-                {
-                    Debug.Console(2, "No matching key found in join map for: '{0}'", customJoinData.Key);
-                    continue;
-                }
+                var join = Joins[customJoinData.Key];

                if (join != null)
                {
                    join.SetCustomJoinData(customJoinData.Value);
                }
+                else
+                {
+                    Debug.Console(2, "No matching key found in join map for: '{0}'", customJoinData.Key);
+                }
            }

            PrintJoinMapInfo();
--- 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" />
@@ -202,6 +200,7 @@
    <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
    <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
    <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />
+    <Compile Include="Device Info\NetworkDeviceHelpers.cs" />
    <Compile Include="Devices\PowerInterfaces.cs" />
    <Compile Include="Web\RequestHandlers\AppDebugRequestHandler.cs" />
    <Compile Include="Web\RequestHandlers\GetFeedbacksForDeviceRequestHandler.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/Core/PepperDashEssentialsBase/Routing/RoutingPort.cs
+++ b/Core/PepperDashEssentialsBase/Routing/RoutingPort.cs
@@ -42,7 +42,7 @@ namespace PepperDash.Essentials.Core
 	public enum eRoutingPortConnectionType
 	{
 		None, BackplaneOnly, DisplayPort, Dvi, Hdmi, Rgb, Vga, LineAudio, DigitalAudio, Sdi, 
-		Composite, Component, DmCat, DmMmFiber, DmSmFiber, Speaker, Streaming
+		Composite, Component, DmCat, DmMmFiber, DmSmFiber, Speaker, Streaming, UsbC, HdBaseT
 	}

 	/// <summary>
--- a/Core/PepperDashEssentialsBase/Routing/RoutingPortNames.cs
+++ b/Core/PepperDashEssentialsBase/Routing/RoutingPortNames.cs
@@ -199,5 +199,45 @@ namespace PepperDash.Essentials.Core.Routing
        /// MediaPlayer
        /// </summary>
        public const string MediaPlayer = "mediaPlayer";
-	}
+        /// <summary>
+        /// UsbCIn
+        /// </summary>
+        public const string UsbCIn = "usbCIn";
+        /// <summary>
+        /// UsbCIn1
+        /// </summary>
+        public const string UsbCIn1 = "usbCIn1";
+        /// <summary>
+        /// UsbCIn2
+        /// </summary>
+        public const string UsbCIn2 = "usbCIn2";
+        /// <summary>
+        /// UsbCIn3
+        /// </summary>
+        public const string UsbCIn3 = "usbCIn3";
+        /// <summary>
+        /// UsbCOut
+        /// </summary>
+        public const string UsbCOut = "usbCOut";
+        /// <summary>
+        /// UsbCOut1
+        /// </summary>
+        public const string UsbCOut1 = "usbCOut1";
+        /// <summary>
+        /// UsbCOut2
+        /// </summary>
+        public const string UsbCOut2 = "usbCOut2";
+        /// <summary>
+        /// UsbCOut3
+        /// </summary>
+        public const string UsbCOut3 = "usbCOut3";
+        /// <summary>
+        /// HdBaseTIn
+        /// </summary>
+        public const string HdBaseTIn = "hdBaseTIn";
+        /// <summary>
+        /// HdBaseTOut
+        /// </summary>
+        public const string HdBaseTOut = "hdBaseTOut";
+    }
 }
--- a/Core/PepperDashEssentialsBase/Touchpanels/Mpc3Touchpanel.cs
+++ b/Core/PepperDashEssentialsBase/Touchpanels/Mpc3Touchpanel.cs
@@ -1,295 +1,144 @@
-using System.Collections.Generic;
-using System.Globalization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
-using Newtonsoft.Json;
+
 using PepperDash.Core;
+using PepperDash.Essentials.Core;

 namespace PepperDash.Essentials.Core.Touchpanels
 {
-	/// <summary>
-	/// A wrapper class for the touchpanel portion of an MPC3 class process to allow for configurable
-	/// behavior of the keybad buttons
-	/// </summary>
-	public class Mpc3TouchpanelController : Device
-	{
-		readonly MPC3Basic _touchpanel;
+    /// <summary>
+    /// A wrapper class for the touchpanel portion of an MPC3 class process to allow for configurable
+    /// behavior of the keybad buttons
+    /// </summary>
+    public class Mpc3TouchpanelController : Device
+    {
+        MPC3Basic _Touchpanel;

-		readonly Dictionary<string, KeypadButton> _buttons;
+        Dictionary<string, KeypadButton> _Buttons;

-		public Mpc3TouchpanelController(string key, string name, CrestronControlSystem processor, Dictionary<string, KeypadButton> buttons)
-			: base(key, name)
-		{
-			_touchpanel = processor.ControllerTouchScreenSlotDevice as MPC3Basic;
-			if (_touchpanel == null)
-			{
-				Debug.Console(1, this, "Failed to construct MPC3 Touchpanel Controller with key {0}, check configuration", key);
-				return;
-			}
+        public Mpc3TouchpanelController(string key, string name, CrestronControlSystem processor, Dictionary<string, KeypadButton> buttons)
+            : base(key, name)
+        {
+            _Touchpanel = processor.ControllerTouchScreenSlotDevice as MPC3Basic;
+            _Buttons = buttons;

-			_touchpanel.ButtonStateChange += _touchpanel_ButtonStateChange;
-			_buttons = buttons;
-			if (_buttons == null)
-			{
-				Debug.Console(1, this,
-					"Button properties are null, failed to setup MPC3 Touch Controller, check configuration");
-				return;
-			}
+            _Touchpanel.ButtonStateChange += new Crestron.SimplSharpPro.DeviceSupport.ButtonEventHandler(_Touchpanel_ButtonStateChange);

-			AddPostActivationAction(() =>
-			{
-				foreach (var button in _buttons)
-				{
-					var buttonKey = button.Key.ToLower();
-					var buttonConfig = button.Value;
+            AddPostActivationAction(() =>
+                {
+                    // Link up the button feedbacks to the specified BoolFeedbacks
+                    foreach (var button in _Buttons)
+                    {
+                        var feedbackConfig = button.Value.Feedback;
+                        var device = DeviceManager.GetDeviceForKey(feedbackConfig.DeviceKey) as Device;
+                        if (device != null)
+                        {
+                            var bKey = button.Key.ToLower();

-					InitializeButton(buttonKey, buttonConfig);
-					InitializeButtonFeedback(buttonKey, buttonConfig);
-				}
-			});
-		}
+                            var feedback = device.GetFeedbackProperty(feedbackConfig.FeedbackName);

-		/// <summary>
-		/// Enables/disables buttons based on event type configuration 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="config"></param>
-		public void InitializeButton(string key, KeypadButton config)
-		{
-			if (config == null)
-			{
-				Debug.Console(1, this, "Button '{0}' config is null, unable to initialize", key);
-				return;
-			}
+                            var bFeedback = feedback as BoolFeedback;
+                            var iFeedback = feedback as IntFeedback;
+                            if (bFeedback != null)
+                            {

-			int buttonNumber;
-			TryParseInt(key, out buttonNumber);
+                                if (bKey == "power")
+                                {
+                                    bFeedback.LinkCrestronFeedback(_Touchpanel.FeedbackPower);
+                                    continue;
+                                }
+                                else if (bKey == "mute")
+                                {
+                                    bFeedback.LinkCrestronFeedback(_Touchpanel.FeedbackMute);
+                                    continue;
+                                }

-			var buttonEventTypes = config.EventTypes;
+                                // Link to the Crestron Feedback corresponding to the button number
+                                bFeedback.LinkCrestronFeedback(_Touchpanel.Feedbacks[UInt16.Parse(button.Key)]);
+                            }
+                            else if (iFeedback != null)
+                            {
+                                if (bKey == "volumefeedback")
+                                {
+                                    var volFeedback = feedback as IntFeedback;
+                                    // TODO: Figure out how to subsribe to a volume IntFeedback and link it to the voluem
+                                    volFeedback.LinkInputSig(_Touchpanel.VolumeBargraph);
+                                }
+                            }
+                            else
+                            {
+                                Debug.Console(1, this, "Unable to get BoolFeedback with name: {0} from device: {1}", feedbackConfig.FeedbackName, device.Key);
+                            }
+                        }
+                        else
+                        {
+                            Debug.Console(1, this, "Unable to get device with key: {0}", feedbackConfig.DeviceKey);
+                        }
+                    }
+                });
+        }

-			switch (key)
-			{
-				case ("power"):
-					{
-						if (buttonEventTypes == null)
-							_touchpanel.DisablePowerButton();
-						else
-							_touchpanel.EnablePowerButton();
+        void _Touchpanel_ButtonStateChange(GenericBase device, Crestron.SimplSharpPro.DeviceSupport.ButtonEventArgs args)
+        {
+            Debug.Console(1, this, "Button {0} ({1}), {2}", args.Button.Number, args.Button.Name, args.NewButtonState);
+            var type = args.NewButtonState.ToString();

-						break;
-					}
-				case ("volumeup"):
-					{
-						if (buttonEventTypes == null)
-							_touchpanel.DisableVolumeUpButton();
+            if (_Buttons.ContainsKey(args.Button.Number.ToString()))
+            {
+                Press(args.Button.Number.ToString(), type);
+            }
+            else if(_Buttons.ContainsKey(args.Button.Name.ToString()))
+            {
+                Press(args.Button.Name.ToString(), type);
+            }
+        }

-						break;
-					}
-				case ("volumedown"):
-					{
-						if (buttonEventTypes == null)
-							_touchpanel.DisableVolumeDownButton();
+        /// <summary>
+        /// Runs the function associated with this button/type. One of the following strings:
+        /// Pressed, Released, Tapped, DoubleTapped, Held, HeldReleased    
+        /// </summary>
+        /// <param name="number"></param>
+        /// <param name="type"></param>
+        public void Press(string number, string type)
+        {
+            // TODO: In future, consider modifying this to generate actions at device activation time
+            //       to prevent the need to dynamically call the method via reflection on each button press
+            if (!_Buttons.ContainsKey(number)) { return; }
+            var but = _Buttons[number];
+            if (but.EventTypes.ContainsKey(type))
+            {
+                foreach (var a in but.EventTypes[type]) { DeviceJsonApi.DoDeviceAction(a); }
+            }
+        }

-						break;
-					}
-				case ("volumefeedback"):
-					{

-						break;
-					}
-				case ("mute"):
-					{
-						if (buttonEventTypes == null)
-							_touchpanel.DisableMuteButton();
-						else
-							_touchpanel.EnableMuteButton();
+    }

-						break;
-					}
-				default:
-					{
-						if (buttonNumber == 0)
-							break;
+    /// <summary>
+    /// Represents the configuration of a keybad buggon
+    /// </summary>
+    public class KeypadButton
+    {
+        public Dictionary<string, DeviceActionWrapper[]> EventTypes { get; set; }
+        public KeypadButtonFeedback Feedback { get; set; }

-						if (buttonEventTypes == null)
-							_touchpanel.DisableNumericalButton((uint)buttonNumber);
-						else
-							_touchpanel.EnableNumericalButton((uint)buttonNumber);
+        public KeypadButton()
+        {
+            EventTypes = new Dictionary<string, DeviceActionWrapper[]>();
+            Feedback = new KeypadButtonFeedback();
+        }
+    }

-						break;
-					}
-			}
-
-			Debug.Console(1, this, "Button '{0}' {1}", key, buttonEventTypes == null
-				? "is disabled, verify eventTypes are configured."
-				: "is enabled");
-		}
-
-		/// <summary>
-		/// Links button feedback if configured
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="config"></param>
-		public void InitializeButtonFeedback(string key, KeypadButton config)
-		{
-			if (config == null)
-			{
-				Debug.Console(1, this, "Button '{0}' config is null, unable to initialize feedback", key);
-				return;
-			}
-
-			int buttonNumber;
-			TryParseInt(key, out buttonNumber);
-
-			// Link up the button feedbacks to the specified device feedback
-			var buttonFeedback = config.Feedback;
-			if (buttonFeedback == null)
-			{
-				Debug.Console(1, this, "Button '{0}' feedback not configured and will not be implemented. Verify feedback is configured if required.", key);
-				return;
-			}
-
-			var device = DeviceManager.GetDeviceForKey(buttonFeedback.DeviceKey) as Device;
-			if (device == null)
-			{
-				Debug.Console(1, this, "Button '{0}' feedback device with key '{0}' not found, feedback will not be implemented.  Verify feedback deviceKey is properly configured.",
-					buttonFeedback.DeviceKey);
-				return;
-			}
-
-			// TODO [ ] verify if this can replace the current method
-			var deviceFeedback = device.GetFeedbackProperty(buttonFeedback.FeedbackName);
-			Debug.Console(0, this, "deviceFeedback.GetType().Name: '{0}'", deviceFeedback.GetType().Name);
-			//switch (feedback.GetType().Name.ToLower())
-			//{
-			//    case("boolfeedback"):
-			//    {
-			//        break;
-			//    }
-			//    case("intfeedback"):
-			//    {
-			//        break;
-			//    }
-			//    case("stringfeedback"):
-			//    {
-			//        break;
-			//    }
-			//}
-
-			var boolFeedback = deviceFeedback as BoolFeedback;
-			var intFeedback = deviceFeedback as IntFeedback;
-
-			switch (key)
-			{
-				case ("power"):
-					{
-						if (boolFeedback != null) boolFeedback.LinkCrestronFeedback(_touchpanel.FeedbackPower);
-						break;
-					}
-				case ("volumeup"):
-				case ("volumedown"):
-				case ("volumefeedback"):
-					{
-						if (intFeedback != null)
-						{
-							var volumeFeedback = intFeedback;
-							volumeFeedback.LinkInputSig(_touchpanel.VolumeBargraph);
-						}
-						break;
-					}
-				case ("mute"):
-					{
-						if (boolFeedback != null) boolFeedback.LinkCrestronFeedback(_touchpanel.FeedbackMute);
-						break;
-					}
-				default:
-					{
-						if (boolFeedback != null) boolFeedback.LinkCrestronFeedback(_touchpanel.Feedbacks[(uint)buttonNumber]);
-						break;
-					}
-			}
-		}
-
-		/// <summary>
-		/// Try parse int helper method
-		/// </summary>
-		/// <param name="str"></param>
-		/// <param name="result"></param>
-		/// <returns></returns>
-		public bool TryParseInt(string str, out int result)
-		{
-			try
-			{
-				result = int.Parse(str);
-				return true;
-			}
-			catch
-			{
-				result = 0;
-				return false;
-			}
-		}
-
-		private void _touchpanel_ButtonStateChange(GenericBase device, Crestron.SimplSharpPro.DeviceSupport.ButtonEventArgs args)
-		{
-			Debug.Console(1, this, "Button {0} ({1}), {2}", args.Button.Number, args.Button.Name, args.NewButtonState);
-			var type = args.NewButtonState.ToString();
-
-			if (_buttons.ContainsKey(args.Button.Number.ToString(CultureInfo.InvariantCulture)))
-			{
-				Press(args.Button.Number.ToString(CultureInfo.InvariantCulture), type);
-			}
-			else if (_buttons.ContainsKey(args.Button.Name.ToString()))
-			{
-				Press(args.Button.Name.ToString(), type);
-			}
-		}
-
-		/// <summary>
-		/// Runs the function associated with this button/type. One of the following strings:
-		/// Pressed, Released, Tapped, DoubleTapped, Held, HeldReleased    
-		/// </summary>
-		/// <param name="buttonKey"></param>
-		/// <param name="type"></param>
-		public void Press(string buttonKey, string type)
-		{
-			// TODO: In future, consider modifying this to generate actions at device activation time
-			//       to prevent the need to dynamically call the method via reflection on each button press
-			if (!_buttons.ContainsKey(buttonKey)) return;
-
-			var button = _buttons[buttonKey];
-			if (!button.EventTypes.ContainsKey(type)) return;
-
-			foreach (var eventType in button.EventTypes[type]) DeviceJsonApi.DoDeviceAction(eventType);
-		}
-	}
-
-	/// <summary>
-	/// Represents the configuration of a keypad button
-	/// </summary>
-	public class KeypadButton
-	{
-		[JsonProperty("eventTypes")]
-		public Dictionary<string, DeviceActionWrapper[]> EventTypes { get; set; }
-
-		[JsonProperty("feedback")]
-		public KeypadButtonFeedback Feedback { get; set; }
-
-		public KeypadButton()
-		{
-			EventTypes = new Dictionary<string, DeviceActionWrapper[]>();
-			Feedback = new KeypadButtonFeedback();
-		}
-	}
-
-	/// <summary>
-	/// Represents the configuration of a keypad button feedback
-	/// </summary>
-	public class KeypadButtonFeedback
-	{
-		[JsonProperty("deviceKey")]
-		public string DeviceKey { get; set; }
-
-		[JsonProperty("feedbackName")]
-		public string FeedbackName { get; set; }
-	}
+    /// <summary>
+    /// 
+    /// </summary>
+    public class KeypadButtonFeedback
+    {
+        public string DeviceKey { get; set; }
+        public string FeedbackName { get; set; }
+    }
 }
--- a/Common/Codec/iHasScheduleAwareness.cs
+++ b/Common/Codec/iHasScheduleAwareness.cs
@@ -216,10 +216,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
                return joinable;
            }
        }
-
-		[JsonProperty("dialable")]
-		public bool Dialable { get; set; }
-
        //public string ConferenceNumberToDial { get; set; }
        [JsonProperty("conferencePassword")]
        public string ConferencePassword { get; set; }
--- a/Common/VideoCodec/CiscoCodec/BookingsDataClasses.cs
+++ b/Common/VideoCodec/CiscoCodec/BookingsDataClasses.cs
@@ -348,8 +348,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                    if (b.DialInfo.ConnectMode.Value.ToLower() == "obtp" || b.DialInfo.ConnectMode.Value.ToLower() == "manual")
                        meeting.IsOneButtonToPushMeeting = true;

-				meeting.Dialable = b.DialInfo.Calls.Call.Count > 0;
-
                if (b.DialInfo.Calls.Call != null)
                {
                    foreach (Call c in b.DialInfo.Calls.Call)
--- a/Common/VideoCodec/VideoCodecBase.cs
+++ b/Common/VideoCodec/VideoCodecBase.cs
@@ -940,7 +940,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec

 		        //digitals
 		        tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, meeting.Joinable);
-		        tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, meeting.Dialable);
+		        tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, meeting.Id != "0");

 		        //serials
 		        tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, meeting.Organizer);
@@ -994,7 +994,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec

            //Special Change for protected directory clear

-            trilist.SetBoolSigAction(joinMap.DirectoryClearSelected.JoinNumber, (b) => SelectDirectoryEntry(codec, 0, trilist, joinMap));
+            trilist.SetBoolSigAction(joinMap.DirectoryClearSelected.JoinNumber, (b) => SelectDirectoryEntry(_directoryCodec, 0, _directoryTrilist, _directoryJoinmap));

 		    // Report feedback for number of contact methods for selected contact

--- a/Common/VideoCodec/ZoomRoom/ResponseObjects.cs
+++ b/Common/VideoCodec/ZoomRoom/ResponseObjects.cs
@@ -1510,8 +1510,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

 				meeting.Privacy = b.IsPrivate ? eMeetingPrivacy.Private : eMeetingPrivacy.Public;

-				meeting.Dialable = meeting.Id != "0";
-
 				// No meeting.Calls data exists for Zoom Rooms.  Leaving out for now.
 				var now = DateTime.Now;
 				if (meeting.StartTime < now && meeting.EndTime < now)
--- a/packages.config
+++ b/packages.config
@@ -1,3 +1,3 @@
 <packages>
-	<package id="PepperDashCore" version="1.3.2" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
+	<package id="PepperDashCore" version="1.3.0" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
 </packages>
Author	SHA1	Message	Date
Andrew Welker	d95692ba96	Merge pull request #1121 from PepperDash/hotfix/vtc-room-activation-deactivation-changes Hotfix/vtc room activation deactivation changes	2023-08-17 10:44:58 -06:00
Andrew Welker	269d82227d	Merge branch 'development' into hotfix/vtc-room-activation-deactivation-changes	2023-08-15 12:50:19 -06:00
Andrew Welker	e8f20a4ca3	Merge pull request #1123 from PepperDash/hotfix/crestron-db-updates Update Crestron DBS & PD Core DEV	2023-08-15 12:50:07 -06:00
Andrew Welker	5fbacadd7f	Merge branch 'development' into hotfix/crestron-db-updates	2023-08-15 12:25:49 -06:00
Andrew Welker	8d0f0c0c37	Merge branch 'development' into hotfix/vtc-room-activation-deactivation-changes	2023-08-15 10:59:46 -06:00
Andrew Welker	2b97b9bdc4	Merge pull request #1114 from PepperDash/feature/DeviceNetworkInformationUpdates Add Static Class for device network information and supporting extension methods	2023-08-15 10:59:06 -06:00
Andrew Welker	4a0bacb27e	Merge branch 'development' into feature/DeviceNetworkInformationUpdates	2023-07-21 12:23:42 -06:00
Andrew Welker	a36901894d	Merge pull request #1111 from PepperDash/feature/AddUsbCConnector Add USB-C and HdBaseT Options for Routing Ports	2023-07-21 12:23:30 -06:00
Andrew Welker	c047507997	Merge branch 'development' into hotfix/vtc-room-activation-deactivation-changes	2023-07-21 12:22:58 -06:00
Trevor Payne	3f6b2f05a2	feature: Add Static Class to assist with getting network information about connected devices feature: Add overload to 'Contains' extension method to allow for some more verbose comparisons feature: Add 'TrimAll' string extension method to TrimStart and TrimEnd with an overload to set the character to trim docs: improve XML summary comments for string extensions	2023-07-04 23:53:31 -05:00
Trevor Payne	f4af1b6e7c	feature: Add HdBaseT as a eRoutingPortConnectionType	2023-06-16 14:57:48 -05:00
Trevor Payne	a04bfd1fcb	feature: Add HdBaseTIn and HdBaseTOut as RoutingPortNames	2023-06-16 14:56:21 -05:00
Trevor Payne	faaf8151df	Merge branch 'feature/AddUsbCConnector' of https://github.com/PepperDash/Essentials into feature/AddUsbCConnector	2023-06-16 14:50:52 -05:00
Trevor Payne	0ee6322684	feature: Add USBCIn and Out Names for RoutingPortNames	2023-06-16 14:50:10 -05:00
Trevor Payne	c614347f29	Merge branch 'main' into feature/AddUsbCConnector	2023-06-16 14:29:02 -05:00
Trevor Payne	43f06d2167	feature: Add USB-C as eRoutingPortConnectionType option	2023-06-16 14:26:52 -05:00
Andrew Welker	e1ce35863f	Merge pull request #1109 from PepperDash/release/1.14.0 Release/1.14.0	2023-06-07 10:11:49 -06:00