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

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
+                SetupScreenSaver(room, mainDriver);
-
-                mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, _config);
 
                 // 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");
+                Debug.Console(0, this, "Adding huddle space VTC AV driver");
-
+
-                // Screen Saver Driver
+                SetupScreenSaver(room, mainDriver);
-                mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, _config);
 
                 // 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;
 				}				
@@ -117,37 +126,39 @@ namespace PepperDash.Essentials.Core
         {
             var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
 
-			Debug.Console(0, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null 
+            if (dev != null)
-				? "is not valid, failed to create build cec port"
+            {
-				: "found in device manager, attempting to build cec port");
+                if (!String.IsNullOrEmpty(config.ControlPortName))
+                {
 
-	        if (dev == null)
+                    var inputPort = (dev as IRoutingInputsOutputs).InputPorts[config.ControlPortName];
-		        return null;
 
-	        if (String.IsNullOrEmpty(config.ControlPortName))
+                    if (inputPort != null)
-	        {
+                    {
-		        Debug.Console(0, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
+                        if (inputPort.Port is ICec)
-		        return null;
+                            return inputPort.Port as ICec;
-	        }
+                    }
 
-			var inputPort = (dev as IRoutingInputsOutputs).InputPorts[config.ControlPortName];
+                    var outputPort = (dev as IRoutingInputsOutputs).OutputPorts[config.ControlPortName];
-			if (inputPort != null)
-			{
-				if (inputPort.Port is ICec)
-					return inputPort.Port as ICec;
-			}
 
-			var outputPort = (dev as IRoutingInputsOutputs).OutputPorts[config.ControlPortName];
+                    if (outputPort != null)
-			if (outputPort != null)
+                    {
-			{
+                        if (outputPort.Port is ICec)
-				if (outputPort.Port is ICec)
+                            return outputPort.Port as ICec;
-					return outputPort.Port as ICec;
+                    }
-			}
 
-			Debug.Console(0, "GetCecPort: Device '{0}' does not have a CEC port called: '{1}'",
+                    else
-					config.ControlPortDevKey, config.ControlPortName);
+                        Debug.Console(0, "GetCecPort: Device '{0}' does not have a CEC port called: '{1}'",
+                            config.ControlPortDevKey, config.ControlPortName);
+                }
+                else
+                {
+                    Debug.Console(0, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
+                }
+            }
+            Debug.Console(0, "GetCecPort: Device '{0}' is not a valid device.", config.ControlPortDevKey);
 
-	        return null;
+            return null;
         }
 
 		/// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Device Info/NetworkDeviceHelpers.cs

@@ -1,218 +0,0 @@
-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;
-        }
-    }
-}

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/Extensions/StringExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,70 +8,17 @@ 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);
-        }
-
     }
 }

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();
+                        if (occupancyRoom.OccupancyStatusProviderIsRemote)
-                    }
+                        {
-                    else
+                            SetUpRemoteOccupancy();
-                    {
+                        }
-                        SetUpLocalOccupancy();
+                        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" />
@@ -201,7 +200,6 @@
     <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" />

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
+                    var essentialsRoom = Room as IEssentialsRoom;
-                    if (!Room.OnFeedback.BoolValue)
+
-                    {
+                    if (essentialsRoom != null) {
-                        Debug.Console(1, this, "Powering Room on to default source");
+                        if (!essentialsRoom.OnFeedback.BoolValue)
-                        Room.RunDefaultPresentRoute();
+                        {
+                            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; }
+        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; }
@@ -35,31 +30,16 @@ 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; }
 
-        eVacancyMode VacancyMode { get; }
+        void StartShutdown(eShutdownType type);        
 
-        bool ZeroVolumeWhenSwtichingVolumeDevices { get; }
+        void Shutdown();        
 
-        void StartShutdown(eShutdownType type);
+        void PowerOnToDefaultOrLastSource();               
-        void StartRoomVacancyTimer(eVacancyMode mode);
-
-        void Shutdown();
-
-        void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes);
-
-        void PowerOnToDefaultOrLastSource();
-
-        void SetDefaultLevels();
-
-        void RoomVacatedForTimeoutPeriod(object o);
     }
 
 }

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/Routing/RoutingInterfaces.cs

@@ -204,11 +204,4 @@ namespace PepperDash.Essentials.Core
             SigType = sigType;
         }
     }
-
-	public interface IRoutingSyncProvider
-	{
-		event RoutingSyncProviderDelegate SyncChanged;
-	}
-
-	public delegate void RoutingSyncProviderDelegate(uint inputNumber, bool hasSync);
 }

essentials-framework/Essentials 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, UsbC, HdBaseT
+		Composite, Component, DmCat, DmMmFiber, DmSmFiber, Speaker, Streaming
 	}
 
 	/// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingPortNames.cs

@@ -199,45 +199,5 @@ 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";
-    }
 }

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

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Globalization;
 using Crestron.SimplSharpPro;
 using Newtonsoft.Json;
@@ -28,7 +27,6 @@ namespace PepperDash.Essentials.Core.Touchpanels
 			}
 
 			_touchpanel.ButtonStateChange += _touchpanel_ButtonStateChange;
-
 			_buttons = buttons;
 			if (_buttons == null)
 			{
@@ -57,8 +55,6 @@ namespace PepperDash.Essentials.Core.Touchpanels
 		/// <param name="config"></param>
 		public void InitializeButton(string key, KeypadButton config)
 		{
-			Debug.Console(1, this, "Initializing button '{0}'...", key);
-
 			if (config == null)
 			{
 				Debug.Console(1, this, "Button '{0}' config is null, unable to initialize", key);
@@ -135,8 +131,6 @@ namespace PepperDash.Essentials.Core.Touchpanels
 		/// <param name="config"></param>
 		public void InitializeButtonFeedback(string key, KeypadButton config)
 		{
-			Debug.Console(1, this, "Initializing button '{0}' feedback...", key);
-
 			if (config == null)
 			{
 				Debug.Console(1, this, "Button '{0}' config is null, unable to initialize feedback", key);
@@ -150,61 +144,37 @@ namespace PepperDash.Essentials.Core.Touchpanels
 			var buttonFeedback = config.Feedback;
 			if (buttonFeedback == null)
 			{
-				Debug.Console(1, this, "Button '{0}' feedback not configured and will not be implemented. If feedback is required, verify configuration.", 
+				Debug.Console(1, this, "Button '{0}' feedback not configured and will not be implemented. Verify feedback is configured if required.", key);
-					key);
 				return;
 			}
 
-			Feedback deviceFeedback;
+			var device = DeviceManager.GetDeviceForKey(buttonFeedback.DeviceKey) as Device;
-
+			if (device == null)
-			try
 			{
-				var device = DeviceManager.GetDeviceForKey(buttonFeedback.DeviceKey) as Device;
+				Debug.Console(1, this, "Button '{0}' feedback device with key '{0}' not found, feedback will not be implemented.  Verify feedback deviceKey is properly configured.",
-				if (device == null)
+					buttonFeedback.DeviceKey);
-				{
-					Debug.Console(1, this, "Button '{0}' feedback with deviceKey '{1}' not found, feedback will not be implemented.  Verify feedback deviceKey is properly configured.",
-						key, buttonFeedback.DeviceKey);
-					return;
-				}
-				
-				deviceFeedback = device.GetFeedbackProperty(buttonFeedback.FeedbackName);
-				if (deviceFeedback == null)
-				{
-					Debug.Console(1, this, "Button '{0}' feedback failed to get feedback property for '{1}', feedback will not be implemented.  Verify feedback deviceKey is properly configured.",
-						key, buttonFeedback.FeedbackName);
-					return;
-				}
-
-				// TODO [ ] verify if this can replace the current method
-				//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;
-				//    }
-				//}
-			}
-			catch (Exception ex)
-			{
-				Debug.Console(0, this, "Failed to initialize button '{0}' feedback with deviceKey '{1}'. If feedback is required, verify configuration.",
-						key, buttonFeedback.DeviceKey);
-
-				Debug.Console(1, this, "InitializeButtonFeedback Exception Message: {0}", ex.Message);
-				Debug.Console(2, this, "InitializeButtonFeedback Exception StackTrace: {0}", ex.StackTrace);
-				if (ex.InnerException != null) Debug.Console(2, this, "InitializeButtonFeedback Exception InnerExceptioni: {0}", ex.InnerException);
-
 				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;
 

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

@@ -1,565 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-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
-	{
-		private readonly HdPsXxx _chassis;
-		//private byte[] _inputPriorityParams;
-
-		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;
-		public event EventHandler<DMInputEventArgs> DmInputChange;
-
-		/// <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 = chassis;
-			Name = name;
-
-			if (props == null)
-			{
-				Debug.Console(1, this, "HdPsXxxController properties are null, failed to build device");
-				return;
-			}
-
-			InputPorts = new RoutingPortCollection<RoutingInputPort>();
-			InputNameFeedbacks = new FeedbackCollection<StringFeedback>();
-			InputHdcpEnableFeedback = new FeedbackCollection<BoolFeedback>();
-			InputNames = new Dictionary<uint, string>();
-
-			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-			OutputNameFeedbacks = new FeedbackCollection<StringFeedback>();
-			OutputRouteNameFeedback = new FeedbackCollection<StringFeedback>();
-			OutputNames = new Dictionary<uint, string>();
-
-			VideoInputSyncFeedbacks = new FeedbackCollection<BoolFeedback>();
-			VideoOutputRouteFeedbacks = new FeedbackCollection<IntFeedback>();
-
-			if (_chassis.NumberOfOutputs == 1)
-				AutoRouteFeedback = new BoolFeedback(() => _chassis.PriorityRouteOnFeedback.BoolValue);
-
-			//if (props.InputPriorities != null)
-			//{
-			//    _inputPriorityParams = new byte[_chassis.NumberOfInputs];
-			//    _inputPriorityParams = GetInputPriorities(props);
-			//}
-
-			InputNames = props.Inputs;
-			SetupInputs(InputNames);
-
-			OutputNames = props.Outputs;
-			SetupOutputs(OutputNames);
-		}
-
-		// get input priorities
-		private byte[] GetInputPriorities(HdPsXxxPropertiesConfig props)
-		{
-			throw new NotImplementedException();
-		}
-
-		// input setup
-		private void SetupInputs(Dictionary<uint, string> dict)
-		{
-			if (dict == null)
-			{
-				Debug.Console(1, this, "Failed to setup inputs, properties are null");
-				return;
-			}
-			foreach (var kvp in dict)
-			{
-				Debug.Console(1, this, "props.Input[{0}]: {1}", kvp.Key, kvp.Value);
-			}
-
-			foreach (var item in _chassis.HdmiInputs)
-			{
-				var input = item;
-				var index = item.Number;
-				var key = string.Format("hdmiIn{0}", index);
-				var name = string.IsNullOrEmpty(InputNames[index]) ? string.Format("HDMI Input {0}", index) : InputNames[index];
-
-				InputNameFeedbacks.Add(new StringFeedback(name, () => InputNames[index]));
-
-				var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this)
-				{
-					FeedbackMatchObject = input
-				};
-				Debug.Console(1, this, "Adding Input port: {0}", port.Key);
-				InputPorts.Add(port);
-
-				InputHdcpEnableFeedback.Add(new BoolFeedback(name, () => input.InputPort.HdcpSupportOnFeedback.BoolValue));
-
-				VideoInputSyncFeedbacks.Add(new BoolFeedback(name, () => input.VideoDetectedFeedback.BoolValue));
-			}
-
-			foreach (var item in _chassis.DmLiteInputs)
-			{
-				var input = item;
-				var index = item.Number;
-				var key = string.Format("dmLiteIn{0}", index);
-				var name = string.IsNullOrEmpty(InputNames[index]) ? string.Format("DM Input {0}", index) : InputNames[index];
-				input.Name.StringValue = name;
-
-				InputNameFeedbacks.Add(new StringFeedback(name, () => InputNames[index]));
-
-				var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this)
-				{
-					FeedbackMatchObject = input
-				};
-				Debug.Console(0, this, "Adding Input port: {0}", port.Key);
-				InputPorts.Add(port);
-
-				InputHdcpEnableFeedback.Add(new BoolFeedback(name, () => input.InputPort.HdcpSupportOnFeedback.BoolValue));
-
-				VideoInputSyncFeedbacks.Add(new BoolFeedback(name, () => input.VideoDetectedFeedback.BoolValue));
-			}
-
-			_chassis.DMInputChange += _chassis_InputChange;
-		}
-
-		// output setup
-		private void SetupOutputs(Dictionary<uint, string> dict)
-		{
-			if (dict == null)
-			{
-				Debug.Console(1, this, "Failed to setup outputs, properties are null");
-				return;
-			}
-			foreach (var kvp in dict)
-			{
-				Debug.Console(1, this, "props.Output[{0}]: {1}", kvp.Key, kvp.Value);
-			}
-
-			foreach (var item in _chassis.HdmiDmLiteOutputs)
-			{
-				var output = item;
-				var index = item.Number;
-				var key = string.Format("hdmiDmLiteOut{0}", index);
-				var name = string.IsNullOrEmpty(OutputNames[index]) ? string.Format("Output {0}", index) : OutputNames[index];
-				output.Name.StringValue = name;
-
-				var port = new RoutingOutputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, output, this)
-				{
-					FeedbackMatchObject = output,
-					// set port for CEC
-					Port = output
-				};
-				Debug.Console(0, this, "Adding Output port: {0}", port.Key);
-				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));
-
-				// TODO [ ] Investigate setting input priorities per output
-				// {{in1-priority-level}, {in2-priority-level}, .... {in6-priority-level}}
-				// default priority level input 1-4 ascending
-				//if (_inputPriorityParams != null && _inputPriorityParams.Count() > 0)
-				//	output.OutputPort.InputPriorities(_inputPriorityParams);
-
-				if (port.Port == null) continue;
-
-				var hdmiOutputStreamCec = output.HdmiOutput.HdmiOutputPort.StreamCec;
-				if (hdmiOutputStreamCec != null)
-				{
-					var streamCec = new StreamCecWrapper(string.Format("{0}-hdmiOut{1}-streamCec", Key, index), hdmiOutputStreamCec);
-					DeviceManager.AddDevice(streamCec);
-				}
-
-				var dmLiteOutputStreamCec = output.DmLiteOutput.DmLiteOutputPort.StreamCec;
-				if (dmLiteOutputStreamCec != null)
-				{
-					var streamCec = new StreamCecWrapper(string.Format("{0}-dmLiteOut{1}-streamCec", Key, index), dmLiteOutputStreamCec);
-					DeviceManager.AddDevice(streamCec);
-				}
-			}
-
-			_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;
-
-			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]);
-			}
-
-			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;
-
-			_chassis.AutoRouteOn();
-		}
-
-
-		/// <summary>
-		/// Disables switcher auto route
-		/// </summary>
-		public void DisableAutoRoute()
-		{
-			if (_chassis.NumberOfInputs == 1) return;
-
-			_chassis.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;
-					}
-			}
-
-			OnDmInputChange(args);
-		}
-
-
-		// _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));
-		}
-
-
-		// Raise an event when the status of a switch object changes.
-		private void OnSwitchChange(RoutingNumericEventArgs args)
-		{
-			var newEvent = NumericSwitchChange;
-			if (newEvent != null) newEvent(this, args);
-		}
-
-		// Raise an event when the DM input changes.
-		private void OnDmInputChange(DMInputEventArgs args)
-		{
-			var newEvent = DmInputChange;
-			if (newEvent != null) newEvent(this, args);
-		}
-
-
-		#endregion
-
-
-		#region Factory
-
-
-		public class HdSp401ControllerFactory : EssentialsDeviceFactory<HdPsXxxController>
-		{
-			public HdSp401ControllerFactory()
-			{
-				TypeNames = new List<string>() { "hdps401", "hdps402", "hdps621", "hdps622" };
-			}
-			public override EssentialsDevice BuildDevice(DeviceConfig dc)
-			{
-				var key = dc.Key;
-				var name = dc.Name;
-				var type = dc.Type.ToLower();
-
-				Debug.Console(1, "Factory Attempting to create new {0} device", type);
-
-				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 ipid = props.Control.IpIdInt;
-
-				switch (type)
-				{
-					case ("hdps401"):
-						{
-							return new HdPsXxxController(key, name, new HdPs401(ipid, Global.ControlSystem), props);
-						}
-					case ("hdps402"):
-						{
-							return new HdPsXxxController(key, name, new HdPs402(ipid, Global.ControlSystem), props);
-						}
-					case ("hdps621"):
-						{
-							return new HdPsXxxController(key, name, new HdPs621(ipid, Global.ControlSystem), props);
-						}
-					case ("hdps622"):
-						{
-							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
-	}
-
-
-	public class StreamCecWrapper : IKeyed, ICec
-	{
-		public string Key { get; private set; }
-		public Cec StreamCec { get; private set; }
-
-		public StreamCecWrapper(string key, Cec streamCec)
-		{
-			Key = key;
-			StreamCec = streamCec;
-		}
-	}
-}

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

@@ -1,28 +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; }
-
-		// "inputPriorities": "1,4,3,2"
-		[JsonProperty("inputPriorities")]
-		public string InputPriorities { get; set; }
-
-		public HdPsXxxPropertiesConfig()
-		{
-			Inputs = new Dictionary<uint, string>();
-			Outputs = new Dictionary<uint, string>();
-		}
-	}
-}

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" />