feat(essentials): Updated EssentialsVideoCodecUIDriver to display password prompt when joining password protected meeting

fix(essentials): #792 refactors logic to show/hide SelectASourceVisible subpage

.github/workflows/docker.yml

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

PepperDashEssentials/ControlSystem.cs

@@ -484,7 +484,7 @@ namespace PepperDash.Essentials
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
-                        CreateMobileControlBridge(room as EssentialsRoomBase);
+                        CreateMobileControlBridge(room);
                     }
                     else if (room is IEssentialsHuddleVtc1Room)
                     {
@@ -495,7 +495,7 @@ namespace PepperDash.Essentials
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
-                        CreateMobileControlBridge(room as EssentialsRoomBase);
+                        CreateMobileControlBridge(room);
                     }
                     else if (room is EssentialsTechRoom)
                     {
@@ -507,7 +507,7 @@ namespace PepperDash.Essentials
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge");
 
-                        CreateMobileControlBridge(room as EssentialsRoomBase);
+                        CreateMobileControlBridge(room);
                     }
                     else
                     {
@@ -524,13 +524,22 @@ namespace PepperDash.Essentials
 
         }
 
-        private static void CreateMobileControlBridge(EssentialsRoomBase room)
+        private static void CreateMobileControlBridge(object room)
         {
             var mobileControl = GetMobileControlDevice();
 
             if (mobileControl == null) return;
 
-            mobileControl.CreateMobileControlRoomBridge(room, mobileControl);
+            var mobileControl3 = mobileControl as IMobileControl3;
+
+            if (mobileControl3 != null)
+            {
+                mobileControl3.CreateMobileControlRoomBridge(room as IEssentialsRoom, mobileControl);
+            }
+            else
+            {
+                mobileControl.CreateMobileControlRoomBridge(room as EssentialsRoomBase, mobileControl);
+            }
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control Bridge Added...");
         }

PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs

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

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -226,7 +226,7 @@ namespace PepperDash.Essentials
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
 
-                Initialize();
+                InitializeRoom();
             }
             catch (Exception e)
             {
@@ -234,7 +234,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void Initialize()
+        void InitializeRoom()
 		{
             try
             {
@@ -454,7 +454,8 @@ namespace PepperDash.Essentials
             else
             {
                 Debug.Console(1, this, "sourceListKey present but not yet implemented");
-                throw new NotImplementedException();
+
+                RunRouteAction(routeKey, new Action(() => { }));
             }
         }
 
@@ -471,7 +472,11 @@ namespace PepperDash.Essentials
                 RunRouteAction(routeKey, successCallback);
             }
             else
-                throw new NotImplementedException();
+            {
+                Debug.Console(1, this, "sourceListKey present but not yet implemented");
+
+                RunRouteAction(routeKey, successCallback);
+            }
         }
 
 		/// <summary>

PepperDashEssentials/Room/Types/IEssentialsHuddleSpaceRoom.cs

@@ -17,7 +17,7 @@ using PepperDash.Core;
 
 namespace PepperDash.Essentials
 {
-    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasDefaultDisplay
+    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IHasDefaultDisplay
     {
         bool ExcludeFromGlobalFunctions { get; }
 
@@ -31,7 +31,7 @@ namespace PepperDash.Essentials
     }
 
     public interface IEssentialsHuddleVtc1Room : IEssentialsRoom, IHasCurrentSourceInfoChange,
-        IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
+        IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay
     {
         EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; }
 
@@ -39,10 +39,6 @@ namespace PepperDash.Essentials
 
         IHasScheduleAwareness ScheduleSource { get; }
 
-        BoolFeedback InCallFeedback { get; }
-
-        BoolFeedback PrivacyModeIsOnFeedback { get; }
-
         string DefaultCodecRouteString { get; }
     }
 }

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -752,10 +752,10 @@ namespace PepperDash.Essentials
         /// 15044 Close button for source modal overlay
         /// </summary>
         public const uint SourceBackgroundOverlayClosePress = 15044;
-        /// <summary>
-        /// 15045 - Visibility for the bar containing call navigation button list
-        /// </summary>
-        public const uint CallStagingBarVisible = 15045;
+        ///// <summary>
+        ///// 15045 - Visibility for the bar containing call navigation button list
+        ///// </summary>
+        //public const uint CallStagingBarVisible = 15045;
 		/// <summary>
 		/// 15046
 		/// </summary>
@@ -948,5 +948,24 @@ 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

@@ -118,6 +118,14 @@ namespace PepperDash.Essentials
 
         //----- through 3120
 
+        /// <summary>
+        /// 3201
+        /// </summary>
+        public const uint PasswordPromptMessageText = 3201;
+        /// <summary>
+        /// 3202
+        /// </summary>
+        public const uint PasswordPromptPasswordText = 3202;
 
         /// <summary>
         /// 3812

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -918,6 +918,7 @@ 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

@@ -1,326 +1,326 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-using PepperDash.Essentials;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Core;
+using PepperDash.Essentials;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.SmartObjects;
-using PepperDash.Essentials.Core.Touchpanels.Keyboards;
-using PepperDash.Essentials.Devices.Displays;
-using PepperDash.Essentials.Room.Config;
-
-namespace PepperDash.Essentials.UIDrivers
-{
-    public class EssentialsHuddleTechPageDriver : PanelDriverBase
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        SmartObjectDynamicList MenuList;
-        /// <summary>
-        /// 
-        /// </summary>
-        SubpageReferenceList StatusList;
-        /// <summary>
-        /// The list of display controls
-        /// </summary>
-        SubpageReferenceList DisplayList;
-        /// <summary>
-        /// References lines in the list against device instances
-        /// </summary>
-        Dictionary<ICommunicationMonitor, uint> StatusListDeviceIndexes;
-        /// <summary>
-        /// 
-        /// </summary>
-        JoinedSigInterlock PagesInterlock;
-
-        /// <summary>
-        /// 1
-        /// </summary>
-        public const uint JoinText = 1;
-
-        CTimer PinAuthorizedTimer;
-
-		EssentialsRoomTechConfig Config;
-
-        StringBuilder PinEntryBuilder = new StringBuilder(4);
-
-        bool IsAuthorized;
-
-        SmartObjectNumeric PinKeypad;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="trilist"></param>
-        /// <param name="parent"></param>
-        public EssentialsHuddleTechPageDriver(BasicTriListWithSmartObject trilist, EssentialsRoomTechConfig config)
-            : base(trilist)
-        {
-			Config = config;
-
-            PagesInterlock = new JoinedSigInterlock(trilist);
-            PagesInterlock.SetButDontShow(UIBoolJoin.TechSystemStatusVisible);
-
-            trilist.SetSigFalseAction(UIBoolJoin.TechExitButton, Hide);
-
-            MenuList = new SmartObjectDynamicList(trilist.SmartObjects[UISmartObjectJoin.TechMenuList], 
-                true, 3100);
-
-            MenuList.SetFeedback(1, true); // initial fb
-			ushort count = 0;
-
-            MenuList.SetItemMainText(1, "System Status");
-            MenuList.SetItemButtonAction(1, b => { 
-                if (b) PagesInterlock.ShowInterlocked(UIBoolJoin.TechSystemStatusVisible); 
-                MenuList.SetFeedback(1, true);
-            });
-
-            MenuList.SetItemMainText(2, "Display Controls");
-            MenuList.SetItemButtonAction(2, b => { 
-                if (b) PagesInterlock.ShowInterlocked(UIBoolJoin.TechDisplayControlsVisible); 
-                MenuList.SetFeedback(2, true);
-            });
-
-			count = 2;
-
-			// Don't show panel setup on iPad or xpanel
-			if (TriList is Crestron.SimplSharpPro.DeviceSupport.TswFt5Button)
-			{
-				count++;
-				MenuList.SetItemMainText(count, "Panel Setup");
-				MenuList.SetItemButtonAction(count, b =>
-				{
-					if (b) PagesInterlock.ShowInterlocked(UIBoolJoin.TechPanelSetupVisible);
-					MenuList.SetFeedback(count, true);
-				});
-			}
-
-            MenuList.Count = count;
-            BuildStatusList();
-            BuildDisplayList();
-            SetupPinModal();
-        }
-        
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void Show()
-        {
-            // divert to PIN if we need auth
-            if (IsAuthorized)
-            {
-                // Cancel the auth timer so we don't deauth after coming back in
-                if (PinAuthorizedTimer != null)
-                    PinAuthorizedTimer.Stop();
-
-                TriList.SetBool(UIBoolJoin.TechCommonItemsVisbible, true);
-                PagesInterlock.Show();
-                base.Show();
-            }
-            else
-            {
-                TriList.SetBool(UIBoolJoin.PinDialog4DigitVisible, true);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void Hide()
-        {
-            // Leave it authorized for 60 seconds.
-            if (IsAuthorized)
-                PinAuthorizedTimer = new CTimer(o => { 
-                    IsAuthorized = false;
-                    PinAuthorizedTimer = null;
-                }, 60000);
-            TriList.SetBool(UIBoolJoin.TechCommonItemsVisbible, false);
-            PagesInterlock.Hide();
-            base.Hide();
-        }
-
-        /// <summary>
-        /// Wire up the keypad and buttons
-        /// </summary>
-        void SetupPinModal()
-        {
-            TriList.SetSigFalseAction(UIBoolJoin.PinDialogCancelPress, CancelPinDialog);
-            PinKeypad = new SmartObjectNumeric(TriList.SmartObjects[UISmartObjectJoin.TechPinDialogKeypad], true);
-            PinKeypad.Digit0.UserObject = new Action<bool>(b => { if (b)DialPinDigit('0'); });
-            PinKeypad.Digit1.UserObject = new Action<bool>(b => { if (b)DialPinDigit('1'); });
-            PinKeypad.Digit2.UserObject = new Action<bool>(b => { if (b)DialPinDigit('2'); });
-            PinKeypad.Digit3.UserObject = new Action<bool>(b => { if (b)DialPinDigit('3'); });
-            PinKeypad.Digit4.UserObject = new Action<bool>(b => { if (b)DialPinDigit('4'); });
-            PinKeypad.Digit5.UserObject = new Action<bool>(b => { if (b)DialPinDigit('5'); });
-            PinKeypad.Digit6.UserObject = new Action<bool>(b => { if (b)DialPinDigit('6'); });
-            PinKeypad.Digit7.UserObject = new Action<bool>(b => { if (b)DialPinDigit('7'); });
-            PinKeypad.Digit8.UserObject = new Action<bool>(b => { if (b)DialPinDigit('8'); });
-            PinKeypad.Digit9.UserObject = new Action<bool>(b => { if (b)DialPinDigit('9'); });
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="d"></param>
-        void DialPinDigit(char d)
-        {
-            PinEntryBuilder.Append(d);
-            var len = PinEntryBuilder.Length;
-            SetPinDotsFeedback(len);
-
-            // check it!
-            if (len == 4)
-            {
-                if (Config.Password == PinEntryBuilder.ToString())
-                {
-                    IsAuthorized = true;
-                    SetPinDotsFeedback(0);
-                    TriList.SetBool(UIBoolJoin.PinDialog4DigitVisible, false);
-                    Show();
-                }
-                else
-                {
-                    SetPinDotsFeedback(0);
-                    TriList.SetBool(UIBoolJoin.PinDialogErrorVisible, true);
-                    new CTimer(o => 
-                        {
-                            TriList.SetBool(UIBoolJoin.PinDialogErrorVisible, false);
-                        }, 1500);
-                }
-
-                PinEntryBuilder.Remove(0, len); // clear it either way
-            }
-        }
-
-        /// <summary>
-        /// Draws the dots as pin is entered
-        /// </summary>
-        /// <param name="len"></param>
-        void SetPinDotsFeedback(int len)
-        {
-            TriList.SetBool(UIBoolJoin.PinDialogDot1, len >= 1);
-            TriList.SetBool(UIBoolJoin.PinDialogDot2, len >= 2);
-            TriList.SetBool(UIBoolJoin.PinDialogDot3, len >= 3);
-            TriList.SetBool(UIBoolJoin.PinDialogDot4, len == 4);
-
-        }
-
-        /// <summary>
-        /// Does what it says
-        /// </summary>
-        void CancelPinDialog()
-        {
-            PinEntryBuilder.Remove(0, PinEntryBuilder.Length);
-            TriList.SetBool(UIBoolJoin.PinDialog4DigitVisible, false);
-        }
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void BuildStatusList()
-        {
-            StatusList = new SubpageReferenceList(TriList, UISmartObjectJoin.TechStatusList, 3, 3, 3);
-            StatusListDeviceIndexes = new Dictionary<ICommunicationMonitor, uint>();
-            uint i = 0;
-            foreach (var d in DeviceManager.AllDevices)
-            {
-                // make sure it is both ICommunicationMonitor and a Device
-                var sd = d as ICommunicationMonitor;
-                if (sd == null)
-                    continue;
-                var dd = sd as Device;
-                if(dd == null)
-                    continue;
-                i++;
-                StatusList.StringInputSig(i, 1).StringValue = dd.Name;
-                StatusList.UShortInputSig(i, 1).UShortValue = (ushort)sd.CommunicationMonitor.Status;
-                StatusListDeviceIndexes.Add(sd, i);
-                sd.CommunicationMonitor.StatusChange += CommunicationMonitor_StatusChange ;
-            }
-            StatusList.Count = (ushort)i;
-        }
-
-        /// <summary>
-        /// Builds the list of display controls
-        /// </summary>
-        void BuildDisplayList()
-        {
-            DisplayList = new SubpageReferenceList(TriList, UISmartObjectJoin.TechDisplayControlsList, 10, 3, 3);
-
-            var devKeys = ConfigReader.ConfigObject.Devices.Where(d =>
-                d.Group.Equals("display", StringComparison.OrdinalIgnoreCase)
-                || d.Group.Equals("projector", StringComparison.OrdinalIgnoreCase))
-                .Select(dd => dd.Key);
-            var disps = DeviceManager.AllDevices.Where(d =>
-                devKeys.Contains(d.Key));
-            ushort i = 0;
-            foreach (var disp in disps)
-            {
-                var display = disp as DisplayBase;
-                if (display != null)
-                {
-                    i++;
-                    DisplayList.StringInputSig(i, 1).StringValue = display.Name;
-                    DisplayList.GetBoolFeedbackSig(i, 1).SetSigFalseAction(display.PowerOn);      
-                    DisplayList.GetBoolFeedbackSig(i, 2).SetSigFalseAction(display.PowerOff);
-                    if (display is TwoWayDisplayBase)
-                    {
-                        var powerOnSig = DisplayList.BoolInputSig(i, 1);
-                        (display as TwoWayDisplayBase).PowerIsOnFeedback.LinkInputSig(powerOnSig);
-
-                        var powerOffSig = DisplayList.BoolInputSig(1, 2);
-                        (display as TwoWayDisplayBase).PowerIsOnFeedback.LinkComplementInputSig(powerOffSig);
-                    } 
-                    DisplayList.GetBoolFeedbackSig(i, 3).SetSigFalseAction(() =>
-                        { if (display is IInputHdmi1) (display as IInputHdmi1).InputHdmi1(); });
-                    DisplayList.GetBoolFeedbackSig(i, 4).SetSigFalseAction(() =>
-                        { if (display is IInputHdmi2) (display as IInputHdmi2).InputHdmi2(); });
-                    DisplayList.GetBoolFeedbackSig(i, 5).SetSigFalseAction(() =>
-                        { if (display is IInputHdmi3) (display as IInputHdmi3).InputHdmi3(); });
-                    //DisplayList.GetBoolFeedbackSig(i, 6).SetSigFalseAction(() =>
-                    //{ if (display is IInputHdmi4) (display as IInputHdmi4).InputHdmi4(); });
-                    DisplayList.GetBoolFeedbackSig(i, 6).SetSigFalseAction(() =>
-                        { if (display is IInputDisplayPort1) (display as IInputDisplayPort1).InputDisplayPort1(); });
-
-                
-                    // Figure out some way to provide current input feedback
-                    if (display is TwoWayDisplayBase)
-                    {
-                        (display as TwoWayDisplayBase).CurrentInputFeedback.OutputChange += CurrentInputFeedback_OutputChange;
-                    }
-                }
-
-                
-            }
-
-            DisplayList.Count = i;
-        }
-
-
-        void CurrentInputFeedback_OutputChange(object sender, EventArgs e)
-        {
-            
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void CommunicationMonitor_StatusChange(object sender, MonitorStatusChangeEventArgs e)
-        {
-            var c = sender as ICommunicationMonitor;
-            if (StatusListDeviceIndexes.ContainsKey(c))
-            {
-                var i = StatusListDeviceIndexes[c];
-                StatusList.UShortInputSig(i, 1).UShortValue = (ushort)e.Status;
-            }
-        }
-    }
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.SmartObjects;
+using PepperDash.Essentials.Core.Touchpanels.Keyboards;
+using PepperDash.Essentials.Devices.Displays;
+using PepperDash.Essentials.Room.Config;
+
+namespace PepperDash.Essentials.UIDrivers
+{
+    public class EssentialsHuddleTechPageDriver : PanelDriverBase
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        SmartObjectDynamicList MenuList;
+        /// <summary>
+        /// 
+        /// </summary>
+        SubpageReferenceList StatusList;
+        /// <summary>
+        /// The list of display controls
+        /// </summary>
+        SubpageReferenceList DisplayList;
+        /// <summary>
+        /// References lines in the list against device instances
+        /// </summary>
+        Dictionary<ICommunicationMonitor, uint> StatusListDeviceIndexes;
+        /// <summary>
+        /// 
+        /// </summary>
+        JoinedSigInterlock PagesInterlock;
+
+        /// <summary>
+        /// 1
+        /// </summary>
+        public const uint JoinText = 1;
+
+        CTimer PinAuthorizedTimer;
+
+		EssentialsRoomTechConfig Config;
+
+        StringBuilder PinEntryBuilder = new StringBuilder(4);
+
+        bool IsAuthorized;
+
+        SmartObjectNumeric PinKeypad;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="trilist"></param>
+        /// <param name="parent"></param>
+        public EssentialsHuddleTechPageDriver(BasicTriListWithSmartObject trilist, EssentialsRoomTechConfig config)
+            : base(trilist)
+        {
+			Config = config;
+
+            PagesInterlock = new JoinedSigInterlock(trilist);
+            PagesInterlock.SetButDontShow(UIBoolJoin.TechSystemStatusVisible);
+
+            trilist.SetSigFalseAction(UIBoolJoin.TechExitButton, Hide);
+
+            MenuList = new SmartObjectDynamicList(trilist.SmartObjects[UISmartObjectJoin.TechMenuList], 
+                true, 3100);
+
+            MenuList.SetFeedback(1, true); // initial fb
+			ushort count = 0;
+
+            MenuList.SetItemMainText(1, "System Status");
+            MenuList.SetItemButtonAction(1, b => { 
+                if (b) PagesInterlock.ShowInterlocked(UIBoolJoin.TechSystemStatusVisible); 
+                MenuList.SetFeedback(1, true);
+            });
+
+            MenuList.SetItemMainText(2, "Display Controls");
+            MenuList.SetItemButtonAction(2, b => { 
+                if (b) PagesInterlock.ShowInterlocked(UIBoolJoin.TechDisplayControlsVisible); 
+                MenuList.SetFeedback(2, true);
+            });
+
+			count = 2;
+
+			// Don't show panel setup on iPad or xpanel
+			if (TriList is Crestron.SimplSharpPro.DeviceSupport.TswFt5Button)
+			{
+				count++;
+				MenuList.SetItemMainText(count, "Panel Setup");
+				MenuList.SetItemButtonAction(count, b =>
+				{
+					if (b) PagesInterlock.ShowInterlocked(UIBoolJoin.TechPanelSetupVisible);
+					MenuList.SetFeedback(count, true);
+				});
+			}
+
+            MenuList.Count = count;
+            BuildStatusList();
+            BuildDisplayList();
+            SetupPinModal();
+        }
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void Show()
+        {
+            // divert to PIN if we need auth
+            if (IsAuthorized)
+            {
+                // Cancel the auth timer so we don't deauth after coming back in
+                if (PinAuthorizedTimer != null)
+                    PinAuthorizedTimer.Stop();
+
+                TriList.SetBool(UIBoolJoin.TechCommonItemsVisbible, true);
+                PagesInterlock.Show();
+                base.Show();
+            }
+            else
+            {
+                TriList.SetBool(UIBoolJoin.PinDialog4DigitVisible, true);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void Hide()
+        {
+            // Leave it authorized for 60 seconds.
+            if (IsAuthorized)
+                PinAuthorizedTimer = new CTimer(o => { 
+                    IsAuthorized = false;
+                    PinAuthorizedTimer = null;
+                }, 60000);
+            TriList.SetBool(UIBoolJoin.TechCommonItemsVisbible, false);
+            PagesInterlock.Hide();
+            base.Hide();
+        }
+
+        /// <summary>
+        /// Wire up the keypad and buttons
+        /// </summary>
+        void SetupPinModal()
+        {
+            TriList.SetSigFalseAction(UIBoolJoin.PinDialogCancelPress, CancelPinDialog);
+            PinKeypad = new SmartObjectNumeric(TriList.SmartObjects[UISmartObjectJoin.TechPinDialogKeypad], true);
+            PinKeypad.Digit0.UserObject = new Action<bool>(b => { if (b)DialPinDigit('0'); });
+            PinKeypad.Digit1.UserObject = new Action<bool>(b => { if (b)DialPinDigit('1'); });
+            PinKeypad.Digit2.UserObject = new Action<bool>(b => { if (b)DialPinDigit('2'); });
+            PinKeypad.Digit3.UserObject = new Action<bool>(b => { if (b)DialPinDigit('3'); });
+            PinKeypad.Digit4.UserObject = new Action<bool>(b => { if (b)DialPinDigit('4'); });
+            PinKeypad.Digit5.UserObject = new Action<bool>(b => { if (b)DialPinDigit('5'); });
+            PinKeypad.Digit6.UserObject = new Action<bool>(b => { if (b)DialPinDigit('6'); });
+            PinKeypad.Digit7.UserObject = new Action<bool>(b => { if (b)DialPinDigit('7'); });
+            PinKeypad.Digit8.UserObject = new Action<bool>(b => { if (b)DialPinDigit('8'); });
+            PinKeypad.Digit9.UserObject = new Action<bool>(b => { if (b)DialPinDigit('9'); });
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="d"></param>
+        void DialPinDigit(char d)
+        {
+            PinEntryBuilder.Append(d);
+            var len = PinEntryBuilder.Length;
+            SetPinDotsFeedback(len);
+
+            // check it!
+            if (len == 4)
+            {
+                if (Config.Password == PinEntryBuilder.ToString())
+                {
+                    IsAuthorized = true;
+                    SetPinDotsFeedback(0);
+                    TriList.SetBool(UIBoolJoin.PinDialog4DigitVisible, false);
+                    Show();
+                }
+                else
+                {
+                    SetPinDotsFeedback(0);
+                    TriList.SetBool(UIBoolJoin.PinDialogErrorVisible, true);
+                    new CTimer(o => 
+                        {
+                            TriList.SetBool(UIBoolJoin.PinDialogErrorVisible, false);
+                        }, 1500);
+                }
+
+                PinEntryBuilder.Remove(0, len); // clear it either way
+            }
+        }
+
+        /// <summary>
+        /// Draws the dots as pin is entered
+        /// </summary>
+        /// <param name="len"></param>
+        void SetPinDotsFeedback(int len)
+        {
+            TriList.SetBool(UIBoolJoin.PinDialogDot1, len >= 1);
+            TriList.SetBool(UIBoolJoin.PinDialogDot2, len >= 2);
+            TriList.SetBool(UIBoolJoin.PinDialogDot3, len >= 3);
+            TriList.SetBool(UIBoolJoin.PinDialogDot4, len == 4);
+
+        }
+
+        /// <summary>
+        /// Does what it says
+        /// </summary>
+        void CancelPinDialog()
+        {
+            PinEntryBuilder.Remove(0, PinEntryBuilder.Length);
+            TriList.SetBool(UIBoolJoin.PinDialog4DigitVisible, false);
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        void BuildStatusList()
+        {
+            StatusList = new SubpageReferenceList(TriList, UISmartObjectJoin.TechStatusList, 3, 3, 3);
+            StatusListDeviceIndexes = new Dictionary<ICommunicationMonitor, uint>();
+            uint i = 0;
+            foreach (var d in DeviceManager.AllDevices)
+            {
+                // make sure it is both ICommunicationMonitor and a Device
+                var sd = d as ICommunicationMonitor;
+                if (sd == null)
+                    continue;
+                var dd = sd as Device;
+                if(dd == null)
+                    continue;
+                i++;
+                StatusList.StringInputSig(i, 1).StringValue = dd.Name;
+                StatusList.UShortInputSig(i, 1).UShortValue = (ushort)sd.CommunicationMonitor.Status;
+                StatusListDeviceIndexes.Add(sd, i);
+                sd.CommunicationMonitor.StatusChange += CommunicationMonitor_StatusChange ;
+            }
+            StatusList.Count = (ushort)i;
+        }
+
+        /// <summary>
+        /// Builds the list of display controls
+        /// </summary>
+        void BuildDisplayList()
+        {
+            DisplayList = new SubpageReferenceList(TriList, UISmartObjectJoin.TechDisplayControlsList, 10, 3, 3);
+
+            var devKeys = ConfigReader.ConfigObject.Devices.Where(d =>
+                d.Group.Equals("display", StringComparison.OrdinalIgnoreCase)
+                || d.Group.Equals("projector", StringComparison.OrdinalIgnoreCase))
+                .Select(dd => dd.Key);
+            var disps = DeviceManager.AllDevices.Where(d =>
+                devKeys.Contains(d.Key));
+            ushort i = 0;
+            foreach (var disp in disps)
+            {
+                var display = disp as DisplayBase;
+                if (display != null)
+                {
+                    i++;
+                    DisplayList.StringInputSig(i, 1).StringValue = display.Name;
+                    DisplayList.GetBoolFeedbackSig(i, 1).SetSigFalseAction(display.PowerOn);      
+                    DisplayList.GetBoolFeedbackSig(i, 2).SetSigFalseAction(display.PowerOff);
+                    if (display is TwoWayDisplayBase)
+                    {
+                        var powerOnSig = DisplayList.BoolInputSig(i, 1);
+                        (display as TwoWayDisplayBase).PowerIsOnFeedback.LinkInputSig(powerOnSig);
+
+                        var powerOffSig = DisplayList.BoolInputSig(1, 2);
+                        (display as TwoWayDisplayBase).PowerIsOnFeedback.LinkComplementInputSig(powerOffSig);
+                    } 
+                    DisplayList.GetBoolFeedbackSig(i, 3).SetSigFalseAction(() =>
+                        { if (display is IInputHdmi1) (display as IInputHdmi1).InputHdmi1(); });
+                    DisplayList.GetBoolFeedbackSig(i, 4).SetSigFalseAction(() =>
+                        { if (display is IInputHdmi2) (display as IInputHdmi2).InputHdmi2(); });
+                    DisplayList.GetBoolFeedbackSig(i, 5).SetSigFalseAction(() =>
+                        { if (display is IInputHdmi3) (display as IInputHdmi3).InputHdmi3(); });
+                    //DisplayList.GetBoolFeedbackSig(i, 6).SetSigFalseAction(() =>
+                    //{ if (display is IInputHdmi4) (display as IInputHdmi4).InputHdmi4(); });
+                    DisplayList.GetBoolFeedbackSig(i, 6).SetSigFalseAction(() =>
+                        { if (display is IInputDisplayPort1) (display as IInputDisplayPort1).InputDisplayPort1(); });
+
+                
+                    // Figure out some way to provide current input feedback
+                    if (display is TwoWayDisplayBase)
+                    {
+                        (display as TwoWayDisplayBase).CurrentInputFeedback.OutputChange += CurrentInputFeedback_OutputChange;
+                    }
+                }
+
+                
+            }
+
+            DisplayList.Count = i;
+        }
+
+
+        void CurrentInputFeedback_OutputChange(object sender, EventArgs e)
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        void CommunicationMonitor_StatusChange(object sender, MonitorStatusChangeEventArgs e)
+        {
+            var c = sender as ICommunicationMonitor;
+            if (c != null && StatusListDeviceIndexes.ContainsKey(c))
+            {
+                var i = StatusListDeviceIndexes[c];
+                StatusList.UShortInputSig(i, 1).UShortValue = (ushort)e.Status;
+            }
+        }
+    }
 }

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -173,10 +173,28 @@ namespace PepperDash.Essentials
         /// </summary>
         public PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; private set; }
 
+
+        private UiDisplayMode _currentMode;
+
         /// <summary>
         /// The mode showing. Presentation or call.
         /// </summary>
-        UiDisplayMode CurrentMode = UiDisplayMode.Start;
+        UiDisplayMode CurrentMode
+        {
+            get
+            {
+                return _currentMode;
+            }
+            set
+            {
+                if (value != _currentMode)
+                {
+                    _currentMode = value;
+
+                    SetActivityFooterFeedbacks();
+                }
+            }
+        }
 
 		CTimer NextMeetingTimer;
 
@@ -207,6 +225,7 @@ 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]);
@@ -607,11 +626,24 @@ namespace PepperDash.Essentials
         /// </summary>
         void SetActivityFooterFeedbacks()
         {
-            CallButtonSig.BoolValue = CurrentMode == UiDisplayMode.Call 
-                && CurrentRoom.ShutdownType == eShutdownType.None;
-            ShareButtonSig.BoolValue = CurrentMode == UiDisplayMode.Presentation 
-                && CurrentRoom.ShutdownType == eShutdownType.None;
-            EndMeetingButtonSig.BoolValue = CurrentRoom.ShutdownType != eShutdownType.None;
+            if (CurrentRoom != null)
+            {
+                var startMode = CurrentMode == UiDisplayMode.Start;
+                var presentationMode = CurrentMode == UiDisplayMode.Presentation;
+                var callMode = CurrentMode == UiDisplayMode.Call;
+
+                TriList.SetBool(StartPageVisibleJoin, startMode ? true : false);
+
+                TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, presentationMode ? true : false);
+                if (!presentationMode)
+                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
+
+                CallButtonSig.BoolValue = callMode
+                    && CurrentRoom.ShutdownType == eShutdownType.None;
+                ShareButtonSig.BoolValue = presentationMode
+                    && CurrentRoom.ShutdownType == eShutdownType.None;
+                EndMeetingButtonSig.BoolValue = CurrentRoom.ShutdownType != eShutdownType.None;
+            }
         }
 
         /// <summary>
@@ -623,14 +655,13 @@ 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();
         }
 
@@ -643,29 +674,25 @@ namespace PepperDash.Essentials
             if (VCDriver.IsVisible)
                 VCDriver.Hide();
 			HideNextMeetingPopup();
-            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)
             { 
-				if (!CurrentRoom.OnFeedback.BoolValue)
-				{
-					// If there's no default, show UI elements
-					if (!(CurrentRoom as IRunDefaultPresentRoute).RunDefaultPresentRoute())
-						TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
-				}
-            }
+				// 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.CurrentSourceInfoKey == CurrentRoom.DefaultCodecRouteString)
+                if(CurrentRoom.CurrentSourceInfo == null || (CurrentRoom.VideoCodec != null && CurrentRoom.CurrentSourceInfo.SourceDevice.Key == CurrentRoom.VideoCodec.OsdSource.Key))
                     TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
                 else if (CurrentSourcePageManager != null)
+                {
+                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
                     CurrentSourcePageManager.Show();
+                }
             }
             CurrentMode = UiDisplayMode.Presentation;
 			SetupSourceList();
-            SetActivityFooterFeedbacks();
         }
 
 		/// <summary>
@@ -707,6 +734,8 @@ namespace PepperDash.Essentials
 			if (CurrentRoom.CurrentSourceInfo == null)
 				return;
 
+            CurrentMode = UiDisplayMode.Presentation;
+
 			if (CurrentRoom.CurrentSourceInfo.SourceDevice == null)
 			{
 				TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
@@ -1105,6 +1134,30 @@ 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;
         }
@@ -1202,12 +1255,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;
 
             }
@@ -1218,9 +1271,8 @@ namespace PepperDash.Essentials
                     VCDriver.Hide();
                 SetupActivityFooterWhenRoomOff();
                 ShowLogo();
-                SetActivityFooterFeedbacks();
-                TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
-                TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
+                //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;
             }

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -83,6 +83,9 @@ namespace PepperDash.Essentials.UIDrivers.VC
         StringBuilder SearchStringBuilder = new StringBuilder();
         BoolFeedback SearchStringBackspaceVisibleFeedback;
 
+        StringFeedback PasswordStringFeedback;
+        StringBuilder PasswordStringBuilder = new StringBuilder();
+
         ModalDialog IncomingCallModal;
 
         eKeypadMode KeypadMode;
@@ -180,8 +183,22 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 });
                 SearchStringFeedback.LinkInputSig(triList.StringInput[UIStringJoin.CodecDirectorySearchEntryText]);
 
-                SetupDirectoryList();
+                PasswordStringFeedback = new StringFeedback(() =>
+                {
+                    if (PasswordStringBuilder.Length > 0)
+                    {
+                        Parent.Keyboard.EnableGoButton();
+                        return PasswordStringBuilder.ToString();
+                    }
+                    else
+                    {
+                        Parent.Keyboard.DisableGoButton();
+                        return "Tap for keyboard";
+                    }
+                });
+                PasswordStringFeedback.LinkInputSig(triList.StringInput[UIStringJoin.PasswordPromptPasswordText]);
 
+                SetupDirectoryList();
 
                 SearchStringBackspaceVisibleFeedback = new BoolFeedback(() => SearchStringBuilder.Length > 0);
                 SearchStringBackspaceVisibleFeedback.LinkInputSig(triList.BooleanInput[UIBoolJoin.VCDirectoryBackspaceVisible]);
@@ -199,6 +216,12 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 triList.SetSigHeldAction(UIBoolJoin.VCDirectoryBackspacePress, 500,
                     StartSearchBackspaceRepeat, StopSearchBackspaceRepeat, SearchKeypadBackspacePress);
 
+
+                if (Codec is IPasswordPrompt)
+                {
+                    SetupPasswordPrompt();
+                }
+
             }
             catch (Exception e)
             {
@@ -782,12 +805,14 @@ 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) =>
@@ -852,6 +877,14 @@ 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");
             }
         }
 
@@ -1031,22 +1064,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		void SetupDirectoryList()
 		{
 			var codec = Codec as IHasDirectory;
-			if (codec != null)
-			{
-				DirectoryList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCDirectoryList],
-					true, 1300);
-				codec.DirectoryResultReturned += new EventHandler<DirectoryEventArgs>(dir_DirectoryResultReturned);
+		    if (codec == null)
+		    {
+		        return;
+		    }
 
-				if (codec.PhonebookSyncState.InitialSyncComplete)
-					SetCurrentDirectoryToRoot();
-				else
-				{
-					codec.PhonebookSyncState.InitialSyncCompleted += new EventHandler<EventArgs>(PhonebookSyncState_InitialSyncCompleted);
-				}
+		    DirectoryList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCDirectoryList],
+		        true, 1300);
+		    codec.DirectoryResultReturned += dir_DirectoryResultReturned;
 
-			    RefreshDirectory();
-				
-			}
+		    if (codec.PhonebookSyncState.InitialSyncComplete)
+		        SetCurrentDirectoryToRoot();
+		    else
+		    {
+		        codec.PhonebookSyncState.InitialSyncCompleted += PhonebookSyncState_InitialSyncCompleted;
+		    }
 		}
 
         /// <summary>
@@ -1054,11 +1086,15 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void SetCurrentDirectoryToRoot()
         {
-            (Codec as IHasDirectory).SetCurrentDirectoryToRoot();
+            var hasDirectory = Codec as IHasDirectory;
 
+            if (hasDirectory == null)
+            {
+                return;
+            }
+
+            hasDirectory.SetCurrentDirectoryToRoot();
             SearchKeypadClear();
-
-            RefreshDirectory();
         }
 
         /// <summary>
@@ -1070,10 +1106,17 @@ namespace PepperDash.Essentials.UIDrivers.VC
         {
             var codec = Codec as IHasDirectory;
 
-            SetCurrentDirectoryToRoot();
+            if (codec == null)
+            {
+                return;
+            }
 
-            RefreshDirectory();
-            
+            if (!codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
+            {
+                return;
+            }
+
+            SetCurrentDirectoryToRoot();
         }
 
 		/// <summary>
@@ -1083,8 +1126,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <param name="e"></param>
 		void dir_DirectoryResultReturned(object sender, DirectoryEventArgs e)
 		{
-
-			RefreshDirectory();
+		    RefreshDirectory(e.Directory);
 		}
 
         /// <summary>
@@ -1113,16 +1155,27 @@ namespace PepperDash.Essentials.UIDrivers.VC
  
         }
 
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="dir"></param>
-		void RefreshDirectory()
+        /// <summary>
+        /// 
+        /// </summary>
+        void RefreshDirectory()
 		{
-            if ((Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults.Count > 0)
+		    var codec = Codec as IHasDirectory;
+
+		    if (codec == null)
+		    {
+		        return;
+		    }
+
+		    RefreshDirectory(codec.CurrentDirectoryResult);
+		}
+
+        void RefreshDirectory(CodecDirectory directory)
+        {
+            if (directory.CurrentDirectoryResults.Count > 0)
             {
                 ushort i = 0;
-                foreach (var r in (Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults)
+                foreach (var r in directory.CurrentDirectoryResults)
                 {
                     if (i == DirectoryList.MaxCount)
                     {
@@ -1142,19 +1195,33 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             // If more than one contact method, show contact method modal dialog
                             DirectoryList.SetItemButtonAction(i, b =>
                             {
-                                if (!b)
+                                if (b)
                                 {
-                                    // Refresh the contact methods list
-                                    RefreshContactMethodsModalList(dc);
-                                    Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible);
+                                    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
                         {
-                            // If only one contact method, just dial that method
-							DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(dc.ContactMethods[0].Number); });
+                            Debug.Console(1, "Unable to dial contact.  No availble ContactMethod(s) specified");
                         }
                     }
                     else    // is DirectoryFolder
@@ -1181,8 +1248,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 DirectoryList.SetItemMainText(1, "No Results Found");
             }
-
-		}
+        }
 
         void RefreshContactMethodsModalList(DirectoryContact contact)
         {
@@ -1285,7 +1351,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void RevealKeyboard()
         {
-            if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCKeypadWithFavoritesVisible && KeypadMode == eKeypadMode.Dial)
+            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)
             {
                 var kb = Parent.Keyboard;
 				kb.KeyPress -= Keyboard_DialKeyPress;
@@ -1307,6 +1387,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 SearchStringKeypadCheckEnables();
                 kb.Show();
             }
+
         }
 
         /// <summary>
@@ -1362,6 +1443,32 @@ 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>
@@ -1375,6 +1482,11 @@ namespace PepperDash.Essentials.UIDrivers.VC
             Parent.Keyboard.KeyPress -= Keyboard_SearchKeyPress;
         }
 
+        void DetachPasswordKeyboard()
+        {
+            Parent.Keyboard.KeyPress -= Keyboard_PasswordKeyPress;
+        }
+
         /// <summary>
         /// Shows the camera controls subpage
         /// </summary>
@@ -1628,6 +1740,40 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 Parent.Keyboard.DisableGoButton();
         }
 
+        /// <summary>
+        /// Clears the Password keypad
+        /// </summary>
+        void PasswordKeypadClear()
+        {
+            PasswordStringBuilder.Remove(0, SearchStringBuilder.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
@@ -1673,5 +1819,58 @@ 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
+            PasswordStringBuilder.Remove(0, PasswordStringBuilder.Length);
+
+            _passwordPromptDialogVisible = true;
+            TriList.SetBool(UIBoolJoin.PasswordPromptDialogVisible, _passwordPromptDialogVisible);
+            RevealKeyboard();
+        }
+
+        void HidePasswordPrompt()
+        {
+            _passwordPromptDialogVisible = false;
+            Parent.Keyboard.Hide();
+            TriList.SetBool(UIBoolJoin.PasswordPromptDialogVisible, _passwordPromptDialogVisible);
+        }
     }
 }

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

@@ -13,6 +13,14 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         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

@@ -0,0 +1,56 @@
+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/PepperDash_Essentials_Core.csproj

@@ -203,6 +203,7 @@
     <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" />

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
+    public interface IEssentialsRoom : IKeyName, IReconfigurableDevice, IRunDefaultPresentRoute
     {
         BoolFeedback OnFeedback { get; }
 
@@ -56,7 +56,6 @@ namespace PepperDash.Essentials.Core
         void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes);
 
         void PowerOnToDefaultOrLastSource();
-        bool RunDefaultPresentRoute();
 
         void SetDefaultLevels();
 

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

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

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

@@ -69,6 +69,22 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("directoryResults")]
         public List<DirectoryItem> CurrentDirectoryResults { get; private set; }
 
+        public List<DirectoryItem> Contacts
+        {
+            get
+            {
+                return CurrentDirectoryResults.OfType<DirectoryContact>().Cast<DirectoryItem>().ToList();
+            }
+        }
+
+        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>
@@ -104,6 +120,15 @@ 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>

essentials-framework/Essentials Devices Common/Essentials Devices Common/Display/InputInterfaces.cs

@@ -1,17 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Devices.Displays
-{
-    public interface IInputHdmi1 { void InputHdmi1(); }
-    public interface IInputHdmi2 { void InputHdmi2(); }
-    public interface IInputHdmi3 { void InputHdmi3(); }
-    public interface IInputHdmi4 { void InputHdmi4(); }
-    public interface IInputDisplayPort1 { void InputDisplayPort1(); }
-    public interface IInputDisplayPort2 { void InputDisplayPort2(); }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Displays
+{
+    public interface IInputHdmi1 { void InputHdmi1(); }
+    public interface IInputHdmi2 { void InputHdmi2(); }
+    public interface IInputHdmi3 { void InputHdmi3(); }
+    public interface IInputHdmi4 { void InputHdmi4(); }
+    public interface IInputDisplayPort1 { void InputDisplayPort1(); }
+    public interface IInputDisplayPort2 { void InputDisplayPort2(); }
     public interface IInputVga1 { void InputVga1(); }
 
 }

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

@@ -327,6 +327,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public SpeakerTrack()
             {
                 Status = new Status2();
+                Availability = new Availability();
             }
         }
 

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

@@ -1,100 +1,102 @@
 using System;
 using System.Collections.Generic;
+using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
 {
-    /// <summary>
-    /// Describes a device that has call participants
-    /// </summary>
-    public interface IHasParticipants
-    {
-        CodecParticipants Participants { get; }
-    }
+	/// <summary>
+	/// Describes a device that has call participants
+	/// </summary>
+	public interface IHasParticipants
+	{
+		CodecParticipants Participants { get; }
+	}
 
-    /// <summary>
-    /// Describes the ability to mute and unmute a participant's video in a meeting
-    /// </summary>
-    public interface IHasParticipantVideoMute:IHasParticipants
-    {
-        void MuteVideoForParticipant(int userId);
-        void UnmuteVideoForParticipant(int userId);
-        void ToggleVideoForParticipant(int userId);
-    }
+	/// <summary>
+	/// Describes the ability to mute and unmute a participant's video in a meeting
+	/// </summary>
+	public interface IHasParticipantVideoMute : IHasParticipants
+	{
+		void MuteVideoForParticipant(int userId);
+		void UnmuteVideoForParticipant(int userId);
+		void ToggleVideoForParticipant(int userId);
+	}
 
-    /// <summary>
-    /// Describes the ability to mute and unmute a participant's audio in a meeting
-    /// </summary>
-    public interface IHasParticipantAudioMute : IHasParticipantVideoMute
-    {
-        void MuteAudioForParticipant(int userId);
-        void UnmuteAudioForParticipant(int userId);
-        void ToggleAudioForParticipant(int userId);
-    }
+	/// <summary>
+	/// Describes the ability to mute and unmute a participant's audio in a meeting
+	/// </summary>
+	public interface IHasParticipantAudioMute : IHasParticipantVideoMute
+	{
+		void MuteAudioForParticipant(int userId);
+		void UnmuteAudioForParticipant(int userId);
+		void ToggleAudioForParticipant(int userId);
+	}
 
-    /// <summary>
-    /// Describes the ability to pin and unpin a participant in a meeting
-    /// </summary>
-    public interface IHasParticipantPinUnpin : IHasParticipants
-    {
-        IntFeedback NumberOfScreensFeedback { get; }
-        int ScreenIndexToPinUserTo { get; }
+	/// <summary>
+	/// Describes the ability to pin and unpin a participant in a meeting
+	/// </summary>
+	public interface IHasParticipantPinUnpin : IHasParticipants
+	{
+		IntFeedback NumberOfScreensFeedback { get; }
+		int ScreenIndexToPinUserTo { get; }
 
-        void PinParticipant(int userId, int screenIndex);
-        void UnPinParticipant(int userId);
-        void ToggleParticipantPinState(int userId, int screenIndex);
-    }
+		void PinParticipant(int userId, int screenIndex);
+		void UnPinParticipant(int userId);
+		void ToggleParticipantPinState(int userId, int screenIndex);
+	}
 
-    public class CodecParticipants
-    {
-        private List<Participant> _currentParticipants;
- 
-        public List<Participant> CurrentParticipants {
-            get { return _currentParticipants; }
-            set
-            {
-                _currentParticipants = value;
-                OnParticipantsChanged();
-            }
-        }
+	public class CodecParticipants
+	{
+		private List<Participant> _currentParticipants;
 
-        public event EventHandler<EventArgs> ParticipantsListHasChanged;
+		public List<Participant> CurrentParticipants
+		{
+			get { return _currentParticipants; }
+			set
+			{
+				_currentParticipants = value;
+				OnParticipantsChanged();
+			}
+		}
 
-        public CodecParticipants()
-        {
-            _currentParticipants = new List<Participant>();
-        }
+		public event EventHandler<EventArgs> ParticipantsListHasChanged;
 
-        public void OnParticipantsChanged()
-        {
-            var handler = ParticipantsListHasChanged;
+		public CodecParticipants()
+		{
+			_currentParticipants = new List<Participant>();
+		}
 
-            if (handler == null) return;
+		public void OnParticipantsChanged()
+		{
+			var handler = ParticipantsListHasChanged;
 
-            handler(this, new EventArgs());
-        }
-    }
+			if (handler == null) return;
 
-    /// <summary>
-    /// Represents a call participant
-    /// </summary>
-    public class Participant
-    {
-        public int UserId { get; set; }
-        public bool IsHost { get; set; }
-        public string Name { get; set; }
-        public bool CanMuteVideo { get; set; }       
-        public bool CanUnmuteVideo { get; set; }
-        public bool VideoMuteFb { get; set; }
-        public bool AudioMuteFb { get; set; }
-        public bool HandIsRaisedFb { get; set; }
-        public bool IsPinnedFb { get; set; }
-        public int ScreenIndexIsPinnedToFb { get; set; }
+			handler(this, new EventArgs());
+		}
+	}
 
-        public Participant()
-        {
-            // Initialize to -1 (no screen)
-            ScreenIndexIsPinnedToFb = -1;
-        }
-    }
+	/// <summary>
+	/// Represents a call participant
+	/// </summary>
+	public class Participant
+	{
+		public int UserId { get; set; }
+		public bool IsHost { get; set; }
+		public string Name { get; set; }
+		public bool CanMuteVideo { get; set; }
+		public bool CanUnmuteVideo { get; set; }
+		public bool VideoMuteFb { get; set; }
+		public bool AudioMuteFb { get; set; }
+		public bool HandIsRaisedFb { get; set; }
+		public bool IsPinnedFb { get; set; }
+		public int ScreenIndexIsPinnedToFb { get; set; }
+
+		public Participant()
+		{
+			// Initialize to -1 (no screen)
+			ScreenIndexIsPinnedToFb = -1;
+		}
+	}
 }

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

@@ -11,10 +11,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 	/// <summary>
 	/// For rooms that have video codec
 	/// </summary>
-	public interface IHasVideoCodec
+	public interface IHasVideoCodec:IHasInCallFeedback,IPrivacy
 	{
 		VideoCodecBase VideoCodec { get; }
-		BoolFeedback InCallFeedback { get; }
 
         ///// <summary>
         ///// Make this more specific
@@ -26,11 +25,6 @@ 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/ZoomRoom/ResponseObjects.cs

@@ -276,6 +276,9 @@ 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";
@@ -292,22 +295,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 				try
 				{
-					if (zoomContacts.Count == 0) return directory;
+                    if (zoomContacts.Count == 0)
+                    {
+                        return directory;
+                    }
+					
+					foreach (Contact c in zoomContacts)
 					{
-						foreach (Contact c in zoomContacts)
+						var contact = new ZoomDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
+
+                        contact.ContactMethods.Add(new ContactMethod() { Number = c.Jid, Device = eContactMethodDevice.Video, CallType = eContactMethodCallType.Video, ContactMethodId = c.Jid });
+
+						if (folders.Count > 0)
 						{
-							var contact = new ZoomDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
-
-							if (folders.Count > 0)
-							{
-								contact.ParentFolderId = c.IsZoomRoom ? "rooms" : "contacts";
-							}
-
-							contacts.Add(contact);
+							contact.ParentFolderId = c.IsZoomRoom ? "rooms" : "contacts";
 						}
 
-						directory.AddContactsToDirectory(contacts);
+						contacts.Add(contact);
 					}
+
+					directory.AddContactsToDirectory(contacts);
 				}
 				catch (Exception e)
 				{
@@ -920,6 +927,15 @@ 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>
@@ -1161,11 +1177,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				}
 				set
 				{
-					if (value != _hideConfSelfVideo)
-					{
+					//if (value != _hideConfSelfVideo)
+					//{
 						_hideConfSelfVideo = value;
 						NotifyPropertyChanged("HideConfSelfVideo");
-					}
+					//}
 				}
 			}
 

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

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