Merge branch 'development' into hotfix/cisco-share-content-fb-fix

Feature/zoom bridge updates

.github/workflows/docker.yml

@@ -22,7 +22,7 @@ env:
   RELEASE_BRANCH: main
 jobs:
   Build_Project:
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       # First we checkout the source repo
       - name: Checkout repo
@@ -98,7 +98,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   Push_Nuget_Package:
     needs: Build_Project
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       - name: Download Build Version Info
         uses: actions/download-artifact@v1

.github/workflows/main.yml

@@ -19,7 +19,7 @@ env:
   RELEASE_BRANCH: main
 jobs:
   Build_Project:
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       # First we checkout the source repo
       - name: Checkout repo
@@ -82,7 +82,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   Push_Nuget_Package:
     needs: Build_Project
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       - name: Download Build Version Info
         uses: actions/download-artifact@v1

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

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

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -202,11 +202,28 @@ namespace PepperDash.Essentials
                 };
             }
 
+            SetupEnvironmentalControlDevices();
+
             SetSourceListKey();
           
 			EnablePowerOnToLastSource = true;
    		}
 
+        private void SetupEnvironmentalControlDevices()
+        {
+            if (PropertiesConfig.Environment != null)
+            {
+                if (PropertiesConfig.Environment.Enabled)
+                {
+                    foreach (var d in PropertiesConfig.Environment.DeviceKeys)
+                    {
+                        var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
+                        EnvironmentalControlDevices.Add(envDevice);
+                    }
+                }
+            }
+        }
+
         private void SetSourceListKey()
         {
             if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -214,17 +214,25 @@ namespace PepperDash.Essentials
 
                 VideoCodec = DeviceManager.GetDeviceForKey(PropertiesConfig.VideoCodecKey) as
                     PepperDash.Essentials.Devices.Common.VideoCodec.VideoCodecBase;
-				
+
 
                 if (VideoCodec == null)
-                    throw new ArgumentNullException("codec cannot be null");
-				
+                {
+                    Debug.Console(0, Debug.ErrorLogLevel.Error, "No Video Codec set.  Please check 'videoCodecKey' property in room config");
+                    throw new ArgumentNullException("VideoCodec cannot be null");
+                }
+
                 AudioCodec = DeviceManager.GetDeviceForKey(PropertiesConfig.AudioCodecKey) as
                     PepperDash.Essentials.Devices.Common.AudioCodec.AudioCodecBase;
                 if (AudioCodec == null)
                     Debug.Console(0, this, "No Audio Codec Found");
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
+                if (DefaultAudioDevice == null)
+                {
+                    Debug.Console(0, Debug.ErrorLogLevel.Error, "No Default Audio Device set.  Please check 'defaultAudioKey' property in room config");
+                    throw new ArgumentNullException("DefaultAudioDevice cannot be null");
+                }
 
                 InitializeRoom();
             }
@@ -326,6 +334,8 @@ namespace PepperDash.Essentials
 
                 CallTypeFeedback = new IntFeedback(() => 0);
 
+                SetupEnvironmentalControlDevices();
+
                 SetSourceListKey();
 
                 EnablePowerOnToLastSource = true;
@@ -336,6 +346,21 @@ namespace PepperDash.Essentials
             }
    		}
 
+        private void SetupEnvironmentalControlDevices()
+        {
+            if (PropertiesConfig.Environment != null)
+            {
+                if (PropertiesConfig.Environment.Enabled)
+                {
+                    foreach (var d in PropertiesConfig.Environment.DeviceKeys)
+                    {
+                        var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
+                        EnvironmentalControlDevices.Add(envDevice);
+                    }
+                }
+            }
+        }
+
 
         private void SetSourceListKey()
         {
@@ -419,6 +444,14 @@ namespace PepperDash.Essentials
         /// <returns></returns>
         public bool RunDefaultCallRoute()
         {
+            Debug.Console(2, this, "RunDefaultCallRoute() Currently Sharing Content: {0}", VideoCodec.SharingContentIsOnFeedback.BoolValue); 
+
+            if (VideoCodec.SharingContentIsOnFeedback.BoolValue)
+            {
+                Debug.Console(2, this, "Currently sharing content.  Ignoring request to run default call route.");
+                return false;
+            }
+
             RunRouteAction(DefaultCodecRouteString);
             return true;
         }

PepperDashEssentials/Room/Types/EssentialsTechRoom.cs

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

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

@@ -20,21 +20,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("SendDtmfToSpecificCallIndex")]
-        public JoinDataComplete SendDtmfToSpecificCallIndex = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 10,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "If High, will send DTMF tones to the call set by SelectCall analog.  If low sends DTMF tones to last connected call.",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("Dtmf1")]
+		[JoinName("1")]
 		public JoinDataComplete Dtmf1 = new JoinDataComplete(
 			new JoinData
 			{
@@ -48,7 +34,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf2")]
+		[JoinName("2")]
 		public JoinDataComplete Dtmf2 = new JoinDataComplete(
 			new JoinData
 			{
@@ -62,7 +48,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf3")]
+		[JoinName("3")]
 		public JoinDataComplete Dtmf3 = new JoinDataComplete(
 			new JoinData
 			{
@@ -76,7 +62,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf4")]
+		[JoinName("4")]
 		public JoinDataComplete Dtmf4 = new JoinDataComplete(
 			new JoinData
 			{
@@ -90,7 +76,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf5")]
+		[JoinName("5")]
 		public JoinDataComplete Dtmf5 = new JoinDataComplete(
 			new JoinData
 			{
@@ -104,7 +90,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf6")]
+		[JoinName("6")]
 		public JoinDataComplete Dtmf6 = new JoinDataComplete(
 			new JoinData
 			{
@@ -118,7 +104,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf7")]
+		[JoinName("7")]
 		public JoinDataComplete Dtmf7 = new JoinDataComplete(
 			new JoinData
 			{
@@ -132,7 +118,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf8")]
+		[JoinName("8")]
 		public JoinDataComplete Dtmf8 = new JoinDataComplete(
 			new JoinData
 			{
@@ -146,7 +132,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf9")]
+		[JoinName("9")]
 		public JoinDataComplete Dtmf9 = new JoinDataComplete(
 			new JoinData
 			{
@@ -160,7 +146,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf0")]
+		[JoinName("0")]
 		public JoinDataComplete Dtmf0 = new JoinDataComplete(
 			new JoinData
 			{
@@ -174,7 +160,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("DtmfStar")]
+		[JoinName("*")]
 		public JoinDataComplete DtmfStar = new JoinDataComplete(
 			new JoinData
 			{
@@ -188,7 +174,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("DtmfPound")]
+		[JoinName("#")]
 		public JoinDataComplete DtmfPound = new JoinDataComplete(
 			new JoinData
 			{
@@ -202,8 +188,8 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("EndAllCalls")]
-		public JoinDataComplete EndAllCalls = new JoinDataComplete(
+		[JoinName("EndCall")]
+		public JoinDataComplete EndCall = new JoinDataComplete(
 			new JoinData
 			{
 				JoinNumber = 24,
@@ -211,7 +197,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "End All Calls",
+				Description = "Hang Up",
 				JoinCapabilities = eJoinCapabilities.FromSIMPL,
 				JoinType = eJoinType.Digital
 			});
@@ -295,12 +281,12 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Dial manual string specified by CurrentDialString serial join",
+				Description = "Dial manual string",
 				JoinCapabilities = eJoinCapabilities.FromSIMPL,
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("DialPhone")]
+		[JoinName("DialPhoneCall")]
 		public JoinDataComplete DialPhone = new JoinDataComplete(
 			new JoinData
 			{
@@ -328,7 +314,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("HangUpPhone")]
+		[JoinName("EndPhoneCall")]
 		public JoinDataComplete HangUpPhone = new JoinDataComplete(
 			new JoinData
 			{
@@ -337,53 +323,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Hang Up Phone",
+				Description = "Hang Up PHone",
 				JoinCapabilities = eJoinCapabilities.FromSIMPL,
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("EndCallStart")]
-        public JoinDataComplete EndCallStart = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 81,
-                JoinSpan = 8
-            },
-            new JoinMetadata
-            {
-                Description = "End a specific call by call index. ",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("JoinAllCalls")]
-        public JoinDataComplete JoinAllCalls = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 90,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Join all calls",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("JoinCallStart")]
-        public JoinDataComplete JoinCallStart = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 91,
-                JoinSpan = 8
-            },
-            new JoinMetadata
-            {
-                Description = "Join a specific call by call index. ",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
 		[JoinName("DirectorySearchBusy")]
 		public JoinDataComplete DirectorySearchBusy = new JoinDataComplete(
 			new JoinData
@@ -464,7 +408,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			new JoinMetadata
 			{
 				Description = "Go to Directory Root",
-				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
 				JoinType = eJoinType.Digital
 			});
 
@@ -496,33 +440,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("DirectoryDisableAutoDialSelectedLine")]
-        public JoinDataComplete DirectoryDisableAutoDialSelectedLine = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 107,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Set high to disable automatic dialing of a contact when selected",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("DirectoryDialSelectedContactMethod")]
-        public JoinDataComplete DirectoryDialSelectedContactMethod = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 108,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Pulse to dial the selected contact method",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
 
 		[JoinName("CameraTiltUp")]
 		public JoinDataComplete CameraTiltUp = new JoinDataComplete(
@@ -608,48 +525,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("CameraFocusNear")]
-        public JoinDataComplete CameraFocusNear = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 117,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Camera Focus Near",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("CameraFocusFar")]
-        public JoinDataComplete CameraFocusFar = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 118,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Camera Focus Far",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("CameraFocusAuto")]
-        public JoinDataComplete CameraFocusAuto = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 119,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Camera Auto Focus Trigger",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
 		[JoinName("CameraPresetSave")]
 		public JoinDataComplete CameraPresetSave = new JoinDataComplete(
 			new JoinData
@@ -659,7 +534,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Pulse to save selected preset spcified by CameraPresetSelect analog join.  FB will pulse for 3s when preset saved.",
+				Description = "Save Selected Preset",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
 			});
@@ -673,7 +548,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Camera Mode Auto.  Enables camera auto tracking mode, with feedback",
+				Description = "Camera Mode Auto",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
 			});
@@ -687,7 +562,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Camera Mode Manual.  Disables camera auto tracking mode, with feedback",
+				Description = "Camera Mode Manual",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
 			});
@@ -701,7 +576,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Camera Mode Off.  Disables camera video, with feedback. Works like video mute.",
+				Description = "Camera Mode Off",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
 			});
@@ -930,34 +805,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("RemoveSelectedRecentCallItem")]
-        public JoinDataComplete RemoveSelectedRecentCallItem = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 181,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Pulse to remove the selected recent call item specified by the SelectRecentCallItem analog join",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("DialSelectedRecentCallItem")]
-        public JoinDataComplete DialSelectedRecentCallItem = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 182,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Pulse to dial the selected recent call item specified by the SelectRecentCallItem analog join",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
 		[JoinName("SourceShareStart")]
 		public JoinDataComplete SourceShareStart = new JoinDataComplete(
 			new JoinData
@@ -1023,67 +870,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Toggles selfview position",
+				Description = "advance selfview position",
 				JoinCapabilities = eJoinCapabilities.FromSIMPL,
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("HoldCallsStart")]
-        public JoinDataComplete HoldCallsStart = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 221,
-                JoinSpan = 8
-            },
-            new JoinMetadata
-            {
-                Description = "Holds Call at specified index",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("ResumeCallsStart")]
-        public JoinDataComplete ResumeCallsStart = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 231,
-                JoinSpan = 8
-            },
-            new JoinMetadata
-            {
-                Description = "Resume Call at specified index",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("MultiSiteOptionIsEnabled")]
-        public JoinDataComplete MultiSiteOptionIsEnabled = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 301,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Multi site option is enabled FB",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("AutoAnswerEnabled")]
-        public JoinDataComplete AutoAnswerEnabled = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 302,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Auto Answer is enabled FB",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
         [JoinName("ParticipantAudioMuteToggleStart")]
         public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
 			new JoinData 
@@ -1133,35 +924,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 
 		#region Analog
 
-        [JoinName("SelectCall")]
-        public JoinDataComplete SelectCall = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 24,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sets the selected Call for DTMF commands. Valid values 1-8",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-
-        [JoinName("ConnectedCallCount")]
-        public JoinDataComplete ConnectedCallCount = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 25,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Reports the number of currently connected calls",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
 		[JoinName("MinutesBeforeMeetingStart")]
 		public JoinDataComplete MinutesBeforeMeetingStart = new JoinDataComplete(
 			new JoinData
@@ -1185,25 +947,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Camera Number Select/FB.  1 based index.  Valid range is 1 to the value reported by CameraCount.",
+				Description = "Camera Number Select/FB",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Analog
 			});
 
-        [JoinName("CameraCount")]
-        public JoinDataComplete CameraCount = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 61,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Reports the number of cameras",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
 		[JoinName("DirectoryRowCount")]
 		public JoinDataComplete DirectoryRowCount = new JoinDataComplete(
 			new JoinData
@@ -1232,34 +980,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Analog
 			});
 
-        [JoinName("SelectedContactMethodCount")]
-        public JoinDataComplete SelectedContactMethodCount = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 102,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Reports the number of contact methods for the selected contact",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("SelectContactMethod")]
-        public JoinDataComplete SelectContactMethod = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 103,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Selects a contact method by index",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
 		[JoinName("CameraPresetSelect")]
 		public JoinDataComplete CameraPresetSelect = new JoinDataComplete(
 			new JoinData
@@ -1270,24 +990,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			new JoinMetadata
 			{
 				Description = "Camera Preset Select",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Analog
 			});
 
-        [JoinName("FarEndPresetSelect")]
-        public JoinDataComplete FarEndPresetSelect = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 122,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Far End Preset Preset Select",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
 		[JoinName("ParticipantCount")]
 		public JoinDataComplete ParticipantCount = new JoinDataComplete(
 			new JoinData
@@ -1330,48 +1036,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Analog
 			});
 
-        [JoinName("SelectRecentCallItem")]
-        public JoinDataComplete SelectRecentCallItem = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 180,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Select/FB for Recent Call Item.  Valid values 1 - 10",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("RecentCallOccurrenceType")]
-        public JoinDataComplete RecentCallOccurrenceType = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 181,
-                JoinSpan = 10
-            },
-            new JoinMetadata
-            {
-                Description = "Recent Call Occurrence Type. [0-3] 0 = Unknown, 1 = Placed, 2 = Received, 3 = NoAnswer",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("RecentCallCount")]
-        public JoinDataComplete RecentCallCount = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 191,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Recent Call Count",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
 		#endregion
 
 
@@ -1387,12 +1051,12 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Value to dial when ManualDial digital join is pulsed",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				Description = "Current Dial String",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Serial
 			});
 
-        [JoinName("PhoneDialString")]
+		[JoinName("PhoneString")]
 		public JoinDataComplete PhoneDialString = new JoinDataComplete(
 			new JoinData
 			{
@@ -1406,7 +1070,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Serial
 			});
 
-        [JoinName("CurrentCallData")]
+		[JoinName("CurrentCallName")]
 		public JoinDataComplete CurrentCallData = new JoinDataComplete(
 			new JoinData
 			{
@@ -1505,20 +1169,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Serial
 			});
 
-        [JoinName("ContactMethods")]
-        public JoinDataComplete ContactMethods = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 103,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Contact Methods - XSig, 10 entries",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
 		[JoinName("CameraPresetNames")]
 		public JoinDataComplete CameraPresetNames = new JoinDataComplete(
 			new JoinData
@@ -1533,8 +1183,8 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Serial
 			});
 
-        [JoinName("CurrentLayoutStringFb")]
-		public JoinDataComplete CurrentLayoutStringFb = new JoinDataComplete(
+		[JoinName("CameraLayoutStringFb")]
+		public JoinDataComplete CameraLayoutStringFb = new JoinDataComplete(
 			new JoinData
 			{
 				JoinNumber = 141,
@@ -1561,76 +1211,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Serial
 			});
 
-        [JoinName("CameraNamesFb")]
-        public JoinDataComplete CameraNamesFb = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 161,
-                JoinSpan = 10
-            },
-            new JoinMetadata
-            {
-                Description = "Camera Name Fb",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("SelectedRecentCallName")]
-        public JoinDataComplete SelectedRecentCallName = new JoinDataComplete(
-         new JoinData
-         {
-             JoinNumber = 171,
-             JoinSpan = 1
-         },
-         new JoinMetadata
-         {
-             Description = "Selected Recent Call Name",
-             JoinCapabilities = eJoinCapabilities.ToSIMPL,
-             JoinType = eJoinType.Serial
-         });
-
-        [JoinName("SelectedRecentCallNumber")]
-        public JoinDataComplete SelectedRecentCallNumber = new JoinDataComplete(
-         new JoinData
-         {
-             JoinNumber = 172,
-             JoinSpan = 1
-         },
-         new JoinMetadata
-         {
-             Description = "Selected Recent Call Number",
-             JoinCapabilities = eJoinCapabilities.ToSIMPL,
-             JoinType = eJoinType.Serial
-         });
-
-        [JoinName("RecentCallNamesStart")]
-        public JoinDataComplete RecentCallNamesStart = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 181,
-                JoinSpan = 10
-            },
-            new JoinMetadata
-            {
-                Description = "Recent Call Names",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("RecentCallTimesStart")]
-        public JoinDataComplete RecentCallTimesStart = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 191,
-                JoinSpan = 10
-            },
-            new JoinMetadata
-            {
-                Description = "Recent Calls Times",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
 		[JoinName("CurrentSource")]
 		public JoinDataComplete CurrentSource = new JoinDataComplete(
 			new JoinData
@@ -1657,77 +1237,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				Description = "advance selfview position",
 				JoinCapabilities = eJoinCapabilities.ToSIMPL,
 				JoinType = eJoinType.Serial
-			});
-
-        [JoinName("DeviceIpAddresss")]
-        public JoinDataComplete DeviceIpAddresss = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 301,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "IP Address of device",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("SipPhoneNumber")]
-        public JoinDataComplete SipPhoneNumber = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 302,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "SIP phone number of device",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("E164Alias")]
-        public JoinDataComplete E164Alias = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 303,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "E164 alias of device",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("H323Id")]
-        public JoinDataComplete H323Id = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 304,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "H323 ID of device",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("SipUri")]
-        public JoinDataComplete SipUri = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 305,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "SIP URI of device",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
+			});		
 
 		[JoinName("DirectoryEntrySelectedName")]
 		public JoinDataComplete DirectoryEntrySelectedName = new JoinDataComplete(

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

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

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

@@ -1,83 +1,83 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
-
-namespace PepperDash.Essentials.Core.Lighting
-{
-    public abstract class LightingBase : EssentialsBridgeableDevice, ILightingScenes
-    {
-        #region ILightingScenes Members
-
-        public event EventHandler<LightingSceneChangeEventArgs> LightingSceneChange;
-
-        public List<LightingScene> LightingScenes { get; protected set; }
-
-        public LightingScene CurrentLightingScene { get; protected set; }
-		
-		public IntFeedback CurrentLightingSceneFeedback { get; protected set; }
-
-        #endregion
-
-        protected LightingBase(string key, string name)
-            : base(key, name)
-        {
-            LightingScenes = new List<LightingScene>();
-
-            CurrentLightingScene = new LightingScene();
-			//CurrentLightingSceneFeedback = new IntFeedback(() => { return int.Parse(this.CurrentLightingScene.ID); });
-        }
-
-        public abstract void SelectScene(LightingScene scene);
-
-        public void SimulateSceneSelect(string sceneName)
-        {
-            Debug.Console(1, this, "Simulating selection of scene '{0}'", sceneName);
-
-            var scene = LightingScenes.FirstOrDefault(s => s.Name.Equals(sceneName));
-
-            if (scene != null)
-            {
-                CurrentLightingScene = scene;
-                OnLightingSceneChange();
-            }
-        }
-
-        /// <summary>
-        /// Sets the IsActive property on each scene and fires the LightingSceneChange event
-        /// </summary>
-        protected void OnLightingSceneChange()
-        {
-            foreach (var scene in LightingScenes)
-            {
-                if (scene == CurrentLightingScene)
-                    scene.IsActive = true;
-					
-                else
-                    scene.IsActive = false;
-            }
-
-            var handler = LightingSceneChange;
-            if (handler != null)
-            {
-                handler(this, new LightingSceneChangeEventArgs(CurrentLightingScene));
-            }
-        }
-
-        protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, uint joinStart,
-            string joinMapKey, EiscApiAdvanced bridge)
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Bridges;
+
+namespace PepperDash.Essentials.Core.Lighting
+{
+    public abstract class LightingBase : EssentialsBridgeableDevice, ILightingScenes
+    {
+        #region ILightingScenes Members
+
+        public event EventHandler<LightingSceneChangeEventArgs> LightingSceneChange;
+
+        public List<LightingScene> LightingScenes { get; protected set; }
+
+        public LightingScene CurrentLightingScene { get; protected set; }
+		
+		public IntFeedback CurrentLightingSceneFeedback { get; protected set; }
+
+        #endregion
+
+        protected LightingBase(string key, string name)
+            : base(key, name)
         {
-            var joinMap = new GenericLightingJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
+            LightingScenes = new List<LightingScene>();
+
+            CurrentLightingScene = new LightingScene();
+			//CurrentLightingSceneFeedback = new IntFeedback(() => { return int.Parse(this.CurrentLightingScene.ID); });
+        }
+
+        public abstract void SelectScene(LightingScene scene);
+
+        public void SimulateSceneSelect(string sceneName)
+        {
+            Debug.Console(1, this, "Simulating selection of scene '{0}'", sceneName);
+
+            var scene = LightingScenes.FirstOrDefault(s => s.Name.Equals(sceneName));
+
+            if (scene != null)
+            {
+                CurrentLightingScene = scene;
+                OnLightingSceneChange();
+            }
+        }
+
+        /// <summary>
+        /// Sets the IsActive property on each scene and fires the LightingSceneChange event
+        /// </summary>
+        protected void OnLightingSceneChange()
+        {
+            foreach (var scene in LightingScenes)
+            {
+                if (scene == CurrentLightingScene)
+                    scene.IsActive = true;
+					
+                else
+                    scene.IsActive = false;
+            }
+
+            var handler = LightingSceneChange;
+            if (handler != null)
+            {
+                handler(this, new LightingSceneChangeEventArgs(CurrentLightingScene));
+            }
+        }
+
+        protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, uint joinStart,
+            string joinMapKey, EiscApiAdvanced bridge)
+        {
+            var joinMap = new GenericLightingJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<GenericLightingJoinMap>(joinMapSerialized);
 
             if (bridge != null)
@@ -87,52 +87,52 @@ namespace PepperDash.Essentials.Core.Lighting
             else
             {
                 Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
-
-            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
-
+            }
+
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
+
             // GenericLighitng Actions & FeedBack
-            trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
-
-            var sceneIndex = 0;
-            foreach (var scene in lightingDevice.LightingScenes)
+            trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
+
+            var sceneIndex = 0;
+            foreach (var scene in lightingDevice.LightingScenes)
             {
-                trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex), () => lightingDevice.SelectScene(lightingDevice.LightingScenes[sceneIndex]));
+                trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex), () => lightingDevice.SelectScene(lightingDevice.LightingScenes[sceneIndex]));
                 scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)]);
-                trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)].StringValue = scene.Name;
-                trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + sceneIndex)].BoolValue = true;
-                sceneIndex++;
-            }
-
-            return joinMap;
-        }
-
-    }
-
-    public class LightingScene
-    {
-        public string Name { get; set; }
-        public string ID { get; set; }
-        bool _IsActive;
-        public bool IsActive 
-        {
-            get
-            {
-                return _IsActive;
-            }
-            set
-            {
-                _IsActive = value;
-                IsActiveFeedback.FireUpdate();
-            }
-        }
-        public BoolFeedback IsActiveFeedback { get; set; }
-
-        public LightingScene()
-        {
-            IsActiveFeedback = new BoolFeedback(new Func<bool>(() => IsActive));
-        }
-    }
+                trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)].StringValue = scene.Name;
+                trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + sceneIndex)].BoolValue = true;
+                sceneIndex++;
+            }
+
+            return joinMap;
+        }
+
+    }
+
+    public class LightingScene
+    {
+        public string Name { get; set; }
+        public string ID { get; set; }
+        bool _IsActive;
+        public bool IsActive 
+        {
+            get
+            {
+                return _IsActive;
+            }
+            set
+            {
+                _IsActive = value;
+                IsActiveFeedback.FireUpdate();
+            }
+        }
+        public BoolFeedback IsActiveFeedback { get; set; }
+
+        public LightingScene()
+        {
+            IsActiveFeedback = new BoolFeedback(new Func<bool>(() => IsActive));
+        }
+    }
 }

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

@@ -182,6 +182,7 @@
     <Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />
     <Compile Include="Crestron IO\Inputs\IDigitalInput.cs" />
     <Compile Include="Crestron IO\IOPortConfig.cs" />
+    <Compile Include="Crestron IO\Relay\CenIoRy104Controller.cs" />
     <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
     <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
     <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />

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

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

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

@@ -15,7 +15,7 @@ namespace PepperDash.Essentials.Core
     /// <summary>
     /// Describes the basic functionality of an EssentialsRoom
     /// </summary>
-    public interface IEssentialsRoom : IKeyName, IReconfigurableDevice, IRunDefaultPresentRoute
+    public interface IEssentialsRoom : IKeyName, IReconfigurableDevice, IRunDefaultPresentRoute, IEnvironmentalControls
     {
         BoolFeedback OnFeedback { get; }
 

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

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

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

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

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

@@ -483,7 +483,7 @@ namespace PepperDash.Essentials.DM
             Debug.Console(2, this, "Adding output port '{0}'", portKey);
             OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this)
             {
-                FeedbackMatchObject = Chassis.Outputs[(uint)selector]
+                FeedbackMatchObject = selector
             });
         }*/
 

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

@@ -12,40 +12,34 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 {
     public class CodecActiveCallItem
     {
-		[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("name")]
         public string Name { get; set; }
 
-        [JsonProperty("number", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("number")]
         public string Number { get; set; }
 
-        [JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("type")]
 		[JsonConverter(typeof(StringEnumConverter))]
         public eCodecCallType Type { get; set; }
 
-        [JsonProperty("status", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("status")]
 		[JsonConverter(typeof(StringEnumConverter))]
         public eCodecCallStatus Status { get; set; }
 
-        [JsonProperty("direction", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("direction")]
 		[JsonConverter(typeof(StringEnumConverter))]
         public eCodecCallDirection Direction { get; set; }
 
-        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("id")]
         public string Id { get; set; }
 
-        [JsonProperty("isOnHold", NullValueHandling = NullValueHandling.Ignore)]
-        public bool IsOnHold { get; set; }
-
-        [JsonProperty("duration", NullValueHandling = NullValueHandling.Ignore)]
-        public TimeSpan Duration { get; set; }
-
         //public object CallMetaData { get; set; }
 
         /// <summary>
         /// Returns true when this call is any status other than 
         /// Unknown, Disconnected, Disconnecting
         /// </summary>
-        [JsonProperty("isActiveCall", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("isActiveCall")]
         public bool IsActiveCall
         {
             get

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

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-    public interface IHasCallHold
-    {
-        /// <summary>
-        /// Put the specified call on hold
-        /// </summary>
-        /// <param name="activeCall"></param>
-        void HoldCall(CodecActiveCallItem activeCall);
-
-        /// <summary>
-        /// Resume the specified call
-        /// </summary>
-        /// <param name="activeCall"></param>
-        void ResumeCall(CodecActiveCallItem activeCall);
-    }
-}

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

@@ -23,9 +23,9 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     public enum eCodecOccurrenceType
     {
         Unknown = 0,
-        Placed = 1,
-        Received = 2,
-        NoAnswer = 3,
+        Placed,
+        Received,
+        NoAnswer
     }
 
     /// <summary>

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

@@ -108,7 +108,6 @@
     <Compile Include="Codec\eCodecCallStatus.cs" />
     <Compile Include="Codec\eMeetingPrivacy.cs" />
     <Compile Include="Codec\iCodecAudio.cs" />
-    <Compile Include="Codec\IHasCallHold.cs" />
     <Compile Include="Codec\IHasDoNotDisturb.cs" />
     <Compile Include="Codec\IHasExternalSourceSwitching.cs" />
     <Compile Include="ImageProcessors\TVOneCorio.cs" />
@@ -124,13 +123,14 @@
     <Compile Include="Cameras\CameraControl.cs" />
     <Compile Include="Display\PanasonicThDisplay.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasMeetingInfo.cs" />
+    <Compile Include="VideoCodec\Interfaces\IHasMeetingLock.cs" />
+    <Compile Include="VideoCodec\Interfaces\IHasMeetingRecording.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasParticipants.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasPresentationOnlyMeeting.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasSelfviewPosition.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasSelfviewSize.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasStandbyMode.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasStartMeeting.cs" />
-    <Compile Include="VideoCodec\Interfaces\IJoinCalls.cs" />
     <Compile Include="VideoCodec\Interfaces\iVideoCodecInfo.cs" />
     <Compile Include="Codec\iHasCallFavorites.cs" />
     <Compile Include="Codec\iHasCallHistory.cs" />

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

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

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

@@ -116,7 +116,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// <summary>
         /// The ID of the camera on the codec
         /// </summary>
-        public uint CameraId { get; private set; }
+        protected uint CameraId { get; private set; }
 
         /// <summary>
         /// Valid range 1-15

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

@@ -9,39 +9,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
     {
         #region Digital
 
-        [JoinName("PresentationLocalOnly")]
-        public JoinDataComplete PresentationLocalOnly = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 205,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Presentation Local Only Feedback",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("PresentationLocalRemote")]
-        public JoinDataComplete PresentationLocalRemote = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 206,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Presentation Local and Remote Feedback",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
         [JoinName("ActivateDoNotDisturbMode")]
         public JoinDataComplete ActivateDoNotDisturbMode = new JoinDataComplete(
             new JoinData
             {
-                JoinNumber = 241,
+                JoinNumber = 221,
                 JoinSpan = 1
             },
             new JoinMetadata
@@ -55,7 +27,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public JoinDataComplete DeactivateDoNotDisturbMode = new JoinDataComplete(
             new JoinData
             {
-                JoinNumber = 242,
+                JoinNumber = 222,
                 JoinSpan = 1
             },
             new JoinMetadata
@@ -69,7 +41,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public JoinDataComplete ToggleDoNotDisturbMode = new JoinDataComplete(
             new JoinData
             {
-                JoinNumber = 243,
+                JoinNumber = 223,
                 JoinSpan = 1
             },
             new JoinMetadata
@@ -83,7 +55,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public JoinDataComplete ActivateStandby = new JoinDataComplete(
             new JoinData
             {
-                JoinNumber = 246,
+                JoinNumber = 226,
                 JoinSpan = 1
             },
             new JoinMetadata
@@ -97,7 +69,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public JoinDataComplete DeactivateStandby = new JoinDataComplete(
             new JoinData
             {
-                JoinNumber = 247,
+                JoinNumber = 227,
                 JoinSpan = 1
             },
             new JoinMetadata
@@ -111,7 +83,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public JoinDataComplete ActivateHalfWakeMode = new JoinDataComplete(
             new JoinData
             {
-                JoinNumber = 248,
+                JoinNumber = 228,
                 JoinSpan = 1
             },
             new JoinMetadata
@@ -125,7 +97,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public JoinDataComplete EnteringStandbyMode = new JoinDataComplete(
             new JoinData
             {
-                JoinNumber = 249,
+                JoinNumber = 229,
                 JoinSpan = 1
             },
             new JoinMetadata
@@ -140,55 +112,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         #region Analog
 
-        [JoinName("RingtoneVolume")]
-        public JoinDataComplete RingtoneVolume = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 21,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Ringtone volume set/FB.  Valid values are 0 - 100 in increments of 5 (5, 10, 15, 20, etc.)",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("PresentationSource")]
-        public JoinDataComplete PresentationSource = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 201,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Presentation set/FB.  Valid values are 0 - 6 depending on the codec model.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
 
         #endregion
 
 
         #region Serials
 
-        [JoinName("CommandToDevice")]
-        public JoinDataComplete CommandToDevice = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 5,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sends a serial command to the device.  Do not include the delimiter, it will be added automatically.",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-
 
         #endregion
 

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

@@ -28,12 +28,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
     public class CiscoSparkCodec : VideoCodecBase, IHasCallHistory, IHasCallFavorites, IHasDirectory,
         IHasScheduleAwareness, IOccupancyStatusProvider, IHasCodecLayouts, IHasCodecSelfView,
-        ICommunicationMonitor, IRouting, IHasCodecCameras, IHasCameraAutoMode, IHasCodecRoomPresets, 
-        IHasExternalSourceSwitching, IHasBranding, IHasCameraOff, IHasCameraMute, IHasDoNotDisturbMode,
-        IHasHalfWakeMode, IHasCallHold, IJoinCalls
+        ICommunicationMonitor, IRouting, IHasCodecCameras, IHasCameraAutoMode, IHasCodecRoomPresets, IHasExternalSourceSwitching, IHasBranding, IHasCameraOff, IHasCameraMute
     {
-        private CiscoSparkCodecPropertiesConfig _config;
-
         private bool _externalSourceChangeRequested;
 
         public event EventHandler<DirectoryEventArgs> DirectoryResultReturned;
@@ -44,11 +40,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public StatusMonitorBase CommunicationMonitor { get; private set; }
 
-        private GenericQueue _receiveQueue;
+        private GenericQueue ReceiveQueue;
 
 		public BoolFeedback PresentationViewMaximizedFeedback { get; private set; }
 
-		private string _currentPresentationView;
+		string CurrentPresentationView;
 
         public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
 
@@ -66,11 +62,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public BoolFeedback FarEndIsSharingContentFeedback { get; private set; }
 
-        public IntFeedback RingtoneVolumeFeedback { get; private set; }
+        private CodecCommandWithLabel CurrentSelfviewPipPosition;
 
-        private CodecCommandWithLabel _currentSelfviewPipPosition;
-
-        private CodecCommandWithLabel _currentLocalLayout;
+        private CodecCommandWithLabel CurrentLocalLayout;
 
         /// <summary>
         /// List the available positions for the selfview PIP window
@@ -169,7 +163,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             get 
             {
-                return () => _presentationSourceKey;
+                return () => PresentationSourceKey;
             }
         }
 
@@ -233,7 +227,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             get
             {               
-                return () => _currentSelfviewPipPosition.Label;
+                return () => CurrentSelfviewPipPosition.Label;
             }
         }
 
@@ -241,7 +235,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             get
             {
-                return () => _currentLocalLayout.Label;
+                return () => CurrentLocalLayout.Label;
             }
         }
 
@@ -249,58 +243,43 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             get
             {
-                return () => _currentLocalLayout.Label == "Prominent";
+                return () => CurrentLocalLayout.Label == "Prominent";
             }
         }
 
 
-        private string _cliFeedbackRegistrationExpression;
+        private string CliFeedbackRegistrationExpression;
 
-        private CodecSyncState _syncState;
+        private CodecSyncState SyncState;
 
         public CodecPhonebookSyncState PhonebookSyncState { get; private set; }
 
-        private StringBuilder _jsonMessage;
+        private StringBuilder JsonMessage;
 
-        private bool _jsonFeedbackMessageIsIncoming;
+        private bool JsonFeedbackMessageIsIncoming;
 
         public bool CommDebuggingIsOn;
 
         string Delimiter = "\r\n";
 
-        public IntFeedback PresentationSourceFeedback { get; private set; }
-
-        public BoolFeedback PresentationSendingLocalOnlyFeedback { get; private set; }
-
-        public BoolFeedback PresentationSendingLocalRemoteFeedback { get; private set; }
-
         /// <summary>
         /// Used to track the current connector used for the presentation source
         /// </summary>
-        private int _presentationSource;
+        int PresentationSource;
 
-        /// <summary>
-        /// Used to track the connector that is desired to be the current presentation source (until the command is send)
-        /// </summary>
-        private int _desiredPresentationSource;
+        string PresentationSourceKey;
 
-        private string _presentationSourceKey;
+        string PhonebookMode = "Local"; // Default to Local
 
-        private bool _presentationLocalOnly;
+        uint PhonebookResultsLimit = 255; // Could be set later by config.
 
-        private bool _presentationLocalRemote;
-
-        private string _phonebookMode = "Local"; // Default to Local
-
-        private uint _phonebookResultsLimit = 255; // Could be set later by config.
-
-        private CTimer _loginMessageReceivedTimer;
-        private CTimer _retryConnectionTimer;
+        CTimer LoginMessageReceivedTimer;
+		CTimer RetryConnectionTimer;
 
         // **___________________________________________________________________**
         //  Timers to be moved to the global system timer at a later point....
-        private CTimer BookingsRefreshTimer;
-        private CTimer PhonebookRefreshTimer;
+        CTimer BookingsRefreshTimer;
+        CTimer PhonebookRefreshTimer;
         // **___________________________________________________________________**
 
         public RoutingInputPort CodecOsdIn { get; private set; }
@@ -316,16 +295,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             var props = JsonConvert.DeserializeObject<Codec.CiscoSparkCodecPropertiesConfig>(config.Properties.ToString());
 
-            _config = props;
-
             // Use the configured phonebook results limit if present
             if (props.PhonebookResultsLimit > 0)
             {
-                _phonebookResultsLimit = props.PhonebookResultsLimit;
+                PhonebookResultsLimit = props.PhonebookResultsLimit;
             }
 
             // The queue that will collect the repsonses in the order they are received
-            _receiveQueue = new GenericQueue(this.Key + "-rxQueue", 25);
+            ReceiveQueue = new GenericQueue(this.Key + "-rxQueue", 25);
 
             RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
             PeopleCountFeedback = new IntFeedback(PeopleCountFeedbackFunc);
@@ -339,17 +316,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             CameraIsMutedFeedback = CameraIsOffFeedback;
             SupportsCameraOff = true;
 
-            DoNotDisturbModeIsOnFeedback = new BoolFeedback(() => CodecStatus.Status.Conference.DoNotDisturb.BoolValue);
-            HalfWakeModeIsOnFeedback = new BoolFeedback(() => CodecStatus.Status.Standby.State.Value.ToLower() == "halfwake");
-            EnteringStandbyModeFeedback = new BoolFeedback(() => CodecStatus.Status.Standby.State.Value.ToLower() == "enteringstandby");
-
-			PresentationViewMaximizedFeedback = new BoolFeedback(() => _currentPresentationView == "Maximized");
-
-            RingtoneVolumeFeedback = new IntFeedback(() => CodecConfiguration.Configuration.Audio.SoundsAndAlerts.RingVolume.Volume);
-
-            PresentationSourceFeedback = new IntFeedback(() => _presentationSource);
-            PresentationSendingLocalOnlyFeedback = new BoolFeedback(() => _presentationLocalOnly);
-            PresentationSendingLocalRemoteFeedback = new BoolFeedback(() => _presentationLocalRemote);
+			PresentationViewMaximizedFeedback = new BoolFeedback(() => CurrentPresentationView == "Maximized");
 
             Communication = comm;
 
@@ -369,13 +336,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             DeviceManager.AddDevice(CommunicationMonitor);
 
-            _phonebookMode = props.PhonebookMode;
+            PhonebookMode = props.PhonebookMode;
 
-            _syncState = new CodecSyncState(Key + "--Sync");
+            SyncState = new CodecSyncState(Key + "--Sync");
 
             PhonebookSyncState = new CodecPhonebookSyncState(Key + "--PhonebookSync");
 
-            _syncState.InitialSyncCompleted += new EventHandler<EventArgs>(SyncState_InitialSyncCompleted);
+            SyncState.InitialSyncCompleted += new EventHandler<EventArgs>(SyncState_InitialSyncCompleted);
 
             PortGather = new CommunicationGather(Communication, Delimiter);
             PortGather.IncludeDelimiter = true;
@@ -421,6 +388,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			InputPorts.Add(HdmiIn2);
 			InputPorts.Add(HdmiIn3);
 			OutputPorts.Add(HdmiOut1);
+
+            SetUpCameras();
+
 			CreateOsdSource();
 
             ExternalSourceListEnabled = props.ExternalSourceListEnabled;
@@ -443,12 +413,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             CodecStatus.Status.Audio.Volume.ValueChangedAction = VolumeLevelFeedback.FireUpdate;
             CodecStatus.Status.Audio.VolumeMute.ValueChangedAction = MuteFeedback.FireUpdate;
             CodecStatus.Status.Audio.Microphones.Mute.ValueChangedAction = PrivacyModeIsOnFeedback.FireUpdate;
-            CodecStatus.Status.Standby.State.ValueChangedAction = new Action(() =>
-                {
-                    StandbyIsOnFeedback.FireUpdate();
-                    HalfWakeModeIsOnFeedback.FireUpdate();
-                    EnteringStandbyModeFeedback.FireUpdate();
-                });
+            CodecStatus.Status.Standby.State.ValueChangedAction = StandbyIsOnFeedback.FireUpdate;
             CodecStatus.Status.RoomAnalytics.PeoplePresence.ValueChangedAction = RoomIsOccupiedFeedback.FireUpdate;
             CodecStatus.Status.RoomAnalytics.PeopleCount.Current.ValueChangedAction = PeopleCountFeedback.FireUpdate;
             CodecStatus.Status.Cameras.SpeakerTrack.Status.ValueChangedAction = CameraAutoModeIsOnFeedback.FireUpdate;
@@ -456,11 +421,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             CodecStatus.Status.Video.Selfview.Mode.ValueChangedAction = SelfviewIsOnFeedback.FireUpdate;
             CodecStatus.Status.Video.Selfview.PIPPosition.ValueChangedAction = ComputeSelfviewPipStatus;
             CodecStatus.Status.Video.Layout.LayoutFamily.Local.ValueChangedAction = ComputeLocalLayout;
-            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = SharingContentIsOnFeedback.FireUpdate;
-            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = FarEndIsSharingContentFeedback.FireUpdate;
-            CodecStatus.Status.Conference.DoNotDisturb.ValueChangedAction = DoNotDisturbModeIsOnFeedback.FireUpdate;
-
-            CodecConfiguration.Configuration.Audio.SoundsAndAlerts.RingVolume.ValueChangedAction = RingtoneVolumeFeedback.FireUpdate;
+            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = () =>
+            {
+                SharingContentIsOnFeedback.FireUpdate();
+                FarEndIsSharingContentFeedback.FireUpdate();
+            };
 
             try
             {
@@ -590,16 +555,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             CrestronConsole.AddNewConsoleCommand(GetPhonebook, "GetCodecPhonebook", "Triggers a refresh of the codec phonebook", ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(GetBookings, "GetCodecBookings", "Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator);
 
-            PhonebookSyncState.InitialSyncCompleted += new EventHandler<EventArgs>(PhonebookSyncState_InitialSyncCompleted);
-
             return base.CustomActivate();
         }
 
-        void PhonebookSyncState_InitialSyncCompleted(object sender, EventArgs e)
-        {
-            OnDirectoryResultReturned(DirectoryRoot);
-        }
-
         #region Overrides of Device
 
         public override void Initialize()
@@ -616,12 +574,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             const string prefix = "xFeedback register ";
 
-            _cliFeedbackRegistrationExpression =
+            CliFeedbackRegistrationExpression =
                 prefix + "/Configuration" + Delimiter +
                 prefix + "/Status/Audio" + Delimiter +
                 prefix + "/Status/Call" + Delimiter +
                 prefix + "/Status/Conference/Presentation" + Delimiter +
-                prefix + "/Status/Conference/DoNotDisturb" + Delimiter +
                 prefix + "/Status/Cameras/SpeakerTrack" + Delimiter +
                 prefix + "/Status/RoomAnalytics" + Delimiter +
                 prefix + "/Status/RoomPreset" + Delimiter +
@@ -630,11 +587,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 prefix + "/Status/Video/Layout" + Delimiter +
                 prefix + "/Status/Video/Input/MainVideoMute" + Delimiter +
                 prefix + "/Bookings" + Delimiter +
+                prefix + "/Event/CallDisconnect" + Delimiter +
                 prefix + "/Event/Bookings" + Delimiter +
                 prefix + "/Event/CameraPresetListUpdated" + Delimiter +
-                prefix + "/Event/UserInterface/Presentation/ExternalSource/Selected/SourceIdentifier" + Delimiter +
-                prefix + "/Event/CallDisconnect" + Delimiter; // Keep CallDisconnect last to detect when feedback registration completes correctly
-
+                prefix + "/Event/UserInterface/Presentation/ExternalSource/Selected/SourceIdentifier" + Delimiter;
         }
 
         #endregion
@@ -646,36 +602,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// <param name="e"></param>
         void SyncState_InitialSyncCompleted(object sender, EventArgs e)
         {
-            // Check for camera config info first
-            if (_config.CameraInfo.Count > 0)
-            {
-                Debug.Console(0, this, "Reading codec cameraInfo from config properties.");
-                SetUpCameras(_config.CameraInfo);
-            }
-            else
-            {
-                Debug.Console(0, this, "No cameraInfo defined in video codec config.  Attempting to get camera info from codec status data");
-                try
-                {
-                    var cameraInfo = new List<CameraInfo>();
-
-                    foreach (var camera in CodecStatus.Status.Cameras.Camera)
-                    {
-                        var id = Convert.ToUInt16(camera.id);
-                        var info = new CameraInfo() { CameraNumber = id, Name = string.Format("{0} {1}", camera.Manufacturer, camera.Model), SourceId = camera.DetectedConnector.ConnectorId };
-                        cameraInfo.Add(info);
-                    }
-
-                    Debug.Console(0, this, "Successfully got cameraInfo for {0} cameras from codec.", cameraInfo.Count);
-
-                    SetUpCameras(cameraInfo);
-                }
-                catch (Exception ex)
-                {
-                    Debug.Console(2, this, "Error generating camera info from codec status data: {0}", ex);
-                }
-            }
-
+            // Fire the ready event
+            SetIsReady();
             //CommDebuggingIsOn = false;
 
             GetCallHistory();
@@ -685,9 +613,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             BookingsRefreshTimer = new CTimer(GetBookings, 900000,  900000);       // 15 minute timer to check for new booking info
             GetBookings(null);
-
-            // Fire the ready event
-            SetIsReady();
         }
 
         public void SetCommDebug(string s)
@@ -709,12 +634,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			Debug.Console(1, this, "Socket status change {0}", e.Client.ClientStatus);
             if (e.Client.IsConnected)
             {
-                if(!_syncState.LoginMessageWasReceived)
-				    _loginMessageReceivedTimer = new CTimer(o => DisconnectClientAndReconnect(), 5000);
+                if(!SyncState.LoginMessageWasReceived)
+				    LoginMessageReceivedTimer = new CTimer(o => DisconnectClientAndReconnect(), 5000);
             }
             else
             {
-                _syncState.CodecDisconnected();
+                SyncState.CodecDisconnected();
                 PhonebookSyncState.CodecDisconnected();
 
                 if (PhonebookRefreshTimer != null)
@@ -737,7 +662,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             Communication.Disconnect();
 
-			_retryConnectionTimer = new CTimer(o => Communication.Connect(), 2000);
+			RetryConnectionTimer = new CTimer(o => Communication.Connect(), 2000);
 
 			//CrestronEnvironment.Sleep(2000);
 
@@ -754,66 +679,66 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             if (CommDebuggingIsOn)
             {
-                if (!_jsonFeedbackMessageIsIncoming)
+                if (!JsonFeedbackMessageIsIncoming)
                     Debug.Console(1, this, "RX: '{0}'", args.Text);
             }
 
             if (args.Text == "{" + Delimiter)        // Check for the beginning of a new JSON message
             {
-                _jsonFeedbackMessageIsIncoming = true;
+                JsonFeedbackMessageIsIncoming = true;
 
                 if (CommDebuggingIsOn)
                     Debug.Console(1, this, "Incoming JSON message...");
 
-                _jsonMessage = new StringBuilder();
+                JsonMessage = new StringBuilder();
             }
             else if (args.Text == "}" + Delimiter)  // Check for the end of a JSON message
             {
-                _jsonFeedbackMessageIsIncoming = false;
+                JsonFeedbackMessageIsIncoming = false;
 
-                _jsonMessage.Append(args.Text);
+                JsonMessage.Append(args.Text);
 
                 if (CommDebuggingIsOn)
-                    Debug.Console(1, this, "Complete JSON Received:\n{0}", _jsonMessage.ToString());
+                    Debug.Console(1, this, "Complete JSON Received:\n{0}", JsonMessage.ToString());
 
                 // Enqueue the complete message to be deserialized
 
-                _receiveQueue.Enqueue(new ProcessStringMessage(_jsonMessage.ToString(), DeserializeResponse));
+                ReceiveQueue.Enqueue(new ProcessStringMessage(JsonMessage.ToString(), DeserializeResponse));
 
                 return;
             }
 
-            if(_jsonFeedbackMessageIsIncoming)
+            if(JsonFeedbackMessageIsIncoming)
             {
-                _jsonMessage.Append(args.Text);
+                JsonMessage.Append(args.Text);
 
                 //Debug.Console(1, this, "Building JSON:\n{0}", JsonMessage.ToString());
                 return;
             }
 
-            if (!_syncState.InitialSyncComplete)
+            if (!SyncState.InitialSyncComplete)
             {
                 switch (args.Text.Trim().ToLower()) // remove the whitespace
                 {
                     case "*r login successful":
                         {
-                            _syncState.LoginMessageReceived();
+                            SyncState.LoginMessageReceived();
 
-                            if(_loginMessageReceivedTimer != null)
-                                _loginMessageReceivedTimer.Stop();
+                            if(LoginMessageReceivedTimer != null)
+                                LoginMessageReceivedTimer.Stop();
 
                             SendText("xPreferences outputmode json");
                             break;
                         }
                     case "xpreferences outputmode json":
                         {
-                            if (!_syncState.InitialStatusMessageWasReceived)
+                            if (!SyncState.InitialStatusMessageWasReceived)
                                 SendText("xStatus");
                             break;
                         }
                     case "xfeedback register /event/calldisconnect":
                         {
-                            _syncState.FeedbackRegistered();
+                            SyncState.FeedbackRegistered();
                             break;
                         }
                 }
@@ -856,30 +781,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                     // Check to see if the message contains /Status/Conference/Presentation/LocalInstance and extract source value 
                     var conference = tempCodecStatus.Status.Conference;
 
-                    if (conference.Presentation != null && conference.Presentation.LocalInstance == null)
-                    {
-                        // Handles an empty presentation object response
-                        return;   
-                    }
-
                     if (conference.Presentation.LocalInstance.Count > 0)
                     {
                         if (!string.IsNullOrEmpty(conference.Presentation.LocalInstance[0].ghost))
-                        {
-                            _presentationSource = 0;
-                            _presentationLocalOnly = false;
-                            _presentationLocalRemote = false;
-                        }
+                            PresentationSource = 0;
                         else if (conference.Presentation.LocalInstance[0].Source != null)
                         {
-                            _presentationSource = conference.Presentation.LocalInstance[0].Source.IntValue;
-                            _presentationLocalOnly = conference.Presentation.LocalInstance.Any((i) => i.SendingMode.LocalOnly);
-                            _presentationLocalRemote = conference.Presentation.LocalInstance.Any((i) => i.SendingMode.LocalRemote);
+                            PresentationSource = conference.Presentation.LocalInstance[0].Source.IntValue;
                         }
-
-                        PresentationSourceFeedback.FireUpdate();
-                        PresentationSendingLocalOnlyFeedback.FireUpdate();
-                        PresentationSendingLocalRemoteFeedback.FireUpdate();
                     }
 
                     // Check to see if this is a call status message received after the initial status message
@@ -927,19 +836,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                                         changeDetected = true;
                                     }
                                 }
-                                if(call.Duration != null)
-                                {
-                                    if(!string.IsNullOrEmpty(call.Duration.Value))
-                                    {
-                                        tempActiveCall.Duration = call.Duration.DurationValue;
-                                        changeDetected = true;
-                                    }
-                                }
-                                if(call.PlacedOnHold != null)
-                                {
-                                    tempActiveCall.IsOnHold = call.PlacedOnHold.BoolValue;
-                                    changeDetected = true;
-                                }
 
                                 if (changeDetected)
                                 {
@@ -958,9 +854,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                                     Name = call.DisplayName.Value,
                                     Number = call.RemoteNumber.Value,
                                     Type = CodecCallType.ConvertToTypeEnum(call.CallType.Value),
-                                    Direction = CodecCallDirection.ConvertToDirectionEnum(call.Direction.Value),
-                                    Duration = call.Duration.DurationValue,
-                                    IsOnHold = call.PlacedOnHold.BoolValue,
+                                    Direction = CodecCallDirection.ConvertToDirectionEnum(call.Direction.Value)
                                 };
 
                                 // Add it to the ActiveCalls List
@@ -1040,11 +934,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                         JsonConvert.PopulateObject(response, CodecStatus);
                     }
 
-                    if (!_syncState.InitialStatusMessageWasReceived)
+                    if (!SyncState.InitialStatusMessageWasReceived)
                     {
-                        _syncState.InitialStatusMessageReceived();
+                        SyncState.InitialStatusMessageReceived();
 
-                        if (!_syncState.InitialConfigurationMessageWasReceived)
+                        if (!SyncState.InitialConfigurationMessageWasReceived)
                             SendText("xConfiguration");
                     }
                 }
@@ -1054,12 +948,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
                     JsonConvert.PopulateObject(response, CodecConfiguration);
 
-                    if (!_syncState.InitialConfigurationMessageWasReceived)
+                    if (!SyncState.InitialConfigurationMessageWasReceived)
                     {
-                        _syncState.InitialConfigurationMessageReceived();
-                        if (!_syncState.FeedbackWasRegistered)
+                        SyncState.InitialConfigurationMessageReceived();
+                        if (!SyncState.FeedbackWasRegistered)
                         {
-                            SendText(_cliFeedbackRegistrationExpression);
+                            SendText(CliFeedbackRegistrationExpression);
                         }
                     }
 
@@ -1189,7 +1083,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             var handler = DirectoryResultReturned;
             if (handler != null)
             {
-                Debug.Console(2, this, "Directory result returned");
                 handler(this, new DirectoryEventArgs()
                 {
                     Directory = result,
@@ -1233,7 +1126,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 		public override void ExecuteSwitch(object selector)
 		{
 			(selector as Action)();
-			_presentationSourceKey = selector.ToString();
+			PresentationSourceKey = selector.ToString();
 		}
 
 		/// <summary>
@@ -1243,7 +1136,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
         {
 			ExecuteSwitch(inputSelector);
-            _presentationSourceKey = inputSelector.ToString();
+            PresentationSourceKey = inputSelector.ToString();
         }
 
 
@@ -1322,13 +1215,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         private void GetPhonebookFolders()
         {
             // Get Phonebook Folders (determine local/corporate from config, and set results limit)
-            SendText(string.Format("xCommand Phonebook Search PhonebookType: {0} ContactType: Folder", _phonebookMode));
+            SendText(string.Format("xCommand Phonebook Search PhonebookType: {0} ContactType: Folder", PhonebookMode));
         }
 
         private void GetPhonebookContacts()
         {
             // Get Phonebook Folders (determine local/corporate from config, and set results limit)
-            SendText(string.Format("xCommand Phonebook Search PhonebookType: {0} ContactType: Contact Limit: {1}", _phonebookMode, _phonebookResultsLimit));
+            SendText(string.Format("xCommand Phonebook Search PhonebookType: {0} ContactType: Contact Limit: {1}", PhonebookMode, PhonebookResultsLimit));
         }
 
         /// <summary>
@@ -1337,7 +1230,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// <param name="searchString"></param>
         public void SearchDirectory(string searchString)
         {
-            SendText(string.Format("xCommand Phonebook Search SearchString: \"{0}\" PhonebookType: {1} ContactType: Contact Limit: {2}", searchString, _phonebookMode, _phonebookResultsLimit));
+            SendText(string.Format("xCommand Phonebook Search SearchString: \"{0}\" PhonebookType: {1} ContactType: Contact Limit: {2}", searchString, PhonebookMode, PhonebookResultsLimit));
         }
 
         /// <summary>
@@ -1346,7 +1239,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// <param name="folderId"></param>
         public void GetDirectoryFolderContents(string folderId)
         {
-            SendText(string.Format("xCommand Phonebook Search FolderId: {0} PhonebookType: {1} ContactType: Any Limit: {2}", folderId, _phonebookMode, _phonebookResultsLimit));
+            SendText(string.Format("xCommand Phonebook Search FolderId: {0} PhonebookType: {1} ContactType: Any Limit: {2}", folderId, PhonebookMode, PhonebookResultsLimit));
         }
 
         /// <summary>
@@ -1444,8 +1337,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             SendText(string.Format("xCommand Dial Number: \"{0}\" Protocol: {1} CallRate: {2} CallType: {3} BookingId: {4}", number, protocol, callRate, callType, meetingId));
         }
-
-
+ 
         public override void EndCall(CodecActiveCallItem activeCall)
         {
             SendText(string.Format("xCommand Call Disconnect CallId: {0}", activeCall.Id));
@@ -1469,94 +1361,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             SendText("xCommand Call Reject");
         }
 
-        #region IHasCallHold Members
-
-        public void HoldCall(CodecActiveCallItem activeCall)
-        {
-            SendText(string.Format("xCommand Call Hold CallId: {0}", activeCall.Id));
-        }
-
-        public void ResumeCall(CodecActiveCallItem activeCall)
-        {
-            SendText(string.Format("xCommand Call Resume CallId: {0}", activeCall.Id));
-        }
-
-        #endregion
-
-        #region IJoinCalls
-
-        public void JoinCall(CodecActiveCallItem activeCall)
-        {
-            SendText(string.Format("xCommand Call Join CallId: {0}", activeCall.Id));
-        }
-
-        public void JoinAllCalls()
-        {
-            StringBuilder ids = new StringBuilder();
-
-            foreach (var call in ActiveCalls)
-            {
-                if (call.IsActiveCall)
-                {
-                    ids.Append(string.Format(" CallId: {0}", call.Id));
-                }
-            }
-
-            if (ids.Length > 0)
-            {
-                SendText(string.Format("xCommand Call Join {0}", ids.ToString()));
-            }
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Sends tones to the last connected call
-        /// </summary>
-        /// <param name="s"></param>
         public override void SendDtmf(string s)
         {
             SendText(string.Format("xCommand Call DTMFSend CallId: {0} DTMFString: \"{1}\"", GetCallId(), s));
         }
 
-        /// <summary>
-        /// Sends tones to a specific call
-        /// </summary>
-        /// <param name="s"></param>
-        /// <param name="activeCall"></param>
-        public override void SendDtmf(string s, CodecActiveCallItem activeCall)
-        {
-            SendText(string.Format("xCommand Call DTMFSend CallId: {0} DTMFString: \"{1}\"", activeCall.Id, s));
-        }
-
         public void SelectPresentationSource(int source)
         {
-            _desiredPresentationSource = source;
+            PresentationSource = source;
 
             StartSharing();
         }
 
-        /// <summary>
-        /// Sets the ringtone volume level
-        /// </summary>
-        /// <param name="volume">level from 0 - 100 in increments of 5</param>
-        public void SetRingtoneVolume(int volume)
-        {
-            if (volume < 0 || volume > 100)
-            {
-                Debug.Console(0, this, "Cannot set ringtone volume to '{0}'. Value must be between 0 - 100", volume);
-                return;
-            }
-
-            if (volume % 5 != 0)
-            {
-                Debug.Console(0, this, "Cannot set ringtone volume to '{0}'. Value must be between 0 - 100 and a multiple of 5", volume);
-                return;
-            }
-
-            SendText(string.Format("xConfiguration Audio SoundsAndAlerts RingVolume: {0}", volume));
-        }
-
         /// <summary>
         /// Select source 1 as the presetnation source
         /// </summary>
@@ -1573,8 +1389,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             SelectPresentationSource(3);
         }
 
-
-
         /// <summary>
         /// Starts presentation sharing
         /// </summary>
@@ -1587,8 +1401,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             else
                 sendingMode = "LocalOnly";
 
-            if (_desiredPresentationSource > 0)
-                SendText(string.Format("xCommand Presentation Start PresentationSource: {0} SendingMode: {1}", _desiredPresentationSource, sendingMode));
+            if(PresentationSource > 0)
+                SendText(string.Format("xCommand Presentation Start PresentationSource: {0} SendingMode: {1}", PresentationSource, sendingMode));
         }
 
         /// <summary>
@@ -1596,13 +1410,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         public override void StopSharing()
         {
-            _desiredPresentationSource = 0;
+            PresentationSource = 0;
 
             SendText("xCommand Presentation Stop");
         }
 
-
-
         public override void PrivacyModeOn()
         {
             SendText("xCommand Audio Microphones Mute");
@@ -1687,65 +1499,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
-            var joinMap = new CiscoCodecJoinMap(joinStart);
-
-            var customJoins = JoinMapHelper.TryGetJoinMapAdvancedForDevice(joinMapKey);
-
-            if (customJoins != null)
-            {
-                joinMap.SetCustomJoinData(customJoins);
-            }
-
-            if (bridge != null)
-            {
-                bridge.AddJoinMap(Key, joinMap);
-            }
-
             LinkVideoCodecToApi(this, trilist, joinStart, joinMapKey, bridge);
-
-            LinkCiscoCodecToApi(trilist, joinMap);
-        }
-
-        public void LinkCiscoCodecToApi(BasicTriList trilist, CiscoCodecJoinMap joinMap)
-        {
-            // Custom commands to codec
-            trilist.SetStringSigAction(joinMap.CommandToDevice.JoinNumber, (s) => this.SendText(s));
-
-
-            var dndCodec = this as IHasDoNotDisturbMode;
-            if (dndCodec != null)
-            {
-                dndCodec.DoNotDisturbModeIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.ActivateDoNotDisturbMode.JoinNumber]);
-                dndCodec.DoNotDisturbModeIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.DeactivateDoNotDisturbMode.JoinNumber]);
-
-                trilist.SetSigFalseAction(joinMap.ActivateDoNotDisturbMode.JoinNumber, () => dndCodec.ActivateDoNotDisturbMode());
-                trilist.SetSigFalseAction(joinMap.DeactivateDoNotDisturbMode.JoinNumber, () => dndCodec.DeactivateDoNotDisturbMode());
-                trilist.SetSigFalseAction(joinMap.ToggleDoNotDisturbMode.JoinNumber, () => dndCodec.ToggleDoNotDisturbMode());
-            }
-
-            var halfwakeCodec = this as IHasHalfWakeMode;
-            if (halfwakeCodec != null)
-            {
-                halfwakeCodec.StandbyIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.ActivateStandby.JoinNumber]);
-                halfwakeCodec.StandbyIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.DeactivateStandby.JoinNumber]);
-                halfwakeCodec.HalfWakeModeIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.ActivateHalfWakeMode.JoinNumber]);
-                halfwakeCodec.EnteringStandbyModeFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnteringStandbyMode.JoinNumber]);
-
-                trilist.SetSigFalseAction(joinMap.ActivateStandby.JoinNumber, () => halfwakeCodec.StandbyActivate());
-                trilist.SetSigFalseAction(joinMap.DeactivateStandby.JoinNumber, () => halfwakeCodec.StandbyDeactivate());
-                trilist.SetSigFalseAction(joinMap.ActivateHalfWakeMode.JoinNumber, () => halfwakeCodec.HalfwakeActivate());
-            }
-
-            // Ringtone volume
-            trilist.SetUShortSigAction(joinMap.RingtoneVolume.JoinNumber, (u) => SetRingtoneVolume(u));
-            RingtoneVolumeFeedback.LinkInputSig(trilist.UShortInput[joinMap.RingtoneVolume.JoinNumber]);
-
-            // Presentation Source
-            trilist.SetUShortSigAction(joinMap.PresentationSource.JoinNumber, (u) => SelectPresentationSource(u));
-            PresentationSourceFeedback.LinkInputSig(trilist.UShortInput[joinMap.PresentationSource.JoinNumber]);
-
-            PresentationSendingLocalOnlyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PresentationLocalOnly.JoinNumber]);
-            PresentationSendingLocalRemoteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PresentationLocalRemote.JoinNumber]);
         }
 
         /// <summary>
@@ -1819,9 +1573,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         public void SelfviewPipPositionToggle()
         {
-            if (_currentSelfviewPipPosition != null)
+            if (CurrentSelfviewPipPosition != null)
             {
-                var nextPipPositionIndex = SelfviewPipPositions.IndexOf(_currentSelfviewPipPosition) + 1;
+                var nextPipPositionIndex = SelfviewPipPositions.IndexOf(CurrentSelfviewPipPosition) + 1;
 
                 if (nextPipPositionIndex >= SelfviewPipPositions.Count) // Check if we need to loop back to the first item in the list
                     nextPipPositionIndex = 0;                  
@@ -1844,9 +1598,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         public void LocalLayoutToggle()
         {
-            if(_currentLocalLayout != null)
+            if(CurrentLocalLayout != null)
             {
-                var nextLocalLayoutIndex = LocalLayouts.IndexOf(_currentLocalLayout) + 1;
+                var nextLocalLayoutIndex = LocalLayouts.IndexOf(CurrentLocalLayout) + 1;
 
                 if (nextLocalLayoutIndex >= LocalLayouts.Count)  // Check if we need to loop back to the first item in the list
                     nextLocalLayoutIndex = 0;
@@ -1860,9 +1614,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         public void LocalLayoutToggleSingleProminent()
         {
-            if (_currentLocalLayout != null)
+            if (CurrentLocalLayout != null)
             {
-                if (_currentLocalLayout.Label != "Prominent")
+                if (CurrentLocalLayout.Label != "Prominent")
                     LocalLayoutSet(LocalLayouts.FirstOrDefault(l => l.Label.Equals("Prominent")));
                 else
                     LocalLayoutSet(LocalLayouts.FirstOrDefault(l => l.Label.Equals("Single")));
@@ -1876,11 +1630,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 		public void MinMaxLayoutToggle()
 		{
 			if (PresentationViewMaximizedFeedback.BoolValue)
-				_currentPresentationView = "Minimized";
+				CurrentPresentationView = "Minimized";
 			else
-				_currentPresentationView = "Maximized";
+				CurrentPresentationView = "Maximized";
 
-			SendText(string.Format("xCommand Video PresentationView Set View:  {0}", _currentPresentationView));
+			SendText(string.Format("xCommand Video PresentationView Set View:  {0}", CurrentPresentationView));
 			PresentationViewMaximizedFeedback.FireUpdate();
 		}
 
@@ -1889,9 +1643,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         void ComputeSelfviewPipStatus()
         {
-            _currentSelfviewPipPosition = SelfviewPipPositions.FirstOrDefault(p => p.Command.ToLower().Equals(CodecStatus.Status.Video.Selfview.PIPPosition.Value.ToLower()));
+            CurrentSelfviewPipPosition = SelfviewPipPositions.FirstOrDefault(p => p.Command.ToLower().Equals(CodecStatus.Status.Video.Selfview.PIPPosition.Value.ToLower()));
 
-            if(_currentSelfviewPipPosition != null)
+            if(CurrentSelfviewPipPosition != null)
                 SelfviewIsOnFeedback.FireUpdate();
         }
 
@@ -1900,9 +1654,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         void ComputeLocalLayout()
         {
-            _currentLocalLayout = LocalLayouts.FirstOrDefault(l => l.Command.ToLower().Equals(CodecStatus.Status.Video.Layout.LayoutFamily.Local.Value.ToLower()));
+            CurrentLocalLayout = LocalLayouts.FirstOrDefault(l => l.Command.ToLower().Equals(CodecStatus.Status.Video.Layout.LayoutFamily.Local.Value.ToLower()));
 
-            if (_currentLocalLayout != null)
+            if (CurrentLocalLayout != null)
                 LocalLayoutFeedback.FireUpdate();
         }
 
@@ -1950,63 +1704,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// <summary>
         /// Builds the cameras List.  Could later be modified to build from config data
         /// </summary>
-        void SetUpCameras(List<CameraInfo> cameraInfo)
+        void SetUpCameras()
         {
             // Add the internal camera
             Cameras = new List<CameraBase>();
 
-            var camCount = CodecStatus.Status.Cameras.Camera.Count;
+            var internalCamera = new CiscoSparkCamera(Key + "-camera1", "Near End", this, 1);
 
-            Debug.Console(0, this, "Codec reports {0} cameras", camCount);
-
-
-            // Deal with the case of 1 or no reported cameras
-            if (camCount <= 1)
-            {
-                var internalCamera = new CiscoSparkCamera(Key + "-camera1", "Near End", this, 1);
-
-                if (camCount > 0)
-                {
-                    // Try to get the capabilities from the codec
-                    if (CodecStatus.Status.Cameras.Camera[0] != null && CodecStatus.Status.Cameras.Camera[0].Capabilities != null)
-                    {
-                        internalCamera.SetCapabilites(CodecStatus.Status.Cameras.Camera[0].Capabilities.Options.Value);
-                    }
-                }
-
-                Cameras.Add(internalCamera);
-                DeviceManager.AddDevice(internalCamera);
-            }
+            if(CodecStatus.Status.Cameras.Camera.Count > 0)
+                internalCamera.SetCapabilites(CodecStatus.Status.Cameras.Camera[0].Capabilities.Options.Value);
             else
-            {
-                // Setup all the cameras
-                for (int i = 0; i < camCount; i++)
-                {
-                    var cam = CodecStatus.Status.Cameras.Camera[i];
+                // Somehow subscribe to the event on the Options.Value property and update when it changes.
 
-                    var id = (uint)i;
-                    var name = string.Format("Camera {0}", id);
-
-                    // Check for a config object that matches the camera number
-                    var camInfo = cameraInfo.FirstOrDefault(c => c.CameraNumber == i + 1);
-                    if (camInfo != null)
-                    {
-                        id = (uint)camInfo.SourceId;
-                        name = camInfo.Name;
-                    }
-
-                    var key = string.Format("{0}-camera{1}", Key, id);
-                    var camera = new CiscoSparkCamera(key, name, this, id);
-
-                    if (cam.Capabilities != null)
-                    {
-                        camera.SetCapabilites(cam.Capabilities.Options.Value);
-                    }
-
-                    Cameras.Add(camera);
-                    DeviceManager.AddDevice(camera);
-                }
-            }
+            Cameras.Add(internalCamera);
 
             // Add the far end camera
             var farEndCamera = new CiscoFarEndCamera(Key + "-cameraFar", "Far End", this);
@@ -2014,10 +1724,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             SelectedCameraFeedback = new StringFeedback(() => SelectedCamera.Key);
 
-            SelectedCamera = Cameras[0]; ; // call the method to select the camera and ensure the feedbacks get updated.
-
             ControllingFarEndCameraFeedback = new BoolFeedback(() => SelectedCamera is IAmFarEndCamera);
 
+            DeviceManager.AddDevice(internalCamera);
             DeviceManager.AddDevice(farEndCamera);
 
             NearEndPresets = new List<CodecRoomPreset>(15);
@@ -2031,6 +1740,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 FarEndRoomPresets.Add(new CodecRoomPreset(i, label, true, false));
             }
 
+            SelectedCamera = internalCamera; ; // call the method to select the camera and ensure the feedbacks get updated.
         }
 
         #region IHasCodecCameras Members
@@ -2078,12 +1788,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             }
             else
                 Debug.Console(2, this, "Unable to select camera with key: '{0}'", key);
-
-            var ciscoCam = camera as CiscoSparkCamera;
-            if (ciscoCam != null)
-            {
-                SendText(string.Format("xCommand Video Input SetMainVideoSource SourceId: {0}", ciscoCam.CameraId));
-            }
         }
 
         public CameraBase FarEndCamera { get; private set; }
@@ -2201,8 +1905,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             {
                 get
                 {
-                    if (CodecConfiguration.Configuration.Conference.AutoAnswer.Mode.Value == null) return false;
-                    return CodecConfiguration.Configuration.Conference.AutoAnswer.Mode.Value.ToLower() == "on";
+                    if (CodecConfiguration.Configuration.Conference.AutoAnswer.Mode.Value.ToLower() == "on")
+                        return true;
+                    else
+                        return false;
                 }
             }
 
@@ -2367,47 +2073,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             else
                 CameraMuteOn();
         }
-
-        #region IHasDoNotDisturbMode Members
-
-        public BoolFeedback DoNotDisturbModeIsOnFeedback { get; private set; }
-
-        public void ActivateDoNotDisturbMode()
-        {
-            SendText("xCommand Conference DoNotDisturb Activate");
-        }
-
-        public void DeactivateDoNotDisturbMode()
-        {
-            SendText("xCommand Conference DoNotDisturb Deactivate");
-        }
-
-        public void ToggleDoNotDisturbMode()
-        {
-            if (DoNotDisturbModeIsOnFeedback.BoolValue)
-            {
-                DeactivateDoNotDisturbMode();
-            }
-            else
-            {
-                ActivateDoNotDisturbMode();
-            }
-        }
-
-        #endregion
-
-        #region IHasHalfWakeMode Members
-
-        public BoolFeedback HalfWakeModeIsOnFeedback { get; private set; }
-
-        public BoolFeedback EnteringStandbyModeFeedback { get; private set; }
-
-        public void HalfwakeActivate()
-        {
-            SendText("xCommand Standby Halfwake");
-        }
-
-        #endregion
     }
 
 
@@ -2530,5 +2195,4 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             return new VideoCodec.Cisco.CiscoSparkCodec(dc, comm);
         }
     }
-
 }

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

@@ -50,16 +50,8 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         public uint PhonebookResultsLimit { get; set; }
 
         [JsonProperty("UiBranding")]
-        public BrandingLogoProperties UiBranding { get; set; }
+        public BrandingLogoProperties UiBranding { get; set; }       
 
-        [JsonProperty("cameraInfo")]
-        public List<CameraInfo> CameraInfo { get; set; }
-
-
-        public CiscoSparkCodecPropertiesConfig()
-        {
-            CameraInfo = new List<CameraInfo>();
-        }
     }
 
     public class SharingProperties
@@ -76,14 +68,4 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         [JsonProperty("brandingUrl")]
         public string BrandingUrl { get; set; }
     }
-
-    /// <summary>
-    /// Describes configuration information for the near end cameras
-    /// </summary>
-    public class CameraInfo
-    {
-        public int CameraNumber { get; set; }
-        public string Name { get; set; }
-        public int SourceId { get; set; }
-    }
 }

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

@@ -26,8 +26,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         void CodecRoomPresetSelect(int preset);
 
         void CodecRoomPresetStore(int preset, string description);
-
-        void SelectFarEndPreset(int preset);        
     }
 
     public static class RoomPresets

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

@@ -112,46 +112,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class RingVolume : ValueProperty
+        public class RingVolume
         {
             public string valueSpaceRef { get; set; }
-
-            string _Value;
-
-            /// <summary>
-            /// Sets Value and triggers the action when set
-            /// </summary>
-            public string Value
-            {
-                get
-                {
-                    return _Value;
-                }
-                set
-                {
-                    _Value = value;
-                    OnValueChanged();
-                }
-            }
-
-            public int Volume
-            {
-                get
-                {
-                    return Int32.Parse(_Value);
-                }
-            }
+            public string Value { get; set; }
         }
 
         public class SoundsAndAlerts
         {
             public RingTone RingTone { get; set; }
             public RingVolume RingVolume { get; set; }
-
-            public SoundsAndAlerts()
-            {
-                RingVolume = new RingVolume();
-            }
         }
 
         public class Audio
@@ -161,12 +131,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Microphones Microphones { get; set; }
             public Output Output { get; set; }
             public SoundsAndAlerts SoundsAndAlerts { get; set; }
-
-
-            public Audio()
-            {
-                SoundsAndAlerts = new SoundsAndAlerts();
-            }
         }
 
         public class DefaultMode
@@ -376,13 +340,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Delay Delay { get; set; }
             public Mode9 Mode { get; set; }
             public Mute2 Mute { get; set; }
-
-            public AutoAnswer()
-            {
-               Mode = new Mode9(); 
-               Delay = new Delay();
-               Mute = new Mute2();
-            }
         }
 
         public class Protocol
@@ -483,11 +440,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public MaxTotalTransmitCallRate MaxTotalTransmitCallRate { get; set; }
             public MaxTransmitCallRate MaxTransmitCallRate { get; set; }
             public MultiStream MultiStream { get; set; }
-
-            public Conference()
-            {
-                AutoAnswer = new AutoAnswer();
-            }
         }
 
         public class LoginName
@@ -1845,22 +1797,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public UserInterface UserInterface { get; set; }
             public UserManagement UserManagement { get; set; }
             public Video2 Video { get; set; }
-
-            public Configuration()
-            {
-                Audio = new Audio();
-                Conference = new Conference();
-            }
         }
 
         public class RootObject
         {
             public Configuration Configuration { get; set; }
-
-            public RootObject()
-            {
-                Configuration = new Configuration();
-            }   
         }
     }
 }

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

@@ -12,28 +12,28 @@ using PepperDash.Essentials.Devices.Common.VideoCodec.CiscoCodec;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 {
-    // Helper Classes for Proerties
-    public abstract class ValueProperty
-    {
-        /// <summary>
-        /// Triggered when Value is set
-        /// </summary>
-        public Action ValueChangedAction { get; set; }
-
-        protected void OnValueChanged()
-        {
-            var a = ValueChangedAction;
-            if (a != null)
-                a();
-        }
-
-    }
-
 	/// <summary>
 	/// This class exists to capture serialized data sent back by a Cisco codec in JSON output mode
 	/// </summary>
     public class CiscoCodecStatus
     {
+        // Helper Classes for Proerties
+        public abstract class ValueProperty
+        {
+            /// <summary>
+            /// Triggered when Value is set
+            /// </summary>
+            public Action ValueChangedAction { get; set; }
+
+            protected void OnValueChanged()
+            {
+                var a = ValueChangedAction;
+                if (a != null)
+                    a();
+            }
+
+        }
+
 
         public class ConnectionStatus
         {
@@ -262,25 +262,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class DectectedConnector
-        {
-            public string Value { get; set; }
-
-            public int ConnectorId
-            {
-                get
-                {
-                    return Convert.ToUInt16(Value);
-                }
-            }
-        }
-
         public class Camera
         {
             public string id { get; set; }
             public Capabilities Capabilities { get; set; }
             public Connected Connected { get; set; }
-            public DectectedConnector DetectedConnector { get; set; }
             public Flip Flip { get; set; }
             public HardwareID HardwareID { get; set; }
             public MacAddress MacAddress { get; set; }
@@ -572,41 +558,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             }
         }
 
-        public class SendingMode : ValueProperty
+        public class SendingMode
         {
-            string _Value;
-
-            /// <summary>
-            /// Sets Value and triggers the action when set
-            /// </summary>
-            public string Value
-            {
-                get
-                {
-                    return _Value;
-                }
-                set
-                {
-                    _Value = value;
-                    OnValueChanged();
-                }
-            }
-
-            public bool LocalOnly
-            {
-                get
-                {
-                    return _Value.ToLower() == "localonly";
-                }
-            }
-
-            public bool LocalRemote
-            {
-                get
-                {
-                    return _Value.ToLower() == "localremote";
-                }
-            }
+            public string Value { get; set; }
         }
 
         public class LocalInstance
@@ -619,7 +573,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public LocalInstance()
             {
                 Source = new Source2();
-                SendingMode = new SendingMode();
             }
         }
 
@@ -1996,30 +1949,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Duration : ValueProperty
+        public class Duration
         {
-            private string _Value;
-
-            public string Value
-            {
-                get
-                {
-                    return _Value;
-                }
-                set
-                {
-                    _Value = value;
-                    OnValueChanged();
-                }
-            }
-
-            public TimeSpan DurationValue
-            {
-                get
-                {
-                    return new TimeSpan(0, 0, Int32.Parse(_Value));
-                }
-            }
+            public string Value { get; set; }
         }
 
         public class FacilityServiceId
@@ -2032,19 +1964,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class PlacedOnHold : ValueProperty
+        public class PlacedOnHold
         {
-            public bool BoolValue { get; private set; }
-
-            public string Value
-            {
-                set
-                {
-                    // If the incoming value is "True" it sets the BoolValue true, otherwise sets it false
-                    BoolValue = value == "True";
-                    OnValueChanged();
-                }
-            }
+            public string Value { get; set; }
         }
 
         public class Protocol
@@ -2092,7 +2014,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             {
                 CallType = new CallType();
                 Status = new Status2();
-                Duration = new Duration();
             }
         }
 

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

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

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

@@ -24,24 +24,27 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
     /// </summary>
     public class MeetingInfo
     {
-        [JsonProperty("id")]
+        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
         public string Id { get; private set; }
-        [JsonProperty("name")]
+        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
         public string Name { get; private set; }
-        [JsonProperty("host")]
+        [JsonProperty("host", NullValueHandling = NullValueHandling.Ignore)]
         public string Host { get; private set; }
-        [JsonProperty("password")]
+        [JsonProperty("password", NullValueHandling = NullValueHandling.Ignore)]
         public string Password { get; private set; }
-        [JsonProperty("shareStatus")]
+        [JsonProperty("shareStatus", NullValueHandling = NullValueHandling.Ignore)]
         public string ShareStatus { get; private set; }
-        [JsonProperty("isHost")]
+        [JsonProperty("isHost", NullValueHandling = NullValueHandling.Ignore)]
         public Boolean IsHost { get; private set; }
-        [JsonProperty("isSharingMeeting")]
+        [JsonProperty("isSharingMeeting", NullValueHandling = NullValueHandling.Ignore)]
         public Boolean IsSharingMeeting { get; private set; }
-        [JsonProperty("waitingForHost")]
+        [JsonProperty("waitingForHost", NullValueHandling = NullValueHandling.Ignore)]
         public Boolean WaitingForHost { get; private set; }
+        [JsonProperty("isLocked", NullValueHandling = NullValueHandling.Ignore)]
+        public Boolean IsLocked { get; private set; }
 
-        public MeetingInfo(string id, string name, string host, string password, string shareStatus, bool isHost, bool isSharingMeeting, bool waitingForHost)
+
+        public MeetingInfo(string id, string name, string host, string password, string shareStatus, bool isHost, bool isSharingMeeting, bool waitingForHost, bool isLocked)
         {
             Id = id;
             Name = name;
@@ -51,6 +54,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
             IsHost = isHost;
             IsSharingMeeting = isSharingMeeting;
             WaitingForHost = waitingForHost;
+            IsLocked = isLocked;
         }
     }
 

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

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

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

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

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

@@ -12,6 +12,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
 	public interface IHasParticipants
 	{
 		CodecParticipants Participants { get; }
+
+        /// <summary>
+        /// Removes the participant from the meeting
+        /// </summary>
+        /// <param name="participant"></param>
+        void RemoveParticipant(int userId);
+
+        /// <summary>
+        /// Sets the participant as the new host
+        /// </summary>
+        /// <param name="participant"></param>
+        void SetParticipantAsHost(int userId);
 	}
 
 	/// <summary>
@@ -29,6 +41,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
 	/// </summary>
 	public interface IHasParticipantAudioMute : IHasParticipantVideoMute
 	{
+        /// <summary>
+        /// Mute audio of all participants
+        /// </summary>
+        void MuteAudioForAllParticipants();
+
 		void MuteAudioForParticipant(int userId);
 		void UnmuteAudioForParticipant(int userId);
 		void ToggleAudioForParticipant(int userId);

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

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Devices.Common.Codec;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec
-{
-    public interface IJoinCalls
-    {
-        void JoinCall(CodecActiveCallItem activeCall);
-        void JoinAllCalls();
-    }
-}

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

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

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

@@ -751,11 +751,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             SetConfig(Config);
         }
 
-        public void SelectFarEndPreset(int i)
-        {
-            Debug.Console(1, this, "Selecting Far End Preset: {0}", i);
-        }
-
         #endregion
 
         protected override void CustomSetConfig(DeviceConfig config)

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

@@ -149,7 +149,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		public abstract void AcceptCall(CodecActiveCallItem call);
 		public abstract void RejectCall(CodecActiveCallItem call);
 		public abstract void SendDtmf(string s);
-        public virtual void SendDtmf(string s, CodecActiveCallItem call) { }
 
 		#endregion
 
@@ -303,8 +302,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		    trilist.OnlineStatusChange += (device, args) =>
 		    {
 		        if (!args.DeviceOnLine) return;
-
-		        trilist.SetString(joinMap.Schedule.JoinNumber, "\xFC");
 		    };
 		}
 
@@ -328,22 +325,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 			LinkVideoCodecVolumeToApi(trilist, joinMap);
 
-            LinkVideoCodecInfoToApi(trilist, joinMap);
-
-            // Register for this event to link any functions that require the codec to be ready first
-            codec.IsReadyChange += (o, a) =>
-                {
-                    if (codec is IHasCodecCameras)
-                    {
-                        LinkVideoCodecCameraToApi(codec as IHasCodecCameras, trilist, joinMap);
-                    }
-                };
-
 			if (codec is ICommunicationMonitor)
 			{
 				LinkVideoCodecCommMonitorToApi(codec as ICommunicationMonitor, trilist, joinMap);
 			}
 
+			if (codec is IHasCodecCameras)
+			{
+				LinkVideoCodecCameraToApi(codec as IHasCodecCameras, trilist, joinMap);
+			}
 
 			if (codec is IHasCodecSelfView)
 			{
@@ -397,11 +387,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				LinkVideoCodecPhoneToApi(codec as IHasPhoneDialing, trilist, joinMap);
 			}
 
-            if (codec is IHasCallHistory)
-            {
-                LinkVideoCodecCallHistoryToApi(codec as IHasCallHistory, trilist, joinMap);
-            }
-
 			trilist.OnlineStatusChange += (device, args) =>
 			{
 				if (!args.DeviceOnLine) return;
@@ -448,11 +433,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 					(codec as IHasPhoneDialing).PhoneOffHookFeedback.FireUpdate();
 				}
 
-                if (codec is IHasCallHistory)
-                {
-                    UpdateCallHistory((codec as IHasCallHistory), trilist, joinMap);
-                }
-
 				SharingContentIsOnFeedback.FireUpdate();
 
 				trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
@@ -461,31 +441,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			};
 		}
 
-        private void LinkVideoCodecInfoToApi(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
-        {
-            trilist.SetBool(joinMap.MultiSiteOptionIsEnabled.JoinNumber, this.CodecInfo.MultiSiteOptionIsEnabled);
-            trilist.SetBool(joinMap.AutoAnswerEnabled.JoinNumber, this.CodecInfo.AutoAnswerEnabled);
-            trilist.SetString(joinMap.DeviceIpAddresss.JoinNumber, this.CodecInfo.IpAddress);
-            trilist.SetString(joinMap.SipPhoneNumber.JoinNumber, this.CodecInfo.SipPhoneNumber);
-            trilist.SetString(joinMap.E164Alias.JoinNumber, this.CodecInfo.E164Alias);
-            trilist.SetString(joinMap.H323Id.JoinNumber, this.CodecInfo.H323Id);
-            trilist.SetString(joinMap.SipUri.JoinNumber, this.CodecInfo.SipUri);
-
-            trilist.OnlineStatusChange += (o, a) =>
-            {
-                if (a.DeviceOnLine)
-                {
-                    trilist.SetBool(joinMap.MultiSiteOptionIsEnabled.JoinNumber, this.CodecInfo.MultiSiteOptionIsEnabled);
-                    trilist.SetBool(joinMap.AutoAnswerEnabled.JoinNumber, this.CodecInfo.AutoAnswerEnabled);
-                    trilist.SetString(joinMap.DeviceIpAddresss.JoinNumber, this.CodecInfo.IpAddress);
-                    trilist.SetString(joinMap.SipPhoneNumber.JoinNumber, this.CodecInfo.SipPhoneNumber);
-                    trilist.SetString(joinMap.E164Alias.JoinNumber, this.CodecInfo.E164Alias);
-                    trilist.SetString(joinMap.H323Id.JoinNumber, this.CodecInfo.H323Id);
-                    trilist.SetString(joinMap.SipUri.JoinNumber, this.CodecInfo.SipUri);
-                }
-            };
-        }
-
 		private void LinkVideoCodecPhoneToApi(IHasPhoneDialing codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
 			codec.PhoneOffHookFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PhoneHookState.JoinNumber]);
@@ -596,6 +551,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
                 UpdateParticipantsXSig(codec, trilist, joinMap);
 			};
+
+            trilist.OnlineStatusChange += (device, args) =>
+            {
+                if (!args.DeviceOnLine) return;
+
+                // TODO [ ] Issue #868
+                trilist.SetString(joinMap.CurrentParticipants.JoinNumber, "\xFC");
+                UpdateParticipantsXSig(codec, trilist, joinMap);
+            };
 		}
 
         private void UpdateParticipantsXSig(IHasParticipants codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
@@ -827,7 +791,16 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 						UpdateMeetingsList(codec, trilist, joinMap);
 					}
 				};
-		}
+
+            trilist.OnlineStatusChange += (device, args) =>
+            {
+                if (!args.DeviceOnLine) return;
+
+                // TODO [ ] Issue #868
+                trilist.SetString(joinMap.Schedule.JoinNumber, "\xFC");
+                UpdateMeetingsList(codec, trilist, joinMap);
+            };
+        }
 
 		private void UpdateMeetingsList(IHasScheduleAwareness codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
@@ -848,6 +821,15 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 			var meetingsData = UpdateMeetingsListXSig(_currentMeetings);
 			trilist.SetString(joinMap.Schedule.JoinNumber, meetingsData);
 			trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort)_currentMeetings.Count);
+
+            trilist.OnlineStatusChange += (device, args) =>
+            {
+                if (!args.DeviceOnLine) return;
+
+                // TODO [ ] Issue #868
+                trilist.SetString(joinMap.Schedule.JoinNumber, "\xFC");
+                UpdateMeetingsListXSig(_currentMeetings);
+            };
 		}
 
 		private string UpdateMeetingsListXSig(List<Meeting> meetings)
@@ -937,33 +919,18 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 		private void LinkVideoCodecDirectoryToApi(IHasDirectory codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
 			codec.CurrentDirectoryResultIsNotDirectoryRoot.LinkComplementInputSig(
-				trilist.BooleanInput[joinMap.DirectoryIsRoot.JoinNumber]);			
+				trilist.BooleanInput[joinMap.DirectoryIsRoot.JoinNumber]);
+
+			trilist.SetSigFalseAction(joinMap.DirectoryRoot.JoinNumber, codec.SetCurrentDirectoryToRoot);
 
 			trilist.SetStringSigAction(joinMap.DirectorySearchString.JoinNumber, codec.SearchDirectory);
 
-			trilist.SetUShortSigAction(joinMap.DirectorySelectRow.JoinNumber, (i) => SelectDirectoryEntry(codec, i, trilist, joinMap));
-
-            // Report feedback for number of contact methods for selected contact
+			trilist.SetUShortSigAction(joinMap.DirectorySelectRow.JoinNumber, (i) => SelectDirectoryEntry(codec, i));
 
 			trilist.SetSigFalseAction(joinMap.DirectoryRoot.JoinNumber, codec.SetCurrentDirectoryToRoot);
 
 			trilist.SetSigFalseAction(joinMap.DirectoryFolderBack.JoinNumber, codec.GetDirectoryParentFolderContents);
 
-		    if (codec.DirectoryRoot != null)
-		    {
-                trilist.SetUshort(joinMap.DirectoryRowCount.JoinNumber, (ushort)codec.DirectoryRoot.CurrentDirectoryResults.Count);
-
-                var clearBytes = XSigHelpers.ClearOutputs();
-
-                trilist.SetString(joinMap.DirectoryEntries.JoinNumber,
-                    Encoding.GetEncoding(XSigEncoding).GetString(clearBytes, 0, clearBytes.Length));
-                var directoryXSig = UpdateDirectoryXSig(codec.DirectoryRoot, !codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue);
-
-                Debug.Console(2, this, "Directory XSig Length: {0}", directoryXSig.Length);
-
-                trilist.SetString(joinMap.DirectoryEntries.JoinNumber, directoryXSig);
-		    }
-
 			codec.DirectoryResultReturned += (sender, args) =>
 			{
 				trilist.SetUshort(joinMap.DirectoryRowCount.JoinNumber, (ushort)args.Directory.CurrentDirectoryResults.Count);
@@ -974,160 +941,54 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 					Encoding.GetEncoding(XSigEncoding).GetString(clearBytes, 0, clearBytes.Length));
 				var directoryXSig = UpdateDirectoryXSig(args.Directory, !codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue);
 
-                Debug.Console(2, this, "Directory XSig Length: {0}", directoryXSig.Length);
-
 				trilist.SetString(joinMap.DirectoryEntries.JoinNumber, directoryXSig);
 			};
+
+            trilist.OnlineStatusChange += (device, args) =>
+            {
+                if (!args.DeviceOnLine) return;
+
+                // TODO [ ] Issue #868
+                trilist.SetString(joinMap.DirectoryEntries.JoinNumber, "\xFC");
+                UpdateDirectoryXSig(codec.CurrentDirectoryResult,
+                    !codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue);
+            };
 		}
 
-
-
-		private void SelectDirectoryEntry(IHasDirectory codec, ushort i, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+		private void SelectDirectoryEntry(IHasDirectory codec, ushort i)
 		{
-            if (i < 1 || i > codec.CurrentDirectoryResult.CurrentDirectoryResults.Count) return;
+			var entry = codec.CurrentDirectoryResult.CurrentDirectoryResults[i - 1];
 
-			_selectedDirectoryItem = codec.CurrentDirectoryResult.CurrentDirectoryResults[i - 1];
-
-
-			if (_selectedDirectoryItem is DirectoryFolder)
+			if (entry is DirectoryFolder)
 			{
-				codec.GetDirectoryFolderContents(_selectedDirectoryItem.FolderId);
-                trilist.SetUshort(joinMap.SelectedContactMethodCount.JoinNumber, 0);
-                trilist.SetString(joinMap.DirectorySelectedFolderName.JoinNumber, _selectedDirectoryItem.Name);
-                trilist.SetString(joinMap.DirectoryEntrySelectedName.JoinNumber, string.Empty);
-                trilist.ClearUShortSigAction(joinMap.SelectContactMethod.JoinNumber);
-                trilist.ClearBoolSigAction(joinMap.DirectoryDialSelectedLine.JoinNumber);
-                trilist.ClearBoolSigAction(joinMap.DirectoryDialSelectedContactMethod.JoinNumber);
-                return;
+				codec.GetDirectoryFolderContents(entry.FolderId);
+				return;
 			}
 
-            // not a folder.  Clear this value
-            trilist.SetString(joinMap.DirectorySelectedFolderName.JoinNumber, string.Empty);
+			var dialableEntry = entry as IInvitableContact;
 
-            var selectedContact = _selectedDirectoryItem as DirectoryContact;
-            if (selectedContact != null)
-            {
-                trilist.SetString(joinMap.DirectoryEntrySelectedName.JoinNumber, selectedContact.Name);
-            
-            }
+			if (dialableEntry != null)
+			{
+				Dial(dialableEntry);
+				return;
+			}
 
-            // Allow auto dial of selected line.  Always dials first contact method
-            if (!trilist.GetBool(joinMap.DirectoryDisableAutoDialSelectedLine.JoinNumber))
-            {
-                var invitableEntry = _selectedDirectoryItem as IInvitableContact;
+			var entryToDial = entry as DirectoryContact;
 
-                if (invitableEntry != null)
-                {
-                    Dial(invitableEntry);
-                    return;
-                }
+			if (entryToDial == null) return;
 
-                var entryToDial = _selectedDirectoryItem as DirectoryContact;
-
-                trilist.SetString(joinMap.DirectoryEntrySelectedNumber.JoinNumber, selectedContact.ContactMethods[0].Number);
-
-                if (entryToDial == null) return;
-
-                Dial(entryToDial.ContactMethods[0].Number);
-                return;
-            }
-            else
-            {
-                // If auto dial is disabled...
-                var entryToDial = _selectedDirectoryItem as DirectoryContact;
-
-                if (entryToDial == null)
-                {
-                    // Clear out values and actions from last selected item
-                    trilist.SetUshort(joinMap.SelectedContactMethodCount.JoinNumber, 0);
-                    trilist.SetString(joinMap.DirectoryEntrySelectedName.JoinNumber, string.Empty);
-                    trilist.ClearUShortSigAction(joinMap.SelectContactMethod.JoinNumber);
-                    trilist.ClearBoolSigAction(joinMap.DirectoryDialSelectedLine.JoinNumber);
-                    trilist.ClearBoolSigAction(joinMap.DirectoryDialSelectedContactMethod.JoinNumber);
-                    return;
-                }
-
-                trilist.SetUshort(joinMap.SelectedContactMethodCount.JoinNumber, (ushort)entryToDial.ContactMethods.Count);
-
-                // Update the action to dial the selected contact method
-                trilist.SetUShortSigAction(joinMap.SelectContactMethod.JoinNumber, (u) =>
-                {
-                    if (u < 1 || u > entryToDial.ContactMethods.Count) return;
-
-                    trilist.SetSigFalseAction(joinMap.DirectoryDialSelectedContactMethod.JoinNumber, () => Dial(entryToDial.ContactMethods[u].Number));
-                });
-
-                // Sets DirectoryDialSelectedLine join action to dial first contact method
-                trilist.SetSigFalseAction(joinMap.DirectoryDialSelectedLine.JoinNumber, () => Dial(entryToDial.ContactMethods[0].Number));
-
-                var clearBytes = XSigHelpers.ClearOutputs();
-
-                trilist.SetString(joinMap.ContactMethods.JoinNumber,
-                    Encoding.GetEncoding(XSigEncoding).GetString(clearBytes, 0, clearBytes.Length));
-                var contactMethodsXSig = UpdateContactMethodsXSig(entryToDial);
-
-                trilist.SetString(joinMap.ContactMethods.JoinNumber, contactMethodsXSig);
-            }
+			Dial(entryToDial.ContactMethods[0].Number);
 		}
 
-        /// <summary>
-        /// Generates the XSig data representing the available contact methods for the selected DirectoryContact
-        /// </summary>
-        /// <param name="contact"></param>
-        /// <returns></returns>
-        private string UpdateContactMethodsXSig(DirectoryContact contact)
-        {
-            const int maxMethods = 10;
-            const int maxStrings = 3;
-            const int offset = maxStrings;
-            var stringIndex = 0;
-            var arrayIndex = 0;
-            // Create a new token array and set the size to the number of methods times the total number of signals
-            var tokenArray = new XSigToken[maxMethods * offset];
-
-            Debug.Console(2, this, "Creating XSIG token array with size {0}", maxMethods * offset);
-
-            // TODO: Add code to generate XSig data
-            foreach (var method in contact.ContactMethods)
-            {
-                if (arrayIndex >= maxMethods * offset)
-                    break;
-
-                //serials
-                tokenArray[arrayIndex + 1] = new XSigSerialToken(stringIndex + 1, method.Number);
-                tokenArray[arrayIndex + 2] = new XSigSerialToken(stringIndex + 2, method.ContactMethodId.ToString());
-                tokenArray[arrayIndex + 3] = new XSigSerialToken(stringIndex + 3, method.Device.ToString());
-
-				arrayIndex += offset;
-				stringIndex += maxStrings;
-            }
-
-            while (arrayIndex < maxMethods)
-            {
-                tokenArray[arrayIndex + 1] = new XSigSerialToken(stringIndex + 1, String.Empty);
-                tokenArray[arrayIndex + 2] = new XSigSerialToken(stringIndex + 2, String.Empty);
-                tokenArray[arrayIndex + 3] = new XSigSerialToken(stringIndex + 3, String.Empty);
-
-				arrayIndex += offset;
-				stringIndex += maxStrings;
-            }
-
-            return GetXSigString(tokenArray);
-        }
-
 		private string UpdateDirectoryXSig(CodecDirectory directory, bool isRoot)
 		{
 			var contactIndex = 1;
 			var tokenArray = new XSigToken[directory.CurrentDirectoryResults.Count];
 
-            Debug.Console(2, this, "Is root {0} Directory Count: {1}", isRoot, directory.CurrentDirectoryResults.Count);
-
 			foreach (var entry in directory.CurrentDirectoryResults)
 			{
 				var arrayIndex = contactIndex - 1;
 
-                Debug.Console(2, this, "Entry Name: {0}, Folder ID: {1}", entry.Name, entry.FolderId);
-
 				if (entry is DirectoryFolder && entry.ParentFolderId == "root")
 				{
 					tokenArray[arrayIndex] = new XSigSerialToken(contactIndex, String.Format("[+] {0}", entry.Name));
@@ -1137,6 +998,8 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 					continue;
 				}
 
+				if (isRoot && String.IsNullOrEmpty(entry.FolderId)) continue;
+
 				tokenArray[arrayIndex] = new XSigSerialToken(contactIndex, entry.Name);
 
 				contactIndex++;
@@ -1150,25 +1013,8 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 			trilist.SetSigFalseAction(joinMap.ManualDial.JoinNumber,
 				() => Dial(trilist.StringOutput[joinMap.CurrentDialString.JoinNumber].StringValue));
 
-			//End All calls
-			trilist.SetSigFalseAction(joinMap.EndAllCalls.JoinNumber, EndAllCalls);
-
-            //End a specific call, specified by index. Maximum 8 calls supported
-            for (int i = 0; i < joinMap.EndCallStart.JoinSpan; i++)
-            {
-                trilist.SetSigFalseAction((uint)(joinMap.EndCallStart.JoinNumber + i), () =>
-                    {
-                        var call = ActiveCalls[i];
-                        if (call != null)
-                        {
-                            EndCall(call);
-                        }
-                        else
-                        {
-                            Debug.Console(0, this, "[End Call] Unable to find call at index '{0}'", i);
-                        }
-                    });
-            }
+			//End All calls for now
+			trilist.SetSigFalseAction(joinMap.EndCall.JoinNumber, EndAllCalls);
 
 			trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
 
@@ -1187,70 +1033,22 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				}
 
 				trilist.SetString(joinMap.CurrentCallData.JoinNumber, UpdateCallStatusXSig());
-
-                trilist.SetUshort(joinMap.ConnectedCallCount.JoinNumber, (ushort)ActiveCalls.Count);
 			};
 
-            var joinCodec = this as IJoinCalls;
-            if (joinCodec != null)
+            trilist.OnlineStatusChange += (device, args) =>
             {
-                trilist.SetSigFalseAction(joinMap.JoinAllCalls.JoinNumber, () => joinCodec.JoinAllCalls());
+                if (!args.DeviceOnLine) return;
 
-                for (int i = 0; i < joinMap.JoinCallStart.JoinSpan; i++)
-                {
-                    trilist.SetSigFalseAction((uint)(joinMap.JoinCallStart.JoinNumber + i), () =>
-                        {
-                            var call = ActiveCalls[i];
-                            if (call != null)
-                            {
-                                joinCodec.JoinCall(call);
-                            } 
-                            else
-                            {
-                                Debug.Console(0, this, "[Join Call] Unable to find call at index '{0}'", i);
-                            }
-                        });
-                }
-            }
-
-            var holdCodec = this as IHasCallHold;
-            if (holdCodec != null)
-            {
-                for (int i = 0; i < joinMap.JoinCallStart.JoinSpan; i++)
-                {
-                    trilist.SetSigFalseAction((uint)(joinMap.HoldCallsStart.JoinNumber + i), () =>
-                        {
-                            var call = ActiveCalls[i];
-                            if (call != null)
-                            {
-                                holdCodec.HoldCall(call);
-                            } 
-                            else
-                            {
-                                Debug.Console(0, this, "[Hold Call] Unable to find call at index '{0}'", i);
-                            }
-                        });
-
-                    trilist.SetSigFalseAction((uint)(joinMap.ResumeCallsStart.JoinNumber + i), () =>
-                        {
-                            var call = ActiveCalls[i];
-                            if (call != null)
-                            {
-                                holdCodec.ResumeCall(call);
-                            } 
-                            else
-                            {
-                                Debug.Console(0, this, "[Resume Call] Unable to find call at index '{0}'", i);
-                            }
-                        });
-                }
-            }
+                // TODO [ ] Issue #868
+                trilist.SetString(joinMap.CurrentCallData.JoinNumber, "\xFC");
+                UpdateCallStatusXSig();
+            };
 		}
 
 		private string UpdateCallStatusXSig()
 		{
 			const int maxCalls = 8;
-			const int maxStrings = 6;
+			const int maxStrings = 5;
 			const int offset = 6;
 			var stringIndex = 0;
 			var digitalIndex = maxStrings * maxCalls;
@@ -1264,7 +1062,6 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 					break;
 				//digitals
 				tokenArray[arrayIndex] = new XSigDigitalToken(digitalIndex + 1, call.IsActiveCall);
-                tokenArray[arrayIndex + 1] = new XSigDigitalToken(digitalIndex + 2, call.IsOnHold);
 
 				//serials
 				tokenArray[arrayIndex + 1] = new XSigSerialToken(stringIndex + 1, call.Name ?? String.Empty);
@@ -1272,12 +1069,6 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				tokenArray[arrayIndex + 3] = new XSigSerialToken(stringIndex + 3, call.Direction.ToString());
 				tokenArray[arrayIndex + 4] = new XSigSerialToken(stringIndex + 4, call.Type.ToString());
 				tokenArray[arrayIndex + 5] = new XSigSerialToken(stringIndex + 5, call.Status.ToString());
-                if(call.Duration != null)
-                {
-                    // May need to verify correct string format here
-                    var dur = string.Format("{0:c}", call.Duration);
-                    tokenArray[arrayIndex + 6] = new XSigSerialToken(stringIndex + 6, dur);
-                }
 
 				arrayIndex += offset;
 				stringIndex += maxStrings;
@@ -1287,16 +1078,13 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 			{
 				//digitals
 				tokenArray[arrayIndex] = new XSigDigitalToken(digitalIndex + 1, false);
-                tokenArray[arrayIndex + 1] = new XSigDigitalToken(digitalIndex + 2, false);
 
-
-                //serials
+				//serials
 				tokenArray[arrayIndex + 1] = new XSigSerialToken(stringIndex + 1, String.Empty);
 				tokenArray[arrayIndex + 2] = new XSigSerialToken(stringIndex + 2, String.Empty);
 				tokenArray[arrayIndex + 3] = new XSigSerialToken(stringIndex + 3, String.Empty);
 				tokenArray[arrayIndex + 4] = new XSigSerialToken(stringIndex + 4, String.Empty);
 				tokenArray[arrayIndex + 5] = new XSigSerialToken(stringIndex + 5, String.Empty);
-                tokenArray[arrayIndex + 6] = new XSigSerialToken(stringIndex + 6, String.Empty);
 
 				arrayIndex += offset;
 				stringIndex += maxStrings;
@@ -1308,61 +1096,25 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 
 		private void LinkVideoCodecDtmfToApi(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
-            trilist.SetSigFalseAction(joinMap.Dtmf0.JoinNumber, () => SendDtmfAction("0", trilist, joinMap));
-            trilist.SetSigFalseAction(joinMap.Dtmf1.JoinNumber, () => SendDtmfAction("1", trilist, joinMap));
-            trilist.SetSigFalseAction(joinMap.Dtmf2.JoinNumber, () => SendDtmfAction("2", trilist, joinMap));
-            trilist.SetSigFalseAction(joinMap.Dtmf3.JoinNumber, () => SendDtmfAction("3", trilist, joinMap));
-            trilist.SetSigFalseAction(joinMap.Dtmf4.JoinNumber, () => SendDtmfAction("4", trilist, joinMap));
-            trilist.SetSigFalseAction(joinMap.Dtmf5.JoinNumber, () => SendDtmfAction("5", trilist, joinMap));
-            trilist.SetSigFalseAction(joinMap.Dtmf6.JoinNumber, () => SendDtmfAction("6", trilist, joinMap));
-            trilist.SetSigFalseAction(joinMap.Dtmf7.JoinNumber, () => SendDtmfAction("7", trilist, joinMap));
-            trilist.SetSigFalseAction(joinMap.Dtmf8.JoinNumber, () => SendDtmfAction("8", trilist, joinMap));
-            trilist.SetSigFalseAction(joinMap.Dtmf9.JoinNumber, () => SendDtmfAction("9", trilist, joinMap));
-            trilist.SetSigFalseAction(joinMap.DtmfStar.JoinNumber, () => SendDtmfAction("*", trilist, joinMap));
-            trilist.SetSigFalseAction(joinMap.DtmfPound.JoinNumber, () => SendDtmfAction("#", trilist, joinMap));       
+			trilist.SetSigFalseAction(joinMap.Dtmf0.JoinNumber, () => SendDtmf("0"));
+			trilist.SetSigFalseAction(joinMap.Dtmf1.JoinNumber, () => SendDtmf("1"));
+			trilist.SetSigFalseAction(joinMap.Dtmf2.JoinNumber, () => SendDtmf("2"));
+			trilist.SetSigFalseAction(joinMap.Dtmf3.JoinNumber, () => SendDtmf("3"));
+			trilist.SetSigFalseAction(joinMap.Dtmf4.JoinNumber, () => SendDtmf("4"));
+			trilist.SetSigFalseAction(joinMap.Dtmf5.JoinNumber, () => SendDtmf("5"));
+			trilist.SetSigFalseAction(joinMap.Dtmf6.JoinNumber, () => SendDtmf("6"));
+			trilist.SetSigFalseAction(joinMap.Dtmf7.JoinNumber, () => SendDtmf("7"));
+			trilist.SetSigFalseAction(joinMap.Dtmf8.JoinNumber, () => SendDtmf("8"));
+			trilist.SetSigFalseAction(joinMap.Dtmf9.JoinNumber, () => SendDtmf("9"));
+			trilist.SetSigFalseAction(joinMap.DtmfStar.JoinNumber, () => SendDtmf("*"));
+			trilist.SetSigFalseAction(joinMap.DtmfPound.JoinNumber, () => SendDtmf("#"));
 		}
 
-        /// <summary>
-        /// Sends the specified string as a DTMF command.
-        /// Reads the value of the SendDtmfToSpecificCallInstance digital join and SelectCall analog join to determine
-        /// Whther to send to a specific call index or to the last connected call
-        /// </summary>
-        /// <param name="s"></param>
-        /// <param name="trilist"></param>
-        /// <param name="joinMap"></param>
-        private void SendDtmfAction(string s, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
-        {
-            if (!trilist.GetBool(joinMap.SendDtmfToSpecificCallIndex.JoinNumber))
-            {
-                SendDtmf(s);
-            }
-            else
-            {
-                var callIndex = trilist.GetUshort(joinMap.SelectCall.JoinNumber);
-                if (callIndex > 0 && callIndex <= 8)
-                {
-                    var call = ActiveCalls[callIndex - 1];
-                    if (call != null && call.IsActiveCall)
-                    {
-                        SendDtmf(s, call);
-                    }
-                    else
-                    {
-                        Debug.Console(0, this, "Warning: No call found at index {0} or call is not active.", callIndex);
-                    }
-                }
-                else
-                {
-                    Debug.Console(0, this, "Warning: Invalid call index specified.  Please use a value of 1-8.");
-                }
-            }
-        }
-
 		private void LinkVideoCodecCameraLayoutsToApi(IHasCodecLayouts codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
 			trilist.SetSigFalseAction(joinMap.CameraLayout.JoinNumber, codec.LocalLayoutToggle);
 
-			codec.LocalLayoutFeedback.LinkInputSig(trilist.StringInput[joinMap.CurrentLayoutStringFb.JoinNumber]);
+			codec.LocalLayoutFeedback.LinkInputSig(trilist.StringInput[joinMap.CameraLayoutStringFb.JoinNumber]);
 		}
 
 		private void LinkVideoCodecCameraModeToApi(IHasCameraAutoMode codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
@@ -1493,81 +1245,18 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				else camera.ZoomStop();
 			});
 
-
-            trilist.SetBoolSigAction(joinMap.CameraFocusNear.JoinNumber, (b) =>
-            {
-                if (codec.SelectedCamera == null) return;
-                var camera = codec.SelectedCamera as IHasCameraFocusControl;
-
-                if (camera == null) return;
-
-                if (b) camera.FocusNear();
-                else camera.FocusStop();
-            });
-
-            trilist.SetBoolSigAction(joinMap.CameraFocusFar.JoinNumber, (b) =>
-            {
-                if (codec.SelectedCamera == null) return;
-                var camera = codec.SelectedCamera as IHasCameraFocusControl;
-
-                if (camera == null) return;
-
-                if (b) camera.FocusFar();
-                else camera.FocusStop();
-            });
-
-            trilist.SetSigFalseAction(joinMap.CameraFocusAuto.JoinNumber, () =>
-            {
-                if (codec.SelectedCamera == null) return;
-                var camera = codec.SelectedCamera as IHasCameraFocusControl;
-
-                if (camera == null) return;
-
-                camera.TriggerAutoFocus();
-            });
-
-            // Camera count
-            trilist.SetUshort(joinMap.CameraCount.JoinNumber, (ushort)codec.Cameras.Count);
-
-            // Camera names
-            for (uint i = 0; i < joinMap.CameraNamesFb.JoinSpan; i++)
-            {
-                //Check the count first
-                if (i < codec.Cameras.Count && codec.Cameras[(int)i] != null)
-                {
-                    trilist.SetString(joinMap.CameraNamesFb.JoinNumber + i, codec.Cameras[(int)i].Name);
-                }
-                else
-                {
-                    trilist.SetString(joinMap.CameraNamesFb.JoinNumber + i, "");
-                }
-            }
-
 			//Camera Select
 			trilist.SetUShortSigAction(joinMap.CameraNumberSelect.JoinNumber, (i) =>
 			{
-                if (i > 0 && i <= codec.Cameras.Count)
-                {
-                    codec.SelectCamera(codec.Cameras[i - 1].Key);
-                }
-                else
-                {
-                    Debug.Console(0, this, "Unable to select.  No camera found at index {0}", i);
-                }
-			});
+				if (codec.SelectedCamera == null) return;
 
-            // Set initial selected camera feedback
-            if (codec.SelectedCamera != null)
-            {
-                trilist.SetUshort(joinMap.CameraNumberSelect.JoinNumber, (ushort)codec.Cameras.FindIndex((c) => c.Key == codec.SelectedCamera.Key));
-            }
+				codec.SelectCamera(codec.Cameras[i].Key);
+			});
 
 			codec.CameraSelected += (sender, args) =>
 			{
 				var i = (ushort)codec.Cameras.FindIndex((c) => c.Key == args.SelectedCamera.Key);
 
-                trilist.SetUshort(joinMap.CameraNumberSelect.JoinNumber, (ushort)(i + 1));
-
 				if (codec is IHasCodecRoomPresets)
 				{
 					return;
@@ -1610,16 +1299,10 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 			trilist.SetUShortSigAction(joinMap.CameraPresetSelect.JoinNumber, (i) =>
 			{
 				presetCodec.CodecRoomPresetSelect(i);
+
+				trilist.SetUshort(joinMap.CameraPresetSelect.JoinNumber, i);
 			});
 
-
-            // Far End Presets
-            trilist.SetUShortSigAction(joinMap.FarEndPresetSelect.JoinNumber, (i) =>
-            {
-                presetCodec.SelectFarEndPreset(i);
-            });
-
-
 			trilist.SetSigFalseAction(joinMap.CameraPresetSave.JoinNumber,
 					() =>
 					{
@@ -1627,98 +1310,18 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 							trilist.UShortOutput[joinMap.CameraPresetSelect.JoinNumber].UShortValue, String.Empty);
 						trilist.PulseBool(joinMap.CameraPresetSave.JoinNumber, 3000);
 					});
+
+            trilist.OnlineStatusChange += (device, args) =>
+            {
+                if (!args.DeviceOnLine) return;
+
+                // TODO [ ] Issue #868
+                trilist.SetString(joinMap.CameraPresetNames.JoinNumber, "\xFC");
+                SetCameraPresetNames(presetCodec.NearEndPresets);
+            };
 		}
 
-        // Following fields only used for Bridging
-        private int _selectedRecentCallItemIndex;
-        private CodecCallHistory.CallHistoryEntry _selectedRecentCallItem;
-        private DirectoryItem _selectedDirectoryItem;
-
-        private void LinkVideoCodecCallHistoryToApi(IHasCallHistory codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
-        {
-            codec.CallHistory.RecentCallsListHasChanged += (o, a) =>
-                {
-                    UpdateCallHistory(codec, trilist, joinMap);  
-                };
-
-            // Selected item action and feedback
-            trilist.SetUShortSigAction(joinMap.SelectRecentCallItem.JoinNumber, (u) =>
-                {
-                    if (u == 0 || u > codec.CallHistory.RecentCalls.Count) 
-                    {
-                        Debug.Console(2, this, "Recent Call History index out of range");
-                        return;
-                    }
-
-                    _selectedRecentCallItemIndex = (int)(u - 1);
-                    trilist.SetUshort(joinMap.SelectRecentCallItem.JoinNumber, u);     
-
-                    var _selectedRecentCallItem = codec.CallHistory.RecentCalls[_selectedRecentCallItemIndex];
-                    
-                    if (_selectedRecentCallItem != null)
-                    {
-                        trilist.SetString(joinMap.SelectedRecentCallName.JoinNumber, _selectedRecentCallItem.Name);
-                        trilist.SetString(joinMap.SelectedRecentCallNumber.JoinNumber, _selectedRecentCallItem.Number);
-                        trilist.SetSigFalseAction(joinMap.RemoveSelectedRecentCallItem.JoinNumber, () => codec.RemoveCallHistoryEntry(_selectedRecentCallItem));
-                        trilist.SetSigFalseAction(joinMap.DialSelectedRecentCallItem.JoinNumber, () => this.Dial(_selectedRecentCallItem.Number));
-                    }
-                    else
-                    {
-                        trilist.SetString(joinMap.SelectedRecentCallName.JoinNumber, string.Empty);
-                        trilist.SetString(joinMap.SelectedRecentCallNumber.JoinNumber, string.Empty);
-                        trilist.ClearBoolSigAction(joinMap.RemoveSelectedRecentCallItem.JoinNumber);
-                        trilist.ClearBoolSigAction(joinMap.DialSelectedRecentCallItem.JoinNumber);
-                    }
-                });
-        }
-
-
-
-        private void UpdateCallHistory(IHasCallHistory codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
-        {
-            // Clear out selected item
-            _selectedRecentCallItemIndex = 0;
-            _selectedRecentCallItem = null;
-            trilist.SetUshort(joinMap.SelectRecentCallItem.JoinNumber, 0);
-            trilist.SetString(joinMap.SelectedRecentCallName.JoinNumber, string.Empty);
-            trilist.SetString(joinMap.SelectedRecentCallNumber.JoinNumber, string.Empty);
-            trilist.ClearBoolSigAction(joinMap.RemoveSelectedRecentCallItem.JoinNumber);
-            //
-
-            trilist.SetUshort(joinMap.RecentCallCount.JoinNumber, (ushort)codec.CallHistory.RecentCalls.Count);
-
-            // Update the call history joins
-            var maxItems = joinMap.RecentCallNamesStart.JoinSpan;
-
-            // Create history
-            uint index = 0;          
-            for (uint i = 0; i < maxItems && i < codec.CallHistory.RecentCalls.Count; i++)
-            {
-                trilist.SetString(joinMap.RecentCallNamesStart.JoinNumber + i, codec.CallHistory.RecentCalls[(int)i].Name);
-                trilist.SetString(joinMap.RecentCallTimesStart.JoinNumber + i, codec.CallHistory.RecentCalls[(int)i].StartTime.ToShortTimeString());
-                trilist.SetUshort(joinMap.RecentCallOccurrenceType.JoinNumber + i, (ushort)codec.CallHistory.RecentCalls[(int)i].OccurrenceType);
-                //i++;
-                index = i;
-            }
-            
-            //foreach(var item in codec.CallHistory.RecentCalls)
-            //{
-            //    trilist.SetString(joinMap.RecentCallNamesStart.JoinNumber + i, item.Name);
-            //    trilist.SetString(joinMap.RecentCallTimesStart.JoinNumber + i, item.StartTime.ToShortTimeString());
-            //    trilist.SetUshort(joinMap.RecentCallOccurrenceType.JoinNumber + i, (ushort)item.OccurrenceType);
-            //    i++;
-            //}
-
-            // Clears existing items 
-            for (uint j = index; j < maxItems; j++)
-            {
-                trilist.SetString(joinMap.RecentCallNamesStart.JoinNumber + j, string.Empty);
-                trilist.SetString(joinMap.RecentCallTimesStart.JoinNumber + j, string.Empty);
-                trilist.SetUshort(joinMap.RecentCallOccurrenceType.JoinNumber + j, 0);
-            }
-        }
-
-        private string SetCameraPresetNames(IEnumerable<CodecRoomPreset> presets)
+		private string SetCameraPresetNames(IEnumerable<CodecRoomPreset> presets)
 		{
 			return SetCameraPresetNames(presets.Select(p => p.Description).ToList());
 		}

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

@@ -618,13 +618,31 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			private bool _can_Switch_Speaker_View;
 			private bool _can_Switch_Wall_View;
 			private bool _can_Switch_Share_On_All_Screens;
+            private bool _can_Switch_Floating_Share_Content;
 			private bool _is_In_First_Page;
 			private bool _is_In_Last_Page;
 			private string _video_type;
 
 
 			public bool can_Adjust_Floating_Video { get; set; }
-			public bool can_Switch_Floating_Share_Content { get; set; }
+
+
+			public bool can_Switch_Floating_Share_Content
+            {
+                get
+                {
+                    return _can_Switch_Floating_Share_Content;
+                }
+                set
+                {
+                    if (value != _can_Switch_Floating_Share_Content)
+                    {
+                        _can_Switch_Floating_Share_Content = value;
+                        NotifyPropertyChanged("can_Switch_Floating_Share_Content");
+                    }
+                }
+            }
+
 
 			/// <summary>
 			/// [on/off] // Set to On if it is possible to invoke zConfiguration Call Layout Style: ShareAll, to switch to the ShareAll mode, where the content sharing is shown full screen on all monitors.
@@ -744,12 +762,29 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
-		public class CallRecordInfo
+		public class CallRecordInfo : NotifiableObject
 		{
+            private bool _meetingIsBeingRecorded;
+
 			public bool canRecord { get; set; }
 			public bool emailRequired { get; set; }
 			public bool amIRecording { get; set; }
-			public bool meetingIsBeingRecorded { get; set; }
+
+			public bool meetingIsBeingRecorded 
+            {
+                get
+                {
+                    return _meetingIsBeingRecorded;
+                }
+                set
+                {
+                    if (value != _meetingIsBeingRecorded)
+                    {
+                        _meetingIsBeingRecorded = value;
+                        NotifyPropertyChanged("meetingIsBeingRecorded");
+                    }
+                }
+            }
 		}
 	}
 
@@ -1123,9 +1158,25 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
-		public class Lock
+		public class Lock : NotifiableObject
 		{
-			public bool Enable { get; set; }
+            private bool _enable;
+
+			public bool Enable 
+            {
+                get
+                {
+                    return _enable;
+                }
+                set
+                {
+                    if (value != _enable)
+                    {
+                        _enable = value;
+                        NotifyPropertyChanged("Enable");
+                    }
+                }
+            }
 		}
 
 		public class ClosedCaption

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

@@ -26,7 +26,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		IRouting,
 		IHasScheduleAwareness, IHasCodecCameras, IHasParticipants, IHasCameraOff, IHasCameraMute, IHasCameraAutoMode,
 		IHasFarEndContentStatus, IHasSelfviewPosition, IHasPhoneDialing, IHasZoomRoomLayouts, IHasParticipantPinUnpin,
-		IHasParticipantAudioMute, IHasSelfviewSize, IPasswordPrompt, IHasStartMeeting, IHasMeetingInfo, IHasPresentationOnlyMeeting
+		IHasParticipantAudioMute, IHasSelfviewSize, IPasswordPrompt, IHasStartMeeting, IHasMeetingInfo, IHasPresentationOnlyMeeting,
+        IHasMeetingLock, IHasMeetingRecording
 	{
 		private const long MeetingRefreshTimer = 60000;
         public uint DefaultMeetingDurationMin { get; private set; }
@@ -147,6 +148,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			ContentSwappedWithThumbnailFeedback = new BoolFeedback(ContentSwappedWithThumbnailFeedbackFunc);
 
 			NumberOfScreensFeedback = new IntFeedback(NumberOfScreensFeedbackFunc);
+
+            MeetingIsLockedFeedback = new BoolFeedback(() => Configuration.Call.Lock.Enable );
+
+            MeetingIsRecordingFeedback = new BoolFeedback(() => Status.Call.CallRecordInfo.meetingIsBeingRecorded );
 		}
 
 		public CommunicationGather PortGather { get; private set; }
@@ -499,19 +504,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 {
                     var sharingStatus = GetSharingStatus();
 
-                    MeetingInfo = new MeetingInfo("", "", "", "", sharingStatus, GetIsHostMyself(), true, false);
+                    MeetingInfo = new MeetingInfo("", "", "", "", sharingStatus, GetIsHostMyself(), true, false, MeetingIsLockedFeedback.BoolValue);
                     return;
                 }
 
                 var meetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, Participants.Host != null ? Participants.Host.Name : "None",
-                    MeetingInfo.Password, GetSharingStatus(), GetIsHostMyself(), MeetingInfo.IsSharingMeeting, MeetingInfo.WaitingForHost);
+                    MeetingInfo.Password, GetSharingStatus(), GetIsHostMyself(), MeetingInfo.IsSharingMeeting, MeetingInfo.WaitingForHost, MeetingIsLockedFeedback.BoolValue);
                 MeetingInfo = meetingInfo;
             }
             catch (Exception e)
             {
                 Debug.Console(1, this, "Error processing state property update. {0}", e.Message);
                 Debug.Console(2, this, e.StackTrace);
-                MeetingInfo = new MeetingInfo("", "", "", "", "None", false, false, false);
+                MeetingInfo = new MeetingInfo("", "", "", "", "None", false, false, false, MeetingIsLockedFeedback.BoolValue);
             }
 	    }
 
@@ -578,11 +583,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					case "ShareThumb":
 					{
 						ContentSwappedWithThumbnailFeedback.FireUpdate();
+                        OnLayoutInfoChanged();
 						break;
 					}
 					case "Style":
 					{
 						LocalLayoutFeedback.FireUpdate();
+                        OnLayoutInfoChanged();
 						break;
 					}
 					case "Size":
@@ -597,6 +604,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				}
 			};
 
+            Configuration.Call.Lock.PropertyChanged += (o, a) =>
+                {
+                    if (a.PropertyName == "Enable")
+                    {
+                        MeetingIsLockedFeedback.FireUpdate();
+                        MeetingInfo = new MeetingInfo
+                            (
+                                MeetingInfo.Id, 
+                                MeetingInfo.Name, 
+                                MeetingInfo.Host,
+                                MeetingInfo.Password,
+                                GetSharingStatus(), 
+                                MeetingInfo.IsHost, 
+                                MeetingInfo.IsSharingMeeting, 
+                                MeetingInfo.WaitingForHost, 
+                                MeetingIsLockedFeedback.BoolValue
+                            );
+                    }
+                };
+
 			// This is to deal with incorrect object structure coming back from the Zoom Room on v 5.6.3
 			Configuration.Client.Call.Layout.PropertyChanged += (o, a) =>
 			{
@@ -613,11 +640,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					case "ShareThumb":
 					{
 						ContentSwappedWithThumbnailFeedback.FireUpdate();
+                        OnLayoutInfoChanged();
 						break;
 					}
 					case "Style":
 					{
 						LocalLayoutFeedback.FireUpdate();
+                        OnLayoutInfoChanged();
 						break;
 					}
 				}
@@ -634,13 +663,31 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			Status.Call.PropertyChanged += (o, a) =>
 			{
-				if (a.PropertyName == "Info")
+                switch(a.PropertyName)
+                {
+                    case "Info":
 				{
 					Debug.Console(1, this, "Updating Call Status");
 					UpdateCallStatus();
+                    break;
 				}
+
+                case "Status":
+                    {
+                        UpdateCallStatus();
+                        break;
+                    }
+                    }
 			};
 
+            Status.Call.CallRecordInfo.PropertyChanged += (o, a) =>
+                {
+                    if (a.PropertyName == "meetingIsBeingRecorded")
+                    {
+                        MeetingIsRecordingFeedback.FireUpdate();
+                    }
+                };
+
 			Status.Sharing.PropertyChanged += (o, a) =>
 			{
 				switch (a.PropertyName)
@@ -663,7 +710,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                                 return;
                             }
                             // Update the share status of the meeting info
-                            var meetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, MeetingInfo.Host, MeetingInfo.Password, GetSharingStatus(), GetIsHostMyself(), MeetingInfo.IsSharingMeeting, MeetingInfo.WaitingForHost);
+                            var meetingInfo = new MeetingInfo(MeetingInfo.Id, 
+                                MeetingInfo.Name, 
+                                MeetingInfo.Host, 
+                                MeetingInfo.Password, 
+                                GetSharingStatus(), 
+                                GetIsHostMyself(), 
+                                MeetingInfo.IsSharingMeeting, 
+                                MeetingInfo.WaitingForHost, 
+                                MeetingIsLockedFeedback.BoolValue);
                             MeetingInfo = meetingInfo;
                             break;
                         }
@@ -714,13 +769,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 						LayoutViewIsOnLastPageFeedback.FireUpdate();
 						break;
 					}
-						//case "video_type":
-						//    {
-						//        It appears as though the actual value we want to watch is Configuration.Call.Layout.Style
-						//        LocalLayoutFeedback.FireUpdate();
-						//        break;
-						//    }
+                    case "can_Switch_Floating_Share_Content":
+                    {
+                        CanSwapContentWithThumbnailFeedback.FireUpdate();
+                        break;
+                    }
 				}
+                OnLayoutInfoChanged();
 			};
 
 			Status.NumberOfScreens.PropertyChanged += (o, a) =>
@@ -1244,7 +1299,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 								Participants.CurrentParticipants = participants;
 
                                 // Update the share status of the meeting info
-                                var meetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, Participants.Host.Name, MeetingInfo.Password, MeetingInfo.ShareStatus, GetIsHostMyself(), MeetingInfo.IsSharingMeeting, MeetingInfo.WaitingForHost);
+                                var meetingInfo = new MeetingInfo(
+                                    MeetingInfo.Id, 
+                                    MeetingInfo.Name, 
+                                    Participants.Host.Name, 
+                                    MeetingInfo.Password, 
+                                    MeetingInfo.ShareStatus, 
+                                    GetIsHostMyself(), 
+                                    MeetingInfo.IsSharingMeeting, 
+                                    MeetingInfo.WaitingForHost, 
+                                    MeetingIsLockedFeedback.BoolValue);
                                 MeetingInfo = meetingInfo;
 
 								PrintCurrentCallParticipants();
@@ -1446,21 +1510,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 							{
                                 Status.NeedWaitForHost = JsonConvert.DeserializeObject<zEvent.NeedWaitForHost>(responseObj.ToString());
 
-							    Debug.Console(1, this, "NeedWaitForHost: {0}", Status.NeedWaitForHost.Wait);
+							    Debug.Console(1, this, "WaitingForHost: {0}", Status.NeedWaitForHost.Wait);
 
                                 if (Status.NeedWaitForHost.Wait)
 							    {
 							        if (MeetingInfo == null)
 							        {
 							            MeetingInfo = new MeetingInfo("Waiting For Host", "Waiting For Host", "Waiting For Host", "",
-							                GetSharingStatus(), false, false, true);
+                                            GetSharingStatus(), false, false, true, MeetingIsLockedFeedback.BoolValue);
 
                                         UpdateCallStatus();
 							            break;
 							        }
 
                                     MeetingInfo = new MeetingInfo("Waiting For Host", "Waiting For Host", "Waiting For Host", "",
-							            GetSharingStatus(), false, false, true);
+                                        GetSharingStatus(), false, false, true, MeetingIsLockedFeedback.BoolValue);
 
 							        UpdateCallStatus();
 
@@ -1470,12 +1534,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 							    if (MeetingInfo == null)
 							    {
 							        MeetingInfo = new MeetingInfo("Waiting For Host", "Waiting For Host", "Waiting For Host", "",
-							            GetSharingStatus(), false, false, false);
+                                        GetSharingStatus(), false, false, false, MeetingIsLockedFeedback.BoolValue);
 							        break;
 							    }
 
 							    MeetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, MeetingInfo.Host, MeetingInfo.Password,
-							        GetSharingStatus(), GetIsHostMyself(), false, false);
+                                    GetSharingStatus(), GetIsHostMyself(), false, false, MeetingIsLockedFeedback.BoolValue);
 
 							    break;
 							}
@@ -1559,7 +1623,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 						        if (result.Success)
 						        {
-						            MeetingInfo = new MeetingInfo("", "", "", "", "", true, true, MeetingInfo.WaitingForHost);
+                                    MeetingInfo = new MeetingInfo("", "", "", "", "", true, true, MeetingInfo.WaitingForHost, MeetingIsLockedFeedback.BoolValue);
 						            break;
 						        }
 
@@ -1904,6 +1968,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                     GetSharingStatus(),
                     GetIsHostMyself(),
                     !String.Equals(Status.Call.Info.meeting_type,"NORMAL"),
+                    false,
+                    MeetingIsLockedFeedback.BoolValue
+                    );
+            }
+            // TODO [ ] Issue #868
+            else if (item.Status == eCodecCallStatus.Disconnected)
+            {
+                MeetingInfo = new MeetingInfo(
+                    string.Empty,
+                    string.Empty,
+                    string.Empty,
+                    string.Empty,
+                    string.Empty,
+                    false,
+                    false,
+                    false,
                     false
                     );
             }
@@ -2132,16 +2212,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			var layoutsCodec = this as IHasZoomRoomLayouts;
 			if (layoutsCodec != null)
 			{
-				layoutsCodec.AvailableLayoutsChanged += (o, a) =>
+				layoutsCodec.LayoutInfoChanged += (o, a) =>
 				{
-					trilist.SetBool(joinMap.LayoutGalleryIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Gallery
-					                                                             ==
-					                                                             (a.AvailableLayouts &
-					                                                              zConfiguration.eLayoutStyle.Gallery));
-					trilist.SetBool(joinMap.LayoutSpeakerIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Speaker
-					                                                             ==
-					                                                             (a.AvailableLayouts &
-					                                                              zConfiguration.eLayoutStyle.Speaker));
+					trilist.SetBool(joinMap.LayoutGalleryIsAvailable.JoinNumber, 
+                        zConfiguration.eLayoutStyle.Gallery == (a.AvailableLayouts & zConfiguration.eLayoutStyle.Gallery));
+
+					trilist.SetBool(joinMap.LayoutSpeakerIsAvailable.JoinNumber, 
+                        zConfiguration.eLayoutStyle.Speaker == (a.AvailableLayouts & zConfiguration.eLayoutStyle.Speaker));
+					                                                             
+					                                                             
+					                                                              
 					trilist.SetBool(joinMap.LayoutStripIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Strip
 					                                                           ==
 					                                                           (a.AvailableLayouts & zConfiguration.eLayoutStyle.Strip));
@@ -2196,7 +2276,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				trilist.SetUShortSigAction(joinMap.ScreenIndexToPinUserTo.JoinNumber, (u) => ScreenIndexToPinUserTo = u);
 			}
 
-			// TODO: #714 [ ] LinkZoomRoomToApi >> layoutSizeCoodec
 			var layoutSizeCodec = this as IHasSelfviewSize;
 			if (layoutSizeCodec != null)
 			{
@@ -2218,6 +2297,75 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				layoutSizeCodec.SelfviewPipSizeFeedback.LinkInputSig(trilist.StringInput[joinMap.GetSetSelfviewPipSize.JoinNumber]);
 			}
 
+		    PasswordRequired += (device, args) =>
+		    {
+		        if (args.LoginAttemptCancelled)
+		        {
+		            trilist.SetBool(joinMap.ShowPasswordPrompt.JoinNumber, false);
+		            return;
+		        }
+
+		        if (!string.IsNullOrEmpty(args.Message))
+		        {
+		            trilist.SetString(joinMap.PasswordPromptMessage.JoinNumber, args.Message);
+		        }
+
+		        if (args.LoginAttemptFailed)
+		        {
+                    trilist.SetBool(joinMap.PasswordLoginFailed.JoinNumber, true);
+		            return;
+		        }                
+
+                trilist.SetBool(joinMap.ShowPasswordPrompt.JoinNumber, true);
+		    };
+
+		    MeetingInfoChanged += (device, args) =>
+		    {
+                trilist.SetString(joinMap.MeetingInfoId.JoinNumber, args.Info.Id);
+                trilist.SetString(joinMap.MeetingInfoHost.JoinNumber, args.Info.Host);
+                trilist.SetString(joinMap.MeetingInfoPassword.JoinNumber, args.Info.Password);
+		        trilist.SetBool(joinMap.IsHost.JoinNumber, args.Info.IsHost);
+		        trilist.SetBool(joinMap.ShareOnlyMeeting.JoinNumber, args.Info.IsSharingMeeting);
+                trilist.SetBool(joinMap.WaitingForHost.JoinNumber, args.Info.WaitingForHost);
+                //trilist.SetString(joinMap.CurrentSource.JoinNumber, args.Info.ShareStatus);
+		    };
+
+		    trilist.SetSigTrueAction(joinMap.StartMeetingNow.JoinNumber, () => StartMeeting(0));
+		    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);
+			PasswordRequired += (devices, args) =>
+			{
+				if (args.LoginAttemptCancelled)
+				{
+					trilist.SetBool(joinMap.ShowPasswordPrompt.JoinNumber, false);
+					return;
+				}
+
+				if (!string.IsNullOrEmpty(args.Message))
+				{
+					trilist.SetString(joinMap.PasswordPromptMessage.JoinNumber, args.Message);
+				}
+
+				if (args.LoginAttemptFailed)
+				{
+					// login attempt failed
+					return;
+				}
+
+				trilist.SetBool(joinMap.PasswordIncorrect.JoinNumber, args.LastAttemptWasIncorrect);
+				trilist.SetBool(joinMap.ShowPasswordPrompt.JoinNumber, true);
+			};
+
 			trilist.OnlineStatusChange += (device, args) =>
 			{
 				if (!args.DeviceOnLine) return;
@@ -2334,6 +2482,56 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
+        /// <summary>
+        /// Invites contacts to a new meeting for a specified duration
+        /// </summary>
+        /// <param name="contacts"></param>
+        /// <param name="duration"></param>
+        public void InviteContactsToNewMeeting(List<InvitableDirectoryContact> contacts, uint duration)
+        {
+            if(duration == 0)
+            {
+                duration = DefaultMeetingDurationMin;
+            }
+
+            StringBuilder message = new StringBuilder();
+
+            // Add the prefix
+            message.Append(string.Format("zCommand Invite Duration: {0}", duration));
+
+            // Add each invitee
+            foreach (var contact in contacts)
+            {
+                var invitee = string.Format(" user: {0}", contact.ContactId);
+
+                message.Append(invitee);
+            }
+
+            SendText(message.ToString());
+        }
+
+        /// <summary>
+        /// Invites contacts to an existing meeting
+        /// </summary>
+        /// <param name="contacts"></param>
+        public void InviteContactsToExistingMeeting(List<InvitableDirectoryContact> contacts)
+        {
+            StringBuilder message = new StringBuilder();
+
+            // Add the prefix
+            message.Append(string.Format("zCommand Call Invite"));
+
+            // Add each invitee
+            foreach (var contact in contacts)
+            {
+                var invitee = string.Format(" user: {0}", contact.ContactId);
+
+                message.Append(invitee);
+            }
+
+            SendText(message.ToString());
+        }
+
 
         /// <summary>
         /// Starts a PMI Meeting for the specified duration (or default meeting duration if 0 is specified)
@@ -2469,10 +2667,25 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public CodecParticipants Participants { get; private set; }
 
+        public void RemoveParticipant(int userId)
+        {
+            SendText(string.Format("zCommand Call Expel Id: {0}", userId));
+        }
+
+        public void SetParticipantAsHost(int userId)
+        {
+            SendText(string.Format("zCommand Call HostChange Id: {0}", userId));
+        }
+
 		#endregion
 
 		#region IHasParticipantAudioMute Members
 
+        public void MuteAudioForAllParticipants()
+        {
+            SendText(string.Format("zCommand Call MuteAll Mute: on"));
+        }
+
 		public void MuteAudioForParticipant(int userId)
 		{
 			SendText(string.Format("zCommand Call MuteParticipant Mute: on Id: {0}", userId));
@@ -2770,7 +2983,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		#region IHasZoomRoomLayouts Members
 
-		public event EventHandler<LayoutInfoChangedEventArgs> AvailableLayoutsChanged;
+		public event EventHandler<LayoutInfoChangedEventArgs> LayoutInfoChanged;
 
 		private Func<bool> LayoutViewIsOnFirstPageFeedbackFunc
 		{
@@ -2836,15 +3049,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			Debug.Console(1, this, "availablelayouts: {0}", availableLayouts);
 
-			var handler = AvailableLayoutsChanged;
-			if (handler != null)
-			{
-				handler(this, new LayoutInfoChangedEventArgs() {AvailableLayouts = availableLayouts});
-			}
-
 			AvailableLayouts = availableLayouts;
 		}
 
+        private void OnLayoutInfoChanged()
+        {
+            var handler = LayoutInfoChanged;
+            if (handler != null)
+            {
+                handler(this, new LayoutInfoChangedEventArgs()
+                {
+                    AvailableLayouts = AvailableLayouts,
+                    CurrentSelectedLayout = (zConfiguration.eLayoutStyle)Enum.Parse(typeof(zConfiguration.eLayoutStyle),LocalLayoutFeedback.StringValue, true),
+                    LayoutViewIsOnFirstPage = LayoutViewIsOnFirstPageFeedback.BoolValue,
+                    LayoutViewIsOnLastPage = LayoutViewIsOnLastPageFeedback.BoolValue,
+                    CanSwapContentWithThumbnail = CanSwapContentWithThumbnailFeedback.BoolValue,
+                    ContentSwappedWithThumbnail = ContentSwappedWithThumbnailFeedback.BoolValue,
+                });
+            }
+        }
+
 		public void GetAvailableLayouts()
 		{
 			SendText("zStatus Call Layout");
@@ -3034,7 +3258,63 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 	    }
 
 	    #endregion
-	}
+
+        #region IHasMeetingLock Members
+
+        public BoolFeedback MeetingIsLockedFeedback { get; private set; }
+
+        public void LockMeeting()
+        {
+            SendText(string.Format("zConfiguration Call Lock Enable: on"));
+        }
+
+        public void UnLockMeeting()
+        {
+            SendText(string.Format("zConfiguration Call Lock Enable: off"));
+        }
+
+        public void ToggleMeetingLock()
+        {
+            if (MeetingIsLockedFeedback.BoolValue)
+            {
+                UnLockMeeting();
+            }
+            else
+            {
+                LockMeeting();
+            }
+        }
+
+        #endregion
+
+        #region IHasMeetingRecording Members
+
+        public BoolFeedback MeetingIsRecordingFeedback { get; private set; }
+
+        public void StartRecording()
+        {
+            SendText(string.Format("Command Call Record Enable: on"));
+        }
+
+        public void StopRecording()
+        {
+            SendText(string.Format("Command Call Record Enable: off"));
+        }
+
+        public void ToggleRecording()
+        {
+            if (MeetingIsRecordingFeedback.BoolValue)
+            {
+                StopRecording();
+            }
+            else
+            {
+                StartRecording();
+            }
+        }
+
+        #endregion
+    }
 
 	/// <summary>
 	/// Zoom Room specific info object
@@ -3047,8 +3327,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			Configuration = configuration;
 		}
 
+        [JsonIgnore]
 		public ZoomRoomStatus Status { get; private set; }
-		public ZoomRoomConfiguration Configuration { get; private set; }
+        [JsonIgnore]
+        public ZoomRoomConfiguration Configuration { get; private set; }
 
 		public override bool AutoAnswerEnabled
 		{

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

@@ -1,301 +1,496 @@
-using System;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges.JoinMaps;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
-{
-	public class ZoomRoomJoinMap : VideoCodecControllerJoinMap
-	{
-		#region Digital
-
-		[JoinName("CanSwapContentWithThumbnail")]
-		public JoinDataComplete CanSwapContentWithThumbnail = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 206,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "FB Indicates if content can be swapped with thumbnail",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-		[JoinName("SwapContentWithThumbnail")]
-		public JoinDataComplete SwapContentWithThumbnail = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 206,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Pulse to swap content with thumbnail.  FB reports current state",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-		[JoinName("GetAvailableLayouts")]
-		public JoinDataComplete GetAvailableLayouts = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 215,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Gets the available layouts.  Will update the LayoutXXXXXIsAvailbale signals.",
-				JoinCapabilities = eJoinCapabilities.FromSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-		[JoinName("LayoutIsOnFirstPage")]
-		public JoinDataComplete LayoutIsOnFirstPage = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 216,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Indicates if layout is on first page",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-		[JoinName("LayoutIsOnLastPage")]
-		public JoinDataComplete LayoutIsOnLastPage = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 217,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Indicates if layout is on first page",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-		[JoinName("LayoutTurnToNextPage")]
-		public JoinDataComplete LayoutTurnToNextPage = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 216,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Turns layout view to next page",
-				JoinCapabilities = eJoinCapabilities.FromSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-		[JoinName("LayoutTurnToPreviousPage")]
-		public JoinDataComplete LayoutTurnToPreviousPage = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 217,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Turns layout view to previous page",
-				JoinCapabilities = eJoinCapabilities.FromSIMPL,
-				JoinType = eJoinType.Digital
-			});	
-
-		[JoinName("LayoutGalleryIsAvailable")]
-		public JoinDataComplete LayoutGalleryIsAvailable = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 221,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "FB Indicates if layout 'Gallery' is available",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.DigitalSerial
-			});
-
-		[JoinName("LayoutSpeakerIsAvailable")]
-		public JoinDataComplete LayoutSpeakerIsAvailable = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 222,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "FB Indicates if layout 'Speaker' is available",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.DigitalSerial
-			});
-
-		[JoinName("LayoutStripIsAvailable")]
-		public JoinDataComplete LayoutStripIsAvailable = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 223,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "FB Indicates if layout 'Strip' is available",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.DigitalSerial
-			});
-
-		[JoinName("LayoutShareAllIsAvailable")]
-		public JoinDataComplete LayoutShareAllIsAvailable = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 224,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "FB Indicates if layout 'ShareAll' is available",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.DigitalSerial
-			});		
-
-		// TODO: #714 [ ] JoinMap >> SelfivewPipSizeToggle
-		[JoinName("SelfviewPipSizeToggle")]
-		public JoinDataComplete SelfviewPipSizeToggle = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 231,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Toggles the selfview pip size, (aka layout size)",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Digital
-			});		
-
-        //[JoinName("ParticipantAudioMuteToggleStart")]
-        //public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
-        //    new JoinData
-        //    {
-        //        JoinNumber = 500,
-        //        JoinSpan = 100
-        //    },
-        //    new JoinMetadata
-        //    {
-        //        Description = "Toggles the participant's audio mute status",
-        //        JoinCapabilities = eJoinCapabilities.ToSIMPL,
-        //        JoinType = eJoinType.Digital
-        //    });
-
-        //[JoinName("ParticipantVideoMuteToggleStart")]
-        //public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
-        //    new JoinData
-        //    {
-        //        JoinNumber = 800,
-        //        JoinSpan = 100
-        //    },
-        //    new JoinMetadata
-        //    {
-        //        Description = "Toggles the participant's video mute status",
-        //        JoinCapabilities = eJoinCapabilities.ToSIMPL,
-        //        JoinType = eJoinType.Digital
-        //    });
-
-        //[JoinName("ParticipantPinToggleStart")]
-        //public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
-        //    new JoinData
-        //    {
-        //        JoinNumber = 1100,
-        //        JoinSpan = 100
-        //    },
-        //    new JoinMetadata
-        //    {
-        //        Description = "Toggles the participant's pin status",
-        //        JoinCapabilities = eJoinCapabilities.ToSIMPL,
-        //        JoinType = eJoinType.Digital
-        //    });
-
-		#endregion
-
-
-		#region Analog
-
-		[JoinName("NumberOfScreens")]
-		public JoinDataComplete NumberOfScreens = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 11,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Reports the number of screens connected",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Analog
-			});
-
-		[JoinName("ScreenIndexToPinUserTo")]
-		public JoinDataComplete ScreenIndexToPinUserTo = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 11,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Specifies the screen index a participant should be pinned to",
-				JoinCapabilities = eJoinCapabilities.FromSIMPL,
-				JoinType = eJoinType.Analog
-			});
-
-		#endregion
-
-
-		#region Serials
-
-		[JoinName("GetSetCurrentLayout")]
-		public JoinDataComplete GetSetCurrentLayout = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 215,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Sets and reports the current layout.  Use the LayoutXXXXIsAvailable signals to determine valid layouts",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Serial
-			});
-
-		// TODO: #714 [ ] JoinMap >> GetSetSelfviewPipSize
-		[JoinName("GetSetSelfviewPipSize")]
-		public JoinDataComplete GetSetSelfviewPipSize = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 230,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Sets and reports the selfview pip size, (aka layout size).",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.DigitalSerial
-			});
-
-		#endregion
-
-		public ZoomRoomJoinMap(uint joinStart)
-			: base(joinStart, typeof(ZoomRoomJoinMap))
-		{
-		}
-
-		public ZoomRoomJoinMap(uint joinStart, Type type)
-			: base(joinStart, type)
-		{
-		}
-	}
+using System;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges.JoinMaps;
+
+namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
+{
+	public class ZoomRoomJoinMap : VideoCodecControllerJoinMap
+	{
+		#region Digital
+
+        // TODO [ ] Issue #868
+        [JoinName("ShowPasswordPrompt")]
+        public JoinDataComplete ShowPasswordPrompt = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 6,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "FB Indicates to show the password prompt",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        // TODO [ ] Issue #868
+        [JoinName("PasswordIncorrect")]
+        public JoinDataComplete PasswordIncorrect = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 7,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "FB Indicates the password entered is incorrect",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        // TODO [ ] Issue #868
+        [JoinName("PassowrdLoginFailed")]
+        public JoinDataComplete PasswordLoginFailed = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 8,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "FB Indicates the password entered is incorrect",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        // TODO [ ] Issue #868
+        [JoinName("WaitingForHost")]
+        public JoinDataComplete WaitingForHost = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 9,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "FB Indicates system is waiting for host",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        // TODO [ ] Issue #868
+        [JoinName("IsHost")]
+        public JoinDataComplete IsHost = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 10,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "FB Indicates system is the host",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        // TODO [ ] Issue #868
+        [JoinName("StartMeetingNow")]
+        public JoinDataComplete StartMeetingNow = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 25,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "FB Indicates the password prompt is active",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        // TODO [ ] Issue #868
+        [JoinName("ShareOnlyMeeting")]
+        public JoinDataComplete ShareOnlyMeeting = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 26,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Triggers a share only meeting, feedback indicates the current meeting is share only",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        // TODO [ ] Issue #868
+        [JoinName("StartNormalMeetingFromSharingOnlyMeeting")]
+        public JoinDataComplete StartNormalMeetingFromSharingOnlyMeeting = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 27,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Starts a normal meeting from a share only meeting",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+		[JoinName("CanSwapContentWithThumbnail")]
+		public JoinDataComplete CanSwapContentWithThumbnail = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 206,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "FB Indicates if content can be swapped with thumbnail",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		[JoinName("SwapContentWithThumbnail")]
+		public JoinDataComplete SwapContentWithThumbnail = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 206,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Pulse to swap content with thumbnail.  FB reports current state",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		[JoinName("GetAvailableLayouts")]
+		public JoinDataComplete GetAvailableLayouts = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 215,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Gets the available layouts.  Will update the LayoutXXXXXIsAvailbale signals.",
+				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		[JoinName("LayoutIsOnFirstPage")]
+		public JoinDataComplete LayoutIsOnFirstPage = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 216,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Indicates if layout is on first page",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		[JoinName("LayoutIsOnLastPage")]
+		public JoinDataComplete LayoutIsOnLastPage = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 217,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Indicates if layout is on first page",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		[JoinName("LayoutTurnToNextPage")]
+		public JoinDataComplete LayoutTurnToNextPage = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 216,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Turns layout view to next page",
+				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		[JoinName("LayoutTurnToPreviousPage")]
+		public JoinDataComplete LayoutTurnToPreviousPage = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 217,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Turns layout view to previous page",
+				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinType = eJoinType.Digital
+			});	
+
+		[JoinName("LayoutGalleryIsAvailable")]
+		public JoinDataComplete LayoutGalleryIsAvailable = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 221,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "FB Indicates if layout 'Gallery' is available",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.DigitalSerial
+			});
+
+		[JoinName("LayoutSpeakerIsAvailable")]
+		public JoinDataComplete LayoutSpeakerIsAvailable = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 222,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "FB Indicates if layout 'Speaker' is available",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.DigitalSerial
+			});
+
+		[JoinName("LayoutStripIsAvailable")]
+		public JoinDataComplete LayoutStripIsAvailable = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 223,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "FB Indicates if layout 'Strip' is available",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.DigitalSerial
+			});
+
+		[JoinName("LayoutShareAllIsAvailable")]
+		public JoinDataComplete LayoutShareAllIsAvailable = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 224,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "FB Indicates if layout 'ShareAll' is available",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.DigitalSerial
+			});		
+
+		// TODO: #714 [ ] JoinMap >> SelfivewPipSizeToggle
+		[JoinName("SelfviewPipSizeToggle")]
+		public JoinDataComplete SelfviewPipSizeToggle = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 231,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Toggles the selfview pip size, (aka layout size)",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});		
+
+        //[JoinName("ParticipantAudioMuteToggleStart")]
+        //public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
+        //    new JoinData
+        //    {
+        //        JoinNumber = 500,
+        //        JoinSpan = 100
+        //    },
+        //    new JoinMetadata
+        //    {
+        //        Description = "Toggles the participant's audio mute status",
+        //        JoinCapabilities = eJoinCapabilities.ToSIMPL,
+        //        JoinType = eJoinType.Digital
+        //    });
+
+        //[JoinName("ParticipantVideoMuteToggleStart")]
+        //public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
+        //    new JoinData
+        //    {
+        //        JoinNumber = 800,
+        //        JoinSpan = 100
+        //    },
+        //    new JoinMetadata
+        //    {
+        //        Description = "Toggles the participant's video mute status",
+        //        JoinCapabilities = eJoinCapabilities.ToSIMPL,
+        //        JoinType = eJoinType.Digital
+        //    });
+
+        //[JoinName("ParticipantPinToggleStart")]
+        //public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
+        //    new JoinData
+        //    {
+        //        JoinNumber = 1100,
+        //        JoinSpan = 100
+        //    },
+        //    new JoinMetadata
+        //    {
+        //        Description = "Toggles the participant's pin status",
+        //        JoinCapabilities = eJoinCapabilities.ToSIMPL,
+        //        JoinType = eJoinType.Digital
+        //    });
+
+		#endregion
+
+
+		#region Analog
+
+		[JoinName("NumberOfScreens")]
+		public JoinDataComplete NumberOfScreens = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 11,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Reports the number of screens connected",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Analog
+			});
+
+		[JoinName("ScreenIndexToPinUserTo")]
+		public JoinDataComplete ScreenIndexToPinUserTo = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 11,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Specifies the screen index a participant should be pinned to",
+				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinType = eJoinType.Analog
+			});
+
+		#endregion
+
+
+		#region Serials
+
+        // TODO [ ] Issue #868
+        [JoinName("SubmitPassword")]
+        public JoinDataComplete SubmitPassword = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 6,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Submit password text",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        // TODO [ ] Issue #868
+        [JoinName("PasswordPromptMessage")]
+        public JoinDataComplete PasswordPromptMessage = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 6,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Password prompt message",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        // TODO [ ] Issue #868
+        [JoinName("MeetingInfoId")]
+        public JoinDataComplete MeetingInfoId = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 11,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Meeting info ID text feedback",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        // TODO [ ] Issue #868
+        [JoinName("MeetingInfoHostt")]
+        public JoinDataComplete MeetingInfoHost = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 12,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Meeting info Host text feedback",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        // TODO [ ] Issue #868
+        [JoinName("MeetingInfoPassword")]
+        public JoinDataComplete MeetingInfoPassword = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 13,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Meeting info Password text feedback",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+		[JoinName("GetSetCurrentLayout")]
+		public JoinDataComplete GetSetCurrentLayout = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 215,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets and reports the current layout.  Use the LayoutXXXXIsAvailable signals to determine valid layouts",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Serial
+			});
+
+		// TODO: #714 [ ] JoinMap >> GetSetSelfviewPipSize
+		[JoinName("GetSetSelfviewPipSize")]
+		public JoinDataComplete GetSetSelfviewPipSize = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 230,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets and reports the selfview pip size, (aka layout size).",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.DigitalSerial
+			});
+
+		#endregion
+
+		public ZoomRoomJoinMap(uint joinStart)
+			: base(joinStart, typeof(ZoomRoomJoinMap))
+		{
+		}
+
+		public ZoomRoomJoinMap(uint joinStart, Type type)
+			: base(joinStart, type)
+		{
+		}
+	}
 }