Changes print message for stream debug to avoid exceptions seen with com port debugging. Updates PepperDash Core to fix keyNotFound exception when stream debugging

Merge pull request #447 from PepperDash/bugfix/card-cage-iteration-fix
Bugfix/card cage iteration fix
2026-01-28 11:54:57 +00:00 · 2020-10-15 20:02:22 -04:00 · 2020-10-15 12:41:35 -06:00 · 2020-10-15 12:36:14 -04:00 · 2020-10-13 18:11:45 -05:00 · 2020-10-13 16:15:04 -05:00
15 changed files with 938 additions and 272 deletions
--- a/Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
+++ b/Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
@@ -36,6 +36,15 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                    JoinType = eJoinType.Digital
                });

+        [JoinName("CameraLayoutStringFb")] public JoinDataComplete CameraLayoutStringFb =
+            new JoinDataComplete(new JoinData {JoinNumber = 141, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Current Layout Fb",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
        [JoinName("CameraModeAuto")] public JoinDataComplete CameraModeAuto =
            new JoinDataComplete(new JoinData {JoinNumber = 131, JoinSpan = 1},
                new JoinMetadata
@@ -90,6 +99,15 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                    JoinType = eJoinType.Digital
                });

+        [JoinName("CameraPresetNames")] public JoinDataComplete CameraPresetNames =
+            new JoinDataComplete(new JoinData {JoinNumber = 121, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Preset Names - XSIG, max of 15",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
        [JoinName("CameraPresetSelect")] public JoinDataComplete CameraPresetSelect =
            new JoinDataComplete(new JoinData {JoinNumber = 121, JoinSpan = 1},
                new JoinMetadata
@@ -99,13 +117,13 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                    JoinType = eJoinType.Analog
                });

-        [JoinName("CameraPresetNames")] public JoinDataComplete CameraPresetNames =
+        [JoinName("CameraPresetSave")] public JoinDataComplete CameraPresetSave =
            new JoinDataComplete(new JoinData {JoinNumber = 121, JoinSpan = 1},
                new JoinMetadata
                {
-                    Description = "Camera Preset Names - XSIG, max of 15",
-                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                    JoinType = eJoinType.Serial
+                    Description = "Save Selected Preset",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
                });

        [JoinName("CameraSelfView")] public JoinDataComplete CameraSelfView =
@@ -189,15 +207,53 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                    JoinType = eJoinType.Serial
                });

-        [JoinName("DirectoryHasChanged")] public JoinDataComplete DirectoryHasChanged =
-            new JoinDataComplete(new JoinData {JoinNumber = 103, JoinSpan = 1},
+        [JoinName("CurrentParticipants")] public JoinDataComplete CurrentParticipants =
+            new JoinDataComplete(new JoinData {JoinNumber = 151, JoinSpan = 1},
+                new JoinMetadata()
+                {
+                    Description = "Current Participants XSig",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("CurrentSource")] public JoinDataComplete CurrentSource =
+            new JoinDataComplete(new JoinData {JoinNumber = 201, JoinSpan = 1},
                new JoinMetadata
                {
-                    Description = "Directory has changed FB",
+                    Description = "Current Source",
                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("DialMeeting1")] public JoinDataComplete DialMeeting1 =
+            new JoinDataComplete(new JoinData {JoinNumber = 161, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Join first meeting",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
                    JoinType = eJoinType.Digital
                });

+        [JoinName("DialMeeting2")]
+        public JoinDataComplete DialMeeting2 =
+            new JoinDataComplete(new JoinData { JoinNumber = 162, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Join second meeting",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("DialMeeting3")]
+        public JoinDataComplete DialMeeting3 =
+            new JoinDataComplete(new JoinData { JoinNumber = 163, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Join third meeting",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
        [JoinName("DirectoryDialSelectedLine")] public JoinDataComplete DirectoryDialSelectedLine =
            new JoinDataComplete(new JoinData {JoinNumber = 106, JoinSpan = 1},
                new JoinMetadata
@@ -252,6 +308,15 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                    JoinType = eJoinType.Digital
                });

+        [JoinName("DirectoryHasChanged")] public JoinDataComplete DirectoryHasChanged =
+            new JoinDataComplete(new JoinData {JoinNumber = 103, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory has changed FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
        [JoinName("DirectoryIsRoot")] public JoinDataComplete DirectoryIsRoot =
            new JoinDataComplete(new JoinData {JoinNumber = 102, JoinSpan = 1},
                new JoinMetadata
@@ -495,37 +560,12 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                    JoinType = eJoinType.Digital
                });

-        [JoinName("SpeedDialStart")] public JoinDataComplete SpeedDialStart =
-            new JoinDataComplete(new JoinData {JoinNumber = 41, JoinSpan = 4},
+
+        [JoinName("ManualDial")] public JoinDataComplete ManualDial =
+            new JoinDataComplete(new JoinData {JoinNumber = 71, JoinSpan = 1},
                new JoinMetadata
                {
-                    Description = "Speed Dial",
-                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("Schedule")] public JoinDataComplete Schedule =
-            new JoinDataComplete(new JoinData {JoinNumber = 102, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Schedule Data - XSIG",
-                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                    JoinType = eJoinType.Serial
-                });
-
-        [JoinName("DialMeeting")] public JoinDataComplete DialMeeting = new JoinDataComplete(new JoinData{JoinNumber=161, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Join first joinable meeting",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("UpdateMeetings")] public JoinDataComplete UpdateMeetings =
-            new JoinDataComplete(new JoinData {JoinNumber = 162, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Update Meetings",
+                    Description = "Dial manual string",
                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
                    JoinType = eJoinType.Digital
                });
@@ -539,82 +579,15 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                    JoinType = eJoinType.Analog
                });

-
-        [JoinName("CameraLayoutStringFb")]
-        public JoinDataComplete CameraLayoutStringFb =
-            new JoinDataComplete(new JoinData { JoinNumber = 141, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Current Layout Fb",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        
-        
-
-        [JoinName("ManualDial")] public JoinDataComplete ManualDial =
-            new JoinDataComplete(new JoinData {JoinNumber = 71, JoinSpan = 1},
+        [JoinName("MicMuteOff")] public JoinDataComplete MicMuteOff =
+            new JoinDataComplete(new JoinData {JoinNumber = 172, JoinSpan = 1},
                new JoinMetadata
                {
-                    Description = "Dial manual string",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("SourceShareStart")] public JoinDataComplete SourceShareStart =
-            new JoinDataComplete(new JoinData {JoinNumber = 201, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Start Sharing & Feedback",
+                    Description = "Mic Mute Off",
                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                    JoinType = eJoinType.Digital
                });

-        [JoinName("SourceShareEnd")]
-        public JoinDataComplete SourceShareEnd =
-            new JoinDataComplete(new JoinData { JoinNumber = 202, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Stop Sharing & Feedback",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("AutoShareWhileInCall")] public JoinDataComplete SourceShareAutoStart =
-            new JoinDataComplete(new JoinData {JoinNumber = 203, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "When high, will autostart sharing when a call is joined",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("CurrentSource")] public JoinDataComplete CurrentSource = new JoinDataComplete(new JoinData{JoinNumber = 201, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Current Source",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("CurrentParticipants")] public JoinDataComplete CurrentParticipants =
-            new JoinDataComplete(new JoinData{JoinNumber = 151, JoinSpan = 1},
-                new JoinMetadata()
-                {
-                    Description = "Current Participants XSig",
-                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                    JoinType = eJoinType.Serial
-                });
-
-        [JoinName("ParticipantCount")] public JoinDataComplete ParticipantCount = new JoinDataComplete(new JoinData{JoinNumber = 151, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Current Participant Count",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
        [JoinName("MicMuteOn")] public JoinDataComplete MicMuteOn =
            new JoinDataComplete(new JoinData {JoinNumber = 171, JoinSpan = 1},
                new JoinMetadata
@@ -624,15 +597,6 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                    JoinType = eJoinType.Digital
                });

-        [JoinName("MicMuteOff")] public JoinDataComplete MicMuteOff =
-            new JoinDataComplete(new JoinData {JoinNumber = 172, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Mic Mute Off",
-                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
        [JoinName("MicMuteToggle")] public JoinDataComplete MicMuteToggle =
            new JoinDataComplete(new JoinData {JoinNumber = 173, JoinSpan = 1},
                new JoinMetadata
@@ -642,35 +606,150 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                    JoinType = eJoinType.Digital
                });

-        [JoinName("VolumeMuteOn")]
-        public JoinDataComplete VolumeMuteOn =
-            new JoinDataComplete(new JoinData { JoinNumber = 176, JoinSpan = 1 },
+        [JoinName("MinutesBeforeMeetingStart")] public JoinDataComplete MinutesBeforeMeetingStart =
+            new JoinDataComplete(new JoinData {JoinNumber = 41, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Minutes before meeting start that a meeting is joinable",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        [JoinName("ParticipantCount")] public JoinDataComplete ParticipantCount =
+            new JoinDataComplete(new JoinData {JoinNumber = 151, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Current Participant Count",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        [JoinName("Schedule")] public JoinDataComplete Schedule =
+            new JoinDataComplete(new JoinData {JoinNumber = 102, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Schedule Data - XSIG",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("AutoShareWhileInCall")] public JoinDataComplete SourceShareAutoStart =
+            new JoinDataComplete(new JoinData {JoinNumber = 203, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "When high, will autostart sharing when a call is joined",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("SourceShareEnd")] public JoinDataComplete SourceShareEnd =
+            new JoinDataComplete(new JoinData {JoinNumber = 202, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Stop Sharing & Feedback",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("SourceShareStart")] public JoinDataComplete SourceShareStart =
+            new JoinDataComplete(new JoinData {JoinNumber = 201, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Start Sharing & Feedback",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("RecievingContent")] public JoinDataComplete RecievingContent =
+            new JoinDataComplete(new JoinData {JoinNumber = 204, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Recieving content from the far end",
+                    JoinType = eJoinType.Digital,
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL
+                });
+
+        [JoinName("SelfviewPosition")] public JoinDataComplete SelfviewPosition =
+            new JoinDataComplete(new JoinData {JoinNumber = 211, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "advance selfview position",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("SelfviewPositionFb")]
+        public JoinDataComplete SelfviewPositionFb =
+            new JoinDataComplete(new JoinData { JoinNumber = 211, JoinSpan = 1 },
            new JoinMetadata
            {
-                Description = "Volume Mute On",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
+                Description = "advance selfview position",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
            });

-        [JoinName("VolumeMuteOff")]
-        public JoinDataComplete VolumeMuteOff =
-            new JoinDataComplete(new JoinData { JoinNumber = 177, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Volume Mute Off",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
+        [JoinName("SpeedDialStart")] public JoinDataComplete SpeedDialStart =
+            new JoinDataComplete(new JoinData {JoinNumber = 41, JoinSpan = 4},
+                new JoinMetadata
+                {
+                    Description = "Speed Dial",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });

-        [JoinName("VolumeMuteToggle")]
-        public JoinDataComplete VolumeMuteToggle =
-            new JoinDataComplete(new JoinData { JoinNumber = 178, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Volume Mute Toggle",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
+        [JoinName("UpdateMeetings")] public JoinDataComplete UpdateMeetings =
+            new JoinDataComplete(new JoinData {JoinNumber = 160, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Update Meetings",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("VolumeDown")] public JoinDataComplete VolumeDown =
+            new JoinDataComplete(new JoinData {JoinNumber = 175, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Volume Down",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("VolumeLevel")] public JoinDataComplete VolumeLevel =
+            new JoinDataComplete(new JoinData {JoinNumber = 174, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Volume Level",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        [JoinName("VolumeMuteOff")] public JoinDataComplete VolumeMuteOff =
+            new JoinDataComplete(new JoinData {JoinNumber = 177, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Volume Mute Off",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("VolumeMuteOn")] public JoinDataComplete VolumeMuteOn =
+            new JoinDataComplete(new JoinData {JoinNumber = 176, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Volume Mute On",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("VolumeMuteToggle")] public JoinDataComplete VolumeMuteToggle =
+            new JoinDataComplete(new JoinData {JoinNumber = 178, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Volume Mute Toggle",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });

        [JoinName("VolumeUp")] public JoinDataComplete VolumeUp =
            new JoinDataComplete(new JoinData {JoinNumber = 174, JoinSpan = 1},
@@ -681,34 +760,45 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                    JoinType = eJoinType.Digital
                });

-        [JoinName("VolumeDown")]
-        public JoinDataComplete VolumeDown =
-            new JoinDataComplete(new JoinData { JoinNumber = 175, JoinSpan = 1 },
+        [JoinName("DialPhoneCall")]
+        public JoinDataComplete DialPhone =
+            new JoinDataComplete(new JoinData { JoinNumber = 72, JoinSpan = 1 },
            new JoinMetadata
            {
-                Description = "Volume Down",
+                Description = "Dial Phone",
                JoinCapabilities = eJoinCapabilities.FromSIMPL,
                JoinType = eJoinType.Digital
            });

-        [JoinName("VolumeLevel")]
-        public JoinDataComplete VolumeLevel =
-            new JoinDataComplete(new JoinData { JoinNumber = 174, JoinSpan = 1 },
+        [JoinName("PhoneHookState")]
+        public JoinDataComplete PhoneHookState =
+            new JoinDataComplete(new JoinData { JoinNumber = 72, JoinSpan = 1 },
            new JoinMetadata
            {
-                Description = "Volume Level",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Analog
+                Description = "Dial Phone",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
            });

-        [JoinName("MinutesBeforeMeetingStart")] public JoinDataComplete MinutesBeforeMeetingStart =
-            new JoinDataComplete(new JoinData {JoinNumber = 41, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Minutes before meeting start that a meeting is joinable",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Analog
-                });
+        [JoinName("EndPhoneCall")]
+        public JoinDataComplete HangUpPhone =
+            new JoinDataComplete(new JoinData { JoinNumber = 73, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Hang Up PHone",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("PhoneString")]
+        public JoinDataComplete PhoneDialString =
+            new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Phone Dial String",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Serial
+            });

        public VideoCodecControllerJoinMap(uint joinStart) : base(joinStart, typeof (VideoCodecControllerJoinMap))
        {
--- a/IO/Cards/InternalCardCageController.cs
+++ b/IO/Cards/InternalCardCageController.cs
@@ -73,21 +73,21 @@ namespace PepperDash.Essentials.Core.CrestronIO.Cards
                string cardType;
                if (!_config.Cards.TryGetValue(i, out cardType))
                {
-                    Debug.Console(1, this, "No card found for slot {0}", i);
+                    Debug.Console(0, this, "No card found for slot {0}", i);
                    continue;
                }

                if (String.IsNullOrEmpty(cardType))
                {
                    Debug.Console(0, this, "No card specified for slot {0}", i);
-                    return;
+                    continue;
                }

                Func<uint, C3CardControllerBase> cardBuilder;
                if (!_cardDict.TryGetValue(cardType.ToLower(), out cardBuilder))
                {
                    Debug.Console(0, "Unable to find factory for 3-Series card type {0}.", cardType);
-                    return;
+                    continue;
                }

                try
--- a/Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasFarEndContentStatus.cs
+++ b/Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasFarEndContentStatus.cs
@@ -0,0 +1,7 @@
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface IHasFarEndContentStatus
+    {
+         BoolFeedback ReceivingContent { get; }
+    }
+}
--- a/Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasPhoneDialing.cs
+++ b/Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasPhoneDialing.cs
@@ -0,0 +1,14 @@
+using PepperDash.Essentials.Core;
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    public interface IHasPhoneDialing
+    {
+        BoolFeedback PhoneOffHookFeedback { get; }
+        StringFeedback CallerIdNameFeedback { get; }
+        StringFeedback CallerIdNumberFeedback { get; }
+        void DialPhoneCall(string number);
+        void EndPhoneCall();
+        void SendDtmfToPhone(string digit);
+    }
+}
--- a/Core/PepperDashEssentialsBase/Devices/DeviceManager.cs
+++ b/Core/PepperDashEssentialsBase/Devices/DeviceManager.cs
@@ -413,7 +413,7 @@ namespace PepperDash.Essentials.Core
                    var min = Convert.ToUInt32(timeout);

                    device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
-                    Debug.Console(0, "Device: '{0}' debug level set to {1) for {2} minutes", deviceKey, debugSetting, min);
+                    Debug.Console(0, "Device: '{0}' debug level set to {1) for {2} minutes", deviceKey, setting, min);

                }
                catch (Exception e)
@@ -424,7 +424,7 @@ namespace PepperDash.Essentials.Core
            else
            {
                device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
-                Debug.Console(0, "Device: '{0}' debug level set to {1) for default time (30 minutes)", deviceKey, debugSetting);
+                Debug.Console(0, "Device: '{0}' debug level set to {1) for default time (30 minutes)", deviceKey, setting);
            }
        }

--- a/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
+++ b/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
@@ -196,6 +196,8 @@
    <Compile Include="Devices\ReconfigurableDevice.cs" />
    <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
    <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
+    <Compile Include="DeviceTypeInterfaces\IHasFarEndContentStatus.cs" />
+    <Compile Include="DeviceTypeInterfaces\IHasPhoneDialing.cs" />
    <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />
    <Compile Include="Factory\DeviceFactory.cs" />
    <Compile Include="Factory\IDeviceFactory.cs" />
--- a/Core/PepperDashEssentialsBase/Touchpanels/TriListExtensions.cs
+++ b/Core/PepperDashEssentialsBase/Touchpanels/TriListExtensions.cs
@@ -251,6 +251,12 @@ namespace PepperDash.Essentials.Core
            tl.StringInput[sigNum].StringValue = value;
        }

+	    public static void SetString(this BasicTriList tl, uint sigNum, string value, eStringEncoding encoding)
+	    {
+	        tl.StringInput[sigNum].StringEncoding = encoding;
+	        tl.StringInput[sigNum].StringValue = value;
+	    }
+
 		/// <summary>
 		/// Returns bool value of trilist sig
 		/// </summary>
--- a/essentials-framework/Essentials
+++ b/essentials-framework/Essentials
@@ -121,6 +121,7 @@
    <Compile Include="Cameras\CameraControl.cs" />
    <Compile Include="Display\PanasonicThDisplay.cs" />
    <Compile Include="VideoCodec\Interfaces\IHasParticipants.cs" />
+    <Compile Include="VideoCodec\Interfaces\IHasSelfviewPosition.cs" />
    <Compile Include="VideoCodec\Interfaces\iVideoCodecInfo.cs" />
    <Compile Include="Codec\iHasCallFavorites.cs" />
    <Compile Include="Codec\iHasCallHistory.cs" />
--- a/Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs
+++ b/Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs
@@ -0,0 +1,14 @@
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface IHasSelfviewPosition
+    {
+        StringFeedback SelfviewPipPositionFeedback { get; }
+
+        void SelfviewPipPositionSet(CodecCommandWithLabel position);
+
+        void SelfviewPipPositionToggle();
+    }
+}
--- a/Common/VideoCodec/VideoCodecBase.cs
+++ b/Common/VideoCodec/VideoCodecBase.cs
@@ -13,11 +13,13 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 using PepperDash_Essentials_Core.Bridges.JoinMaps;
+using PepperDash_Essentials_Core.DeviceTypeInterfaces;
 using Feedback = PepperDash.Essentials.Core.Feedback;

 namespace PepperDash.Essentials.Devices.Common.VideoCodec
@@ -60,9 +62,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec

        public List<CodecActiveCallItem> ActiveCalls { get; set; }

-        public bool ShowSelfViewByDefault { get; protected set; }
-
-        protected bool SupportsCameraOff;
+        public bool ShowSelfViewByDefault { get; protected set; }
+
+        protected bool SupportsCameraOff;
        protected bool SupportsCameraAutoMode;

        public bool IsReady { get; protected set; }
@@ -198,7 +200,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
        /// <param name="previousStatus"></param>
        /// <param name="newStatus"></param>
        /// <param name="item"></param>
-        protected void OnCallStatusChange(CodecActiveCallItem item)
+        protected virtual void OnCallStatusChange(CodecActiveCallItem item)
        {
            var handler = CallStatusChange;
            if (handler != null)
@@ -309,12 +311,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
            {
                trilist.SetBool(joinMap.CameraSupportsAutoMode.JoinNumber, SupportsCameraAutoMode);
                LinkVideoCodecCameraModeToApi(codec as IHasCameraAutoMode, trilist, joinMap);
-            }
-
-            if (codec is IHasCameraOff)
-            {
-                trilist.SetBool(joinMap.CameraSupportsOffMode.JoinNumber, SupportsCameraOff);
-                LinkVideoCodecCameraOffToApi(codec as IHasCameraOff, trilist, joinMap);
+            }
+
+            if (codec is IHasCameraOff)
+            {
+                trilist.SetBool(joinMap.CameraSupportsOffMode.JoinNumber, SupportsCameraOff);
+                LinkVideoCodecCameraOffToApi(codec as IHasCameraOff, trilist, joinMap);
            }

            if (codec is IHasCodecLayouts)
@@ -322,6 +324,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                LinkVideoCodecCameraLayoutsToApi(codec as IHasCodecLayouts, trilist, joinMap);
            }

+            if (codec is IHasSelfviewPosition)
+            {
+                LinkVideoCodecSelfviewPositionToApi(codec as IHasSelfviewPosition, trilist, joinMap);
+            }
+
            if (codec is IHasDirectory)
            {
                LinkVideoCodecDirectoryToApi(codec as IHasDirectory, trilist, joinMap);
@@ -337,6 +344,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                LinkVideoCodecParticipantsToApi(codec as IHasParticipants, trilist, joinMap);
            }

+            if (codec is IHasFarEndContentStatus)
+            {
+                (codec as IHasFarEndContentStatus).ReceivingContent.LinkInputSig(trilist.BooleanInput[joinMap.RecievingContent.JoinNumber]);
+            }
+
+            if (codec is IHasPhoneDialing)
+            {
+                LinkVideoCodecPhoneToApi(codec as IHasPhoneDialing, trilist, joinMap);
+            }
+
            trilist.OnlineStatusChange += (device, args) =>
            {
                if (!args.DeviceOnLine) return;
@@ -360,27 +377,96 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                {
                    trilist.SetBool(joinMap.CameraSupportsAutoMode.JoinNumber, true);

-                    (codec as IHasCameraAutoMode).CameraAutoModeIsOnFeedback.InvokeFireUpdate();
+                    (codec as IHasCameraAutoMode).CameraAutoModeIsOnFeedback.FireUpdate();
                }

                if (codec is IHasCodecSelfView)
                {
-                    (codec as IHasCodecSelfView).SelfviewIsOnFeedback.InvokeFireUpdate();
+                    (codec as IHasCodecSelfView).SelfviewIsOnFeedback.FireUpdate();
                }

-                SharingContentIsOnFeedback.InvokeFireUpdate();
+                if (codec is IHasCameraAutoMode)
+                {
+                    (codec as IHasCameraAutoMode).CameraAutoModeIsOnFeedback.FireUpdate();
+                }

-                UpdateCallStatusXSig();
+                if (codec is IHasCameraOff)
+                {
+                    (codec as IHasCameraOff).CameraIsOffFeedback.FireUpdate();
+                }
+
+                if (codec is IHasPhoneDialing)
+                {
+                    (codec as IHasPhoneDialing).PhoneOffHookFeedback.FireUpdate();
+                }
+
+                SharingContentIsOnFeedback.FireUpdate();
+
+                trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
+
+                trilist.SetString(joinMap.CurrentCallData.JoinNumber, UpdateCallStatusXSig());
            };
-        }
-
-        private void LinkVideoCodecCameraOffToApi(IHasCameraOff codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
-        {
-            codec.CameraIsOffFeedback.LinkInputSig(trilist.BooleanInput[joinMap.CameraModeOff.JoinNumber]);
-
-            trilist.SetSigFalseAction(joinMap.CameraModeOff.JoinNumber, codec.CameraOff);
-        }
-
+        }
+
+        private void LinkVideoCodecPhoneToApi(IHasPhoneDialing codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            codec.PhoneOffHookFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PhoneHookState.JoinNumber]);
+
+            trilist.SetSigFalseAction(joinMap.DialPhone.JoinNumber,
+                () => codec.DialPhoneCall(trilist.StringOutput[joinMap.PhoneDialString.JoinNumber].StringValue));
+
+            trilist.SetSigFalseAction(joinMap.HangUpPhone.JoinNumber, codec.EndPhoneCall);
+        }
+
+        private void LinkVideoCodecSelfviewPositionToApi(IHasSelfviewPosition codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            trilist.SetSigFalseAction(joinMap.SelfviewPosition.JoinNumber, codec.SelfviewPipPositionToggle);
+
+            codec.SelfviewPipPositionFeedback.LinkInputSig(trilist.StringInput[joinMap.SelfviewPositionFb.JoinNumber]);
+        }
+
+        private void LinkVideoCodecCameraOffToApi(IHasCameraOff codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            trilist.SetSigFalseAction(joinMap.CameraModeOff.JoinNumber, codec.CameraOff);
+
+            codec.CameraIsOffFeedback.OutputChange += (o, a) =>
+            {
+                if (a.BoolValue)
+                {
+                    trilist.SetBool(joinMap.CameraModeOff.JoinNumber, true);
+                    trilist.SetBool(joinMap.CameraModeManual.JoinNumber, false);
+                    trilist.SetBool(joinMap.CameraModeAuto.JoinNumber, false);
+                    return;
+                }
+
+                trilist.SetBool(joinMap.CameraModeOff.JoinNumber, false);
+
+                var autoCodec = codec as IHasCameraAutoMode;
+
+                if (autoCodec == null) return;
+
+                trilist.SetBool(joinMap.CameraModeAuto.JoinNumber, autoCodec.CameraAutoModeIsOnFeedback.BoolValue);
+                trilist.SetBool(joinMap.CameraModeManual.JoinNumber, !autoCodec.CameraAutoModeIsOnFeedback.BoolValue);
+            };
+
+            if (codec.CameraIsOffFeedback.BoolValue)
+            {
+                trilist.SetBool(joinMap.CameraModeOff.JoinNumber, true);
+                trilist.SetBool(joinMap.CameraModeManual.JoinNumber, false);
+                trilist.SetBool(joinMap.CameraModeAuto.JoinNumber, false);
+                return;
+            }
+
+            trilist.SetBool(joinMap.CameraModeOff.JoinNumber, false);
+
+            var autoModeCodec = codec as IHasCameraAutoMode;
+
+            if (autoModeCodec == null) return;
+
+            trilist.SetBool(joinMap.CameraModeAuto.JoinNumber, autoModeCodec.CameraAutoModeIsOnFeedback.BoolValue);
+            trilist.SetBool(joinMap.CameraModeManual.JoinNumber, !autoModeCodec.CameraAutoModeIsOnFeedback.BoolValue);
+        }
+
        private void LinkVideoCodecVolumeToApi(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
        {
            MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMuteOn.JoinNumber]);
@@ -419,6 +505,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
            codec.Participants.ParticipantsListHasChanged += (sender, args) =>
            {
                string participantsXSig;
+
                if (codec.Participants.CurrentParticipants.Count == 0)
                {
                    participantsXSig = Encoding.GetEncoding(XSigEncoding).GetString(_clearBytes, 0, _clearBytes.Length);
@@ -427,10 +514,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                    return;
                }

-                participantsXSig = Encoding.GetEncoding(XSigEncoding).GetString(_clearBytes, 0, _clearBytes.Length);
-
-                trilist.SetString(joinMap.CurrentParticipants.JoinNumber, participantsXSig);
-
                participantsXSig = UpdateParticipantsXSig(codec.Participants.CurrentParticipants);

                trilist.SetString(joinMap.CurrentParticipants.JoinNumber, participantsXSig);
@@ -441,7 +524,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec

        private string UpdateParticipantsXSig(List<Participant> currentParticipants)
        {
-            const int maxParticipants = 255;
+            const int maxParticipants = 50;
            const int maxDigitals = 5;
            const int maxStrings = 1;
            const int offset = maxDigitals + maxStrings;
@@ -453,7 +536,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec

            foreach (var participant in currentParticipants)
            {
-                if (meetingIndex > maxParticipants * offset) break;
+                if (meetingIndex >= maxParticipants * offset) break;

                //digitals
                tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, participant.AudioMuteFb);
@@ -469,6 +552,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                meetingIndex += offset;
                stringIndex += maxStrings;
            }
+
+            while (meetingIndex < maxParticipants*offset)
+            {
+                tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, false);
+                tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, false);
+                tokenArray[digitalIndex + 2] = new XSigDigitalToken(digitalIndex + 3, false);
+                tokenArray[digitalIndex + 3] = new XSigDigitalToken(digitalIndex + 4, false);
+                tokenArray[digitalIndex + 4] = new XSigDigitalToken(digitalIndex + 5, false);
+
+                //serials
+                tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, String.Empty);
+
+                digitalIndex += maxDigitals;
+                meetingIndex += offset;
+                stringIndex += maxStrings;
+            }
            
            return GetXSigString(tokenArray);
        }
@@ -517,12 +616,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec

            trilist.SetString(joinMap.Schedule.JoinNumber, meetingsData);

-            trilist.SetSigFalseAction(joinMap.DialMeeting.JoinNumber, () =>
+            trilist.SetSigFalseAction(joinMap.DialMeeting1.JoinNumber, () =>
            {
-                if (codec.CodecSchedule.Meetings[0].Joinable)
-                {
+                if(codec.CodecSchedule.Meetings[0] != null)
                    Dial(codec.CodecSchedule.Meetings[0]);
-                }
+            });
+            trilist.SetSigFalseAction(joinMap.DialMeeting2.JoinNumber, () =>
+            {
+                if (codec.CodecSchedule.Meetings[1] != null)
+                    Dial(codec.CodecSchedule.Meetings[1]);
+            });
+            trilist.SetSigFalseAction(joinMap.DialMeeting3.JoinNumber, () =>
+            {
+                if (codec.CodecSchedule.Meetings[2] != null)
+                    Dial(codec.CodecSchedule.Meetings[2]);
            });

            trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort)currentMeetings.Count);
@@ -600,11 +707,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                tokenArray[stringIndex + 3] = new XSigSerialToken(stringIndex + 4, String.Empty);
                tokenArray[stringIndex + 4] = new XSigSerialToken(stringIndex + 5, String.Empty);
                tokenArray[stringIndex + 5] = new XSigSerialToken(stringIndex + 6, String.Empty);
-                tokenArray[stringIndex + 6] = new XSigSerialToken(stringIndex + 7, String.Empty);
-
-				digitalIndex += maxDigitals;
-				meetingIndex += offset;
-				stringIndex += maxStrings;
+                tokenArray[stringIndex + 6] = new XSigSerialToken(stringIndex + 7, String.Empty);
+
+				digitalIndex += maxDigitals;
+				meetingIndex += offset;
+				stringIndex += maxStrings;
 			}

            return GetXSigString(tokenArray);
@@ -700,6 +807,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
            //End All calls for now
            trilist.SetSigFalseAction(joinMap.EndCall.JoinNumber, EndAllCalls);

+            trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
+
            CallStatusChange += (sender, args) =>
            {
                trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
@@ -712,9 +821,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                    trilist.SetSigFalseAction(joinMap.IncomingReject.JoinNumber, () => RejectCall(args.CallItem));
                }

-                var callStatusXsig = UpdateCallStatusXSig();
-
-                trilist.SetString(joinMap.CurrentCallData.JoinNumber, callStatusXsig);
+                trilist.SetString(joinMap.CurrentCallData.JoinNumber, UpdateCallStatusXSig());
            };
        }

@@ -723,26 +830,44 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
            const int maxCalls = 8;
            const int maxStrings = 5;
            const int offset = 6;
-            var callIndex = 0;
-            var digitalIndex = maxStrings*maxCalls;
-            
-
-            var tokenArray = new XSigToken[ActiveCalls.Count*offset]; //set array size for number of calls * pieces of info
+            var stringIndex = 0;
+            var digitalIndex = maxStrings * maxCalls;
+            var arrayIndex = 0;            
+        
+            var tokenArray = new XSigToken[maxCalls*offset]; //set array size for number of calls * pieces of info

            foreach (var call in ActiveCalls)
            {
-                var arrayIndex = callIndex;
+                if (arrayIndex >= maxCalls * offset)
+                    break;
                //digitals
                tokenArray[arrayIndex] = new XSigDigitalToken(digitalIndex + 1, call.IsActiveCall);

                //serials
-                tokenArray[arrayIndex + 1] = new XSigSerialToken(callIndex + 1, call.Name ?? String.Empty);
-                tokenArray[arrayIndex + 2] = new XSigSerialToken(callIndex + 2, call.Number ?? String.Empty);
-                tokenArray[arrayIndex + 3] = new XSigSerialToken(callIndex + 3, call.Direction.ToString());
-                tokenArray[arrayIndex + 4] = new XSigSerialToken(callIndex + 4, call.Type.ToString());
-                tokenArray[arrayIndex + 5] = new XSigSerialToken(callIndex + 5, call.Status.ToString());
+                tokenArray[arrayIndex + 1] = new XSigSerialToken(stringIndex + 1, call.Name ?? String.Empty);
+                tokenArray[arrayIndex + 2] = new XSigSerialToken(stringIndex + 2, call.Number ?? String.Empty);
+                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());

-                callIndex += offset;
+                arrayIndex += offset;
+                stringIndex += maxStrings;
+                digitalIndex++;
+            }
+            while (digitalIndex < maxCalls)
+            {
+                //digitals
+                tokenArray[arrayIndex] = new XSigDigitalToken(digitalIndex + 1, false);
+
+                //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);
+
+                arrayIndex += offset;
+                stringIndex += maxStrings;
                digitalIndex++;
            }

@@ -776,14 +901,55 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
        {
            trilist.SetSigFalseAction(joinMap.CameraModeAuto.JoinNumber, codec.CameraAutoModeOn);
            trilist.SetSigFalseAction(joinMap.CameraModeManual.JoinNumber, codec.CameraAutoModeOff);
-            
-            codec.CameraAutoModeIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.CameraModeAuto.JoinNumber]);
-            codec.CameraAutoModeIsOnFeedback.LinkComplementInputSig(
-                trilist.BooleanInput[joinMap.CameraModeManual.JoinNumber]);
+
+            codec.CameraAutoModeIsOnFeedback.OutputChange += (o, a) =>
+            {
+                var offCodec = codec as IHasCameraOff;
+
+                if (offCodec != null)
+                {
+                    if (offCodec.CameraIsOffFeedback.BoolValue)
+                    {
+                        trilist.SetBool(joinMap.CameraModeAuto.JoinNumber, false);
+                        trilist.SetBool(joinMap.CameraModeManual.JoinNumber, false);
+                        trilist.SetBool(joinMap.CameraModeOff.JoinNumber, true);
+                        return;
+                    }
+
+                    trilist.SetBool(joinMap.CameraModeAuto.JoinNumber, a.BoolValue);
+                    trilist.SetBool(joinMap.CameraModeManual.JoinNumber, !a.BoolValue);
+                    trilist.SetBool(joinMap.CameraModeOff.JoinNumber, false);
+                    return;
+                }
+
+                trilist.SetBool(joinMap.CameraModeAuto.JoinNumber, a.BoolValue);
+                trilist.SetBool(joinMap.CameraModeManual.JoinNumber, !a.BoolValue);
+                trilist.SetBool(joinMap.CameraModeOff.JoinNumber, false);
+            };
+
+            var offModeCodec = codec as IHasCameraOff;
+
+            if (offModeCodec != null)
+            {
+                if (offModeCodec.CameraIsOffFeedback.BoolValue)
+                {
+                    trilist.SetBool(joinMap.CameraModeAuto.JoinNumber, false);
+                    trilist.SetBool(joinMap.CameraModeManual.JoinNumber, false);
+                    trilist.SetBool(joinMap.CameraModeOff.JoinNumber, true);
+                    return;
+                }
+
+                trilist.SetBool(joinMap.CameraModeAuto.JoinNumber, codec.CameraAutoModeIsOnFeedback.BoolValue);
+                trilist.SetBool(joinMap.CameraModeManual.JoinNumber, !codec.CameraAutoModeIsOnFeedback.BoolValue);
+                trilist.SetBool(joinMap.CameraModeOff.JoinNumber, false);
+                return;
+            }
+
+            trilist.SetBool(joinMap.CameraModeAuto.JoinNumber, codec.CameraAutoModeIsOnFeedback.BoolValue);
+            trilist.SetBool(joinMap.CameraModeManual.JoinNumber, !codec.CameraAutoModeIsOnFeedback.BoolValue);
+            trilist.SetBool(joinMap.CameraModeOff.JoinNumber, false);
        }

-
-
        private void LinkVideoCodecSelfviewToApi(IHasCodecSelfView codec, BasicTriList trilist,
            VideoCodecControllerJoinMap joinMap)
        {
@@ -871,8 +1037,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
            {
                var i = (ushort) codec.Cameras.FindIndex((c) => c.Key == args.SelectedCamera.Key);

-                trilist.SetUshort(joinMap.CameraPresetSelect.JoinNumber, i);
-
                if (codec is IHasCodecRoomPresets)
                {
                    return;
@@ -887,24 +1051,58 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                SetCameraPresetNames(cam.Presets);

                (args.SelectedCamera as IHasCameraPresets).PresetsListHasChanged += (o, eventArgs) => SetCameraPresetNames(cam.Presets);
+
+                trilist.SetUShortSigAction(joinMap.CameraPresetSelect.JoinNumber,
+                        (a) =>
+                        {
+                            cam.PresetSelect(a);
+                            trilist.SetUshort(joinMap.CameraPresetSelect.JoinNumber, a);
+                        });
+
+                trilist.SetSigFalseAction(joinMap.CameraPresetSave.JoinNumber,
+                    () =>
+                    {
+                        cam.PresetStore(trilist.UShortOutput[joinMap.CameraPresetSelect.JoinNumber].UShortValue,
+                            String.Empty);
+                        trilist.PulseBool(joinMap.CameraPresetSave.JoinNumber, 3000);
+                    });
            };

+            if (!(codec is IHasCodecRoomPresets)) return;
+
+            var presetCodec = codec as IHasCodecRoomPresets;
+
+            presetCodec.CodecRoomPresetsListHasChanged +=
+                (sender, args) => SetCameraPresetNames(presetCodec.NearEndPresets);
+
            //Camera Presets
            trilist.SetUShortSigAction(joinMap.CameraPresetSelect.JoinNumber, (i) =>
            {
-                if (codec.SelectedCamera == null) return;
-
-                var cam = codec.SelectedCamera as IHasCameraPresets;
-
-                if (cam == null) return;
-
-                cam.PresetSelect(i);
+                presetCodec.CodecRoomPresetSelect(i);

                trilist.SetUshort(joinMap.CameraPresetSelect.JoinNumber, i);
            });
+
+            trilist.SetSigFalseAction(joinMap.CameraPresetSave.JoinNumber,
+                    () =>
+                    {
+                        presetCodec.CodecRoomPresetStore(
+                            trilist.UShortOutput[joinMap.CameraPresetSelect.JoinNumber].UShortValue, String.Empty);
+                        trilist.PulseBool(joinMap.CameraPresetSave.JoinNumber, 3000);
+                    });
        }

-        private string SetCameraPresetNames(List<CameraPreset> presets)
+        private string SetCameraPresetNames(IEnumerable<CodecRoomPreset> presets)
+        {
+            return SetCameraPresetNames(presets.Select(p => p.Description).ToList());
+        }
+
+        private string SetCameraPresetNames(IEnumerable<CameraPreset> presets)
+        {
+            return SetCameraPresetNames(presets.Select(p => p.Description).ToList());
+        }
+
+        private string SetCameraPresetNames(ICollection<string> presets)
        {
            var i = 1; //start index for xsig;

@@ -912,7 +1110,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec

            foreach (var preset in presets)
            {
-                var cameraPreset = new XSigSerialToken(i, preset.Description);
+                var cameraPreset = new XSigSerialToken(i, preset);
                tokenArray[i - 1] = cameraPreset;
                i++;
            }
--- a/Common/VideoCodec/ZoomRoom/ResponseObjects.cs
+++ b/Common/VideoCodec/ZoomRoom/ResponseObjects.cs
@@ -58,6 +58,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
        public List<zStatus.AudioVideoInputOutputLineItem> AudioInputs { get; set; }
        public List<zStatus.AudioVideoInputOutputLineItem> AudioOuputs { get; set; }
        public List<zStatus.AudioVideoInputOutputLineItem> Cameras { get; set; }
+        public zEvent.PhoneCallStatus PhoneCall { get; set; }

        public ZoomRoomStatus()
        {
@@ -74,6 +75,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
            AudioInputs = new List<zStatus.AudioVideoInputOutputLineItem>();
            AudioOuputs = new List<zStatus.AudioVideoInputOutputLineItem>();
            Cameras = new List<zStatus.AudioVideoInputOutputLineItem>();
+            PhoneCall = new zEvent.PhoneCallStatus();
        }
    }

@@ -370,7 +372,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

            public CallRecordInfo CallRecordInfo { get; set; }

-            public zCommand.InfoResult Info { get; set; }
+            private zCommand.InfoResult _info;
+
+            public zCommand.InfoResult Info
+            {
+                get
+                {
+                    return _info;
+                }
+                set
+                {
+                    _info = value;
+                    NotifyPropertyChanged("Info");
+                }
+            }

            public Call()
            {
@@ -687,6 +702,86 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
            [JsonProperty("why_cannot_pin_share")]
            public string WhyCannotPinShare { get; set; }
        }
+
+        public class PhoneCallStatus:NotifiableObject
+        {
+            private bool _isIncomingCall;
+            private string _peerDisplayName;
+            private string _peerNumber;
+
+            private bool _offHook;
+
+            public string CallId { get; set; }
+            public bool IsIncomingCall {
+                get { return _isIncomingCall; }
+                set
+                {
+                    if(value == _isIncomingCall) return;
+
+                    _isIncomingCall = value;
+                    NotifyPropertyChanged("IsIncomingCall");
+                } }
+
+            public string PeerDisplayName
+            {
+                get { return _peerDisplayName; }
+                set
+                {
+                    if (value == _peerDisplayName) return;
+                    _peerDisplayName = value;
+                    NotifyPropertyChanged("PeerDisplayName");
+                }
+            }
+
+            public string PeerNumber
+            {
+                get { return _peerNumber; }
+                set
+                {
+                    if (value == _peerNumber) return;
+
+                    _peerNumber = value;
+                    NotifyPropertyChanged("PeerNumber");
+                } 
+            }
+
+            public string PeerUri { get; set; }
+
+            private ePhoneCallStatus _status;
+            public ePhoneCallStatus Status
+            {
+                get { return _status; }
+                set
+                {
+                    _status = value;
+                    OffHook = _status == ePhoneCallStatus.PhoneCallStatus_Accepted ||
+                              _status == ePhoneCallStatus.PhoneCallStatus_InCall ||
+                              _status == ePhoneCallStatus.PhoneCallStatus_Init ||
+                              _status == ePhoneCallStatus.PhoneCallStatus_Ringing;
+                } 
+            }
+
+            public bool OffHook
+            {
+                get { return _offHook; }
+                set
+                {
+                    if (value == _offHook) return;
+
+                    _offHook = value;
+                    NotifyPropertyChanged("OffHook");
+                }
+            }
+        }
+
+        public enum ePhoneCallStatus
+        {
+            PhoneCallStatus_Ringing,
+            PhoneCallStatus_Terminated,
+            PhoneCallStatus_Accepted,
+            PhoneCallStatus_InCall,
+            PhoneCallStatus_Init,
+        }
    }
    
    /// <summary>
@@ -706,17 +801,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

            public bool Mute
            {
-                get
-                {
-                    return _mute;
-                }
+                get { return _mute; }
                set
                {
-                    if (value != _mute)
-                    {
-                        _mute = value;
-                        NotifyPropertyChanged("Mute");
-                    }
+                    Debug.Console(1, "Camera Mute response received: {0}", value);
+                    
+                    if (value == _mute) return;
+                    
+                    _mute = value;
+                    NotifyPropertyChanged("Mute");
                }
            }
        }
@@ -772,12 +865,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
            DownLeft
        }

-        public class Layout
+        public class Layout:NotifiableObject
        {
            public bool ShareThumb { get; set; }
            public eLayoutStyle Style { get; set; }
            public eLayoutSize Size { get; set; }
-            public eLayoutPosition Position { get; set; }
+
+            private eLayoutPosition _position;
+            public eLayoutPosition Position {
+                get { return _position; }
+                set
+                {
+                    _position = value;
+                    NotifyPropertyChanged("Position");
+                } }
        }

        public class Lock
--- a/Common/VideoCodec/ZoomRoom/ZoomRoom.cs
+++ b/Common/VideoCodec/ZoomRoom/ZoomRoom.cs
@@ -11,16 +11,20 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
 using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
+using PepperDash_Essentials_Core.DeviceTypeInterfaces;

 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
    public class ZoomRoom : VideoCodecBase, IHasCodecSelfView, IHasDirectoryHistoryStack, ICommunicationMonitor,
        IRouting,
-        IHasScheduleAwareness, IHasCodecCameras, IHasParticipants, IHasCameraOff, IHasCameraAutoMode
+        IHasScheduleAwareness, IHasCodecCameras, IHasParticipants, IHasCameraOff, IHasCameraAutoMode,
+        IHasFarEndContentStatus, IHasSelfviewPosition, IHasPhoneDialing
    {
        private const long MeetingRefreshTimer = 60000;
        private const uint DefaultMeetingDurationMin = 30;
@@ -98,6 +102,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

            CodecSchedule = new CodecScheduleAwareness(MeetingRefreshTimer);

+            ReceivingContent = new BoolFeedback(FarEndIsSharingContentFeedbackFunc);
+
+            SelfviewPipPositionFeedback = new StringFeedback(SelfviewPipPositionFeedbackFunc);
+
            SetUpFeedbackActions();

            Cameras = new List<CameraBase>();
@@ -108,6 +116,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

            SupportsCameraOff = _props.SupportsCameraOff;
            SupportsCameraAutoMode = _props.SupportsCameraAutoMode;
+
+            PhoneOffHookFeedback = new BoolFeedback(PhoneOffHookFeedbackFunc);
+            CallerIdNameFeedback = new StringFeedback(CallerIdNameFeedbackFunc);
+            CallerIdNumberFeedback = new StringFeedback(CallerIdNumberFeedbackFunc);
        }

        public CommunicationGather PortGather { get; private set; }
@@ -152,7 +164,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

        protected Func<bool> FarEndIsSharingContentFeedbackFunc
        {
-            get { return () => false; }
+            get { return () => Status.Call.Sharing.State == zEvent.eSharingState.Receiving; }
        }

        protected override Func<bool> MuteFeedbackFunc
@@ -183,17 +195,17 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

        protected Func<bool> CameraIsOffFeedbackFunc
        {
-            get { return () => Configuration.Camera.Mute; }
+            get { return () => Configuration.Call.Camera.Mute; }
        }

        protected Func<bool> CameraAutoModeIsOnFeedbackFunc
        {
-            get { return () => !Configuration.Camera.Mute; }
-        } 
+            get { return () => false; }
+        }

        protected Func<string> SelfviewPipPositionFeedbackFunc
        {
-            get { return () => ""; }
+            get { return () => _currentSelfviewPipPosition.Command; }
        }

        protected Func<string> LocalLayoutFeedbackFunc
@@ -393,6 +405,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
            SetIsReady();
        }

+        private void SetUpCallFeedbackActions()
+        {
+            Status.Call.Sharing.PropertyChanged += (o, a) =>
+            {
+                if (a.PropertyName == "State")
+                {
+                    SharingContentIsOnFeedback.FireUpdate();
+                    ReceivingContent.FireUpdate();
+                }
+            };
+
+            Status.Call.PropertyChanged += (o, a) =>
+            {
+                if (a.PropertyName == "Info")
+                {
+                    Debug.Console(1, this, "Updating Call Status");
+                    UpdateCallStatus();
+                }
+            };
+        }

        /// <summary>
        /// Subscribes to the PropertyChanged events on the state objects and fires the corresponding feedbacks.
@@ -432,11 +464,23 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                }
            };

-            Configuration.Camera.PropertyChanged += (o, a) =>
+            Configuration.Call.Camera.PropertyChanged += (o, a) =>
            {
+                Debug.Console(1, this, "Configuration.Call.Camera.PropertyChanged: {0}", a.PropertyName);
+
                if (a.PropertyName != "Mute") return;

                CameraIsOffFeedback.FireUpdate();
+                CameraAutoModeIsOnFeedback.FireUpdate();
+            };
+
+            Configuration.Call.Layout.PropertyChanged += (o, a) =>
+            {
+                if (a.PropertyName != "Position") return;
+
+                ComputeSelfviewPipStatus();
+
+                SelfviewPipPositionFeedback.FireUpdate();
            };

            Status.Call.Sharing.PropertyChanged += (o, a) =>
@@ -444,6 +488,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                if (a.PropertyName == "State")
                {
                    SharingContentIsOnFeedback.FireUpdate();
+                    ReceivingContent.FireUpdate();
+                }
+            };
+
+            Status.Call.PropertyChanged += (o, a) =>
+            {
+                if (a.PropertyName == "Info")
+                {
+                    Debug.Console(1, this, "Updating Call Status");
+                    UpdateCallStatus();
                }
            };

@@ -458,6 +512,28 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                        break;
                }
            };
+
+            Status.PhoneCall.PropertyChanged += (o, a) =>
+            {
+                switch (a.PropertyName)
+                {
+                    case "IsIncomingCall":
+                        Debug.Console(1, this, "Incoming Phone Call: {0}", Status.PhoneCall.IsIncomingCall);
+                        break;
+                    case "PeerDisplayName":
+                        Debug.Console(1, this, "Peer Display Name: {0}", Status.PhoneCall.PeerDisplayName);
+                        CallerIdNameFeedback.FireUpdate();
+                        break;
+                    case "PeerNumber":
+                        Debug.Console(1, this, "Peer Number: {0}", Status.PhoneCall.PeerNumber);
+                        CallerIdNumberFeedback.FireUpdate();
+                        break;
+                    case "OffHook":
+                        Debug.Console(1, this, "Phone is OffHook: {0}", Status.PhoneCall.OffHook);
+                        PhoneOffHookFeedback.FireUpdate();
+                        break;
+                }
+            };
        }

        private void SetUpDirectory()
@@ -504,9 +580,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
        {
            CrestronConsole.AddNewConsoleCommand(SetCommDebug, "SetCodecCommDebug", "0 for Off, 1 for on",
                ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(s => SendText("zCommand Phonebook List Offset: 0 Limit: 512"),
-                "GetZoomRoomContacts", "Triggers a refresh of the codec phonebook",
-                ConsoleAccessLevelEnum.AccessOperator);
+            if (!_props.DisablePhonebookAutoDownload)
+            {
+                CrestronConsole.AddNewConsoleCommand(s => SendText("zCommand Phonebook List Offset: 0 Limit: 512"),
+                    "GetZoomRoomContacts", "Triggers a refresh of the codec phonebook",
+                    ConsoleAccessLevelEnum.AccessOperator);
+            }
+
            CrestronConsole.AddNewConsoleCommand(s => GetBookings(), "GetZoomRoomBookings",
                "Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator);

@@ -657,6 +737,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
            }

            _syncState.AddQueryToQueue("zCommand Bookings List");
+            _syncState.AddQueryToQueue("zCommand Call ListParticipants");
+            _syncState.AddQueryToQueue("zCommand Call Info");


            _syncState.StartSync();
@@ -669,6 +751,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
        private void ProcessMessage(string message)
        {
            // Counts the curly braces
+            if (message.Contains("client_loop: send disconnect: Broken pipe"))
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Error,
+                    "Zoom Room Controller or App connected. Essentials will NOT control the Zoom Room until it is disconnected.");
+
+                return;
+            }
+
            if (message.Contains('{'))
            {
                _jsonCurlyBraceCounter++;
@@ -757,6 +847,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                            Thread.Sleep(100);
                            SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callout_country_list");
                            Thread.Sleep(100);
+
+                            if (!_props.DisablePhonebookAutoDownload)
+                            {
+                                SendText("zFeedback Register Op: ex Path: /Event/Phonebook/AddedContact");
+                            }
                            // switch to json format
                            SendText("format json");
                        });
@@ -835,6 +930,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                    {
                        switch (topKey.ToLower())
                        {
+                            case "inforesult":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.Info);
+                                break;
+                            }
                            case "phonebooklistresult":
                            {
                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Phonebook);
@@ -995,6 +1095,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                            {
                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.Sharing);

+                                SetLayout();
+
                                break;
                            }
                            case "incomingcallindication":
@@ -1107,6 +1209,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

                                break;
                            }
+                            case "phonecallstatus":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.PhoneCall);
+                                break;
+                            }
                            default:
                            {
                                break;
@@ -1218,6 +1325,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
            }
        }

+        private void SetLayout()
+        {
+            if (!_props.AutoDefaultLayouts) return;
+
+            if (
+                (Status.Call.Sharing.State == zEvent.eSharingState.Receiving ||
+                 Status.Call.Sharing.State == zEvent.eSharingState.Sending))
+            {
+                SendText(String.Format("zconfiguration call layout style: {0}",
+                    _props.DefaultSharingLayout));
+            }
+            else
+            {
+                SendText(String.Format("zconfiguration call layout style: {0}",
+                    _props.DefaultCallLayout));
+            }
+        }
+
        public void PrintCurrentCallParticipants()
        {
            if (Debug.Level <= 0)
@@ -1256,11 +1381,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                if (callStatus != zStatus.eCallStatus.IN_MEETING || callStatus != zStatus.eCallStatus.CONNECTING_MEETING)
                {
                    Status.Call = new zStatus.Call {Status = callStatus};
+
+                    SetUpCallFeedbackActions();
                }

                if (ActiveCalls.Count == 0)
                {
-                    if (callStatus == zStatus.eCallStatus.CONNECTING_MEETING || callStatus == zStatus.eCallStatus.IN_MEETING )
+                    if (callStatus == zStatus.eCallStatus.CONNECTING_MEETING ||
+                        callStatus == zStatus.eCallStatus.IN_MEETING)
                    {
                        var newStatus = eCodecCallStatus.Unknown;

@@ -1319,13 +1447,28 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                    ActiveCalls.Remove(call);
                }
            }
-
            Debug.Console(1, this, "**************************************************************************");
+
+            //clear participants list after call cleanup
+            if (ActiveCalls.Count == 0)
+            {
+                Participants.CurrentParticipants = new List<Participant>();
+            }
+        }
+
+        protected override void OnCallStatusChange(CodecActiveCallItem item)
+        {
+            base.OnCallStatusChange(item);
+
+            if (_props.AutoDefaultLayouts)
+            {
+                SetLayout();
+            }
        }

        public override void StartSharing()
        {
-            throw new NotImplementedException();
+            SendText("zCommand Call Sharing HDMI Start");
        }

        /// <summary>
@@ -1525,7 +1668,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

        public override void SendDtmf(string s)
        {
-            throw new NotImplementedException();
+            SendDtmfToPhone(s);
        }

        /// <summary>
@@ -1605,6 +1748,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
        #endregion

        #region Implementation of IHasCameraAutoMode
+
        //Zoom doesn't support camera auto modes. Setting this to just unmute video
        public void CameraAutoModeOn()
        {
@@ -1625,6 +1769,81 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
        public BoolFeedback CameraAutoModeIsOnFeedback { get; private set; }

        #endregion
+
+        #region Implementation of IHasFarEndContentStatus
+
+        public BoolFeedback ReceivingContent { get; private set; }
+
+        #endregion
+
+        #region Implementation of IHasSelfviewPosition
+
+        private CodecCommandWithLabel _currentSelfviewPipPosition;
+
+        public StringFeedback SelfviewPipPositionFeedback { get; private set; }
+
+        public void SelfviewPipPositionSet(CodecCommandWithLabel position)
+        {
+            SendText(String.Format("zConfiguration Call Layout Position: {0}", position.Command));
+        }
+
+        public void SelfviewPipPositionToggle()
+        {
+            if (_currentSelfviewPipPosition != null)
+            {
+                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;
+
+                SelfviewPipPositionSet(SelfviewPipPositions[nextPipPositionIndex]);
+            }
+        }
+
+        public List<CodecCommandWithLabel> SelfviewPipPositions = new List<CodecCommandWithLabel>()
+        {
+            new CodecCommandWithLabel("UpLeft", "Center Left"),
+            new CodecCommandWithLabel("UpRight", "Center Right"),
+            new CodecCommandWithLabel("DownRight", "Lower Right"),
+            new CodecCommandWithLabel("DownLeft", "Lower Left")
+        };
+
+        private void ComputeSelfviewPipStatus()
+        {
+            _currentSelfviewPipPosition =
+                SelfviewPipPositions.FirstOrDefault(
+                    p => p.Command.ToLower().Equals(Configuration.Call.Layout.Position.ToString().ToLower()));
+        }
+
+        #endregion
+
+        #region Implementation of IHasPhoneDialing
+
+        private Func<bool> PhoneOffHookFeedbackFunc {get {return () => Status.PhoneCall.OffHook; }}
+        private Func<string> CallerIdNameFeedbackFunc { get { return () => Status.PhoneCall.PeerDisplayName; } }
+        private Func<string> CallerIdNumberFeedbackFunc { get { return () => Status.PhoneCall.PeerNumber; } }
+
+        public BoolFeedback PhoneOffHookFeedback { get; private set; }
+        public StringFeedback CallerIdNameFeedback { get; private set; }
+        public StringFeedback CallerIdNumberFeedback { get; private set; }
+
+        public void DialPhoneCall(string number)
+        {
+            SendText(String.Format("zCommand Dial PhoneCallOut Number: {0}", number));
+        }
+
+        public void EndPhoneCall()
+        {
+            SendText(String.Format("zCommand Dial PhoneHangUp CallId: {0}", Status.PhoneCall.CallId));
+        }
+
+        public void SendDtmfToPhone(string digit)
+        {
+            SendText(String.Format("zCommand SendSipDTMF CallId: {0} Key: {1}", Status.PhoneCall.CallId, digit));
+        }
+
+        #endregion
    }

    /// <summary>
--- a/Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs
+++ b/Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs
@@ -68,7 +68,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
        /// <summary>
        /// Builds the command and triggers the parent ZoomRoom to send it
        /// </summary>
-        /// <param name="id"></param>
        /// <param name="state"></param>
        /// <param name="action"></param>
        void SendCommand(eZoomRoomCameraState state, eZoomRoomCameraAction action)
@@ -86,16 +85,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
        void SendContinueAction(eZoomRoomCameraAction action)
        {
            SendCommand(eZoomRoomCameraState.Continue, action);
-            ContinueTimer.Reset();
        }

        void StopContinueTimer()
        {
-            if (ContinueTimer != null)
+            if (ContinueTimer == null)
            {
-                ContinueTimer.Stop();
-                ContinueTimer.Dispose();
+                return;
            }
+
+            ContinueTimer.Stop();
+            ContinueTimer.Dispose();
+            ContinueTimer = null;
        }

        #region IHasCameraPtzControl Members
@@ -111,22 +112,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

        public void PanLeft()
        {
-            if (!isMoving)
+            if (isMoving)
            {
-                SendCommand(eZoomRoomCameraState.Start, eZoomRoomCameraAction.Left);
-                StartContinueTimer();
-                isPanning = true;
+                return;
            }
+
+            SendCommand(eZoomRoomCameraState.Start, eZoomRoomCameraAction.Left);
+            StartContinueTimer();
+            isPanning = true;
        }

        public void PanRight()
        {
-            if (!isMoving)
+            if (isMoving)
            {
-                SendCommand(eZoomRoomCameraState.Start, eZoomRoomCameraAction.Right);
-                StartContinueTimer();
-                isPanning = true;
+                return;
            }
+
+            SendCommand(eZoomRoomCameraState.Start, eZoomRoomCameraAction.Right);
+            StartContinueTimer();
+            isPanning = true;
        }

        public void PanStop()
--- a/Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs
+++ b/Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs
@@ -16,5 +16,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
        public bool DisablePhonebookAutoDownload { get; set; }
        public bool SupportsCameraAutoMode { get; set; }
        public bool SupportsCameraOff { get; set; }
+
+        //if true, the layouts will be set automatically when sharing starts/ends or a call is joined
+        public bool AutoDefaultLayouts { get; set; }
+
+        /* This layout will be selected when Sharing starts (either from Far end or locally)*/
+        public string DefaultSharingLayout { get; set; }
+
+        //This layout will be selected when a call is connected and no content is being shared
+        public string DefaultCallLayout { get; set; }
    }
 }
--- a/packages.config
+++ b/packages.config
@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.0.43-alpha-170" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+  <package id="PepperDashCore" version="1.0.43-alpha-176" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
 </packages>
Author	SHA1	Message	Date
Alex Johnson	617c2ce023	Changes print message for stream debug to avoid exceptions seen with com port debugging. Updates PepperDash Core to fix keyNotFound exception when stream debugging	2020-10-15 20:02:22 -04:00
Neil Dorin	50dae0ef69	Merge pull request #447 from PepperDash/bugfix/card-cage-iteration-fix Bugfix/card cage iteration fix	2020-10-15 12:41:35 -06:00
Alex Johnson	e0fdefa28e	Fix to allow card cage creation loop to continue even if a previous card encountered an issue	2020-10-15 12:36:14 -04:00
Andrew Welker	68ac506a25	Merge pull request #444 from PepperDash/feature/add-encoding-overload Add SetString Overload to allow for setting encoding on a sig	2020-10-13 18:11:45 -05:00
Andrew Welker	633a946f26	Merge branch 'development' into feature/add-encoding-overload	2020-10-13 16:15:04 -05:00
Andrew Welker	8e01455140	Merge pull request #442 from PepperDash/feature/zoom-room-feature-add Zoom Room Updates & Adds	2020-10-13 16:14:49 -05:00
Andrew Welker	b373ab8708	#443 Add SetString Overload	2020-10-13 14:06:48 -06:00
Alex Johnson	1ea80c3fab	Adds phone call ringing status to zoom phone status enum	2020-10-12 12:58:22 -04:00
Andrew Welker	1676f5a956	add phone call logic and commands to Zoom Room	2020-10-08 17:09:59 -06:00
Alex Johnson	cdc9cdbe95	Adds joining meetings 2 and 3 if meetings exist	2020-10-08 15:25:51 -04:00
Alex Johnson	28e8a1fb11	Fixes for selfview feedback. Rearranges order to happen in clockwise motion	2020-10-08 14:40:44 -04:00
Alex Johnson	5f1b92ca62	Adds additional check for if DisablePhonebookAutoDownload is true to CustomActivate method. Fixes issue where layout was not being set properly on sharing end.	2020-10-08 11:43:12 -04:00
Alex Johnson	c58a1874ca	Limits max video participant list size to 50	2020-10-07 15:41:04 -04:00
Andrew Welker	f4fb9cd173	add fix for sharing status not updating add fix for clearing participants list on meeting end	2020-10-07 12:45:05 -06:00
Alex Johnson	ad4a6e9383	Fixes for UpdateCallStatusXSig() method	2020-10-06 16:59:27 -04:00
Andrew Welker	decdaf9f1f	lots of updates	2020-10-02 16:58:18 -06:00
Andrew Welker	27382a6be1	various fixes	2020-10-01 14:40:13 -06:00