fix: Remove reference to DMOutput name sig

the HD-MD series of switchers appears to not populate the Name sig of the DMOutput, leading to a NullSig exception when attempting to set output names. This is probably because those names can't be set on the device itself, but some experimentation with hardware may be required to determine that completely.

.github/scripts/ZipBuildOutput.ps1

@@ -8,7 +8,6 @@ $destination = "$($Env:GITHUB_HOME)\output"
 New-Item -ItemType Directory -Force -Path ($destination)
 Get-ChildItem ($destination)
 $exclusions = @(git submodule foreach --quiet 'echo $name')
-$exclusions += "Newtonsoft.Compact.Json.dll"
 # Trying to get any .json schema files (not currently working)
 # Gets any files with the listed extensions.
 Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll", "*.nuspec" | ForEach-Object {

.github/workflows/docker.yml

@@ -8,9 +8,12 @@ on:
       - bugfix/*
       - release/*
       - development
+  pull_request:
+    branches:
+      - development
 
 env:
-  # solution path doesn't need slashes unless it is multiple folders deep
+  # solution path doesn't need slashes unless there it is multiple folders deep
   # solution name does not include extension. .sln is assumed
   SOLUTION_PATH: PepperDashEssentials
   SOLUTION_FILE: PepperDashEssentials

PepperDashEssentials/ControlSystem.cs

@@ -28,7 +28,6 @@ namespace PepperDash.Essentials
         HttpLogoServer LogoServer;
 
         private CTimer _startTimer;
-        private CEvent _initializeEvent;
         private const long StartupTime = 500;
 
         public ControlSystem()
@@ -47,24 +46,6 @@ namespace PepperDash.Essentials
         public override void InitializeSystem()
         {
             _startTimer = new CTimer(StartSystem,StartupTime);
-
-
-            // If the control system is a DMPS type, we need to wait to exit this method until all devices have had time to activate
-            // to allow any HD-BaseT DM endpoints to register first.
-            if (Global.ControlSystemIsDmpsType)
-            {
-                Debug.Console(2, "******************* InitializeSystem() Entering **********************");
-
-                _initializeEvent = new CEvent();
-
-                DeviceManager.AllDevicesActivated += (o, a) =>
-                {
-                    _initializeEvent.Set();
-                    Debug.Console(2, "******************* InitializeSystem() Exiting **********************");
-                };
-
-                _initializeEvent.Wait(30000);
-            }
         }
 
         private void StartSystem(object obj)
@@ -362,7 +343,7 @@ namespace PepperDash.Essentials
                     {
                         var prompt = Global.ControlSystem.ControllerPrompt;
 
-                        var typeMatch = String.Equals(devConf.Type, prompt, StringComparison.OrdinalIgnoreCase) ||
+                        var typeMatch = String.Equals(devConf.Type, prompt, StringComparison.OrdinalIgnoreCase) &&
                                         String.Equals(devConf.Type, prompt.Replace("-", ""), StringComparison.OrdinalIgnoreCase);
 
                         if (!typeMatch)
@@ -380,7 +361,9 @@ namespace PepperDash.Essentials
                             if(propertiesConfig == null)
                                 propertiesConfig =  new DM.Config.DmpsRoutingPropertiesConfig();
 
-                            DeviceManager.AddDevice(DmpsRoutingController.GetDmpsRoutingController("processor-avRouting", this.ControllerPrompt, propertiesConfig));
+                            var dmpsRoutingController = DmpsRoutingController.GetDmpsRoutingController("processor-avRouting", this.ControllerPrompt, propertiesConfig);
+
+                            DeviceManager.AddDevice(dmpsRoutingController);
                         }
                         else if (this.ControllerPrompt.IndexOf("mpc3", StringComparison.OrdinalIgnoreCase) > -1)
                         {
@@ -544,22 +527,13 @@ namespace PepperDash.Essentials
 
         }
 
-        private static void CreateMobileControlBridge(object room)
+        private static void CreateMobileControlBridge(IEssentialsRoom room)
         {
             var mobileControl = GetMobileControlDevice();
 
             if (mobileControl == null) return;
 
-            var mobileControl3 = mobileControl as IMobileControl3;
-
-            if (mobileControl3 != null)
-            {
-                mobileControl3.CreateMobileControlRoomBridge(room as IEssentialsRoom, mobileControl);
-            }
-            else
-            {
-                mobileControl.CreateMobileControlRoomBridge(room as EssentialsRoomBase, mobileControl);
-            }
+            mobileControl.CreateMobileControlRoomBridge(room, mobileControl);
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control Bridge Added...");
         }

PepperDashEssentials/Example Configuration/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json

@@ -88,7 +88,7 @@
             {
                 "name": "Wireless Video",
                 "key": "wePresent-1",
-                "type": "genericSource",
+                "type": "wePresent",
                 "group": "genericSource",
                 "uid": 9,
                 "properties": {

PepperDashEssentials/Example Configuration/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json

@@ -114,7 +114,7 @@
             {
                 "name": "Wireless Video",
                 "key": "wePresent-1",
-                "type": "genericSource",
+                "type": "wePresent",
                 "properties": {},
                 "group": "genericSource",
                 "uid": 3

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -147,24 +147,6 @@ namespace PepperDash.Essentials.Room.Config
 		[JsonProperty("helpMessage")]
 		public string HelpMessage { get; set; }
 
-        /// <summary>
-        /// Read this value to get the help message.  It checks for the old and new config format.
-        /// </summary>
-        public string HelpMessageForDisplay
-        {
-            get
-            {
-                if(Help != null && !string.IsNullOrEmpty(Help.Message))
-                {
-                    return Help.Message;
-                }
-                else
-                {
-                    return HelpMessage; 
-                }
-            }
-        }
-
 		[JsonProperty("environment")]
 		public EssentialsEnvironmentPropertiesConfig Environment { get; set; }
 

PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs

@@ -207,7 +207,7 @@ namespace PepperDash.Essentials
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -215,7 +215,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void InitializeRoom()
+        void Initialize()
         {
             if (DefaultAudioDevice is IBasicVolumeControls)
                 DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -156,7 +156,7 @@ namespace PepperDash.Essentials
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IRoutingSinkWithSwitching;
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -164,7 +164,7 @@ namespace PepperDash.Essentials
             }
         }
 
-		void InitializeRoom()
+		void Initialize()
 		{
             if (DefaultAudioDevice is IBasicVolumeControls)
                 DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
@@ -202,28 +202,11 @@ namespace PepperDash.Essentials
                 };
             }
 
-            SetupEnvironmentalControlDevices();
-
             SetSourceListKey();
           
 			EnablePowerOnToLastSource = true;
    		}
 
-        private void SetupEnvironmentalControlDevices()
-        {
-            if (PropertiesConfig.Environment != null)
-            {
-                if (PropertiesConfig.Environment.Enabled)
-                {
-                    foreach (var d in PropertiesConfig.Environment.DeviceKeys)
-                    {
-                        var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
-                        EnvironmentalControlDevices.Add(envDevice);
-                    }
-                }
-            }
-        }
-
         private void SetSourceListKey()
         {
             if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -217,10 +217,7 @@ namespace PepperDash.Essentials
 				
 
                 if (VideoCodec == null)
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "No Video Codec set.  Please check 'videoCodecKey' property in room config");
-                    throw new ArgumentNullException("VideoCodec cannot be null");
-                }
+                    throw new ArgumentNullException("codec cannot be null");
 				
                 AudioCodec = DeviceManager.GetDeviceForKey(PropertiesConfig.AudioCodecKey) as
                     PepperDash.Essentials.Devices.Common.AudioCodec.AudioCodecBase;
@@ -228,13 +225,8 @@ namespace PepperDash.Essentials
                     Debug.Console(0, this, "No Audio Codec Found");
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
-                if (DefaultAudioDevice == null)
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "No Default Audio Device set.  Please check 'defaultAudioKey' property in room config");
-                    throw new ArgumentNullException("DefaultAudioDevice cannot be null");
-                }
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -242,7 +234,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void InitializeRoom()
+        void Initialize()
 		{
             try
             {
@@ -334,8 +326,6 @@ namespace PepperDash.Essentials
 
                 CallTypeFeedback = new IntFeedback(() => 0);
 
-                SetupEnvironmentalControlDevices();
-
                 SetSourceListKey();
 
                 EnablePowerOnToLastSource = true;
@@ -346,21 +336,6 @@ namespace PepperDash.Essentials
             }
    		}
 
-        private void SetupEnvironmentalControlDevices()
-        {
-            if (PropertiesConfig.Environment != null)
-            {
-                if (PropertiesConfig.Environment.Enabled)
-                {
-                    foreach (var d in PropertiesConfig.Environment.DeviceKeys)
-                    {
-                        var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
-                        EnvironmentalControlDevices.Add(envDevice);
-                    }
-                }
-            }
-        }
-
 
         private void SetSourceListKey()
         {
@@ -444,14 +419,6 @@ namespace PepperDash.Essentials
         /// <returns></returns>
         public bool RunDefaultCallRoute()
         {
-            Debug.Console(2, this, "RunDefaultCallRoute() Currently Sharing Content: {0}", VideoCodec.SharingContentIsOnFeedback.BoolValue); 
-
-            if (VideoCodec.SharingContentIsOnFeedback.BoolValue)
-            {
-                Debug.Console(2, this, "Currently sharing content.  Ignoring request to run default call route.");
-                return false;
-            }
-
             RunRouteAction(DefaultCodecRouteString);
             return true;
         }
@@ -487,8 +454,7 @@ namespace PepperDash.Essentials
             else
             {
                 Debug.Console(1, this, "sourceListKey present but not yet implemented");
-
-                RunRouteAction(routeKey, new Action(() => { }));
+                throw new NotImplementedException();
             }
         }
 
@@ -505,11 +471,7 @@ namespace PepperDash.Essentials
                 RunRouteAction(routeKey, successCallback);
             }
             else
-            {
-                Debug.Console(1, this, "sourceListKey present but not yet implemented");
-
-                RunRouteAction(routeKey, successCallback);
-            }
+                throw new NotImplementedException();
         }
 
 		/// <summary>

PepperDashEssentials/Room/Types/EssentialsTechRoom.cs

@@ -375,7 +375,7 @@ Params: {2}"
             {
                 bridge.AddJoinMap(Key, joinMap);
             }
-
+            uint i;
             if (_config.IsPrimary)
             {
                 Debug.Console(1, this, "Linking Primary system Tuner Preset Mirroring");

PepperDashEssentials/Room/Types/IEssentialsHuddleSpaceRoom.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Core.Devices;
-using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Devices.Common.AudioCodec;
-
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials
-{
-    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IHasDefaultDisplay
-    {
-        bool ExcludeFromGlobalFunctions { get; }
-
-        void RunRouteAction(string routeKey);
-
-        EssentialsHuddleRoomPropertiesConfig PropertiesConfig { get; }
-
-        IBasicVolumeControls CurrentVolumeControls { get; }
-
-        event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-    }
-
-    public interface IEssentialsHuddleVtc1Room : IEssentialsRoom, IHasCurrentSourceInfoChange,
-        IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay
-    {
-        EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; }
-
-        void RunRouteAction(string routeKey);
-
-        IHasScheduleAwareness ScheduleSource { get; }
-
-        string DefaultCodecRouteString { get; }
-    }
-}

PepperDashEssentials/UI/EssentialsTouchpanelController.cs

@@ -213,7 +213,7 @@ namespace PepperDash.Essentials
     {
         public EssentialsTouchpanelControllerFactory()
         {
-            TypeNames = new List<string>() { "crestronapp", "tsw550", "tsw750", "tsw1050", "tsw560", "tsw760", "tsw1060", "tsw570", "tsw770", "ts770", "tsw1070", "ts1070", "xpanel" };
+            TypeNames = new List<string>() { "tsw550", "tsw750", "tsw1050", "tsw560", "tsw760", "tsw1060", "tsw570", "tsw770", "ts770", "tsw1070", "ts1070", "xpanel" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -49,16 +49,6 @@ namespace PepperDash.Essentials
 		/// 1006
 		/// </summary>
 		public const uint CallEndAllConfirmVisible = 1006;
-        /// <summary>
-        /// 1007
-        /// </summary>
-        public const uint MeetingPasswordVisible = 1007;
-        /// <summary>
-        /// 1008
-        /// </summary>
-        public const uint MeetingLeavePress = 1008;
-
-
 
 
 
@@ -113,7 +103,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// 1202
         /// </summary>
-        public const uint VCStagingInactivePopoverWithRecentsVisible = 1202;
+        public const uint VCStagingInactivePopoverVisible = 1202;
         /// <summary>
         /// 
         /// </summary>
@@ -131,11 +121,6 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint VCRecentsVisible = 1206;
 
-        /// <summary>
-        /// 1202
-        /// </summary>
-        public const uint VCStagingInactivePopoverWithoutRecentsVisible = 1207;
-
 		/// <summary>
 		/// 1208
 		/// </summary>
@@ -163,11 +148,6 @@ namespace PepperDash.Essentials
         public const uint VCFavoriteVisibleStart = 1221;
         //									RANGE IN USE
         public const uint VCFavoriteVisibleEnd = 1225;
-
-        /// <summary>
-        /// 1230
-        /// </summary>
-        public const uint VCStagingMeetNowPress = 1230;
         /// <summary>
         /// 1231
         /// </summary>
@@ -263,10 +243,6 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint VCCameraSelectBarWithoutModeVisible = 1261;
 
-        /// <summary>
-        /// 1262
-        /// </summary>
-        public const uint VCCameraAutoModeIsOnFb = 1262;
 
         /// <summary>
         /// 1271
@@ -768,9 +744,9 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint SourceBackgroundOverlayClosePress = 15044;
         /// <summary>
-        /// 15045
+        /// 15045 - Visibility for the bar containing call navigation button list
         /// </summary>
-        public const uint ZoomRoomContentSharingVisible = 15045;
+        public const uint CallStagingBarVisible = 15045;
 		/// <summary>
 		/// 15046
 		/// </summary>
@@ -859,11 +835,6 @@ namespace PepperDash.Essentials
         /// 15067
         /// </summary>
         public const uint NotificationRibbonVisible = 15067;
-        /// <summary>
-        /// 15068
-        /// </summary>
-        public const uint HeaderMeetingInfoVisible = 15068;
-
         /// <summary>
         /// 15083 - Press for Call help desk on AC/VC
         /// </summary>
@@ -968,24 +939,5 @@ namespace PepperDash.Essentials
         /// 15214
         /// </summary>
         public const uint PinDialogDot4 = 15214;
-
-        //  Password Prompt Dialog **************************
-
-        /// <summary>
-        /// 15301
-        /// </summary>
-        public const uint PasswordPromptDialogVisible = 15301;
-        /// <summary>
-        /// 15302
-        /// </summary>
-        public const uint PasswordPromptTextPress = 15302;
-        /// <summary>
-        /// 15306
-        /// </summary>
-        public const uint PasswordPromptCancelPress = 15306;
-        /// <summary>
-        /// 15307
-        /// </summary>
-        public const uint PasswordPromptErrorVisible = 15307;
     }
 }

PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs

@@ -27,33 +27,6 @@ namespace PepperDash.Essentials
         /// 1004
         /// </summary>
         public const uint CallSharedSourceNameText = 1004;
-        /// <summary>
-        /// 1005
-        /// </summary>
-        public const uint MeetingIdText = 1005;
-        /// <summary>
-        /// 1006
-        /// </summary>
-        public const uint MeetingHostText = 1006;
-        /// <summary>
-        /// 1007
-        /// </summary>
-        public const uint MeetingPasswordText = 1007;
-        /// <summary>
-        /// 1008
-        /// </summary>
-        public const uint MeetingLeaveText = 1008;
-        /// <summary>
-        /// 1009
-        /// </summary>
-        public const uint MeetingNameText = 1009;
-
-	    ///<summary>
-	    /// 1240 - Used to determine text for meeting start button
-	    ///</summary>
-	    public const uint MeetingStartButtonText = 1240;
-
-
 
 
         /// <summary>
@@ -145,14 +118,6 @@ namespace PepperDash.Essentials
 
         //----- through 3120
 
-        /// <summary>
-        /// 3201
-        /// </summary>
-        public const uint PasswordPromptMessageText = 3201;
-        /// <summary>
-        /// 3202
-        /// </summary>
-        public const uint PasswordPromptPasswordText = 3202;
 
         /// <summary>
         /// 3812

PepperDashEssentials/UI/JoinConstants/UIUshortJoin.cs

@@ -7,7 +7,7 @@
 	{
         // Video Codec
         /// <summary>
-        /// 1234: values 0 = Connect, 1 = End, 2 = Start Meeting
+        /// 1234: values 0 = Connect, 1 = End
         /// </summary>
         public const uint VCStagingConnectButtonMode = 1234;
 

PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs

@@ -12,7 +12,6 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.SmartObjects;
 using PepperDash.Essentials.Core.PageManagers;
-using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 using PepperDash.Essentials.Room.Config;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
@@ -165,7 +164,7 @@ namespace PepperDash.Essentials
             CallCaretVisible = tempJoin + 10;
             TriList.SetSigFalseAction(tempJoin, () =>
                 {
-                    avDriver.ShowActiveCallsListOrMeetingInfo();
+                    avDriver.ShowActiveCallsList();
                     if(avDriver.CurrentRoom.InCallFeedback.BoolValue)
                         CaretInterlock.ShowInterlocked(CallCaretVisible);
                 });
@@ -192,56 +191,32 @@ namespace PepperDash.Essentials
                 return;
             }
 
-            var meetingInfoCodec = codec as IHasMeetingInfo;
-
             // Set mode of header button
-            SetHeaderCallIcon(codec);
-
-            // Set the call status text
-            Debug.Console(1, "Active Call Count: {0}", codec.ActiveCalls.Count);
-
-            if (codec.ActiveCalls.Count > 0)
-            {
-                if (codec.ActiveCalls.Count == 1 && meetingInfoCodec == null)
-                    TriList.SetString(UIStringJoin.HeaderCallStatusLabel, "1 Active Call");
-                else if (codec.ActiveCalls.Count == 1 && meetingInfoCodec != null)
-                {
-                    var headerCallStatusLabel = meetingInfoCodec.MeetingInfo.IsSharingMeeting
-                        ? "Sharing-Only Meeting"
-                        : "Active Meeting";
-
-                    headerCallStatusLabel = meetingInfoCodec.MeetingInfo.WaitingForHost
-                        ? "Waiting For Host"
-                        : headerCallStatusLabel;
-
-                    TriList.SetString(UIStringJoin.HeaderCallStatusLabel, headerCallStatusLabel);
-                }
-                else if (codec.ActiveCalls.Count > 1)
-                    TriList.SetString(UIStringJoin.HeaderCallStatusLabel, string.Format("{0} Active Calls", codec.ActiveCalls.Count));
-            }
-            else
-                TriList.SetString(UIStringJoin.HeaderCallStatusLabel, "No Active Calls");
-        }
-
-        private void SetHeaderCallIcon(VideoCodecBase codec)
-        {
             if (!codec.IsInCall)
             {
                 HeaderCallButtonIconSig.StringValue = "DND";
                 //HeaderCallButton.SetIcon(HeaderListButton.OnHook);
             }
             else if (codec.ActiveCalls.Any(c => c.Type == eCodecCallType.Video))
-            {
                 HeaderCallButtonIconSig.StringValue = "Misc-06_Dark";
-            }
             //HeaderCallButton.SetIcon(HeaderListButton.Camera);
             //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 2);
             else
-            {
                 HeaderCallButtonIconSig.StringValue = "Misc-09_Dark";
-            }
             //HeaderCallButton.SetIcon(HeaderListButton.Phone);
             //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 1);
+
+            // Set the call status text
+            Debug.Console(1, "Active Call Count: {0}", codec.ActiveCalls.Count);
+            if (codec.ActiveCalls.Count > 0)
+            {
+                if (codec.ActiveCalls.Count == 1)
+                    TriList.SetString(UIStringJoin.HeaderCallStatusLabel, "1 Active Call");
+                else if (codec.ActiveCalls.Count > 1)
+                    TriList.SetString(UIStringJoin.HeaderCallStatusLabel, string.Format("{0} Active Calls", codec.ActiveCalls.Count));
+            }
+            else
+                TriList.SetString(UIStringJoin.HeaderCallStatusLabel, "No Active Calls");
         }
 
         /// <summary>
@@ -281,7 +256,7 @@ namespace PepperDash.Essentials
             TriList.SetSigFalseAction(UIBoolJoin.HeaderCallStatusLabelPress,
                 () =>
                 {
-                    avDriver.ShowActiveCallsListOrMeetingInfo();
+                    avDriver.ShowActiveCallsList();
                     if (avDriver.CurrentRoom.InCallFeedback.BoolValue)
                         CaretInterlock.ShowInterlocked(CallCaretVisible);
                 });
@@ -379,8 +354,6 @@ namespace PepperDash.Essentials
                     headerPopupShown = true;
                 else if (e.NewJoin == UIBoolJoin.HeaderActiveCallsListVisible)
                     headerPopupShown = true;
-                else if (e.NewJoin == UIBoolJoin.HeaderMeetingInfoVisible)
-                    headerPopupShown = true;
                 else if (e.NewJoin == UIBoolJoin.HelpPageVisible)
                     headerPopupShown = true;
                 else if (e.NewJoin == UIBoolJoin.MeetingsOrContacMethodsListVisible)

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -918,7 +918,6 @@ namespace PepperDash.Essentials
                 TriList.BooleanInput[StartPageVisibleJoin].BoolValue = true;
                 TriList.BooleanInput[UIBoolJoin.VolumeSingleMute1Visible].BoolValue = false;
                 TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
-                TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
             }
         }
 

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddleTechPageDriver.cs

@@ -316,7 +316,7 @@ namespace PepperDash.Essentials.UIDrivers
         void CommunicationMonitor_StatusChange(object sender, MonitorStatusChangeEventArgs e)
         {
             var c = sender as ICommunicationMonitor;
-            if (c != null && StatusListDeviceIndexes.ContainsKey(c))
+            if (StatusListDeviceIndexes.ContainsKey(c))
             {
                 var i = StatusListDeviceIndexes[c];
                 StatusList.UShortInputSig(i, 1).UShortValue = (ushort)e.Status;

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using System.Globalization;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.UI;
@@ -9,13 +8,11 @@ using Crestron.SimplSharpPro.UI;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.SmartObjects;
 using PepperDash.Essentials.Core.PageManagers;
 using PepperDash.Essentials.Room.Config;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 
 namespace PepperDash.Essentials
 {
@@ -101,9 +98,6 @@ namespace PepperDash.Essentials
 		/// </summary>
         public SubpageReferenceList MeetingOrContactMethodModalSrl { get; set; }
 
-        public uint CallListOrMeetingInfoPopoverVisibilityJoin { get; private set; }
-
-
 		/// <summary>
 		/// The list of buttons on the header. Managed with visibility only
 		/// </summary>
@@ -179,38 +173,10 @@ namespace PepperDash.Essentials
         /// </summary>
         public PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; private set; }
 
-
-        private UiDisplayMode _currentMode;
-
-        private bool _isZoomRoomWithNoExternalSources
-        {
-            get
-            {
-                return CurrentRoom.VideoCodec is Essentials.Devices.Common.VideoCodec.ZoomRoom.ZoomRoom && _sourceListCount <= 1;
-            }
-        }
-
-        private uint _sourceListCount;
-
         /// <summary>
         /// The mode showing. Presentation or call.
         /// </summary>
-        UiDisplayMode CurrentMode
-        {
-            get
-            {
-                return _currentMode;
-            }
-            set
-            {
-                if (value != _currentMode)
-                {
-                    _currentMode = value;
-
-                    SetActivityFooterFeedbacks();
-                }
-            }
-        }
+        UiDisplayMode CurrentMode = UiDisplayMode.Start;
 
 		CTimer NextMeetingTimer;
 
@@ -241,7 +207,6 @@ namespace PepperDash.Essentials
 
 			MeetingOrContactMethodModalSrl = new SubpageReferenceList(TriList, UISmartObjectJoin.MeetingListSRL, 3, 3, 5);
 
-            CurrentMode = UiDisplayMode.Start;
 
 			// buttons are added in SetCurrentRoom
 			//HeaderButtonsList = new SmartObjectHeaderButtonList(TriList.SmartObjects[UISmartObjectJoin.HeaderButtonList]);
@@ -366,17 +331,15 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Allows PopupInterlock to be toggled if the calls list is already visible, or if the codec is in a call
         /// </summary>
-        public void ShowActiveCallsListOrMeetingInfo()
+        public void ShowActiveCallsList()
         {
 			TriList.SetBool(UIBoolJoin.CallEndAllConfirmVisible, true);
-
-
-            if(PopupInterlock.CurrentJoin == CallListOrMeetingInfoPopoverVisibilityJoin)
-                PopupInterlock.ShowInterlockedWithToggle(CallListOrMeetingInfoPopoverVisibilityJoin);
+            if(PopupInterlock.CurrentJoin == UIBoolJoin.HeaderActiveCallsListVisible) 
+                PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HeaderActiveCallsListVisible);
             else
             {
-                if(CurrentRoom.VideoCodec.IsInCall)
-                    PopupInterlock.ShowInterlockedWithToggle(CallListOrMeetingInfoPopoverVisibilityJoin);
+                if((CurrentRoom.ScheduleSource as VideoCodecBase).IsInCall)
+                    PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HeaderActiveCallsListVisible);
             }
         }
 
@@ -472,22 +435,14 @@ namespace PepperDash.Essentials
 		/// </summary>
 		void ShowNextMeetingTimerCallback()
 		{
-            //Update calendar for Zoom. Zoom doesn't automatically update when meetings are in the past
-            if (_isZoomRoomWithNoExternalSources)
-            {
-                CurrentRoom.ScheduleSource.GetSchedule();
-            }
-
 			// Every 60 seconds, refresh the calendar
 			RefreshMeetingsList();
 			// check meetings list for the closest, joinable meeting
 			var ss = CurrentRoom.ScheduleSource;
 			var meetings = ss.CodecSchedule.Meetings;
 
-		    if (meetings.Count <= 0)
+			if (meetings.Count > 0)
 			{
-		        return;
-		    }
 				// If the room is off pester the user
 				// If the room is on, and the meeting is joinable
 				// and the LastMeetingDismissed != this meeting
@@ -496,16 +451,12 @@ namespace PepperDash.Essentials
 				Debug.Console(0, "*#* Room on: {0}, lastMeetingDismissedId: {1} {2} *#*", 
 					CurrentRoom.OnFeedback.BoolValue,
 					LastMeetingDismissedId,
-		        lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToString("t", Global.Culture) : "");
+					lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToShortTimeString() : "");
 
 				var meeting = meetings.LastOrDefault(m => m.Joinable);
 				if (CurrentRoom.OnFeedback.BoolValue
 					&& lastMeetingDismissed == meeting)
 				{
-		        // meeting no longer joinable, hide popup
-		        if(meeting == null)
-		            HideNextMeetingPopup();
-
 					return;
 				}
 
@@ -517,11 +468,9 @@ namespace PepperDash.Essentials
 				}
 				else
 				{
-
-
 					TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Upcoming meeting");
-		        TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToString("t", Global.Culture));
-		        TriList.SetString(UIStringJoin.NextMeetingEndTimeText, meeting.EndTime.ToString("t", Global.Culture));
+					TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToShortTimeString());
+					TriList.SetString(UIStringJoin.NextMeetingEndTimeText, meeting.EndTime.ToShortTimeString());
 					TriList.SetString(UIStringJoin.NextMeetingTitleText, meeting.Title);
 					TriList.SetString(UIStringJoin.NextMeetingNameText, meeting.Organizer);
 					TriList.SetString(UIStringJoin.NextMeetingButtonLabel, "Join");
@@ -544,7 +493,7 @@ namespace PepperDash.Essentials
 					// indexOf = 3, 4 meetings :  
 					if (indexOfNext < meetings.Count)
 						TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText,
-		                meetings[indexOfNext].StartTime.ToString("t", Global.Culture));
+							meetings[indexOfNext].StartTime.ToShortTimeString());
 					else
 						TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText, "No more meetings today");
 
@@ -559,6 +508,7 @@ namespace PepperDash.Essentials
 					TriList.SetBool(UIBoolJoin.NextMeetingModalVisible, true);
 				}
 			}
+		}
 		
 		/// <summary>
 		/// 
@@ -583,26 +533,19 @@ namespace PepperDash.Essentials
 		/// </summary>
 		void RoomOnAndDialMeeting(Meeting meeting)
 		{
-		    Debug.Console(1, "[RoomOnAndDialMeeting] Joining meeting [{0}]", meeting);
 			Action dialAction = () => 
 				{
 					var d = CurrentRoom.ScheduleSource as VideoCodecBase;
                     if (d != null)
                     {
-                        Debug.Console(1,
-                            "[RoomOnAndDialMeeting] [dialAction] Sending command to codec to join meeting {0}", meeting);
                         d.Dial(meeting);
 						LastMeetingDismissedId = meeting.Id; // To prevent prompts for already-joined call
                     }
 				};
 			if (CurrentRoom.OnFeedback.BoolValue)
-		    {
-                Debug.Console(1, "[RoomOnAndDialMeeting] Room is on.");
 				dialAction();
-		    }
 			else
 			{
-		        Debug.Console(1, "RoomOnAndDialMeeting] Room is off or warming. Registering for Warming Feedback");
 				// Rig a one-time handler to catch when the room is warmed and then dial call
 				EventHandler<FeedbackEventArgs> oneTimeHandler = null;
 				oneTimeHandler = (o, a) =>
@@ -664,40 +607,12 @@ namespace PepperDash.Essentials
         /// </summary>
         void SetActivityFooterFeedbacks()
         {
-            if (CurrentRoom != null)
-            {
-                var startMode = CurrentMode == UiDisplayMode.Start;
-                var presentationMode = CurrentMode == UiDisplayMode.Presentation;
-                var callMode = CurrentMode == UiDisplayMode.Call;
-
-                TriList.SetBool(StartPageVisibleJoin, startMode ? true : false);
-
-                if (presentationMode &&_isZoomRoomWithNoExternalSources)
-                {
-                    // For now, if this is a Zoom Room and there are no shareable sources just display the informational subpage
-                    TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
-                    TriList.SetBool(UIBoolJoin.ZoomRoomContentSharingVisible, true);
-                }
-                else
-                {
-                    // Otherwise, show the staging bar 
-                    TriList.SetBool(UIBoolJoin.ZoomRoomContentSharingVisible, false);
-                    TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, presentationMode ? true : false);
-
-                }
-                if (!presentationMode)
-                {
-                    TriList.SetBool(UIBoolJoin.ZoomRoomContentSharingVisible, false);
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
-                }
-
-                CallButtonSig.BoolValue = callMode
+            CallButtonSig.BoolValue = CurrentMode == UiDisplayMode.Call 
                 && CurrentRoom.ShutdownType == eShutdownType.None;
-                ShareButtonSig.BoolValue = presentationMode
+            ShareButtonSig.BoolValue = CurrentMode == UiDisplayMode.Presentation 
                 && CurrentRoom.ShutdownType == eShutdownType.None;
             EndMeetingButtonSig.BoolValue = CurrentRoom.ShutdownType != eShutdownType.None;
         }
-        }
 
         /// <summary>
         /// 
@@ -708,13 +623,14 @@ namespace PepperDash.Essentials
                 return;
             HideLogo();
 			HideNextMeetingPopup();
-            //TriList.SetBool(StartPageVisibleJoin, false);
-            //TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
-            //TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
+            TriList.SetBool(StartPageVisibleJoin, false);
+            TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
+            TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
             if (CurrentSourcePageManager != null)
                 CurrentSourcePageManager.Hide();
 			PowerOnFromCall();
             CurrentMode = UiDisplayMode.Call;
+            SetActivityFooterFeedbacks();
             VCDriver.Show();
         }
 
@@ -727,63 +643,29 @@ namespace PepperDash.Essentials
             if (VCDriver.IsVisible)
                 VCDriver.Hide();
 			HideNextMeetingPopup();
-
-
-            if (_isZoomRoomWithNoExternalSources)
-            {
+            TriList.SetBool(StartPageVisibleJoin, false);
+            TriList.SetBool(UIBoolJoin.CallStagingBarVisible, false);
+            TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, true);
+            // Run default source when room is off and share is pressed
             if (!CurrentRoom.OnFeedback.BoolValue)
             { 
-                    CurrentRoom.RunDefaultPresentRoute();
-                }
-                // For now, if this is a Zoom Room and there are no shareable sources just display the informational subpage
-                TriList.SetBool(UIBoolJoin.ZoomRoomContentSharingVisible, true);
-
-                var presentationMeetingCodec = CurrentRoom.VideoCodec as IHasPresentationOnlyMeeting;
-                var farEndContentStatusCodec = CurrentRoom.VideoCodec as IHasFarEndContentStatus;
-                var receivingContent = false;
-
-                if (farEndContentStatusCodec != null)
-                {
-                    receivingContent = farEndContentStatusCodec.ReceivingContent.BoolValue;
-                }
-
-                if (presentationMeetingCodec != null && !CurrentRoom.VideoCodec.IsInCall)
-                {
-                    presentationMeetingCodec.StartSharingOnlyMeeting(eSharingMeetingMode.Laptop);
-                }
-                else if (CurrentRoom.VideoCodec.IsInCall && !CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue &&
-                         !receivingContent)
-                {
-                    CurrentRoom.VideoCodec.StartSharing();
-                }
-
-                if (CurrentSourcePageManager != null)
-                    CurrentSourcePageManager.Hide();
-            }
-            else
-            {
-                // Run default source when room is off and share is pressed
 				if (!CurrentRoom.OnFeedback.BoolValue)
 				{
 					// If there's no default, show UI elements
 					if (!(CurrentRoom as IRunDefaultPresentRoute).RunDefaultPresentRoute())
 						TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
 				}
+            }
             else // room is on show what's active or select a source if nothing is yet active
             {
-                    if (CurrentRoom.CurrentSourceInfo == null ||
-                        (CurrentRoom.VideoCodec != null &&
-                         CurrentRoom.CurrentSourceInfo.SourceDevice.Key == CurrentRoom.VideoCodec.OsdSource.Key))
+                if(CurrentRoom.CurrentSourceInfo == null || CurrentRoom.CurrentSourceInfoKey == CurrentRoom.DefaultCodecRouteString)
                     TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
                 else if (CurrentSourcePageManager != null)
-                    {
-                        TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
                     CurrentSourcePageManager.Show();
             }
-                }
-                SetupSourceList();
-            }
             CurrentMode = UiDisplayMode.Presentation;
+			SetupSourceList();
+            SetActivityFooterFeedbacks();
         }
 
 		/// <summary>
@@ -822,11 +704,9 @@ namespace PepperDash.Essentials
         /// </summary>
         void ShowCurrentSource()
         {
-			if (CurrentRoom.CurrentSourceInfo == null || _isZoomRoomWithNoExternalSources)
+			if (CurrentRoom.CurrentSourceInfo == null)
 				return;
 
-            CurrentMode = UiDisplayMode.Presentation;
-
 			if (CurrentRoom.CurrentSourceInfo.SourceDevice == null)
 			{
 				TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
@@ -1032,18 +912,6 @@ namespace PepperDash.Essentials
                 _CurrentRoom.IsWarmingUpFeedback.OutputChange -= CurrentRoom_IsWarmingFeedback_OutputChange;
                 _CurrentRoom.IsCoolingDownFeedback.OutputChange -= CurrentRoom_IsCoolingDownFeedback_OutputChange;
 				_CurrentRoom.InCallFeedback.OutputChange -= CurrentRoom_InCallFeedback_OutputChange;
-
-                var scheduleAwareCodec = _CurrentRoom.VideoCodec as IHasScheduleAwareness;
-                if (scheduleAwareCodec != null)
-                {
-                    scheduleAwareCodec.CodecSchedule.MeetingsListHasChanged -= CodecSchedule_MeetingsListHasChanged;
-                }
-
-                var meetingInfoCodec = _CurrentRoom.VideoCodec as IHasMeetingInfo;
-                if (meetingInfoCodec != null)
-                {
-                    meetingInfoCodec.MeetingInfoChanged -= meetingInfoCodec_MeetingInfoChanged;
-                }
             }
 
             _CurrentRoom = room;
@@ -1076,23 +944,9 @@ namespace PepperDash.Essentials
                 _CurrentRoom.CurrentSourceChange += CurrentRoom_SourceInfoChange;
                 RefreshSourceInfo();
 
-                
-                var scheduleAwareCodec = _CurrentRoom.VideoCodec as IHasScheduleAwareness;
-                if (scheduleAwareCodec != null)
+                if (_CurrentRoom.VideoCodec is IHasScheduleAwareness)
                 {
-                    scheduleAwareCodec.CodecSchedule.MeetingsListHasChanged += CodecSchedule_MeetingsListHasChanged;
-                }
-              
-                var meetingInfoCodec = _CurrentRoom.VideoCodec as IHasMeetingInfo;
-                if (meetingInfoCodec != null)
-                {
-                    meetingInfoCodec.MeetingInfoChanged += new EventHandler<MeetingInfoEventArgs>(meetingInfoCodec_MeetingInfoChanged);
-
-                    CallListOrMeetingInfoPopoverVisibilityJoin = UIBoolJoin.HeaderMeetingInfoVisible;
-                }
-                else
-                {
-                    CallListOrMeetingInfoPopoverVisibilityJoin = UIBoolJoin.HeaderActiveCallsListVisible;
+                    (_CurrentRoom.VideoCodec as IHasScheduleAwareness).CodecSchedule.MeetingsListHasChanged += CodecSchedule_MeetingsListHasChanged;
                 }
 
                 CallSharingInfoVisibleFeedback = new BoolFeedback(() => _CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue);
@@ -1104,8 +958,7 @@ namespace PepperDash.Essentials
                 if (_CurrentRoom != null)
                     _CurrentRoom.CurrentSourceChange += new SourceInfoChangeHandler(CurrentRoom_CurrentSingleSourceChange);
 
-                // Moved to EssentialsVideoCodecUiDriver
-                //TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd", _CurrentRoom.SourceListKey));
+                TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd", _CurrentRoom.SourceListKey));
 
                 (Parent as EssentialsPanelMainInterfaceDriver).HeaderDriver.SetupHeaderButtons(this, CurrentRoom);
             }
@@ -1116,26 +969,6 @@ namespace PepperDash.Essentials
             }
         }
 
-        void meetingInfoCodec_MeetingInfoChanged(object sender, MeetingInfoEventArgs e)
-        {
-            if (e.Info == null)
-            {
-                return;
-            }
-
-            TriList.SetString(UIStringJoin.MeetingIdText, e.Info.Id);
-            TriList.SetString(UIStringJoin.MeetingHostText, e.Info.Host);
-            TriList.SetString(UIStringJoin.MeetingNameText, e.Info.Name);
-
-            TriList.SetString(UIStringJoin.MeetingPasswordText, e.Info.Password);
-            // Show the password fields if one is present
-            TriList.SetBool(UIBoolJoin.MeetingPasswordVisible, !string.IsNullOrEmpty(e.Info.Password));
-
-            TriList.SetString(UIStringJoin.CallSharedSourceNameText, e.Info.ShareStatus);
-
-            TriList.SetString(UIStringJoin.MeetingLeaveText, e.Info.IsHost ? "End Meeting" : "Leave Meeting");    
-        }
-
         void SetCurrentRoom(IEssentialsHuddleVtc1Room room)
         {
             if (_CurrentRoom == room) return;
@@ -1249,8 +1082,7 @@ namespace PepperDash.Essentials
 					Debug.Console(1, "**** KEY {0}", kvp.Key);
 					
 				}
-                _sourceListCount = (i - 1);
-                SourceStagingSrl.Count = (ushort)_sourceListCount;
+				SourceStagingSrl.Count = (ushort)(i - 1);
 			}
 
 		}
@@ -1273,30 +1105,6 @@ namespace PepperDash.Essentials
         /// <param name="type"></param>
         void CurrentRoom_CurrentSingleSourceChange(SourceListItem info, ChangeType type)
         {
-            Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange");
-
-            // Show the Select a source subpage 
-            if (TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue)
-            {
-                Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange SourceStagingBarVisisble: true");
-
-                if (_CurrentRoom.CurrentSourceInfo == null || (_CurrentRoom.VideoCodec != null && _CurrentRoom.CurrentSourceInfo.SourceDevice.Key == _CurrentRoom.VideoCodec.OsdSource.Key))
-                {
-                    Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange Showing SelectASourceVisible");
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
-                }
-                else
-                {
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
-                    Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange Hiding SelectASourceVisible");
-                }
-            }
-            else
-            {
-                Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange Hiding SelectASourceVisible");
-                TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
-            }
-
             if (_CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue && _CurrentRoom.CurrentSourceInfo != null)
                 TriList.StringInput[UIStringJoin.CallSharedSourceNameText].StringValue = _CurrentRoom.CurrentSourceInfo.PreferredName;
         }
@@ -1339,6 +1147,7 @@ namespace PepperDash.Essentials
 		{
             // See if this is helpful or if the callback response in the codec class maybe doesn't come it time?
             // Let's build list from event
+			// CurrentRoom.ScheduleSource.GetSchedule();
 
             TriList.SetString(UIStringJoin.MeetingsOrContactMethodListIcon, "Calendar");
             TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Today's Meetings");
@@ -1347,8 +1156,8 @@ namespace PepperDash.Essentials
 			foreach (var m in CurrentRoom.ScheduleSource.CodecSchedule.Meetings)
 			{
 				i++;
-                MeetingOrContactMethodModalSrl.StringInputSig(i, 1).StringValue = m.StartTime.ToString("t", Global.Culture);
-                MeetingOrContactMethodModalSrl.StringInputSig(i, 2).StringValue = m.EndTime.ToString("t", Global.Culture);
+				MeetingOrContactMethodModalSrl.StringInputSig(i, 1).StringValue = m.StartTime.ToShortTimeString();
+				MeetingOrContactMethodModalSrl.StringInputSig(i, 2).StringValue = m.EndTime.ToShortTimeString();
 				MeetingOrContactMethodModalSrl.StringInputSig(i, 3).StringValue = m.Title;
                 MeetingOrContactMethodModalSrl.StringInputSig(i, 4).StringValue = string.Format("<br>{0}",m.Organizer);
                 MeetingOrContactMethodModalSrl.StringInputSig(i, 5).StringValue = "Join";
@@ -1393,12 +1202,12 @@ namespace PepperDash.Essentials
             var value = _CurrentRoom.OnFeedback.BoolValue;
             TriList.BooleanInput[UIBoolJoin.RoomIsOn].BoolValue = value;
 
-            //TriList.BooleanInput[StartPageVisibleJoin].BoolValue = !value;
+            TriList.BooleanInput[StartPageVisibleJoin].BoolValue = !value;
 
             if (value) //ON
             {
                 SetupActivityFooterWhenRoomOn();
-                //TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
+                TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
                 TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = true;
 
             }
@@ -1409,8 +1218,9 @@ namespace PepperDash.Essentials
                     VCDriver.Hide();
                 SetupActivityFooterWhenRoomOff();
                 ShowLogo();
-                //TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
-                //TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
+                SetActivityFooterFeedbacks();
+                TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
+                TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
 				// Clear this so that the pesky meeting warning can resurface every minute when off
 				LastMeetingDismissedId = null;
             }
@@ -1645,8 +1455,6 @@ namespace PepperDash.Essentials
         /// </summary>
         void PrepareForCodecIncomingCall();
 
-        uint CallListOrMeetingInfoPopoverVisibilityJoin { get; }
-
         SubpageReferenceList MeetingOrContactMethodModalSrl { get; }
     }
 }

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Globalization;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
@@ -15,7 +14,6 @@ using PepperDash.Essentials.Core.SmartObjects;
 using PepperDash.Essentials.Core.Touchpanels.Keyboards;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 using PepperDash.Essentials.Devices.Common.Cameras;
 
 namespace PepperDash.Essentials.UIDrivers.VC
@@ -85,9 +83,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
         StringBuilder SearchStringBuilder = new StringBuilder();
         BoolFeedback SearchStringBackspaceVisibleFeedback;
 
-        StringFeedback PasswordStringFeedback;
-        StringBuilder PasswordStringBuilder = new StringBuilder();
-
         ModalDialog IncomingCallModal;
 
         eKeypadMode KeypadMode;
@@ -128,24 +123,26 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 codec.CallStatusChange += new EventHandler<CodecCallStatusItemChangeEventArgs>(Codec_CallStatusChange);
 
+                // If the codec is ready, then get the values we want, otherwise wait
+                if (Codec.IsReady)
+                    Codec_IsReady();
+                else
+                    codec.IsReadyChange += (o, a) => Codec_IsReady();
+
                 //InCall = new BoolFeedback(() => false);
                 LocalPrivacyIsMuted = new BoolFeedback(() => false);
 
                 VCControlsInterlock = new JoinedSigInterlock(triList);
                 VCCameraControlModeInterlock = new JoinedSigInterlock(triList);
 
-                VCControlsInterlock.HideAndClear();
 
-                /* if (CodecHasFavorites || codec is IHasZoomRoomLayouts) //Checking for Zoom Room...picked a ZoomRoom specific interface to check for
+                if (CodecHasFavorites)
                     VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadWithFavoritesVisible);
                 else
-                    VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadVisible); */
+                    VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadVisible);
 
                 StagingBarsInterlock = new JoinedSigInterlock(triList);
-                if(Codec is IHasCallHistory)
-                    StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverWithRecentsVisible);
-                else
-                    StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverWithoutRecentsVisible);
+                StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverVisible);
 
                 StagingButtonsFeedbackInterlock = new JoinedSigInterlock(triList);
                 StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
@@ -153,8 +150,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 // Return formatted when dialing, straight digits when in call
                 DialStringFeedback = new StringFeedback(() =>
                 {
-                    // Format the number feedback if in dial mode and the codec is not IHasStartMeeting (ZoomRoom)
-                    if (KeypadMode == eKeypadMode.Dial  && !(Codec is IHasStartMeeting))
+                    if (KeypadMode == eKeypadMode.Dial)
                         return GetFormattedDialString(DialStringBuilder.ToString());
                     else
                         return DialStringBuilder.ToString();
@@ -181,23 +177,9 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 });
                 SearchStringFeedback.LinkInputSig(triList.StringInput[UIStringJoin.CodecDirectorySearchEntryText]);
 
-                PasswordStringFeedback = new StringFeedback(() =>
-                {
-                    if (PasswordStringBuilder.Length > 0)
-                    {
-                        Parent.Keyboard.EnableGoButton();
-                        return PasswordStringBuilder.ToString();
-                    }
-                    else
-                    {
-                        Parent.Keyboard.DisableGoButton();
-                        return "";
-                    }
-                });
-                PasswordStringFeedback.LinkInputSig(triList.StringInput[UIStringJoin.PasswordPromptPasswordText]);
-
                 SetupDirectoryList();
 
+
                 SearchStringBackspaceVisibleFeedback = new BoolFeedback(() => SearchStringBuilder.Length > 0);
                 SearchStringBackspaceVisibleFeedback.LinkInputSig(triList.BooleanInput[UIBoolJoin.VCDirectoryBackspaceVisible]);
 
@@ -214,18 +196,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 triList.SetSigHeldAction(UIBoolJoin.VCDirectoryBackspacePress, 500,
                     StartSearchBackspaceRepeat, StopSearchBackspaceRepeat, SearchKeypadBackspacePress);
 
-
-                if (Codec is IPasswordPrompt)
-                {
-                    SetupPasswordPrompt();
-                }
-
-
-                // If the codec is ready, then get the values we want, otherwise wait
-                if (Codec.IsReady)
-                    Codec_IsReady();
-                else
-                    codec.IsReadyChange += (o, a) => Codec_IsReady();
             }
             catch (Exception e)
             {
@@ -321,20 +291,24 @@ namespace PepperDash.Essentials.UIDrivers.VC
         void Codec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
         {
             var call = e.CallItem;
-            var meetingInfoSender = sender as IHasMeetingInfo;
 
             switch (e.CallItem.Status)
             {
                 case eCodecCallStatus.Connected:
                     // fire at SRL item
+                    KeypadMode = eKeypadMode.DTMF;
+                    DialStringBuilder.Remove(0, DialStringBuilder.Length);
+                    DialStringFeedback.FireUpdate();
+					DialStringTextCheckEnables();
                     Parent.ShowNotificationRibbon("Connected", 2000);
-                    OnCallConnected();
+                    StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
+					ShowKeypad();
+                    ((Parent.CurrentRoom as IHasCurrentVolumeControls).CurrentVolumeControls as IBasicVolumeWithFeedback).MuteOff();
 					//VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCKeypadVisible);
                     break;
                 case eCodecCallStatus.Connecting:
                     // fire at SRL item
                     Parent.ShowNotificationRibbon("Connecting", 0);
-                    OnCallConnected();
                     break;
                 case eCodecCallStatus.Dialing:
                     Parent.ShowNotificationRibbon("Connecting", 0);
@@ -350,10 +324,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
                         DialStringBuilder.Remove(0, DialStringBuilder.Length);
                         DialStringFeedback.FireUpdate();
                         Parent.ShowNotificationRibbon("Disconnected", 2000);
-                        Debug.Console(0, "Setting Connect Button mode to 0");
                     }
-
-                    
                     break;
                 case eCodecCallStatus.Disconnecting:
                     break;
@@ -374,32 +345,16 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             ShowIncomingModal(call);
                         break;
                     }
+                default:
+                    break;
             }
-
-            if (meetingInfoSender != null && Codec.IsInCall)
-            {
-                var meetingInfo = meetingInfoSender.MeetingInfo;
-
-                TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue =
-                    (ushort) (meetingInfo.IsSharingMeeting ? 2 : 1);
-            }
-            else
-            {
-
-                TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue =
-                    (ushort) (Codec.IsInCall ? 1 : 0);
-            }
+            TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue = (ushort)(Codec.IsInCall ? 1 : 0);
 			
 			uint stageJoin;
 			if (Codec.IsInCall)
 				stageJoin = UIBoolJoin.VCStagingActivePopoverVisible;
 			else
-            {
-                if (Codec is IHasCallHistory)
-                    stageJoin = UIBoolJoin.VCStagingInactivePopoverWithRecentsVisible;
-                else
-                    stageJoin = UIBoolJoin.VCStagingInactivePopoverWithoutRecentsVisible;
-            }
+				stageJoin = UIBoolJoin.VCStagingInactivePopoverVisible;
 			if (IsVisible)
 				StagingBarsInterlock.ShowInterlocked(stageJoin);
 			else
@@ -411,36 +366,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             UpdateHeaderActiveCallList();
         }
 
-        private void OnCallConnected()
-        {
-            HidePasswordPrompt();
-            KeypadMode = eKeypadMode.DTMF;
-            DialStringBuilder.Remove(0, DialStringBuilder.Length);
-            DialStringFeedback.FireUpdate();
-            DialStringTextCheckEnables();
-
-            StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
-            ShowKeypad();
-
-            UnmuteRoomOnCallConnect();
-        }
-
-        private void UnmuteRoomOnCallConnect()
-        {
-            var volControl = Parent.CurrentRoom as IHasCurrentVolumeControls;
-
-            if (volControl == null)
-            {
-                return;
-            }
-            var currentVolControls = volControl.CurrentVolumeControls as IBasicVolumeWithFeedback;
-
-            if (currentVolControls != null)
-            {
-                currentVolControls.MuteOff();
-            }
-        }
-
         /// <summary>
         /// Redraws the calls list on the header
         /// </summary>
@@ -464,8 +389,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 ActiveCallsSRL.Count = (ushort)activeList.Count;
 
             // If Active Calls list is visible and codec is not in a call, hide the list    
-            if (!Codec.IsInCall && Parent.PopupInterlock.CurrentJoin == Parent.CallListOrMeetingInfoPopoverVisibilityJoin)
-                Parent.PopupInterlock.ShowInterlockedWithToggle(Parent.CallListOrMeetingInfoPopoverVisibilityJoin);
+            if (!Codec.IsInCall && Parent.PopupInterlock.CurrentJoin == UIBoolJoin.HeaderActiveCallsListVisible)
+                Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HeaderActiveCallsListVisible);
         }
         
         /// <summary>
@@ -556,67 +481,20 @@ namespace PepperDash.Essentials.UIDrivers.VC
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingRecentsPress, ShowRecents);
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingCameraPress, ShowCameraControls);
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingConnectPress, ConnectPress);
-            TriList.SetSigFalseAction(UIBoolJoin.VCStagingMeetNowPress, MeetNowPress);
-            TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, CallStopSharingPress);
-
-            var meetingInfoCodec = Codec as IHasMeetingInfo;
-
             TriList.SetSigFalseAction(UIBoolJoin.CallEndPress, () =>
                 {
                     if (Codec.ActiveCalls.Count > 1)
                     {
-                        Parent.PopupInterlock.ShowInterlocked(Parent.CallListOrMeetingInfoPopoverVisibilityJoin);
-                    }
-                    else if (meetingInfoCodec != null && Codec.ActiveCalls.Count == 1)
-                    {
-                        var meetingInfo = meetingInfoCodec.MeetingInfo;
-
-                        if (meetingInfo != null && meetingInfo.IsSharingMeeting)
-                        {
-                            var presentationMeetingCodec = Codec as IHasPresentationOnlyMeeting;
-                            if (presentationMeetingCodec != null)
-                            {
-                                presentationMeetingCodec.StartNormalMeetingFromSharingOnlyMeeting();
-                            }
+                        Parent.PopupInterlock.ShowInterlocked(UIBoolJoin.HeaderActiveCallsListVisible);
                     }
                     else
-                        {
                         Codec.EndAllCalls();
-                        }
-                    }
-                    else
-                    {
-                        Codec.EndAllCalls();
-                    }
                 });
-
 			TriList.SetSigFalseAction(UIBoolJoin.CallEndAllConfirmPress, () =>
 				{
 					Parent.PopupInterlock.HideAndClear();
 					Codec.EndAllCalls();
 				});
-
-            
-            if (meetingInfoCodec != null)
-            {
-                TriList.SetSigFalseAction(UIBoolJoin.MeetingLeavePress, () =>
-                    {
-                        Parent.PopupInterlock.HideAndClear();
-
-                        if (meetingInfoCodec.MeetingInfo.IsHost)
-                        {
-                            Codec.EndAllCalls();
-                        }
-                        else
-                        {
-                            var startMeetingCodec = Codec as IHasStartMeeting;
-                            if (startMeetingCodec != null)
-                            {
-                                startMeetingCodec.LeaveMeeting();
-                            }
-                        }
-                    });
-            }
         }
 
         void SetupCameraControls()
@@ -635,18 +513,13 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 var codecOffCameras = Codec as IHasCameraOff;
 
-                var supportsCameraOffMode = Codec.SupportsCameraOff;
-
                 var codecAutoCameras = Codec as IHasCameraAutoMode;
 
-                var supportsAutoCameraMode = Codec.SupportsCameraAutoMode;
-
-                if (codecAutoCameras != null && supportsAutoCameraMode)
+                if (codecAutoCameras != null)
                 {
                     CameraModeList.SetItemButtonAction(1,(b) => codecAutoCameras.CameraAutoModeOn());
                     TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 1 Visible"].BoolValue = true;
                     codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 1 Selected"]);
-                    codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(TriList.BooleanInput[UIBoolJoin.VCCameraAutoModeIsOnFb]);
                     //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 1 Pressed"].SetSigFalseAction(
                     //() => codecAutoCameras.CameraAutoModeOn());
 
@@ -681,7 +554,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 2 Pressed"].SetSigFalseAction(
                 //    () => ShowCameraManualMode());
 
-                if (codecOffCameras != null && supportsCameraOffMode)
+                if (codecOffCameras != null)
                 {
                     TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 3 Visible"].BoolValue = true;
                     codecOffCameras.CameraIsOffFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 3 Selected"]);
@@ -896,14 +769,12 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
             if (camerasCodec != null && camerasCodec.SelectedCamera != null)
             {
-                Debug.Console(2, "Attempting to map camera actions to selected camera: '{0}'", camerasCodec.SelectedCamera.Key);
+
                 var dpad = CameraPtzPad;
 
                 var camera = camerasCodec.SelectedCamera as IHasCameraPtzControl;
                 if (camera != null)
                 {
-
-                    Debug.Console(2, "Selected camera is IHasCameraPtzControl");
                     if (camerasCodec.SelectedCamera.CanTilt)
                     {
                         dpad.SigUp.SetBoolSigAction((b) =>
@@ -968,46 +839,25 @@ namespace PepperDash.Essentials.UIDrivers.VC
                     }
 
                 }
-                else
-                {
-                    Debug.Console(2, "Selected Camera is not IHasCameraPtzControl.  No controls to map");
-                }
-            }
-            else
-            {
-                Debug.Console(2, "Codec does not have cameras of selected camera is null");
             }
         }
 
         // Determines if codec is in manual camera control mode and shows feedback
         void ShowCameraManualMode()
         {
-            Debug.Console(2, "ShowCameraManualMode");
-
             var inManualMode = true;
 
             var codecOffCameras = Codec as IHasCameraOff;
 
             var codecAutoCameras = Codec as IHasCameraAutoMode;
 
-            var supportsAutoCameras = codecAutoCameras != null && Codec.SupportsCameraAutoMode;
-
             if (codecOffCameras != null && codecOffCameras.CameraIsOffFeedback.BoolValue)
             {
                 inManualMode = false;
-
-                var codecCameraMute = Codec as IHasCameraMute;
-
-                if (codecCameraMute != null)
-                {
-                    codecCameraMute.CameraMuteOff();
-                    inManualMode = true;
-
-                }
             }
 
             // Clear auto mode
-            if (supportsAutoCameras)
+            if (codecAutoCameras != null )
             {
                 if (codecAutoCameras.CameraAutoModeIsOnFeedback.BoolValue)
                 {
@@ -1098,7 +948,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 					// if it's today, show a simpler string
 					string timeText = null;
 					if (c.StartTime.Date == DateTime.Now.Date)
-                        timeText = c.StartTime.ToString("t", Global.Culture);
+						timeText = c.StartTime.ToShortTimeString();
 					else if (c.StartTime == DateTime.MinValue)
 						timeText = "";
 					else
@@ -1155,20 +1005,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		void SetupDirectoryList()
 		{
 			var codec = Codec as IHasDirectory;
-		    if (codec == null)
+			if (codec != null)
 			{
-		        return;
-		    }
-
 				DirectoryList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCDirectoryList],
 					true, 1300);
-		    codec.DirectoryResultReturned += dir_DirectoryResultReturned;
+				codec.DirectoryResultReturned += new EventHandler<DirectoryEventArgs>(dir_DirectoryResultReturned);
 
 				if (codec.PhonebookSyncState.InitialSyncComplete)
 					SetCurrentDirectoryToRoot();
 				else
 				{
-		        codec.PhonebookSyncState.InitialSyncCompleted += PhonebookSyncState_InitialSyncCompleted;
+					codec.PhonebookSyncState.InitialSyncCompleted += new EventHandler<EventArgs>(PhonebookSyncState_InitialSyncCompleted);
+				}
+
+			    RefreshDirectory();
+				
 			}
 		}
 
@@ -1177,15 +1028,11 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void SetCurrentDirectoryToRoot()
         {
-            var hasDirectory = Codec as IHasDirectory;
+            (Codec as IHasDirectory).SetCurrentDirectoryToRoot();
 
-            if (hasDirectory == null)
-            {
-                return;
-            }
-
-            hasDirectory.SetCurrentDirectoryToRoot();
             SearchKeypadClear();
+
+            RefreshDirectory();
         }
 
         /// <summary>
@@ -1197,17 +1044,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
         {
             var codec = Codec as IHasDirectory;
 
-            if (codec == null)
-            {
-                return;
-            }
-
-            if (!codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
-            {
-                return;
-            }
-
             SetCurrentDirectoryToRoot();
+
+            RefreshDirectory();
+            
         }
 
 		/// <summary>
@@ -1217,7 +1057,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <param name="e"></param>
 		void dir_DirectoryResultReturned(object sender, DirectoryEventArgs e)
 		{
-		    RefreshDirectory(e.Directory);
+
+			RefreshDirectory();
 		}
 
         /// <summary>
@@ -1249,24 +1090,13 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <summary>
 		/// 
 		/// </summary>
+		/// <param name="dir"></param>
 		void RefreshDirectory()
 		{
-		    var codec = Codec as IHasDirectory;
-
-		    if (codec == null)
-		    {
-		        return;
-		    }
-
-		    RefreshDirectory(codec.CurrentDirectoryResult);
-		}
-
-        void RefreshDirectory(CodecDirectory directory)
-        {
-            if (directory.CurrentDirectoryResults.Count > 0)
+            if ((Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults.Count > 0)
             {
                 ushort i = 0;
-                foreach (var r in directory.CurrentDirectoryResults)
+                foreach (var r in (Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults)
                 {
                     if (i == DirectoryList.MaxCount)
                     {
@@ -1286,35 +1116,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             // If more than one contact method, show contact method modal dialog
                             DirectoryList.SetItemButtonAction(i, b =>
                             {
-                                if (b)
+                                if (!b)
                                 {
-                                    return;
-                                }
                                     // Refresh the contact methods list
                                     RefreshContactMethodsModalList(dc);
                                     Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible);
+                                }
                             });
 
                         }
-                        else if (dc.ContactMethods.Count == 1)
-                        {
-                            var invitableContact = dc as IInvitableContact;
-
-                            if (invitableContact != null)
-                            {
-                                DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(invitableContact); });
-                            }
                         else
                         {
                             // If only one contact method, just dial that method
 							DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(dc.ContactMethods[0].Number); });
                         }
                     }
-                        else
-                        {
-                            Debug.Console(1, "Unable to dial contact.  No availble ContactMethod(s) specified");
-                        }
-                    }
                     else    // is DirectoryFolder
                     {
                         DirectoryList.SetItemMainText(i, string.Format("[+] {0}", r.Name));
@@ -1339,6 +1155,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 DirectoryList.SetItemMainText(1, "No Results Found");
             }
+
 		}
 
         void RefreshContactMethodsModalList(DirectoryContact contact)
@@ -1384,7 +1201,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 			var lc = Codec as IHasCodecLayouts;
 			if (lc != null)
 			{
-
+                TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggleSingleProminent);
 				lc.LocalLayoutFeedback.LinkInputSig(TriList.StringInput[UIStringJoin.VCLayoutModeText]);
 				lc.LocalLayoutFeedback.OutputChange += (o,a) => 
 				{
@@ -1397,7 +1214,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
 				var cisco = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoSparkCodec;
 				if (cisco != null)
 				{
-                    TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggleSingleProminent);
 					// Cisco has min/max buttons that need special sauce
 					cisco.SharingContentIsOnFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges;
 					//cisco.PresentationViewMaximizedFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges;
@@ -1405,16 +1221,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 					TriList.SetSigFalseAction(UIBoolJoin.VCMinMaxPress, cisco.MinMaxLayoutToggle);
 				}
 				 
-                var zoomRoom = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom.ZoomRoom;
-                if (zoomRoom != null)
-                {
-                    TriList.BooleanInput[UIBoolJoin.VCLayoutToggleEnable].BoolValue = true;
-                    TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggle);
 			}
-				 
-			}
-
-            
 		}
 
 		/// <summary>
@@ -1442,21 +1249,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void RevealKeyboard()
         {
-            if (_passwordPromptDialogVisible)
-            {
-                Debug.Console(2, "Attaching Keyboard to PasswordPromptDialog");
-                DetachDialKeyboard();
-                DetachSearchKeyboard();
-                var kb = Parent.Keyboard;
-                kb.KeyPress -= Keyboard_PasswordKeyPress;
-                kb.KeyPress += Keyboard_PasswordKeyPress;
-                kb.HideAction = this.DetachPasswordKeyboard;
-                kb.GoButtonText = "Submit";
-                kb.GoButtonVisible = true;
-                PasswordStringCheckEnables();
-                kb.Show();
-            }
-            else if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCKeypadWithFavoritesVisible && KeypadMode == eKeypadMode.Dial)
+            if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCKeypadWithFavoritesVisible && KeypadMode == eKeypadMode.Dial)
             {
                 var kb = Parent.Keyboard;
 				kb.KeyPress -= Keyboard_DialKeyPress;
@@ -1478,7 +1271,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 SearchStringKeypadCheckEnables();
                 kb.Show();
             }
-
         }
 
         /// <summary>
@@ -1534,32 +1326,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             }
         }
 
-        /// <summary>
-        /// Event handler for keyboard dialing
-        /// </summary>
-        void Keyboard_PasswordKeyPress(object sender, PepperDash.Essentials.Core.Touchpanels.Keyboards.KeyboardControllerPressEventArgs e)
-        {
-            if (_passwordPromptDialogVisible)
-            {
-                if (e.Text != null)
-                    PasswordStringBuilder.Append(e.Text);
-                else
-                {
-                    if (e.SpecialKey == KeyboardSpecialKey.Backspace)
-                        PasswordKeypadBackspacePress();
-                    else if (e.SpecialKey == KeyboardSpecialKey.Clear)
-                        PasswordKeypadClear();
-                    else if (e.SpecialKey == KeyboardSpecialKey.GoButton)
-                    {
-                        (Codec as IPasswordPrompt).SubmitPassword(PasswordStringBuilder.ToString());
-                        HidePasswordPrompt();
-                    }
-                }
-                PasswordStringFeedback.FireUpdate();
-                PasswordStringCheckEnables();
-            }
-        }
-
 		/// <summary>
 		/// Call
 		/// </summary>
@@ -1573,11 +1339,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             Parent.Keyboard.KeyPress -= Keyboard_SearchKeyPress;
         }
 
-        void DetachPasswordKeyboard()
-        {
-            Parent.Keyboard.KeyPress -= Keyboard_PasswordKeyPress;
-        }
-
         /// <summary>
         /// Shows the camera controls subpage
         /// </summary>
@@ -1655,22 +1416,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingRecentsPress);
         }
 
-        /// <summary>
-        /// Meet Now button
-        /// </summary>
-        void MeetNowPress()
-        {
-            var startMeetingCodec = Codec as IHasStartMeeting;
-            if (startMeetingCodec != null)
-            {
-                startMeetingCodec.StartMeeting(startMeetingCodec.DefaultMeetingDurationMin);
-            }
-            else
-            {
-                Debug.Console(2, "Codce does not implment IHasStartMeeting. Cannot meet now");
-            }
-        }
-
         /// <summary>
         /// Connect call button
         /// </summary>
@@ -1681,16 +1426,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             Codec.Dial(DialStringBuilder.ToString());
         }
 
-        /// <summary>
-        /// Stop Sharing button
-        /// </summary>
-        void CallStopSharingPress()
-        {
-            Codec.StopSharing();
-            Parent.CurrentRoom.RunRouteAction("codecOsd", Parent.CurrentRoom.SourceListKey);
-        }
-
-
         /// <summary>
         /// 
         /// </summary>
@@ -1857,40 +1592,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 Parent.Keyboard.DisableGoButton();
         }
 
-        /// <summary>
-        /// Clears the Password keypad
-        /// </summary>
-        void PasswordKeypadClear()
-        {
-            PasswordStringBuilder.Remove(0, PasswordStringBuilder.Length);
-            PasswordStringFeedback.FireUpdate();
-            PasswordStringCheckEnables();
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void PasswordKeypadBackspacePress()
-        {
-            PasswordStringBuilder.Remove(PasswordStringBuilder.Length - 1, 1);
-
-            PasswordStringFeedback.FireUpdate();
-            PasswordStringCheckEnables();
-        }
-
-        /// <summary>
-        /// Checks the enabled states of various elements around the keypad
-        /// </summary>
-        void PasswordStringCheckEnables()
-        {
-            var textIsEntered = PasswordStringBuilder.Length > 0;
-            if (textIsEntered)
-                Parent.Keyboard.EnableGoButton();
-            else
-                Parent.Keyboard.DisableGoButton();
-        }
-
 
         /// <summary>
         /// Returns the text value for the keypad dial entry field
@@ -1936,62 +1637,5 @@ namespace PepperDash.Essentials.UIDrivers.VC
             Dial = 0,
             DTMF
         }
-
-        void SetupPasswordPrompt()
-        {
-            var passwordPromptCodec = Codec as IPasswordPrompt;
-
-            passwordPromptCodec.PasswordRequired += new EventHandler<PasswordPromptEventArgs>(passwordPromptCodec_PasswordRequired);
-
-            TriList.SetSigFalseAction(UIBoolJoin.PasswordPromptCancelPress, HidePasswordPrompt);
-            TriList.SetSigFalseAction(UIBoolJoin.PasswordPromptTextPress, RevealKeyboard);
-        }
-
-        void passwordPromptCodec_PasswordRequired(object sender, PasswordPromptEventArgs e)
-        {
-            if (e.LoginAttemptCancelled)
-            {
-                HidePasswordPrompt();
-                return;
-            }
-
-            if (!string.IsNullOrEmpty(e.Message))
-            {
-                TriList.SetString(UIStringJoin.PasswordPromptMessageText, e.Message);
-            }
-
-            if (e.LoginAttemptFailed)
-            {
-                // TODO: Show a message modal to indicate the login attempt failed
-                return;
-            }
-
-            TriList.SetBool(UIBoolJoin.PasswordPromptErrorVisible, e.LastAttemptWasIncorrect);
-
-            ShowPasswordPrompt();
-        }
-
-        private bool _passwordPromptDialogVisible;
-
-        void ShowPasswordPrompt()
-        {
-            // Clear out any previous data
-            PasswordKeypadClear();
-
-            _passwordPromptDialogVisible = true;
-            TriList.SetBool(UIBoolJoin.PasswordPromptDialogVisible, _passwordPromptDialogVisible);
-            RevealKeyboard();
-        }
-
-        void HidePasswordPrompt()
-        {
-            if (_passwordPromptDialogVisible)
-            {
-                _passwordPromptDialogVisible = false;
-                Parent.Keyboard.Hide();
-                TriList.SetBool(UIBoolJoin.PasswordPromptDialogVisible, _passwordPromptDialogVisible);
-                PasswordKeypadClear();
-            }
-        }
     }
 }

README.md

@@ -54,10 +54,6 @@ Utilization of Essentials Framework falls into the following categories:
 
 For detailed documentation, see the [Wiki](https://github.com/PepperDash/EssentialsFramework/wiki).
 
-## Support
-
-* Check out our [Discord Server](https://discord.gg/rWyeRH3K)
-
 ## How-To (Getting Started)
 
 See [Getting Started](https://github.com/PepperDash/Essentials/wiki/Get-started#how-to-get-started)

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

@@ -46,14 +46,6 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete RawOccupancyUsFeedback = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Raw Occupancy Us Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        [JoinName("IdentityModeOn")]
-        public JoinDataComplete IdentityMode = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
-            new JoinMetadata { Description = "Enable Identity Mode", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IdentityModeFeedback")]
-        public JoinDataComplete IdentityModeFeedback = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
-            new JoinMetadata { Description = "Identity Mode Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
         [JoinName("EnableLedFlash")]
         public JoinDataComplete EnableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Led Flash", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });

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

@@ -10,7 +10,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinMetadata
             {
                 Description = "DM Chassis enable audio breakaway routing",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
                 JoinType = eJoinType.Digital
             });
 
@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinMetadata
             {
                 Description = "DM Chassis enable USB breakaway routing",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
                 JoinType = eJoinType.Digital
             });
 

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

@@ -4,14 +4,6 @@ namespace PepperDash.Essentials.Core.Bridges
 {
     public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
     {
-        [JoinName("SystemPowerOn")]
-        public JoinDataComplete SystemPowerOn = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
-            new JoinMetadata { Description = "DMPS System Power On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SystemPowerOff")]
-        public JoinDataComplete SystemPowerOff = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
-            new JoinMetadata { Description = "DMPS System Power Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
         [JoinName("VideoSyncStatus")]
         public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

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

@@ -5,9 +5,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
     {
-
-        #region Digital
-
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(
             new JoinData
@@ -22,6 +19,19 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
+        [JoinName("Name")]
+        public JoinDataComplete Name = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 1,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Name",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
 
         [JoinName("Enable")]
         public JoinDataComplete Enable = new JoinDataComplete(
@@ -93,10 +103,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        #endregion
-
-        #region Analog
-
         [JoinName("Sensitivity")]
         public JoinDataComplete Sensitivity = new JoinDataComplete(
             new JoinData
@@ -111,28 +117,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
-        #endregion
-
-
-        #region Serial
-
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 1,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sensor Name",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        #endregion
-
-
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it
         /// </summary>

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

@@ -924,21 +924,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 
 		#region Analog
 
-        // TODO [ ] hotfix/videocodecbase-max-meeting-xsig-set
-        [JoinName("MeetingsToDisplay")]
-        public JoinDataComplete MeetingsToDisplay = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 40,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Set/FB the number of meetings to display via the bridge xsig; default: 3 meetings.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
 		[JoinName("MinutesBeforeMeetingStart")]
 		public JoinDataComplete MinutesBeforeMeetingStart = new JoinDataComplete(
 			new JoinData

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/CenIoRy104Controller.cs

@@ -1,77 +0,0 @@
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Wrapper class for CEN-IO-RY-104 relay module
-    /// </summary>
-    [Description("Wrapper class for the CEN-IO-RY-104 relay module")]
-    public class CenIoRy104Controller : EssentialsDevice, IRelayPorts
-    {
-        private readonly CenIoRy104 _ry104;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="name"></param>
-        /// <param name="ry104"></param>
-        public CenIoRy104Controller(string key, string name, CenIoRy104 ry104)
-            : base(key, name)
-        {
-            _ry104 = ry104;
-        }
-
-        /// <summary>
-        /// Relay port collection
-        /// </summary>
-        public CrestronCollection<Relay> RelayPorts
-        {
-            get { return _ry104.RelayPorts; }
-        }
-    
-        /// <summary>
-        /// Number of relay ports property
-        /// </summary>
-        public int NumberOfRelayPorts
-        {
-            get { return _ry104.NumberOfRelayPorts; }
-        }        
-    }
-
-    /// <summary>
-    /// CEN-IO-RY Controller factory
-    /// </summary>
-    public class CenIoRy104ControllerFactory : EssentialsDeviceFactory<CenIoRy104Controller>
-    {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public CenIoRy104ControllerFactory()
-        {
-            TypeNames = new List<string>() { "ceniory104" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create a new CEN-IO-RY-104 Device");
-
-            var controlPropertiesConfig = CommFactory.GetControlPropertiesConfig(dc);
-            if (controlPropertiesConfig == null)
-            {
-                Debug.Console(1, "Factory failed to create a new CEN-IO-RY-104 Device");
-                return null;
-            }
-
-            var ipid = controlPropertiesConfig.IpIdInt;
-            if (ipid != 0) return new CenIoRy104Controller(dc.Key, dc.Name, new CenIoRy104(ipid, Global.ControlSystem));
-            
-            Debug.Console(1, "Factory failed to create a new CEN-IO-RY-104 Device using IP-ID-{0}", ipid);
-            return null;
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/GenericRelayDevice.cs

@@ -44,12 +44,6 @@ namespace PepperDash.Essentials.Core.CrestronIO
             {
                 RelayOutput = postActivationFunc(config);
 
-                if (RelayOutput == null)
-                {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Unable to get parent relay device for device key {0} and port {1}", config.PortDeviceKey, config.PortNumber);
-                    return;
-                }
-
                 RelayOutput.Register();
 
                 RelayOutput.StateChange += RelayOutput_StateChange;
@@ -67,36 +61,33 @@ namespace PepperDash.Essentials.Core.CrestronIO
             {
                 if (!Global.ControlSystem.SupportsRelay)
                 {
-                    Debug.Console(0, "Processor does not support relays");
+                    Debug.Console(0, "GetRelayDevice: Processor does not support relays");
                     return null;
                 }
                 relayDevice = Global.ControlSystem;
-
-                return relayDevice.RelayPorts[dc.PortNumber];
             }
-            
-            var essentialsDevice = DeviceManager.GetDeviceForKey(dc.PortDeviceKey);
-            if (essentialsDevice == null)
+            else
             {
-                Debug.Console(0, "Device {0} was not found in Device Manager. Check configuration or for errors with device.", dc.PortDeviceKey);
+                var relayDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IRelayPorts;
+                if (relayDev == null)
+                {
+                    Debug.Console(0, "GetRelayDevice: Device {0} is not a valid device", dc.PortDeviceKey);
                     return null;
                 }
-
-            relayDevice = essentialsDevice as IRelayPorts;
-            
+                relayDevice = relayDev;
+            }
             if (relayDevice == null)
             {
-                Debug.Console(0, "Device {0} is not a valid relay parent. Please check configuration.", dc.PortDeviceKey);
+                Debug.Console(0, "GetRelayDevice: Device '0' is not a valid IRelayPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
-            if (dc.PortNumber <= relayDevice.NumberOfRelayPorts)
+            if (dc.PortNumber > relayDevice.NumberOfRelayPorts)
             {
-                return relayDevice.RelayPorts[dc.PortNumber];
+                Debug.Console(0, "GetRelayDevice: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
             }
             
-            Debug.Console(0, "Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
-            return null;
+            return relayDevice.RelayPorts[dc.PortNumber];
         }
 
         #endregion
@@ -209,6 +200,58 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 var portDevice = new GenericRelayDevice(dc.Key, dc.Name, GetRelay, props);
 
                 return portDevice;
+
+
+                /*
+                if (props.PortDeviceKey == "processor")
+                    portDevice = Global.ControlSystem as IRelayPorts;
+                else
+                    portDevice = DeviceManager.GetDeviceForKey(props.PortDeviceKey) as IRelayPorts;
+
+                if (portDevice == null)
+                    Debug.Console(0, "Unable to add relay device with key '{0}'. Port Device does not support relays", key);
+                else
+                {
+                    var cs = (portDevice as CrestronControlSystem);
+
+                    if (cs != null)
+                    {
+                        // The relay is on a control system processor
+                        if (!cs.SupportsRelay || props.PortNumber > cs.NumberOfRelayPorts)
+                        {
+                            Debug.Console(0, "Port Device: {0} does not support relays or does not have enough relays");
+                            return null;
+                        }
+                    }
+                    else
+                    {
+                        // The relay is on another device type
+
+                        if (props.PortNumber > portDevice.NumberOfRelayPorts)
+                        {
+                            Debug.Console(0, "Port Device: {0} does not have enough relays");
+                            return null;
+                        }
+                    }
+
+                    Relay relay = portDevice.RelayPorts[props.PortNumber];
+
+                    if (!relay.Registered)
+                    {
+                        if (relay.Register() == eDeviceRegistrationUnRegistrationResponse.Success)
+                            return new GenericRelayDevice(key, relay);
+                        else
+                            Debug.Console(0, "Attempt to register relay {0} on device with key '{1}' failed.", props.PortNumber, props.PortDeviceKey);
+                    }
+                    else
+                    {
+                        return new GenericRelayDevice(key, relay);
+                    }
+
+                    // Future: Check if portDevice is 3-series card or other non control system that supports versiports
+                }
+                */
+
             }
         }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs

@@ -82,15 +82,6 @@ namespace PepperDash.Essentials.Core
 
                 IsRegistered.FireUpdate();
 			}
-            else
-            {
-                AddPostActivationAction(() =>
-                    {
-                        var response = Hardware.RegisterWithLogging(Key);
-
-                        IsRegistered.FireUpdate();
-                    });
-            }
 
             foreach (var f in Feedbacks)
             {

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs

@@ -8,19 +8,11 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     /// </summary>
     public interface IMobileControl : IKeyed
     {
-        void CreateMobileControlRoomBridge(EssentialsRoomBase room, IMobileControl parent);
+        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
 
         void LinkSystemMonitorToAppServer();
     }
 
-    /// <summary>
-    /// Describes a MobileSystemController that accepts IEssentialsRoom
-    /// </summary>
-    public interface IMobileControl3 : IMobileControl
-    {
-        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
-    }
-
     /// <summary>
     /// Describes a MobileControl Room Bridge
     /// </summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IPasswordPrompt.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Describes the functionality required to prompt a user to enter a password
-    /// </summary>
-    public interface IPasswordPrompt
-    {
-        /// <summary>
-        /// Notifies when a password is required or is entered incorrectly
-        /// </summary>
-        event EventHandler<PasswordPromptEventArgs> PasswordRequired;
-
-        /// <summary>
-        /// Submits the password
-        /// </summary>
-        /// <param name="password"></param>
-        void SubmitPassword(string password);
-    }
-
-    public class PasswordPromptEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Indicates if the last submitted password was incorrect
-        /// </summary>
-        public bool LastAttemptWasIncorrect { get; private set; }
-
-        /// <summary>
-        /// Indicates that the login attempt has failed
-        /// </summary>
-        public bool LoginAttemptFailed { get; private set; }
-
-        /// <summary>
-        /// Indicates that the process was cancelled and the prompt should be dismissed
-        /// </summary>
-        public bool LoginAttemptCancelled { get; private set; }
-
-        /// <summary>
-        /// A message to be displayed to the user
-        /// </summary>
-        public string Message { get; private set; }
-
-        public PasswordPromptEventArgs(bool lastAttemptIncorrect, bool loginFailed, bool loginCancelled, string message)
-        {
-            LastAttemptWasIncorrect = lastAttemptIncorrect;
-            LoginAttemptFailed = loginFailed;
-            LoginAttemptCancelled = loginCancelled;
-            Message = message;
-        }
-    }
-}

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

@@ -57,7 +57,7 @@ namespace PepperDash.Essentials.Core
 
         public DescriptionAttribute(string description)
         {
-            //Debug.Console(2, "Setting Description: {0}", description);
+            Debug.Console(2, "Setting Description: {0}", description);
             _Description = description;
         }
 
@@ -74,7 +74,7 @@ namespace PepperDash.Essentials.Core
 
         public ConfigSnippetAttribute(string configSnippet)
         {
-            //Debug.Console(2, "Setting Config Snippet {0}", configSnippet);
+            Debug.Console(2, "Setting Config Snippet {0}", configSnippet);
             _ConfigSnippet = configSnippet;
         }
 
@@ -103,7 +103,7 @@ namespace PepperDash.Essentials.Core
         {
             foreach (var typeName in TypeNames)
             {
-                //Debug.Console(2, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
+                Debug.Console(2, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
                 var descriptionAttribute = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
                 string description = descriptionAttribute[0].Description;
                 var snippetAttribute = typeof(T).GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];

essentials-framework/Essentials Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs

@@ -69,13 +69,13 @@ namespace PepperDash.Essentials.Core
 		/// <returns></returns>
 		public static void AddFactoryForType(string typeName, Func<DeviceConfig, IKeyed> method) 
 		{
-            //Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+			Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
             DeviceFactory.FactoryMethods.Add(typeName, new DeviceFactoryWrapper() { FactoryMethod = method});
 		}
 
         public static void AddFactoryForType(string typeName, string description, CType cType, Func<DeviceConfig, IKeyed> method)
         {
-            //Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+            Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
 
             if(FactoryMethods.ContainsKey(typeName))
             {
@@ -156,15 +156,6 @@ namespace PepperDash.Essentials.Core
                 Debug.Console(0, Debug.ErrorLogLevel.Error, "Exception occurred while creating device {0}: {1}", dc.Key, ex.Message);
 
                 Debug.Console(2, "{0}", ex.StackTrace);
-
-                if (ex.InnerException == null)
-                {
-                    return null;
-                }
-
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Inner exception while creating device {0}: {1}", dc.Key,
-                    ex.InnerException.Message);
-                Debug.Console(2, "{0}", ex.InnerException.StackTrace);
                 return null;
             }
         }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Text.RegularExpressions;
-using System.Globalization;
 using Crestron.SimplSharp;
 using System.Collections.Generic;
 using Crestron.SimplSharp.CrestronIO;
@@ -29,31 +28,6 @@ namespace PepperDash.Essentials.Core
 
         public static eCrestronSeries ProcessorSeries { get { return CrestronEnvironment.ProgramCompatibility; } }
 
-        // TODO: consider making this configurable later
-        public static IFormatProvider Culture = CultureInfo.CreateSpecificCulture("en-US");
-
-        /// <summary>
-        /// True when the processor type is a DMPS variant
-        /// </summary>
-        public static bool ControlSystemIsDmpsType
-        {
-            get
-            {
-                return ControlSystem.ControllerPrompt.ToLower().IndexOf("dmps") > -1;
-            }
-        }
-
-        /// <summary>
-        /// True when the processor type is a DMPS 4K variant
-        /// </summary>
-        public static bool ControlSystemIsDmps4kType
-        {
-            get
-            {
-                return ControlSystemIsDmpsType && ControlSystem.ControllerPrompt.ToLower().IndexOf("4k") > -1;
-            }
-        }
-
         /// <summary>
         /// The file path prefix to the folder containing configuration files
         /// </summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs

@@ -113,12 +113,9 @@ namespace PepperDash.Essentials.Core.Lighting
 
     public class LightingScene
     {
-        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
         public string Name { get; set; }
-        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
         public string ID { get; set; }
         bool _IsActive;
-        [JsonProperty("isActive", NullValueHandling = NullValueHandling.Ignore)]
         public bool IsActive 
         {
             get
@@ -131,8 +128,6 @@ namespace PepperDash.Essentials.Core.Lighting
                 IsActiveFeedback.FireUpdate();
             }
         }
-
-        [JsonIgnore]
         public BoolFeedback IsActiveFeedback { get; set; }
 
         public LightingScene()

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/CenOdtOccupancySensorBaseController.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Resources;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
@@ -62,8 +61,6 @@ namespace PepperDash.Essentials.Core
 
 		public BoolFeedback RawOccupancyUsFeedback { get; private set; }
 
-        public BoolFeedback IdentityModeFeedback { get; private set; }
-
 		// Debug properties
 		public bool InTestMode { get; private set; }
 
@@ -120,8 +117,6 @@ namespace PepperDash.Essentials.Core
 
 			RawOccupancyUsFeedback = new BoolFeedback(() => OccSensor.RawOccupancyDetectedByUltrasonicSensorFeedback.BoolValue);
 
-            IdentityModeFeedback = new BoolFeedback(()=>OccSensor.IdentityModeOnFeedback.BoolValue);
-
 			UltrasonicSensitivityInVacantStateFeedback = new IntFeedback(() => (int)OccSensor.UltrasonicSensorSensitivityInVacantStateFeedback);
 
 			UltrasonicSensitivityInOccupiedStateFeedback = new IntFeedback(() => (int)OccSensor.UltrasonicSensorSensitivityInOccupiedStateFeedback);
@@ -204,27 +199,6 @@ namespace PepperDash.Essentials.Core
             {
                 SetAndWhenVacatedState((bool)PropertiesConfig.AndWhenVacatedState);
             }
-
-            // TODO [ ] feature/cenoodtcpoe-sensor-sensitivity-configuration
-            if (PropertiesConfig.UsSensitivityOccupied != null)
-            {
-                SetUsSensitivityOccupied((ushort)PropertiesConfig.UsSensitivityOccupied);
-            }
-
-            if (PropertiesConfig.UsSensitivityVacant != null)
-            {
-                SetUsSensitivityVacant((ushort)PropertiesConfig.UsSensitivityVacant);
-            }
-
-            if (PropertiesConfig.PirSensitivityOccupied != null)
-            {
-                SetPirSensitivityOccupied((ushort)PropertiesConfig.PirSensitivityOccupied);
-            }
-
-            if (PropertiesConfig.PirSensitivityVacant != null)
-            {
-                SetPirSensitivityVacant((ushort)PropertiesConfig.PirSensitivityVacant);
-            }
         }
 
 		/// <summary>
@@ -305,20 +279,6 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 
-        /// <summary>
-        /// Sets the identity mode on or off
-        /// </summary>
-        /// <param name="state"></param>
-	    public void SetIdentityMode(bool state)
-        {
-            if (state)
-                OccSensor.IdentityModeOn();
-            else
-                OccSensor.IdentityModeOff();
-
-            Debug.Console(1, this, "Identity Mode: {0}", OccSensor.IdentityModeOnFeedback.BoolValue ? "On" : "Off");
-        }
-
 		/// <summary>
 		/// Enables or disables the PIR sensor
 		/// </summary>
@@ -546,54 +506,6 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 
-        /// <summary>
-        /// Sets the US sensor sensitivity for occupied state
-        /// </summary>
-        /// <param name="sensitivity"></param>
-	    public void SetUsSensitivityOccupied(ushort sensitivity)
-        {
-            var level = (eSensitivityLevel) sensitivity;
-            if (level == 0) return;
-
-            OccSensor.UltrasonicSensorSensitivityInOccupiedState = level;
-        }
-
-        /// <summary>
-        /// Sets the US sensor sensitivity for vacant state
-        /// </summary>
-        /// <param name="sensitivity"></param>
-        public void SetUsSensitivityVacant(ushort sensitivity)
-        {
-            var level = (eSensitivityLevel)sensitivity;
-            if (level == 0) return;
-
-            OccSensor.UltrasonicSensorSensitivityInVacantState = level;
-        }
-
-        /// <summary>
-        /// Sets the PIR sensor sensitivity for occupied state
-        /// </summary>
-        /// <param name="sensitivity"></param>
-        public void SetPirSensitivityOccupied(ushort sensitivity)
-        {
-            var level = (eSensitivityLevel)sensitivity;
-            if (level == 0) return;
-
-            OccSensor.PassiveInfraredSensorSensitivityInOccupiedState = level;
-        }
-
-        /// <summary>
-        /// Sets the PIR sensor sensitivity for vacant state
-        /// </summary>
-        /// <param name="sensitivity"></param>
-        public void SetPirSensitivityVacant(ushort sensitivity)
-        {
-            var level = (eSensitivityLevel)sensitivity;
-            if (level == 0) return;
-
-            OccSensor.PassiveInfraredSensorSensitivityInVacantState = level;
-        }
-
 		/// <summary>
 		/// Method to print current settings to console
 		/// </summary>
@@ -737,9 +649,6 @@ namespace PepperDash.Essentials.Core
 			occController.RawOccupancyPirFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyPirFeedback.JoinNumber]);
 			occController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback.JoinNumber]);
 
-            // Identity mode
-		    trilist.SetBoolSigAction(joinMap.IdentityMode.JoinNumber, occController.SetIdentityMode);
-            occController.IdentityModeFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IdentityModeFeedback.JoinNumber]);
 		}
 
 		public class CenOdtOccupancySensorBaseControllerFactory : EssentialsDeviceFactory<CenOdtOccupancySensorBaseController>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorPropertiesConfig.cs

@@ -47,35 +47,5 @@ namespace PepperDash.Essentials.Core
 
         [JsonProperty("andWhenVacatedState")]
         public bool? AndWhenVacatedState { get; set; }
-
-        // PoE Sensors: CenOdtCPoe
-
-        /// <summary>
-        /// Sets the sensitivity level for US while sensor is in occupied state
-        /// 1 = low; 2 = medium; 3 = high; 4 = xlow; 5 = 2xlow; 6 = 3xlow
-        /// </summary>
-        [JsonProperty("usSensitivityOccupied")]
-        public ushort? UsSensitivityOccupied { get; set; }
-
-        /// <summary>
-        /// Sets the sensitivity level for US while sensor is in vacant state
-        /// 1 = low; 2 = medium; 3 = high; 4 = xlow; 5 = 2xlow; 6 = 3xlow
-        /// </summary>
-        [JsonProperty("usSensitivityVacant")]
-        public ushort? UsSensitivityVacant { get; set; }
-
-        /// <summary>
-        /// Sets the sensitivity level for PIR while sensor is in occupied state
-        /// 1 = low; 2 = medium; 3 = high
-        /// </summary>
-        [JsonProperty("pirSensitivityOccupied")]
-        public ushort? PirSensitivityOccupied { get; set; }
-
-        /// <summary>
-        /// Sets the sensitivity level for PIR while sensor is in vacant state
-        /// 1 = low; 2 = medium; 3 = high
-        /// </summary>
-        [JsonProperty("pirSensitivityVacant")]
-        public ushort? PirSensitivityVacant { get; set; }
     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorController.cs

@@ -1,5 +1,4 @@
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.GeneralIO;
 using Newtonsoft.Json;
@@ -10,18 +9,15 @@ using PepperDash.Essentials.Core.Bridges.JoinMaps;
 using System;
 using System.Collections.Generic;
 using PepperDash.Essentials.Core.Config;
-using PepperDash_Essentials_Core.PartitionSensor;
 
 namespace PepperDash.Essentials.Core
 {
 	[Description("Wrapper class for GLS Cresnet Partition Sensor")]
 	public class GlsPartitionSensorController : CrestronGenericBridgeableBaseDevice, IPartitionStateProvider
 	{
-
-        public GlsPartitionSensorPropertiesConfig PropertiesConfig { get; private set; }
-        
 		private GlsPartCn _partitionSensor;
 
+		public StringFeedback NameFeedback { get; private set; }
 		public BoolFeedback EnableFeedback { get; private set; }
 		public BoolFeedback PartitionPresentFeedback { get; private set; }
 		public BoolFeedback PartitionNotSensedFeedback { get; private set; }
@@ -36,68 +32,20 @@ namespace PepperDash.Essentials.Core
 		public GlsPartitionSensorController(string key, Func<DeviceConfig, GlsPartCn> preActivationFunc, DeviceConfig config)
 			: base(key, config.Name)
 		{
-
-		    var props = config.Properties.ToObject<GlsPartitionSensorPropertiesConfig>();
-		    if (props != null)
-		    {
-		        PropertiesConfig = props;
-		    }
-		    else
-		    {
-		        Debug.Console(1, this, "props are null.  Unable to deserialize into GlsPartSensorPropertiesConfig");
-		    }
-
             AddPreActivationAction(() =>
             {
                 _partitionSensor = preActivationFunc(config);
 
                 RegisterCrestronGenericBase(_partitionSensor);
 
+                NameFeedback = new StringFeedback(() => Name);
                 EnableFeedback = new BoolFeedback(() => InTestMode ? TestEnableFeedback : _partitionSensor.EnableFeedback.BoolValue);
                 PartitionPresentFeedback = new BoolFeedback(() => InTestMode ? TestPartitionSensedFeedback : _partitionSensor.PartitionSensedFeedback.BoolValue);
                 PartitionNotSensedFeedback = new BoolFeedback(() => InTestMode ? !TestPartitionSensedFeedback : _partitionSensor.PartitionNotSensedFeedback.BoolValue);
                 SensitivityFeedback = new IntFeedback(() => InTestMode ? TestSensitivityFeedback : _partitionSensor.SensitivityFeedback.UShortValue);
 
-                if (_partitionSensor != null)
-                {
-                    _partitionSensor.BaseEvent += PartitionSensor_BaseEvent;                    
-                }
+                if (_partitionSensor != null) _partitionSensor.BaseEvent += PartitionSensor_BaseEvent;
             });
-
-            AddPostActivationAction(() =>
-            {
-                _partitionSensor.OnlineStatusChange += (o, a) =>
-                {
-                    if (a.DeviceOnLine)
-                    {
-                        ApplySettingsToSensorFromConfig();
-                    }
-                };
-
-                if (_partitionSensor.IsOnline)
-                {
-                    ApplySettingsToSensorFromConfig();
-                }
-            });
-		}        
-
-	    private void ApplySettingsToSensorFromConfig()
-	    {
-	        if (_partitionSensor.IsOnline == false) return;
-
-	        Debug.Console(1, this, "Attempting to apply settings to sensor from config");            
-
-	        if (PropertiesConfig.Sensitivity != null)
-	        {
-	            Debug.Console(1, this, "Sensitivity found, attempting to set value '{0}' from config",
-	                PropertiesConfig.Sensitivity);
-                _partitionSensor.Sensitivity.UShortValue = (ushort) PropertiesConfig.Sensitivity;
-	        }	        
-	        else
-	        {
-	            Debug.Console(1, this, "Sensitivity null, no value specified in config");
-	        }
-
 		}
 
 		private void PartitionSensor_BaseEvent(GenericBase device, BaseEventArgs args)
@@ -113,13 +61,11 @@ namespace PepperDash.Essentials.Core
 					}
 				case (GlsPartCn.PartitionSensedFeedbackEventId):
 					{
-                        Debug.Console(1, this, "Partition Sensed State: {0}", _partitionSensor.PartitionSensedFeedback.BoolValue);
 						PartitionPresentFeedback.FireUpdate();
 						break;
 					}
 				case (GlsPartCn.PartitionNotSensedFeedbackEventId):
 					{
-                        Debug.Console(1, this, "Partition Not Sensed State: {0}", _partitionSensor.PartitionNotSensedFeedback.BoolValue);
 						PartitionNotSensedFeedback.FireUpdate();
 						break;
 					}
@@ -187,24 +133,8 @@ namespace PepperDash.Essentials.Core
 			Debug.Console(1, this, "InTestMode: {0}, unable to set sensitivity value: {1}", InTestMode.ToString(), value);
 		}
 
-	    public void GetSettings()
-	    {
-	        var dash = new string('*', 50);
-	        CrestronConsole.PrintLine(string.Format("{0}\n", dash));
-
-	        Debug.Console(0, this, "Enabled State: {0}", _partitionSensor.EnableFeedback.BoolValue);
-
-	        Debug.Console(0, this, "Partition Sensed State: {0}", _partitionSensor.PartitionSensedFeedback.BoolValue);
-	        Debug.Console(0, this, "Partition Not Sensed State: {0}", _partitionSensor.PartitionNotSensedFeedback.BoolValue);
-
-	        Debug.Console(0, this, "Sensitivity Value: {0}", _partitionSensor.SensitivityFeedback.UShortValue);
-
-	        CrestronConsole.PrintLine(string.Format("{0}\n", dash));
-	    }
-
 		public void SetEnableState(bool state)
 		{
-            Debug.Console(2, this, "Sensor is {0}, SetEnableState: {1}", _partitionSensor == null ? "null" : "not null", state);
 			if (_partitionSensor == null)
 				return;
 
@@ -213,7 +143,6 @@ namespace PepperDash.Essentials.Core
 
 		public void IncreaseSensitivity()
 		{
-            Debug.Console(2, this, "Sensor is {0}, IncreaseSensitivity", _partitionSensor == null ? "null" : "not null");
 			if (_partitionSensor == null)
 				return;
 
@@ -222,7 +151,6 @@ namespace PepperDash.Essentials.Core
 
 		public void DecreaseSensitivity()
 		{
-            Debug.Console(2, this, "Sensor is {0}, DecreaseSensitivity", _partitionSensor == null ? "null" : "not null");
 			if (_partitionSensor == null)
 				return;
 
@@ -231,7 +159,6 @@ namespace PepperDash.Essentials.Core
 
 		public void SetSensitivity(ushort value)
 		{
-            Debug.Console(2, this, "Sensor is {0}, SetSensitivity: {1}", _partitionSensor == null ? "null" : "not null", value);
 			if (_partitionSensor == null)
 				return;
 
@@ -258,21 +185,20 @@ namespace PepperDash.Essentials.Core
 			Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 			Debug.Console(0, this, "Linking to Bridge Type {0}", GetType().Name);
 
-            IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);            
-		    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = _partitionSensor.Name;
-			
-		    trilist.SetBoolSigAction(joinMap.Enable.JoinNumber, SetEnableState);
-            EnableFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Enable.JoinNumber]);
-
-            PartitionPresentFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionSensed.JoinNumber]);
-            PartitionNotSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionNotSensed.JoinNumber]);
-
+			// link input from simpl
+			trilist.SetSigTrueAction(joinMap.Enable.JoinNumber, () => SetEnableState(true));
+			trilist.SetSigFalseAction(joinMap.Enable.JoinNumber, () => SetEnableState(false));
 			trilist.SetSigTrueAction(joinMap.IncreaseSensitivity.JoinNumber, IncreaseSensitivity);
 			trilist.SetSigTrueAction(joinMap.DecreaseSensitivity.JoinNumber, DecreaseSensitivity);
-
-            SensitivityFeedback.LinkInputSig(trilist.UShortInput[joinMap.Sensitivity.JoinNumber]);
 			trilist.SetUShortSigAction(joinMap.Sensitivity.JoinNumber, SetSensitivity);
 
+			// link output to simpl
+			IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+			EnableFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Enable.JoinNumber]);
+			PartitionPresentFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionSensed.JoinNumber]);
+			PartitionNotSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionNotSensed.JoinNumber]);
+			SensitivityFeedback.LinkInputSig(trilist.UShortInput[joinMap.Sensitivity.JoinNumber]);
+
 			FeedbacksFireUpdates();
 
 			// update when device is online
@@ -289,7 +215,6 @@ namespace PepperDash.Essentials.Core
 			{
 				if (a.DeviceOnLine)
 				{
-				    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = _partitionSensor.Name;
 					FeedbacksFireUpdates();
 				}
 			};
@@ -298,6 +223,7 @@ namespace PepperDash.Essentials.Core
 		private void FeedbacksFireUpdates()
 		{
 			IsOnline.FireUpdate();
+			NameFeedback.FireUpdate();
 			EnableFeedback.FireUpdate();
 			PartitionPresentFeedback.FireUpdate();
 			PartitionNotSensedFeedback.FireUpdate();

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorPropertiesConfig.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Newtonsoft.Json;
-
-namespace PepperDash_Essentials_Core.PartitionSensor
-{
-    public class GlsPartitionSensorPropertiesConfig
-    {
-        /// <summary>
-        /// Sets the sensor sensitivity        
-        /// </summary>
-        /// <remarks>
-        /// The sensitivity range shall be between 1(lowest) to 10 (highest).
-        /// </remarks>
-        [JsonProperty("sensitivity")]
-        public ushort? Sensitivity { get; set; }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -182,7 +182,6 @@
     <Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />
     <Compile Include="Crestron IO\Inputs\IDigitalInput.cs" />
     <Compile Include="Crestron IO\IOPortConfig.cs" />
-    <Compile Include="Crestron IO\Relay\CenIoRy104Controller.cs" />
     <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
     <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
     <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />
@@ -204,7 +203,6 @@
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
-    <Compile Include="DeviceTypeInterfaces\IPasswordPrompt.cs" />
     <Compile Include="DeviceTypeInterfaces\ITvPresetsProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\LanguageLabel.cs" />
     <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
@@ -237,7 +235,6 @@
     <Compile Include="Occupancy\GlsOccupancySensorPropertiesConfig.cs" />
     <Compile Include="Occupancy\GlsOirOccupancySensorController.cs" />
     <Compile Include="PartitionSensor\EssentialsPartitionController.cs" />
-    <Compile Include="PartitionSensor\GlsPartitionSensorPropertiesConfig.cs" />
     <Compile Include="PartitionSensor\IPartitionStateProvider.cs" />
     <Compile Include="Occupancy\OccupancyAggregatorConfig.cs" />
     <Compile Include="Queues\ComsMessage.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.nuspec

@@ -14,7 +14,7 @@
     <tags>crestron 3series 4series</tags>
     <repository type="git" url="https://github.com/PepperDash/Essentials"/>
     <dependencies>
-      <dependency id="PepperDashCore" version="[1.0.45, 2.0.0)"/>
+      <dependency id="PepperDashCore" version="[1.0.45, 1.1.0)"/>
     </dependencies>
   </metadata>
   <files>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs

@@ -123,7 +123,7 @@ namespace PepperDash.Essentials
         /// <param name="fileName"></param>
         static LoadedAssembly LoadAssembly(string filePath)
         {
-            //Debug.Console(2, "Attempting to load {0}", filePath);
+            Debug.Console(2, "Attempting to load {0}", filePath);
             var assembly = Assembly.LoadFrom(filePath);
             if (assembly != null)
             {

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

@@ -11,8 +11,6 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
-using Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Core
 {
     /// <summary>
@@ -20,8 +18,6 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public abstract class EssentialsRoomBase : ReconfigurableDevice, IEssentialsRoom
     {
-
-
         /// <summary>
         ///
         /// </summary>
@@ -39,16 +35,6 @@ namespace PepperDash.Essentials.Core
 
         public bool OccupancyStatusProviderIsRemote { get; private set; }
 
-        public List<EssentialsDevice> EnvironmentalControlDevices { get; protected set; }
-
-        public bool HasEnvironmentalControlDevices
-        {
-            get
-            {
-                return EnvironmentalControlDevices != null && EnvironmentalControlDevices.Count > 0;
-            }
-        }
-
         protected abstract Func<bool> IsWarmingFeedbackFunc { get; }
         protected abstract Func<bool> IsCoolingFeedbackFunc { get; }
 
@@ -133,8 +119,6 @@ namespace PepperDash.Essentials.Core
         public EssentialsRoomBase(DeviceConfig config)
             : base(config)
         {
-            EnvironmentalControlDevices = new List<EssentialsDevice>();
-
             // Setup the ShutdownPromptTimer
             ShutdownPromptTimer = new SecondsCountdownTimer(Key + "-offTimer");
             ShutdownPromptTimer.IsRunningFeedback.OutputChange += (o, a) =>

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

@@ -15,7 +15,7 @@ namespace PepperDash.Essentials.Core
     /// <summary>
     /// Describes the basic functionality of an EssentialsRoom
     /// </summary>
-    public interface IEssentialsRoom : IKeyName, IReconfigurableDevice, IRunDefaultPresentRoute, IEnvironmentalControls
+    public interface IEssentialsRoom : IKeyName, IReconfigurableDevice
     {
         BoolFeedback OnFeedback { get; }
 
@@ -56,6 +56,7 @@ namespace PepperDash.Essentials.Core
         void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes);
 
         void PowerOnToDefaultOrLastSource();
+        bool RunDefaultPresentRoute();
 
         void SetDefaultLevels();
 

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

@@ -4,8 +4,6 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using PepperDash.Core;
-
 
 namespace PepperDash.Essentials.Core
 {
@@ -68,14 +66,6 @@ namespace PepperDash.Essentials.Core
         bool RunDefaultCallRoute();
     }
 
-    /// <summary>
-    /// Describes environmental controls available on a room such as lighting, shades, temperature, etc.
-    /// </summary>
-    public interface IEnvironmentalControls
-    {
-        List<EssentialsDevice> EnvironmentalControlDevices { get; }
 
-        bool HasEnvironmentalControlDevices { get; }
-    }
 
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Shades/Shade Interfaces.cs

@@ -31,7 +31,6 @@ namespace PepperDash.Essentials.Core.Shades
     public interface IShadesOpenCloseStop : IShadesOpenClose
     {
         void StopOrPreset();
-        string StopOrPresetButtonLabel { get; }
     }
 
 	/// <summary>

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

@@ -16,8 +16,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.DM.Config;
 
-namespace PepperDash.Essentials.DM
-{
+namespace PepperDash.Essentials.DM {
     /// <summary>
     /// Builds a controller for basic DM-RMCs with Com and IR ports and no control functions
     /// 
@@ -76,10 +75,8 @@ namespace PepperDash.Essentials.DM
         /// Factory method to create a new chassis controller from config data. Limited to 8x8 right now
         /// </summary>
         public static DmBladeChassisController GetDmChassisController(string key, string name,
-            string type, DMChassisPropertiesConfig properties)
-        {
-            try
-            {
+            string type, DMChassisPropertiesConfig properties) {
+            try {
                 type = type.ToLower();
                 uint ipid = properties.Control.IpIdInt;
 
@@ -88,8 +85,7 @@ namespace PepperDash.Essentials.DM
                 else if (type == "dmmd128x128") { chassis = new DmMd128x128(ipid, Global.ControlSystem); }
 
 
-                if (chassis == null)
-                {
+                if (chassis == null) {
                     return null;
                 }
 
@@ -97,13 +93,11 @@ namespace PepperDash.Essentials.DM
                 // add the cards and port names
                 foreach (var kvp in properties.InputSlots)
                     controller.AddInputBlade(kvp.Value, kvp.Key);
-                foreach (var kvp in properties.OutputSlots)
-                {
+                foreach (var kvp in properties.OutputSlots) {
                     controller.AddOutputBlade(kvp.Value, kvp.Key);
                 }
 
-                foreach (var kvp in properties.VolumeControls)
-                {
+                foreach (var kvp in properties.VolumeControls) {
                     // get the card
                     // check it for an audio-compatible type
                     // make a something-something that will make it work
@@ -129,8 +123,7 @@ namespace PepperDash.Essentials.DM
                 controller.PropertiesConfig = properties;
                 return controller;
             }
-            catch (System.Exception e)
-            {
+            catch (System.Exception e) {
                 Debug.Console(0, "Error creating DM chassis:\r{0}", e);
             }
             return null;
@@ -144,8 +137,7 @@ namespace PepperDash.Essentials.DM
         /// <param name="name"></param>
         /// <param name="chassis"></param>
         public DmBladeChassisController(string key, string name, BladeSwitch chassis)
-            : base(key, name, chassis)
-        {
+            : base(key, name, chassis) {
             Chassis = chassis;
             InputPorts = new RoutingPortCollection<RoutingInputPort>();
             OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
@@ -169,43 +161,33 @@ namespace PepperDash.Essentials.DM
             InputCardHdcpCapabilityFeedbacks = new Dictionary<uint, IntFeedback>();
             InputCardHdcpCapabilityTypes = new Dictionary<uint, eHdcpCapabilityType>();
 
-            for (uint x = 1; x <= Chassis.NumberOfOutputs; x++)
-            {
+            for (uint x = 1; x <= Chassis.NumberOfOutputs; x++) {
                 var tempX = x;
 
-                if (Chassis.Outputs[tempX] != null)
-                {
-                    VideoOutputFeedbacks[tempX] = new IntFeedback(() =>
-                    {
+                if (Chassis.Outputs[tempX] != null) {
+                    VideoOutputFeedbacks[tempX] = new IntFeedback(() => {
                         if (Chassis.Outputs[tempX].VideoOutFeedback != null) { return (ushort)Chassis.Outputs[tempX].VideoOutFeedback.Number; }
                         else { return 0; };
                     });
 
-                    OutputNameFeedbacks[tempX] = new StringFeedback(() =>
-                    {
-                        if (Chassis.Outputs[tempX].NameFeedback != null)
-                        {
+                    OutputNameFeedbacks[tempX] = new StringFeedback(() => {
+                        if (Chassis.Outputs[tempX].NameFeedback != null) {
                             return Chassis.Outputs[tempX].NameFeedback.StringValue;
                         }
-                        else
-                        {
+                        else {
                             return "";
                         }
                     });
-                    OutputVideoRouteNameFeedbacks[tempX] = new StringFeedback(() =>
-                    {
-                        if (Chassis.Outputs[tempX].VideoOutFeedback != null)
-                        {
+                    OutputVideoRouteNameFeedbacks[tempX] = new StringFeedback(() => {
+                        if (Chassis.Outputs[tempX].VideoOutFeedback != null) {
                             return Chassis.Outputs[tempX].VideoOutFeedback.NameFeedback.StringValue;
                         }
-                        else
-                        {
+                        else {
                             return "";
                         }
                     });
 
-                    OutputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() =>
-                    {
+                    OutputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => {
                         //if (Chassis.Outputs[tempX].Endpoint != null)
                         //    return Chassis.Outputs[tempX].Endpoint.IsOnline;
                         //else
@@ -213,43 +195,34 @@ namespace PepperDash.Essentials.DM
                     });
                 }
 
-                if (Chassis.Inputs[tempX] != null)
-                {
-                    UsbInputRoutedToFeebacks[tempX] = new IntFeedback(() =>
-                    {
+                if (Chassis.Inputs[tempX] != null) {
+                    UsbInputRoutedToFeebacks[tempX] = new IntFeedback(() => {
                         if (Chassis.Inputs[tempX].USBRoutedToFeedback != null) { return (ushort)Chassis.Inputs[tempX].USBRoutedToFeedback.Number; }
                         else { return 0; };
                     });
-                    VideoInputSyncFeedbacks[tempX] = new BoolFeedback(() =>
-                    {
+                    VideoInputSyncFeedbacks[tempX] = new BoolFeedback(() => {
                         if (Chassis.Inputs[tempX].VideoDetectedFeedback != null)
                             return Chassis.Inputs[tempX].VideoDetectedFeedback.BoolValue;
                         else
                             return false;
                     });
-                    InputNameFeedbacks[tempX] = new StringFeedback(() =>
-                    {
-                        if (Chassis.Inputs[tempX].NameFeedback != null)
-                        {
+                    InputNameFeedbacks[tempX] = new StringFeedback(() => {
+                        if (Chassis.Inputs[tempX].NameFeedback != null) {
                             return Chassis.Inputs[tempX].NameFeedback.StringValue;
                         }
-                        else
-                        {
+                        else {
                             return "";
                         }
                     });
 
-                    InputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() =>
-                    {
+                    InputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => {
                         return Chassis.Inputs[tempX].EndpointOnlineFeedback;
                     });
 
-                    InputCardHdcpCapabilityFeedbacks[tempX] = new IntFeedback(() =>
-                    {
+                    InputCardHdcpCapabilityFeedbacks[tempX] = new IntFeedback(() => {
                         var inputCard = Chassis.Inputs[tempX];
 
-                        if (inputCard.Card is DmHdmi4kInputBladeCard)
-                        {
+                        if (inputCard.Card is DmHdmi4kInputBladeCard) {
                             InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
 
                             if ((inputCard.Card as DmHdmi4kInputBladeCard).Hdmi4kInput.HdcpSupportOnFeedback.BoolValue)
@@ -258,8 +231,7 @@ namespace PepperDash.Essentials.DM
                                 return 0;
                         }
 
-                        if (inputCard.Card is DmC4kInputBladeCard)
-                        {
+                        if (inputCard.Card is DmC4kInputBladeCard) {
                             InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
 
                             if ((inputCard.Card as DmC4kInputBladeCard).DmInput.HdcpCapabilityFeedback.Equals(eHdcpCapabilityType.HdcpSupportOff))
@@ -280,56 +252,45 @@ namespace PepperDash.Essentials.DM
         /// </summary>
         /// <param name="type"></param>
         /// <param name="number"></param>
-        public void AddInputBlade(string type, uint number)
-        {
+        public void AddInputBlade(string type, uint number) {
             Debug.Console(2, this, "Adding input blade '{0}', slot {1}", type, number);
 
             type = type.ToLower();
 
-            if (type == "dmb4kihd")
-            {
+            if (type == "dmb4kihd") {
                 var inputBlade = new Dmb4kIHd(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs)
-                {
+                foreach (var item in inputBlade.Inputs) {
                     var card = (item.Card as DmHdmi4kInputBladeCard).Hdmi4kInput;
                     var cecPort = card as ICec;
                     AddHdmiInBladePorts(item.Number, cecPort);
                 }
             }
 
-            else if (type == "dmb4kihddnt")
-            {
+            else if (type == "dmb4kihddnt") {
                 var inputBlade = new Dmb4kIHd(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs)
-                {
+                foreach (var item in inputBlade.Inputs) {
                     var card = (item.Card as DmHdmi4kInputBladeCard).Hdmi4kInput;
                     var cecPort = card as ICec;
                     AddHdmiInBladePorts(item.Number, cecPort);
                 }
             }
 
-            else if (type == "dmb4kic")
-            {
+            else if (type == "dmb4kic") {
                 var inputBlade = new Dmb4kIC(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs)
-                {
+                foreach (var item in inputBlade.Inputs) {
                     AddDmInBladePorts(item.Number);
                 }
             }
 
-            else if (type == "dmbis")
-            {
+            else if (type == "dmbis") {
                 var inputBlade = new DmbIS(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs)
-                {
+                foreach (var item in inputBlade.Inputs) {
                     AddDmInMmFiberPorts(item.Number);
                 }
             }
-            else if (type == "dmbis2")
-            {
+            else if (type == "dmbis2") {
                 var inputBlade = new DmbIS2(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs)
-                {
+                foreach (var item in inputBlade.Inputs) {
                     AddDmInSmFiberPorts(item.Number);
                 }
             }
@@ -346,23 +307,19 @@ namespace PepperDash.Essentials.DM
         }
 
 
-        void AddHdmiInBladePorts(uint number, ICec cecPort)
-        {
+        void AddHdmiInBladePorts(uint number, ICec cecPort) {
             AddInputPortWithDebug(number, "hdmiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, cecPort);
         }
 
-        void AddDmInBladePorts(uint number)
-        {
+        void AddDmInBladePorts(uint number) {
             AddInputPortWithDebug(number, "dmCIn", eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat);
         }
 
-        void AddDmInMmFiberPorts(uint number)
-        {
+        void AddDmInMmFiberPorts(uint number) {
             AddInputPortWithDebug(number, "dmMmIn", eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber);
         }
 
-        void AddDmInSmFiberPorts(uint number)
-        {
+        void AddDmInSmFiberPorts(uint number) {
             AddInputPortWithDebug(number, "dmSmIn", eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber);
         }
 
@@ -371,81 +328,64 @@ namespace PepperDash.Essentials.DM
         /// </summary>
         /// <param name="type"></param>
         /// <param name="number"></param>
-        public void AddOutputBlade(string type, uint number)
-        {
+        public void AddOutputBlade(string type, uint number) {
             type = type.ToLower();
 
             Debug.Console(2, this, "Adding output blade '{0}', slot {1}", type, number);
-            if (type == "dmb4kohd")
-            {
+            if (type == "dmb4kohd") {
                 var outputBlade = new Dmb4KOHD(number, Chassis);
-                foreach (var item in outputBlade.Outputs)
-                {
+                foreach (var item in outputBlade.Outputs) {
                     AddHdmiOutBladePorts(item.Number);
                 }
             }
 
-            else if (type == "dmb4kohddnt")
-            {
+            else if (type == "dmb4kohddnt") {
                 var outputBlade = new Dmb4KOHD(number, Chassis);
-                foreach (var item in outputBlade.Outputs)
-                {
+                foreach (var item in outputBlade.Outputs) {
                     AddHdmiOutBladePorts(item.Number);
                 }
             }
 
-            else if (type == "dmb4koc")
-            {
+            else if (type == "dmb4koc") {
                 var outputBlade = new Dmb4KOC(number, Chassis);
-                foreach (var item in outputBlade.Outputs)
-                {
+                foreach (var item in outputBlade.Outputs) {
                     AddDmOutBladePorts(item.Number);
                 }
             }
-            else if (type == "dmb4koc")
-            {
+            else if (type == "dmb4koc") {
                 var outputBlade = new Dmb4KOC(number, Chassis);
-                foreach (var item in outputBlade.Outputs)
-                {
+                foreach (var item in outputBlade.Outputs) {
                     AddDmOutBladePorts(item.Number);
                 }
             }
-            else if (type == "dmbos")
-            {
+            else if (type == "dmbos") {
                 var outputBlade = new DmbOS(number, Chassis);
-                foreach (var item in outputBlade.Outputs)
-                {
+                foreach (var item in outputBlade.Outputs) {
                     AddDmOutMmFiberBladePorts(item.Number);
                 }
             }
-            else if (type == "dmbos2")
-            {
+            else if (type == "dmbos2") {
                 var outputBlade = new DmbOS2(number, Chassis);
-                foreach (var item in outputBlade.Outputs)
-                {
+                foreach (var item in outputBlade.Outputs) {
                     AddDmOutSmFiberBladePorts(item.Number);
                 }
             }
         }
 
-        void AddHdmiOutBladePorts(uint number)
-        {
-            AddOutputPortWithDebug(number, "hdmiOut", eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, Chassis.Outputs[number]);
+        void AddHdmiOutBladePorts(uint number) {
+            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("hdmiOut{0}", number) , eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, Chassis.Outputs[number]);
         }
 
-        void AddDmOutBladePorts(uint number)
-        {
-            AddOutputPortWithDebug(number, "dmOut", eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, Chassis.Outputs[number]);
+        void AddDmOutBladePorts(uint number) {
+            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("dmOut{0}", number), eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, Chassis.Outputs[number]);
         }
 
-        void AddDmOutMmFiberBladePorts(uint number)
-        {
-            AddOutputPortWithDebug(number, "dmMmOut", eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, Chassis.Outputs[number]);
+        void AddDmOutMmFiberBladePorts(uint number) {
+            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("dmOut{0}", number), eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, Chassis.Outputs[number]);
         }
 
-        void AddDmOutSmFiberBladePorts(uint number)
-        {
-            AddOutputPortWithDebug(number, "dmSmOut", eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, Chassis.Outputs[number]);
+        void AddDmOutSmFiberBladePorts(uint number) {
+            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("dmOut{0}", number), eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, Chassis.Outputs[number]);
         }
 
 
@@ -477,44 +417,23 @@ namespace PepperDash.Essentials.DM
         }
 
 
-        
-        /*void AddOutputPortWithDebug(string cardName, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector) {
+        /// <summary>
+        /// Adds OutputPort
+        /// </summary>
+        void AddOutputPortWithDebug(string cardName, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector) {
             var portKey = string.Format("{0}--{1}", cardName, portName);
             Debug.Console(2, this, "Adding output port '{0}'", portKey);
             OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this)
             {
-                FeedbackMatchObject = selector
+                FeedbackMatchObject = Chassis.Outputs[(uint)selector]
             });
-        }*/
-
-        /// <summary>
-        /// Adds OutputPort
-        /// </summary>
-        void AddOutputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector)
-        {
-            try
-            {
-                var portKey = string.Format("outputCard{0}--{1}", cardNum, portName);
-                Debug.Console(2, this, "Adding output port '{0}'", portKey);
-                var outputPort = new RoutingOutputPort(portKey, sigType, portType, selector, this)
-                {
-                    FeedbackMatchObject = Chassis.Outputs[cardNum]
-                };
-                OutputPorts.Add(outputPort);
-            }
-            catch (Exception ex)
-            {
-                Debug.Console(0, this, "Exception : {0}", ex);
-            }
-
         }
 
 
         /// <summary>
         /// 
         /// </summary>
-        void AddVolumeControl(uint number, Audio.Output audio)
-        {
+        void AddVolumeControl(uint number, Audio.Output audio) {
             VolumeControls.Add(number, new DmCardAudioOutputController(audio));
         }
 
@@ -524,43 +443,35 @@ namespace PepperDash.Essentials.DM
         //}
 
 
-        void Chassis_DMInputChange(Switch device, DMInputEventArgs args)
-        {
+        void Chassis_DMInputChange(Switch device, DMInputEventArgs args) {
 
-            switch (args.EventId)
-            {
-                case DMInputEventIds.EndpointOnlineEventId:
-                    {
+            switch (args.EventId) {
+                case DMInputEventIds.EndpointOnlineEventId: {
                         Debug.Console(2, this, "DM Input EndpointOnlineEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
                         InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                case DMInputEventIds.OnlineFeedbackEventId:
-                    {
+                case DMInputEventIds.OnlineFeedbackEventId: {
                         Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
                         InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                case DMInputEventIds.VideoDetectedEventId:
-                    {
+                case DMInputEventIds.VideoDetectedEventId: {
                         Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
                         VideoInputSyncFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                case DMInputEventIds.InputNameEventId:
-                    {
+                case DMInputEventIds.InputNameEventId: {
                         Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
                         InputNameFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                case DMInputEventIds.HdcpCapabilityFeedbackEventId:
-                    {
+                case DMInputEventIds.HdcpCapabilityFeedbackEventId: {
                         Debug.Console(2, this, "DM Input {0} HdcpCapabilityFeedbackEventId", args.Number);
                         InputCardHdcpCapabilityFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                default:
-                    {
+                default: {
                         Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);
                         break;
                     }
@@ -653,8 +564,7 @@ namespace PepperDash.Essentials.DM
         /// 
         /// </summary>
         /// <param name="pnt"></param>
-        void StartOffTimer(PortNumberType pnt)
-        {
+        void StartOffTimer(PortNumberType pnt) {
             if (RouteOffTimers.ContainsKey(pnt))
                 return;
             RouteOffTimers[pnt] = new CTimer(o => ExecuteSwitch(null, pnt.Selector, pnt.Type), RouteOffTime);
@@ -662,10 +572,8 @@ namespace PepperDash.Essentials.DM
 
 
         // Send out sigs when coming online
-        void IsOnline_OutputChange(object sender, EventArgs e)
-        {
-            if (IsOnline.BoolValue)
-            {
+        void IsOnline_OutputChange(object sender, EventArgs e) {
+            if (IsOnline.BoolValue) {
                 Chassis.EnableUSBBreakaway.BoolValue = true;
 
                 if (InputNames != null)
@@ -679,8 +587,7 @@ namespace PepperDash.Essentials.DM
 
         #region IRouting Members
 
-        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType sigType)
-        {
+        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType sigType) {
             Debug.Console(2, this, "Making an awesome DM route from {0} to {1} {2}", inputSelector, outputSelector, sigType);
 
             var input = inputSelector as DMInput; // Cast can sometimes fail
@@ -698,14 +605,11 @@ namespace PepperDash.Essentials.DM
             // Check to see if there's an off timer waiting on this and if so, cancel
             var key = new PortNumberType(output, sigType);
 
-            if (input == null)
-            {
+            if (input == null) {
                 StartOffTimer(key);
             }
-            else
-            {
-                if (RouteOffTimers.ContainsKey(key))
-                {
+            else {
+                if (RouteOffTimers.ContainsKey(key)) {
                     Debug.Console(2, this, "{0} cancelling route off due to new source", output);
                     RouteOffTimers[key].Stop();
                     RouteOffTimers.Remove(key);

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

@@ -8,7 +8,6 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
 using Crestron.SimplSharpPro.DM.Cards;
 using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpProInternal;
 using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -483,24 +482,6 @@ namespace PepperDash.Essentials.DM
             
         }
 
-        private void RegisterForInputResolutionFeedback(IVideoAttributesBasic input, uint number, RoutingInputPortWithVideoStatuses inputPort)
-        {
-            if (input == null)
-            {
-                return;
-            }
-
-            Debug.Console(1, this, "Registering for resolution feedback for input {0} using Routing Port {1}", number, inputPort.Key);
-
-            input.VideoAttributes.AttributeChange += (sender, args) =>
-            {
-                Debug.Console(1, this, "Input {0} resolution updated", number);
-
-                Debug.Console(1, this, "Updating resolution feedback for input {0}", number);
-                inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-            };
-        }
-
         /// <summary>
         /// 
         /// </summary>
@@ -516,191 +497,168 @@ namespace PepperDash.Essentials.DM
             {
                 case "dmchd":
                 {
-                    var inputCard = new DmcHd(number, Chassis);
-                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
+                    var inputCard = new DmcHd(number, this.Chassis);
+                    var cecPort = inputCard.HdmiInput as ICec;
+                    AddHdmiInCardPorts(number, cecPort);
                 }
                     break;
                 case "dmchddsp":
                 {
-                    var inputCard = new DmcHdDsp(number, Chassis);
-                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
+                    var inputCard = new DmcHdDsp(number, this.Chassis);
+                    var cecPort = inputCard.HdmiInput as ICec;
+                    AddHdmiInCardPorts(number, cecPort);
                 }
                     break;
                 case "dmc4khd":
                 {
-                    var inputCard = new Dmc4kHd(number, Chassis);
-                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
+                    var inputCard = new Dmc4kHd(number, this.Chassis);
+                    var cecPort = inputCard.HdmiInput as ICec;
+                    AddHdmiInCardPorts(number, cecPort);
                 }
                     break;
                 case "dmc4khddsp":
                 {
-                    var inputCard = new Dmc4kHdDsp(number, Chassis);
-                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
+                    var inputCard = new Dmc4kHdDsp(number, this.Chassis);
+                    var cecPort = inputCard.HdmiInput as ICec;
+                    AddHdmiInCardPorts(number, cecPort);
                 }
                     break;
                 case "dmc4kzhd":
                 {
-                    var inputCard = new Dmc4kzHd(number, Chassis);
-                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
-                    break;
+                    var inputCard = new Dmc4kzHd(number, this.Chassis);
+                    var cecPort = inputCard.HdmiInput as ICec;
+                    AddHdmiInCardPorts(number, cecPort);
                 }
+                    break;
                 case "dmc4kzhddsp":
                 {
-                    var inputCard = new Dmc4kzHdDsp(number, Chassis);
-                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
-                    break;
+                    var inputCard = new Dmc4kzHdDsp(number, this.Chassis);
+                    var cecPort = inputCard.HdmiInput as ICec;
+                    AddHdmiInCardPorts(number, cecPort);
                 }
+                    break;
                 case "dmcc":
                 {
-                    var inputCard = new DmcC(number, Chassis);
-                    //DmInput doesn't implement ICec...cast was resulting in null anyway
-                    AddDmInCardPorts(number, null, inputCard.DmInput);
+                    var inputCard = new DmcC(number, this.Chassis);
+                    var cecPort = inputCard.DmInput as ICec;
+                    AddDmInCardPorts(number, cecPort);
                 }
                     break;
                 case "dmccdsp":
                 {
-                    var inputCard = new DmcCDsp(number, Chassis);
-                    //DmInput doesn't implement ICec...cast was resulting in null anyway
-                    AddDmInCardPorts(number, null, inputCard.DmInput);
-                    break;
+                    var inputCard = new DmcCDsp(number, this.Chassis);
+                    var cecPort = inputCard.DmInput as ICec;
+                    AddDmInCardPorts(number, cecPort);
                 }
-                    
+                    break;
                 case "dmc4kc":
                 {
-                    var inputCard = new Dmc4kC(number, Chassis);
-                    AddDmInCardPorts(number, inputCard.DmInput,inputCard.DmInput);
-                    break;
+                    var inputCard = new Dmc4kC(number, this.Chassis);
+                    var cecPort = inputCard.DmInput as ICec;
+                    AddDmInCardPorts(number, cecPort);
                 }
-                    
+                    break;
                 case "dmc4kcdsp":
                 {
-                    var inputCard = new Dmc4kCDsp(number, Chassis);
-                    AddDmInCardPorts(number, inputCard.DmInput,inputCard.DmInput);
-                    break;
+                    var inputCard = new Dmc4kCDsp(number, this.Chassis);
+                    var cecPort = inputCard.DmInput as ICec;
+                    AddDmInCardPorts(number, cecPort);
                 }
-                    
+                    break;
                 case "dmc4kzc":
                 {
-                    var inputCard = new Dmc4kzC(number, Chassis);
-                    AddDmInCardPorts(number, inputCard.DmInput,inputCard.DmInput);
-                    break;
+                    var inputCard = new Dmc4kzC(number, this.Chassis);
+                    var cecPort = inputCard.DmInput as ICec;
+                    AddDmInCardPorts(number, cecPort);
                 }
-                   
+                    break;
                 case "dmc4kzcdsp":
                 {
-                    var inputCard = new Dmc4kzCDsp(number, Chassis);
-                    AddDmInCardPorts(number, inputCard.DmInput, inputCard.DmInput);
-                    break;
+                    var inputCard = new Dmc4kzCDsp(number, this.Chassis);
+                    var cecPort = inputCard.DmInput as ICec;
+                    AddDmInCardPorts(number, cecPort);
                 }
-                    
+                    break;
                 case "dmccat":
-                {
-                    var inputCard = new DmcCat(number, Chassis);
-                    AddDmInCardPorts(number, null, inputCard.DmInput);
+                    new DmcCat(number, this.Chassis);
+                    AddDmInCardPorts(number);
                     break;
-                }
                 case "dmccatdsp":
-                {
-                    var inputCard = new DmcCatDsp(number, Chassis);
-                    AddDmInCardPorts(number, null, inputCard.DmInput);
+                    new DmcCatDsp(number, this.Chassis);
+                    AddDmInCardPorts(number);
                     break;
-                }
                 case "dmcs":
-                {
-                    var inputCard = new DmcS(number, Chassis);
-                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, null, inputCard.DmInput);
+                    new DmcS(number, Chassis);
+                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber);
                     AddInCardHdmiAndAudioLoopPorts(number);
                     break;
-                }
                 case "dmcsdsp":
-                {
-                    var inputCard = new DmcSDsp(number, Chassis);
-                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, null, inputCard.DmInput);
+                    new DmcSDsp(number, Chassis);
+                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber);
                     AddInCardHdmiAndAudioLoopPorts(number);
                     break;
-                }
                 case "dmcs2":
-                {
-                    var inputCard = new DmcS2(number, Chassis);
-                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, null, inputCard.DmInput);
+                    new DmcS2(number, Chassis);
+                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber);
                     AddInCardHdmiAndAudioLoopPorts(number);
                     break;
-                }
                 case "dmcs2dsp":
-                {
-                    var inputCard = new DmcS2Dsp(number, Chassis);
-                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, null, inputCard.DmInput);
+                    new DmcS2Dsp(number, Chassis);
+                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber);
                     AddInCardHdmiAndAudioLoopPorts(number);
                     break;
-                }
                 case "dmcsdi":
-                {
-                    var inputCard = new DmcSdi(number, Chassis);
-                    AddInputPortWithDebug(number, "sdiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Sdi, null, inputCard.SdiInput);
+                    new DmcSdi(number, Chassis);
+                    AddInputPortWithDebug(number, "sdiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Sdi);
                     AddOutputPortWithDebug(string.Format("inputCard{0}", number), "sdiOut", eRoutingSignalType.Audio | eRoutingSignalType.Video,
                         eRoutingPortConnectionType.Sdi, null);
                     AddInCardHdmiAndAudioLoopPorts(number);
                     break;
-                }
                 case "dmcdvi":
-                {
-                    var inputCard = new DmcDvi(number, Chassis);
-                    AddInputPortWithDebug(number, "dviIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Dvi, null, inputCard.DviInput);
+                    new DmcDvi(number, Chassis);
+                    AddInputPortWithDebug(number, "dviIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Dvi);
                     AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                     AddInCardHdmiLoopPort(number);
                     break;
-                }
                 case "dmcvga":
-                {
-                    var inputCard = new DmcVga(number, Chassis);
-                    AddInputPortWithDebug(number, "vgaIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, null, inputCard.VgaInput);
+                    new DmcVga(number, Chassis);
+                    AddInputPortWithDebug(number, "vgaIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Vga);
                     AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                     AddInCardHdmiLoopPort(number);
                     break;
-                }
                 case "dmcvidbnc":
-                {
-                    var inputCard = new DmcVidBnc(number, Chassis);
-                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component, null, inputCard.VideoInput);
+                    new DmcVidBnc(number, Chassis);
+                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component);
                     AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                     AddInCardHdmiLoopPort(number);
                     break;
-                }
                 case "dmcvidrcaa":
-                {
-                    var inputCard = new DmcVidRcaA(number, Chassis);
-                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component, null, inputCard.VideoInput);
+                    new DmcVidRcaA(number, Chassis);
+                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component);
                     AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                     AddInCardHdmiLoopPort(number);
                     break;
-                }
                 case "dmcvidrcad":
-                {
-                    var inputCard = new DmcVidRcaD(number, Chassis);
-                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component, null, inputCard.VideoInput);
+                    new DmcVidRcaD(number, Chassis);
+                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component);
                     AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.DigitalAudio);
                     AddInCardHdmiLoopPort(number);
                     break;
-                }
                 case "dmcvid4":
-                {
-                    var inputCard = new DmcVid4(number, Chassis);
+                    new DmcVid4(number, Chassis);
                     AddInputPortWithDebug(number, "compositeIn1", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                     AddInputPortWithDebug(number, "compositeIn2", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                     AddInputPortWithDebug(number, "compositeIn3", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                     AddInputPortWithDebug(number, "compositeIn4", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                     AddInCardHdmiLoopPort(number);
                     break;
-                }
                 case "dmcstr":
-                {
-                    var inputCard = new DmcStr(number, Chassis);
-                    AddInputPortWithDebug(number, "streamIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Streaming, null, inputCard.Source);
+                    new DmcStr(number, Chassis);
+                    AddInputPortWithDebug(number, "streamIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Streaming);
                     AddInCardHdmiAndAudioLoopPorts(number);
                     break;
             }
         }
-        }
 
         void AddDmInCardPorts(uint number)
         {
@@ -714,24 +672,12 @@ namespace PepperDash.Essentials.DM
             AddInCardHdmiAndAudioLoopPorts(number);
         }
 
-        void AddDmInCardPorts(uint number, ICec cecPort, IVideoAttributesBasic videoAttributes)
-        {
-            AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, cecPort, videoAttributes);
-            AddInCardHdmiAndAudioLoopPorts(number);
-        }
-
         void AddHdmiInCardPorts(uint number, ICec cecPort)
         {
             AddInputPortWithDebug(number, "hdmiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, cecPort);
             AddInCardHdmiAndAudioLoopPorts(number);
         }
 
-        void AddHdmiInCardPorts(uint number, ICec cecPort, IVideoAttributesBasic videoAttributes)
-        {
-            AddInputPortWithDebug(number, "hdmiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, cecPort, videoAttributes);
-            AddInCardHdmiAndAudioLoopPorts(number);
-        }
-
         void AddInCardHdmiAndAudioLoopPorts(uint number)
         {
             AddOutputPortWithDebug(string.Format("inputCard{0}", number), "hdmiLoopOut", eRoutingSignalType.Audio | eRoutingSignalType.Video,
@@ -870,55 +816,20 @@ namespace PepperDash.Essentials.DM
         /// </summary>
         void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType)
         {
-            //Cast is necessary here to determine the correct overload
-            AddInputPortWithDebug(cardNum, portName, sigType, portType, null, null);
-        }
-
-        private void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType,
-            eRoutingPortConnectionType portType, ICec cecPort)
-        {
-            //Cast is necessary here to determine the correct overload
-            AddInputPortWithDebug(cardNum, portName, sigType, portType, cecPort, null);
+            AddInputPortWithDebug(cardNum, portName, sigType, portType, null);
         }
 
         /// <summary>
-        /// Adds InputPort and sets Port as ICec object. If videoAttributesBasic is defined, RoutingPort will be RoutingInputPortWithVideoStatuses
+        /// Adds InputPort and sets Port as ICec object
         /// </summary>
-        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, ICec cecPort, IVideoAttributesBasic videoAttributesBasic)
+        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, ICec cecPort)
         {
             var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
             Debug.Console(2, this, "Adding input port '{0}'", portKey);
-
-            RoutingInputPort inputPort;
-
-            if (videoAttributesBasic != null)
-            {
-                Debug.Console(1, this, "card {0} supports IVideoAttributesBasic", cardNum);
-                var statusFuncs = new VideoStatusFuncsWrapper
-                {
-                    VideoResolutionFeedbackFunc = () =>
-                    {
-                        var resolution = videoAttributesBasic.VideoAttributes.GetVideoResolutionString();
-                        Debug.Console(1, this, "Updating resolution for input {0}. New resolution: {1}", cardNum, resolution);
-                        return resolution;
-                    }
-                };
-                inputPort = new RoutingInputPortWithVideoStatuses(portKey, sigType, portType,
-                    Chassis.Inputs[cardNum], this, statusFuncs)
+            var inputPort = new RoutingInputPort(portKey, sigType, portType, Chassis.Inputs[cardNum], this)
             {
                 FeedbackMatchObject = Chassis.Inputs[cardNum]
-                };
-
-                RegisterForInputResolutionFeedback(videoAttributesBasic, cardNum, inputPort as RoutingInputPortWithVideoStatuses);
-            }
-            else
-            {
-                inputPort = new RoutingInputPort(portKey, sigType, portType,
-                    Chassis.Inputs[cardNum], this)
-                {
-                    FeedbackMatchObject = Chassis.Inputs[cardNum]
-                };
-            }
+            }; ;
 
             if (cecPort != null)
                 inputPort.Port = cecPort;
@@ -1078,23 +989,6 @@ namespace PepperDash.Essentials.DM
                                 Debug.Console(2, this, "No index of {0} found in InputStreamCardStateFeedbacks");
                             break;
                         }
-                    case DMInputEventIds.HorizontalResolutionFeedbackEventId:
-                    case DMInputEventIds.VerticalResolutionFeedbackEventId:
-                    case DMInputEventIds.FramesPerSecondFeedbackEventId:
-                    case DMInputEventIds.ResolutionEventId:
-                    {
-                        Debug.Console(1, this, "Input {0} resolution updated", args.Number);
-                        var inputPort =
-                            InputPorts.Cast<RoutingInputPortWithVideoStatuses>()
-                                .FirstOrDefault((ip) => ip.Key.Contains(String.Format("inputCard{0}", args.Number)));
-
-                        if (inputPort != null)
-                        {
-                            Debug.Console(1, this, "Updating resolution feedback for input {0}", args.Number);
-                            inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                        }
-                        break;
-                    }
                     default:
                         {
                             Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);
@@ -1156,7 +1050,7 @@ namespace PepperDash.Essentials.DM
                     var inputNumber = Chassis.Outputs[output].VideoOutFeedback == null ? 0 : Chassis.
                     Outputs[output].VideoOutFeedback.Number;
 
-                    Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", Name, inputNumber, output);
+                    Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name, inputNumber, output);
 
                     if (VideoOutputFeedbacks.ContainsKey(output))
                     {
@@ -1183,7 +1077,7 @@ namespace PepperDash.Essentials.DM
                     var inputNumber = Chassis.Outputs[output].AudioOutFeedback == null ? 0 : Chassis.
                     Outputs[output].AudioOutFeedback.Number;
 
-                    Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", Name, inputNumber, output);
+                    Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", this.Name, inputNumber, output);
 
                     if (AudioOutputFeedbacks.ContainsKey(output))
                     {
@@ -1285,10 +1179,7 @@ namespace PepperDash.Essentials.DM
 
             var output = outputSelector as DMOutput;
 
-            var isUsbInput = (sigType & eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput;
-            var isUsbOutput = (sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput;
-
-            if (output == null && !(isUsbOutput || isUsbInput))
+            if (output == null)
             {
                 Debug.Console(0, this, Debug.ErrorLogLevel.Warning,
                     "Unable to execute switch for inputSelector {0} to outputSelector {1}", inputSelector,
@@ -1319,11 +1210,8 @@ namespace PepperDash.Essentials.DM
             if ((sigType & eRoutingSignalType.Video) == eRoutingSignalType.Video)
             {
                 Chassis.VideoEnter.BoolValue = true;
-                if (output != null)
-                {
                 output.VideoOut = input; //Chassis.Outputs[output].VideoOut = inCard;
             }
-            }
 
             if ((sigType & eRoutingSignalType.Audio) == eRoutingSignalType.Audio)
             {
@@ -1332,66 +1220,17 @@ namespace PepperDash.Essentials.DM
                 {
                     dmMdMnxn.AudioEnter.BoolValue = true;
                 }
-                if (output != null)
-                {
                 output.AudioOut = input;
-                }
+                //Chassis.Outputs[output].AudioOut = inCard;
             }
 
-            if ((sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput)
-                
+            if ((sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput || (sigType & eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput)
             {
                 Chassis.USBEnter.BoolValue = true;
-                if (inputSelector == null && output != null)
-                {
-                    //clearing the route is intended
-                    output.USBRoutedTo = null;
-                    return;
-                }
-
-                if (inputSelector != null && input == null)
-                {
-                    //input selector is DMOutput...we're doing a out to out route
-                    var tempInput = inputSelector as DMOutput;
-
-                    if (tempInput == null || output == null)
-                    {
-                        return;
-                    }
-                    output.USBRoutedTo = tempInput;
-                    return;
-                }
-
-                if (input != null & output != null)
-                {
                 output.USBRoutedTo = input;
             }
-            }
 
-            if((sigType & eRoutingSignalType.UsbInput) != eRoutingSignalType.UsbInput)
-            {
-                return;
         }
-
-            Chassis.USBEnter.BoolValue = true;
-            if (output != null)
-            {
-                output.USBRoutedTo = input;
-                return;
-            }
-            var tempOutput = outputSelector as DMInput;
-
-            if (tempOutput == null)
-            {
-                Debug.Console(0, this, Debug.ErrorLogLevel.Warning,
-                    "Unable to execute switch for inputSelector {0} to outputSelector {1}", inputSelector,
-                    outputSelector);
-                return;
-            }
-
-            tempOutput.USBRoutedTo = input;
-        }
-
         #endregion
 
         #region IRoutingNumeric Members
@@ -1404,10 +1243,8 @@ namespace PepperDash.Essentials.DM
 
             DMInputOutputBase dmCard;
 
-            //Routing Input to Input or Output to Input
             if ((sigType & eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput)
             {
-                Debug.Console(2, this, "Executing USB Input switch.\r\n in:{0} output: {1}", inputSelector, outputSelector);
                 if (outputSelector > chassisSize)
                 {
                     uint outputIndex;
@@ -1427,14 +1264,13 @@ namespace PepperDash.Essentials.DM
                     dmCard = Chassis.Inputs[inputSelector];
                 }
 
-                ExecuteSwitch(dmCard, Chassis.Inputs[outputSelector], sigType);
+                ExecuteSwitch(dmCard, Chassis.Outputs[outputSelector], sigType);
                 return;
             }
             if ((sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput)
             {
                 Debug.Console(2, this, "Executing USB Output switch.\r\n in:{0} output: {1}", inputSelector, outputSelector);
 
-                //routing Output to Output or Input to Output
                 if (inputSelector > chassisSize)
                 {
                     //wanting to route an output to an output. Subtract chassis size and get output, unless it's 8x8
@@ -1552,16 +1388,6 @@ namespace PepperDash.Essentials.DM
             {
                 trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber + ioSlotJoin].UShortValue = 1;
             }
-
-            var videoStatus = inputPort as RoutingInputPortWithVideoStatuses;
-
-            if (videoStatus == null)
-            {
-                return;
-            }
-
-            Debug.Console(1, this, "Linking {0} to join {1} for resolution feedback.", videoStatus.Key, joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin);
-            videoStatus.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin]);
         }
 
         private void LinkStreamInputToApi(BasicTriList trilist, uint ioSlot, DmChassisControllerJoinMap joinMap, uint ioSlotJoin)
@@ -1602,13 +1428,6 @@ namespace PepperDash.Essentials.DM
             InputStreamCardStateFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[join]);
 
             trilist.UShortInput[join].UShortValue = InputStreamCardStateFeedbacks[ioSlot].UShortValue;
-
-            var videoStatus = inputPort as RoutingInputPortWithVideoStatuses;
-
-            if (videoStatus != null)
-            {
-                videoStatus.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin]);
-            }
         }
 
         private void LinkStreamOutputToApi(BasicTriList trilist, uint ioSlot, DmChassisControllerJoinMap joinMap, uint ioSlotJoin)
@@ -1745,15 +1564,6 @@ namespace PepperDash.Essentials.DM
             {
                 trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber + ioSlotJoin].UShortValue = 1;
             }
-
-            var videoStatus = inputPort as RoutingInputPortWithVideoStatuses;
-
-            if (videoStatus == null)
-            {
-                return;
-            }
-            Debug.Console(1, this, "Linking {0} to join {1} for resolution feedback.", videoStatus.Key, joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin);
-            videoStatus.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin]);
         }
 
         private void LinkAdvancedTxToApi(BasicTriList trilist, DmChassisControllerJoinMap joinMap,
@@ -1771,9 +1581,7 @@ namespace PepperDash.Essentials.DM
 
             if (txRoutingInputs == null) return;
 
-            var inputPorts =
-                txRoutingInputs.InputPorts.Where(
-                    (p) => p.Port is EndpointHdmiInput || p.Port is EndpointDisplayPortInput).ToList();
+            var inputPorts = txRoutingInputs.InputPorts.Where((p) => p.Port is EndpointHdmiInput || p.Port is EndpointDisplayPortInput).ToList();
 
             if (inputPorts.Count == 0)
             {
@@ -1806,19 +1614,6 @@ namespace PepperDash.Essentials.DM
 
             trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber + ioSlotJoin].UShortValue =
                 (ushort) transmitter.HdcpSupportCapability;
-
-
-            var videoStatus =
-                InputPorts[string.Format("inputCard{0}--dmIn", ioSlot)] as RoutingInputPortWithVideoStatuses;
-
-            if (videoStatus == null)
-            {
-                return;
-            }
-            Debug.Console(1, this, "Linking {0} to join {1} for resolution feedback.", videoStatus.Key,
-                joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin);
-            videoStatus.VideoStatus.VideoResolutionFeedback.LinkInputSig(
-                trilist.StringInput[joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin]);
         }
 
         private void LinkTxOnlineFeedbackToApi(BasicTriList trilist, uint ioSlot, DmChassisControllerJoinMap joinMap,
@@ -2101,15 +1896,15 @@ namespace PepperDash.Essentials.DM
             {
 
                 var props = JsonConvert.DeserializeObject
-                    <DMChassisPropertiesConfig>(dc.Properties.ToString());
-                return DmChassisController.
+                    <PepperDash.Essentials.DM.Config.DMChassisPropertiesConfig>(dc.Properties.ToString());
+                return PepperDash.Essentials.DM.DmChassisController.
                     GetDmChassisController(dc.Key, dc.Name, type, props);
             }
             else if (type.StartsWith("dmmd128x") || type.StartsWith("dmmd64x"))
             {
                 var props = JsonConvert.DeserializeObject
-                    <DMChassisPropertiesConfig>(dc.Properties.ToString());
-                return DmBladeChassisController.
+                    <PepperDash.Essentials.DM.Config.DMChassisPropertiesConfig>(dc.Properties.ToString());
+                return PepperDash.Essentials.DM.DmBladeChassisController.
                     GetDmChassisController(dc.Key, dc.Name, type, props);
             }
 

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

@@ -26,16 +26,9 @@ namespace PepperDash.Essentials.DM
         public CrestronControlSystem Dmps { get; set; }
         public ISystemControl SystemControl { get; private set; }
 
-        //Check if DMPS is a DMPS3-4K type for endpoint creation
-        public bool Dmps4kType { get; private set; }
-
         //IroutingNumericEvent
         public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
 
-        //Feedback for DMPS System Power
-        public BoolFeedback SystemPowerOnFeedback { get; private set; }
-        public BoolFeedback SystemPowerOffFeedback { get; private set; }
-
         // Feedbacks for EssentialDM
         public Dictionary<uint, IntFeedback> VideoOutputFeedbacks { get; private set; }
         public Dictionary<uint, IntFeedback> AudioOutputFeedbacks { get; private set; }
@@ -120,28 +113,9 @@ namespace PepperDash.Essentials.DM
         public DmpsRoutingController(string key, string name, ISystemControl systemControl)
             : base(key, name)
         {
-            Dmps = Global.ControlSystem;
             
-            switch (name.Replace("-", "").Replace("c", "").Replace("C", ""))
-            {
-                case "dmps34k50":
-                case "dmps34k100":
-                case "dmps34k150":
-                    SystemControl = systemControl as Dmps34K150CSystemControl;
-                    Dmps4kType = true;
-                    break;
-                case "dmps34k200":
-                case "dmps34k250":
-                case "dmps34k300":
-                case "dmps34k350":
-                    SystemControl = systemControl as Dmps34K300CSystemControl;
-                    Dmps4kType = true;
-                    break;
-                default:
-                    SystemControl = systemControl as Dmps3SystemControl;
-                    Dmps4kType = false;
-                    break;
-            }
+            Dmps = Global.ControlSystem;
+            SystemControl = systemControl;
 
             InputPorts = new RoutingPortCollection<RoutingInputPort>();
             OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
@@ -149,29 +123,6 @@ namespace PepperDash.Essentials.DM
             TxDictionary = new Dictionary<uint, string>();
             RxDictionary = new Dictionary<uint, string>();
 
-            SystemPowerOnFeedback = new BoolFeedback(() =>
-            {
-                if (SystemControl is Dmps3SystemControl)
-                {
-                    return ((Dmps3SystemControl)SystemControl).SystemPowerOnFeedBack.BoolValue;
-                }
-                else
-                {
-                    return false;
-                }
-            });
-            SystemPowerOffFeedback = new BoolFeedback(() =>
-            {
-                if (SystemControl is Dmps3SystemControl)
-                {
-                    return ((Dmps3SystemControl)SystemControl).SystemPowerOffFeedBack.BoolValue;
-                }
-                else
-                {
-                    return false;
-                }
-            });
-
             VideoOutputFeedbacks = new Dictionary<uint, IntFeedback>();
             AudioOutputFeedbacks = new Dictionary<uint, IntFeedback>();
             VideoInputSyncFeedbacks = new Dictionary<uint, BoolFeedback>();
@@ -203,7 +154,6 @@ namespace PepperDash.Essentials.DM
             // Subscribe to events
             Dmps.DMInputChange += Dmps_DMInputChange;
             Dmps.DMOutputChange += Dmps_DMOutputChange;
-            Dmps.DMSystemChange += Dmps_DMSystemChange;
 
             return base.CustomActivate();
         }
@@ -241,22 +191,6 @@ namespace PepperDash.Essentials.DM
             }
         }
 
-        public void SetPowerOn(bool a)
-        {
-            if (SystemControl is Dmps3SystemControl)
-            {
-                ((Dmps3SystemControl)SystemControl).SystemPowerOn();
-            }
-        }
-
-        public void SetPowerOff(bool a)
-        {
-            if (SystemControl is Dmps3SystemControl)
-            {
-                ((Dmps3SystemControl)SystemControl).SystemPowerOff();
-            }
-        }
-
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
             var joinMap = new DmpsRoutingControllerJoinMap(joinStart);
@@ -277,22 +211,9 @@ namespace PepperDash.Essentials.DM
 
             Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
-            //Link up system
-            trilist.SetBoolSigAction(joinMap.SystemPowerOn.JoinNumber, SetPowerOn);
-            trilist.SetBoolSigAction(joinMap.SystemPowerOff.JoinNumber, SetPowerOff);
-            if (SystemPowerOnFeedback != null)
-            {
-                SystemPowerOnFeedback.LinkInputSig(
-                    trilist.BooleanInput[joinMap.SystemPowerOn.JoinNumber]);
-            }
-            if (SystemPowerOffFeedback != null)
-            {
-                SystemPowerOffFeedback.LinkInputSig(
-                    trilist.BooleanInput[joinMap.SystemPowerOff.JoinNumber]);
-            }
-
             // Link up outputs
             LinkInputsToApi(trilist, joinMap);
+
             LinkOutputsToApi(trilist, joinMap);
         }
 
@@ -798,8 +719,8 @@ namespace PepperDash.Essentials.DM
 
         void Dmps_DMInputChange(Switch device, DMInputEventArgs args)
         {
-            try
-            {
+            //Debug.Console(2, this, "DMSwitch:{0} Input:{1} Event:{2}'", this.Name, args.Number, args.EventId.ToString());
+
             switch (args.EventId)
             {
                 case (DMInputEventIds.OnlineFeedbackEventId):
@@ -817,19 +738,11 @@ namespace PepperDash.Essentials.DM
                 case (DMInputEventIds.InputNameEventId):
                     {
                         Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
-                            if(InputNameFeedbacks.ContainsKey(args.Number))
-                            {
                         InputNameFeedbacks[args.Number].FireUpdate();
-                            }
                         break;
                     }
             }
         }
-            catch (Exception e)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "DMSwitch Input Change:{0} Input:{1} Event:{2}\rException: {3}", this.Name, args.Number, args.EventId.ToString(), e.ToString());
-            }
-        }
         void Dmps_DMOutputChange(Switch device, DMOutputEventArgs args)
         {
             Debug.Console(2, this, "DMOutputChange Output: {0} EventId: {1}", args.Number, args.EventId.ToString());
@@ -899,23 +812,6 @@ namespace PepperDash.Essentials.DM
 
         }
 
-        void Dmps_DMSystemChange(Switch device, DMSystemEventArgs args)
-        {
-            switch (args.EventId)
-            {
-                case DMSystemEventIds.SystemPowerOnEventId:
-                {
-                    SystemPowerOnFeedback.FireUpdate();
-                    break;
-                }
-                case DMSystemEventIds.SystemPowerOffEventId:
-                {
-                    SystemPowerOffFeedback.FireUpdate();
-                    break;
-                }
-            }
-        }
-
         /// <summary>
         /// 
         /// </summary>
@@ -983,6 +879,7 @@ namespace PepperDash.Essentials.DM
                     // NOTE THAT BITWISE COMPARISONS - TO CATCH ALL ROUTING TYPES 
                     if ((sigType & eRoutingSignalType.Video) == eRoutingSignalType.Video)
                     {
+                        
                             output.VideoOut = input;
                     }
 
@@ -1006,6 +903,7 @@ namespace PepperDash.Essentials.DM
 
                     if ((sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput)
                     {
+                        
                             output.USBRoutedTo = input;
                     }
 

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

@@ -37,8 +37,8 @@ namespace PepperDash.Essentials.DM.Chassis
 		public FeedbackCollection<StringFeedback> OutputNameFeedbacks { get; private set; }
 		public FeedbackCollection<StringFeedback> OutputRouteNameFeedbacks { get; private set; }
 		public FeedbackCollection<BoolFeedback> InputHdcpEnableFeedback { get; private set; }
-		public StringFeedback DeviceNameFeedback { get; private set; }
-        public BoolFeedback AutoRouteFeedback { get; private set; }
+		public FeedbackCollection<StringFeedback> DeviceNameFeedback { get; private set; }
+		public FeedbackCollection<BoolFeedback> AutoRouteFeedback { get; private set; }
 
 		#region Constructor
 
@@ -47,7 +47,6 @@ namespace PepperDash.Essentials.DM.Chassis
 			: base(key, name, chassis)
 		{
 			_Chassis = chassis;
-		    Name = name;
 
 			if (props == null)
 			{
@@ -60,7 +59,7 @@ namespace PepperDash.Essentials.DM.Chassis
 			{
 				foreach (var kvp in props.Inputs)
 				{
-					Debug.Console(1, this, "props.Inputs: {0}-{1}", kvp.Key, kvp.Value);
+					Debug.Console(0, this, "props.Inputs: {0}-{1}", kvp.Key, kvp.Value);
 				}
 				InputNames = props.Inputs;
 			}
@@ -68,44 +67,45 @@ namespace PepperDash.Essentials.DM.Chassis
 			{
 				foreach (var kvp in props.Outputs)
 				{
-					Debug.Console(1, this, "props.Outputs: {0}-{1}", kvp.Key, kvp.Value);
+					Debug.Console(0, this, "props.Outputs: {0}-{1}", kvp.Key, kvp.Value);
 				}
 				OutputNames = props.Outputs;
 			}
 
-            DeviceNameFeedback = new StringFeedback(()=>Name);		    
-
 			VideoInputSyncFeedbacks = new FeedbackCollection<BoolFeedback>();
 			VideoOutputRouteFeedbacks = new FeedbackCollection<IntFeedback>();
 			InputNameFeedbacks = new FeedbackCollection<StringFeedback>();
 			OutputNameFeedbacks = new FeedbackCollection<StringFeedback>();
 			OutputRouteNameFeedbacks = new FeedbackCollection<StringFeedback>();
 			InputHdcpEnableFeedback = new FeedbackCollection<BoolFeedback>();
+			DeviceNameFeedback = new FeedbackCollection<StringFeedback>();
+			AutoRouteFeedback = new FeedbackCollection<BoolFeedback>();
 
 			InputPorts = new RoutingPortCollection<RoutingInputPort>();
 			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
 
+			var deviceName = string.IsNullOrEmpty(this.Name) ? name : this.Name;
+			DeviceNameFeedback.Add(new StringFeedback(deviceName, () => deviceName));				
+
 			if (_Chassis.NumberOfInputs == 1)
 			{
 				_Chassis4x1 = _Chassis as HdMd4x14kE;
-                AutoRouteFeedback = new BoolFeedback(() => _Chassis4x1.AutoModeOnFeedback.BoolValue);			    
+				AutoRouteFeedback.Add(new BoolFeedback(deviceName + "-" + InputNames[1], () => _Chassis4x1.AutoModeOnFeedback.BoolValue));
 			}
 
 			for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
 			{
 				var index = i;
 				var inputName = InputNames[index];
-			    //_Chassis.Inputs[index].Name.StringValue = inputName;
-			    _Chassis.HdmiInputs[index].Name.StringValue = inputName;
+				_Chassis.Inputs[index].Name.StringValue = inputName;
 
 				InputPorts.Add(new RoutingInputPort(inputName, eRoutingSignalType.AudioVideo,
-					eRoutingPortConnectionType.Hdmi, _Chassis.HdmiInputs[index], this)
+					eRoutingPortConnectionType.Hdmi, index, this)
 				{
 					FeedbackMatchObject = _Chassis.HdmiInputs[index]
 				});
 				VideoInputSyncFeedbacks.Add(new BoolFeedback(inputName, () => _Chassis.Inputs[index].VideoDetectedFeedback.BoolValue));
-                //InputNameFeedbacks.Add(new StringFeedback(inputName, () => _Chassis.Inputs[index].NameFeedback.StringValue));
-                InputNameFeedbacks.Add(new StringFeedback(inputName, () => InputNames[index]));
+				InputNameFeedbacks.Add(new StringFeedback(inputName, () => _Chassis.Inputs[index].Name.StringValue));
 				InputHdcpEnableFeedback.Add(new BoolFeedback(inputName, () => _Chassis.HdmiInputs[index].HdmiInputPort.HdcpSupportOnFeedback.BoolValue));
 			}
 
@@ -113,15 +113,14 @@ namespace PepperDash.Essentials.DM.Chassis
 			{
 				var index = i;
 				var outputName = OutputNames[index];
-				//_Chassis.Outputs[index].Name.StringValue = outputName;
-                //_Chassis.HdmiOutputs[index].Name.StringValue = outputName;
+				//_Chassis.Outputs[i].Name.StringValue = outputName;
 
 				OutputPorts.Add(new RoutingOutputPort(outputName, eRoutingSignalType.AudioVideo,
-					eRoutingPortConnectionType.Hdmi, _Chassis.HdmiOutputs[index], this)
+					eRoutingPortConnectionType.Hdmi, index, this)
 				{
 					FeedbackMatchObject = _Chassis.HdmiOutputs[index]
 				});
-				VideoOutputRouteFeedbacks.Add(new IntFeedback(outputName, () => _Chassis.Outputs[index].VideoOutFeedback == null ? 0 : (int)_Chassis.Outputs[index].VideoOutFeedback.Number));
+				VideoOutputRouteFeedbacks.Add(new IntFeedback(outputName, () => (int)_Chassis.Outputs[index].VideoOutFeedback.Number));
 				OutputNameFeedbacks.Add(new StringFeedback(outputName, () => OutputNames[index]));
 				OutputRouteNameFeedbacks.Add(new StringFeedback(outputName, () => _Chassis.Outputs[index].VideoOutFeedback.NameFeedback.StringValue));
 			}
@@ -186,10 +185,9 @@ namespace PepperDash.Essentials.DM.Chassis
 
 		public void AddFeedbackCollections()
 		{
-            AddFeedbackToList(DeviceNameFeedback);
 			AddCollectionsToList(VideoInputSyncFeedbacks, InputHdcpEnableFeedback);
 			AddCollectionsToList(VideoOutputRouteFeedbacks);
-			AddCollectionsToList(InputNameFeedbacks, OutputNameFeedbacks, OutputRouteNameFeedbacks);
+			AddCollectionsToList(InputNameFeedbacks, OutputNameFeedbacks, OutputRouteNameFeedbacks, DeviceNameFeedback);
 		}
 
 		#endregion
@@ -277,20 +275,10 @@ namespace PepperDash.Essentials.DM.Chassis
 
 		public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
 		{
-            var input = inputSelector as HdMdNxMHdmiInput; //changed from HdMdNxM4kzEHdmiInput;
-		    var output = outputSelector as HdMdNxMHdmiOutput;
-            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 HdMdNxMHdmiOutput");
-		        return;
-		    }
-
 			// Try to make switch only when necessary.  The unit appears to toggle when already selected.
-			var current = output.VideoOut;
-		    if (current != input)
-		        output.VideoOut = input;		        
+			var current = _Chassis.HdmiOutputs[(uint)outputSelector].VideoOut;
+			if (current != _Chassis.HdmiInputs[(uint)inputSelector])
+				_Chassis.HdmiOutputs[(uint)outputSelector].VideoOut = _Chassis.HdmiInputs[(uint)inputSelector];
 		}
 
 		#endregion
@@ -299,12 +287,7 @@ namespace PepperDash.Essentials.DM.Chassis
 
 		public void ExecuteNumericSwitch(ushort inputSelector, ushort outputSelector, eRoutingSignalType signalType)
 		{
-            var input = inputSelector == 0 ? null : _Chassis.HdmiInputs[inputSelector];
-		    var output = _Chassis.HdmiOutputs[outputSelector];
-
-            Debug.Console(2, this, "ExecuteNumericSwitch: input={0} output={1}", input, output);
-
-			ExecuteSwitch(input, output, signalType);
+			ExecuteSwitch(inputSelector, outputSelector, signalType);
 		}
 
 		#endregion
@@ -332,51 +315,52 @@ namespace PepperDash.Essentials.DM.Chassis
 			}
 
 			IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-			DeviceNameFeedback.LinkInputSig(trilist.StringInput[joinMap.Name.JoinNumber]);
+			DeviceNameFeedback[this.Name].LinkInputSig(trilist.StringInput[joinMap.Name.JoinNumber]);
 
 			if (_Chassis4x1 != null)
 			{
 				trilist.SetSigTrueAction(joinMap.EnableAutoRoute.JoinNumber, () => _Chassis4x1.AutoModeOn());
 				trilist.SetSigFalseAction(joinMap.EnableAutoRoute.JoinNumber, () => _Chassis4x1.AutoModeOff());
-				AutoRouteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableAutoRoute.JoinNumber]);
+				AutoRouteFeedback[this.Name + "-" + InputNames[1]].LinkInputSig(trilist.BooleanInput[joinMap.EnableAutoRoute.JoinNumber]);
 			}
 
 			for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
 			{
 				var joinIndex = i - 1;
-			    var input = i;
 				//Digital
-				VideoInputSyncFeedbacks[InputNames[input]].LinkInputSig(trilist.BooleanInput[joinMap.InputSync.JoinNumber + joinIndex]);
-				InputHdcpEnableFeedback[InputNames[input]].LinkInputSig(trilist.BooleanInput[joinMap.EnableInputHdcp.JoinNumber + joinIndex]);
-				InputHdcpEnableFeedback[InputNames[input]].LinkComplementInputSig(trilist.BooleanInput[joinMap.DisableInputHdcp.JoinNumber + joinIndex]);
-				trilist.SetSigTrueAction(joinMap.EnableInputHdcp.JoinNumber + joinIndex, () => EnableHdcp(input));
-				trilist.SetSigTrueAction(joinMap.DisableInputHdcp.JoinNumber + joinIndex, () => DisableHdcp(input));
+				VideoInputSyncFeedbacks[InputNames[i]].LinkInputSig(trilist.BooleanInput[joinMap.InputSync.JoinNumber + joinIndex]);
+				InputHdcpEnableFeedback[InputNames[i]].LinkInputSig(trilist.BooleanInput[joinMap.EnableInputHdcp.JoinNumber + joinIndex]);
+				InputHdcpEnableFeedback[InputNames[i]].LinkComplementInputSig(trilist.BooleanInput[joinMap.DisableInputHdcp.JoinNumber + joinIndex]);
+				trilist.SetSigTrueAction(joinMap.EnableInputHdcp.JoinNumber + joinIndex, () => EnableHdcp(i));
+				trilist.SetSigTrueAction(joinMap.DisableInputHdcp.JoinNumber + joinIndex, () => DisableHdcp(i));
 
 				//Serial
-				InputNameFeedbacks[InputNames[input]].LinkInputSig(trilist.StringInput[joinMap.InputName.JoinNumber + joinIndex]);                
+				InputNameFeedbacks[InputNames[i]].LinkInputSig(trilist.StringInput[joinMap.InputName.JoinNumber + joinIndex]);
 			}
 
 			for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
 			{
 				var joinIndex = i - 1;
-			    var output = i;
 				//Analog
-				VideoOutputRouteFeedbacks[OutputNames[output]].LinkInputSig(trilist.UShortInput[joinMap.OutputRoute.JoinNumber + joinIndex]);
-				trilist.SetUShortSigAction(joinMap.OutputRoute.JoinNumber + joinIndex, (a) => ExecuteNumericSwitch(a, (ushort) output, eRoutingSignalType.AudioVideo));
+				VideoOutputRouteFeedbacks[OutputNames[i]].LinkInputSig(trilist.UShortInput[joinMap.OutputRoute.JoinNumber + joinIndex]);
+				trilist.SetUShortSigAction(joinMap.OutputRoute.JoinNumber + joinIndex, (a) => ExecuteSwitch(a, i, eRoutingSignalType.AudioVideo));
 
 				//Serial
-				OutputNameFeedbacks[OutputNames[output]].LinkInputSig(trilist.StringInput[joinMap.OutputName.JoinNumber + joinIndex]);
-				OutputRouteNameFeedbacks[OutputNames[output]].LinkInputSig(trilist.StringInput[joinMap.OutputRoutedName.JoinNumber + joinIndex]);
+				OutputNameFeedbacks[OutputNames[i]].LinkInputSig(trilist.StringInput[joinMap.OutputName.JoinNumber + joinIndex]);
+				OutputRouteNameFeedbacks[OutputNames[i]].LinkInputSig(trilist.StringInput[joinMap.OutputRoutedName.JoinNumber + joinIndex]);
 			}
 
 			_Chassis.OnlineStatusChange += Chassis_OnlineStatusChange;
 
 			trilist.OnlineStatusChange += (d, args) =>
 			{
-			    if (!args.DeviceOnLine)  return;
-
-                // feedback updates was moved to the Chassis_OnlineStatusChange 
-                // due to the amount of time it takes for the device to come online                
+			    if (args.DeviceOnLine)
+			    {
+			        foreach (var feedback in Feedbacks)
+			        {
+			            feedback.FireUpdate();
+			        }
+			    }
 			};
 		}
 
@@ -387,76 +371,45 @@ namespace PepperDash.Essentials.DM.Chassis
 
 		void Chassis_OnlineStatusChange(Crestron.SimplSharpPro.GenericBase currentDevice, Crestron.SimplSharpPro.OnlineOfflineEventArgs args)
 		{
-            IsOnline.FireUpdate();
-
 			if (!args.DeviceOnLine) return;
+			for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
+			{
+				_Chassis.Inputs[i].Name.StringValue = InputNames[i];
+			}
+			for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
+			{
+				_Chassis.Outputs[i].Name.StringValue = OutputNames[i];
+			}
 
 			foreach (var feedback in Feedbacks)
 			{
 				feedback.FireUpdate();
 			}
-
-            if (_Chassis4x1 != null)
-                AutoRouteFeedback.FireUpdate();
 		}
 
 		void Chassis_DMOutputChange(Switch device, DMOutputEventArgs args)
 		{
 			if (args.EventId != DMOutputEventIds.VideoOutEventId) return;
 
-		    var output = args.Number;
-
-		    var inputNumber = _Chassis.HdmiOutputs[output].VideoOutFeedback == null
-		        ? 0
-		        : _Chassis.HdmiOutputs[output].VideoOutFeedback.Number;
-
-		    var outputName = OutputNames[output];
-
-		    var feedback = VideoOutputRouteFeedbacks[outputName];
-
-		    if (feedback == null)
+			for (var i = 0; i < VideoOutputRouteFeedbacks.Count; i++)
 			{
-		        return;
-		    }
-		    var inPort =
-		        InputPorts.FirstOrDefault(p => p.FeedbackMatchObject == _Chassis.HdmiOutputs[output].VideoOutFeedback);
-		    var outPort = OutputPorts.FirstOrDefault(p => p.FeedbackMatchObject == _Chassis.HdmiOutputs[output]);
+				var index = i;
+				var localInputPort = InputPorts.FirstOrDefault(p => (DMInput)p.FeedbackMatchObject == _Chassis.HdmiOutputs[(uint)index + 1].VideoOutFeedback);
+				var localOutputPort =
+					OutputPorts.FirstOrDefault(p => (DMOutput)p.FeedbackMatchObject == _Chassis.HdmiOutputs[(uint)index + 1]);
 
-		    feedback.FireUpdate();
-		    OnSwitchChange(new RoutingNumericEventArgs(output, inputNumber, outPort, inPort, eRoutingSignalType.AudioVideo));
+
+				VideoOutputRouteFeedbacks[i].FireUpdate();
+				OnSwitchChange(new RoutingNumericEventArgs((ushort)i, VideoOutputRouteFeedbacks[i].UShortValue, localOutputPort, localInputPort, eRoutingSignalType.AudioVideo));
+			}
 		}
 
 		void Chassis_DMInputChange(Switch device, DMInputEventArgs args)
 		{
-		    switch (args.EventId)
-		    {
-                case DMInputEventIds.VideoDetectedEventId:
-		        {
-                    Debug.Console(1, this, "Event ID {0}: Updating VideoInputSyncFeedbacks", args.EventId);
+			if (args.EventId != DMInputEventIds.VideoDetectedEventId) return;
 			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.", args.EventId);
-		            Debug.Console(1, this, "Input {0} Name {1}", args.Number,
-		                _Chassis.HdmiInputs[args.Number].NameFeedback.StringValue);
-                    foreach (var item in InputNameFeedbacks)
-                    {
-                        item.FireUpdate();
-                    }
-		            break;
-		        }
-                default:
-		        {
-                    Debug.Console(1, this, "Unhandled DM Input Event ID {0}", args.EventId);
-		            break;
-		        }
 			}
 		}
 

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

@@ -14,7 +14,6 @@ using PepperDash.Essentials.DM.Config;
 
 namespace PepperDash.Essentials.DM.Chassis
 {
-    [Obsolete("Please use HdMdNxM4kEBridgeable Controller")]
     public class HdMdNxM4kEController : CrestronGenericBaseDevice, IRoutingInputsOutputs, IRouting
     {
         public HdMdNxM Chassis { get; private set; }
@@ -33,7 +32,6 @@ namespace PepperDash.Essentials.DM.Chassis
             HdMdNxM4kEPropertiesConfig props)
             : base(key, name, chassis)
         {
-            Debug.Console(0, this, "Type hdmd4x14ke is obsolete. Please use hdmd4x14ke-bridgeable");
             Chassis = chassis;
 
             // logical ports

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc4kZScalerCController.cs

@@ -14,7 +14,7 @@ namespace PepperDash.Essentials.DM
 {
     [Description("Wrapper Class for DM-RMC-4K-Z-SCALER-C")]
     public class DmRmc4kZScalerCController : DmRmcControllerBase, IRmcRoutingWithFeedback,
-        IIROutputPorts, IComPorts, ICec, IRelayPorts
+        IIROutputPorts, IComPorts, ICec
     {
         private readonly DmRmc4kzScalerC _rmc;
 
@@ -168,18 +168,5 @@ namespace PepperDash.Essentials.DM
         }
         #endregion
 
-        #region Implementation of IRelayPorts
-
-        public CrestronCollection<Relay> RelayPorts
-        {
-            get { return _rmc.RelayPorts; }
-        }
-
-        public int NumberOfRelayPorts
-        {
-            get { return _rmc.NumberOfRelayPorts; }
-        }
-
-        #endregion
     }
 }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs

@@ -329,14 +329,7 @@ namespace PepperDash.Essentials.DM
 	        var parentDev = DeviceManager.GetDeviceForKey(pKey);
 	        if (parentDev is DmpsRoutingController)
 	        {
-                if ((parentDev as DmpsRoutingController).Dmps4kType)
-                {
-                    return GetDmRmcControllerForDmps4k(key, name, typeName, parentDev as DmpsRoutingController, props.ParentOutputNumber);
-                }
-                else
-                {
-                    return GetDmRmcControllerForDmps(key, name, typeName, ipid, parentDev as DmpsRoutingController, props.ParentOutputNumber);
-                }
+	            return GetDmRmcControllerForDmps(key, name, typeName, parentDev as DmpsRoutingController, props.ParentOutputNumber);
 	        }
 	        if (!(parentDev is IDmSwitch))
 	        {
@@ -403,16 +396,16 @@ namespace PepperDash.Essentials.DM
 	    }
 
 	    private static CrestronGenericBaseDevice GetDmRmcControllerForDmps(string key, string name, string typeName,
-            uint ipid, DmpsRoutingController controller, uint num)
+	        DmpsRoutingController controller, uint num)
 	    {
-            Func<string, string, uint, DMOutput, CrestronGenericBaseDevice> dmpsHandler;
-            if (ChassisDict.TryGetValue(typeName.ToLower(), out dmpsHandler))
+	        Func<string, string, DMOutput, CrestronGenericBaseDevice> dmpsHandler;
+	        if (ChassisCpu3Dict.TryGetValue(typeName.ToLower(), out dmpsHandler))
 	        {
 	            var output = controller.Dmps.SwitcherOutputs[num] as DMOutput;
 
 	            if (output != null)
 	            {
-                    return dmpsHandler(key, name, ipid, output);
+	                return dmpsHandler(key, name, output);
 	            }
 	            Debug.Console(0, Debug.ErrorLogLevel.Error,
 	                "Cannot attach DM-RMC of type '{0}' to output {1} on DMPS chassis. Output is not a DM Output.",
@@ -424,28 +417,6 @@ namespace PepperDash.Essentials.DM
 	        return null;
 	    }
 
-	    private static CrestronGenericBaseDevice GetDmRmcControllerForDmps4k(string key, string name, string typeName,
-	        DmpsRoutingController controller, uint num)
-	    {
-	        Func<string, string, DMOutput, CrestronGenericBaseDevice> dmps4kHandler;
-	        if (ChassisCpu3Dict.TryGetValue(typeName.ToLower(), out dmps4kHandler))
-	        {
-	            var output = controller.Dmps.SwitcherOutputs[num] as DMOutput;
-
-	            if (output != null)
-	            {
-	                return dmps4kHandler(key, name, output);
-	            }
-	            Debug.Console(0, Debug.ErrorLogLevel.Error,
-	                "Cannot attach DM-RMC of type '{0}' to output {1} on DMPS-4K chassis. Output is not a DM Output.",
-	                typeName, num);
-	            return null;
-	        }
-
-            Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot create DM-RMC of type '{0}' to output {1} on DMPS-4K chassis", typeName, num);
-	        return null;
-	    }
-
 	    private static CrestronGenericBaseDevice GetDmRmcControllerForProcessor(string key, string name, string typeName, uint ipid)
 	    {
 	        try

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz202CController.cs

@@ -313,7 +313,7 @@ namespace PepperDash.Essentials.DM
             var localVideoInputPort =
                 InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
             var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
+                InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
 
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
@@ -338,8 +338,8 @@ namespace PepperDash.Essentials.DM
                     OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.VideoSourceFeedback);
+                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
+                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
                     OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs

@@ -339,7 +339,7 @@ namespace PepperDash.Essentials.DM
             var localVideoInputPort =
                 InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
             var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
+                InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
 
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
@@ -364,8 +364,8 @@ namespace PepperDash.Essentials.DM
                     OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.VideoSourceFeedback);
+                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
+                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
                     OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs

@@ -65,20 +65,21 @@ namespace PepperDash.Essentials.DM
 				{
 					Debug.Console(0, "[{0}] WARNING: Cannot create DM-TX device: {1}", key, e);
 				}
+			}
+			else
+			{
+				var parentDev = DeviceManager.GetDeviceForKey(pKey);
+				if (!(parentDev is IDmSwitch))
+				{
+					Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a DM Chassis.",
+						key, pKey);
 					return null;
 				}
 
-            var parentDev = DeviceManager.GetDeviceForKey(pKey);
-            DMInput dmInput;
-            bool isCpu3 = false;
-
-		    if (parentDev is IDmSwitch)
-            {
                 // Get the Crestron chassis and link stuff up
 				var switchDev = (parentDev as IDmSwitch);
 				var chassis = switchDev.Chassis;
 
-                //Check that the input is within range of this chassis' possible inputs
 				var num = props.ParentInputNumber;
 				if (num <= 0 || num > chassis.NumberOfInputs)
 				{
@@ -86,112 +87,75 @@ namespace PepperDash.Essentials.DM
 						key, num);
 					return null;
 				}
+                else
+                {
+                    var controller = (parentDev as IDmSwitch);
+                    controller.TxDictionary.Add(num, key);
+                }
 
-                switchDev.TxDictionary.Add(num, key);
-                dmInput = chassis.Inputs[num];
-
-                //Determine if IpId is needed for this chassis type
+				// Catch constructor failures, mainly dues to IPID
+				try
+				{
+					// Must use different constructor for CPU3 chassis types. No IPID
 					if (chassis is DmMd8x8Cpu3 || chassis is DmMd16x16Cpu3 ||
 					chassis is DmMd32x32Cpu3 || chassis is DmMd8x8Cpu3rps ||
 					chassis is DmMd16x16Cpu3rps || chassis is DmMd32x32Cpu3rps||
                     chassis is DmMd128x128 || chassis is DmMd64x64)
-                {
-                    isCpu3 = true;
-                }
-
-            }
-            else if(parentDev is DmpsRoutingController)
-            {
-                // Get the DMPS chassis and link stuff up
-                var dmpsDev = (parentDev as DmpsRoutingController);
-                var chassis = dmpsDev.Dmps;
-
-                //Check that the input is within range of this chassis' possible inputs
-                var num = props.ParentInputNumber;
-                if (num <= 0 || num > chassis.SwitcherInputs.Count)
-                {
-                    Debug.Console(0, "Cannot create DMPS device '{0}'. Input number '{1}' is out of range",
-                        key, num);
-                    return null;
-                }
-
-                dmpsDev.TxDictionary.Add(num, key);
-
-                try
-                {
-                    dmInput = chassis.SwitcherInputs[num] as DMInput;
-                }
-                catch
-                {
-                    Debug.Console(0, "Cannot create DMPS device '{0}'. Input number '{1}' is not a DM input", key, num);
-                    return null;
-                }
-            }
-
-            else
-            {
-			    Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a processor, DM Chassis or DMPS.", key, pKey);
-			    return null;
-			}
-
-        	try
-		    {
-			    // Must use different constructor for CPU3 or DMPS3-4K types. No IPID
-			    if (isCpu3 || Global.ControlSystemIsDmps4kType)
 					{
 						if (typeName.StartsWith("dmtx200"))
-					    return new DmTx200Controller(key, name, new DmTx200C2G(dmInput));
+							return new DmTx200Controller(key, name, new DmTx200C2G(chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx201c"))
-                        return new DmTx201CController(key, name, new DmTx201C(dmInput));
+							return new DmTx201CController(key, name, new DmTx201C(chassis.Inputs[num]));
                         if (typeName.StartsWith("dmtx201s"))
-                        return new DmTx201SController(key, name, new DmTx201S(dmInput));
+                            return new DmTx201SController(key, name, new DmTx201S(chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx4k100"))
-                        return new DmTx4k100Controller(key, name, new DmTx4K100C1G(dmInput));
+							return new DmTx4k100Controller(key, name, new DmTx4K100C1G(chassis.Inputs[num]));
                         if (typeName.StartsWith("dmtx4kz100"))
-                        return new DmTx4kz100Controller(key, name, new DmTx4kz100C1G(dmInput));
+                            return new DmTx4kz100Controller(key, name, new DmTx4kz100C1G(chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx4k202"))
-                        return new DmTx4k202CController(key, name, new DmTx4k202C(dmInput));
+							return new DmTx4k202CController(key, name, new DmTx4k202C(chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx4kz202"))
-                        return new DmTx4kz202CController(key, name, new DmTx4kz202C(dmInput));
+							return new DmTx4kz202CController(key, name, new DmTx4kz202C(chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx4k302"))
-                        return new DmTx4k302CController(key, name, new DmTx4k302C(dmInput));
+							return new DmTx4k302CController(key, name, new DmTx4k302C(chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx4kz302"))
-                        return new DmTx4kz302CController(key, name, new DmTx4kz302C(dmInput));
+							return new DmTx4kz302CController(key, name, new DmTx4kz302C(chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx401"))
-                        return new DmTx401CController(key, name, new DmTx401C(dmInput));
+							return new DmTx401CController(key, name, new DmTx401C(chassis.Inputs[num]));
                         if (typeName.StartsWith("hdbasettx"))
-                        return new HDBaseTTxController(key, name, new HDTx3CB(dmInput));
+                            return new HDBaseTTxController(key, name, new HDTx3CB(chassis.Inputs[num]));
                     }
 					else
 					{
 						if (typeName.StartsWith("dmtx200"))
-                        return new DmTx200Controller(key, name, new DmTx200C2G(ipid, dmInput));
+							return new DmTx200Controller(key, name, new DmTx200C2G(ipid, chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx201c"))
-                        return new DmTx201CController(key, name, new DmTx201C(ipid, dmInput));
+							return new DmTx201CController(key, name, new DmTx201C(ipid, chassis.Inputs[num]));
                         if (typeName.StartsWith("dmtx201s"))
-                        return new DmTx201SController(key, name, new DmTx201S(ipid, dmInput));
+                            return new DmTx201SController(key, name, new DmTx201S(ipid, chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx4k100"))
-                        return new DmTx4k100Controller(key, name, new DmTx4K100C1G(ipid, dmInput));
+							return new DmTx4k100Controller(key, name, new DmTx4K100C1G(ipid, chassis.Inputs[num]));
                         if (typeName.StartsWith("dmtx4kz100"))
-                        return new DmTx4kz100Controller(key, name, new DmTx4kz100C1G(ipid, dmInput));
+                            return new DmTx4kz100Controller(key, name, new DmTx4kz100C1G(ipid, chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx4k202"))
-                        return new DmTx4k202CController(key, name, new DmTx4k202C(ipid, dmInput));
+							return new DmTx4k202CController(key, name, new DmTx4k202C(ipid, chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx4kz202"))
-                        return new DmTx4kz202CController(key, name, new DmTx4kz202C(ipid, dmInput));
+							return new DmTx4kz202CController(key, name, new DmTx4kz202C(ipid, chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx4k302"))
-                        return new DmTx4k302CController(key, name, new DmTx4k302C(ipid, dmInput));
+							return new DmTx4k302CController(key, name, new DmTx4k302C(ipid, chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx4kz302"))
-                        return new DmTx4kz302CController(key, name, new DmTx4kz302C(ipid, dmInput));
+							return new DmTx4kz302CController(key, name, new DmTx4kz302C(ipid, chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx401"))
-                        return new DmTx401CController(key, name, new DmTx401C(ipid, dmInput));
+							return new DmTx401CController(key, name, new DmTx401C(ipid, chassis.Inputs[num]));
                         if (typeName.StartsWith("hdbasettx"))
-                        return new HDBaseTTxController(key, name, new HDTx3CB(ipid, dmInput));
+                            return new HDBaseTTxController(key, name, new HDTx3CB(ipid, chassis.Inputs[num]));
                     }
 				}
 				catch (Exception e)
 				{
 					Debug.Console(0, "[{0}] WARNING: Cannot create DM-TX device: {1}", key, e);
 				}
+			}
 			
 			return null;
 		}
@@ -221,12 +185,11 @@ namespace PepperDash.Essentials.DM
 	    protected DmTxControllerBase(string key, string name, EndpointTransmitterBase hardware)
 			: base(key, name, hardware) 
 		{
-            // if wired to a chassis or DMPS, skip registration step in base class
-            if (hardware.DMInput != null || (Global.ControlSystemIsDmpsType && hardware.DMInput != null))
+			// if wired to a chassis, skip registration step in base class
+			if (hardware.DMInput != null)
 			{
 				this.PreventRegistration = true;
 			}
-
             AddToFeedbackList(ActiveVideoInputFeedback);
 		}
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/AudioCodec/Interfaces/IHasAudioCodec.cs

@@ -11,9 +11,10 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
     /// <summary>
     /// For rooms that have audio codec
     /// </summary>
-    public interface IHasAudioCodec:IHasInCallFeedback
+    public interface IHasAudioCodec
     {
         AudioCodecBase AudioCodec { get; }
+        BoolFeedback InCallFeedback { get; }
 
         ///// <summary>
         ///// Make this more specific

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraBase.cs

@@ -216,10 +216,20 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 var presetsCamera = cameraDevice as IHasCameraPresets;
                 presetsCamera.PresetsListHasChanged += new EventHandler<EventArgs>((o, a) =>
                 {
-                    SendCameraPresetNamesToApi(presetsCamera, joinMap, trilist);
-                });
+                    for (int i = 1; i <= joinMap.NumberOfPresets.JoinNumber; i++)
+                    {
+                        int tempNum = i - 1;
 
-                SendCameraPresetNamesToApi(presetsCamera, joinMap, trilist);
+                        string label = "";
+
+                        var preset = presetsCamera.Presets.FirstOrDefault(p => p.ID.Equals(i));
+
+                        if (preset != null)
+                            label = preset.Description;
+
+                        trilist.SetString((ushort) (joinMap.PresetLabelStart.JoinNumber + tempNum), label);
+                    }
+                });
 
                 for (int i = 0; i < joinMap.NumberOfPresets.JoinNumber; i++)
                 {
@@ -236,35 +246,10 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                         presetsCamera.PresetStore(tempNum, label);
                     });
                 }
-                trilist.OnlineStatusChange += (sender, args) =>
-                {
-                    if (!args.DeviceOnLine)
-                    { return; }
-
-                    SendCameraPresetNamesToApi(presetsCamera, joinMap, trilist);
-                };
-
-            }
-        }
-        private void SendCameraPresetNamesToApi(IHasCameraPresets presetsCamera, CameraControllerJoinMap joinMap, BasicTriList trilist)
-        {
-            for (int i = 1; i <= joinMap.NumberOfPresets.JoinNumber; i++)
-            {
-                int tempNum = i - 1;
-
-                string label = "";
-
-                var preset = presetsCamera.Presets.FirstOrDefault(p => p.ID.Equals(i));
-
-                if (preset != null)
-                    label = preset.Description;
-
-                trilist.SetString((ushort)(joinMap.PresetLabelStart.JoinNumber + tempNum), label);
             }
         }
 	}
 
-
     public class CameraPreset : PresetBase
     {
         public CameraPreset(int id, string description, bool isDefined, bool isDefinable)

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraVisca.cs

@@ -525,15 +525,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
         public event EventHandler<EventArgs> PresetsListHasChanged;
 
-		protected void OnPresetsListHasChanged()
-		{
-			var handler = PresetsListHasChanged;
-			if (handler == null)
-				return;
-
-			handler.Invoke(this, EventArgs.Empty);
-		}
-
         public List<CameraPreset> Presets { get; private set; }
 
         public void PresetSelect(int preset)
@@ -546,7 +537,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
             SavePreset(preset);
         }
 
-
         #endregion
 
         #region IHasCameraFocusControl Members

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/IHasDoNotDisturb.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-    /// <summary>
-    /// Describes a device that has Do Not Disturb mode capability
-    /// </summary>
-    public interface IHasDoNotDisturbMode
-    {
-        /// <summary>
-        /// Indictes whether Do Not Disturb mode is on (Activated)
-        /// </summary>
-        BoolFeedback DoNotDisturbModeIsOnFeedback { get; }
-
-        /// <summary>
-        /// Activates Do Not Disturb mode
-        /// </summary>
-        void ActivateDoNotDisturbMode();
-
-        /// <summary>
-        /// Deactivates Do Not Disturb mode
-        /// </summary>
-        void DeactivateDoNotDisturbMode();
-
-        /// <summary>
-        /// Toggles Do Not Disturb mode
-        /// </summary>
-        void ToggleDoNotDisturbMode();
-    }
-
-    public interface IHasDoNotDisturbModeWithTimeout : IHasDoNotDisturbMode
-    {
-        /// <summary>
-        /// Activates Do Not Disturb mode with a timeout
-        /// </summary>
-        /// <param name="timeout"></param>
-        void ActivateDoNotDisturbMode(int timeout);
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs

@@ -69,24 +69,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("directoryResults")]
         public List<DirectoryItem> CurrentDirectoryResults { get; private set; }
 
-        [JsonProperty("contacts")]
-        public List<DirectoryItem> Contacts
-        {
-            get
-            {
-                return CurrentDirectoryResults.OfType<DirectoryContact>().Cast<DirectoryItem>().ToList();
-            }
-        }
-
-        [JsonProperty("folders")]
-        public List<DirectoryItem> Folders
-        {
-            get
-            {
-                return CurrentDirectoryResults.OfType<DirectoryFolder>().Cast<DirectoryItem>().ToList();
-            }
-        }
-
         /// <summary>
         /// Used to store the ID of the current folder for CurrentDirectoryResults
         /// </summary>
@@ -122,15 +104,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             SortDirectory();
         }
 
-        /// <summary>
-        /// Filters the CurrentDirectoryResults by the predicate
-        /// </summary>
-        /// <param name="predicate"></param>
-        public void FilterContacts(Func<DirectoryItem, bool> predicate)
-        {
-            CurrentDirectoryResults = CurrentDirectoryResults.Where(predicate).ToList();
-        }
-
         /// <summary>
         /// Sorts the DirectoryResults list to display all folders alphabetically, then all contacts alphabetically
         /// </summary>
@@ -162,19 +135,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public interface IInvitableContact
     {
-        bool IsInvitableContact { get; }
-    }
 
-    public class InvitableDirectoryContact : DirectoryContact, IInvitableContact
-    {
-        [JsonProperty("isInvitableContact")]
-        public bool IsInvitableContact
-        {
-            get
-            {
-                return this is IInvitableContact;
-            }
-        }
     }
 
 	/// <summary>
@@ -223,6 +184,8 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("title")]
         public string Title { get; set; }
 
+        
+
 		[JsonProperty("contactMethods")]
         public List<ContactMethod> ContactMethods { get; set; }
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs

@@ -235,15 +235,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         {
             Calls = new List<Call>();
         }
-
-        #region Overrides of Object
-
-        public override string ToString()
-        {
-            return String.Format("{0}:{1}: {2}-{3}", Title, Agenda, StartTime, EndTime);
-        }
-
-        #endregion
     }
 
     public class Call

essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -108,7 +108,6 @@
     <Compile Include="Codec\eCodecCallStatus.cs" />
     <Compile Include="Codec\eMeetingPrivacy.cs" />
     <Compile Include="Codec\iCodecAudio.cs" />
-    <Compile Include="Codec\IHasDoNotDisturb.cs" />
     <Compile Include="Codec\IHasExternalSourceSwitching.cs" />
     <Compile Include="ImageProcessors\TVOneCorio.cs" />
     <Compile Include="ImageProcessors\TVOneCorioPropertiesConfig.cs" />
@@ -118,19 +117,12 @@
     <Compile Include="ImageProcessors\AnalogWay\AnalogWayLiveCorePropertiesConfig.cs" />
     <Compile Include="SoftCodec\BlueJeansPc.cs" />
     <Compile Include="VideoCodec\CiscoCodec\CiscoCamera.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\CiscoCodecJoinMap.cs" />
     <Compile Include="VideoCodec\CiscoCodec\RoomPresets.cs" />
     <Compile Include="Cameras\CameraControl.cs" />
     <Compile Include="Display\PanasonicThDisplay.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasMeetingInfo.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasMeetingLock.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasMeetingRecording.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasParticipants.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasPresentationOnlyMeeting.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasSelfviewPosition.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasSelfviewSize.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasStandbyMode.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasStartMeeting.cs" />
     <Compile Include="VideoCodec\Interfaces\iVideoCodecInfo.cs" />
     <Compile Include="Codec\iHasCallFavorites.cs" />
     <Compile Include="Codec\iHasCallHistory.cs" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/Streaming/AppleTV.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Devices.Common
 	public class AppleTV : EssentialsBridgeableDevice, IDPad, ITransport, IUiDisplayInfo, IRoutingOutputs
 	{
 		public IrOutputPortController IrPort { get; private set; }
-        public const string StandardDriverName = "Apple_AppleTV_4th_Gen_Essentials.ir";
+		public const string StandardDriverName = "Apple AppleTV-v2.ir";
 		public uint DisplayUiType { get { return DisplayUiConstants.TypeAppleTv; } }
 
 		public AppleTV(string key, string name, IrOutputPortController portCont)

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodecJoinMap.cs

@@ -1,134 +0,0 @@
-using System;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges.JoinMaps;
-
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
-{
-    public class CiscoCodecJoinMap : VideoCodecControllerJoinMap
-    {
-        #region Digital
-
-        [JoinName("ActivateDoNotDisturbMode")]
-        public JoinDataComplete ActivateDoNotDisturbMode = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 221,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Activates Do Not Disturb Mode.  FB High if active.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("DeactivateDoNotDisturbMode")]
-        public JoinDataComplete DeactivateDoNotDisturbMode = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 222,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Deactivates Do Not Disturb Mode.  FB High if deactivated.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("ToggleDoNotDisturbMode")]
-        public JoinDataComplete ToggleDoNotDisturbMode = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 223,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Toggles Do Not Disturb Mode.",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("ActivateStandby")]
-        public JoinDataComplete ActivateStandby = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 226,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Activates Standby Mode.  FB High if active.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("DeactivateStandby")]
-        public JoinDataComplete DeactivateStandby = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 227,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Deactivates Standby Mode.  FB High if deactivated.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("ActivateHalfWakeMode")]
-        public JoinDataComplete ActivateHalfWakeMode = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 228,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Activates Half Wake Mode.  FB High if active.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("EnteringStandbyMode")]
-        public JoinDataComplete EnteringStandbyMode = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 229,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "High to indicate that the codec is entering standby mode",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        #endregion
-
-
-        #region Analog
-
-
-        #endregion
-
-
-        #region Serials
-
-
-        #endregion
-
-        public CiscoCodecJoinMap(uint joinStart)
-            : base(joinStart, typeof(CiscoCodecJoinMap))
-        {
-        }
-
-        public CiscoCodecJoinMap(uint joinStart, Type type)
-            : base(joinStart, type)
-        {
-        }
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs

@@ -314,7 +314,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			FarEndIsSharingContentFeedback = new BoolFeedback(FarEndIsSharingContentFeedbackFunc);
             CameraIsOffFeedback = new BoolFeedback(() => CodecStatus.Status.Video.Input.MainVideoMute.BoolValue);
             CameraIsMutedFeedback = CameraIsOffFeedback;
-            SupportsCameraOff = true;
+
 
 			PresentationViewMaximizedFeedback = new BoolFeedback(() => CurrentPresentationView == "Maximized");
 
@@ -417,16 +417,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             CodecStatus.Status.RoomAnalytics.PeoplePresence.ValueChangedAction = RoomIsOccupiedFeedback.FireUpdate;
             CodecStatus.Status.RoomAnalytics.PeopleCount.Current.ValueChangedAction = PeopleCountFeedback.FireUpdate;
             CodecStatus.Status.Cameras.SpeakerTrack.Status.ValueChangedAction = CameraAutoModeIsOnFeedback.FireUpdate;
-            CodecStatus.Status.Cameras.SpeakerTrack.Availability.ValueChangedAction = () => { SupportsCameraAutoMode = CodecStatus.Status.Cameras.SpeakerTrack.Availability.BoolValue; };
             CodecStatus.Status.Video.Selfview.Mode.ValueChangedAction = SelfviewIsOnFeedback.FireUpdate;
             CodecStatus.Status.Video.Selfview.PIPPosition.ValueChangedAction = ComputeSelfviewPipStatus;
             CodecStatus.Status.Video.Layout.LayoutFamily.Local.ValueChangedAction = ComputeLocalLayout;
-            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = () =>
-            {
-                SharingContentIsOnFeedback.FireUpdate();
-                FarEndIsSharingContentFeedback.FireUpdate();
-            };
-
+            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = SharingContentIsOnFeedback.FireUpdate;
+            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = FarEndIsSharingContentFeedback.FireUpdate;
             try
             {
                 CodecStatus.Status.Video.Input.MainVideoMute.ValueChangedAction = CameraIsOffFeedback.FireUpdate;
@@ -747,10 +742,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 
         }
 
-        /// <summary>
-        /// Appends the delimiter and send the command to the codec
-        /// </summary>
-        /// <param name="command"></param>
         public void SendText(string command)
         {
             if (CommDebuggingIsOn)
@@ -2195,4 +2186,5 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             return new VideoCodec.Cisco.CiscoSparkCodec(dc, comm);
         }
     }
+
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs

@@ -277,25 +277,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public SoftwareID SoftwareID { get; set; }
         }
 
-        public class Availability : ValueProperty
+        public class Availability
         {
-            string _Value;
-            public bool BoolValue { get; private set; }
-
-            public string Value
-            {
-                get
-                {
-                    return _Value;
-                }
-                set
-                {
-                    // If the incoming value is "Available" it sets the BoolValue true, otherwise sets it false
-                    _Value = value;
-                    BoolValue = value == "Available";
-                    OnValueChanged();
-                }
-            }
+            public string Value { get; set; }
         }
 
         public class Status2 : ValueProperty
@@ -327,7 +311,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public SpeakerTrack()
             {
                 Status = new Status2();
-                Availability = new Availability();
             }
         }
 
@@ -440,26 +423,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public CallId CallId { get; set; }
         }
 
-        public class DoNotDisturb : ValueProperty
+        public class DoNotDisturb
         {
-            string _Value;
-
-            public bool BoolValue { get; private set; }
-
-            public string Value
-            {
-                get
-                {
-                    return _Value;
-                }
-                set
-                {
-                    _Value = value;
-                    // If the incoming value is "On" it sets the BoolValue true, otherwise sets it false
-                    BoolValue = value == "On" || value == "Active";
-                    OnValueChanged();
-                }
-            }
+            public string Value { get; set; }
         }
 
         public class Mode
@@ -617,7 +583,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Conference2()
             {
                 Presentation = new Presentation();
-                DoNotDisturb = new DoNotDisturb();
             }
         }
 
@@ -1398,16 +1363,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class State : ValueProperty
         {
-            string _value;
-
             public bool BoolValue { get; private set; }
 
             public string Value // Valid values are Standby/EnteringStandby/Halfwake/Off
             {
-                get { return _value; }
                 set
                 {
-                    _value = value;
                     // If the incoming value is "On" it sets the BoolValue true, otherwise sets it false
                     BoolValue = value == "On" || value == "Standby";
                     OnValueChanged();
@@ -2113,7 +2074,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 Conference = new Conference2();
                 SystemUnit = new SystemUnit();
                 Video = new Video();
-                Conference = new Conference2();
             }
         }
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasCodecLayouts.cs

@@ -6,8 +6,6 @@ using Crestron.SimplSharp;
 
 using PepperDash.Essentials.Core;
 
-using Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {
     /// <summary>
@@ -27,7 +25,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
     /// </summary>
     public interface IHasZoomRoomLayouts : IHasCodecLayouts
     {
-        event EventHandler<LayoutInfoChangedEventArgs> LayoutInfoChanged;
+        event EventHandler<LayoutInfoChangedEventArgs> AvailableLayoutsChanged;
 
         BoolFeedback LayoutViewIsOnFirstPageFeedback { get; }  // TODO: #697 [*] Consider modifying to report button visibility in func
         BoolFeedback LayoutViewIsOnLastPageFeedback { get; } // TODO: #697 [*] Consider modifying to report button visibility in func 
@@ -47,17 +45,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
     public class LayoutInfoChangedEventArgs : EventArgs
     {
-        [JsonProperty("availableLayouts", NullValueHandling = NullValueHandling.Ignore)]
         public ZoomRoom.zConfiguration.eLayoutStyle AvailableLayouts { get; set; }
-        [JsonProperty("currentSelectedLayout", NullValueHandling = NullValueHandling.Ignore)]
-        public ZoomRoom.zConfiguration.eLayoutStyle CurrentSelectedLayout { get; set; }
-        [JsonProperty("canSwapContentWithThumbnail", NullValueHandling = NullValueHandling.Ignore)]
-        public bool CanSwapContentWithThumbnail { get; set; }
-        [JsonProperty("contentSwappedWithThumbnail", NullValueHandling = NullValueHandling.Ignore)]
-        public bool ContentSwappedWithThumbnail { get; set; }
-        [JsonProperty("layoutViewIsOnFirstPage", NullValueHandling = NullValueHandling.Ignore)]
-        public bool LayoutViewIsOnFirstPage { get; set; }
-        [JsonProperty("layoutViewIsOnLastPage", NullValueHandling = NullValueHandling.Ignore)]
-        public bool LayoutViewIsOnLastPage { get; set; }
     }
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasMeetingInfo.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
-{
-    /// <summary>
-    /// Describes a device that provides meeting information (like a ZoomRoom)
-    /// </summary>
-    public interface IHasMeetingInfo
-    {
-        event EventHandler<MeetingInfoEventArgs> MeetingInfoChanged;
-
-        MeetingInfo MeetingInfo { get; }
-    }
-
-    /// <summary>
-    /// Represents the information about a meeting in progress
-    /// Currently used for Zoom meetings
-    /// </summary>
-    public class MeetingInfo
-    {
-        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
-        public string Id { get; private set; }
-        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
-        public string Name { get; private set; }
-        [JsonProperty("host", NullValueHandling = NullValueHandling.Ignore)]
-        public string Host { get; private set; }
-        [JsonProperty("password", NullValueHandling = NullValueHandling.Ignore)]
-        public string Password { get; private set; }
-        [JsonProperty("shareStatus", NullValueHandling = NullValueHandling.Ignore)]
-        public string ShareStatus { get; private set; }
-        [JsonProperty("isHost", NullValueHandling = NullValueHandling.Ignore)]
-        public Boolean IsHost { get; private set; }
-        [JsonProperty("isSharingMeeting", NullValueHandling = NullValueHandling.Ignore)]
-        public Boolean IsSharingMeeting { get; private set; }
-        [JsonProperty("waitingForHost", NullValueHandling = NullValueHandling.Ignore)]
-        public Boolean WaitingForHost { get; private set; }
-        [JsonProperty("isLocked", NullValueHandling = NullValueHandling.Ignore)]
-        public Boolean IsLocked { get; private set; }
-
-
-        public MeetingInfo(string id, string name, string host, string password, string shareStatus, bool isHost, bool isSharingMeeting, bool waitingForHost, bool isLocked)
-        {
-            Id = id;
-            Name = name;
-            Host = host;
-            Password = password;
-            ShareStatus = shareStatus;
-            IsHost = isHost;
-            IsSharingMeeting = isSharingMeeting;
-            WaitingForHost = waitingForHost;
-            IsLocked = isLocked;
-        }
-    }
-
-    public class MeetingInfoEventArgs : EventArgs
-    {
-        public MeetingInfo Info { get; private set; }
-
-        public MeetingInfoEventArgs(MeetingInfo info)
-        {
-            Info = info;
-        }
-
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasMeetingLock.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
-{
-    public interface IHasMeetingLock
-    {
-        BoolFeedback MeetingIsLockedFeedback { get; }
-
-        void LockMeeting();
-        void UnLockMeeting();
-        void ToggleMeetingLock();
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasMeetingRecording.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
-{
-    public interface IHasMeetingRecording
-    {
-        BoolFeedback MeetingIsRecordingFeedback { get; }
-
-        void StartRecording();
-        void StopRecording();
-        void ToggleRecording();
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasParticipants.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Linq;
 using System.Collections.Generic;
-using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
@@ -12,18 +10,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
     public interface IHasParticipants
     {
         CodecParticipants Participants { get; }
-
-        /// <summary>
-        /// Removes the participant from the meeting
-        /// </summary>
-        /// <param name="participant"></param>
-        void RemoveParticipant(int userId);
-
-        /// <summary>
-        /// Sets the participant as the new host
-        /// </summary>
-        /// <param name="participant"></param>
-        void SetParticipantAsHost(int userId);
     }
 
     /// <summary>
@@ -41,11 +27,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
     /// </summary>
     public interface IHasParticipantAudioMute : IHasParticipantVideoMute
     {
-        /// <summary>
-        /// Mute audio of all participants
-        /// </summary>
-        void MuteAudioForAllParticipants();
-
         void MuteAudioForParticipant(int userId);
         void UnmuteAudioForParticipant(int userId);
         void ToggleAudioForParticipant(int userId);
@@ -68,8 +49,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
     {
         private List<Participant> _currentParticipants;
  
-		public List<Participant> CurrentParticipants
-		{
+        public List<Participant> CurrentParticipants {
             get { return _currentParticipants; }
             set
             {
@@ -78,14 +58,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
             }
         }
 
-        public Participant Host
-        {
-            get
-            {
-                return _currentParticipants.FirstOrDefault(p => p.IsHost);
-            }
-        }
-
         public event EventHandler<EventArgs> ParticipantsListHasChanged;
 
         public CodecParticipants()
@@ -110,7 +82,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
     {
         public int UserId { get; set; }
         public bool IsHost { get; set; }
-        public bool IsMyself { get; set; }
         public string Name { get; set; }
         public bool CanMuteVideo { get; set; }       
         public bool CanUnmuteVideo { get; set; }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasPresentationOnlyMeeting.cs

@@ -1,18 +0,0 @@
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
-{
-    public interface IHasPresentationOnlyMeeting
-    {
-        void StartSharingOnlyMeeting();
-        void StartSharingOnlyMeeting(eSharingMeetingMode mode);
-        void StartSharingOnlyMeeting(eSharingMeetingMode mode, ushort duration);
-        void StartSharingOnlyMeeting(eSharingMeetingMode mode, ushort duration, string password);
-        void StartNormalMeetingFromSharingOnlyMeeting();
-    }
-
-    public enum eSharingMeetingMode
-    {
-        None,
-        Laptop,
-        Ios,
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasStandbyMode.cs

@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec
-{
-    /// <summary>
-    /// Describes a device that has Standby Mode capability
-    /// </summary>
-    public interface IHasStandbyMode
-    {
-        BoolFeedback StandbyIsOnFeedback { get; }
-
-        void StandbyActivate();
-
-        void StandbyDeactivate();
-    }
-
-    /// <summary>
-    /// Describes a device that has Half Waek Mode capability
-    /// </summary>
-    public interface IHasHalfWakeMode : IHasStandbyMode
-    {
-        BoolFeedback HalfWakeModeIsOnFeedback { get; }
-
-        BoolFeedback EnteringStandbyModeFeedback { get; }
-
-        void HalfwakeActivate();
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasStartMeeting.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
-{
-    /// <summary>
-    /// Describes the ability to start an ad-hoc meeting
-    /// </summary>
-    public interface IHasStartMeeting
-    {
-        /// <summary>
-        /// The default meeting duration in minutes
-        /// </summary>
-        uint DefaultMeetingDurationMin { get; }
-
-        /// <summary>
-        /// Start an ad-hoc meeting for the specified duration
-        /// </summary>
-        /// <param name="duration"></param>
-        void StartMeeting(uint duration);
-
-        /// <summary>
-        /// Leaves a meeting without ending it
-        /// </summary>
-        void LeaveMeeting();
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasVideoCodec.cs

@@ -11,9 +11,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 	/// <summary>
 	/// For rooms that have video codec
 	/// </summary>
-	public interface IHasVideoCodec:IHasInCallFeedback,IPrivacy
+	public interface IHasVideoCodec
 	{
 		VideoCodecBase VideoCodec { get; }
+		BoolFeedback InCallFeedback { get; }
 
         ///// <summary>
         ///// Make this more specific
@@ -25,6 +26,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		/// </summary>
 		IntFeedback CallTypeFeedback { get; }
 
+		/// <summary>
+		/// 
+		/// </summary>
+		BoolFeedback PrivacyModeIsOnFeedback { get; }
+
 		/// <summary>
 		/// When something in the room is sharing with the far end or through other means
 		/// </summary>

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/iVideoCodecInfo.cs

@@ -4,8 +4,6 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Devices.Common.Codec
 {
     /// <summary>
@@ -21,19 +19,12 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public abstract class VideoCodecInfo
     {
-        [JsonProperty("multiSiteOptionIsEnabled", NullValueHandling = NullValueHandling.Ignore)]
         public abstract bool MultiSiteOptionIsEnabled { get; }
-        [JsonProperty("ipAddress", NullValueHandling = NullValueHandling.Ignore)]
         public abstract string IpAddress { get; }
-        [JsonProperty("sipPhoneNumber", NullValueHandling = NullValueHandling.Ignore)]
         public abstract string SipPhoneNumber { get; }
-        [JsonProperty("e164Alias", NullValueHandling = NullValueHandling.Ignore)]
         public abstract string E164Alias { get; }
-        [JsonProperty("h323Id", NullValueHandling = NullValueHandling.Ignore)]
         public abstract string H323Id { get; }
-        [JsonProperty("sipUri", NullValueHandling = NullValueHandling.Ignore)]
         public abstract string SipUri { get; }
-        [JsonProperty("autoAnswerEnabled", NullValueHandling = NullValueHandling.Ignore)]
         public abstract bool AutoAnswerEnabled { get; }
     }
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVC.cs

@@ -78,8 +78,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             SetupCameras();
 
-            CreateOsdSource();
-
             SetIsReady();
        }
 
@@ -119,19 +117,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         }
         bool _StandbyIsOn;
 
-        /// <summary>
-        /// Creates the fake OSD source, and connects it's AudioVideo output to the CodecOsdIn input
-        /// to enable routing 
-        /// </summary>
-        private void CreateOsdSource()
-        {
-            OsdSource = new DummyRoutingInputsDevice(Key + "[osd]");
-            DeviceManager.AddDevice(OsdSource);
-            var tl = new TieLine(OsdSource.AudioVideoOutputPort, CodecOsdIn);
-            TieLineCollection.Default.Add(tl);
-
-            //foreach(var input in Status.Video.
-        }
 
         /// <summary>
         /// Dials, yo!
@@ -582,10 +567,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         void SetupCameras()
         {
-            SupportsCameraAutoMode = true;
-
-            SupportsCameraOff = false;
-
             Cameras = new List<CameraBase>();
 
             var internalCamera = new MockVCCamera(Key + "-camera1", "Near End", this);

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs

@@ -25,7 +25,7 @@ using Feedback = PepperDash.Essentials.Core.Feedback;
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {
 	public abstract class VideoCodecBase : ReconfigurableDevice, IRoutingInputsOutputs,
-		IUsageTracking, IHasDialer, IHasContentSharing, ICodecAudio, iVideoCodecInfo, IBridgeAdvanced, IHasStandbyMode
+		IUsageTracking, IHasDialer, IHasContentSharing, ICodecAudio, iVideoCodecInfo, IBridgeAdvanced
 	{
 		private const int XSigEncoding = 28591;
         protected const int MaxParticipants = 50;
@@ -41,9 +41,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			SharingSourceFeedback = new StringFeedback(SharingSourceFeedbackFunc);
 			SharingContentIsOnFeedback = new BoolFeedback(SharingContentIsOnFeedbackFunc);
 
-            // TODO [ ] hotfix/videocodecbase-max-meeting-xsig-set
-            MeetingsToDisplayFeedback = new IntFeedback(() => MeetingsToDisplay);
-
 			InputPorts = new RoutingPortCollection<RoutingInputPort>();
 			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
 
@@ -68,8 +65,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 		public bool ShowSelfViewByDefault { get; protected set; }
 
-        public bool SupportsCameraOff { get; protected set; }
-        public bool SupportsCameraAutoMode { get; protected set; }
+		protected bool SupportsCameraOff;
+		protected bool SupportsCameraAutoMode;
 
 		public bool IsReady { get; protected set; }
 
@@ -301,11 +298,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			}
 
 			LinkVideoCodecToApi(codec, trilist, joinMap);
-
-		    trilist.OnlineStatusChange += (device, args) =>
-		    {
-		        if (!args.DeviceOnLine) return;
-		    };
 		}
 
 		/// <summary>
@@ -554,15 +546,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
                 UpdateParticipantsXSig(codec, trilist, joinMap);
 			};
-
-            trilist.OnlineStatusChange += (device, args) =>
-            {
-                if (!args.DeviceOnLine) return;
-
-                // TODO [ ] Issue #868
-                trilist.SetString(joinMap.CurrentParticipants.JoinNumber, "\xFC");
-                UpdateParticipantsXSig(codec, trilist, joinMap);
-            };
 		}
 
         private void UpdateParticipantsXSig(IHasParticipants codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
@@ -794,21 +777,6 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 						UpdateMeetingsList(codec, trilist, joinMap);
 					}
 				};
-
-            // TODO [ ] hotfix/videocodecbase-max-meeting-xsig-set
-            trilist.SetUShortSigAction(joinMap.MeetingsToDisplay.JoinNumber, m => MeetingsToDisplay = m);
-            MeetingsToDisplayFeedback.LinkInputSig(trilist.UShortInput[joinMap.MeetingsToDisplay.JoinNumber]);
-
-            trilist.OnlineStatusChange += (device, args) =>
-            {
-                if (!args.DeviceOnLine) return;
-
-                // TODO [ ] Issue #868
-                trilist.SetString(joinMap.Schedule.JoinNumber, "\xFC");
-                UpdateMeetingsList(codec, trilist, joinMap);
-                // TODO [ ] hotfix/videocodecbase-max-meeting-xsig-set
-                MeetingsToDisplayFeedback.LinkInputSig(trilist.UShortInput[joinMap.MeetingsToDisplay.JoinNumber]);
-            };
 		}
 
 		private void UpdateMeetingsList(IHasScheduleAwareness codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
@@ -817,58 +785,22 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 
 			_currentMeetings = codec.CodecSchedule.Meetings.Where(m => m.StartTime >= currentTime || m.EndTime >= currentTime).ToList();
 
-            if (_currentMeetings.Count == 0)
-            {
-                var emptyXSigByteArray = XSigHelpers.ClearOutputs();
-                var emptyXSigString = Encoding.GetEncoding(XSigEncoding)
-                    .GetString(emptyXSigByteArray, 0, emptyXSigByteArray.Length);
-
-                trilist.SetString(joinMap.Schedule.JoinNumber, emptyXSigString);
-                return;
-            }
-
 			var meetingsData = UpdateMeetingsListXSig(_currentMeetings);
 			trilist.SetString(joinMap.Schedule.JoinNumber, meetingsData);
 			trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort)_currentMeetings.Count);
-
-            trilist.OnlineStatusChange += (device, args) =>
-            {
-                if (!args.DeviceOnLine) return;
-
-                // TODO [ ] Issue #868
-                trilist.SetString(joinMap.Schedule.JoinNumber, "\xFC");
-                UpdateMeetingsListXSig(_currentMeetings);
-            };
 		}
 
-
-        // TODO [ ] hotfix/videocodecbase-max-meeting-xsig-set
-	    private int _meetingsToDisplay = 3;
-        // TODO [ ] hotfix/videocodecbase-max-meeting-xsig-set
-	    protected int MeetingsToDisplay
-	    {
-	        get { return _meetingsToDisplay; }
-	        set {
-                _meetingsToDisplay = (ushort) (value == 0 ? 3 : value);
-                MeetingsToDisplayFeedback.FireUpdate();
-	        }
-	    }
-
-        // TODO [ ] hotfix/videocodecbase-max-meeting-xsig-set
-        public IntFeedback MeetingsToDisplayFeedback { get; set; }
-
 		private string UpdateMeetingsListXSig(List<Meeting> meetings)
 		{
-            // TODO [ ] hotfix/videocodecbase-max-meeting-xsig-set
-            //const int _meetingsToDisplay = 3;            
+			const int maxMeetings = 3;
 			const int maxDigitals = 2;
 			const int maxStrings = 7;
 			const int offset = maxDigitals + maxStrings;
-			var digitalIndex = maxStrings * _meetingsToDisplay; //15
+			var digitalIndex = maxStrings * maxMeetings; //15
 			var stringIndex = 0;
 			var meetingIndex = 0;
 
-			var tokenArray = new XSigToken[_meetingsToDisplay * offset];
+			var tokenArray = new XSigToken[maxMeetings * offset];
 			/* 
 			 * Digitals
 			 * IsJoinable - 1
@@ -891,7 +823,7 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 
 				if (meeting.StartTime < currentTime && meeting.EndTime < currentTime) continue;
 
-				if (meetingIndex >= _meetingsToDisplay * offset)
+				if (meetingIndex >= maxMeetings * offset)
 				{
 					Debug.Console(2, this, "Max Meetings reached");
 					break;
@@ -904,10 +836,10 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				//serials
 				tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, meeting.Organizer);
 				tokenArray[stringIndex + 1] = new XSigSerialToken(stringIndex + 2, meeting.Title);
-                tokenArray[stringIndex + 2] = new XSigSerialToken(stringIndex + 3, meeting.StartTime.ToString("t", Global.Culture));
-				tokenArray[stringIndex + 3] = new XSigSerialToken(stringIndex + 4, meeting.StartTime.ToString("t", Global.Culture));
-                tokenArray[stringIndex + 4] = new XSigSerialToken(stringIndex + 5, meeting.EndTime.ToString("t", Global.Culture));
-				tokenArray[stringIndex + 5] = new XSigSerialToken(stringIndex + 6, meeting.EndTime.ToString("t", Global.Culture));
+				tokenArray[stringIndex + 2] = new XSigSerialToken(stringIndex + 3, meeting.StartTime.ToShortDateString());
+				tokenArray[stringIndex + 3] = new XSigSerialToken(stringIndex + 4, meeting.StartTime.ToShortTimeString());
+				tokenArray[stringIndex + 4] = new XSigSerialToken(stringIndex + 5, meeting.EndTime.ToShortDateString());
+				tokenArray[stringIndex + 5] = new XSigSerialToken(stringIndex + 6, meeting.EndTime.ToShortTimeString());
 				tokenArray[stringIndex + 6] = new XSigSerialToken(stringIndex + 7, meeting.Id);
 
 
@@ -916,10 +848,10 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				stringIndex += maxStrings;
 			}
 
-			while (meetingIndex < _meetingsToDisplay * offset)
+			while (meetingIndex < maxMeetings * offset)
 			{
 				Debug.Console(2, this, "Clearing unused data. Meeting Index: {0} MaxMeetings * Offset: {1}",
-					meetingIndex, _meetingsToDisplay * offset);
+					meetingIndex, maxMeetings * offset);
 
 				//digitals
 				tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, false);
@@ -969,16 +901,6 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 
 				trilist.SetString(joinMap.DirectoryEntries.JoinNumber, directoryXSig);
 			};
-
-            trilist.OnlineStatusChange += (device, args) =>
-            {
-                if (!args.DeviceOnLine) return;
-
-                // TODO [ ] Issue #868
-                trilist.SetString(joinMap.DirectoryEntries.JoinNumber, "\xFC");
-                UpdateDirectoryXSig(codec.CurrentDirectoryResult,
-                    !codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue);
-            };
 		}
 
 		private void SelectDirectoryEntry(IHasDirectory codec, ushort i)
@@ -1060,15 +982,6 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 
 				trilist.SetString(joinMap.CurrentCallData.JoinNumber, UpdateCallStatusXSig());
 			};
-
-            trilist.OnlineStatusChange += (device, args) =>
-            {
-                if (!args.DeviceOnLine) return;
-
-                // TODO [ ] Issue #868
-                trilist.SetString(joinMap.CurrentCallData.JoinNumber, "\xFC");
-                UpdateCallStatusXSig();
-            };
 		}
 
 		private string UpdateCallStatusXSig()
@@ -1336,15 +1249,6 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 							trilist.UShortOutput[joinMap.CameraPresetSelect.JoinNumber].UShortValue, String.Empty);
 						trilist.PulseBool(joinMap.CameraPresetSave.JoinNumber, 3000);
 					});
-
-            trilist.OnlineStatusChange += (device, args) =>
-            {
-                if (!args.DeviceOnLine) return;
-
-                // TODO [ ] Issue #868
-                trilist.SetString(joinMap.CameraPresetNames.JoinNumber, "\xFC");
-                SetCameraPresetNames(presetCodec.NearEndPresets);
-            };
 		}
 
 		private string SetCameraPresetNames(IEnumerable<CodecRoomPreset> presets)

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs

@@ -59,7 +59,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		public List<zStatus.AudioVideoInputOutputLineItem> AudioOuputs { get; set; }
 		public List<zStatus.AudioVideoInputOutputLineItem> Cameras { get; set; }
 		public zEvent.PhoneCallStatus PhoneCall { get; set; }
-        public zEvent.NeedWaitForHost NeedWaitForHost { get; set; }
 
 		public ZoomRoomStatus()
 		{
@@ -77,7 +76,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			AudioOuputs = new List<zStatus.AudioVideoInputOutputLineItem>();
 			Cameras = new List<zStatus.AudioVideoInputOutputLineItem>();
 			PhoneCall = new zEvent.PhoneCallStatus();
-		    NeedWaitForHost = new zEvent.NeedWaitForHost();
 		}
 	}
 
@@ -238,6 +236,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
+		/// <summary>
+		/// Used to be able to inplement IInvitableContact on DirectoryContact
+		/// </summary>
+		public class ZoomDirectoryContact : DirectoryContact, IInvitableContact
+		{
+
+		}
+
 		public class Phonebook
 		{
 			[JsonProperty("Contacts")]
@@ -270,9 +276,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				if (zoomRooms.Count > 0)
 				{
 					// If so, setup a rooms and contacts folder and add them.
-
-                    directory.ResultsFolderId = "root";
-
 					roomFolder.Name = "Rooms";
 					roomFolder.ParentFolderId = "root";
 					roomFolder.FolderId = "rooms";
@@ -289,16 +292,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 				try
 				{
-                    if (zoomContacts.Count == 0)
+					if (zoomContacts.Count == 0) return directory;
 					{
-                        return directory;
-                    }
-					
 						foreach (Contact c in zoomContacts)
 						{
-						var contact = new InvitableDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
-
-                        contact.ContactMethods.Add(new ContactMethod() { Number = c.Jid, Device = eContactMethodDevice.Video, CallType = eContactMethodCallType.Video, ContactMethodId = c.Jid });
+							var contact = new ZoomDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
 
 							if (folders.Count > 0)
 							{
@@ -310,6 +308,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 						directory.AddContactsToDirectory(contacts);
 					}
+				}
 				catch (Exception e)
 				{
 					Debug.Console(1, "Error converting Zoom Phonebook results to generic: {0}", e);
@@ -433,10 +432,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		{
 			private string _dispState;
 			private string _password;
-            private bool _isAirHostClientConnected;
-            private bool _isSharingBlackMagic;
-            private bool _isDirectPresentationConnected;
-
 
 			public string directPresentationPairingCode { get; set; }
 			/// <summary>
@@ -458,51 +453,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					}
 				}
 			}
-
-			public bool isAirHostClientConnected 
-            {
-                get { return _isAirHostClientConnected; }
-                set
-                {
-                    if (value != _isAirHostClientConnected)
-                    {
-                        _isAirHostClientConnected = value;
-                        NotifyPropertyChanged("isAirHostClientConnected");
-                    }
-                }
-            }
-
+			public bool isAirHostClientConnected { get; set; }
 			public bool isBlackMagicConnected { get; set; }
 			public bool isBlackMagicDataAvailable { get; set; }
-
-			public bool isDirectPresentationConnected
-            {
-                get { return _isDirectPresentationConnected; }
-                set
-                {
-                    if (value != _isDirectPresentationConnected)
-                    {
-                        _isDirectPresentationConnected = value;
-                        NotifyPropertyChanged("isDirectPresentationConnected");
-                    }
-                }
-            }
-
-			public bool isSharingBlackMagic
-            {
-                get { return _isSharingBlackMagic; }
-                set
-                {
-                    if (value != _isSharingBlackMagic)
-                    {
-                        _isSharingBlackMagic = value;
-                        NotifyPropertyChanged("isSharingBlackMagic");
-                    }
-                }
-            }
-
-
-
+			public bool isDirectPresentationConnected { get; set; }
+			public bool isSharingBlackMagic { get; set; }
 			/// <summary>
 			/// IOS Airplay code
 			/// </summary>
@@ -618,31 +573,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			private bool _can_Switch_Speaker_View;
 			private bool _can_Switch_Wall_View;
 			private bool _can_Switch_Share_On_All_Screens;
-            private bool _can_Switch_Floating_Share_Content;
 			private bool _is_In_First_Page;
 			private bool _is_In_Last_Page;
 			private string _video_type;
 
 
 			public bool can_Adjust_Floating_Video { get; set; }
-
-
-			public bool can_Switch_Floating_Share_Content
-            {
-                get
-                {
-                    return _can_Switch_Floating_Share_Content;
-                }
-                set
-                {
-                    if (value != _can_Switch_Floating_Share_Content)
-                    {
-                        _can_Switch_Floating_Share_Content = value;
-                        NotifyPropertyChanged("can_Switch_Floating_Share_Content");
-                    }
-                }
-            }
-
+			public bool can_Switch_Floating_Share_Content { get; set; }
 
 			/// <summary>
 			/// [on/off] // Set to On if it is possible to invoke zConfiguration Call Layout Style: ShareAll, to switch to the ShareAll mode, where the content sharing is shown full screen on all monitors.
@@ -762,29 +699,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
-		public class CallRecordInfo : NotifiableObject
+		public class CallRecordInfo
 		{
-            private bool _meetingIsBeingRecorded;
-
 			public bool canRecord { get; set; }
 			public bool emailRequired { get; set; }
 			public bool amIRecording { get; set; }
-
-			public bool meetingIsBeingRecorded 
-            {
-                get
-                {
-                    return _meetingIsBeingRecorded;
-                }
-                set
-                {
-                    if (value != _meetingIsBeingRecorded)
-                    {
-                        _meetingIsBeingRecorded = value;
-                        NotifyPropertyChanged("meetingIsBeingRecorded");
-                    }
-                }
-            }
+			public bool meetingIsBeingRecorded { get; set; }
 		}
 	}
 
@@ -793,10 +713,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 	/// </summary>
 	public class zEvent
 	{
-	    public class StartLocalPresentMeeting
-	    {
-	        public bool Success { get; set; }
-	    }
 		public class NeedWaitForHost
 		{
 			public bool Wait { get; set; }
@@ -864,7 +780,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			private bool _paused;
 			private eSharingState _state;
 
-            public bool IsSharing { get; private set; }
+			public bool IsSharing;
 
 			[JsonProperty("paused")]
 			public bool Paused
@@ -1004,15 +920,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			PhoneCallStatus_InCall,
 			PhoneCallStatus_Init,
 		}
-
-        public class MeetingNeedsPassword
-        {
-            [JsonProperty("needsPassword")]
-            public bool NeedsPassword { get; set; }
-
-            [JsonProperty("wrongAndRetry")]
-            public bool WrongAndRetry { get; set; }
-        }
 	}
 
 	/// <summary>
@@ -1158,25 +1065,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
-		public class Lock : NotifiableObject
+		public class Lock
 		{
-            private bool _enable;
-
-			public bool Enable 
-            {
-                get
-                {
-                    return _enable;
-                }
-                set
-                {
-                    if (value != _enable)
-                    {
-                        _enable = value;
-                        NotifyPropertyChanged("Enable");
-                    }
-                }
-            }
+			public bool Enable { get; set; }
 		}
 
 		public class ClosedCaption
@@ -1270,11 +1161,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				}
 				set
 				{
-					//if (value != _hideConfSelfVideo)
-					//{
+					if (value != _hideConfSelfVideo)
+					{
 						_hideConfSelfVideo = value;
 						NotifyPropertyChanged("HideConfSelfVideo");
-					//}
+					}
 				}
 			}
 
@@ -1528,10 +1419,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			public static List<Participant> GetGenericParticipantListFromParticipantsResult(
 				List<ListParticipant> participants)
 			{
-			    if (participants.Count == 0)
-			    {
-			        return new List<Participant>();
-			    }
 				//return participants.Select(p => new Participant
 				//            {
 				//                UserId = p.UserId,
@@ -1550,7 +1437,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					UserId = p.UserId,
 					Name = p.UserName,
 					IsHost = p.IsHost,
-                    IsMyself = p.IsMyself,
 					CanMuteVideo = p.IsVideoCanMuteByHost,
 					CanUnmuteVideo = p.IsVideoCanUnmuteByHost,
 					AudioMuteFb = p.AudioStatusState == "AUDIO_MUTED",

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs

@@ -63,8 +63,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             : base(key, name)
         {
             ParentCodec = codec;
-
-            Capabilities = eCameraCapabilities.Pan | eCameraCapabilities.Tilt | eCameraCapabilities.Zoom;
         }
 
         /// <summary>

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomJoinMap.cs

@@ -8,126 +8,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 	{
 		#region Digital
 
-        // TODO [ ] Issue #868
-        [JoinName("ShowPasswordPrompt")]
-        public JoinDataComplete ShowPasswordPrompt = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 6,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "FB Indicates to show the password prompt",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        // TODO [ ] Issue #868
-        [JoinName("PasswordIncorrect")]
-        public JoinDataComplete PasswordIncorrect = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 7,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "FB Indicates the password entered is incorrect",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        // TODO [ ] Issue #868
-        [JoinName("PassowrdLoginFailed")]
-        public JoinDataComplete PasswordLoginFailed = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 8,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "FB Indicates the password entered is incorrect",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        // TODO [ ] Issue #868
-        [JoinName("WaitingForHost")]
-        public JoinDataComplete WaitingForHost = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 9,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "FB Indicates system is waiting for host",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        // TODO [ ] Issue #868
-        [JoinName("IsHost")]
-        public JoinDataComplete IsHost = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 10,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "FB Indicates system is the host",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        // TODO [ ] Issue #868
-        [JoinName("StartMeetingNow")]
-        public JoinDataComplete StartMeetingNow = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 25,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "FB Indicates the password prompt is active",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        // TODO [ ] Issue #868
-        [JoinName("ShareOnlyMeeting")]
-        public JoinDataComplete ShareOnlyMeeting = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 26,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Triggers a share only meeting, feedback indicates the current meeting is share only",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        // TODO [ ] Issue #868
-        [JoinName("StartNormalMeetingFromSharingOnlyMeeting")]
-        public JoinDataComplete StartNormalMeetingFromSharingOnlyMeeting = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 27,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Starts a normal meeting from a share only meeting",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
 		[JoinName("CanSwapContentWithThumbnail")]
 		public JoinDataComplete CanSwapContentWithThumbnail = new JoinDataComplete(
 			new JoinData
@@ -377,81 +257,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		#region Serials
 
-        // TODO [ ] Issue #868
-        [JoinName("SubmitPassword")]
-        public JoinDataComplete SubmitPassword = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 6,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Submit password text",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        // TODO [ ] Issue #868
-        [JoinName("PasswordPromptMessage")]
-        public JoinDataComplete PasswordPromptMessage = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 6,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Password prompt message",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        // TODO [ ] Issue #868
-        [JoinName("MeetingInfoId")]
-        public JoinDataComplete MeetingInfoId = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 11,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Meeting info ID text feedback",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        // TODO [ ] Issue #868
-        [JoinName("MeetingInfoHostt")]
-        public JoinDataComplete MeetingInfoHost = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 12,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Meeting info Host text feedback",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        // TODO [ ] Issue #868
-        [JoinName("MeetingInfoPassword")]
-        public JoinDataComplete MeetingInfoPassword = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 13,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Meeting info Password text feedback",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
 		[JoinName("GetSetCurrentLayout")]
 		public JoinDataComplete GetSetCurrentLayout = new JoinDataComplete(
 			new JoinData

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs

@@ -25,7 +25,5 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         //This layout will be selected when a call is connected and no content is being shared
         public string DefaultCallLayout { get; set; }
-
-        public int MinutesBeforeMeetingStart { get; set; }
     }
 }

packages.config

@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.1.0" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
+  <package id="PepperDashCore" version="1.0.48" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
 </packages>