Merge branch 'development' into hotfix/zoom-room-content-sharing-fb

Hotfix/zoom room privacy mute notincall

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

@@ -792,16 +792,44 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("DialMeetingStart")]
-		public JoinDataComplete DialMeetingStart = new JoinDataComplete(
+		[JoinName("DialMeeting1")]
+		public JoinDataComplete DialMeeting1 = new JoinDataComplete(
 			new JoinData
 			{
 				JoinNumber = 161,
-				JoinSpan = 10
+				JoinSpan = 1
 			},
 			new JoinMetadata
 			{
-				Description = "Join meeting",
+				Description = "Join first meeting",
+				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		[JoinName("DialMeeting2")]
+		public JoinDataComplete DialMeeting2 = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 162,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Join second meeting",
+				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		[JoinName("DialMeeting3")]
+		public JoinDataComplete DialMeeting3 = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 163,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Join third meeting",
 				JoinCapabilities = eJoinCapabilities.FromSIMPL,
 				JoinType = eJoinType.Digital
 			});

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

@@ -1,56 +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;
-        }
-    }
+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 Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -185,7 +185,6 @@
     <Compile Include="VideoCodec\MockVC\MockVC.cs" />
     <Compile Include="VideoCodec\CiscoCodec\xStatus.cs" />
     <Compile Include="VideoCodec\VideoCodecBase.cs" />
-    <Compile Include="VideoCodec\ZoomRoom\IZoomWirelessShareInstructions.cs" />
     <Compile Include="VideoCodec\ZoomRoom\ResponseObjects.cs" />
     <Compile Include="VideoCodec\ZoomRoom\ZoomRoom.cs" />
     <Compile Include="VideoCodec\ZoomRoom\ZoomRoomCamera.cs" />

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

@@ -811,22 +811,35 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			    codec.CodecSchedule.MeetingWarningMinutes = i;
 			});
 
-
-            for (uint i = 0; i < joinMap.DialMeetingStart.JoinSpan; i++)
-            {
-                Debug.Console(1, this, "Setting action to Dial Meeting {0} to digital join {1}", i + 1, joinMap.DialMeetingStart.JoinNumber + i);
-                var joinNumber = joinMap.DialMeetingStart.JoinNumber + i;
-                var mtg = i + 1;
-                var index = (int)i;
-
-                trilist.SetSigFalseAction(joinNumber, () =>
-                {
-                    Debug.Console(1, this, "Meeting {0} Selected (EISC dig-o{1}) > _currentMeetings[{2}].Id: {3}, Title: {4}",
-                        mtg, joinMap.DialMeetingStart.JoinNumber + i, index, _currentMeetings[index].Id, _currentMeetings[index].Title);
-                    if (_currentMeetings[index] != null)
-                        Dial(_currentMeetings[index]);
-                });
-            }
+			trilist.SetSigFalseAction(joinMap.DialMeeting1.JoinNumber, () =>
+			{
+				var mtg = 1;
+				var index = mtg - 1;
+				Debug.Console(1, this, "Meeting {0} Selected (EISC dig-o{1}) > _currentMeetings[{2}].Id: {3}, Title: {4}",
+					mtg, joinMap.DialMeeting1.JoinNumber, index, _currentMeetings[index].Id, _currentMeetings[index].Title);
+				if (_currentMeetings[index] != null)
+					Dial(_currentMeetings[index]);
+			});
+			
+			trilist.SetSigFalseAction(joinMap.DialMeeting2.JoinNumber, () =>
+			{
+				var mtg = 2;
+				var index = mtg - 1;
+				Debug.Console(1, this, "Meeting {0} Selected (EISC dig-o{1}) > _currentMeetings[{2}].Id: {3}, Title: {4}",
+					mtg, joinMap.DialMeeting2.JoinNumber, index, _currentMeetings[index].Id, _currentMeetings[index].Title);
+				if (_currentMeetings[index] != null)
+					Dial(_currentMeetings[index]);
+			});
+			
+			trilist.SetSigFalseAction(joinMap.DialMeeting3.JoinNumber, () =>
+			{
+				var mtg = 3;
+				var index = mtg - 1;
+				Debug.Console(1, this, "Meeting {0} Selected (EISC dig-o{1}) > _currentMeetings[{2}].Id: {3}, Title: {4}",
+					mtg, joinMap.DialMeeting3.JoinNumber, index, _currentMeetings[index].Id, _currentMeetings[index].Title);
+				if (_currentMeetings[index] != null)
+					Dial(_currentMeetings[index]);
+			});
 
 			codec.CodecSchedule.MeetingsListHasChanged += (sender, args) => UpdateMeetingsList(codec, trilist, joinMap);
 			codec.CodecSchedule.MeetingEventChange += (sender, args) =>
@@ -837,6 +850,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 					}
 				};
 
+            // TODO [ ] hotfix/videocodecbase-max-meeting-xsig-set
             trilist.SetUShortSigAction(joinMap.MeetingsToDisplay.JoinNumber, m => MeetingsToDisplay = m);
             MeetingsToDisplayFeedback.LinkInputSig(trilist.UShortInput[joinMap.MeetingsToDisplay.JoinNumber]);
 

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

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-using PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
-{
-    public class ShareInfoEventArgs : EventArgs
-    {
-        public zStatus.Sharing SharingStatus { get; private set; }
-
-        public ShareInfoEventArgs(zStatus.Sharing status)
-        {
-            SharingStatus = status;
-        }
-    }
-
-    public interface IZoomWirelessShareInstructions
-    {
-        event EventHandler<ShareInfoEventArgs> ShareInfoChanged;
-
-        zStatus.Sharing SharingState { get; }
-    }
-}

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

@@ -434,16 +434,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			public bool supports_Web_Settings_Push { get; set; }
 		}
 
-        public enum eDisplayState
-        {
-            None,
-            Laptop,
-            IOS,
-        }
-
 		public class Sharing : NotifiableObject
 		{
-            private eDisplayState _dispState;
+			private string _dispState;
 			private string _password;
             private bool _isAirHostClientConnected;
             private bool _isSharingBlackMagic;
@@ -455,7 +448,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			/// Laptop client sharing key
 			/// </summary>
 			public string directPresentationSharingKey { get; set; }
-            public eDisplayState dispState
+			public string dispState
 			{
 				get
 				{
@@ -513,6 +506,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 }
             }
 
+
+
 			/// <summary>
 			/// IOS Airplay code
 			/// </summary>
@@ -627,7 +622,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			// backer variables
 			private bool _can_Switch_Speaker_View;
 			private bool _can_Switch_Wall_View;
-            private bool _can_Switch_Strip_View;
 			private bool _can_Switch_Share_On_All_Screens;
             private bool _can_Switch_Floating_Share_Content;
 			private bool _is_In_First_Page;
@@ -715,23 +709,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				}
 			}
 
-            [JsonProperty("can_Switch_Strip_View")]
-            public bool can_Switch_Strip_View
-            {
-                get
-                {
-                    return _can_Switch_Strip_View;
-                }
-                set
-                {
-                    if (value != _can_Switch_Strip_View)
-                    {
-                        _can_Switch_Strip_View = value;
-                        NotifyPropertyChanged("can_Switch_Strip_View");
-                    }
-                }
-            }
-
 			[JsonProperty("is_In_First_Page")]
 			public bool is_In_First_Page
 			{

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

@@ -27,7 +27,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         IHasScheduleAwareness, IHasCodecCameras, IHasParticipants, IHasCameraOff, IHasCameraMuteWithUnmuteReqeust, IHasCameraAutoMode,
 		IHasFarEndContentStatus, IHasSelfviewPosition, IHasPhoneDialing, IHasZoomRoomLayouts, IHasParticipantPinUnpin,
 		IHasParticipantAudioMute, IHasSelfviewSize, IPasswordPrompt, IHasStartMeeting, IHasMeetingInfo, IHasPresentationOnlyMeeting,
-        IHasMeetingLock, IHasMeetingRecordingWithPrompt, IZoomWirelessShareInstructions
+        IHasMeetingLock, IHasMeetingRecordingWithPrompt
 	{
         public event EventHandler VideoUnmuteRequested;
 
@@ -47,7 +47,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         private const string JsonDelimiter = "\x0D\x0A\x7D\x0D\x0A";
 
         private string[] Delimiters = new string[] { EchoDelimiter, JsonDelimiter, "OK\x0D\x0A", "end\x0D\x0A" };
+        //"echo off\x0D\x0A\x0A\x0D\x0A"
 		private readonly GenericQueue _receiveQueue;
+		//private readonly CrestronQueue<string> _receiveQueue;
+
+
+		//private readonly Thread _receiveThread;
 
 		private readonly ZoomRoomSyncState _syncState;
 		public bool CommDebuggingIsOn;
@@ -59,7 +64,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		private CameraBase _selectedCamera;
         private string _lastDialedMeetingNumber;
 
-
 		private readonly ZoomRoomPropertiesConfig _props;
 
 		public ZoomRoom(DeviceConfig config, IBasicCommunication comm)
@@ -750,7 +754,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			Status.Sharing.PropertyChanged += (o, a) =>
 			{
-                OnShareInfoChanged(Status.Sharing);
                 SharingSourceFeedback.FireUpdate();
 				switch (a.PropertyName)
 				{
@@ -810,10 +813,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				Debug.Console(1, this, "Status.Layout.PropertyChanged a.PropertyName: {0}", a.PropertyName);
 				switch (a.PropertyName.ToLower())
 				{
-					case "can_Switch_speaker_view":
+					case "can_switch_speaker_view":
 					case "can_switch_wall_view":
-                    case "can_switch_strip_view":
-                    case "video_type":
 					case "can_switch_share_on_all_screens":
 					{
 						ComputeAvailableLayouts();
@@ -829,7 +830,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 						LayoutViewIsOnLastPageFeedback.FireUpdate();
 						break;
 					}
-                    case "can_switch_floating_share_content":
+                    case "can_Switch_Floating_Share_Content":
                     {
                         CanSwapContentWithThumbnailFeedback.FireUpdate();
                         break;
@@ -1561,7 +1562,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 							{
 								JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.Sharing);
 
-								SetDefaultLayout();
+								SetLayout();
 
 								break;
 							}
@@ -1937,7 +1938,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
-		private void SetDefaultLayout()
+		private void SetLayout()
 		{
 			if (!_props.AutoDefaultLayouts) return;
 
@@ -1950,13 +1951,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 			else
 			{
-                if (_props.DefaultCallLayout == (_props.DefaultCallLayout & AvailableLayouts))
-                {
-                    SendText(String.Format("zconfiguration call layout style: {0}",
-                        _props.DefaultCallLayout));
-                }
-                else
-                    Debug.Console(0, this, "Unable to set default Layout.  {0} not currently an available layout based on meeting state", _props.DefaultCallLayout);
+				SendText(String.Format("zconfiguration call layout style: {0}",
+					_props.DefaultCallLayout));
 			}
 		}
 
@@ -2156,10 +2152,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                     MeetingIsLockedFeedback.BoolValue,
                     MeetingIsRecordingFeedback.BoolValue
                     );
-
-                SetDefaultLayout();
             }
-
+            // TODO [ ] Issue #868
             else if (item.Status == eCodecCallStatus.Disconnected)
             {
                 MeetingInfo = new MeetingInfo(
@@ -2180,6 +2174,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			Debug.Console(1, this, "[OnCallStatusChange] Current Call Status: {0}",
 				Status.Call != null ? Status.Call.Status.ToString() : "no call");
+
+			if (_props.AutoDefaultLayouts)
+			{
+				SetLayout();
+			}
 		}
 
         private string GetSharingStatus()
@@ -2510,32 +2509,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		    trilist.SetSigTrueAction(joinMap.ShareOnlyMeeting.JoinNumber, StartSharingOnlyMeeting);
             trilist.SetSigTrueAction(joinMap.StartNormalMeetingFromSharingOnlyMeeting.JoinNumber, StartNormalMeetingFromSharingOnlyMeeting);
 
+            // not sure if this would be needed here, should be handled by VideoCodecBase.cs LinkToApi methods
+            //DirectoryResultReturned += (device, args) =>
+            //{
+            //    // add logic here if necessary when event fires
+
+            //};
+
+
 			trilist.SetStringSigAction(joinMap.SubmitPassword.JoinNumber, SubmitPassword);
-            //trilist.SetSigFalseAction(joinMap.CancelPasswordPrompt.JoinNumber, () =>
-            //    OnPasswordRequired(false, false, true, ""));
-
-            // Subscribe to call status to clear ShowPasswordPrompt when in meeting
-            this.CallStatusChange += (o, a) =>
-                {
-                    if (a.CallItem.Status == eCodecCallStatus.Connected || a.CallItem.Status == eCodecCallStatus.Disconnected)
-                    {
-                        trilist.SetBool(joinMap.MeetingPasswordRequired.JoinNumber, false);
-                    }
-
-                };
-
-            trilist.SetSigFalseAction(joinMap.CancelJoinAttempt.JoinNumber, () => {
-                trilist.SetBool(joinMap.MeetingPasswordRequired.JoinNumber, false);
-                EndAllCalls();
-            });
-
+			trilist.SetStringSigAction(joinMap.CancelPasswordPrompt.JoinNumber,
+				delegate { OnPasswordRequired(false, false, true, ""); });
 			PasswordRequired += (devices, args) =>
 			{
-                Debug.Console(0, this, "***********************************PaswordRequired. Message: {0} Cancelled: {1} Last Incorrect: {2} Failed: {3}", args.Message, args.LoginAttemptCancelled, args.LastAttemptWasIncorrect, args.LoginAttemptFailed);
-
 				if (args.LoginAttemptCancelled)
 				{
-					trilist.SetBool(joinMap.MeetingPasswordRequired.JoinNumber, false);
+					trilist.SetBool(joinMap.ShowPasswordPrompt.JoinNumber, false);
 					return;
 				}
 
@@ -2551,7 +2540,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				}
 
 				trilist.SetBool(joinMap.PasswordIncorrect.JoinNumber, args.LastAttemptWasIncorrect);
-				trilist.SetBool(joinMap.MeetingPasswordRequired.JoinNumber, true);
+				trilist.SetBool(joinMap.ShowPasswordPrompt.JoinNumber, true);
 			};
 
 			trilist.OnlineStatusChange += (device, args) =>
@@ -2567,31 +2556,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				pinCodec.NumberOfScreensFeedback.FireUpdate();
 				layoutSizeCodec.SelfviewPipSizeFeedback.FireUpdate();
 			};
-
-            var wirelessInfoCodec = this as IZoomWirelessShareInstructions;
-            if (wirelessInfoCodec != null)
-            {
-                SetSharingStateJoins(Status.Sharing, trilist, joinMap);
-
-                wirelessInfoCodec.ShareInfoChanged += (o, a) =>
-                    {
-                        SetSharingStateJoins(a.SharingStatus, trilist, joinMap);
-                    };
-            }
 		}
 
-        void SetSharingStateJoins(zStatus.Sharing state, BasicTriList trilist, ZoomRoomJoinMap joinMap)
-        {
-            trilist.SetBool(joinMap.IsSharingAirplay.JoinNumber, state.isAirHostClientConnected);
-            trilist.SetBool(joinMap.IsSharingHdmi.JoinNumber, state.isBlackMagicConnected || state.isDirectPresentationConnected);
-            
-            trilist.SetString(joinMap.DisplayState.JoinNumber, state.dispState.ToString());
-            trilist.SetString(joinMap.AirplayShareCode.JoinNumber, state.password);
-            trilist.SetString(joinMap.LaptopShareKey.JoinNumber, state.directPresentationSharingKey);
-            trilist.SetString(joinMap.WifiName.JoinNumber, state.wifiName);
-            trilist.SetString(joinMap.ServerName.JoinNumber, state.serverName);
-        }
-
 		public override void ExecuteSwitch(object selector)
 		{
 			var action = selector as Action;
@@ -3268,7 +3234,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			// There is no property that directly reports if strip mode is valid, but API stipulates
 			// that strip mode is available if the number of screens is 1
-			if (Status.NumberOfScreens.NumOfScreens == 1 || Status.Layout.can_Switch_Strip_View || Status.Layout.video_type.ToLower() == "strip")
+			if (Status.NumberOfScreens.NumOfScreens == 1)
 			{
 				availableLayouts |= zConfiguration.eLayoutStyle.Strip;
 			}
@@ -3283,15 +3249,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             var handler = LayoutInfoChanged;
             if (handler != null)
             {
-
-                var currentLayout = zConfiguration.eLayoutStyle.None;
-
-                currentLayout = (zConfiguration.eLayoutStyle)Enum.Parse(typeof(zConfiguration.eLayoutStyle), string.IsNullOrEmpty(LocalLayoutFeedback.StringValue) ? "None" : LocalLayoutFeedback.StringValue, true);            
-
                 handler(this, new LayoutInfoChangedEventArgs()
                 {
                     AvailableLayouts = AvailableLayouts,
-                    CurrentSelectedLayout = currentLayout,
+                    CurrentSelectedLayout = (zConfiguration.eLayoutStyle)Enum.Parse(typeof(zConfiguration.eLayoutStyle),string.IsNullOrEmpty(LocalLayoutFeedback.StringValue) ? "None" : LocalLayoutFeedback.StringValue , true),
                     LayoutViewIsOnFirstPage = LayoutViewIsOnFirstPageFeedback.BoolValue,
                     LayoutViewIsOnLastPage = LayoutViewIsOnLastPageFeedback.BoolValue,
                     CanSwapContentWithThumbnail = CanSwapContentWithThumbnailFeedback.BoolValue,
@@ -3421,7 +3382,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         {
             Debug.Console(2, this, "Password Submitted: {0}", password);
             Dial(_lastDialedMeetingNumber, password);
-            //OnPasswordRequired(false, false, true, "");		
+			OnPasswordRequired(false, false, true, "");		
         }
 
         void OnPasswordRequired(bool lastAttemptIncorrect, bool loginFailed, bool loginCancelled, string message)
@@ -3557,29 +3518,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         }
 
         #endregion
-
-        #region IZoomWirelessShareInstructions Members
-
-        public event EventHandler<ShareInfoEventArgs> ShareInfoChanged;
-
-        public zStatus.Sharing SharingState
-        {
-            get
-            {
-                return Status.Sharing;
-            }
-        }
-
-        void OnShareInfoChanged(zStatus.Sharing status)
-        {
-            var handler = ShareInfoChanged;
-            if (handler != null)
-            {
-                handler(this, new ShareInfoEventArgs(status));
-            }
-        }
-
-        #endregion
     }
 
 	/// <summary>

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

@@ -8,22 +8,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 	{
 		#region Digital
 
-        [JoinName("CancelJoinAttempt")]
-        public JoinDataComplete CancelJoinAttempt = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 5,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Pulse to hide the password prompt",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("MeetingPasswordRequired")]
-        public JoinDataComplete MeetingPasswordRequired = new JoinDataComplete(
+        // TODO [ ] Issue #868
+        [JoinName("ShowPasswordPrompt")]
+        public JoinDataComplete ShowPasswordPrompt = new JoinDataComplete(
             new JoinData
             {
                 JoinNumber = 6,
@@ -36,6 +23,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 JoinType = eJoinType.Digital
             });
 
+		[JoinName("CancelPasswordPrompt")]
+		public JoinDataComplete CancelPasswordPrompt = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 7,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "cancels password prompt",
+				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+        // TODO [ ] Issue #868
         [JoinName("PasswordIncorrect")]
         public JoinDataComplete PasswordIncorrect = new JoinDataComplete(
             new JoinData
@@ -50,7 +52,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("PasswordLoginFailed")]
+        // TODO [ ] Issue #868
+        [JoinName("PassowrdLoginFailed")]
         public JoinDataComplete PasswordLoginFailed = new JoinDataComplete(
             new JoinData
             {
@@ -64,6 +67,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 JoinType = eJoinType.Digital
             });
 
+        // TODO [ ] Issue #868
         [JoinName("WaitingForHost")]
         public JoinDataComplete WaitingForHost = new JoinDataComplete(
             new JoinData
@@ -78,6 +82,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 JoinType = eJoinType.Digital
             });
 
+        // TODO [ ] Issue #868
         [JoinName("IsHost")]
         public JoinDataComplete IsHost = new JoinDataComplete(
             new JoinData
@@ -92,6 +97,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 JoinType = eJoinType.Digital
             });
 
+        // TODO [ ] Issue #868
         [JoinName("StartMeetingNow")]
         public JoinDataComplete StartMeetingNow = new JoinDataComplete(
             new JoinData
@@ -106,6 +112,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 JoinType = eJoinType.Digital
             });
 
+        // TODO [ ] Issue #868
         [JoinName("ShareOnlyMeeting")]
         public JoinDataComplete ShareOnlyMeeting = new JoinDataComplete(
             new JoinData
@@ -120,6 +127,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 JoinType = eJoinType.Digital
             });
 
+        // TODO [ ] Issue #868
         [JoinName("StartNormalMeetingFromSharingOnlyMeeting")]
         public JoinDataComplete StartNormalMeetingFromSharingOnlyMeeting = new JoinDataComplete(
             new JoinData
@@ -373,40 +381,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 JoinType = eJoinType.Digital
             });
 
-
-        #region Sharing Status
-
-        [JoinName("IsSharingAirplay")]
-        public JoinDataComplete IsSharingAirplay = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 250,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Indicates an Airplay source is sharing",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("IsSharingHdmi")]
-        public JoinDataComplete IsSharingHdmi = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 251,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Indicates an HDMI source is sharing",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-
-
-        #endregion
         //[JoinName("ParticipantAudioMuteToggleStart")]
         //public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
         //    new JoinData
@@ -591,92 +565,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				JoinType = eJoinType.DigitalSerial
 			});
 
-        [JoinName("DisplayState")]
-        public JoinDataComplete DisplayState = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 250,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Reports the instructions the ZoomRoom is displaying on the monitor. <None | Laptop | IOS>",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("AirplayShareCode")]
-        public JoinDataComplete AirplayShareCode = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 251,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Reports the current code for Airplay Sharing.",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("LaptopShareKey")]
-        public JoinDataComplete LaptopShareKey = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 252,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "The alpha-only sharing key that users type into a laptop client to share with the Zoom Room.",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("LaptopSharePairingCode")]
-        public JoinDataComplete LaptopSharePairingCode = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 253,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "This is the paring code that is broadcast via an ultrasonic signal from the ZRC. It is different than the user-supplied paring code. The ZRC uses a Zoom-proprietary method of advertizing the ultrasonic pairing code, so it\'s not possible to advertize it using commonly available libraries.",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("WifiName")]
-        public JoinDataComplete WifiName = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 254,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Reports the Wifi SSID used by the ZoomRoom.",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("ServerName")]
-        public JoinDataComplete ServerName = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 255,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Reports the namne of the the ZoomRoom.",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-
-
 		#endregion
 
 		public ZoomRoomJoinMap(uint joinStart)

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

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
@@ -30,13 +29,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         /* This layout will be selected when Sharing starts (either from Far end or locally)*/
         [JsonProperty("defaultSharingLayout")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public zConfiguration.eLayoutStyle DefaultSharingLayout { get; set; }
+        public string DefaultSharingLayout { get; set; }
 
         //This layout will be selected when a call is connected and no content is being shared
         [JsonProperty("defaultCallLayout")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public zConfiguration.eLayoutStyle DefaultCallLayout { get; set; }
+        public string DefaultCallLayout { get; set; }
 
         [JsonProperty("minutesBeforeMeetingStart")]
         public int MinutesBeforeMeetingStart { get; set; }