Adds logic to only instantiate screensaver if mobile control is enabled on room

Add secureTcpClient to comm factory

PepperDashEssentials/ControlSystem.cs

@@ -337,19 +337,20 @@ namespace PepperDash.Essentials
 		void Load()
 		{
 			LoadDevices();
-			LoadTieLines();
 			LoadRooms();
 			LoadLogoServer();
 
 			DeviceManager.ActivateAll();
 
+            LoadTieLines();
+
 		    var mobileControl = GetMobileControlDevice();
 
 		    if (mobileControl == null) return;
 
             mobileControl.LinkSystemMonitorToAppServer();
-		    
-		}
+
+        }
 
         /// <summary>
         /// Reads all devices from config and adds them to DeviceManager
@@ -401,20 +402,21 @@ 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)
-                            {
-                                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);
-                            }
-                            
+							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);	
                         }
                         else
                         {

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -334,7 +334,7 @@ namespace PepperDash.Essentials
 		/// route or commands
 		/// </summary>
 		/// <param name="name"></param>
-		public void RunRouteAction(string routeKey, Action successCallback)
+		public virtual void RunRouteAction(string routeKey, Action successCallback)
 		{
 			// Run this on a separate thread
 			new CTimer(o =>

PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleSpaceRoom.cs

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

PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleVtc1Room.cs

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

PepperDashEssentials/UI/EssentialsTouchpanelController.cs

@@ -48,10 +48,8 @@ namespace PepperDash.Essentials
             // spin up different room drivers depending on room type
             var room = DeviceManager.GetDeviceForKey(roomKey);
             if (room is IEssentialsHuddleSpaceRoom)
-            {
-                // Screen Saver Driver
-
-                mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, _config);
+            {
+                SetupScreenSaver(room, mainDriver);
 
                 // Header Driver
                 Debug.Console(0, this, "Adding header driver");
@@ -94,10 +92,9 @@ namespace PepperDash.Essentials
             }
             else if (room is IEssentialsHuddleVtc1Room)
             {
-                Debug.Console(0, this, "Adding huddle space VTC AV driver");
-
-                // Screen Saver Driver
-                mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, _config);
+                Debug.Console(0, this, "Adding huddle space VTC AV driver");
+
+                SetupScreenSaver(room, mainDriver);
 
                 // Header Driver
                 mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, _config);
@@ -148,6 +145,16 @@ namespace PepperDash.Essentials
                 Debug.Console(0, this, "ERROR: Cannot load AvFunctionsDriver for room '{0}'", roomKey);
             }
 
+        }
+
+        private void SetupScreenSaver(IKeyed room, EssentialsPanelMainInterfaceDriver mainDriver)
+        {
+            var huddleRoom = room as IEssentialsRoom;
+            // Screen Saver Driver
+            if (huddleRoom.IsMobileControlEnabled)
+            {
+                mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, _config);
+            }
         }
 
 		public void LoadAndShowDriver(PanelDriverBase driver)

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

@@ -1,190 +0,0 @@
-using System;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash_Essentials_Core.Bridges
-{
-	public class HdPsXxxControllerJoinMap : JoinMapBaseAdvanced
-	{
-
-		#region Digital
-
-		[JoinName("EnableAutoRoute")]
-		public JoinDataComplete EnableAutoRoute = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 1,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Enable Automatic Routing on Xx1 Switchers",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-
-		[JoinName("InputSync")]
-		public JoinDataComplete InputSync = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 2,
-				JoinSpan = 8
-			},
-			new JoinMetadata
-			{
-				Description = "Device Input Sync",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-
-		[JoinName("EnableInputHdcp")]
-		public JoinDataComplete EnableInputHdcp = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 11,
-				JoinSpan = 8
-			},
-			new JoinMetadata
-			{
-				Description = "Device Enable Input Hdcp",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-
-		[JoinName("DisableInputHdcp")]
-		public JoinDataComplete DisableInputHdcp = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 21,
-				JoinSpan = 8
-			},
-			new JoinMetadata
-			{
-				Description = "Device Disnable Input Hdcp",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-
-		[JoinName("IsOnline")]
-		public JoinDataComplete IsOnline = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 30,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Device Onlne",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-		#endregion
-
-
-		#region Analog
-
-		[JoinName("OutputRoute")]
-		public JoinDataComplete OutputRoute = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 11,
-				JoinSpan = 2
-			},
-			new JoinMetadata
-			{
-				Description = "Device Output Route Set/Get",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Analog
-			});
-
-		#endregion
-
-
-		#region Serial
-
-		[JoinName("Name")]
-		public JoinDataComplete Name = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 1,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Device Name",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Serial
-			});
-
-
-		[JoinName("InputName")]
-		public JoinDataComplete InputName = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 2,
-				JoinSpan = 8
-			},
-			new JoinMetadata
-			{
-				Description = "Device Input Name",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Serial
-			});
-
-
-		[JoinName("OutputName")]
-		public JoinDataComplete OutputName = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 11,
-				JoinSpan = 2
-			},
-			new JoinMetadata
-			{
-				Description = "Device Output Name",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Serial
-			});
-
-
-		[JoinName("OutputRoutedName")]
-		public JoinDataComplete OutputRoutedName = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 16,
-				JoinSpan = 2
-			},
-			new JoinMetadata
-			{
-				Description = "Device Output Route Name",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Serial
-			});
-
-
-		#endregion
-
-		/// <summary>
-		/// Constructor to use when instantiating this join map without inheriting from it
-		/// </summary>
-		/// <param name="joinStart">Join this join map will start at</param>
-		public HdPsXxxControllerJoinMap(uint joinStart)
-			: this(joinStart, typeof(HdPsXxxControllerJoinMap))
-		{
-		}
-
-		/// <summary>
-		/// Constructor to use when extending this Join map
-		/// </summary>
-		/// <param name="joinStart">Join this join map will start at</param>
-		/// <param name="type">Type of the child join map</param>
-		protected HdPsXxxControllerJoinMap(uint joinStart, Type type)
-			: base(joinStart, type)
-		{
-		}
-	}
-}

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

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

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

@@ -72,6 +72,10 @@ namespace PepperDash.Essentials.Core
     {
         IBasicVolumeControls CurrentVolumeControls { get; }
 		event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
+
+        void SetDefaultLevels();
+
+        bool ZeroVolumeWhenSwtichingVolumeDevices { get; }
 	}
 
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs

@@ -148,15 +148,20 @@ namespace PepperDash.Essentials.Core.Fusion
                     ReadGuidFile(guidFilePath);
                 }
 
-                if (Room.RoomOccupancy != null)
+                var occupancyRoom = Room as IRoomOccupancy;
+
+                if (occupancyRoom != null)
                 {
-                    if (Room.OccupancyStatusProviderIsRemote)
+                    if (occupancyRoom.RoomOccupancy != null)
                     {
-                        SetUpRemoteOccupancy();
-                    }
-                    else
-                    {
-                        SetUpLocalOccupancy();
+                        if (occupancyRoom.OccupancyStatusProviderIsRemote)
+                        {
+                            SetUpRemoteOccupancy();
+                        }
+                        else
+                        {
+                            SetUpLocalOccupancy();
+                        }
                     }
                 }
 
@@ -1523,10 +1528,15 @@ 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);
 
             //}

essentials-framework/Essentials 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\HdPsXxxControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IAnalogInputJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IDigitalOutputJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\PduJoinMapBase.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs

@@ -38,7 +38,7 @@ namespace PepperDash.Essentials.Core
 
         ScheduledEventGroup FeatureEventGroup;
 
-        public IEssentialsRoom Room { get; private set; }
+        public IRoomOccupancy 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 IEssentialsRoom;
+            Room = DeviceManager.GetDeviceForKey(PropertiesConfig.RoomKey) as IRoomOccupancy;
 
             if (Room != null)
             {
@@ -235,12 +235,23 @@ namespace PepperDash.Essentials.Core
 
                 if (FeatureEnabled)
                 {
-                    // Check room power state first
-                    if (!Room.OnFeedback.BoolValue)
-                    {
-                        Debug.Console(1, this, "Powering Room on to default source");
-                        Room.RunDefaultPresentRoute();
+                    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
+                    
                 }
             }
         }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/IEssentialsRoom.cs

@@ -17,15 +17,10 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public interface IEssentialsRoom : IKeyName, IReconfigurableDevice, IRunDefaultPresentRoute, IEnvironmentalControls
     {
-        BoolFeedback OnFeedback { get; }
-
-        event EventHandler<EventArgs> RoomOccupancyIsSet;
+        BoolFeedback OnFeedback { get; }        
 
         BoolFeedback IsWarmingUpFeedback { get; }
-        BoolFeedback IsCoolingDownFeedback { get; }
-
-        IOccupancyStatusProvider RoomOccupancy { get; }
-        bool OccupancyStatusProviderIsRemote { get; }
+        BoolFeedback IsCoolingDownFeedback { get; }        
 
         bool IsMobileControlEnabled { get; }
         IMobileControlRoomBridge MobileControlRoomBridge { get; }
@@ -35,31 +30,16 @@ namespace PepperDash.Essentials.Core
         SecondsCountdownTimer ShutdownPromptTimer { get; }
         int ShutdownPromptSeconds { get; }
         int ShutdownVacancySeconds { get; }
-        eShutdownType ShutdownType { get; }
-
-        EssentialsRoomEmergencyBase Emergency { get; }
-
-        Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; }
+        eShutdownType ShutdownType { get; }      
 
         string LogoUrlLightBkgnd { get; }
         string LogoUrlDarkBkgnd { get; }
 
-        eVacancyMode VacancyMode { get; }
+        void StartShutdown(eShutdownType type);        
 
-        bool ZeroVolumeWhenSwtichingVolumeDevices { get; }
+        void Shutdown();        
 
-        void StartShutdown(eShutdownType type);
-        void StartRoomVacancyTimer(eVacancyMode mode);
-
-        void Shutdown();
-
-        void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes);
-
-        void PowerOnToDefaultOrLastSource();
-
-        void SetDefaultLevels();
-
-        void RoomVacatedForTimeoutPeriod(object o);
+        void PowerOnToDefaultOrLastSource();               
     }
 
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Interfaces.cs

@@ -41,7 +41,6 @@ namespace PepperDash.Essentials.Core
         void RunRouteAction(string routeKey, string sourceListKey);
 
         void RunRouteAction(string routeKey, string sourceListKey, Action successCallback);
-
     }
 
     /// <summary>
@@ -78,4 +77,30 @@ 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; }
+    }
+
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Touchpanels/Mpc3Touchpanel.cs

@@ -1,144 +1,295 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
+using System.Collections.Generic;
+using System.Globalization;
 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
-    {
-        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
+	{
+		readonly MPC3Basic _touchpanel;
 
-        Dictionary<string, KeypadButton> _Buttons;
+		readonly Dictionary<string, KeypadButton> _buttons;
 
-        public Mpc3TouchpanelController(string key, string name, CrestronControlSystem processor, Dictionary<string, KeypadButton> buttons)
-            : base(key, name)
-        {
-            _Touchpanel = processor.ControllerTouchScreenSlotDevice as MPC3Basic;
-            _Buttons = 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;
+			}
 
-            _Touchpanel.ButtonStateChange += new Crestron.SimplSharpPro.DeviceSupport.ButtonEventHandler(_Touchpanel_ButtonStateChange);
+			_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;
+			}
 
-            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();
+			AddPostActivationAction(() =>
+			{
+				foreach (var button in _buttons)
+				{
+					var buttonKey = button.Key.ToLower();
+					var buttonConfig = button.Value;
 
-                            var feedback = device.GetFeedbackProperty(feedbackConfig.FeedbackName);
+					InitializeButton(buttonKey, buttonConfig);
+					InitializeButtonFeedback(buttonKey, buttonConfig);
+				}
+			});
+		}
 
-                            var bFeedback = feedback as BoolFeedback;
-                            var iFeedback = feedback as IntFeedback;
-                            if (bFeedback != null)
-                            {
+		/// <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;
+			}
 
-                                if (bKey == "power")
-                                {
-                                    bFeedback.LinkCrestronFeedback(_Touchpanel.FeedbackPower);
-                                    continue;
-                                }
-                                else if (bKey == "mute")
-                                {
-                                    bFeedback.LinkCrestronFeedback(_Touchpanel.FeedbackMute);
-                                    continue;
-                                }
+			int buttonNumber;
+			TryParseInt(key, out buttonNumber);
 
-                                // 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);
-                        }
-                    }
-                });
-        }
+			var buttonEventTypes = config.EventTypes;
 
-        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();
+			switch (key)
+			{
+				case ("power"):
+					{
+						if (buttonEventTypes == null)
+							_touchpanel.DisablePowerButton();
+						else
+							_touchpanel.EnablePowerButton();
 
-            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 ("volumeup"):
+					{
+						if (buttonEventTypes == null)
+							_touchpanel.DisableVolumeUpButton();
 
-        /// <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 ("volumedown"):
+					{
+						if (buttonEventTypes == null)
+							_touchpanel.DisableVolumeDownButton();
 
+						break;
+					}
+				case ("volumefeedback"):
+					{
 
-    }
+						break;
+					}
+				case ("mute"):
+					{
+						if (buttonEventTypes == null)
+							_touchpanel.DisableMuteButton();
+						else
+							_touchpanel.EnableMuteButton();
 
-    /// <summary>
-    /// Represents the configuration of a keybad buggon
-    /// </summary>
-    public class KeypadButton
-    {
-        public Dictionary<string, DeviceActionWrapper[]> EventTypes { get; set; }
-        public KeypadButtonFeedback Feedback { get; set; }
+						break;
+					}
+				default:
+					{
+						if (buttonNumber == 0)
+							break;
 
-        public KeypadButton()
-        {
-            EventTypes = new Dictionary<string, DeviceActionWrapper[]>();
-            Feedback = new KeypadButtonFeedback();
-        }
-    }
+						if (buttonEventTypes == null)
+							_touchpanel.DisableNumericalButton((uint)buttonNumber);
+						else
+							_touchpanel.EnableNumericalButton((uint)buttonNumber);
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public class KeypadButtonFeedback
-    {
-        public string DeviceKey { get; set; }
-        public string FeedbackName { get; set; }
-    }
+						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; }
+	}
 }

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

@@ -1,637 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.DM;
-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;
-using PepperDash_Essentials_DM.Config;
-
-namespace PepperDash_Essentials_DM.Chassis
-{
-	[Description("Wrapper class for all HdPsXxx switchers")]
-	public class HdPsXxxController : CrestronGenericBridgeableBaseDevice, IRoutingNumericWithFeedback, IHasFeedback
-	{
-
-		private readonly HdPsXxx _chassis;
-		private readonly HdPs401 _chassis401;
-		private readonly HdPs621 _chassis621;
-
-		public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-		public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-
-		public Dictionary<uint, string> InputNames { get; set; }
-		public Dictionary<uint, string> OutputNames { get; set; }
-
-		public FeedbackCollection<StringFeedback> InputNameFeedbacks { get; private set; }
-		public FeedbackCollection<BoolFeedback> InputHdcpEnableFeedback { get; private set; }
-
-		public FeedbackCollection<StringFeedback> OutputNameFeedbacks { get; private set; }
-		public FeedbackCollection<StringFeedback> OutputRouteNameFeedback { get; private set; }
-
-		public FeedbackCollection<BoolFeedback> VideoInputSyncFeedbacks { get; private set; }
-		public FeedbackCollection<IntFeedback> VideoOutputRouteFeedbacks { get; private set; }
-
-		public StringFeedback DeviceNameFeedback { get; private set; }
-		public BoolFeedback AutoRouteFeedback { get; private set; }
-
-		public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="chassis">HdPs401 device instance</param>
-		/// <param name="props"></param>
-		public HdPsXxxController(string key, string name, HdPsXxx chassis, HdPsXxxPropertiesConfig props)
-			: base(key, name)
-		{
-			_chassis = chassis;
-			Name = name;
-
-			if (props == null)
-			{
-				Debug.Console(1, this, "HdPsXxxController properties are null, failed to build device");
-				return;
-			}
-
-			InputPorts = new RoutingPortCollection<RoutingInputPort>();
-			InputNames = new Dictionary<uint, string>();
-			InputNameFeedbacks = new FeedbackCollection<StringFeedback>();
-			InputHdcpEnableFeedback = new FeedbackCollection<BoolFeedback>();
-
-			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-			OutputNames = new Dictionary<uint, string>();
-			OutputNameFeedbacks = new FeedbackCollection<StringFeedback>();
-			OutputRouteNameFeedback = new FeedbackCollection<StringFeedback>();
-
-			VideoInputSyncFeedbacks = new FeedbackCollection<BoolFeedback>();
-			VideoOutputRouteFeedbacks = new FeedbackCollection<IntFeedback>();
-
-			if (_chassis.NumberOfOutputs == 1)
-			{
-				if (_chassis is HdPs401)
-					_chassis401 = _chassis as HdPs401;
-				if (_chassis is HdPs621)
-					_chassis621 = _chassis as HdPs621;
-
-				AutoRouteFeedback = new BoolFeedback(() => _chassis401.PriorityRouteOnFeedback.BoolValue);
-			}
-
-			SetupInputs(props.Inputs);
-			SetupOutputs(props.Outputs);
-
-			AddPostActivationAction(AddFeedbackCollecitons);
-		}
-
-		// input setup
-		private void SetupInputs(Dictionary<uint, string> dict)
-		{
-			InputNames = dict;
-
-			for (uint i = 1; i <= _chassis.NumberOfInputs; i++)
-			{
-				var index = i;
-				var name = string.IsNullOrEmpty(InputNames[index]) ? string.Format("Input {0}", index) : InputNames[index];
-				var input = _chassis.Inputs[index];
-				var hdmiInput = _chassis.HdmiInputs[index];
-				var dmLiteInput = _chassis.DmLiteInputs[index];
-
-				InputNameFeedbacks.Add(new StringFeedback(name, () => InputNames[index]));
-
-				// TODO [ ] verify which input type is needed
-				input.Name.StringValue = name;
-				hdmiInput.Name.StringValue = name;
-				dmLiteInput.Name.StringValue = name;
-
-				var port = new RoutingInputPort(name, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this)
-				{
-					FeedbackMatchObject = input
-				};
-				InputPorts.Add(port);
-
-				InputHdcpEnableFeedback.Add(new BoolFeedback(name, () => hdmiInput.InputPort.HdcpSupportOnFeedback.BoolValue));
-
-				VideoInputSyncFeedbacks.Add(new BoolFeedback(name, () => input.VideoDetectedFeedback.BoolValue));
-			}
-
-			_chassis.DMInputChange += _chassis_InputChange;			
-		}
-
-		// output setup
-		private void SetupOutputs(Dictionary<uint, string> dict)
-		{
-			OutputNames = dict;
-
-			for (uint i = 1; i <= _chassis.NumberOfOutputs; i++)
-			{
-				var index = i;
-				var name = string.IsNullOrEmpty(OutputNames[index]) ? string.Format("Output {0}", index) : OutputNames[index];
-				var output = _chassis.Outputs[index];
-				var hdmiDmLiteOutput = _chassis.HdmiDmLiteOutputs[index];
-
-				OutputNameFeedbacks.Add(new StringFeedback(name, () => OutputNames[index]));
-
-				// TODO [ ] verify which output type is needed
-				output.Name.StringValue = name;
-				hdmiDmLiteOutput.Name.StringValue = name;
-
-				var port = new RoutingOutputPort(name, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, output, this)
-				{
-					FeedbackMatchObject = output
-				};
-				OutputPorts.Add(port);
-
-				OutputRouteNameFeedback.Add(new StringFeedback(name, () => output.VideoOutFeedback.NameFeedback.StringValue));
-
-				VideoOutputRouteFeedbacks.Add(new IntFeedback(name, () => output.VideoOutFeedback == null ? 0 : (int)output.VideoOutFeedback.Number));
-			}
-
-			_chassis.DMOutputChange += _chassis_OutputChange;
-		}
-
-
-		#region BridgeLinking
-
-		/// <summary>
-		/// Link device to API
-		/// </summary>
-		/// <param name="trilist"></param>
-		/// <param name="joinStart"></param>
-		/// <param name="joinMapKey"></param>
-		/// <param name="bridge"></param>
-		public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-		{
-			var joinMap = new HdPsXxxControllerJoinMap(joinStart);
-
-			if (bridge != null)
-			{
-				bridge.AddJoinMap(Key, joinMap);
-			}
-			else
-			{
-				Debug.Console(0, this, "Please update config to use 'eiscApiAdvanced' to get all join map features for this device");
-			}
-
-			IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-			DeviceNameFeedback.LinkInputSig(trilist.StringInput[joinMap.Name.JoinNumber]);
-
-			_chassis.OnlineStatusChange += _chassis_OnlineStatusChange;
-
-			if (_chassis401 != null) LinkChassis401ToApi(trilist, joinMap);
-
-			if (_chassis621 != null) LinkChassis621ToApi(trilist, joinMap);
-
-			LinkChassisInputsToApi(trilist, joinMap);
-			LinkChassisOutputsToApi(trilist, joinMap);
-
-			trilist.OnlineStatusChange += (sender, args) =>
-			{
-				if (!args.DeviceOnLine) return;
-			};
-		}
-
-
-		// links inputs to API
-		private void LinkChassisInputsToApi(BasicTriList trilist, HdPsXxxControllerJoinMap joinMap)
-		{
-			for (uint i = 1; i <= _chassis.NumberOfInputs; i++)
-			{
-				var input = i;
-				var inputName = InputNames[input];
-				var indexWithOffset = input - 1;
-
-				trilist.SetSigTrueAction(joinMap.EnableInputHdcp.JoinNumber + indexWithOffset, () => EnableHdcp(input));
-				trilist.SetSigTrueAction(joinMap.DisableInputHdcp.JoinNumber + indexWithOffset, () => DisableHdcp(input));
-
-				InputHdcpEnableFeedback[inputName].LinkInputSig(trilist.BooleanInput[joinMap.EnableInputHdcp.JoinNumber + indexWithOffset]);
-				InputHdcpEnableFeedback[inputName].LinkComplementInputSig(trilist.BooleanInput[joinMap.EnableInputHdcp.JoinNumber + indexWithOffset]);
-
-				VideoInputSyncFeedbacks[inputName].LinkInputSig(trilist.BooleanInput[joinMap.InputSync.JoinNumber + indexWithOffset]);
-
-				InputNameFeedbacks[inputName].LinkInputSig(trilist.StringInput[joinMap.InputName.JoinNumber + indexWithOffset]);
-			}
-		}
-
-
-		// links outputs to API
-		private void LinkChassisOutputsToApi(BasicTriList trilist, HdPsXxxControllerJoinMap joinMap)
-		{
-			for (uint i = 1; i <= _chassis.NumberOfOutputs; i++)
-			{
-				var output = i;
-				var outputName = OutputNames[output];
-				var indexWithOffset = output - 1;
-
-				trilist.SetUShortSigAction(joinMap.OutputRoute.JoinNumber + indexWithOffset, (a) =>
-					ExecuteNumericSwitch(a, (ushort) output, eRoutingSignalType.AudioVideo));
-
-				OutputNameFeedbacks[outputName].LinkInputSig(trilist.StringInput[joinMap.OutputName.JoinNumber + indexWithOffset]);
-				OutputRouteNameFeedback[outputName].LinkInputSig(trilist.StringInput[joinMap.OutputRoutedName.JoinNumber + indexWithOffset]);
-
-				VideoOutputRouteFeedbacks[outputName].LinkInputSig(trilist.UShortInput[joinMap.OutputRoute.JoinNumber + indexWithOffset]);
-			}
-		}
-
-
-		// links HdPs401 chassis to API
-		private void LinkChassis401ToApi(BasicTriList trilist, HdPsXxxControllerJoinMap joinMap)
-		{
-			trilist.SetSigTrueAction(joinMap.EnableAutoRoute.JoinNumber, () => _chassis401.AutoRouteOn());
-			trilist.SetSigFalseAction(joinMap.EnableAutoRoute.JoinNumber, () => _chassis401.AutoRouteOff());
-
-			AutoRouteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableAutoRoute.JoinNumber]);
-		}
-
-
-		// links HdPs621 chassis to API
-		private void LinkChassis621ToApi(BasicTriList trilist, HdPsXxxControllerJoinMap joinMap)
-		{
-			trilist.SetSigTrueAction(joinMap.EnableAutoRoute.JoinNumber, () => _chassis621.AutoRouteOn());
-			trilist.SetSigFalseAction(joinMap.EnableAutoRoute.JoinNumber, () => _chassis621.AutoRouteOff());
-
-			AutoRouteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableAutoRoute.JoinNumber]);
-		}
-
-
-		#endregion
-
-
-		/// <summary>
-		/// Executes a device switch using objects
-		/// </summary>
-		/// <param name="inputSelector"></param>
-		/// <param name="outputSelector"></param>
-		/// <param name="signalType"></param>
-		public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
-		{
-			var input = inputSelector as HdPsXxxHdmiInput;
-			var output = outputSelector as HdPsXxxHdmiOutput;
-
-			Debug.Console(2, this, "ExecuteSwitch: input={0}, output={1}", input, output);
-
-			if (output == null)
-			{
-				Debug.Console(0, this, "Unable to make switch, output selector is not HdPsXxxHdmiOutput");
-				return;
-			}
-
-			// TODO [ ] Validate if sending the same input toggles the switch
-			var current = output.VideoOut;
-			if (current != input)
-				output.VideoOut = input;
-		}
-
-
-		/// <summary>
-		/// Executes a device switch using numeric values
-		/// </summary>
-		/// <param name="inputSelector"></param>
-		/// <param name="outputSelector"></param>
-		/// <param name="signalType"></param>
-		public void ExecuteNumericSwitch(ushort inputSelector, ushort outputSelector, eRoutingSignalType signalType)
-		{
-			var input = inputSelector == 0 ? null : _chassis.Inputs[inputSelector];
-			var output = _chassis.Outputs[outputSelector];
-
-			Debug.Console(2, this, "ExecuteNumericSwitch: input={0}, output={1}", input, output);
-
-			ExecuteSwitch(input, output, signalType);
-		}
-
-
-		/// <summary>
-		/// Enables Hdcp on the provided port
-		/// </summary>
-		/// <param name="port"></param>
-		public void EnableHdcp(uint port)
-		{
-			if (port <= 0 || port > _chassis.NumberOfInputs) return;
-
-			_chassis.HdmiInputs[port].InputPort.HdcpSupportOn();
-			InputHdcpEnableFeedback[InputNames[port]].FireUpdate();
-		}
-
-
-		/// <summary>
-		/// Disables Hdcp on the provided port
-		/// </summary>
-		/// <param name="port"></param>
-		public void DisableHdcp(uint port)
-		{
-			if (port <= 0 || port > _chassis.NumberOfInputs) return;
-
-			_chassis.HdmiInputs[port].InputPort.HdcpSupportOff();
-			InputHdcpEnableFeedback[InputNames[port]].FireUpdate();
-		}
-
-
-		/// <summary>
-		/// Enables switcher auto route
-		/// </summary>
-		public void EnableAutoRoute()
-		{
-			if (_chassis.NumberOfInputs != 1) return;
-
-			if (_chassis401 != null)
-			{
-				_chassis401.AutoRouteOn();
-			}
-
-			if (_chassis621 != null)
-			{
-				_chassis621.AutoRouteOn();
-			}
-		}
-
-
-		/// <summary>
-		/// Disables switcher auto route
-		/// </summary>
-		public void DisableAutoRoute()
-		{
-			if (_chassis.NumberOfInputs != 1) return;
-
-			if (_chassis401 != null)
-			{
-				_chassis401.AutoRouteOff();
-			}
-
-			if (_chassis621 != null)
-			{
-				_chassis621.AutoRouteOff();
-			}
-		}
-
-		#region Events		
-
-
-		// _chassis online/offline event
-		private void _chassis_OnlineStatusChange(GenericBase currentDevice,
-			OnlineOfflineEventArgs args)
-		{
-			IsOnline.FireUpdate();
-
-			if (!args.DeviceOnLine) return;
-
-			foreach (var feedback in Feedbacks)
-			{
-				feedback.FireUpdate();
-			}
-		}
-
-
-		// _chassis input change event
-		private void _chassis_InputChange(Switch device, DMInputEventArgs args)
-		{
-			var eventId = args.EventId;
-
-			switch (eventId)
-			{
-				case DMInputEventIds.VideoDetectedEventId:
-				{
-					Debug.Console(1, this, "Event ID {0}: Updating VideoInputSyncFeedbacks", eventId);
-					foreach (var item in VideoInputSyncFeedbacks)
-					{
-						item.FireUpdate();
-					}
-					break;
-				}
-				case DMInputEventIds.InputNameFeedbackEventId:
-				case DMInputEventIds.InputNameEventId:
-				case DMInputEventIds.NameFeedbackEventId:
-				{
-					Debug.Console(1, this, "Event ID {0}: Updating name feedbacks", eventId);
-
-					var input = args.Number;
-					var name = _chassis.HdmiInputs[input].NameFeedback.StringValue;
-
-					Debug.Console(1, this, "Input {0} Name {1}", input, name);
-					break;
-				}
-				default:
-				{
-					Debug.Console(1, this, "Uhandled DM Input Event ID {0}", eventId);
-					break;
-				}
-			}
-		}
-
-
-		// _chassis output change event
-		private void _chassis_OutputChange(Switch device, DMOutputEventArgs args)
-		{
-			if (args.EventId != DMOutputEventIds.VideoOutEventId) return;
-
-			var output = args.Number;
-
-			var input = _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback == null
-				? 0
-				: _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback.Number;
-
-			var outputName = OutputNames[output];
-
-			var feedback = VideoOutputRouteFeedbacks[outputName];
-			if (feedback == null) return;
-
-			var inputPort = InputPorts.FirstOrDefault(
-				p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback);
-
-			var outputPort = OutputPorts.FirstOrDefault(
-				p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output]);
-
-			feedback.FireUpdate();
-
-			OnSwitchChange(new RoutingNumericEventArgs(
-				output, input, outputPort, inputPort, eRoutingSignalType.AudioVideo));
-		}
-
-
-		/// <summary>
-		/// Raise an event when the status of a switch object changes.
-		/// </summary>
-		/// <param name="args">Argumetns defined as IKeyName sender, output, input, & eRoutingSignalType</param>
-		private void OnSwitchChange(RoutingNumericEventArgs args)
-		{
-			var newEvent = NumericSwitchChange;
-			if (newEvent != null) newEvent(this, args);
-		}
-
-
-		#endregion
-
-
-		#region FeedbacksAndFeedbackCollections
-
-
-		/// <summary>
-		/// Add feedback colleciton arrays to feedback collections 
-		/// </summary>
-		/// <param name="feedbackCollections">BoolFeedback[] arrays</param>
-		public void AddCollectionsToList(params FeedbackCollection<BoolFeedback>[] feedbackCollections)
-		{
-			foreach (var item in feedbackCollections.SelectMany(feedbackCollection => feedbackCollections))
-			{
-				AddCollectionsToList(item);
-			}
-		}
-
-
-		/// <summary>
-		/// Add feedback colleciton arrays to feedback collections 
-		/// </summary>
-		/// <param name="feedbackCollections">IntFeedback[] arrays</param>
-		public void AddCollectionsToList(params FeedbackCollection<IntFeedback>[] feedbackCollections)
-		{
-			foreach (var item in feedbackCollections.SelectMany(feedbackCollection => feedbackCollections))
-			{
-				AddCollectionsToList(item);
-			}
-		}
-
-
-		/// <summary>
-		/// Add feedback colleciton arrays to feedback collections 
-		/// </summary>
-		/// <param name="feedbackCollections">StringFeedback[] arrays</param>
-		public void AddCollectionsToList(params FeedbackCollection<StringFeedback>[] feedbackCollections)
-		{
-			foreach (var item in feedbackCollections.SelectMany(feedbackCollection => feedbackCollections))
-			{
-				AddCollectionsToList(item);
-			}
-		}
-
-
-		/// <summary>
-		/// Adds feedback colleciton to feedback collections
-		/// </summary>
-		/// <param name="feedbackCollection">BoolFeedback</param>
-		public void AddCollectionToList(FeedbackCollection<BoolFeedback> feedbackCollection)
-		{
-			foreach (var item in feedbackCollection.Where(item => item != null))
-			{
-				AddFeedbackToList(item);
-			}
-		}
-
-
-		/// <summary>
-		/// Adds feedback colleciton to feedback collections
-		/// </summary>
-		/// <param name="feedbackCollection">IntFeedback</param>
-		public void AddCollectionToList(FeedbackCollection<IntFeedback> feedbackCollection)
-		{
-			foreach (var item in feedbackCollection.Where(item => item != null))
-			{
-				AddFeedbackToList(item);
-			}
-		}
-
-
-		/// <summary>
-		/// Adds feedback colleciton to feedback collections
-		/// </summary>
-		/// <param name="feedbackCollection">StringFeedback</param>
-		public void AddCollectionToList(FeedbackCollection<StringFeedback> feedbackCollection)
-		{
-			foreach (var item in feedbackCollection.Where(item => item != null))
-			{
-				AddFeedbackToList(item);
-			}
-		}
-
-
-		/// <summary>
-		/// Adds individual feedbacks to feedback collection
-		/// </summary>
-		/// <param name="fb">Feedback</param>
-		public void AddFeedbackToList(PepperDash.Essentials.Core.Feedback fb)
-		{
-			if (fb == null || Feedbacks.Contains(fb)) return;
-
-			Feedbacks.Add(fb);
-		}
-
-
-		/// <summary>
-		/// Adds provided feedbacks to feedback collection list
-		/// </summary>
-		public void AddFeedbackCollecitons()
-		{
-			AddFeedbackToList(DeviceNameFeedback);
-			AddCollectionsToList(VideoInputSyncFeedbacks, InputHdcpEnableFeedback);
-			AddCollectionsToList(VideoOutputRouteFeedbacks);
-			AddCollectionsToList(InputNameFeedbacks, OutputNameFeedbacks, OutputRouteNameFeedback);
-		}
-
-
-		#endregion
-
-
-		#region Factory
-
-
-		public class HdSp401ControllerFactory : EssentialsDeviceFactory<HdPsXxxController>
-		{
-			public HdSp401ControllerFactory()
-			{
-				TypeNames = new List<string>() { "hdsp401", "hdsp402", "hdsp621", "hdsp622" };
-			}
-			public override EssentialsDevice BuildDevice(DeviceConfig dc)
-			{
-				Debug.Console(1, "Factory Attempting to create new HD-PSXxx device");
-
-				var props = JsonConvert.DeserializeObject<HdPsXxxPropertiesConfig>(dc.Properties.ToString());
-				if (props == null)
-				{
-					Debug.Console(1, "Factory failed to create new HD-PSXxx device, properties config was null");
-					return null;
-				}
-
-				var key = dc.Key;
-				var name = dc.Name;
-				var type = dc.Type.ToLower();
-				var control = props.Control;
-				var ipid = control.IpIdInt;
-				var address = control.TcpSshProperties.Address;
-
-				switch (type)
-				{
-					case ("hdps401"):
-						{
-							return new HdPsXxxController(key, name, new HdPs401(ipid, Global.ControlSystem), props);
-						}
-					case ("hdsp402"):
-						{
-							return new HdPsXxxController(key, name, new HdPs402(ipid, Global.ControlSystem), props);
-						}
-					case ("hdsp621"):
-						{
-							return new HdPsXxxController(key, name, new HdPs621(ipid, Global.ControlSystem), props);
-						}
-					case ("hdsp622"):
-						{
-							return new HdPsXxxController(key, name, new HdPs622(ipid, Global.ControlSystem), props);
-						}
-					default:
-						{
-							Debug.Console(1, "Factory failed to create new {0} device", type);
-							return null;
-						}
-				}
-			}
-		}
-
-
-		#endregion
-	}
-}

essentials-framework/Essentials DM/Essentials_DM/Config/HdPsXxxPropertiesConfig.cs

@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using PepperDash.Core;
-
-namespace PepperDash_Essentials_DM.Config
-{
-	public class HdPsXxxPropertiesConfig
-	{
-		[JsonProperty("control")]
-		public ControlPropertiesConfig Control { get; set; }
-
-		[JsonProperty("inputs")]
-		public Dictionary<uint, string> Inputs { get; set; } 
-
-		[JsonProperty("outputs")]
-		public Dictionary<uint, string> Outputs { get; set; } 
-	}
-}

essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj

@@ -104,8 +104,6 @@
     <Compile Include="Chassis\HdMd8xNController.cs" />
     <Compile Include="Chassis\HdMdNxM4kEBridgeableController.cs" />
     <Compile Include="Chassis\HdMdNxM4kEController.cs" />
-    <Compile Include="Chassis\HdPsXxxController.cs" />
-    <Compile Include="Config\HdPsXxxPropertiesConfig.cs" />
     <Compile Include="Config\InputPropertiesConfig.cs" />
     <Compile Include="Endpoints\EndpointInterfaces.cs" />
     <Compile Include="Endpoints\DGEs\DgeJoinMap.cs" />