From cffe55428a07a25cb7ad0b6ba7533cd94357b40c Mon Sep 17 00:00:00 2001
From: Trevor Payne <tpayne@pepperdash.com>
Date: Fri, 28 Aug 2020 14:57:09 -0500
Subject: [PATCH 01/89] Exposes buttons for HR-xx0 remotes to essentials

Resolves #394
---
 .../Remotes/Hrxx0WirelessRemoteController.cs  | 534 +++++++++++++++++-
 1 file changed, 521 insertions(+), 13 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Remotes/Hrxx0WirelessRemoteController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Remotes/Hrxx0WirelessRemoteController.cs
index e2dfadbc..161cba45 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Remotes/Hrxx0WirelessRemoteController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Remotes/Hrxx0WirelessRemoteController.cs	
@@ -18,32 +18,29 @@ using PepperDash.Essentials.Core.Bridges;
 
 namespace PepperDash.Essentials.Core
 {
-    [Description("Wrapper class for all HR-Series remotes")]
-    public class Hrxx0WirelessRemoteController : EssentialsBridgeableDevice, IHasFeedback
+    [Description("Wrapper class for all HR-Series remotes")]
+    public class Hrxx0WirelessRemoteController : EssentialsBridgeableDevice, IHasFeedback, IHR52Button
     {
         private CenRfgwController _gateway;
 
         private GatewayBase _gatewayBase;
 
-
-        private Hr1x0WirelessRemoteBase _remote;
-
+        private Hr1x0WirelessRemoteBase _remote;
+
         public FeedbackCollection<Feedback> Feedbacks { get; set; }
 
         public CrestronCollection<Button> Buttons { get { return _remote.Button; } }
 
-        private DeviceConfig _config;
-
+        private DeviceConfig _config;
+
         public Hrxx0WirelessRemoteController(string key, Func<DeviceConfig, Hr1x0WirelessRemoteBase> preActivationFunc, 
             DeviceConfig config)
             : base(key, config.Name)
         {
             Feedbacks = new FeedbackCollection<Feedback>();
 
-            var props = JsonConvert.DeserializeObject<CrestronRemotePropertiesConfig>(config.Properties.ToString());
-
-            var type = config.Type;
-            var rfId = (uint)props.Control.InfinetIdInt;
+            var props = JsonConvert.DeserializeObject<CrestronRemotePropertiesConfig>(config.Properties.ToString());
+
             _config = config;
             
             if (props.GatewayDeviceKey == "processor")
@@ -128,7 +125,20 @@ namespace PepperDash.Essentials.Core
                 if (handler is Action<bool>)
                 {
                     (handler as Action<bool>)(args.Button.State == eButtonState.Pressed ? true : false);
-                }
+                }
+
+                var newHandler = ButtonStateChange;
+                if (ButtonStateChange != null)
+                {
+                    newHandler(device, args);
+                }
+
+                var newerHandler = EssentialsButtonStateChange;
+                if (EssentialsButtonStateChange != null)
+                {
+                    newerHandler(this, args);
+                }
+
             }
             catch (Exception e)
             {
@@ -312,6 +322,504 @@ namespace PepperDash.Essentials.Core
         public void SetTrilistBool(BasicTriList trilist, uint join, bool b)
         {
             trilist.BooleanInput[join].BoolValue = b;
-        }
+        }
+
+
+
+        #region IHR52Button Members
+
+        public Button Custom9
+        {
+            get
+            {
+                var localRemote = (IHR52Button) _remote;
+                return localRemote == null ? null : localRemote.Custom9;
+            }
+        }
+
+        public Button Favorite
+        {
+            get
+            {
+                var localRemote = (IHR52Button)_remote;
+                return localRemote == null ? null : localRemote.Favorite;
+            }
+        }
+        
+
+        public Button Home
+        {
+            get
+            {
+                var localRemote = (IHR52Button)_remote;
+                return localRemote == null ? null : localRemote.Home;
+            }
+        }
+
+        #endregion
+
+        #region IHR49Button Members
+
+        public Button Clear
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Clear;
+            }
+        }
+
+        public Button Custom5
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Custom5;
+            }
+        }
+
+        public Button Custom6
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Custom6;
+            }
+        }
+
+        public Button Custom7
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Custom7;
+            }
+        }
+
+        public Button Custom8
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Custom8;
+            }
+        }
+
+        public Button Enter
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Enter;
+            }
+        }
+
+        public Button Keypad0
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad0;
+            }
+        }
+
+        public Button Keypad1
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad1;
+            }
+        }
+
+        public Button Keypad2Abc
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad2Abc;
+            }
+        }
+
+        public Button Keypad3Def
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad3Def;
+            }
+        }
+
+        public Button Keypad4Ghi
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad4Ghi;
+            }
+        }
+
+        public Button Keypad5Jkl
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad5Jkl;
+            }
+        }
+
+        public Button Keypad6Mno
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad6Mno;
+            }
+        }
+
+        public Button Keypad7Pqrs
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad7Pqrs;
+            }
+        }
+
+        public Button Keypad8Tuv
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad8Tuv;
+            }
+        }
+
+        public Button Keypad9Wxyz
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad9Wxyz;
+            }
+        }
+
+        #endregion
+
+        #region IHR33Button Members
+
+        public Button Blue
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Blue;
+            }
+        }
+
+        public Button ChannelDown
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.ChannelDown;
+            }
+        }
+
+        public Button ChannelUp
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.ChannelUp;
+            }
+        }
+
+        public Button Custom1
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Custom1;
+            }
+        }
+
+        public Button Custom2
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Custom2;
+            }
+        }
+
+        public Button Custom3
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Custom3;
+            }
+        }
+
+        public Button Custom4
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Custom4;
+            }
+        }
+
+        public Button DialPadDown
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.DialPadDown;
+            }
+        }
+
+        public Button DialPadEnter
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.DialPadEnter;
+            }
+        }
+
+        public Button DialPadLeft
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.DialPadLeft;
+            }
+        }
+
+        public Button DialPadRight
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.DialPadRight;
+            }
+        }
+
+        public Button DialPadUp
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.DialPadUp;
+            }
+        }
+
+        public Button Dvr
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Dvr;
+            }
+        }
+
+        public Button Exit
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Exit;
+            }
+        }
+
+        public Button FastForward
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.FastForward;
+            }
+        }
+
+        public Button Green
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Green;
+            }
+        }
+
+        public Button Guide
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Blue;
+            }
+        }
+
+        public Button Information
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Information;
+            }
+        }
+
+        public Button Last
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Last;
+            }
+        }
+
+        public Button Menu
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Menu;
+            }
+        }
+
+        public Button Mute
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Mute;
+            }
+        }
+
+        public Button NextTrack
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.NextTrack;
+            }
+        }
+
+        public Button Pause
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Pause;
+            }
+        }
+
+        public Button Play
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Play;
+            }
+        }
+
+        public Button Power
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Power;
+            }
+        }
+
+        public Button PreviousTrack
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.PreviousTrack;
+            }
+        }
+
+        public Button Record
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Record;
+            }
+        }
+
+        public Button Red
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Red;
+            }
+        }
+
+        public Button Rewind
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Rewind;
+            }
+        }
+
+        public Button Stop
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Stop;
+            }
+        }
+
+        public Button VolumeDown
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.VolumeDown;
+            }
+        }
+
+        public Button VolumeUp
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.VolumeUp;
+            }
+        }
+
+        public Button Yellow
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Yellow;
+            }
+        }
+
+        #endregion
+
+        #region IButton Members
+
+        public CrestronCollection<Button> Button
+        {
+            get { return Buttons; }
+        }
+
+        public event ButtonEventHandler ButtonStateChange;
+
+        public delegate void EssentialsButtonEventHandler(EssentialsDevice device, ButtonEventArgs args);
+
+        public event EssentialsButtonEventHandler EssentialsButtonStateChange;
+
+        #endregion
     }
 }

From fdae50a9721f5ecd6432f96903d587c3a3afc870 Mon Sep 17 00:00:00 2001
From: Nick Genovese <ngenovese@pepperdash.com>
Date: Mon, 31 Aug 2020 15:34:12 -0400
Subject: [PATCH 02/89] Adds a generic queue and string/byte implementations. 
 Also adds a class that processes string responses from a IBasicCommunication
 or Gather

---
 .../PepperDash_Essentials_Core.csproj         |  11 +-
 .../Queues/BytesQueue.cs                      |  67 ++++++++
 .../Queues/GenericQueue.cs                    | 156 ++++++++++++++++++
 .../PepperDashEssentialsBase/Queues/IQueue.cs |  15 ++
 .../Queues/StringQueue.cs                     |  66 ++++++++
 .../Queues/StringResponseProcessor.cs         | 104 ++++++++++++
 .../PepperDash_Essentials_DM.csproj           |   6 +-
 .../Essentials Devices Common.csproj          |   6 +-
 8 files changed, 422 insertions(+), 9 deletions(-)
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/BytesQueue.cs
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/IQueue.cs
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringQueue.cs
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringResponseProcessor.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index c31a46b8..fad95abf 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -98,12 +98,12 @@
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -113,7 +113,7 @@
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -158,6 +158,7 @@
     <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
+    <Compile Include="Queues\BytesQueue.cs" />
     <Compile Include="Comm and IR\CecPortController.cs" />
     <Compile Include="Comm and IR\CommFactory.cs" />
     <Compile Include="Comm and IR\CommunicationExtras.cs" />
@@ -222,8 +223,10 @@
     <Compile Include="Fusion\FusionRviDataClasses.cs" />
     <Compile Include="Gateways\CenRfgwController.cs" />
     <Compile Include="Gateways\EssentialsRfGatewayConfig.cs" />
+    <Compile Include="Queues\GenericQueue.cs" />
     <Compile Include="Global\JobTimer.cs" />
     <Compile Include="Global\Scheduler.cs" />
+    <Compile Include="Queues\IQueue.cs" />
     <Compile Include="JoinMaps\JoinMapBase.cs" />
     <Compile Include="Lighting\Lighting Interfaces.cs" />
     <Compile Include="Lighting\LightingBase.cs" />
@@ -313,6 +316,8 @@
     <Compile Include="SmartObjects\SmartObjectDPad.cs" />
     <Compile Include="SmartObjects\SmartObjectHelperBase.cs" />
     <Compile Include="Routing\TieLine.cs" />
+    <Compile Include="Queues\StringQueue.cs" />
+    <Compile Include="Queues\StringResponseProcessor.cs" />
     <Compile Include="Timers\CountdownTimer.cs" />
     <Compile Include="Touchpanels\CrestronTouchpanelPropertiesConfig.cs" />
     <Compile Include="Touchpanels\Interfaces.cs" />
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/BytesQueue.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/BytesQueue.cs
new file mode 100644
index 00000000..aad96cf1
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/BytesQueue.cs	
@@ -0,0 +1,67 @@
+using System;
+using PepperDash.Core;
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// Byte implementation of Action queue
+    /// </summary>
+    public class BytesQueue : IQueue<byte[]>
+    {
+        private readonly IQueue<byte[]> _queue;
+
+        /// <summary>
+        /// Constructor for BytesQueue
+        /// </summary>
+        /// <param name="key">Key</param>
+        /// <param name="processBytesAction">Action to process queued bytes</param>
+        public BytesQueue(string key, Action<byte[]> processBytesAction)
+        {
+            _queue = new GenericQueue<byte[]>(key, processBytesAction);
+        }
+
+        /// <summary>
+        /// Constructor for BytesQueue
+        /// </summary>
+        /// <param name="key">Key</param>
+        /// <param name="processBytesAction">Action to process queued bytes</param>
+        /// <param name="pacing">Delay in ms between actions being invoked</param>
+        public BytesQueue(string key, Action<byte[]> processBytesAction, int pacing)
+        {
+            _queue = new GenericQueue<byte[]>(key, processBytesAction, pacing);
+        }
+
+        /// <summary>
+        /// Enqueue a byte array to be processed
+        /// </summary>
+        /// <param name="item">Byte array to be processed</param>
+        public void Enqueue(byte[] item)
+        {
+            _queue.Enqueue(item);
+        }
+
+        /// <summary>
+        /// If the instance has been disposed
+        /// </summary>
+        public bool Disposed
+        {
+            get { return _queue.Disposed; }
+        }
+
+        /// <summary>
+        /// Key
+        /// </summary>
+        public string Key
+        {
+            get { return _queue.Key; }
+        }
+
+        /// <summary>
+        /// Disposes of resources
+        /// </summary>
+        public void Dispose()
+        {
+            _queue.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
new file mode 100644
index 00000000..6a06cab8
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs	
@@ -0,0 +1,156 @@
+using System;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.CrestronThread;
+using PepperDash.Core;
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// Threadsafe processing of queued items with pacing if required
+    /// </summary>
+    /// <typeparam name="T">Type of item to be processed</typeparam>
+    public class GenericQueue<T> : IQueue<T> where T : class
+    {
+        private readonly string _key;
+        protected readonly CrestronQueue<T> _queue;
+        protected readonly Thread _worker;
+        protected readonly CEvent _waitHandle = new CEvent();
+        
+        private readonly bool _delayEnabled;
+        private readonly int _delayTime;
+        
+        /// <summary>
+        /// If the instance has been disposed.
+        /// </summary>
+        public bool Disposed { get; private set; }
+
+        /// <summary>
+        /// Constructor for generic queue with no pacing
+        /// </summary>
+        /// <param name="key">Key</param>
+        /// <param name="processQueueAction">Action to process items in the queue</param>
+        public GenericQueue(string key, Action<T> processQueueAction)
+        {
+            _key = key;
+            _queue = new CrestronQueue<T>();
+            _worker = new Thread(ProcessQueue, processQueueAction, Thread.eThreadStartOptions.Running);
+
+            CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
+            {
+                if (programEvent != eProgramStatusEventType.Stopping)
+                    return;
+
+                Dispose();
+            };
+        }
+
+        /// <summary>
+        /// Constructor for generic queue with no pacing
+        /// </summary>
+        /// <param name="key">Key</param>
+        /// <param name="processQueueAction">Action to process items in the queue</param>
+        /// <param name="pacing">Pacing in ms between actions</param>
+        public GenericQueue(string key, Action<T> processQueueAction, int pacing)
+            : this(key, processQueueAction)
+        {
+            _delayEnabled = pacing > 0;
+            _delayTime = pacing;
+        }
+
+        /// <summary>
+        /// Thread callback
+        /// </summary>
+        /// <param name="obj">The action used to process dequeued items</param>
+        /// <returns>Null when the thread is exited</returns>
+        private object ProcessQueue(object obj)
+        {
+            var action = obj as Action<T>;
+            if (action == null)
+                throw new ArgumentNullException("obj");
+
+            while (true)
+            {
+                T item = null;
+
+                if (_queue.Count > 0)
+                {
+                    item = _queue.Dequeue();
+                    if (item == null)
+                        break;
+                }
+                if (item != null)
+                {
+                    try
+                    {
+                        Debug.Console(2, this, "Processing queue item: '{0}'", item.ToString());
+                        action(item);
+
+                        if (_delayEnabled)
+                            Thread.Sleep(_delayTime);
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.ConsoleWithLog(0, this, "Caught an exception in the ComsQueue {0}\r{1}\r{2}", ex.Message, ex.InnerException, ex.StackTrace);
+                    }
+                }
+                else _waitHandle.Wait();
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Enqueues an item and processes the queue.  If 'null' is enqueued the thread will close and
+        /// the class must be reinstantiated.
+        /// </summary>
+        /// <param name="item">Item to be processed</param>
+        public virtual void Enqueue(T item)
+        {
+            _queue.Enqueue(item);
+            _waitHandle.Set();
+        }
+
+        /// <summary>
+        /// Disposes the thread and cleans up resources.  Thread cannot be restarted once
+        /// disposed.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            CrestronEnvironment.GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Actually does the disposing.  If you override this method, be sure to either call the base implementation 
+        /// or clean up all the resources yourself.
+        /// </summary>
+        /// <param name="disposing">set to true unless called from finalizer</param>
+        protected void Dispose(bool disposing)
+        {
+            if (Disposed)
+                return;
+
+            if (disposing)
+            {
+                Enqueue(null);
+                _worker.Join();
+                _waitHandle.Close();
+            }
+
+            Disposed = true;
+        }
+
+        ~GenericQueue()
+        {
+            Dispose(false);
+        }
+
+        /// <summary>
+        /// Key
+        /// </summary>
+        public string Key
+        {
+            get { return _key; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/IQueue.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/IQueue.cs
new file mode 100644
index 00000000..9d69f7fa
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/IQueue.cs	
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    public interface IQueue<T> : IKeyed, IDisposable where T : class
+    {
+        void Enqueue(T item);
+        bool Disposed { get; }
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringQueue.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringQueue.cs
new file mode 100644
index 00000000..2be49f74
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringQueue.cs	
@@ -0,0 +1,66 @@
+using System;
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// String implementation of Action Queue
+    /// </summary>
+    public class StringQueue : IQueue<string>
+    {
+        private readonly IQueue<string> _queue;
+
+        /// <summary>
+        /// Constructor for BytesQueue
+        /// </summary>
+        /// <param name="key">Key</param>
+        /// <param name="processStringAction">Action to process queued strings</param>
+        public StringQueue(string key, Action<string> processStringAction)
+        {
+            _queue = new GenericQueue<string>(key, processStringAction);
+        }
+
+        /// <summary>
+        /// Constructor for StringQueue
+        /// </summary>
+        /// <param name="key">Key</param>
+        /// <param name="processStringAction">Action to process queued strings</param>
+        /// <param name="pacing">Delay in ms between actions being invoked</param>
+        public StringQueue(string key, Action<string> processStringAction, int pacing)
+        {
+            _queue = new GenericQueue<string>(key, processStringAction, pacing);
+        }
+
+        /// <summary>
+        /// Enqueue a byte array to be processed
+        /// </summary>
+        /// <param name="item">Byte array to be processed</param>
+        public void Enqueue(string item)
+        {
+            _queue.Enqueue(item);
+        }
+
+        /// <summary>
+        /// Key
+        /// </summary>
+        public string Key
+        {
+            get { return _queue.Key; }
+        }
+
+        /// <summary>
+        /// Disposes of resources
+        /// </summary>
+        public void Dispose()
+        {
+            _queue.Dispose();
+        }
+
+        /// <summary>
+        /// If the instance has been disposed
+        /// </summary>
+        public bool Disposed
+        {
+            get { return _queue.Disposed; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringResponseProcessor.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringResponseProcessor.cs
new file mode 100644
index 00000000..a3c90689
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringResponseProcessor.cs	
@@ -0,0 +1,104 @@
+using System;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    public sealed class StringResponseProcessor : IKeyed, IDisposable
+    {
+        private readonly IQueue<string> _queue;
+        private readonly IBasicCommunication _coms;
+        private readonly CommunicationGather _gather;
+
+        private StringResponseProcessor(string key, Action<string> processStringAction)
+        {
+            _queue = new StringQueue(key, processStringAction);
+
+            CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
+            {
+                if (programEvent != eProgramStatusEventType.Stopping)
+                    return;
+
+                Dispose();
+            };
+        }
+
+        /// <summary>
+        /// Constructor that builds an instance and subscribes to coms TextReceived for processing
+        /// </summary>
+        /// <param name="coms">Com port to process strings from</param>
+        /// <param name="processStringAction">Action to process the incoming strings</param>
+        public StringResponseProcessor(IBasicCommunication coms, Action<string> processStringAction)
+            : this(coms.Key, processStringAction)
+        {
+            _coms = coms;
+            coms.TextReceived += OnResponseReceived;
+        }
+
+        /// <summary>
+        /// Constructor that builds an instance and subscribes to gather Line Received for processing
+        /// </summary>
+        /// <param name="gather">Gather to process strings from</param>
+        /// <param name="processStringAction">Action to process the incoming strings</param>
+        public StringResponseProcessor(CommunicationGather gather, Action<string> processStringAction)
+            : this(gather.Port.Key, processStringAction)
+        {
+            _gather = gather;
+            gather.LineReceived += OnResponseReceived;
+        }
+
+        private void OnResponseReceived(object sender, GenericCommMethodReceiveTextArgs args)
+        {
+            _queue.Enqueue(args.Text);
+        }
+
+        /// <summary>
+        /// Key
+        /// </summary>
+        public string Key
+        {
+            get { return _queue.Key; }
+        }
+
+        /// <summary>
+        /// Disposes the instance and cleans up resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            CrestronEnvironment.GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (Disposed)
+                return;
+
+            if (disposing)
+            {
+                if (_coms != null)
+                    _coms.TextReceived -= OnResponseReceived;
+
+                if (_gather != null)
+                {
+                    _gather.LineReceived -= OnResponseReceived;
+                    _gather.Stop();
+                }
+
+                _queue.Dispose();
+            }
+
+            Disposed = true;
+        }
+
+        /// <summary>
+        /// If the instance has been disposed or not.  If it has, you can not use it anymore
+        /// </summary>
+        public bool Disposed { get; private set; }
+
+        ~StringResponseProcessor()
+        {
+            Dispose(false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj b/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj
index a8843496..7c8b163a 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj	
+++ b/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj	
@@ -68,12 +68,12 @@
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -83,7 +83,7 @@
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
index 7c978bd8..22a1dc1d 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
@@ -77,12 +77,12 @@
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -92,7 +92,7 @@
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">

From 741f69473348ec5b3ab8198d8c8064f8c8f578b2 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 2 Sep 2020 16:54:01 -0600
Subject: [PATCH 03/89] add genericIrController class

---
 .../Devices/GenericIRController.cs            | 50 +++++++++++++++++++
 .../Devices/IrOutputPortController.cs         |  2 +
 essentials-framework/pepperdashcore-builds    |  2 +-
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs
new file mode 100644
index 00000000..7dcac922
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs	
@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash_Essentials_Core.Devices
+{
+    public class GenericIRController: EssentialsBridgeableDevice
+    {
+        private readonly IrOutputPortController _port;
+
+        public GenericIRController(string key, string name, IrOutputPortController irPort) : base(key, name)
+        {
+            _port = irPort;
+
+            DeviceManager.AddDevice(_port);
+        }
+
+        #region Overrides of EssentialsBridgeableDevice
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        #endregion
+    }
+
+    public class GenericIrControllerFactory : EssentialsDeviceFactory<GenericIRController>
+    {
+        public GenericIrControllerFactory()
+        {
+            TypeNames = new List<string> {"genericIrController"};
+        }
+        #region Overrides of EssentialsDeviceFactory<GenericIRController>
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new Generic IR Controller Device");
+
+            var irPort = IRPortHelper.GetIrOutputPortController(dc);
+
+            return new GenericIRController(dc.Key, dc.Name, irPort);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs
index ff884007..49d4b7f3 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs	
@@ -35,6 +35,8 @@ namespace PepperDash.Essentials.Core
 			: base(key)
 		{
 			//if (port == null) throw new ArgumentNullException("port");
+
+		    DriverLoaded = new BoolFeedback(() => DriverIsLoaded);
 			IrPort = port;
 			if (port == null)
 			{
diff --git a/essentials-framework/pepperdashcore-builds b/essentials-framework/pepperdashcore-builds
index 18cb0c27..b64665a6 160000
--- a/essentials-framework/pepperdashcore-builds
+++ b/essentials-framework/pepperdashcore-builds
@@ -1 +1 @@
-Subproject commit 18cb0c273eb8b750f657d74160ad82eff1b24bca
+Subproject commit b64665a60ebfa8cd4dc680acccb3ef0d94cbbf82

From 9526b9b6febe85a424ee2214b6f3895188520eb0 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 2 Sep 2020 17:18:08 -0600
Subject: [PATCH 04/89] added feedback for IrOutputController and added join
 map

---
 .../Devices/GenericIRController.cs            | 85 +++++++++++++++++--
 .../Devices/IrOutputPortController.cs         |  8 +-
 .../PepperDash_Essentials_Core.csproj         |  1 +
 3 files changed, 85 insertions(+), 9 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs
index 7dcac922..13d851f2 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs	
@@ -1,5 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
@@ -7,28 +9,97 @@ using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash_Essentials_Core.Devices
 {
-    public class GenericIRController: EssentialsBridgeableDevice
+    public class GenericIrController: EssentialsBridgeableDevice
     {
-        private readonly IrOutputPortController _port;
+        //data storage for bridging
+        private BasicTriList _trilist;
+        private uint _joinStart;
+        private string _joinMapKey;
+        private EiscApiAdvanced _bridge;
 
-        public GenericIRController(string key, string name, IrOutputPortController irPort) : base(key, name)
+        private readonly IrOutputPortController _port; 
+
+        public GenericIrController(string key, string name, IrOutputPortController irPort) : base(key, name)
         {
             _port = irPort;
 
             DeviceManager.AddDevice(_port);
+
+            _port.DriverLoaded.OutputChange += DriverLoadedOnOutputChange;
+        }
+
+        private void DriverLoadedOnOutputChange(object sender, FeedbackEventArgs args)
+        {
+            if (!args.BoolValue)
+            {
+                return;
+            }
+
+            LinkToApi(_trilist, _joinStart, _joinMapKey, _bridge);
         }
 
         #region Overrides of EssentialsBridgeableDevice
 
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
-            throw new System.NotImplementedException();
+            //if driver isn't loaded yet, store the variables until it is loaded, then call the LinkToApi method again
+            if (!_port.DriverIsLoaded)
+            {
+                _trilist = trilist;
+                _joinStart = joinStart;
+                _joinMapKey = joinMapKey;
+                _bridge = bridge;
+                return;
+            }
+
+            var joinMap = new GenericIrControllerJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<GenericIrControllerJoinMap>(joinMapSerialized);
+
+            for (uint i = 0; i < _port.IrFileCommands.Length; i++)
+            {
+                joinMap.Joins.Add(_port.IrFileCommands[i],
+                    new JoinDataComplete(new JoinData {JoinNumber = i + joinStart, JoinSpan = 1},
+                        new JoinMetadata
+                        {
+                            Description = _port.IrFileCommands[i],
+                            JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                            JoinType = eJoinType.Digital
+                        }));
+
+                var index = i;
+                trilist.SetBoolSigAction(i + joinStart, (b) => Press(_port.IrFileCommands[index], b));
+            }
+
+            if (bridge != null)
+            {
+                bridge.AddJoinMap(Key, joinMap);
+            }
+            else
+            {
+                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+            }
         }
 
         #endregion
+
+        public void Press(string command, bool pressRelease)
+        {
+            _port.PressRelease(command, pressRelease);
+        }
     }
 
-    public class GenericIrControllerFactory : EssentialsDeviceFactory<GenericIRController>
+    public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
+    {
+        public GenericIrControllerJoinMap(uint joinStart) : base(joinStart)
+        {
+        }
+    }
+
+    public class GenericIrControllerFactory : EssentialsDeviceFactory<GenericIrController>
     {
         public GenericIrControllerFactory()
         {
@@ -42,7 +113,7 @@ namespace PepperDash_Essentials_Core.Devices
 
             var irPort = IRPortHelper.GetIrOutputPortController(dc);
 
-            return new GenericIRController(dc.Key, dc.Name, irPort);
+            return new GenericIrController(dc.Key, dc.Name, irPort);
         }
 
         #endregion
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs
index 49d4b7f3..5099f7d0 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs	
@@ -21,6 +21,8 @@ namespace PepperDash.Essentials.Core
 		uint IrPortUid;
 		IROutputPort IrPort;
 
+        public BoolFeedback DriverLoaded { get; private set; }
+
 		public ushort StandardIrPulseTime { get; set; }
 		public string DriverFilepath { get; private set; }
 		public bool DriverIsLoaded { get; private set; }
@@ -93,13 +95,15 @@ namespace PepperDash.Essentials.Core
 	            DriverFilepath = path;
 	            StandardIrPulseTime = 200;
 	            DriverIsLoaded = true;
+
+                DriverLoaded.FireUpdate();
 	        }
 			catch
 			{
 				DriverIsLoaded = false;
 				var message = string.Format("WARNING IR Driver '{0}' failed to load", path);
-				Debug.Console(0, this, message);
-				ErrorLog.Error(message);
+				Debug.Console(0, this, Debug.ErrorLogLevel.Error, message);
+                DriverLoaded.FireUpdate();
 			}
 		}
 
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index c31a46b8..06978313 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -200,6 +200,7 @@
     <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
     <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
     <Compile Include="Devices\EssentialsDevice.cs" />
+    <Compile Include="Devices\GenericIRController.cs" />
     <Compile Include="Devices\IProjectorInterfaces.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />

From 8a98924ad7c045ce9a43e902656cb572c0f490e5 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 2 Sep 2020 21:03:24 -0600
Subject: [PATCH 05/89] Use joinData methods to set offset to get joins in the
 right spot

---
 .../Devices/GenericIRController.cs            | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs
index 13d851f2..f8486b76 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs	
@@ -61,17 +61,20 @@ namespace PepperDash_Essentials_Core.Devices
 
             for (uint i = 0; i < _port.IrFileCommands.Length; i++)
             {
-                joinMap.Joins.Add(_port.IrFileCommands[i],
-                    new JoinDataComplete(new JoinData {JoinNumber = i + joinStart, JoinSpan = 1},
-                        new JoinMetadata
-                        {
-                            Description = _port.IrFileCommands[i],
-                            JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                            JoinType = eJoinType.Digital
-                        }));
+                var joinData = new JoinDataComplete(new JoinData {JoinNumber = i + joinStart, JoinSpan = 1},
+                    new JoinMetadata
+                    {
+                        Description = _port.IrFileCommands[i],
+                        JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                        JoinType = eJoinType.Digital
+                    });
+
+                joinData.SetJoinOffset(joinStart);
+
+                joinMap.Joins.Add(_port.IrFileCommands[i],joinData);
 
                 var index = i;
-                trilist.SetBoolSigAction(i + joinStart, (b) => Press(_port.IrFileCommands[index], b));
+                trilist.SetBoolSigAction(joinData.JoinNumber, (b) => Press(_port.IrFileCommands[index], b));
             }
 
             if (bridge != null)

From ceef883ad8d059d223120b4f9824b255235da243 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 2 Sep 2020 23:59:26 -0600
Subject: [PATCH 06/89] fixed some null refs and got join map being created
 correctly

---
 .../Devices/GenericIRController.cs            | 22 ++++++++++++++-----
 .../Devices/IrOutputPortController.cs         |  3 ++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs
index f8486b76..f942a0f2 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs	
@@ -23,6 +23,11 @@ namespace PepperDash_Essentials_Core.Devices
         {
             _port = irPort;
 
+            if (_port == null)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Error, "IR Port is null, device will not function");
+                return;
+            }
             DeviceManager.AddDevice(_port);
 
             _port.DriverLoaded.OutputChange += DriverLoadedOnOutputChange;
@@ -35,6 +40,11 @@ namespace PepperDash_Essentials_Core.Devices
                 return;
             }
 
+            if (_trilist == null || _bridge == null)
+            {
+                return;
+            }
+
             LinkToApi(_trilist, _joinStart, _joinMapKey, _bridge);
         }
 
@@ -61,22 +71,24 @@ namespace PepperDash_Essentials_Core.Devices
 
             for (uint i = 0; i < _port.IrFileCommands.Length; i++)
             {
-                var joinData = new JoinDataComplete(new JoinData {JoinNumber = i + joinStart, JoinSpan = 1},
+                var cmd = _port.IrFileCommands[i];
+                var joinData = new JoinDataComplete(new JoinData {JoinNumber = i, JoinSpan = 1},
                     new JoinMetadata
                     {
-                        Description = _port.IrFileCommands[i],
+                        Description = cmd,
                         JoinCapabilities = eJoinCapabilities.FromSIMPL,
                         JoinType = eJoinType.Digital
                     });
 
                 joinData.SetJoinOffset(joinStart);
 
-                joinMap.Joins.Add(_port.IrFileCommands[i],joinData);
+                joinMap.Joins.Add(cmd,joinData);
 
-                var index = i;
-                trilist.SetBoolSigAction(joinData.JoinNumber, (b) => Press(_port.IrFileCommands[index], b));
+                trilist.SetBoolSigAction(joinData.JoinNumber, (b) => Press(cmd, b));
             }
 
+            joinMap.PrintJoinMapInfo();
+
             if (bridge != null)
             {
                 bridge.AddJoinMap(Key, joinMap);
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs
index 5099f7d0..cce1d46e 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs	
@@ -52,6 +52,7 @@ namespace PepperDash.Essentials.Core
 	        DeviceConfig config)
 	        : base(key)
 	    {
+            DriverLoaded = new BoolFeedback(() => DriverIsLoaded);
             AddPostActivationAction(() =>
             {
                 IrPort = postActivationFunc(config);
@@ -63,7 +64,7 @@ namespace PepperDash.Essentials.Core
                 }
                 
                 var filePath = Global.FilePathPrefix + "ir" + Global.DirectorySeparator + config.Properties["control"]["irFile"].Value<string>();
-                Debug.Console(1, "*************Attemting to load IR file: {0}***************", filePath);
+                Debug.Console(1, "*************Attempting to load IR file: {0}***************", filePath);
 
                 LoadDriver(filePath);
                     

From 7248e907626f82708dbb903beefd69b876528ca6 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 3 Sep 2020 00:01:25 -0600
Subject: [PATCH 07/89] add property to get IR Commands for Essentials

---
 .../PepperDashEssentialsBase/Devices/GenericIRController.cs     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs
index f942a0f2..bf4544de 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs	
@@ -19,6 +19,8 @@ namespace PepperDash_Essentials_Core.Devices
 
         private readonly IrOutputPortController _port; 
 
+        public string[] IrCommands {get { return _port.IrFileCommands; }}
+
         public GenericIrController(string key, string name, IrOutputPortController irPort) : base(key, name)
         {
             _port = irPort;

From 7cd3a143a002e2e22cefc5f8b16bd39d60d50a3c Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 3 Sep 2020 08:00:16 -0600
Subject: [PATCH 08/89] Adds Essentials core as a project reference

---
 PepperDashEssentials/PepperDashEssentials.csproj       |  8 ++++----
 .../Essentials Devices Common.csproj                   | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials.csproj
index ed178abc..cd8062ce 100644
--- a/PepperDashEssentials/PepperDashEssentials.csproj
+++ b/PepperDashEssentials/PepperDashEssentials.csproj
@@ -75,10 +75,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
-    <Reference Include="PepperDash_Essentials_DM, Version=1.0.0.19343, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\essentials-framework\Essentials DM\Essentials_DM\bin\PepperDash_Essentials_DM.dll</HintPath>
-    </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
@@ -215,6 +211,10 @@
       <Project>{892B761C-E479-44CE-BD74-243E9214AF13}</Project>
       <Name>Essentials Devices Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\essentials-framework\Essentials DM\Essentials_DM\PepperDash_Essentials_DM.csproj">
+      <Project>{9199CE8A-0C9F-4952-8672-3EED798B284F}</Project>
+      <Name>PepperDash_Essentials_DM</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
index 7c978bd8..00612bab 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
@@ -71,10 +71,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
-    <Reference Include="PepperDash_Essentials_Core, Version=0.0.0.22043, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Essentials Core\PepperDashEssentialsBase\bin\PepperDash_Essentials_Core.dll</HintPath>
-    </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
@@ -187,6 +183,12 @@
     <Compile Include="VideoCodec\ZoomRoom\ZoomRoomPropertiesConfig.cs" />
     <None Include="Properties\ControlSystem.cfg" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj">
+      <Project>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</Project>
+      <Name>PepperDash_Essentials_Core</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>

From b9fff952150ea86a5c0926ea024e32b25d7d0b33 Mon Sep 17 00:00:00 2001
From: Nick Genovese <ngenovese@pepperdash.com>
Date: Thu, 3 Sep 2020 10:57:06 -0400
Subject: [PATCH 09/89] added IQueueMessage and two implementations;
 GenericQueue now accepts type IQueueMessage

---
 .../Crestron/CrestronGenericBaseDevice.cs     |  2 +-
 .../PepperDash_Essentials_Core.csproj         |  5 +-
 .../Queues/BytesQueue.cs                      | 67 -----------------
 .../Queues/ComsMessage.cs                     | 73 +++++++++++++++++++
 .../Queues/GenericQueue.cs                    | 36 +++------
 .../PepperDashEssentialsBase/Queues/IQueue.cs |  2 +-
 .../Queues/IQueueMessage.cs                   |  7 ++
 .../Queues/ProcessStringMessage.cs            | 44 +++++++++++
 .../Queues/StringQueue.cs                     | 66 -----------------
 .../Queues/StringResponseProcessor.cs         |  8 +-
 10 files changed, 146 insertions(+), 164 deletions(-)
 delete mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/BytesQueue.cs
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/ComsMessage.cs
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/IQueueMessage.cs
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/ProcessStringMessage.cs
 delete mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringQueue.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs
index 9db81122..56b36791 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs	
@@ -179,7 +179,7 @@ namespace PepperDash.Essentials.Core
 	{
 		public static eDeviceRegistrationUnRegistrationResponse RegisterWithLogging(this GenericBase device, string key)
 		{
-			var result = device.Register();
+		    var result = device.Register();
 			var level = result == eDeviceRegistrationUnRegistrationResponse.Success ?
 				Debug.ErrorLogLevel.Notice : Debug.ErrorLogLevel.Error;
 			Debug.Console(0, level, "Register device result: '{0}', type '{1}', result {2}", key, device, result);
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index fad95abf..077d46fa 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -158,7 +158,6 @@
     <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
-    <Compile Include="Queues\BytesQueue.cs" />
     <Compile Include="Comm and IR\CecPortController.cs" />
     <Compile Include="Comm and IR\CommFactory.cs" />
     <Compile Include="Comm and IR\CommunicationExtras.cs" />
@@ -223,6 +222,8 @@
     <Compile Include="Fusion\FusionRviDataClasses.cs" />
     <Compile Include="Gateways\CenRfgwController.cs" />
     <Compile Include="Gateways\EssentialsRfGatewayConfig.cs" />
+    <Compile Include="Queues\ComsMessage.cs" />
+    <Compile Include="Queues\ProcessStringMessage.cs" />
     <Compile Include="Queues\GenericQueue.cs" />
     <Compile Include="Global\JobTimer.cs" />
     <Compile Include="Global\Scheduler.cs" />
@@ -241,6 +242,7 @@
     <Compile Include="Plugins\PluginLoader.cs" />
     <Compile Include="Presets\PresetBase.cs" />
     <Compile Include="Plugins\IPluginDeviceFactory.cs" />
+    <Compile Include="Queues\IQueueMessage.cs" />
     <Compile Include="Ramps and Increments\ActionIncrementer.cs" />
     <Compile Include="Config\BasicConfig.cs" />
     <Compile Include="Config\ConfigPropertiesHelpers.cs" />
@@ -316,7 +318,6 @@
     <Compile Include="SmartObjects\SmartObjectDPad.cs" />
     <Compile Include="SmartObjects\SmartObjectHelperBase.cs" />
     <Compile Include="Routing\TieLine.cs" />
-    <Compile Include="Queues\StringQueue.cs" />
     <Compile Include="Queues\StringResponseProcessor.cs" />
     <Compile Include="Timers\CountdownTimer.cs" />
     <Compile Include="Touchpanels\CrestronTouchpanelPropertiesConfig.cs" />
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/BytesQueue.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/BytesQueue.cs
deleted file mode 100644
index aad96cf1..00000000
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/BytesQueue.cs	
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using PepperDash.Core;
-
-namespace PepperDash_Essentials_Core.Queues
-{
-    /// <summary>
-    /// Byte implementation of Action queue
-    /// </summary>
-    public class BytesQueue : IQueue<byte[]>
-    {
-        private readonly IQueue<byte[]> _queue;
-
-        /// <summary>
-        /// Constructor for BytesQueue
-        /// </summary>
-        /// <param name="key">Key</param>
-        /// <param name="processBytesAction">Action to process queued bytes</param>
-        public BytesQueue(string key, Action<byte[]> processBytesAction)
-        {
-            _queue = new GenericQueue<byte[]>(key, processBytesAction);
-        }
-
-        /// <summary>
-        /// Constructor for BytesQueue
-        /// </summary>
-        /// <param name="key">Key</param>
-        /// <param name="processBytesAction">Action to process queued bytes</param>
-        /// <param name="pacing">Delay in ms between actions being invoked</param>
-        public BytesQueue(string key, Action<byte[]> processBytesAction, int pacing)
-        {
-            _queue = new GenericQueue<byte[]>(key, processBytesAction, pacing);
-        }
-
-        /// <summary>
-        /// Enqueue a byte array to be processed
-        /// </summary>
-        /// <param name="item">Byte array to be processed</param>
-        public void Enqueue(byte[] item)
-        {
-            _queue.Enqueue(item);
-        }
-
-        /// <summary>
-        /// If the instance has been disposed
-        /// </summary>
-        public bool Disposed
-        {
-            get { return _queue.Disposed; }
-        }
-
-        /// <summary>
-        /// Key
-        /// </summary>
-        public string Key
-        {
-            get { return _queue.Key; }
-        }
-
-        /// <summary>
-        /// Disposes of resources
-        /// </summary>
-        public void Dispose()
-        {
-            _queue.Dispose();
-        }
-    }
-}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/ComsMessage.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/ComsMessage.cs
new file mode 100644
index 00000000..92c97248
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/ComsMessage.cs	
@@ -0,0 +1,73 @@
+using System;
+using PepperDash.Core;
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// IBasicCommunication Message for IQueue
+    /// </summary>
+    public class ComsMessage : IQueueMessage
+    {
+        private readonly byte[] _bytes;
+        private readonly IBasicCommunication _coms;
+        private readonly string _string;
+        private readonly bool _isByteMessage;
+
+        /// <summary>
+        /// Constructor for a string message
+        /// </summary>
+        /// <param name="coms">IBasicCommunication to send the message</param>
+        /// <param name="message">Message to send</param>
+        public ComsMessage(IBasicCommunication coms, string message)
+        {
+            Validate(coms, message);
+            _coms = coms;
+            _string = message;
+        }
+
+        /// <summary>
+        /// Constructor for a byte message
+        /// </summary>
+        /// <param name="coms">IBasicCommunication to send the message</param>
+        /// <param name="message">Message to send</param>
+        public ComsMessage(IBasicCommunication coms, byte[] message)
+        {
+            Validate(coms, message);
+            _coms = coms;
+            _bytes = message;
+            _isByteMessage = true;
+        }
+
+        private void Validate(IBasicCommunication coms, object message)
+        {
+            if (_coms == null)
+                throw new ArgumentNullException("coms");
+
+            if (message == null)
+                throw new ArgumentNullException("message");
+        }
+
+        /// <summary>
+        /// Dispatchs the string/byte[] to the IBasicCommunication specified
+        /// </summary>
+        public void Dispatch()
+        {
+            if (_isByteMessage)
+            {
+                _coms.SendBytes(_bytes);
+            }
+            else
+            {
+                _coms.SendText(_string);
+            }
+        }
+
+        /// <summary>
+        /// Shows either the byte[] or string to be sent
+        /// </summary>
+        public override string ToString()
+        {
+            return _bytes != null ? _bytes.ToString() : _string;
+        }
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
index 6a06cab8..1f27fe1e 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs	
@@ -8,17 +8,16 @@ namespace PepperDash_Essentials_Core.Queues
     /// <summary>
     /// Threadsafe processing of queued items with pacing if required
     /// </summary>
-    /// <typeparam name="T">Type of item to be processed</typeparam>
-    public class GenericQueue<T> : IQueue<T> where T : class
+    public class GenericQueue : IQueue<IQueueMessage>
     {
         private readonly string _key;
-        protected readonly CrestronQueue<T> _queue;
+        protected readonly CrestronQueue<IQueueMessage> _queue;
         protected readonly Thread _worker;
         protected readonly CEvent _waitHandle = new CEvent();
         
         private readonly bool _delayEnabled;
         private readonly int _delayTime;
-        
+
         /// <summary>
         /// If the instance has been disposed.
         /// </summary>
@@ -28,12 +27,11 @@ namespace PepperDash_Essentials_Core.Queues
         /// Constructor for generic queue with no pacing
         /// </summary>
         /// <param name="key">Key</param>
-        /// <param name="processQueueAction">Action to process items in the queue</param>
-        public GenericQueue(string key, Action<T> processQueueAction)
+        public GenericQueue(string key)
         {
             _key = key;
-            _queue = new CrestronQueue<T>();
-            _worker = new Thread(ProcessQueue, processQueueAction, Thread.eThreadStartOptions.Running);
+            _queue = new CrestronQueue<IQueueMessage>();
+            _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running);
 
             CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
             {
@@ -48,10 +46,9 @@ namespace PepperDash_Essentials_Core.Queues
         /// Constructor for generic queue with no pacing
         /// </summary>
         /// <param name="key">Key</param>
-        /// <param name="processQueueAction">Action to process items in the queue</param>
         /// <param name="pacing">Pacing in ms between actions</param>
-        public GenericQueue(string key, Action<T> processQueueAction, int pacing)
-            : this(key, processQueueAction)
+        public GenericQueue(string key, int pacing)
+            : this(key)
         {
             _delayEnabled = pacing > 0;
             _delayTime = pacing;
@@ -64,13 +61,9 @@ namespace PepperDash_Essentials_Core.Queues
         /// <returns>Null when the thread is exited</returns>
         private object ProcessQueue(object obj)
         {
-            var action = obj as Action<T>;
-            if (action == null)
-                throw new ArgumentNullException("obj");
-
             while (true)
             {
-                T item = null;
+                IQueueMessage item = null;
 
                 if (_queue.Count > 0)
                 {
@@ -83,14 +76,14 @@ namespace PepperDash_Essentials_Core.Queues
                     try
                     {
                         Debug.Console(2, this, "Processing queue item: '{0}'", item.ToString());
-                        action(item);
+                        item.Dispatch();
 
                         if (_delayEnabled)
                             Thread.Sleep(_delayTime);
                     }
                     catch (Exception ex)
                     {
-                        Debug.ConsoleWithLog(0, this, "Caught an exception in the ComsQueue {0}\r{1}\r{2}", ex.Message, ex.InnerException, ex.StackTrace);
+                        Debug.ConsoleWithLog(0, this, "Caught an exception in the Queue {0}\r{1}\r{2}", ex.Message, ex.InnerException, ex.StackTrace);
                     }
                 }
                 else _waitHandle.Wait();
@@ -99,12 +92,7 @@ namespace PepperDash_Essentials_Core.Queues
             return null;
         }
 
-        /// <summary>
-        /// Enqueues an item and processes the queue.  If 'null' is enqueued the thread will close and
-        /// the class must be reinstantiated.
-        /// </summary>
-        /// <param name="item">Item to be processed</param>
-        public virtual void Enqueue(T item)
+        public void Enqueue(IQueueMessage item)
         {
             _queue.Enqueue(item);
             _waitHandle.Set();
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/IQueue.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/IQueue.cs
index 9d69f7fa..852542d5 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/IQueue.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/IQueue.cs	
@@ -7,7 +7,7 @@ using PepperDash.Core;
 
 namespace PepperDash_Essentials_Core.Queues
 {
-    public interface IQueue<T> : IKeyed, IDisposable where T : class
+    public interface IQueue<T> : IKeyed, IDisposable where T : class 
     {
         void Enqueue(T item);
         bool Disposed { get; }
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/IQueueMessage.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/IQueueMessage.cs
new file mode 100644
index 00000000..ee0d87d2
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/IQueueMessage.cs	
@@ -0,0 +1,7 @@
+namespace PepperDash_Essentials_Core.Queues
+{
+    public interface IQueueMessage
+    {
+        void Dispatch();
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/ProcessStringMessage.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/ProcessStringMessage.cs
new file mode 100644
index 00000000..a15f7231
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/ProcessStringMessage.cs	
@@ -0,0 +1,44 @@
+using System;
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// Message class for processing strings via an IQueue
+    /// </summary>
+    public class ProcessStringMessage : IQueueMessage
+    {
+        private readonly Action<string> _action;
+        private readonly string _message;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="message">Message to be processed</param>
+        /// <param name="action">Action to invoke on the message</param>
+        public ProcessStringMessage(string message, Action<string> action)
+        {
+            _message = message;
+            _action = action;
+        }
+
+        /// <summary>
+        /// Processes the string with the given action
+        /// </summary>
+        public void Dispatch()
+        {
+            if (_action == null || String.IsNullOrEmpty(_message))
+                return;
+
+            _action(_message);
+        }
+
+        /// <summary>
+        /// To string
+        /// </summary>
+        /// <returns>The current message</returns>
+        public override string ToString()
+        {
+            return _message ?? String.Empty;
+        }
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringQueue.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringQueue.cs
deleted file mode 100644
index 2be49f74..00000000
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringQueue.cs	
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-
-namespace PepperDash_Essentials_Core.Queues
-{
-    /// <summary>
-    /// String implementation of Action Queue
-    /// </summary>
-    public class StringQueue : IQueue<string>
-    {
-        private readonly IQueue<string> _queue;
-
-        /// <summary>
-        /// Constructor for BytesQueue
-        /// </summary>
-        /// <param name="key">Key</param>
-        /// <param name="processStringAction">Action to process queued strings</param>
-        public StringQueue(string key, Action<string> processStringAction)
-        {
-            _queue = new GenericQueue<string>(key, processStringAction);
-        }
-
-        /// <summary>
-        /// Constructor for StringQueue
-        /// </summary>
-        /// <param name="key">Key</param>
-        /// <param name="processStringAction">Action to process queued strings</param>
-        /// <param name="pacing">Delay in ms between actions being invoked</param>
-        public StringQueue(string key, Action<string> processStringAction, int pacing)
-        {
-            _queue = new GenericQueue<string>(key, processStringAction, pacing);
-        }
-
-        /// <summary>
-        /// Enqueue a byte array to be processed
-        /// </summary>
-        /// <param name="item">Byte array to be processed</param>
-        public void Enqueue(string item)
-        {
-            _queue.Enqueue(item);
-        }
-
-        /// <summary>
-        /// Key
-        /// </summary>
-        public string Key
-        {
-            get { return _queue.Key; }
-        }
-
-        /// <summary>
-        /// Disposes of resources
-        /// </summary>
-        public void Dispose()
-        {
-            _queue.Dispose();
-        }
-
-        /// <summary>
-        /// If the instance has been disposed
-        /// </summary>
-        public bool Disposed
-        {
-            get { return _queue.Disposed; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringResponseProcessor.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringResponseProcessor.cs
index a3c90689..7f6477a3 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringResponseProcessor.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/StringResponseProcessor.cs	
@@ -6,13 +6,15 @@ namespace PepperDash_Essentials_Core.Queues
 {
     public sealed class StringResponseProcessor : IKeyed, IDisposable
     {
-        private readonly IQueue<string> _queue;
+        private readonly Action<string> _processStringAction; 
+        private readonly IQueue<IQueueMessage> _queue;
         private readonly IBasicCommunication _coms;
         private readonly CommunicationGather _gather;
 
         private StringResponseProcessor(string key, Action<string> processStringAction)
         {
-            _queue = new StringQueue(key, processStringAction);
+            _processStringAction = processStringAction;
+            _queue = new GenericQueue(key);
 
             CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
             {
@@ -49,7 +51,7 @@ namespace PepperDash_Essentials_Core.Queues
 
         private void OnResponseReceived(object sender, GenericCommMethodReceiveTextArgs args)
         {
-            _queue.Enqueue(args.Text);
+            _queue.Enqueue(new ProcessStringMessage(args.Text, _processStringAction));
         }
 
         /// <summary>

From 006c5f8655e1e85981e5dfcd5d34520f969430a0 Mon Sep 17 00:00:00 2001
From: Neil Dorin <ndorin@pepperdash.com>
Date: Thu, 3 Sep 2020 15:17:00 -0600
Subject: [PATCH 10/89] Updates example config to include
 inputSlotSupportsHdcp2 object

---
 .../SIMPLBridgeExample_configurationFile.json             | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/PepperDashEssentials/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json b/PepperDashEssentials/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json
index f66add0c..e3d40f4a 100644
--- a/PepperDashEssentials/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json	
+++ b/PepperDashEssentials/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json	
@@ -225,6 +225,14 @@
             "2": "Output 2",
             "3": "Output 3",
             "4": "Output 4"
+          },
+          "inputSlotSupportsHdcp2":{
+            "1": "false",
+            "2": "false",
+            "3": "false",
+            "4": "false",
+            "5": "false",
+            "6": "false"
           }
         }
       },

From f416e12dac59ff5f614f113c69bd4dbca1fbee88 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 3 Sep 2020 16:40:12 -0600
Subject: [PATCH 11/89] remove PepperDashCore-Builds submodule

---
 .gitmodules | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 0abbfb4e..2d6bfa38 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "essentials-framework/pepperdashcore-builds"]
-	path = essentials-framework/pepperdashcore-builds
-	url = https://github.com/ndorin/PepperDashCore-Builds.git
 [submodule "Essentials-Template-UI"]
 	path = Essentials-Template-UI
 	url = https://github.com/PepperDash/Essentials-Template-UI.git

From 484e7c2102938fa5fc333e8125ba72899efd6206 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 3 Sep 2020 16:43:48 -0600
Subject: [PATCH 12/89] removed files for submodule

---
 essentials-framework/pepperdashcore-builds | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 essentials-framework/pepperdashcore-builds

diff --git a/essentials-framework/pepperdashcore-builds b/essentials-framework/pepperdashcore-builds
deleted file mode 160000
index b64665a6..00000000
--- a/essentials-framework/pepperdashcore-builds
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b64665a60ebfa8cd4dc680acccb3ef0d94cbbf82

From 9abac555c3884519b5fd480f8ce013bf3e0ed41e Mon Sep 17 00:00:00 2001
From: Trevor Payne <tpayne@pepperdash.com>
Date: Thu, 3 Sep 2020 23:42:48 -0500
Subject: [PATCH 13/89] Resolves #399

Added obvious ascii art and a friendly message whenever a local config is present.
---
 .../Config/Essentials/ConfigReader.cs         | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigReader.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigReader.cs
index b3fc7d89..8de89ab1 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigReader.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigReader.cs	
@@ -12,8 +12,27 @@ namespace PepperDash.Essentials.Core.Config
 	/// <summary>
 	/// Loads the ConfigObject from the file
 	/// </summary>
-	public class ConfigReader
-	{
+	public class ConfigReader
+	{
+	    public const string LocalConfigPresent =
+	        @"
+ _                     _   _____              __ _       
+| |                   | | /  __ \            / _(_)      
+| |     ___   ___ __ _| | | /  \/ ___  _ __ | |_ _  __ _ 
+| |    / _ \ / __/ _` | | | |    / _ \| '_ \|  _| |/ _` |
+| |___| (_) | (_| (_| | | | \__/\ (_) | | | | | | | (_| |
+\_____/\___/ \___\__,_|_|  \____/\___/|_| |_|_| |_|\__, |
+                                                    __/ |
+                                                   |___/ 
+______                         _     _ _ _               
+| ___ \                       | |   | | | |              
+| |_/ / __ ___  ___  ___ _ __ | |_  | | | |              
+|  __/ '__/ _ \/ __|/ _ \ '_ \| __| | | | |              
+| |  | | |  __/\__ \  __/ | | | |_  |_|_|_|              
+\_|  |_|  \___||___/\___|_| |_|\__| (_|_|_)              
+                                                         
+                                                         ";
+
 		public static EssentialsConfig ConfigObject { get; private set; }
 
 		public static bool LoadConfig2()
@@ -44,6 +63,8 @@ namespace PepperDash.Essentials.Core.Config
                     {
                         localConfigFound = true;
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Local config file: '{0}'", filePath);
+                        Debug.Console(0, LocalConfigPresent);
+                        Debug.Console(0, "Local config files are valid, but be sure this is your intention.  Spinning your wheels chasing down a configuration issue is not fun!");
                     }
                 }
                 else

From 6d9ea8a13c72d75479c06ba8dfcf96df503dae0b Mon Sep 17 00:00:00 2001
From: Trevor Payne <tpayne@pepperdash.com>
Date: Wed, 9 Sep 2020 09:34:52 -0500
Subject: [PATCH 14/89] Made the LocalConfig notice cleaner

Resolves #399
---
 .../Config/Essentials/ConfigReader.cs         | 100 +++++++++++++-----
 .../Receivers/DmRmc4kZScalerCController.cs    |   1 +
 2 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigReader.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigReader.cs
index 8de89ab1..48a026c2 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigReader.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigReader.cs	
@@ -1,5 +1,6 @@
 using System;
-using System.Linq;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json;
@@ -15,23 +16,10 @@ namespace PepperDash.Essentials.Core.Config
 	public class ConfigReader
 	{
 	    public const string LocalConfigPresent =
-	        @"
- _                     _   _____              __ _       
-| |                   | | /  __ \            / _(_)      
-| |     ___   ___ __ _| | | /  \/ ___  _ __ | |_ _  __ _ 
-| |    / _ \ / __/ _` | | | |    / _ \| '_ \|  _| |/ _` |
-| |___| (_) | (_| (_| | | | \__/\ (_) | | | | | | | (_| |
-\_____/\___/ \___\__,_|_|  \____/\___/|_| |_|_| |_|\__, |
-                                                    __/ |
-                                                   |___/ 
-______                         _     _ _ _               
-| ___ \                       | |   | | | |              
-| |_/ / __ ___  ___  ___ _ __ | |_  | | | |              
-|  __/ '__/ _ \/ __|/ _ \ '_ \| __| | | | |              
-| |  | | |  __/\__ \  __/ | | | |_  |_|_|_|              
-\_|  |_|  \___||___/\___|_| |_|\__| (_|_|_)              
-                                                         
-                                                         ";
+            @"
+***************************************************
+************* Using Local config file *************
+***************************************************";
 
 		public static EssentialsConfig ConfigObject { get; private set; }
 
@@ -59,12 +47,10 @@ ______                         _     _ _ _
                             "****Error: Multiple Local Configuration files present. Please ensure only a single file exists and reset program.****");
                         return false;
                     }
-                    else if(configFiles.Length == 1)
+                    if(configFiles.Length == 1)
                     {
-                        localConfigFound = true;
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Local config file: '{0}'", filePath);
-                        Debug.Console(0, LocalConfigPresent);
-                        Debug.Console(0, "Local config files are valid, but be sure this is your intention.  Spinning your wheels chasing down a configuration issue is not fun!");
+                        localConfigFound = true;
+                        
                     }
                 }
                 else
@@ -112,7 +98,13 @@ ______                         _     _ _ _
                 }
 
                 // Get the actual file path
-                filePath = configFiles[0].FullName;
+                filePath = configFiles[0].FullName;
+
+                // Generate debug statement if using a local file.
+			    if (localConfigFound)
+			    {
+                    GetLocalFileMessage(filePath);
+			    }
 
                 // Read the file
                 using (StreamReader fs = new StreamReader(filePath))
@@ -198,7 +190,65 @@ ______                         _     _ _ _
         {
             var dev = ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
             return dev == null ? null : dev.Group;
-        }
+        }
+
+	    private static void GetLocalFileMessage(string filePath)
+	    {
+            var filePathLength = filePath.Length + 2;
+            var debugStringWidth = filePathLength + 12;
+
+            if (debugStringWidth < 51)
+            {
+                debugStringWidth = 51;
+            }
+            var qualifier = (filePathLength % 2 != 0)
+                ? " Using Local Config File "
+                : " Using Local  Config File ";
+            var bookend1 = (debugStringWidth - qualifier.Length) / 2;
+            var bookend2 = (debugStringWidth - filePathLength) / 2;
+
+
+	        var newDebugString = new StringBuilder()
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 1
+	            .Append(new string('*', debugStringWidth))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 2
+	            .Append(new string('*', debugStringWidth))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 3
+	            .Append(new string('*', 2))
+	            .Append(new string(' ', debugStringWidth - 4))
+	            .Append(new string('*', 2))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 4
+	            .Append(new string('*', 2))
+	            .Append(new string(' ', bookend1 - 2))
+	            .Append(qualifier)
+	            .Append(new string(' ', bookend1 - 2))
+	            .Append(new string('*', 2))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 5
+	            .Append(new string('*', 2))
+	            .Append(new string(' ', bookend2 - 2))
+	            .Append(" " + filePath + " ")
+	            .Append(new string(' ', bookend2 - 2))
+	            .Append(new string('*', 2))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 6
+	            .Append(new string('*', 2))
+	            .Append(new string(' ', debugStringWidth - 4))
+	            .Append(new string('*', 2))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 7
+	            .Append(new string('*', debugStringWidth))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 8
+	            .Append(new string('*', debugStringWidth));
+
+            Debug.Console(2, Debug.ErrorLogLevel.Notice, "Found Local config file: '{0}'", filePath);
+            Debug.Console(0, newDebugString.ToString());
+	    }
 
 	}
 }
\ No newline at end of file
diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc4kZScalerCController.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc4kZScalerCController.cs
index 70afc5eb..f0238936 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc4kZScalerCController.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc4kZScalerCController.cs	
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;

From f5d7c90be194dcc3dcce06f8f5e91b9c736dbce8 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 8 Sep 2020 15:14:07 -0600
Subject: [PATCH 15/89] add config for branding

---
 .../CiscoCodec/CiscoSparkCodecPropertiesConfig.cs    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs
index 2f335780..256b803a 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs	
@@ -40,6 +40,9 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         [JsonProperty("phonebookResultsLimit")]
         public uint PhonebookResultsLimit { get; set; }
 
+        [JsonProperty("UiBranding")]
+        public BrandingLogoProperties UiBranding { get; set; }       
+
     }
 
     public class SharingProperties
@@ -47,4 +50,13 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         [JsonProperty("autoShareContentWhileInCall")]
         public bool AutoShareContentWhileInCall { get; set; }
     }
+
+    public class BrandingLogoProperties
+    {
+        [JsonProperty("enable")]
+        public bool Enable { get; set; }
+
+        [JsonProperty("brandingUrl")]
+        public bool LogoUrl { get; set; }
+    }
 }
\ No newline at end of file

From ea28b8afa44813ba3d8c29412ca6f5ca020e5bce Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 8 Sep 2020 16:24:52 -0600
Subject: [PATCH 16/89] add IHasBranding Interface

---
 .../DeviceTypeInterfaces/IHasBranding.cs                  | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasBranding.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasBranding.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasBranding.cs
new file mode 100644
index 00000000..d5c95c47
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasBranding.cs	
@@ -0,0 +1,8 @@
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    public interface IHasBranding
+    {
+        bool BrandingEnabled { get; }
+        void InitializeBranding(string roomKey);
+    }
+}
\ No newline at end of file

From 74c101628b36d9bdee8c90af227f4f0e4f547611 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 8 Sep 2020 16:25:12 -0600
Subject: [PATCH 17/89] Add Config for branding

---
 .../VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs
index 256b803a..cd280b29 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs	
@@ -57,6 +57,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         public bool Enable { get; set; }
 
         [JsonProperty("brandingUrl")]
-        public bool LogoUrl { get; set; }
+        public string BrandingUrl { get; set; }
     }
 }
\ No newline at end of file

From b2ec99e663221a26879fab4fd136425d1e9269e7 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 8 Sep 2020 16:25:21 -0600
Subject: [PATCH 18/89] add logic for branding

---
 .../VideoCodec/CiscoCodec/CiscoSparkCodec.cs  | 87 +++++++++++++++++--
 1 file changed, 82 insertions(+), 5 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index 9759cfdd..bad47d71 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -12,10 +12,12 @@ using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 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;
+using PepperDash_Essentials_Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 {
@@ -25,10 +27,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
     public class CiscoSparkCodec : VideoCodecBase, IHasCallHistory, IHasCallFavorites, IHasDirectory,
         IHasScheduleAwareness, IOccupancyStatusProvider, IHasCodecLayouts, IHasCodecSelfView,
-        ICommunicationMonitor, IRouting, IHasCodecCameras, IHasCameraAutoMode, IHasCodecRoomPresets, IHasExternalSourceSwitching
+        ICommunicationMonitor, IRouting, IHasCodecCameras, IHasCameraAutoMode, IHasCodecRoomPresets, IHasExternalSourceSwitching, IHasBranding
     {
         public event EventHandler<DirectoryEventArgs> DirectoryResultReturned;
 
+        private CTimer _brandingTimer;
+
         public CommunicationGather PortGather { get; private set; }
 
         public StatusMonitorBase CommunicationMonitor { get; private set; }
@@ -401,10 +405,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
 			CreateOsdSource();
 
-			if (props.ExternalSourceListEnabled != null)
-			{
-				ExternalSourceListEnabled = props.ExternalSourceListEnabled;
-			}
+            ExternalSourceListEnabled = props.ExternalSourceListEnabled;
+
+            if (props.UiBranding == null)
+            {
+                return;
+            }
+
+            BrandingEnabled = props.UiBranding.Enable;
+            _brandingUrl = props.UiBranding.BrandingUrl;
         }
 
         /// <summary>
@@ -443,6 +452,70 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			TieLineCollection.Default.Add(tl);
 		}
 
+        public void InitializeBranding(string roomKey)
+        {
+            if (!BrandingEnabled)
+            {
+                return;
+            }
+
+            var mcBridgeKey = String.Format("mobileControlBridge-{0}", roomKey);
+
+            var mcBridge = DeviceManager.GetDeviceForKey(mcBridgeKey) as IMobileControlRoomBridge;
+
+            if (!String.IsNullOrEmpty(_brandingUrl))
+            {
+                if (_brandingTimer != null)
+                {
+                    _brandingTimer.Stop();
+                    _brandingTimer.Dispose();
+                }
+
+                _brandingTimer = new CTimer((o) =>
+                {
+                    if (_sendMcUrl)
+                    {
+                        SendMcBrandingUrl(mcBridge);
+                        _sendMcUrl = false;
+                    }
+                    else
+                    {
+                        SendBrandingUrl();
+                        _sendMcUrl = true;
+                    }
+                }, 0, 15000);
+            } else if (String.IsNullOrEmpty(_brandingUrl))
+            {
+                if (mcBridge == null) return;
+
+                mcBridge.UserCodeChanged += (o, a) => SendMcBrandingUrl(mcBridge);
+
+                SendMcBrandingUrl(mcBridge);
+            }
+        }
+
+        private void SendMcBrandingUrl(IMobileControlRoomBridge mcBridge)
+        {
+            if (mcBridge == null)
+            {
+                return;
+            }
+
+            SendText(String.Format(
+                            "xcommand userinterface branding fetch type: branding url: {0}",
+                            mcBridge.QrCodeUrl));
+            SendText(String.Format(
+                "xcommand userinterface branding fetch type: halfwakebranding url: {0}",
+                mcBridge.QrCodeUrl));
+        }
+
+        private void SendBrandingUrl()
+        {
+            SendText(String.Format("xcommand userinterface branding fetch type: branding url: {0}",
+                            _brandingUrl));
+            SendText(String.Format("xcommand userinterface branding fetch type: halfwakebranding url: {0}",
+                _brandingUrl));
+        }
         /// <summary>
         /// Starts the HTTP feedback server and syncronizes state of codec
         /// </summary>
@@ -1835,6 +1908,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			private set; 
 		}
 
+        public bool BrandingEnabled { get; private set; }
+        private string _brandingUrl;
+        private bool _sendMcUrl;
+
 		/// <summary>
 		/// Adds an external source to the Cisco 
 		/// </summary>

From b6b88086f3f276da6d867af58b61803612310e07 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 8 Sep 2020 16:25:32 -0600
Subject: [PATCH 19/89] Add logic to init branding

---
 .../Room/Types/EssentialsHuddleVtc1Room.cs    | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
index 20c8ae3d..69fdaaec 100644
--- a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
@@ -13,6 +13,7 @@ using PepperDash.Essentials.Room.Config;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 using PepperDash.Essentials.Devices.Common.AudioCodec;
+using PepperDash_Essentials_Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials
 {
@@ -703,29 +704,35 @@ namespace PepperDash.Essentials
 			{
 				return;
 			}
-			else
-			{
-				string codecTieLine = "";
-				codecTieLine = ConfigReader.ConfigObject.TieLines.SingleOrDefault(x => x.DestinationKey == VideoCodec.Key).DestinationPort;
-				videoCodecWithExternalSwitching.ClearExternalSources();
-				videoCodecWithExternalSwitching.RunRouteAction = RunRouteAction;
-				var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
 
-				foreach (var kvp in srcList)
-				{
-					var srcConfig = kvp.Value;
+		    string codecTieLine = ConfigReader.ConfigObject.TieLines.SingleOrDefault(x => x.DestinationKey == VideoCodec.Key).DestinationPort;
+		    videoCodecWithExternalSwitching.ClearExternalSources();
+		    videoCodecWithExternalSwitching.RunRouteAction = RunRouteAction;
+		    var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
 
-					if (kvp.Key != DefaultCodecRouteString && kvp.Key != "roomOff")
-					{
+		    foreach (var kvp in srcList)
+		    {
+		        var srcConfig = kvp.Value;
 
-						videoCodecWithExternalSwitching.AddExternalSource(codecTieLine, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
-						videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
+		        if (kvp.Key != DefaultCodecRouteString && kvp.Key != "roomOff")
+		        {
+
+		            videoCodecWithExternalSwitching.AddExternalSource(codecTieLine, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
+		            videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
 
 
-					}
-				}
-			}
+		        }
+		    }
 		}
+
+        private void SetCodecBranding()
+        {
+            var vcWithBranding = VideoCodec as IHasBranding;
+
+            if (vcWithBranding == null) return;
+
+            vcWithBranding.InitializeBranding(Key);
+        }
 		
         #region IPrivacy Members
 

From 54dd424b012a861ba2bf44bd69a840e610bf057e Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 9 Sep 2020 08:53:20 -0600
Subject: [PATCH 20/89] add some debug statements

---
 .../Room/Types/EssentialsHuddleVtc1Room.cs                 | 2 +-
 .../PepperDash_Essentials_Core.csproj                      | 7 ++++---
 .../VideoCodec/CiscoCodec/CiscoSparkCodec.cs               | 7 ++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
index 69fdaaec..f84d343d 100644
--- a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
@@ -314,7 +314,7 @@ namespace PepperDash.Essentials
 
 
                 VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
-				VideoCodec.IsReadyChange += (o, a) => this.SetCodecExternalSources(); 
+				VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); }; 
 
                 if (AudioCodec != null)
                     AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index ae420105..e0cf8dcb 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -98,12 +98,12 @@
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -113,7 +113,7 @@
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -206,6 +206,7 @@
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
+    <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
     <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Factory\IDeviceFactory.cs" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index bad47d71..d138ee8a 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -411,12 +411,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             {
                 return;
             }
+            Debug.Console(2, this, "Setting branding properties enable: {0} _brandingUrl {1}", props.UiBranding.Enable,
+                props.UiBranding.BrandingUrl);
 
             BrandingEnabled = props.UiBranding.Enable;
             _brandingUrl = props.UiBranding.BrandingUrl;
         }
 
-        /// <summary>
         /// Runs in it's own thread to dequeue messages in the order they were received to be processed
         /// </summary>
         /// <returns></returns>
@@ -454,6 +455,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public void InitializeBranding(string roomKey)
         {
+            Debug.Console(2, this, "Initializing Branding for room {0}", roomKey);
+
             if (!BrandingEnabled)
             {
                 return;
@@ -488,6 +491,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             {
                 if (mcBridge == null) return;
 
+                Debug.Console(2, this, "Setting QR code URL: {0}", mcBridge.QrCodeUrl);
+
                 mcBridge.UserCodeChanged += (o, a) => SendMcBrandingUrl(mcBridge);
 
                 SendMcBrandingUrl(mcBridge);

From cb89bd390894b988143ab403ce385636cc3cf5ea Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 9 Sep 2020 10:29:53 -0600
Subject: [PATCH 21/89] Changed debug levels

---
 .../Room/Types/EssentialsHuddleVtc1Room.cs                | 1 +
 .../VideoCodec/CiscoCodec/CiscoSparkCodec.cs              | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
index f84d343d..97c1775e 100644
--- a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
@@ -731,6 +731,7 @@ namespace PepperDash.Essentials
 
             if (vcWithBranding == null) return;
 
+            Debug.Console(1, this, "Setting Codec Branding");
             vcWithBranding.InitializeBranding(Key);
         }
 		
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index d138ee8a..eb02e814 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -455,7 +455,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public void InitializeBranding(string roomKey)
         {
-            Debug.Console(2, this, "Initializing Branding for room {0}", roomKey);
+            Debug.Console(1, this, "Initializing Branding for room {0}", roomKey);
 
             if (!BrandingEnabled)
             {
@@ -468,6 +468,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             if (!String.IsNullOrEmpty(_brandingUrl))
             {
+                Debug.Console(1, this, "Branding URL found: {0}", _brandingUrl);
                 if (_brandingTimer != null)
                 {
                     _brandingTimer.Stop();
@@ -489,6 +490,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 }, 0, 15000);
             } else if (String.IsNullOrEmpty(_brandingUrl))
             {
+                Debug.Console(1, this, "No Branding URL found");
                 if (mcBridge == null) return;
 
                 Debug.Console(2, this, "Setting QR code URL: {0}", mcBridge.QrCodeUrl);
@@ -506,6 +508,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 return;
             }
 
+            Debug.Console(1, this, "Sending url: {0}", mcBridge.QrCodeUrl);
+
             SendText(String.Format(
                             "xcommand userinterface branding fetch type: branding url: {0}",
                             mcBridge.QrCodeUrl));
@@ -516,6 +520,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         private void SendBrandingUrl()
         {
+            Debug.Console(1, this, "Sending url: {0}", _brandingUrl);
+
             SendText(String.Format("xcommand userinterface branding fetch type: branding url: {0}",
                             _brandingUrl));
             SendText(String.Format("xcommand userinterface branding fetch type: halfwakebranding url: {0}",

From 862a5ebd126123376074aa66d8e6cb1d3e7f9320 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 9 Sep 2020 10:54:01 -0600
Subject: [PATCH 22/89] Added logic to set messages for instructions

---
 .../VideoCodec/CiscoCodec/CiscoSparkCodec.cs                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index eb02e814..814ce903 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -510,6 +510,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             Debug.Console(1, this, "Sending url: {0}", mcBridge.QrCodeUrl);
 
+            SendText("xconfiguration userinterface custommessage: \"Scan the QR code with a mobile phone to get started\"");
+            SendText("xconfiguration userinterface osd halfwakemessage: \"Tap the touch panel or scan the QR code with a mobile phone to get started\"");
+
             SendText(String.Format(
                             "xcommand userinterface branding fetch type: branding url: {0}",
                             mcBridge.QrCodeUrl));

From 8f319a44053e1d488b11ce165b37905822517a5f Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 16 Sep 2020 09:55:58 -0600
Subject: [PATCH 23/89] making changes for adding VC4 bridge

---
 .../Bridges/BridgeBase.cs                     | 58 +++++++++++--------
 .../Bridges/VirtualControlEiscApiAdvanced.cs  |  7 +++
 .../PepperDashEssentialsBase/Global/Global.cs |  2 +
 .../PepperDash_Essentials_Core.csproj         |  7 ++-
 .../VideoCodec/CiscoCodec/CiscoSparkCodec.cs  |  1 +
 5 files changed, 47 insertions(+), 28 deletions(-)
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/VirtualControlEiscApiAdvanced.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs
index ec6c2ebe..9631ead5 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs	
@@ -96,40 +96,48 @@ namespace PepperDash.Essentials.Core.Bridges
 
             Eisc.SigChange += Eisc_SigChange;
 
-            AddPostActivationAction( () =>
+            AddPostActivationAction(LinkDevices);
+        }
+
+        private void LinkDevices()
+        {
+            Debug.Console(1, this, "Linking Devices...");
+
+            foreach (var d in PropertiesConfig.Devices)
             {
-                Debug.Console(1, this, "Linking Devices...");
+                var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
 
-                foreach (var d in PropertiesConfig.Devices)
+                if (device == null)
                 {
-                    var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
-
-                    if (device == null) continue;
-
-                    Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
-
-                    if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
-                    {
-                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
-                            "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
-                            device.Key);
-                        continue;
-                    }
-
-                    var bridge = device as IBridgeAdvanced;
-                    if (bridge != null) bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
+                    continue;
                 }
 
-                var registerResult = Eisc.Register();
+                Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
 
-                if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
+                if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
                 {
-                    Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Registration result: {0}", registerResult);
-                    return;
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
+                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
+                        device.Key);
+                    continue;
                 }
 
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
-            });
+                var bridge = device as IBridgeAdvanced;
+                if (bridge != null)
+                {
+                    bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
+                }
+            }
+
+            var registerResult = Eisc.Register();
+
+            if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
+            {
+                Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Registration result: {0}", registerResult);
+                return;
+            }
+
+            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
         }
 
         /// <summary>
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/VirtualControlEiscApiAdvanced.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/VirtualControlEiscApiAdvanced.cs
new file mode 100644
index 00000000..35de694d
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/VirtualControlEiscApiAdvanced.cs	
@@ -0,0 +1,7 @@
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class VirtualControlEiscApiAdvanced
+    {
+         
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs
index b540b3d6..437c3bbb 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs	
@@ -19,6 +19,8 @@ namespace PepperDash.Essentials.Core
 	{
 		public static CrestronControlSystem ControlSystem { get; set; }
 
+        public static eDevicePlatform Platform { get { return CrestronEnvironment.DevicePlatform; } }
+
 		public static LicenseManager LicenseManager { get; set; }
 
         /// <summary>
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index ae420105..ed70ab1d 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -98,12 +98,12 @@
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -113,7 +113,7 @@
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -158,6 +158,7 @@
     <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
+    <Compile Include="Bridges\VirtualControlEiscApiAdvanced.cs" />
     <Compile Include="Comm and IR\CecPortController.cs" />
     <Compile Include="Comm and IR\CommFactory.cs" />
     <Compile Include="Comm and IR\CommunicationExtras.cs" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index 9759cfdd..b2591475 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -2006,6 +2006,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
             Debug.Console(1, "Factory Attempting to create new Cisco Codec Device");
+
             var comm = CommFactory.CreateCommForDevice(dc);
             return new VideoCodec.Cisco.CiscoSparkCodec(dc, comm);
         }

From f583b849518c88cb3cee35be397cfe7ad9b7ad04 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 16 Sep 2020 16:32:03 -0600
Subject: [PATCH 24/89] Add VideoCodecControllerJoinMap

---
 .../JoinMaps/VideoCodecControllerJoinMap.cs   | 136 ++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
new file mode 100644
index 00000000..80d7016f
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -0,0 +1,136 @@
+using System;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash_Essentials_Core.Bridges.JoinMaps
+{
+    public class VideoCodecControllerJoinMap:JoinMapBaseAdvanced
+    {
+        #region Status
+
+        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData {JoinNumber = 1, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Device is Online",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        #endregion
+
+        
+        #region NearEndCameraControls
+
+        public JoinDataComplete NearEndCameraUp = new JoinDataComplete(new JoinData {JoinNumber = 11, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Near Camera Up",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        public JoinDataComplete NearEndCameraDown = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Near Camera Down",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        public JoinDataComplete NearEndCameraLeft = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Near Camera Left",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        public JoinDataComplete NearEndCameraRight = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Near Camera Right",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        public JoinDataComplete NearEndCameraZoomIn = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Near Camera Zoom In",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        public JoinDataComplete NearEndCameraZoomOut = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Near Camera Zoom Out",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        public JoinDataComplete NearEndCameraFocusNear = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Near Camera Focus Near",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        public JoinDataComplete NearEndCameraFocusFar = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Near Camera Right",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        public JoinDataComplete NearEndCameraSelectSerial = new JoinDataComplete(
+            new JoinData {JoinNumber = 11, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Camera Select & Feedback by name",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        public JoinDataComplete NearEndCameraSelectAnalog = new JoinDataComplete(
+            new JoinData { JoinNumber = 11, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Camera Select & Feedback by index",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+
+
+        #endregion
+        #region Camera Tracking Controls
+
+        public JoinDataComplete CameraTrackingOn = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Camera Tracking On",
+                JoinType = eJoinType.Digital,
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL});
+
+        public JoinDataComplete CameraTrackingOff = new JoinDataComplete(new JoinData {JoinNumber = 12, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Camera Tracking Off",
+                JoinType = eJoinType.Digital,
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL
+            });
+
+        public JoinDataComplete CameraTrackingToggle = new JoinDataComplete(
+            new JoinData {JoinNumber = 13, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Camera Tracking Toggle",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        #endregion
+
+        public VideoCodecControllerJoinMap(uint joinStart) : base(joinStart)
+        {
+        }
+
+        public VideoCodecControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
+        {
+        }
+    }
+}
\ No newline at end of file

From a203eef9a6e73c7cfa8aaac625ee9e8b0ca86021 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 16 Sep 2020 16:33:16 -0600
Subject: [PATCH 25/89] clean up and organize

---
 .../PepperDash_Essentials_Core.csproj         |    7 +-
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           | 1504 +++++++++--------
 2 files changed, 790 insertions(+), 721 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index ae420105..83916856 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -98,12 +98,12 @@
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -113,7 +113,7 @@
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -158,6 +158,7 @@
     <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\VideoCodecControllerJoinMap.cs" />
     <Compile Include="Comm and IR\CecPortController.cs" />
     <Compile Include="Comm and IR\CommFactory.cs" />
     <Compile Include="Comm and IR\CommunicationExtras.cs" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 2f834c36..179b4001 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -4,45 +4,102 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.CrestronThread;
-
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
-    public class ZoomRoom : VideoCodecBase, IHasCodecSelfView, IHasDirectory, ICommunicationMonitor, IRouting, IHasScheduleAwareness, IHasCodecCameras
+    public class ZoomRoom : VideoCodecBase, IHasCodecSelfView, IHasDirectory, ICommunicationMonitor, IRouting,
+        IHasScheduleAwareness, IHasCodecCameras
     {
+        private readonly CrestronQueue<string> ReceiveQueue;
+
+        private readonly Thread ReceiveThread;
+
+        private readonly ZoomRoomSyncState SyncState;
+        public bool CommDebuggingIsOn;
+        private uint DefaultMeetingDurationMin = 30;
+        private string Delimiter = "\x0D\x0A";
+        private uint JsonCurlyBraceCounter = 0;
+        private bool JsonFeedbackMessageIsIncoming;
+        private StringBuilder JsonMessage;
+        private int PreviousVolumeLevel = 0;
+        private CameraBase _selectedCamera;
+
+        public ZoomRoom(DeviceConfig config, IBasicCommunication comm)
+            : base(config)
+        {
+            var props = JsonConvert.DeserializeObject<ZoomRoomPropertiesConfig>(config.Properties.ToString());
+
+            // The queue that will collect the repsonses in the order they are received
+            ReceiveQueue = new CrestronQueue<string>(25);
+
+            // The thread responsible for dequeuing and processing the messages
+            ReceiveThread = new Thread((o) => ProcessQueue(), null);
+            ReceiveThread.Priority = Thread.eThreadPriority.MediumPriority;
+
+            Communication = comm;
+
+            if (props.CommunicationMonitorProperties != null)
+            {
+                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication,
+                    props.CommunicationMonitorProperties);
+            }
+            else
+            {
+                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 30000, 120000, 300000,
+                    "zStatus SystemUnit\r");
+            }
+
+            DeviceManager.AddDevice(CommunicationMonitor);
+
+            Status = new ZoomRoomStatus();
+
+            Configuration = new ZoomRoomConfiguration();
+
+            CodecInfo = new ZoomRoomInfo(Status, Configuration);
+
+            SyncState = new ZoomRoomSyncState(Key + "--Sync", this);
+
+            SyncState.InitialSyncCompleted += new EventHandler<EventArgs>(SyncState_InitialSyncCompleted);
+
+            PhonebookSyncState = new CodecPhonebookSyncState(Key + "--PhonebookSync");
+
+            PortGather = new CommunicationGather(Communication, "\x0A");
+            PortGather.IncludeDelimiter = true;
+            PortGather.LineReceived += this.Port_LineReceived;
+
+            CodecOsdIn = new RoutingInputPort(RoutingPortNames.CodecOsd,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.Hdmi, new Action(StopSharing), this);
+
+            Output1 = new RoutingOutputPort(RoutingPortNames.AnyVideoOut,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.Hdmi, null, this);
+
+            SelfviewIsOnFeedback = new BoolFeedback(SelfViewIsOnFeedbackFunc);
+
+            CodecSchedule = new CodecScheduleAwareness();
+
+            SetUpFeedbackActions();
+
+            Cameras = new List<CameraBase>();
+
+            SetUpDirectory();
+        }
+
         public CommunicationGather PortGather { get; private set; }
 
-        public StatusMonitorBase CommunicationMonitor { get; private set; }
-
-        private CrestronQueue<string> ReceiveQueue;
-        
-        private Thread ReceiveThread;
-
-        string Delimiter = "\x0D\x0A";
-
-        private ZoomRoomSyncState SyncState;
-
         public ZoomRoomStatus Status { get; private set; }
 
         public ZoomRoomConfiguration Configuration { get; private set; }
 
-        private StringBuilder JsonMessage;
-
-        private bool JsonFeedbackMessageIsIncoming;
-        private uint JsonCurlyBraceCounter = 0;
-
-        public bool CommDebuggingIsOn;
-
         //CTimer LoginMessageReceivedTimer;
         //CTimer RetryConnectionTimer;
 
@@ -59,50 +116,32 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         protected override Func<bool> PrivacyModeIsOnFeedbackFunc
         {
-            get
-            {
-                return () => Configuration.Call.Microphone.Mute;
-            }
+            get { return () => Configuration.Call.Microphone.Mute; }
         }
 
         protected override Func<bool> StandbyIsOnFeedbackFunc
         {
-            get
-            {
-                return () => false;
-            }
+            get { return () => false; }
         }
 
         protected override Func<string> SharingSourceFeedbackFunc
         {
-            get
-            {
-                return () => Status.Sharing.dispState;
-            }
+            get { return () => Status.Sharing.dispState; }
         }
 
         protected override Func<bool> SharingContentIsOnFeedbackFunc
         {
-            get
-            {
-                return () => Status.Call.Sharing.IsSharing;
-            }
+            get { return () => Status.Call.Sharing.IsSharing; }
         }
 
         protected Func<bool> FarEndIsSharingContentFeedbackFunc
         {
-            get
-            {
-                return () => false;
-            }
+            get { return () => false; }
         }
 
         protected override Func<bool> MuteFeedbackFunc
         {
-            get
-            {
-                return () => Configuration.Audio.Output.Volume == 0;
-            }
+            get { return () => Configuration.Audio.Output.Volume == 0; }
         }
 
         //protected Func<bool> RoomIsOccupiedFeedbackFunc
@@ -123,103 +162,214 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         protected Func<bool> SelfViewIsOnFeedbackFunc
         {
-            get
-            {
-                return () => !Configuration.Video.HideConfSelfVideo;
-            }
+            get { return () => !Configuration.Video.HideConfSelfVideo; }
         }
 
         protected Func<string> SelfviewPipPositionFeedbackFunc
         {
-            get
-            {
-                return () => "";
-            }
+            get { return () => ""; }
         }
 
         protected Func<string> LocalLayoutFeedbackFunc
         {
-            get
-            {
-                return () => "";
-            }
+            get { return () => ""; }
         }
 
         protected Func<bool> LocalLayoutIsProminentFeedbackFunc
         {
-            get
-            {
-                return () => false;
-            }
+            get { return () => false; }
         }
 
 
         public RoutingInputPort CodecOsdIn { get; private set; }
         public RoutingOutputPort Output1 { get; private set; }
 
-        uint DefaultMeetingDurationMin = 30;
+        #region ICommunicationMonitor Members
 
-        int PreviousVolumeLevel = 0;
+        public StatusMonitorBase CommunicationMonitor { get; private set; }
 
-        public ZoomRoom(DeviceConfig config, IBasicCommunication comm)
-            : base(config)
+        #endregion
+
+        #region IHasCodecCameras Members
+
+        public event EventHandler<CameraSelectedEventArgs> CameraSelected;
+
+        public List<CameraBase> Cameras { get; private set; }
+
+        public CameraBase SelectedCamera
         {
-            var props = JsonConvert.DeserializeObject<ZoomRoomPropertiesConfig>(config.Properties.ToString());
-
-            // The queue that will collect the repsonses in the order they are received
-            ReceiveQueue = new CrestronQueue<string>(25);
-
-            // The thread responsible for dequeuing and processing the messages
-            ReceiveThread = new Thread((o) => ProcessQueue(), null);
-            ReceiveThread.Priority = Thread.eThreadPriority.MediumPriority;
-
-            Communication = comm;
-
-            if (props.CommunicationMonitorProperties != null)
+            get { return _selectedCamera; }
+            private set
             {
-                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, props.CommunicationMonitorProperties);
+                _selectedCamera = value;
+                SelectedCameraFeedback.FireUpdate();
+                ControllingFarEndCameraFeedback.FireUpdate();
+
+                var handler = CameraSelected;
+                if (handler != null)
+                {
+                    handler(this, new CameraSelectedEventArgs(SelectedCamera));
+                }
+            }
+        }
+
+
+        public StringFeedback SelectedCameraFeedback { get; private set; }
+
+        public void SelectCamera(string key)
+        {
+            if (Cameras != null)
+            {
+                var camera = Cameras.FirstOrDefault(c => c.Key.IndexOf(key, StringComparison.OrdinalIgnoreCase) > -1);
+                if (camera != null)
+                {
+                    Debug.Console(1, this, "Selected Camera with key: '{0}'", camera.Key);
+                    SelectedCamera = camera;
+                }
+                else
+                {
+                    Debug.Console(1, this, "Unable to select camera with key: '{0}'", key);
+                }
+            }
+        }
+
+        public CameraBase FarEndCamera { get; private set; }
+
+        public BoolFeedback ControllingFarEndCameraFeedback { get; private set; }
+
+        #endregion
+
+        #region IHasCodecSelfView Members
+
+        public BoolFeedback SelfviewIsOnFeedback { get; private set; }
+
+        public void SelfViewModeOn()
+        {
+            SendText("zConfiguration Video hide_conf_self_video: off");
+        }
+
+        public void SelfViewModeOff()
+        {
+            SendText("zConfiguration Video hide_conf_self_video: on");
+        }
+
+        public void SelfViewModeToggle()
+        {
+            if (SelfviewIsOnFeedback.BoolValue)
+            {
+                SelfViewModeOff();
             }
             else
             {
-                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 30000, 120000, 300000, "zStatus SystemUnit\r");
+                SelfViewModeOn();
             }
-
-            DeviceManager.AddDevice(CommunicationMonitor);
-
-            Status = new ZoomRoomStatus();
-            
-            Configuration = new ZoomRoomConfiguration();
-
-            CodecInfo = new ZoomRoomInfo(Status, Configuration);
-
-            SyncState = new ZoomRoomSyncState(Key + "--Sync", this);
-
-            SyncState.InitialSyncCompleted += new EventHandler<EventArgs>(SyncState_InitialSyncCompleted);
-
-            PhonebookSyncState = new CodecPhonebookSyncState(Key + "--PhonebookSync");
-
-            PortGather = new CommunicationGather(Communication, "\x0A");
-            PortGather.IncludeDelimiter = true;
-            PortGather.LineReceived += this.Port_LineReceived;
-
-            CodecOsdIn = new RoutingInputPort(RoutingPortNames.CodecOsd, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-            eRoutingPortConnectionType.Hdmi, new Action(StopSharing), this);
- 
-            Output1 = new RoutingOutputPort(RoutingPortNames.AnyVideoOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.Hdmi, null, this);
- 
-            SelfviewIsOnFeedback = new BoolFeedback(SelfViewIsOnFeedbackFunc);
-
-            CodecSchedule = new CodecScheduleAwareness();
-
-            SetUpFeedbackActions();
-
-            Cameras = new List<CameraBase>();
-
-            SetUpDirectory();            
         }
 
-        void SyncState_InitialSyncCompleted(object sender, EventArgs e)
+        #endregion
+
+        #region IHasDirectory Members
+
+        public event EventHandler<DirectoryEventArgs> DirectoryResultReturned;
+        public CodecDirectory DirectoryRoot { get; private set; }
+
+        public CodecDirectory CurrentDirectoryResult
+        {
+            get
+            {
+                if (DirectoryBrowseHistory.Count > 0)
+                {
+                    return DirectoryBrowseHistory[DirectoryBrowseHistory.Count - 1];
+                }
+                else
+                {
+                    return DirectoryRoot;
+                }
+            }
+        }
+
+        public CodecPhonebookSyncState PhonebookSyncState { get; private set; }
+
+        public void SearchDirectory(string searchString)
+        {
+            var directoryResults = new CodecDirectory();
+
+            directoryResults.AddContactsToDirectory(
+                DirectoryRoot.CurrentDirectoryResults.FindAll(
+                    c => c.Name.IndexOf(searchString, 0, StringComparison.OrdinalIgnoreCase) > -1));
+
+            DirectoryBrowseHistory.Add(directoryResults);
+
+            OnDirectoryResultReturned(directoryResults);
+        }
+
+        public void GetDirectoryFolderContents(string folderId)
+        {
+            var directoryResults = new CodecDirectory();
+
+            directoryResults.ResultsFolderId = folderId;
+            directoryResults.AddContactsToDirectory(
+                DirectoryRoot.CurrentDirectoryResults.FindAll(c => c.FolderId.Equals(folderId)));
+
+            DirectoryBrowseHistory.Add(directoryResults);
+
+            OnDirectoryResultReturned(directoryResults);
+        }
+
+        public void SetCurrentDirectoryToRoot()
+        {
+            DirectoryBrowseHistory.Clear();
+
+            OnDirectoryResultReturned(DirectoryRoot);
+        }
+
+        public void GetDirectoryParentFolderContents()
+        {
+            var currentDirectory = new CodecDirectory();
+
+            if (DirectoryBrowseHistory.Count > 0)
+            {
+                var lastItemIndex = DirectoryBrowseHistory.Count - 1;
+                var parentDirectoryContents = DirectoryBrowseHistory[lastItemIndex];
+
+                DirectoryBrowseHistory.Remove(DirectoryBrowseHistory[lastItemIndex]);
+
+                currentDirectory = parentDirectoryContents;
+            }
+            else
+            {
+                currentDirectory = DirectoryRoot;
+            }
+
+            OnDirectoryResultReturned(currentDirectory);
+        }
+
+        public BoolFeedback CurrentDirectoryResultIsNotDirectoryRoot { get; private set; }
+
+        public List<CodecDirectory> DirectoryBrowseHistory { get; private set; }
+
+        #endregion
+
+        #region IHasScheduleAwareness Members
+
+        public CodecScheduleAwareness CodecSchedule { get; private set; }
+
+        public void GetSchedule()
+        {
+            GetBookings();
+        }
+
+        #endregion
+
+        #region IRouting Members
+
+        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
+        {
+            ExecuteSwitch(inputSelector);
+        }
+
+        #endregion
+
+        private void SyncState_InitialSyncCompleted(object sender, EventArgs e)
         {
             SetUpRouting();
 
@@ -230,7 +380,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// <summary>
         /// Subscribes to the PropertyChanged events on the state objects and fires the corresponding feedbacks.
         /// </summary>
-        void SetUpFeedbackActions()
+        private void SetUpFeedbackActions()
         {
             Configuration.Audio.Output.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(
                 (o, a) =>
@@ -264,7 +414,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 {
                     if (a.PropertyName == "SelectedId")
                     {
-                        SelectCamera(Configuration.Video.Camera.SelectedId);    // this will in turn fire the affected feedbacks
+                        SelectCamera(Configuration.Video.Camera.SelectedId);
+                            // this will in turn fire the affected feedbacks
                     }
                 });
 
@@ -291,7 +442,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 });
         }
 
-        void SetUpDirectory()
+        private void SetUpDirectory()
         {
             DirectoryRoot = new CodecDirectory();
 
@@ -302,7 +453,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
         }
 
-        void SetUpRouting()
+        private void SetUpRouting()
         {
             // Set up input ports
             CreateOsdSource();
@@ -316,7 +467,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// Creates the fake OSD source, and connects it's AudioVideo output to the CodecOsdIn input
         /// to enable routing 
         /// </summary>
-        void CreateOsdSource()
+        private void CreateOsdSource()
         {
             OsdSource = new DummyRoutingInputsDevice(Key + "[osd]");
             DeviceManager.AddDevice(OsdSource);
@@ -332,9 +483,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// <returns></returns>
         public override bool CustomActivate()
         {
-            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);
-            CrestronConsole.AddNewConsoleCommand((s) => GetBookings(), "GetZoomRoomBookings", "Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator);
+            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);
+            CrestronConsole.AddNewConsoleCommand((s) => GetBookings(), "GetZoomRoomBookings",
+                "Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator);
 
             var socket = Communication as ISocketStatus;
             if (socket != null)
@@ -366,12 +521,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             }
         }
 
-        void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
+        private void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
         {
             Debug.Console(1, this, "Socket status change {0}", e.Client.ClientStatus);
             if (e.Client.IsConnected)
             {
-
             }
             else
             {
@@ -383,7 +537,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public void SendText(string command)
         {
             if (CommDebuggingIsOn)
+            {
                 Debug.Console(1, this, "Sending: '{0}'", command);
+            }
 
             Communication.SendText(command + Delimiter);
         }
@@ -393,7 +549,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// </summary>
         /// <param name="dev"></param>
         /// <param name="args"></param>
-        void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
+        private void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
         {
             //if (CommDebuggingIsOn)
             //    Debug.Console(1, this, "Gathered: '{0}'", args.Text);
@@ -412,7 +568,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// Runs in it's own thread to dequeue messages in the order they were received to be processed
         /// </summary>
         /// <returns></returns>
-        object ProcessQueue()
+        private object ProcessQueue()
         {
             try
             {
@@ -435,7 +591,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// <summary>
         /// Queues the initial queries to be sent upon connection
         /// </summary>
-        void SetUpSyncQueries()
+        private void SetUpSyncQueries()
         {
             // zStatus
             SyncState.AddQueryToQueue("zStatus Call Status");
@@ -488,41 +644,51 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// Processes messages as they are dequeued
         /// </summary>
         /// <param name="message"></param>
-        void ProcessMessage(string message)
-        {          
+        private void ProcessMessage(string message)
+        {
             // Counts the curly braces
-            if(message.Contains('{'))
+            if (message.Contains('{'))
+            {
                 JsonCurlyBraceCounter++;
+            }
 
             if (message.Contains('}'))
+            {
                 JsonCurlyBraceCounter--;
+            }
 
             Debug.Console(2, this, "JSON Curly Brace Count: {0}", JsonCurlyBraceCounter);
 
-            if (!JsonFeedbackMessageIsIncoming && message.Trim('\x20') == "{" + Delimiter)        // Check for the beginning of a new JSON message
+            if (!JsonFeedbackMessageIsIncoming && message.Trim('\x20') == "{" + Delimiter)
+                // Check for the beginning of a new JSON message
             {
                 JsonFeedbackMessageIsIncoming = true;
-                JsonCurlyBraceCounter = 1;  // reset the counter for each new message
+                JsonCurlyBraceCounter = 1; // reset the counter for each new message
 
                 JsonMessage = new StringBuilder();
 
                 JsonMessage.Append(message);
 
                 if (CommDebuggingIsOn)
+                {
                     Debug.Console(2, this, "Incoming JSON message...");
+                }
 
                 return;
             }
-            else if (JsonFeedbackMessageIsIncoming && message.Trim('\x20') == "}" + Delimiter)  // Check for the end of a JSON message
+            else if (JsonFeedbackMessageIsIncoming && message.Trim('\x20') == "}" + Delimiter)
+                // Check for the end of a JSON message
             {
                 JsonMessage.Append(message);
 
-                if(JsonCurlyBraceCounter == 0)
+                if (JsonCurlyBraceCounter == 0)
                 {
                     JsonFeedbackMessageIsIncoming = false;
 
                     if (CommDebuggingIsOn)
+                    {
                         Debug.Console(2, this, "Complete JSON Received:\n{0}", JsonMessage.ToString());
+                    }
 
                     // Forward the complete message to be deserialized
                     DeserializeResponse(JsonMessage.ToString());
@@ -543,36 +709,38 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             }
 
             if (CommDebuggingIsOn)
+            {
                 Debug.Console(1, this, "Non-JSON response: '{0}'", message);
+            }
 
-            JsonCurlyBraceCounter = 0;  // reset on non-JSON response
+            JsonCurlyBraceCounter = 0; // reset on non-JSON response
 
             if (!SyncState.InitialSyncComplete)
             {
                 switch (message.Trim().ToLower()) // remove the whitespace
                 {
                     case "*r login successful":
+                    {
+                        SyncState.LoginMessageReceived();
+
+                        // Fire up a thread to send the intial commands.
+                        CrestronInvoke.BeginInvoke((o) =>
                         {
-                            SyncState.LoginMessageReceived();
+                            Thread.Sleep(100);
+                            // disable echo of commands
+                            SendText("echo off");
+                            Thread.Sleep(100);
+                            // set feedback exclusions
+                            SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callin_country_list");
+                            Thread.Sleep(100);
+                            SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callout_country_list");
+                            Thread.Sleep(100);
+                            // switch to json format
+                            SendText("format json");
+                        });
 
-                            // Fire up a thread to send the intial commands.
-                            CrestronInvoke.BeginInvoke((o) =>
-                                {
-                                    Thread.Sleep(100);
-                                    // disable echo of commands
-                                    SendText("echo off");
-                                    Thread.Sleep(100);
-                                    // set feedback exclusions
-                                    SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callin_country_list");
-                                    Thread.Sleep(100);
-                                    SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callout_country_list");
-                                    Thread.Sleep(100);
-                                    // switch to json format
-                                    SendText("format json");
-                                });
-
-                            break;
-                        }
+                        break;
+                    }
                 }
             }
         }
@@ -581,18 +749,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// Deserializes a JSON formatted response
         /// </summary>
         /// <param name="response"></param>
-        void DeserializeResponse(string response)
+        private void DeserializeResponse(string response)
         {
             try
             {
                 var trimmedResponse = response.Trim();
 
                 if (trimmedResponse.Length <= 0)
+                {
                     return;
+                }
 
                 var message = JObject.Parse(trimmedResponse);
 
-                eZoomRoomResponseType eType = (eZoomRoomResponseType)Enum.Parse(typeof(eZoomRoomResponseType), message["type"].Value<string>(), true);
+                eZoomRoomResponseType eType =
+                    (eZoomRoomResponseType)
+                        Enum.Parse(typeof (eZoomRoomResponseType), message["type"].Value<string>(), true);
 
                 var topKey = message["topKey"].Value<string>();
 
@@ -603,385 +775,413 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 switch (eType)
                 {
                     case eZoomRoomResponseType.zConfiguration:
+                    {
+                        switch (topKey.ToLower())
                         {
-                            switch (topKey.ToLower())
+                            case "call":
                             {
-                                case "call":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Configuration.Call);
+                                JsonConvert.PopulateObject(responseObj.ToString(), Configuration.Call);
 
-                                        break;
-                                    }
-                                case "audio":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Configuration.Audio);
-
-                                        break;
-                                    }
-                                case "video":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Configuration.Video);
-
-                                        break;
-                                    }
-                                case "client":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Configuration.Client);
-
-                                        break;
-                                    }
-                                default:
-                                    {
-                                        break;
-                                    }
+                                break;
+                            }
+                            case "audio":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Configuration.Audio);
+
+                                break;
+                            }
+                            case "video":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Configuration.Video);
+
+                                break;
+                            }
+                            case "client":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Configuration.Client);
+
+                                break;
+                            }
+                            default:
+                            {
+                                break;
                             }
-                            break;
                         }
+                        break;
+                    }
                     case eZoomRoomResponseType.zCommand:
+                    {
+                        switch (topKey.ToLower())
                         {
-                            switch (topKey.ToLower())
+                            case "phonebooklistresult":
                             {
-                                case "phonebooklistresult":
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Phonebook);
+
+                                if (!PhonebookSyncState.InitialSyncComplete)
+                                {
+                                    PhonebookSyncState.InitialPhonebookFoldersReceived();
+                                    PhonebookSyncState.PhonebookRootEntriesReceived();
+                                    PhonebookSyncState.SetPhonebookHasFolders(false);
+                                    PhonebookSyncState.SetNumberOfContacts(Status.Phonebook.Contacts.Count);
+                                }
+
+                                var directoryResults = new CodecDirectory();
+
+                                directoryResults =
+                                    zStatus.Phonebook.ConvertZoomContactsToGeneric(Status.Phonebook.Contacts);
+
+                                DirectoryRoot = directoryResults;
+
+                                OnDirectoryResultReturned(directoryResults);
+
+                                break;
+                            }
+                            case "listparticipantsresult":
+                            {
+                                Debug.Console(1, this, "JTokenType: {0}", responseObj.Type);
+
+                                if (responseObj.Type == JTokenType.Array)
+                                {
+                                    // if the type is array this must be the complete list
+                                    Status.Call.Participants =
+                                        JsonConvert.DeserializeObject<List<zCommand.ListParticipant>>(
+                                            responseObj.ToString());
+                                }
+                                else if (responseObj.Type == JTokenType.Object)
+                                {
+                                    // this is a single participant event notification
+
+                                    var participant =
+                                        JsonConvert.DeserializeObject<zCommand.ListParticipant>(responseObj.ToString());
+
+                                    if (participant != null)
                                     {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.Phonebook);
-
-                                        if(!PhonebookSyncState.InitialSyncComplete)
+                                        if (participant.Event == "ZRCUserChangedEventLeftMeeting" ||
+                                            participant.Event == "ZRCUserChangedEventUserInfoUpdated")
                                         {
-                                            PhonebookSyncState.InitialPhonebookFoldersReceived();
-                                            PhonebookSyncState.PhonebookRootEntriesReceived();
-                                            PhonebookSyncState.SetPhonebookHasFolders(false);
-                                            PhonebookSyncState.SetNumberOfContacts(Status.Phonebook.Contacts.Count);
-                                        }
+                                            var existingParticipant =
+                                                Status.Call.Participants.FirstOrDefault(
+                                                    p => p.UserId.Equals(participant.UserId));
 
-                                        var directoryResults = new CodecDirectory();
-
-                                        directoryResults = zStatus.Phonebook.ConvertZoomContactsToGeneric(Status.Phonebook.Contacts);
-
-                                        DirectoryRoot = directoryResults;
-
-                                        OnDirectoryResultReturned(directoryResults);
-
-                                        break;
-                                    }
-                                case "listparticipantsresult":
-                                    {
-                                        Debug.Console(1, this, "JTokenType: {0}", responseObj.Type);
-
-                                        if (responseObj.Type == JTokenType.Array)
-                                        {
-                                            // if the type is array this must be the complete list
-                                            Status.Call.Participants = JsonConvert.DeserializeObject<List<zCommand.ListParticipant>>(responseObj.ToString());
-                                        }
-                                        else if (responseObj.Type == JTokenType.Object)
-                                        {
-                                            // this is a single participant event notification
-
-                                            var participant = JsonConvert.DeserializeObject<zCommand.ListParticipant>(responseObj.ToString());
-
-                                            if (participant != null)
+                                            if (existingParticipant != null)
                                             {
-                                                if (participant.Event == "ZRCUserChangedEventLeftMeeting" || participant.Event == "ZRCUserChangedEventUserInfoUpdated")
+                                                if (participant.Event == "ZRCUserChangedEventLeftMeeting")
                                                 {
-                                                    var existingParticipant = Status.Call.Participants.FirstOrDefault(p => p.UserId.Equals(participant.UserId));
-
-                                                    if (existingParticipant != null)
-                                                    {
-                                                        if (participant.Event == "ZRCUserChangedEventLeftMeeting")
-                                                        {
-                                                            // Remove participant
-                                                            Status.Call.Participants.Remove(existingParticipant);
-                                                        }
-                                                        else if (participant.Event == "ZRCUserChangedEventUserInfoUpdated")
-                                                        {
-                                                            // Update participant
-                                                            JsonConvert.PopulateObject(responseObj.ToString(), existingParticipant);
-                                                        }
-                                                    }
+                                                    // Remove participant
+                                                    Status.Call.Participants.Remove(existingParticipant);
                                                 }
-                                                else if(participant.Event == "ZRCUserChangedEventJoinedMeeting")
+                                                else if (participant.Event == "ZRCUserChangedEventUserInfoUpdated")
                                                 {
-                                                    Status.Call.Participants.Add(participant);
+                                                    // Update participant
+                                                    JsonConvert.PopulateObject(responseObj.ToString(),
+                                                        existingParticipant);
                                                 }
                                             }
                                         }
-
-                                        PrintCurrentCallParticipants();
-
-                                        break;
-                                    }
-                                default:
-                                    {
-                                        break;
+                                        else if (participant.Event == "ZRCUserChangedEventJoinedMeeting")
+                                        {
+                                            Status.Call.Participants.Add(participant);
+                                        }
                                     }
+                                }
+
+                                PrintCurrentCallParticipants();
+
+                                break;
+                            }
+                            default:
+                            {
+                                break;
                             }
-                            break;
                         }
+                        break;
+                    }
                     case eZoomRoomResponseType.zEvent:
+                    {
+                        switch (topKey.ToLower())
                         {
-                            switch (topKey.ToLower())
+                            case "phonebook":
                             {
-                                case "phonebook":
+                                if (responseObj["Updated Contact"] != null)
+                                {
+                                    var updatedContact =
+                                        JsonConvert.DeserializeObject<zStatus.Contact>(
+                                            responseObj["Updated Contact"].ToString());
+
+                                    var existingContact =
+                                        Status.Phonebook.Contacts.FirstOrDefault(c => c.Jid.Equals(updatedContact.Jid));
+
+                                    if (existingContact != null)
                                     {
-                                        if (responseObj["Updated Contact"] != null)
-                                        {
-                                            var updatedContact = JsonConvert.DeserializeObject<zStatus.Contact>(responseObj["Updated Contact"].ToString());
-
-                                            var existingContact = Status.Phonebook.Contacts.FirstOrDefault(c => c.Jid.Equals(updatedContact.Jid));
-
-                                            if (existingContact != null)
-                                            {
-                                                // Update existing contact
-                                                JsonConvert.PopulateObject(responseObj["Updated Contact"].ToString(), existingContact);
-                                            }
-                                        }
-                                        else if (responseObj["Added Contact"] != null)
-                                        {
-                                            var newContact = JsonConvert.DeserializeObject<zStatus.Contact>(responseObj["Updated Contact"].ToString());
-
-                                            // Add a new contact
-                                            Status.Phonebook.Contacts.Add(newContact);
-                                        }
-
-                                        break;
+                                        // Update existing contact
+                                        JsonConvert.PopulateObject(responseObj["Updated Contact"].ToString(),
+                                            existingContact);
                                     }
-                                case "bookingslistresult":
-                                    {
-                                        if (!SyncState.InitialSyncComplete)
-                                            SyncState.LastQueryResponseReceived();
+                                }
+                                else if (responseObj["Added Contact"] != null)
+                                {
+                                    var newContact =
+                                        JsonConvert.DeserializeObject<zStatus.Contact>(
+                                            responseObj["Updated Contact"].ToString());
 
-                                        var codecBookings = new List<zCommand.BookingsListResult>();
+                                    // Add a new contact
+                                    Status.Phonebook.Contacts.Add(newContact);
+                                }
 
-                                        codecBookings = JsonConvert.DeserializeObject < List<zCommand.BookingsListResult>>(responseObj.ToString());
-
-                                        if (codecBookings != null && codecBookings.Count > 0)
-                                        {
-                                            CodecSchedule.Meetings = zCommand.GetGenericMeetingsFromBookingResult(codecBookings);
-                                        }
-
-                                        break;
-                                    }
-                                case "bookings":
-                                    {
-                                        // Bookings have been updated, trigger a query to retreive the new bookings
-                                        if (responseObj["Updated"] != null)
-                                            GetBookings();
-
-                                        break;
-                                    }
-                                case "sharingstate":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.Sharing);
-
-                                        break;
-                                    }
-                                case "incomingcallindication":
-                                    {
-                                        var incomingCall = JsonConvert.DeserializeObject<zEvent.IncomingCallIndication>(responseObj.ToString());
-
-                                        if (incomingCall != null)
-                                        {
-                                            var newCall = new CodecActiveCallItem();
-
-                                            newCall.Direction = eCodecCallDirection.Incoming;
-                                            newCall.Status = eCodecCallStatus.Ringing;
-                                            newCall.Type = eCodecCallType.Unknown;
-                                            newCall.Name = incomingCall.callerName;
-                                            newCall.Id = incomingCall.callerJID;
-
-                                            ActiveCalls.Add(newCall);
-
-                                            OnCallStatusChange(newCall);
-                                        }
-
-                                        break;
-                                    }
-                                case "treatedincomingcallindication":
-                                    {
-                                        var incomingCall = JsonConvert.DeserializeObject<zEvent.IncomingCallIndication>(responseObj.ToString());
-
-                                        if (incomingCall != null)
-                                        {
-                                            var existingCall = ActiveCalls.FirstOrDefault(c => c.Id.Equals(incomingCall.callerJID));
-
-                                            if (existingCall != null)
-                                            {
-                                                if (!incomingCall.accepted)
-                                                {
-                                                    existingCall.Status = eCodecCallStatus.Disconnected;
-                                                }
-                                                else
-                                                {
-                                                    existingCall.Status = eCodecCallStatus.Connecting;
-                                                }
-
-                                                OnCallStatusChange(existingCall);
-                                            }
-
-                                            UpdateCallStatus();
-                                        }
-
-                                        break;
-                                    }
-                                case "calldisconnect":
-                                    {
-                                        var disconnectEvent = JsonConvert.DeserializeObject<zEvent.CallDisconnect>(responseObj.ToString());
-
-                                        if (disconnectEvent.Successful)
-                                        {
-                                            if (ActiveCalls.Count > 0)
-                                            {
-                                                var activeCall = ActiveCalls.FirstOrDefault(c => c.IsActiveCall);
-
-                                                if (activeCall != null)
-                                                {
-                                                    activeCall.Status = eCodecCallStatus.Disconnected;
-
-                                                    OnCallStatusChange(activeCall);
-                                                }
-                                            }
-                                        }
-
-                                        UpdateCallStatus();
-                                        break;
-                                    }
-                                case "callconnecterror":
-                                    {
-                                        UpdateCallStatus();
-                                        break;
-                                    }
-                                case "videounmuterequest":
-                                    {
-                                        // TODO: notify room of a request to unmute video
-                                        break;
-                                    }
-                                case "meetingneedspassword":
-                                    {
-                                        // TODO: notify user to enter a password
-                                        break;
-                                    }
-                                case "needwaitforhost":
-                                    {
-                                        var needWait = JsonConvert.DeserializeObject<zEvent.NeedWaitForHost>(responseObj.ToString());
-
-                                        if (needWait.Wait)
-                                        {
-                                            // TODO: notify user to wait for host
-                                        }
-
-                                        break;
-                                    }
-                                case "openvideofailforhoststop":
-                                    {
-                                        // TODO: notify user that host has disabled unmuting video
-                                        break;
-                                    }
-                                case "updatedcallrecordinfo":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.CallRecordInfo);
-
-                                        break;
-                                    }
-                                default:
-                                    {
-                                        break;
-                                    }
+                                break;
+                            }
+                            case "bookingslistresult":
+                            {
+                                if (!SyncState.InitialSyncComplete)
+                                {
+                                    SyncState.LastQueryResponseReceived();
+                                }
+
+                                var codecBookings = new List<zCommand.BookingsListResult>();
+
+                                codecBookings =
+                                    JsonConvert.DeserializeObject<List<zCommand.BookingsListResult>>(
+                                        responseObj.ToString());
+
+                                if (codecBookings != null && codecBookings.Count > 0)
+                                {
+                                    CodecSchedule.Meetings = zCommand.GetGenericMeetingsFromBookingResult(codecBookings);
+                                }
+
+                                break;
+                            }
+                            case "bookings":
+                            {
+                                // Bookings have been updated, trigger a query to retreive the new bookings
+                                if (responseObj["Updated"] != null)
+                                {
+                                    GetBookings();
+                                }
+
+                                break;
+                            }
+                            case "sharingstate":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.Sharing);
+
+                                break;
+                            }
+                            case "incomingcallindication":
+                            {
+                                var incomingCall =
+                                    JsonConvert.DeserializeObject<zEvent.IncomingCallIndication>(responseObj.ToString());
+
+                                if (incomingCall != null)
+                                {
+                                    var newCall = new CodecActiveCallItem();
+
+                                    newCall.Direction = eCodecCallDirection.Incoming;
+                                    newCall.Status = eCodecCallStatus.Ringing;
+                                    newCall.Type = eCodecCallType.Unknown;
+                                    newCall.Name = incomingCall.callerName;
+                                    newCall.Id = incomingCall.callerJID;
+
+                                    ActiveCalls.Add(newCall);
+
+                                    OnCallStatusChange(newCall);
+                                }
+
+                                break;
+                            }
+                            case "treatedincomingcallindication":
+                            {
+                                var incomingCall =
+                                    JsonConvert.DeserializeObject<zEvent.IncomingCallIndication>(responseObj.ToString());
+
+                                if (incomingCall != null)
+                                {
+                                    var existingCall =
+                                        ActiveCalls.FirstOrDefault(c => c.Id.Equals(incomingCall.callerJID));
+
+                                    if (existingCall != null)
+                                    {
+                                        if (!incomingCall.accepted)
+                                        {
+                                            existingCall.Status = eCodecCallStatus.Disconnected;
+                                        }
+                                        else
+                                        {
+                                            existingCall.Status = eCodecCallStatus.Connecting;
+                                        }
+
+                                        OnCallStatusChange(existingCall);
+                                    }
+
+                                    UpdateCallStatus();
+                                }
+
+                                break;
+                            }
+                            case "calldisconnect":
+                            {
+                                var disconnectEvent =
+                                    JsonConvert.DeserializeObject<zEvent.CallDisconnect>(responseObj.ToString());
+
+                                if (disconnectEvent.Successful)
+                                {
+                                    if (ActiveCalls.Count > 0)
+                                    {
+                                        var activeCall = ActiveCalls.FirstOrDefault(c => c.IsActiveCall);
+
+                                        if (activeCall != null)
+                                        {
+                                            activeCall.Status = eCodecCallStatus.Disconnected;
+
+                                            OnCallStatusChange(activeCall);
+                                        }
+                                    }
+                                }
+
+                                UpdateCallStatus();
+                                break;
+                            }
+                            case "callconnecterror":
+                            {
+                                UpdateCallStatus();
+                                break;
+                            }
+                            case "videounmuterequest":
+                            {
+                                // TODO: notify room of a request to unmute video
+                                break;
+                            }
+                            case "meetingneedspassword":
+                            {
+                                // TODO: notify user to enter a password
+                                break;
+                            }
+                            case "needwaitforhost":
+                            {
+                                var needWait =
+                                    JsonConvert.DeserializeObject<zEvent.NeedWaitForHost>(responseObj.ToString());
+
+                                if (needWait.Wait)
+                                {
+                                    // TODO: notify user to wait for host
+                                }
+
+                                break;
+                            }
+                            case "openvideofailforhoststop":
+                            {
+                                // TODO: notify user that host has disabled unmuting video
+                                break;
+                            }
+                            case "updatedcallrecordinfo":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.CallRecordInfo);
+
+                                break;
+                            }
+                            default:
+                            {
+                                break;
                             }
-                            break;
                         }
+                        break;
+                    }
                     case eZoomRoomResponseType.zStatus:
+                    {
+                        switch (topKey.ToLower())
                         {
-                            switch (topKey.ToLower())
+                            case "login":
                             {
-                                case "login":
-                                    {
-                                        SyncState.LoginMessageReceived();
+                                SyncState.LoginMessageReceived();
 
-                                        if (!SyncState.InitialQueryMessagesWereSent)
-                                            SetUpSyncQueries();
+                                if (!SyncState.InitialQueryMessagesWereSent)
+                                {
+                                    SetUpSyncQueries();
+                                }
 
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.Login);
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Login);
 
-                                        break;
-                                    }
-                                case "systemunit":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.SystemUnit);
-
-                                        break;
-                                    }
-                                case "call":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.Call);
-
-                                        UpdateCallStatus();
-
-                                        break;
-                                    }
-                                case "capabilities":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.Capabilities);
-                                        break;
-                                    }
-                                case "sharing":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.Sharing);
-
-                                        break;
-                                    }
-                                case "numberofscreens":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.NumberOfScreens);
-                                        break;
-                                    }
-                                case "video":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.Video);
-                                        break;
-                                    }
-                                case "camerashare":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.CameraShare);
-                                        break;
-                                    }
-                                case "layout":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.Layout);
-                                        break;
-                                    }
-                                case "audio input line":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.AudioInputs);
-                                        break;
-                                    }
-                                case "audio output line":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.AudioOuputs);
-                                        break;
-                                    }
-                                case "video camera line":
-                                    {
-                                        JsonConvert.PopulateObject(responseObj.ToString(), Status.Cameras);
-
-                                        if(!SyncState.CamerasHaveBeenSetUp)
-                                            SetUpCameras();
-
-                                        break;
-                                    }
-                                default:
-                                    {
-                                        break;
-                                    }
+                                break;
                             }
+                            case "systemunit":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.SystemUnit);
 
-                            break;
+                                break;
+                            }
+                            case "call":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Call);
+
+                                UpdateCallStatus();
+
+                                break;
+                            }
+                            case "capabilities":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Capabilities);
+                                break;
+                            }
+                            case "sharing":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Sharing);
+
+                                break;
+                            }
+                            case "numberofscreens":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.NumberOfScreens);
+                                break;
+                            }
+                            case "video":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Video);
+                                break;
+                            }
+                            case "camerashare":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.CameraShare);
+                                break;
+                            }
+                            case "layout":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Layout);
+                                break;
+                            }
+                            case "audio input line":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.AudioInputs);
+                                break;
+                            }
+                            case "audio output line":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.AudioOuputs);
+                                break;
+                            }
+                            case "video camera line":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.Cameras);
+
+                                if (!SyncState.CamerasHaveBeenSetUp)
+                                {
+                                    SetUpCameras();
+                                }
+
+                                break;
+                            }
+                            default:
+                            {
+                                break;
+                            }
                         }
+
+                        break;
+                    }
                     default:
-                        {
-                            Debug.Console(1, "Unknown Response Type:");
-                            break;
-                        }
+                    {
+                        Debug.Console(1, "Unknown Response Type:");
+                        break;
+                    }
                 }
-
             }
             catch (Exception ex)
             {
@@ -996,7 +1196,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 Debug.Console(1, this, "****************************Call Participants***************************");
                 foreach (var participant in Status.Call.Participants)
                 {
-                    Debug.Console(1, this, "Name: {0} Audio: {1} IsHost: {2}", participant.UserName, participant.AudioStatusState, participant.IsHost);
+                    Debug.Console(1, this, "Name: {0} Audio: {1} IsHost: {2}", participant.UserName,
+                        participant.AudioStatusState, participant.IsHost);
                 }
                 Debug.Console(1, this, "************************************************************************");
             }
@@ -1005,7 +1206,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// <summary>
         /// Retrieves bookings list
         /// </summary>
-        void GetBookings()
+        private void GetBookings()
         {
             SendText("zCommand Bookings List");
         }
@@ -1014,7 +1215,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// <summary>
         /// Updates the current call status
         /// </summary>
-        void UpdateCallStatus()
+        private void UpdateCallStatus()
         {
             zStatus.eCallStatus callStatus;
 
@@ -1031,7 +1232,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                 if (ActiveCalls.Count == 0)
                 {
-                    if(callStatus == zStatus.eCallStatus.CONNECTING_MEETING)
+                    if (callStatus == zStatus.eCallStatus.CONNECTING_MEETING)
                     {
                         var newCall = new CodecActiveCallItem();
 
@@ -1057,7 +1258,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                     OnCallStatusChange(existingCall);
                 }
-
             }
 
             Debug.Console(1, this, "****************************Active Calls*********************************");
@@ -1067,7 +1267,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             {
                 var call = ActiveCalls[i];
 
-                Debug.Console(1, this, 
+                Debug.Console(1, this,
                     @"Name: {0}
                     ID: {1}
                     IsActive: {2}
@@ -1082,7 +1282,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             }
 
             Debug.Console(1, this, "**************************************************************************");
-
         }
 
         public override void StartSharing()
@@ -1111,19 +1310,23 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public override void PrivacyModeToggle()
         {
             if (PrivacyModeIsOnFeedback.BoolValue)
+            {
                 PrivacyModeOff();
+            }
             else
+            {
                 PrivacyModeOn();
+            }
         }
 
         public override void MuteOff()
         {
-            SetVolume((ushort)PreviousVolumeLevel);
+            SetVolume((ushort) PreviousVolumeLevel);
         }
 
         public override void MuteOn()
         {
-            PreviousVolumeLevel = Configuration.Audio.Output.Volume;    // Store the previous level for recall
+            PreviousVolumeLevel = Configuration.Audio.Output.Volume; // Store the previous level for recall
 
             SetVolume(0);
         }
@@ -1131,9 +1334,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public override void MuteToggle()
         {
             if (MuteFeedback.BoolValue)
+            {
                 MuteOff();
+            }
             else
+            {
                 MuteOn();
+            }
         }
 
         /// <summary>
@@ -1169,7 +1376,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// </summary>
         public void VolumeSetToDefault()
         {
-            
         }
 
         /// <summary>
@@ -1193,20 +1399,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             (selector as Action)();
         }
 
-        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
-        {
-            ExecuteSwitch(inputSelector);
-        }
-
         public override void AcceptCall(CodecActiveCallItem call)
         {
-            var incomingCall = ActiveCalls.FirstOrDefault(c => c.Status.Equals(eCodecCallStatus.Ringing) && c.Direction.Equals(eCodecCallDirection.Incoming));
+            var incomingCall =
+                ActiveCalls.FirstOrDefault(
+                    c => c.Status.Equals(eCodecCallStatus.Ringing) && c.Direction.Equals(eCodecCallDirection.Incoming));
             SendText(string.Format("zCommand Call Accept callerJID: {0}", incomingCall.Id));
         }
 
         public override void RejectCall(CodecActiveCallItem call)
         {
-            var incomingCall = ActiveCalls.FirstOrDefault(c => c.Status.Equals(eCodecCallStatus.Ringing) && c.Direction.Equals(eCodecCallDirection.Incoming));
+            var incomingCall =
+                ActiveCalls.FirstOrDefault(
+                    c => c.Status.Equals(eCodecCallStatus.Ringing) && c.Direction.Equals(eCodecCallDirection.Incoming));
             SendText(string.Format("zCommand Call Reject callerJID: {0}", incomingCall.Id));
         }
 
@@ -1234,9 +1439,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 Debug.Console(1, this, "Attempting to Dial (Invite): {0}", ic.Name);
 
                 if (!IsInCall)
-                    SendText(string.Format("zCommand Invite Duration: {0} user: {1}", DefaultMeetingDurationMin, ic.ContactId));
+                {
+                    SendText(string.Format("zCommand Invite Duration: {0} user: {1}", DefaultMeetingDurationMin,
+                        ic.ContactId));
+                }
                 else
+                {
                     SendText(string.Format("zCommand Call invite user: {0}", ic.ContactId));
+                }
             }
         }
 
@@ -1255,39 +1465,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             throw new NotImplementedException();
         }
 
-
-        #region IHasCodecSelfView Members
-
-        public BoolFeedback SelfviewIsOnFeedback { get; private set; }
-
-        public void SelfViewModeOn()
-        {
-            SendText("zConfiguration Video hide_conf_self_video: off");
-        }
-
-        public void SelfViewModeOff()
-        {
-            SendText("zConfiguration Video hide_conf_self_video: on");
-        }
-
-        public void SelfViewModeToggle()
-        {
-            if (SelfviewIsOnFeedback.BoolValue)
-                SelfViewModeOff();
-            else
-                SelfViewModeOn();
-        }
-
-        #endregion
-
-        #region IHasDirectory Members
-
-        public event EventHandler<DirectoryEventArgs> DirectoryResultReturned;
-
         /// Call when directory results are updated
         /// </summary>
         /// <param name="result"></param>
-        void OnDirectoryResultReturned(CodecDirectory result)
+        private void OnDirectoryResultReturned(CodecDirectory result)
         {
             CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
 
@@ -1305,94 +1486,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             //PrintDirectory(result);
         }
 
-        public CodecDirectory DirectoryRoot { get; private set; }
-
-        public CodecDirectory CurrentDirectoryResult
-        {
-            get
-            {
-                if (DirectoryBrowseHistory.Count > 0)
-                    return DirectoryBrowseHistory[DirectoryBrowseHistory.Count - 1];
-                else
-                    return DirectoryRoot;
-            }
-        }
-
-        public CodecPhonebookSyncState PhonebookSyncState { get; private set; }
-
-        public void SearchDirectory(string searchString)
-        {
-            var directoryResults = new CodecDirectory();
-
-            directoryResults.AddContactsToDirectory(DirectoryRoot.CurrentDirectoryResults.FindAll(c => c.Name.IndexOf(searchString, 0, StringComparison.OrdinalIgnoreCase) > -1));
-
-            DirectoryBrowseHistory.Add(directoryResults);
-
-            OnDirectoryResultReturned(directoryResults);
-        }
-
-        public void GetDirectoryFolderContents(string folderId)
-        {
-            var directoryResults = new CodecDirectory();
-
-            directoryResults.ResultsFolderId = folderId;
-            directoryResults.AddContactsToDirectory(DirectoryRoot.CurrentDirectoryResults.FindAll(c => c.FolderId.Equals(folderId)));
-
-            DirectoryBrowseHistory.Add(directoryResults);
-
-            OnDirectoryResultReturned(directoryResults);
-        }
-
-        public void SetCurrentDirectoryToRoot()
-        {
-            DirectoryBrowseHistory.Clear();
-
-            OnDirectoryResultReturned(DirectoryRoot);
-        }
-
-        public void GetDirectoryParentFolderContents()
-        {
-            var currentDirectory = new CodecDirectory();
-
-            if (DirectoryBrowseHistory.Count > 0)
-            {
-                var lastItemIndex = DirectoryBrowseHistory.Count - 1;
-                var parentDirectoryContents = DirectoryBrowseHistory[lastItemIndex];
-
-                DirectoryBrowseHistory.Remove(DirectoryBrowseHistory[lastItemIndex]);
-
-                currentDirectory = parentDirectoryContents;
-
-            }
-            else
-            {
-                currentDirectory = DirectoryRoot;
-            }
-
-            OnDirectoryResultReturned(currentDirectory);
-        }
-
-        public BoolFeedback CurrentDirectoryResultIsNotDirectoryRoot { get; private set; }
-
-        public List<CodecDirectory> DirectoryBrowseHistory { get; private set; }
-
-        #endregion
-
-        #region IHasScheduleAwareness Members
-
-        public CodecScheduleAwareness CodecSchedule { get; private set; }
-
-        public void GetSchedule()
-        {
-            GetBookings();
-        }
-
-        #endregion
-
         /// <summary>
         /// Builds the cameras List by using the Zoom Room zStatus.Cameras data.  Could later be modified to build from config data
         /// </summary>
-        void SetUpCameras()
+        private void SetUpCameras()
         {
             SelectedCameraFeedback = new StringFeedback(() => Configuration.Video.Camera.SelectedId);
 
@@ -1405,11 +1502,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 Cameras.Add(camera);
 
                 if (cam.Selected)
-                    SelectedCamera = camera;              
+                {
+                    SelectedCamera = camera;
+                }
             }
 
             if (IsInCall)
+            {
                 UpdateFarEndCameras();
+            }
 
             SyncState.CamerasSetUp();
         }
@@ -1417,66 +1518,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// <summary>
         /// Dynamically creates far end cameras for call participants who have far end control enabled.
         /// </summary>
-        void UpdateFarEndCameras()
+        private void UpdateFarEndCameras()
         {
             // TODO: set up far end cameras for the current call
         }
-
-        #region IHasCameras Members
-
-        public event EventHandler<CameraSelectedEventArgs> CameraSelected;
-
-        public List<CameraBase> Cameras { get; private set; }
-
-        private CameraBase _selectedCamera;
-
-        public CameraBase SelectedCamera
-        {
-            get
-            {
-                return _selectedCamera;
-            }
-            private set
-            {
-                _selectedCamera = value;
-                SelectedCameraFeedback.FireUpdate();
-                ControllingFarEndCameraFeedback.FireUpdate();
-
-                var handler = CameraSelected;
-                if (handler != null)
-                {
-                    handler(this, new CameraSelectedEventArgs(SelectedCamera));
-                }
-            }
-        }
-
-
-        public StringFeedback SelectedCameraFeedback { get; private set; }
-
-        public void SelectCamera(string key)
-        {
-            if(Cameras != null)
-            {
-                var camera = Cameras.FirstOrDefault(c => c.Key.IndexOf(key, StringComparison.OrdinalIgnoreCase) > -1);
-                if (camera != null)
-                {
-                    Debug.Console(1, this, "Selected Camera with key: '{0}'", camera.Key);
-                    SelectedCamera = camera;
-                }
-                else
-                    Debug.Console(1, this, "Unable to select camera with key: '{0}'", key);
-            }
-        }
-
-        #endregion
-
-        #region IHasFarEndCameraControl Members
-
-        public CameraBase FarEndCamera { get; private set; }
-
-        public BoolFeedback ControllingFarEndCameraFeedback { get; private set; }
-
-        #endregion
     }
 
     /// <summary>
@@ -1484,15 +1529,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
     /// </summary>
     public class ZoomRoomInfo : VideoCodecInfo
     {
+        public ZoomRoomInfo(ZoomRoomStatus status, ZoomRoomConfiguration configuration)
+        {
+            Status = status;
+            Configuration = configuration;
+        }
+
         public ZoomRoomStatus Status { get; private set; }
         public ZoomRoomConfiguration Configuration { get; private set; }
 
         public override bool AutoAnswerEnabled
         {
-            get 
-            {
-                return Status.SystemUnit.RoomInfo.AutoAnswerIsEnabled;
-            }
+            get { return Status.SystemUnit.RoomInfo.AutoAnswerIsEnabled; }
         }
 
         public override string E164Alias
@@ -1500,9 +1548,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             get
             {
                 if (!string.IsNullOrEmpty(Status.SystemUnit.MeetingNumber))
+                {
                     return Status.SystemUnit.MeetingNumber;
+                }
                 else
+                {
                     return string.Empty;
+                }
             }
         }
 
@@ -1511,9 +1563,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             get
             {
                 if (!string.IsNullOrEmpty(Status.Call.Info.meeting_list_item.third_party.h323_address))
+                {
                     return Status.Call.Info.meeting_list_item.third_party.h323_address;
+                }
                 else
+                {
                     return string.Empty;
+                }
             }
         }
 
@@ -1522,9 +1578,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             get
             {
                 if (!string.IsNullOrEmpty(Status.SystemUnit.RoomInfo.AccountEmail))
+                {
                     return Status.SystemUnit.RoomInfo.AccountEmail;
+                }
                 else
+                {
                     return string.Empty;
+                }
             }
         }
 
@@ -1538,9 +1598,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             get
             {
                 if (!string.IsNullOrEmpty(Status.Call.Info.dialIn))
+                {
                     return Status.Call.Info.dialIn;
+                }
                 else
+                {
                     return string.Empty;
+                }
             }
         }
 
@@ -1549,17 +1613,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             get
             {
                 if (!string.IsNullOrEmpty(Status.Call.Info.meeting_list_item.third_party.sip_address))
+                {
                     return Status.Call.Info.meeting_list_item.third_party.sip_address;
+                }
                 else
+                {
                     return string.Empty;
+                }
             }
         }
-
-        public ZoomRoomInfo(ZoomRoomStatus status, ZoomRoomConfiguration configuration)
-        {
-            Status = status;
-            Configuration = configuration;
-        }
     }
 
     /// <summary>
@@ -1567,15 +1629,17 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
     /// </summary>
     public class ZoomRoomSyncState : IKeyed
     {
-        bool _InitialSyncComplete;
+        private readonly ZoomRoom Parent;
+        private readonly CrestronQueue<string> SyncQueries;
+        private bool _InitialSyncComplete;
 
-        public event EventHandler<EventArgs> InitialSyncCompleted;
-
-        private CrestronQueue<string> SyncQueries;
-
-        private ZoomRoom Parent;
-
-        public string Key { get; private set; }
+        public ZoomRoomSyncState(string key, ZoomRoom parent)
+        {
+            Parent = parent;
+            Key = key;
+            SyncQueries = new CrestronQueue<string>(50);
+            CodecDisconnected();
+        }
 
         public bool InitialSyncComplete
         {
@@ -1586,7 +1650,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 {
                     var handler = InitialSyncCompleted;
                     if (handler != null)
+                    {
                         handler(this, new EventArgs());
+                    }
                 }
                 _InitialSyncComplete = value;
             }
@@ -1598,28 +1664,28 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public bool LastQueryResponseWasReceived { get; private set; }
 
-        public bool CamerasHaveBeenSetUp { get; private set;}
+        public bool CamerasHaveBeenSetUp { get; private set; }
 
-        public ZoomRoomSyncState(string key, ZoomRoom parent)
-        {
-            Parent = parent;
-            Key = key;
-            SyncQueries = new CrestronQueue<string>(50);
-            CodecDisconnected();           
-        }
+        #region IKeyed Members
+
+        public string Key { get; private set; }
+
+        #endregion
+
+        public event EventHandler<EventArgs> InitialSyncCompleted;
 
         public void StartSync()
         {
             DequeueQueries();
         }
 
-        void DequeueQueries()
+        private void DequeueQueries()
         {
             while (!SyncQueries.IsEmpty)
             {
                 var query = SyncQueries.Dequeue();
 
-                Parent.SendText(query);                
+                Parent.SendText(query);
             }
 
             InitialQueryMessagesSent();
@@ -1668,15 +1734,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             InitialSyncComplete = false;
         }
 
-        void CheckSyncStatus()
+        private void CheckSyncStatus()
         {
-            if (LoginMessageWasReceived && InitialQueryMessagesWereSent && LastQueryResponseWasReceived && CamerasHaveBeenSetUp)
+            if (LoginMessageWasReceived && InitialQueryMessagesWereSent && LastQueryResponseWasReceived &&
+                CamerasHaveBeenSetUp)
             {
                 InitialSyncComplete = true;
                 Debug.Console(1, this, "Initial Codec Sync Complete!");
             }
             else
+            {
                 InitialSyncComplete = false;
+            }
         }
     }
 
@@ -1684,15 +1753,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
     {
         public ZoomRoomFactory()
         {
-            TypeNames = new List<string>() { "zoomroom" };
+            TypeNames = new List<string>() {"zoomroom"};
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
             Debug.Console(1, "Factory Attempting to create new ZoomRoom Device");
             var comm = CommFactory.CreateCommForDevice(dc);
-            return new VideoCodec.ZoomRoom.ZoomRoom(dc, comm);
+            return new ZoomRoom(dc, comm);
         }
     }
-
 }
\ No newline at end of file

From 1bd9eca806b6f9478006c8c405f1c2610d09d690 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 17 Sep 2020 11:02:36 -0600
Subject: [PATCH 26/89] Update to PepperDash Core 1.0.42

---
 packages.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages.config b/packages.config
index 11087174..296413b6 100644
--- a/packages.config
+++ b/packages.config
@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.0.41" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+  <package id="PepperDashCore" version="1.0.42" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
 </packages>
\ No newline at end of file

From 6972b544ec8ebed9d5a1174208ec03c202b5e6aa Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 17 Sep 2020 11:03:04 -0600
Subject: [PATCH 27/89] Add IBridgeAdvanced to VideoCodecBase

---
 .../VideoCodec/CiscoCodec/CiscoSparkCodec.cs  |   8 +-
 .../VideoCodec/MockVC/MockVC.cs               |   8 +-
 .../VideoCodec/VideoCodecBase.cs              | 315 ++++++++++--------
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           |  53 ++-
 4 files changed, 231 insertions(+), 153 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index 9759cfdd..9e5ce331 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -5,12 +5,13 @@ using System.Text;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.CrestronThread;
-
+using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
@@ -1388,6 +1389,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             SendText("xCommand Standby Deactivate");
         }
 
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            throw new NotImplementedException();
+        }
+
         /// <summary>
         /// Reboots the codec
         /// </summary>
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVC.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVC.cs
index dc32ecd8..c4bfa298 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVC.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVC.cs	
@@ -3,9 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-
+using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Codec;
@@ -226,6 +227,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             _StandbyIsOn = false;
         }
 
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            throw new NotImplementedException();
+        }
+
         /// <summary>
         /// Called by routing to make it happen
         /// </summary>
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 1f8938f6..fe18e7ca 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -2,83 +2,22 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Crestron.SimplSharp;
-
+using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.Routing;
-using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.Devices.Common.Codec;
+using Feedback = PepperDash.Essentials.Core.Feedback;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {
     public abstract class VideoCodecBase : ReconfigurableDevice, IRoutingInputsOutputs,
-		IUsageTracking, IHasDialer, IHasContentSharing, ICodecAudio, iVideoCodecInfo
+        IUsageTracking, IHasDialer, IHasContentSharing, ICodecAudio, iVideoCodecInfo, IBridgeAdvanced
     {
-        /// <summary>
-        /// Fires when the status of any active, dialing, or incoming call changes or is new
-        /// </summary>
-        public event EventHandler<CodecCallStatusItemChangeEventArgs> CallStatusChange;
-
-        public event EventHandler<EventArgs> IsReadyChange;
-
-        public IBasicCommunication Communication { get; protected set; }
-
-        #region IUsageTracking Members
-
-        /// <summary>
-        /// This object can be added by outside users of this class to provide usage tracking
-        /// for various services
-        /// </summary>
-        public UsageTracking UsageTracker { get; set; }
-
-        #endregion
-
-        /// <summary>
-        /// An internal pseudo-source that is routable and connected to the osd input
-        /// </summary>
-        public DummyRoutingInputsDevice OsdSource { get; protected set; }
-
-        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-
-        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-
-        /// <summary>
-        /// Returns true when any call is not in state Unknown, Disconnecting, Disconnected
-        /// </summary>
-        public bool IsInCall 
-        { 
-            get
-            {
-                bool value;
-
-                if (ActiveCalls != null)
-                    value = ActiveCalls.Any(c => c.IsActiveCall);
-                else
-                    value = false;
-                return value; 
-            } 
-        }
-
-        public BoolFeedback StandbyIsOnFeedback { get; private set; }
-
-        abstract protected Func<bool> PrivacyModeIsOnFeedbackFunc { get; }
-        abstract protected Func<int> VolumeLevelFeedbackFunc { get; }
-        abstract protected Func<bool> MuteFeedbackFunc { get; }
-        abstract protected Func<bool> StandbyIsOnFeedbackFunc { get; }
-
-        public List<CodecActiveCallItem> ActiveCalls { get; set; }
-
-        public VideoCodecInfo CodecInfo { get; protected set; }
-
-        public bool ShowSelfViewByDefault { get; protected set; }
-
-
-        public bool IsReady { get; protected set; }
-
-        public VideoCodecBase(DeviceConfig config)
+        protected VideoCodecBase(DeviceConfig config)
             : base(config)
         {
             StandbyIsOnFeedback = new BoolFeedback(StandbyIsOnFeedbackFunc);
@@ -90,85 +29,45 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             InputPorts = new RoutingPortCollection<RoutingInputPort>();
             OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-            
+
             ActiveCalls = new List<CodecActiveCallItem>();
         }
 
-        #region IHasDialer Members
+        public IBasicCommunication Communication { get; protected set; }
 
-        public abstract void Dial(string number);
-        public abstract void Dial(Meeting meeting);
-        public virtual void Dial(IInvitableContact contact)
-        {
+        /// <summary>
+        /// An internal pseudo-source that is routable and connected to the osd input
+        /// </summary>
+        public DummyRoutingInputsDevice OsdSource { get; protected set; }
 
-        }
-        public abstract void EndCall(CodecActiveCallItem call);
-        public abstract void EndAllCalls();
-        public abstract void AcceptCall(CodecActiveCallItem call);
-        public abstract void RejectCall(CodecActiveCallItem call);
-        public abstract void SendDtmf(string s);
+        public BoolFeedback StandbyIsOnFeedback { get; private set; }
 
-        #endregion
+        protected abstract Func<bool> PrivacyModeIsOnFeedbackFunc { get; }
+        protected abstract Func<int> VolumeLevelFeedbackFunc { get; }
+        protected abstract Func<bool> MuteFeedbackFunc { get; }
+        protected abstract Func<bool> StandbyIsOnFeedbackFunc { get; }
+
+        public List<CodecActiveCallItem> ActiveCalls { get; set; }
+
+        public bool ShowSelfViewByDefault { get; protected set; }
+
+
+        public bool IsReady { get; protected set; }
 
         public virtual List<Feedback> Feedbacks
         {
             get
             {
                 return new List<Feedback>
-				{
+                {
                     PrivacyModeIsOnFeedback,
                     SharingSourceFeedback
-				};
+                };
             }
         }
 
-        public abstract void ExecuteSwitch(object selector);
-
-        /// <summary>
-        /// Helper method to fire CallStatusChange event with old and new status
-        /// </summary>
-        protected void SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus newStatus, CodecActiveCallItem call)
-        {
-            call.Status = newStatus;
-
-            OnCallStatusChange(call);
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="previousStatus"></param>
-        /// <param name="newStatus"></param>
-        /// <param name="item"></param>
-        protected void OnCallStatusChange(CodecActiveCallItem item)
-        {
-            var handler = CallStatusChange;
-            if (handler != null)
-                handler(this, new CodecCallStatusItemChangeEventArgs(item));
-
-            if (AutoShareContentWhileInCall)
-                StartSharing();
-
-            if (UsageTracker != null)
-            {
-                if (IsInCall && !UsageTracker.UsageTrackingStarted)
-                    UsageTracker.StartDeviceUsage();
-                else if (UsageTracker.UsageTrackingStarted && !IsInCall)
-                    UsageTracker.EndDeviceUsage();
-            }
-        }
-
-        /// <summary>
-        /// Sets IsReady property and fires the event. Used for dependent classes to sync up their data.
-        /// </summary>
-        protected void SetIsReady()
-        {
-            IsReady = true;
-            var h = IsReadyChange;
-            if(h != null)
-                h(this, new EventArgs());
-        }
+        protected abstract Func<string> SharingSourceFeedbackFunc { get; }
+        protected abstract Func<bool> SharingContentIsOnFeedbackFunc { get; }
 
         #region ICodecAudio Members
 
@@ -197,7 +96,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         #endregion
 
-        #region IHasSharing Members
+        #region IHasContentSharing Members
 
         public abstract void StartSharing();
         public abstract void StopSharing();
@@ -207,12 +106,133 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         public StringFeedback SharingSourceFeedback { get; private set; }
         public BoolFeedback SharingContentIsOnFeedback { get; private set; }
 
-        abstract protected Func<string> SharingSourceFeedbackFunc { get; }
-        abstract protected Func<bool> SharingContentIsOnFeedbackFunc { get; }
+        #endregion
 
+        #region IHasDialer Members
+
+        /// <summary>
+        /// Fires when the status of any active, dialing, or incoming call changes or is new
+        /// </summary>
+        public event EventHandler<CodecCallStatusItemChangeEventArgs> CallStatusChange;
+
+        /// <summary>
+        /// Returns true when any call is not in state Unknown, Disconnecting, Disconnected
+        /// </summary>
+        public bool IsInCall
+        {
+            get
+            {
+                bool value;
+
+                if (ActiveCalls != null)
+                {
+                    value = ActiveCalls.Any(c => c.IsActiveCall);
+                }
+                else
+                {
+                    value = false;
+                }
+                return value;
+            }
+        }
+
+        public abstract void Dial(string number);
+        public abstract void EndCall(CodecActiveCallItem call);
+        public abstract void EndAllCalls();
+        public abstract void AcceptCall(CodecActiveCallItem call);
+        public abstract void RejectCall(CodecActiveCallItem call);
+        public abstract void SendDtmf(string s);
 
         #endregion
 
+        #region IRoutingInputsOutputs Members
+
+        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
+
+        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
+
+        #endregion
+
+        #region IUsageTracking Members
+
+        /// <summary>
+        /// This object can be added by outside users of this class to provide usage tracking
+        /// for various services
+        /// </summary>
+        public UsageTracking UsageTracker { get; set; }
+
+        #endregion
+
+        #region iVideoCodecInfo Members
+
+        public VideoCodecInfo CodecInfo { get; protected set; }
+
+        #endregion
+
+        public event EventHandler<EventArgs> IsReadyChange;
+        public abstract void Dial(Meeting meeting);
+
+        public virtual void Dial(IInvitableContact contact)
+        {
+        }
+
+        public abstract void ExecuteSwitch(object selector);
+
+        /// <summary>
+        /// Helper method to fire CallStatusChange event with old and new status
+        /// </summary>
+        protected void SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus newStatus, CodecActiveCallItem call)
+        {
+            call.Status = newStatus;
+
+            OnCallStatusChange(call);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="previousStatus"></param>
+        /// <param name="newStatus"></param>
+        /// <param name="item"></param>
+        protected void OnCallStatusChange(CodecActiveCallItem item)
+        {
+            var handler = CallStatusChange;
+            if (handler != null)
+            {
+                handler(this, new CodecCallStatusItemChangeEventArgs(item));
+            }
+
+            if (AutoShareContentWhileInCall)
+            {
+                StartSharing();
+            }
+
+            if (UsageTracker != null)
+            {
+                if (IsInCall && !UsageTracker.UsageTrackingStarted)
+                {
+                    UsageTracker.StartDeviceUsage();
+                }
+                else if (UsageTracker.UsageTrackingStarted && !IsInCall)
+                {
+                    UsageTracker.EndDeviceUsage();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sets IsReady property and fires the event. Used for dependent classes to sync up their data.
+        /// </summary>
+        protected void SetIsReady()
+        {
+            IsReady = true;
+            var h = IsReadyChange;
+            if (h != null)
+            {
+                h(this, new EventArgs());
+            }
+        }
+
         // **** DEBUGGING THINGS ****
         /// <summary>
         /// 
@@ -221,7 +241,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         {
             var sb = new StringBuilder();
             foreach (var c in ActiveCalls)
+            {
                 sb.AppendFormat("{0} {1} -- {2} {3}\n", c.Id, c.Number, c.Name, c.Status);
+            }
             Debug.Console(1, this, "\n{0}\n", sb.ToString());
         }
 
@@ -229,6 +251,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         public abstract void StandbyDeactivate();
 
+        #region Implementation of IBridgeAdvanced
+
+        public abstract void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
+
+        #endregion
     }
 
 
@@ -237,11 +264,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
     /// </summary>
     public class CodecPhonebookSyncState : IKeyed
     {
-        bool _InitialSyncComplete;
+        private bool _InitialSyncComplete;
 
-        public event EventHandler<EventArgs> InitialSyncCompleted;
+        public CodecPhonebookSyncState(string key)
+        {
+            Key = key;
 
-        public string Key { get; private set; }
+            CodecDisconnected();
+        }
 
         public bool InitialSyncComplete
         {
@@ -252,7 +282,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 {
                     var handler = InitialSyncCompleted;
                     if (handler != null)
+                    {
                         handler(this, new EventArgs());
+                    }
                 }
                 _InitialSyncComplete = value;
             }
@@ -268,12 +300,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         public int NumberOfContacts { get; private set; }
 
-        public CodecPhonebookSyncState(string key)
-        {
-            Key = key;
+        #region IKeyed Members
 
-            CodecDisconnected();
-        }
+        public string Key { get; private set; }
+
+        #endregion
+
+        public event EventHandler<EventArgs> InitialSyncCompleted;
 
         public void InitialPhonebookFoldersReceived()
         {
@@ -314,7 +347,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             NumberOfContactsWasReceived = false;
         }
 
-        void CheckSyncStatus()
+        private void CheckSyncStatus()
         {
             if (InitialPhonebookFoldersWasReceived && NumberOfContactsWasReceived && PhonebookRootEntriesWasRecieved)
             {
@@ -322,7 +355,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 Debug.Console(1, this, "Initial Phonebook Sync Complete!");
             }
             else
+            {
                 InitialSyncComplete = false;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 179b4001..d25abb22 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -4,14 +4,17 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.CrestronThread;
+using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
+using PepperDash_Essentials_Core.Bridges.JoinMaps;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
@@ -218,18 +221,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public void SelectCamera(string key)
         {
-            if (Cameras != null)
+            if (Cameras == null)
             {
-                var camera = Cameras.FirstOrDefault(c => c.Key.IndexOf(key, StringComparison.OrdinalIgnoreCase) > -1);
-                if (camera != null)
-                {
-                    Debug.Console(1, this, "Selected Camera with key: '{0}'", camera.Key);
-                    SelectedCamera = camera;
-                }
-                else
-                {
-                    Debug.Console(1, this, "Unable to select camera with key: '{0}'", key);
-                }
+                return;
+            }
+
+            var camera = Cameras.FirstOrDefault(c => c.Key.IndexOf(key, StringComparison.OrdinalIgnoreCase) > -1);
+            if (camera != null)
+            {
+                Debug.Console(1, this, "Selected Camera with key: '{0}'", camera.Key);
+                SelectedCamera = camera;
+            }
+            else
+            {
+                Debug.Console(1, this, "Unable to select camera with key: '{0}'", key);
             }
         }
 
@@ -1394,6 +1399,32 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             // No corresponding function on device
         }
 
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            var joinMap = new VideoCodecControllerJoinMap(joinStart);
+
+            var customJoins = JoinMapHelper.TryGetJoinMapAdvancedForDevice(joinMapKey);
+
+            if (customJoins != null)
+            {
+                joinMap.SetCustomJoinData(customJoins);
+            }
+
+            if (bridge != null)
+            {
+                bridge.AddJoinMap(Key, joinMap);
+            }
+
+            Debug.Console(1, this, "Linking to Trilist {0}", trilist.ID.ToString("X"));
+
+            LinkCameraActions(trilist, joinMap);
+        }
+
+        private void LinkCameraActions(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            
+        }
+
         public override void ExecuteSwitch(object selector)
         {
             (selector as Action)();

From 41b39a5d3b9e942770066fd752b329cec8db08ba Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 17 Sep 2020 11:03:14 -0600
Subject: [PATCH 28/89] remove duplicate using statement

---
 .../Essentials Devices Common/Factory/DeviceFactory.cs           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs
index dd99fe34..a18d3b65 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs	
@@ -17,7 +17,6 @@ using PepperDash.Essentials.Core.CrestronIO;
 using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.Devices.Common.DSP;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common.Environment;
 
 namespace PepperDash.Essentials.Devices.Common

From 477d7957e3aa5f2d5f5cb136deff8ae240ebba11 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 17 Sep 2020 11:03:29 -0600
Subject: [PATCH 29/89] Working through join map stuff

---
 .../JoinMaps/VideoCodecControllerJoinMap.cs   | 134 ++++++++++++++++--
 1 file changed, 124 insertions(+), 10 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index 80d7016f..e8f820b0 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -7,6 +7,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
     {
         #region Status
 
+        [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData {JoinNumber = 1, JoinSpan = 1},
             new JoinMetadata
             {
@@ -20,6 +21,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
         
         #region NearEndCameraControls
 
+        [JoinName("NearCamUp")]
         public JoinDataComplete NearEndCameraUp = new JoinDataComplete(new JoinData {JoinNumber = 11, JoinSpan = 1},
             new JoinMetadata
             {
@@ -27,6 +29,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
+        [JoinName("NearCamDown")]
         public JoinDataComplete NearEndCameraDown = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -34,6 +37,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
+        [JoinName("NearCamLeft")]
         public JoinDataComplete NearEndCameraLeft = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -41,6 +45,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
+        [JoinName("NearCamRight")]
         public JoinDataComplete NearEndCameraRight = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -48,6 +53,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
+        [JoinName("NearCamZoomIn")]
         public JoinDataComplete NearEndCameraZoomIn = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -55,6 +61,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
+        [JoinName("NearCamZoomOut")]
         public JoinDataComplete NearEndCameraZoomOut = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -62,6 +69,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
+        [JoinName("NearCamFocusNear")]
         public JoinDataComplete NearEndCameraFocusNear = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -69,45 +77,150 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
+        [JoinName("NearCamFocusFar")]
         public JoinDataComplete NearEndCameraFocusFar = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
             new JoinMetadata
             {
-                Description = "Near Camera Right",
+                Description = "Near Camera Focus Far",
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
 
+        [JoinName("NearCamSelectSerial")]
         public JoinDataComplete NearEndCameraSelectSerial = new JoinDataComplete(
-            new JoinData {JoinNumber = 11, JoinSpan = 1},
+            new JoinData {JoinNumber = 21, JoinSpan = 1},
             new JoinMetadata
             {
                 Description = "Camera Select & Feedback by name",
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });
-
+        [JoinName("NearCamSelectAnalog")]
         public JoinDataComplete NearEndCameraSelectAnalog = new JoinDataComplete(
-            new JoinData { JoinNumber = 11, JoinSpan = 1 },
+            new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata
             {
                 Description = "Camera Select & Feedback by index",
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Serial
+                JoinType = eJoinType.Analog
             });
 
+        [JoinName("NearCamPresetSelect")]
+        public JoinDataComplete NearEndCameraPresetSelect =
+            new JoinDataComplete(new JoinData {JoinNumber = 31, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Recall Preset",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Analog
+                });
 
+        [JoinName("NearCamPresetSave")]
+        public JoinDataComplete NearEndCameraPresetSave =
+            new JoinDataComplete(new JoinData {JoinNumber = 21, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Save Current Preset",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
 
+        [JoinName("NearCamPresetNames")]
+        public JoinDataComplete NearEndCameraNames = new JoinDataComplete(new JoinData {JoinNumber = 11, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "XSig - Camera Names",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+        #endregion
+        #region Far End Camera Controls
+        [JoinName("FarCamUp")]
+        public JoinDataComplete FarEndCameraUp = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Far Camera Up",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        [JoinName("FarCamDown")]
+        public JoinDataComplete FarEndCameraDown = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Far Camera Down",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        [JoinName("FarCamLeft")]
+        public JoinDataComplete FarEndCameraLeft = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Far Camera Left",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        [JoinName("FarCamRight")]
+        public JoinDataComplete FarEndCameraRight = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Far Camera Right",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        [JoinName("FarCamZoomIn")]
+        public JoinDataComplete FarEndCameraZoomIn = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Far Camera Zoom In",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        [JoinName("FarCamZoomOut")]
+        public JoinDataComplete FarEndCameraZoomOut = new JoinDataComplete(new JoinData { JoinNumber = 36, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Far Camera Zoom Out",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        [JoinName("FarCamFocusNear")]
+        public JoinDataComplete FarEndCameraFocusNear = new JoinDataComplete(new JoinData { JoinNumber = 37, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Far Camera Focus Near",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        [JoinName("FarCamFocusFar")]
+        public JoinDataComplete FarEndCameraFocusFar = new JoinDataComplete(new JoinData { JoinNumber = 38, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Far Camera Focus Far",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("FarCamPresetSelect")]
+        public JoinDataComplete FarEndCameraPresetSelect =
+            new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
+                new JoinMetadata
+                {
+                    Description = "Recall Preset",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Analog
+                });
         #endregion
         #region Camera Tracking Controls
 
-        public JoinDataComplete CameraTrackingOn = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
+        [JoinName("CameraTrackingOn")]
+        public JoinDataComplete CameraTrackingOn = new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1 },
             new JoinMetadata
             {
                 Description = "Camera Tracking On",
                 JoinType = eJoinType.Digital,
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL});
-
-        public JoinDataComplete CameraTrackingOff = new JoinDataComplete(new JoinData {JoinNumber = 12, JoinSpan = 1},
+        [JoinName("CameraTrackingOff")]
+        public JoinDataComplete CameraTrackingOff = new JoinDataComplete(new JoinData {JoinNumber = 52, JoinSpan = 1},
             new JoinMetadata
             {
                 Description = "Camera Tracking Off",
@@ -115,8 +228,9 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL
             });
 
+        [JoinName("CameraTrackingToggle")]
         public JoinDataComplete CameraTrackingToggle = new JoinDataComplete(
-            new JoinData {JoinNumber = 13, JoinSpan = 1},
+            new JoinData {JoinNumber = 53, JoinSpan = 1},
             new JoinMetadata
             {
                 Description = "Camera Tracking Toggle",
@@ -125,7 +239,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
             });
         #endregion
 
-        public VideoCodecControllerJoinMap(uint joinStart) : base(joinStart)
+        public VideoCodecControllerJoinMap(uint joinStart) : base(joinStart, typeof(VideoCodecControllerJoinMap))
         {
         }
 

From 5d5652907bd29dc9757a6d5c09bb7def7888a712 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Fri, 18 Sep 2020 16:28:04 -0600
Subject: [PATCH 30/89] Started linking classes to the API

---
 .../JoinMaps/VideoCodecControllerJoinMap.cs   | 1091 ++++++++++++++---
 .../VideoCodec/VideoCodecBase.cs              |  298 +++++
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           |   55 +-
 3 files changed, 1217 insertions(+), 227 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index e8f820b0..617262f4 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -3,120 +3,69 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 {
-    public class VideoCodecControllerJoinMap:JoinMapBaseAdvanced
+    public class VideoCodecControllerJoinMap : JoinMapBaseAdvanced
     {
         #region Status
 
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData {JoinNumber = 1, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Device is Online",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
+        [JoinName("IsOnline")] public JoinDataComplete IsOnline =
+            new JoinDataComplete(new JoinData {JoinNumber = 1, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Device is Online",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
 
         #endregion
 
-        
-        #region NearEndCameraControls
+        /*#region NearEndCameraControls
 
-        [JoinName("NearCamUp")]
-        public JoinDataComplete NearEndCameraUp = new JoinDataComplete(new JoinData {JoinNumber = 11, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Near Camera Up",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("NearCamDown")]
-        public JoinDataComplete NearEndCameraDown = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Near Camera Down",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("NearCamLeft")]
-        public JoinDataComplete NearEndCameraLeft = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Near Camera Left",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("NearCamRight")]
-        public JoinDataComplete NearEndCameraRight = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Near Camera Right",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("NearCamZoomIn")]
-        public JoinDataComplete NearEndCameraZoomIn = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Near Camera Zoom In",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("NearCamZoomOut")]
-        public JoinDataComplete NearEndCameraZoomOut = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Near Camera Zoom Out",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("NearCamFocusNear")]
-        public JoinDataComplete NearEndCameraFocusNear = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Near Camera Focus Near",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("NearCamFocusFar")]
-        public JoinDataComplete NearEndCameraFocusFar = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Near Camera Focus Far",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("NearCamSelectSerial")]
-        public JoinDataComplete NearEndCameraSelectSerial = new JoinDataComplete(
-            new JoinData {JoinNumber = 21, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Camera Select & Feedback by name",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Serial
-            });
-        [JoinName("NearCamSelectAnalog")]
-        public JoinDataComplete NearEndCameraSelectAnalog = new JoinDataComplete(
-            new JoinData { JoinNumber = 21, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Camera Select & Feedback by index",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("NearCamPresetSelect")]
-        public JoinDataComplete NearEndCameraPresetSelect =
-            new JoinDataComplete(new JoinData {JoinNumber = 31, JoinSpan = 1},
+        [JoinName("NearCamDown")] public JoinDataComplete NearEndCameraDown =
+            new JoinDataComplete(new JoinData {JoinNumber = 12, JoinSpan = 1},
                 new JoinMetadata
                 {
-                    Description = "Recall Preset",
-                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                    JoinType = eJoinType.Analog
+                    Description = "Near Camera Down",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
                 });
 
-        [JoinName("NearCamPresetSave")]
-        public JoinDataComplete NearEndCameraPresetSave =
+        [JoinName("NearCamFocusFar")] public JoinDataComplete NearEndCameraFocusFar =
+            new JoinDataComplete(new JoinData {JoinNumber = 18, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Near Camera Focus Far",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("NearCamFocusNear")] public JoinDataComplete NearEndCameraFocusNear =
+            new JoinDataComplete(new JoinData {JoinNumber = 17, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Near Camera Focus Near",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("NearCamLeft")] public JoinDataComplete NearEndCameraLeft =
+            new JoinDataComplete(new JoinData {JoinNumber = 13, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Near Camera Left",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("NearCamPresetNames")] public JoinDataComplete NearEndCameraNames =
+            new JoinDataComplete(new JoinData {JoinNumber = 11, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "XSig - Camera Names",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("NearCamPresetSave")] public JoinDataComplete NearEndCameraPresetSave =
             new JoinDataComplete(new JoinData {JoinNumber = 21, JoinSpan = 1},
                 new JoinMetadata
                 {
@@ -125,111 +74,177 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                     JoinType = eJoinType.Digital
                 });
 
-        [JoinName("NearCamPresetNames")]
-        public JoinDataComplete NearEndCameraNames = new JoinDataComplete(new JoinData {JoinNumber = 11, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "XSig - Camera Names",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-        #endregion
-        #region Far End Camera Controls
-        [JoinName("FarCamUp")]
-        public JoinDataComplete FarEndCameraUp = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Far Camera Up",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("FarCamDown")]
-        public JoinDataComplete FarEndCameraDown = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Far Camera Down",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("FarCamLeft")]
-        public JoinDataComplete FarEndCameraLeft = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Far Camera Left",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("FarCamRight")]
-        public JoinDataComplete FarEndCameraRight = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Far Camera Right",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("FarCamZoomIn")]
-        public JoinDataComplete FarEndCameraZoomIn = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Far Camera Zoom In",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("FarCamZoomOut")]
-        public JoinDataComplete FarEndCameraZoomOut = new JoinDataComplete(new JoinData { JoinNumber = 36, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Far Camera Zoom Out",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("FarCamFocusNear")]
-        public JoinDataComplete FarEndCameraFocusNear = new JoinDataComplete(new JoinData { JoinNumber = 37, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Far Camera Focus Near",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("FarCamFocusFar")]
-        public JoinDataComplete FarEndCameraFocusFar = new JoinDataComplete(new JoinData { JoinNumber = 38, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Far Camera Focus Far",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("FarCamPresetSelect")]
-        public JoinDataComplete FarEndCameraPresetSelect =
-            new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
+        [JoinName("NearCamPresetSelect")] public JoinDataComplete NearEndCameraPresetSelect =
+            new JoinDataComplete(new JoinData {JoinNumber = 31, JoinSpan = 1},
                 new JoinMetadata
                 {
                     Description = "Recall Preset",
                     JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                     JoinType = eJoinType.Analog
                 });
-        #endregion
-        #region Camera Tracking Controls
 
-        [JoinName("CameraTrackingOn")]
-        public JoinDataComplete CameraTrackingOn = new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1 },
+        [JoinName("NearCamRight")] public JoinDataComplete NearEndCameraRight =
+            new JoinDataComplete(new JoinData {JoinNumber = 14, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Near Camera Right",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("NearCamSelectAnalog")] public JoinDataComplete NearEndCameraSelectAnalog = new JoinDataComplete(
+            new JoinData {JoinNumber = 12, JoinSpan = 1},
             new JoinMetadata
             {
-                Description = "Camera Tracking On",
-                JoinType = eJoinType.Digital,
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL});
-        [JoinName("CameraTrackingOff")]
-        public JoinDataComplete CameraTrackingOff = new JoinDataComplete(new JoinData {JoinNumber = 52, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Camera Tracking Off",
-                JoinType = eJoinType.Digital,
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL
+                Description = "Camera Select & Feedback by index",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Analog
             });
 
-        [JoinName("CameraTrackingToggle")]
-        public JoinDataComplete CameraTrackingToggle = new JoinDataComplete(
+        [JoinName("NearCamSelectSerial")] public JoinDataComplete NearEndCameraSelectSerial = new JoinDataComplete(
+            new JoinData {JoinNumber = 12, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Camera Select & Feedback by name",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        [JoinName("NearCamUp")] public JoinDataComplete NearEndCameraUp =
+            new JoinDataComplete(new JoinData {JoinNumber = 11, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Near Camera Up",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("NearCamZoomIn")] public JoinDataComplete NearEndCameraZoomIn =
+            new JoinDataComplete(new JoinData {JoinNumber = 15, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Near Camera Zoom In",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("NearCamZoomOut")] public JoinDataComplete NearEndCameraZoomOut =
+            new JoinDataComplete(new JoinData {JoinNumber = 16, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Near Camera Zoom Out",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        #endregion
+
+        #region Far End Camera Controls
+
+        [JoinName("FarCamDown")] public JoinDataComplete FarEndCameraDown =
+            new JoinDataComplete(new JoinData {JoinNumber = 32, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Far Camera Down",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("FarCamFocusFar")] public JoinDataComplete FarEndCameraFocusFar =
+            new JoinDataComplete(new JoinData {JoinNumber = 38, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Far Camera Focus Far",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("FarCamFocusNear")] public JoinDataComplete FarEndCameraFocusNear =
+            new JoinDataComplete(new JoinData {JoinNumber = 37, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Far Camera Focus Near",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("FarCamLeft")] public JoinDataComplete FarEndCameraLeft =
+            new JoinDataComplete(new JoinData {JoinNumber = 33, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Far Camera Left",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("FarCamPresetSelect")] public JoinDataComplete FarEndCameraPresetSelect =
+            new JoinDataComplete(new JoinData {JoinNumber = 41, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Recall Preset",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        [JoinName("FarCamRight")] public JoinDataComplete FarEndCameraRight =
+            new JoinDataComplete(new JoinData {JoinNumber = 34, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Far Camera Right",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("FarCamUp")] public JoinDataComplete FarEndCameraUp =
+            new JoinDataComplete(new JoinData {JoinNumber = 31, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Far Camera Up",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("FarCamZoomIn")] public JoinDataComplete FarEndCameraZoomIn =
+            new JoinDataComplete(new JoinData {JoinNumber = 35, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Far Camera Zoom In",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("FarCamZoomOut")] public JoinDataComplete FarEndCameraZoomOut =
+            new JoinDataComplete(new JoinData {JoinNumber = 36, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Far Camera Zoom Out",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        #endregion
+
+        #region Camera Tracking Controls
+
+        [JoinName("CameraTrackingOff")] public JoinDataComplete CameraTrackingOff =
+            new JoinDataComplete(new JoinData {JoinNumber = 52, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Tracking Off",
+                    JoinType = eJoinType.Digital,
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL
+                });
+
+        [JoinName("CameraTrackingOn")] public JoinDataComplete CameraTrackingOn =
+            new JoinDataComplete(new JoinData {JoinNumber = 51, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Tracking On",
+                    JoinType = eJoinType.Digital,
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL
+                });
+
+        [JoinName("CameraTrackingToggle")] public JoinDataComplete CameraTrackingToggle = new JoinDataComplete(
             new JoinData {JoinNumber = 53, JoinSpan = 1},
             new JoinMetadata
             {
@@ -237,9 +252,689 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
+
         #endregion
 
-        public VideoCodecControllerJoinMap(uint joinStart) : base(joinStart, typeof(VideoCodecControllerJoinMap))
+        #region Incoming Call
+
+        [JoinName("IncomingCallAnswer")] public JoinDataComplete IncomingCallAnswer =
+            new JoinDataComplete(new JoinData {JoinNumber = 61, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Answer Incoming Call & Incoming Call FB",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("IncomingCallId")] public JoinDataComplete IncomingCallId =
+            new JoinDataComplete(new JoinData {JoinNumber = 64, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Incoming Call ID",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("IncomingCallName")] public JoinDataComplete IncomingCallName =
+            new JoinDataComplete(new JoinData {JoinNumber = 61, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Incoming Call Name",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("IncomingCallNumber")] public JoinDataComplete IncomingCallNumber =
+            new JoinDataComplete(new JoinData {JoinNumber = 62, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Incoming Call Number",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("IncomingCallReject")] public JoinDataComplete IncomingCallReject =
+            new JoinDataComplete(new JoinData {JoinNumber = 62, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Reject Incoming Call",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("IncomingCallType")] public JoinDataComplete IncomingCallType =
+            new JoinDataComplete(new JoinData {JoinNumber = 63, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Incoming Call Type",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        #endregion
+
+        #region Manual Dial
+        [JoinName("ManualDial")]
+        public JoinDataComplete ManualDial = new JoinDataComplete(new JoinData {JoinNumber = 71, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Dial Entered String",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("HangUpAllCalls")]
+        public JoinDataComplete HangUpAllCalls = new JoinDataComplete(new JoinData {JoinNumber = 72, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Hang up All calls",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        [JoinName("ManualDialString")]
+        public JoinDataComplete ManualDialString = new JoinDataComplete(new JoinData {JoinNumber = 71, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Manual String to dial",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        #endregion
+
+        #region Connected Calls
+
+        [JoinName("ConnectedCallCount")]
+        public JoinDataComplete ConnectedCallCount = new JoinDataComplete(new JoinData {JoinNumber = 81, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Connected Call Count",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
+        [JoinName("ConnectedCallHangup")]
+        public JoinDataComplete ConnectedCallHangupStart =
+            new JoinDataComplete(new JoinData {JoinNumber = 81, JoinSpan = 8},
+                new JoinMetadata
+                {
+                    Description = "Hang up selected call",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("ConnectedCallData")] public JoinDataComplete ConnectedCallData =
+            new JoinDataComplete(new JoinData {JoinNumber = 81, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description =
+                        "XSig - Connected Call info\r\nDigital 1: Connecting\r\nDigital 2: Connected\r\nSerial 1: Name\r\nSerial 2: Number\r\nSerial 3: Status\r\nSerial 4: Type\r\nSerial 5: ID",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        #endregion
+        #region NearEnd Source Select
+
+        [JoinName("NearEndSourceSelect")] public JoinDataComplete NearEndSourceSelect =
+            new JoinDataComplete(new JoinData {JoinNumber = 5, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Near End Source Select",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Analog,
+                    ValidValues = new[] {"1", "2", "3", "4"}
+                });
+        #endregion
+
+        #region Sharing 
+        //Putting share start/stop only in this base join map. The map can be extended for features of other codecs
+
+        public JoinDataComplete SharingStart = new JoinDataComplete(new JoinData {JoinNumber = 101, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Start sharing & feedback",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        public JoinDataComplete SharingStop = new JoinDataComplete(new JoinData {JoinNumber = 102, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Stop Sharing & Feedback",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+        #endregion
+
+        #region Phonebook
+
+        #endregion*/
+
+        [JoinName("CallDirection")] public JoinDataComplete CallDirection =
+            new JoinDataComplete(new JoinData {JoinNumber = 22, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Current Call Direction",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("CameraLayout")] public JoinDataComplete CameraLayout =
+            new JoinDataComplete(new JoinData {JoinNumber = 142, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Layout Toggle",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraModeAuto")] public JoinDataComplete CameraModeAuto =
+            new JoinDataComplete(new JoinData {JoinNumber = 131, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Mode Auto",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraModeManual")] public JoinDataComplete CameraModeManual =
+            new JoinDataComplete(new JoinData {JoinNumber = 132, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Mode Manual",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraModeOff")] public JoinDataComplete CameraModeOff =
+            new JoinDataComplete(new JoinData {JoinNumber = 133, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Mode Off",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraNumberSelect")] public JoinDataComplete CameraNumberSelect =
+            new JoinDataComplete(new JoinData {JoinNumber = 60, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Number Select/FB",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        [JoinName("CameraPanLeft")] public JoinDataComplete CameraPanLeft =
+            new JoinDataComplete(new JoinData {JoinNumber = 113, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Pan Left",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraPanRight")] public JoinDataComplete CameraPanRight =
+            new JoinDataComplete(new JoinData {JoinNumber = 114, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Pan Right",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraPresetSelect")] public JoinDataComplete CameraPresetSelect =
+            new JoinDataComplete(new JoinData {JoinNumber = 121, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Preset Select",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        [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("CameraSelfView")] public JoinDataComplete CameraSelfView =
+            new JoinDataComplete(new JoinData {JoinNumber = 141, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Self View Toggle/FB",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraSupportsAutoMode")] public JoinDataComplete CameraSupportsAutoMode =
+            new JoinDataComplete(new JoinData {JoinNumber = 143, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Supports Auto Mode FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraSupportsOffMode")] public JoinDataComplete CameraSupportsOffMode =
+            new JoinDataComplete(new JoinData {JoinNumber = 144, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Supports Off Mode FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraTiltDown")] public JoinDataComplete CameraTiltDown =
+            new JoinDataComplete(new JoinData {JoinNumber = 112, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Tilt Down",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraTiltUp")] public JoinDataComplete CameraTiltUp =
+            new JoinDataComplete(new JoinData {JoinNumber = 111, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Tilt Up",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraZoomIn")] public JoinDataComplete CameraZoomIn =
+            new JoinDataComplete(new JoinData {JoinNumber = 115, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Zoom In",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraZoomOut")] public JoinDataComplete CameraZoomOut =
+            new JoinDataComplete(new JoinData {JoinNumber = 116, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Zoom Out",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CurrentCallName")] public JoinDataComplete CurrentCallData =
+            new JoinDataComplete(new JoinData {JoinNumber = 2, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Current Call Data - XSIG",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+        /*
+        [JoinName("CurrentCallNumber")] public JoinDataComplete CurrentCallNumber =
+            new JoinDataComplete(new JoinData {JoinNumber = 3, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Current Call Number",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });*/
+
+        [JoinName("CurrentDialString")] public JoinDataComplete CurrentDialString =
+            new JoinDataComplete(new JoinData {JoinNumber = 1, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Current Dial String",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [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("DirectoryDialSelectedLine")] public JoinDataComplete DirectoryDialSelectedLine =
+            new JoinDataComplete(new JoinData {JoinNumber = 106, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Dial selected directory line",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryEntries")] public JoinDataComplete DirectoryEntries =
+            new JoinDataComplete(new JoinData {JoinNumber = 101, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Entries - XSig, 255 entries",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("DirectoryEntryIsContact")] public JoinDataComplete DirectoryEntryIsContact =
+            new JoinDataComplete(new JoinData {JoinNumber = 101, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Selected Entry Is Contact FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryEntrySelectedName")] public JoinDataComplete DirectoryEntrySelectedName =
+            new JoinDataComplete(new JoinData {JoinNumber = 356, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Selected Directory Entry Name",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("DirectoryEntrySelectedNumber")] public JoinDataComplete DirectoryEntrySelectedNumber =
+            new JoinDataComplete(new JoinData {JoinNumber = 357, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Selected Directory Entry Number",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("DirectoryFolderBack")] public JoinDataComplete DirectoryFolderBack =
+            new JoinDataComplete(new JoinData {JoinNumber = 105, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Go back one directory level",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryIsRoot")] public JoinDataComplete DirectoryIsRoot =
+            new JoinDataComplete(new JoinData {JoinNumber = 102, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory is on Root FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryLineSelected")] public JoinDataComplete DirectoryLineSelected =
+            new JoinDataComplete(new JoinData {JoinNumber = 101, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Line Selected FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryRoot")] public JoinDataComplete DirectoryRoot =
+            new JoinDataComplete(new JoinData {JoinNumber = 104, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Go to Directory Root",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryRowCount")] public JoinDataComplete DirectoryRowCount =
+            new JoinDataComplete(new JoinData {JoinNumber = 101, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Row Count FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        [JoinName("DirectorySearchBusy")] public JoinDataComplete DirectorySearchBusy =
+            new JoinDataComplete(new JoinData {JoinNumber = 100, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Search Busy FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectorySearchString")] public JoinDataComplete DirectorySearchString =
+            new JoinDataComplete(new JoinData {JoinNumber = 100, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Search String",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("DirectorySelectRow")] public JoinDataComplete DirectorySelectRow =
+            new JoinDataComplete(new JoinData {JoinNumber = 101, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Select Row",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        [JoinName("DirectorySelectedFolderName")] public JoinDataComplete DirectorySelectedFolderName =
+            new JoinDataComplete(new JoinData {JoinNumber = 358, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Selected Directory Folder Name",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("0")] public JoinDataComplete Dtmf0 =
+            new JoinDataComplete(new JoinData {JoinNumber = 20, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 0",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("1")] public JoinDataComplete Dtmf1 =
+            new JoinDataComplete(new JoinData {JoinNumber = 11, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 1",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("2")] public JoinDataComplete Dtmf2 =
+            new JoinDataComplete(new JoinData {JoinNumber = 12, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 2",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("3")] public JoinDataComplete Dtmf3 =
+            new JoinDataComplete(new JoinData {JoinNumber = 13, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 3",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("4")] public JoinDataComplete Dtmf4 =
+            new JoinDataComplete(new JoinData {JoinNumber = 14, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 4",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("5")] public JoinDataComplete Dtmf5 =
+            new JoinDataComplete(new JoinData {JoinNumber = 15, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 5",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("6")] public JoinDataComplete Dtmf6 =
+            new JoinDataComplete(new JoinData {JoinNumber = 16, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 6",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("7")] public JoinDataComplete Dtmf7 =
+            new JoinDataComplete(new JoinData {JoinNumber = 17, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 7",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("8")] public JoinDataComplete Dtmf8 =
+            new JoinDataComplete(new JoinData {JoinNumber = 18, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 8",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("9")] public JoinDataComplete Dtmf9 =
+            new JoinDataComplete(new JoinData {JoinNumber = 19, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 9",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("#")] public JoinDataComplete DtmfPound =
+            new JoinDataComplete(new JoinData {JoinNumber = 22, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF #",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("*")] public JoinDataComplete DtmfStar =
+            new JoinDataComplete(new JoinData {JoinNumber = 21, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF *",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("EndCall")] public JoinDataComplete EndCall =
+            new JoinDataComplete(new JoinData {JoinNumber = 24, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Hang Up",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("HookState")] public JoinDataComplete HookState =
+            new JoinDataComplete(new JoinData {JoinNumber = 31, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Current Hook State",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("IncomingAnswer")] public JoinDataComplete IncomingAnswer =
+            new JoinDataComplete(new JoinData {JoinNumber = 51, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Answer Incoming Call",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("IncomingCall")] public JoinDataComplete IncomingCall =
+            new JoinDataComplete(new JoinData {JoinNumber = 50, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Incoming Call",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("IncomingCallName")] public JoinDataComplete IncomingCallName =
+            new JoinDataComplete(new JoinData {JoinNumber = 51, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Incoming Call Name",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("IncomingCallNumber")] public JoinDataComplete IncomingCallNumber =
+            new JoinDataComplete(new JoinData {JoinNumber = 52, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Incoming Call Number",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("IncomingReject")] public JoinDataComplete IncomingReject =
+            new JoinDataComplete(new JoinData {JoinNumber = 52, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Reject Incoming Call",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    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("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("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},
+                new JoinMetadata
+                {
+                    Description = "Dial manual string",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        public VideoCodecControllerJoinMap(uint joinStart) : base(joinStart, typeof (VideoCodecControllerJoinMap))
         {
         }
 
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index fe18e7ca..55969a71 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -2,14 +2,21 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharp.Ssh;
 using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
+using PepperDash.Core.Intersystem;
+using PepperDash.Core.Intersystem.Tokens;
+using PepperDash.Core.WebApi.Presets;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.Routing;
+using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
+using PepperDash_Essentials_Core.Bridges.JoinMaps;
 using Feedback = PepperDash.Essentials.Core.Feedback;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
@@ -17,9 +24,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
     public abstract class VideoCodecBase : ReconfigurableDevice, IRoutingInputsOutputs,
         IUsageTracking, IHasDialer, IHasContentSharing, ICodecAudio, iVideoCodecInfo, IBridgeAdvanced
     {
+        private const int XSigEncoding = 28591;
         protected VideoCodecBase(DeviceConfig config)
             : base(config)
         {
+            
             StandbyIsOnFeedback = new BoolFeedback(StandbyIsOnFeedbackFunc);
             PrivacyModeIsOnFeedback = new BoolFeedback(PrivacyModeIsOnFeedbackFunc);
             VolumeLevelFeedback = new IntFeedback(VolumeLevelFeedbackFunc);
@@ -255,6 +264,295 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         public abstract void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
 
+        protected void LinkVideoCodecToApi(VideoCodecBase codec, BasicTriList trilist, uint joinStart, string joinMapKey,
+            EiscApiAdvanced bridge)
+        {
+            var joinMap = new VideoCodecControllerJoinMap(joinStart);
+
+            var customJoins = JoinMapHelper.TryGetJoinMapAdvancedForDevice(joinMapKey);
+
+            if (customJoins != null)
+            {
+                joinMap.SetCustomJoinData(customJoins);
+            }
+
+            if (bridge != null)
+            {
+                bridge.AddJoinMap(Key, joinMap);
+            }
+
+            Debug.Console(1, this, "Linking to Trilist {0}", trilist.ID.ToString("X"));
+
+            LinkVideoCodecDtmfToApi(trilist, joinMap);
+
+            LinkVideoCodecCallControlsToApi(trilist, joinMap);
+
+            if (codec is IHasCodecCameras)
+            {
+                LinkVideoCodecCameraToApi(codec as IHasCodecCameras, trilist, joinMap);
+            }
+
+            if (codec is IHasCodecSelfView)
+            {
+                LinkVideoCodecSelfviewToApi(codec as IHasCodecSelfView, trilist, joinMap);
+            }
+
+            if (codec is IHasCameraAutoMode)
+            {
+                trilist.SetBool(joinMap.CameraSupportsAutoMode.JoinNumber, true);
+                LinkVideoCodecCameraModeToApi(codec as IHasCameraAutoMode, trilist, joinMap);
+            }
+
+            if (codec is IHasCodecLayouts)
+            {
+                LinkVideoCodecCameraLayoutsToApi(codec as IHasCodecLayouts, trilist, joinMap);
+            }
+
+
+        }
+
+        private void LinkVideoCodecCallControlsToApi(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            trilist.SetSigFalseAction(joinMap.ManualDial.JoinNumber,
+                () => Dial(trilist.StringOutput[joinMap.CurrentDialString.JoinNumber].StringValue));
+
+            //End All calls for now
+            trilist.SetSigFalseAction(joinMap.EndCall.JoinNumber, EndAllCalls);
+
+            
+
+            CallStatusChange += (sender, args) =>
+            {
+                trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
+
+                trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming);
+
+                if (args.CallItem.Direction == eCodecCallDirection.Incoming)
+                {
+                    trilist.SetSigFalseAction(joinMap.IncomingAnswer.JoinNumber, () => AcceptCall(args.CallItem));
+                    trilist.SetSigFalseAction(joinMap.IncomingReject.JoinNumber, () => RejectCall(args.CallItem));
+                }
+
+                var callStatusXsig = UpdateCallStatusXSig();
+
+                trilist.SetString(joinMap.CurrentCallData.JoinNumber, callStatusXsig);
+            };
+        }
+
+        private string UpdateCallStatusXSig()
+        {
+            const int offset = 6;
+            var callIndex = 1;
+            
+
+            var tokenArray = new XSigToken[ActiveCalls.Count*offset]; //set array size for number of calls * pieces of info
+
+            foreach (var call in ActiveCalls)
+            {
+                //digitals
+                tokenArray[callIndex] = new XSigDigitalToken((callIndex/offset) + 1, call.IsActiveCall);
+
+                //serials
+                tokenArray[callIndex + 1] = new XSigSerialToken(callIndex, call.Name);
+                tokenArray[callIndex + 2] = new XSigSerialToken(callIndex + 1, call.Number);
+                tokenArray[callIndex + 3] = new XSigSerialToken(callIndex + 2, call.Direction.ToString());
+                tokenArray[callIndex + 4] = new XSigSerialToken(callIndex + 3, call.Type.ToString());
+                tokenArray[callIndex + 5] = new XSigSerialToken(callIndex + 4, call.Status.ToString());
+
+                callIndex += offset;
+            }
+
+            return GetXSigString(tokenArray);
+        }
+
+        private void LinkVideoCodecDtmfToApi(BasicTriList trilist, VideoCodecControllerJoinMap 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("#"));
+        }
+
+        private void LinkVideoCodecCameraLayoutsToApi(IHasCodecLayouts codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            trilist.SetSigFalseAction(joinMap.CameraLayout.JoinNumber, codec.LocalLayoutToggle);
+
+            codec.LocalLayoutFeedback.LinkInputSig(trilist.StringInput[joinMap.CameraLayoutStringFb.JoinNumber]);
+        }
+
+        private void LinkVideoCodecCameraModeToApi(IHasCameraAutoMode codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            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]);
+        }
+
+        private void LinkVideoCodecSelfviewToApi(IHasCodecSelfView codec, BasicTriList trilist,
+            VideoCodecControllerJoinMap joinMap)
+        {
+            trilist.SetSigFalseAction(joinMap.CameraSelfView.JoinNumber, codec.SelfViewModeToggle);
+
+            codec.SelfviewIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.CameraSelfView.JoinNumber]);
+        }
+
+        private void LinkVideoCodecCameraToApi(IHasCodecCameras codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            //Camera PTZ
+            trilist.SetBoolSigAction(joinMap.CameraTiltUp.JoinNumber, (b) =>
+            {
+                if (codec.SelectedCamera == null) return;
+                var camera = codec.SelectedCamera as IHasCameraPtzControl;
+
+                if (camera == null) return;
+
+                if (b) camera.TiltUp();
+                else camera.TiltStop();
+            });
+
+            trilist.SetBoolSigAction(joinMap.CameraTiltDown.JoinNumber, (b) =>
+            {
+                if (codec.SelectedCamera == null) return;
+                var camera = codec.SelectedCamera as IHasCameraPtzControl;
+
+                if (camera == null) return;
+
+                if (b) camera.TiltDown();
+                else camera.TiltStop();
+            });
+            trilist.SetBoolSigAction(joinMap.CameraPanLeft.JoinNumber, (b) =>
+            {
+                if (codec.SelectedCamera == null) return;
+                var camera = codec.SelectedCamera as IHasCameraPtzControl;
+
+                if (camera == null) return;
+
+                if (b) camera.PanLeft();
+                else camera.PanStop();
+            });
+            trilist.SetBoolSigAction(joinMap.CameraPanRight.JoinNumber, (b) =>
+            {
+                if (codec.SelectedCamera == null) return;
+                var camera = codec.SelectedCamera as IHasCameraPtzControl;
+
+                if (camera == null) return;
+
+                if (b) camera.PanRight();
+                else camera.PanStop();
+            });
+
+            trilist.SetBoolSigAction(joinMap.CameraZoomIn.JoinNumber, (b) =>
+            {
+                if (codec.SelectedCamera == null) return;
+                var camera = codec.SelectedCamera as IHasCameraPtzControl;
+
+                if (camera == null) return;
+
+                if (b) camera.ZoomIn();
+                else camera.ZoomStop();
+            });
+
+            trilist.SetBoolSigAction(joinMap.CameraZoomOut.JoinNumber, (b) =>
+            {
+                if (codec.SelectedCamera == null) return;
+                var camera = codec.SelectedCamera as IHasCameraPtzControl;
+
+                if (camera == null) return;
+
+                if (b) camera.ZoomOut();
+                else camera.ZoomStop();
+            });
+
+            //Camera Select
+            trilist.SetUShortSigAction(joinMap.CameraNumberSelect.JoinNumber, (i) =>
+            {
+                if (codec.SelectedCamera == null) return;
+
+                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.CameraPresetSelect.JoinNumber, i);
+
+                if (codec is IHasCodecRoomPresets)
+                {
+                    return;
+                }
+
+                if (!(args.SelectedCamera is IHasCameraPresets))
+                {
+                    return;
+                }
+
+                var cam = args.SelectedCamera as IHasCameraPresets;
+                SetCameraPresetNames(cam.Presets);
+
+                (args.SelectedCamera as IHasCameraPresets).PresetsListHasChanged += (o, eventArgs) => SetCameraPresetNames(cam.Presets);
+            };
+
+            //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);
+
+                trilist.SetUshort(joinMap.CameraPresetSelect.JoinNumber, i);
+            });
+        }
+
+        private string SetCameraPresetNames(List<CameraPreset> presets)
+        {
+            var i = 1; //start index for xsig;
+
+            var tokenArray = new XSigToken[presets.Count];
+
+            string returnString;
+
+            foreach (var token in presets.Select(cameraPreset => new XSigSerialToken(i, cameraPreset.Description)))
+            {
+                tokenArray[i - 1] = token;
+                i++;
+            }
+            
+            return GetXSigString(tokenArray);
+        }
+
+        private string GetXSigString(XSigToken[] tokenArray)
+        {
+            string returnString;
+            using (var s = new MemoryStream())
+            {
+                using (var tw = new XSigTokenStreamWriter(s, true))
+                {
+                    tw.WriteXSigData(tokenArray);
+                }
+
+                var xSig = s.ToArray();
+
+                returnString = Encoding.GetEncoding(XSigEncoding).GetString(xSig, 0, xSig.Length);
+            }
+
+            return returnString;
+        }
+
         #endregion
     }
 
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index d25abb22..ba5dc3e4 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -1401,49 +1401,46 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
-            var joinMap = new VideoCodecControllerJoinMap(joinStart);
-
-            var customJoins = JoinMapHelper.TryGetJoinMapAdvancedForDevice(joinMapKey);
-
-            if (customJoins != null)
-            {
-                joinMap.SetCustomJoinData(customJoins);
-            }
-
-            if (bridge != null)
-            {
-                bridge.AddJoinMap(Key, joinMap);
-            }
-
-            Debug.Console(1, this, "Linking to Trilist {0}", trilist.ID.ToString("X"));
-
-            LinkCameraActions(trilist, joinMap);
-        }
-
-        private void LinkCameraActions(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
-        {
-            
+            LinkVideoCodecToApi(this, trilist, joinStart, joinMapKey, bridge);
         }
 
         public override void ExecuteSwitch(object selector)
         {
-            (selector as Action)();
+            var action = selector as Action;
+            if (action == null)
+            {
+                return;
+            }
+
+            action();
+        }
+
+        public void AcceptCall()
+        {
+            var incomingCall =
+                ActiveCalls.FirstOrDefault(
+                    c => c.Status.Equals(eCodecCallStatus.Ringing) && c.Direction.Equals(eCodecCallDirection.Incoming));
+
+            AcceptCall(incomingCall);
         }
 
         public override void AcceptCall(CodecActiveCallItem call)
         {
-            var incomingCall =
-                ActiveCalls.FirstOrDefault(
-                    c => c.Status.Equals(eCodecCallStatus.Ringing) && c.Direction.Equals(eCodecCallDirection.Incoming));
-            SendText(string.Format("zCommand Call Accept callerJID: {0}", incomingCall.Id));
+            SendText(string.Format("zCommand Call Accept callerJID: {0}", call.Id));
         }
 
-        public override void RejectCall(CodecActiveCallItem call)
+        public void RejectCall()
         {
             var incomingCall =
                 ActiveCalls.FirstOrDefault(
                     c => c.Status.Equals(eCodecCallStatus.Ringing) && c.Direction.Equals(eCodecCallDirection.Incoming));
-            SendText(string.Format("zCommand Call Reject callerJID: {0}", incomingCall.Id));
+
+            RejectCall(incomingCall);
+        }
+
+        public override void RejectCall(CodecActiveCallItem call)
+        {
+            SendText(string.Format("zCommand Call Reject callerJID: {0}", call.Id));
         }
 
         public override void Dial(Meeting meeting)

From 832060e8ad6ddc4d4f375b8084d282be23e84540 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Mon, 21 Sep 2020 18:59:17 -0600
Subject: [PATCH 31/89] Lots of changes

* Copied join map from Mobile Control
* Started implementing for JoinMapBase
* Made some changes and improvements to ZoomRoom for handling Directory stuff
---
 .../PepperDash_Essentials_Core.csproj         |  36 ++----
 .../PepperDash_Essentials_DM.csproj           |  15 +--
 .../Codec/iHasDirectory.cs                    |  13 ++-
 .../Essentials Devices Common.csproj          |  18 +--
 .../VideoCodec/VideoCodecBase.cs              | 107 ++++++++++++++++--
 .../VideoCodec/ZoomRoom/ResponseObjects.cs    |  24 ++--
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           |  55 ++++-----
 7 files changed, 165 insertions(+), 103 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index 83916856..8c7bc10c 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -48,48 +48,39 @@
   <ItemGroup>
     <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.EthernetCommunications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Fusion, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Remotes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.ThreeSeriesCards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="PepperDash_Core, Version=1.0.41.31808, Culture=neutral, processorArchitecture=MSIL">
@@ -108,8 +99,7 @@
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -118,13 +108,11 @@
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpTimerEventInterface, Version=1.0.6197.20052, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj b/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj
index 7c8b163a..7d6b7bde 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj	
+++ b/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj	
@@ -48,18 +48,15 @@
   <ItemGroup>
     <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="PepperDash_Core, Version=1.0.41.31808, Culture=neutral, processorArchitecture=MSIL">
@@ -78,8 +75,7 @@
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -88,8 +84,7 @@
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs
index 3a984ab2..3a59b62d 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs	
@@ -40,9 +40,15 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         /// <summary>
         /// Tracks the directory browse history when browsing beyond the root directory
         /// </summary>
+        [Obsolete("Please use the Stack-based history instead")]
         List<CodecDirectory> DirectoryBrowseHistory { get; }
     }
 
+    public interface IHasDirectoryHistoryStack : IHasDirectory
+    {
+        Stack<CodecDirectory> DirectoryBrowseHistoryStack { get; } 
+    }
+
 	/// <summary>
 	/// 
 	/// </summary>
@@ -147,6 +153,9 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 
 		[JsonProperty("name")]	
         public string Name { get; set; }
+
+        [JsonProperty("parentFolderId")]
+        public string ParentFolderId { get; set; }
     }
 
 	/// <summary>
@@ -157,8 +166,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("contacts")]
         public List<DirectoryContact> Contacts { get; set; }
 
-		[JsonProperty("parentFolderId")]
-        public string ParentFolderId { get; set; }
 
         public DirectoryFolder()
         {
@@ -177,6 +184,8 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("title")]
         public string Title { get; set; }
 
+        
+
 		[JsonProperty("contactMethods")]
         public List<ContactMethod> ContactMethods { get; set; }
 
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
index d18cb6ce..d3d468fc 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
@@ -48,23 +48,19 @@
   <ItemGroup>
     <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Lighting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="PepperDash_Core, Version=1.0.41.31808, Culture=neutral, processorArchitecture=MSIL">
@@ -83,8 +79,7 @@
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -93,8 +88,7 @@
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 55969a71..7c5c784b 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -308,9 +308,95 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 LinkVideoCodecCameraLayoutsToApi(codec as IHasCodecLayouts, trilist, joinMap);
             }
 
+            if (codec is IHasDirectory)
+            {
+                LinkVideoCodecDirectoryToApi(codec as IHasDirectory, trilist, joinMap);
+            }
 
         }
 
+        private void LinkVideoCodecDirectoryToApi(IHasDirectory codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            codec.CurrentDirectoryResultIsNotDirectoryRoot.LinkComplementInputSig(
+                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.SetSigFalseAction(joinMap.DirectoryRoot.JoinNumber, codec.SetCurrentDirectoryToRoot);
+
+            trilist.SetSigFalseAction(joinMap.DirectoryFolderBack.JoinNumber, codec.GetDirectoryParentFolderContents);
+
+            codec.DirectoryResultReturned += (sender, args) =>
+            {
+                trilist.SetUshort(joinMap.DirectoryRowCount.JoinNumber, (ushort) args.Directory.CurrentDirectoryResults.Count);
+
+                var clearBytes = XSigHelpers.ClearOutputs();
+
+                trilist.SetString(joinMap.DirectoryEntries.JoinNumber,
+                    Encoding.GetEncoding(XSigEncoding).GetString(clearBytes, 0, clearBytes.Length));
+                var directoryXSig = UpdateDirectoryXSig(args.Directory, !codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue);
+                
+                trilist.SetString(joinMap.DirectoryEntries.JoinNumber, directoryXSig);
+            };
+        }
+
+        private void SelectDirectoryEntry(IHasDirectory codec, ushort i)
+        {
+            var entry = codec.CurrentDirectoryResult.CurrentDirectoryResults[i - 1];
+
+            if (entry is DirectoryFolder)
+            {
+                codec.GetDirectoryFolderContents(entry.FolderId);
+                return;
+            }
+
+            var dialableEntry = entry as IInvitableContact;
+
+            if (dialableEntry != null)
+            {
+                Dial(dialableEntry);
+                return;
+            }
+
+            var entryToDial = entry as DirectoryContact;
+
+            if (entryToDial == null) return;
+
+            Dial(entryToDial.ContactMethods[0].Number);
+        }
+
+        private string UpdateDirectoryXSig(CodecDirectory directory, bool isRoot)
+        {
+            var contactIndex = 1;
+            var tokenArray = new XSigToken[directory.CurrentDirectoryResults.Count];
+
+            foreach(var entry in directory.CurrentDirectoryResults)
+            {
+                var arrayIndex = contactIndex - 1;
+
+                if (entry is DirectoryFolder && entry.ParentFolderId == "root")
+                {
+                    tokenArray[arrayIndex] = new XSigSerialToken(contactIndex, String.Format("[+] {0}", entry.Name));
+
+                    contactIndex++;
+
+                    continue;
+                }
+
+                if(isRoot && String.IsNullOrEmpty(entry.FolderId)) continue;
+               
+                tokenArray[arrayIndex] = new XSigSerialToken(contactIndex, entry.Name);
+
+                contactIndex++;
+            }
+
+            return GetXSigString(tokenArray);
+        }
+
         private void LinkVideoCodecCallControlsToApi(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
         {
             trilist.SetSigFalseAction(joinMap.ManualDial.JoinNumber,
@@ -319,8 +405,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             //End All calls for now
             trilist.SetSigFalseAction(joinMap.EndCall.JoinNumber, EndAllCalls);
 
-            
-
             CallStatusChange += (sender, args) =>
             {
                 trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
@@ -341,25 +425,30 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         private string UpdateCallStatusXSig()
         {
+            const int maxCalls = 8;
+            const int maxStrings = 5;
             const int offset = 6;
-            var callIndex = 1;
+            var callIndex = 0;
+            var digitalIndex = maxStrings*maxCalls;
             
 
             var tokenArray = new XSigToken[ActiveCalls.Count*offset]; //set array size for number of calls * pieces of info
 
             foreach (var call in ActiveCalls)
             {
+                var arrayIndex = callIndex;
                 //digitals
-                tokenArray[callIndex] = new XSigDigitalToken((callIndex/offset) + 1, call.IsActiveCall);
+                tokenArray[arrayIndex] = new XSigDigitalToken(digitalIndex + 1, call.IsActiveCall);
 
                 //serials
-                tokenArray[callIndex + 1] = new XSigSerialToken(callIndex, call.Name);
-                tokenArray[callIndex + 2] = new XSigSerialToken(callIndex + 1, call.Number);
-                tokenArray[callIndex + 3] = new XSigSerialToken(callIndex + 2, call.Direction.ToString());
-                tokenArray[callIndex + 4] = new XSigSerialToken(callIndex + 3, call.Type.ToString());
-                tokenArray[callIndex + 5] = new XSigSerialToken(callIndex + 4, call.Status.ToString());
+                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());
 
                 callIndex += offset;
+                digitalIndex++;
             }
 
             return GetXSigString(tokenArray);
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs
index c603ca08..780b7d29 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
@@ -255,9 +255,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             /// <returns></returns>
             public static CodecDirectory ConvertZoomContactsToGeneric(List<Contact> zoomContacts)
             {
-                var directory = new Codec.CodecDirectory();
+                var directory = new CodecDirectory();
 
-                var folders = new List<Codec.DirectoryItem>();
+                var folders = new List<DirectoryItem>();
 
                 var roomFolder = new DirectoryFolder();
 
@@ -272,9 +272,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 {
                     // If so, setup a rooms and contacts folder and add them.
                     roomFolder.Name = "Rooms";
+                    roomFolder.ParentFolderId = "root";
                     roomFolder.FolderId = "rooms";
 
                     contactFolder.Name = "Contacts";
+                    contactFolder.ParentFolderId = "root";
                     contactFolder.FolderId = "contacts";
 
                     folders.Add(roomFolder);
@@ -285,21 +287,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                 try
                 {
-                    if (zoomContacts.Count > 0)
+                    if (zoomContacts.Count == 0) return directory;
                     {
                         foreach (Contact c in zoomContacts)
                         {
-                            var contact = new ZoomDirectoryContact();
-
-                            contact.Name = c.ScreenName;
-                            contact.ContactId = c.Jid;
+                            var contact = new ZoomDirectoryContact {Name = c.ScreenName, ContactId = c.Jid};
 
                             if (folders.Count > 0)
                             {
-                                if (c.IsZoomRoom)
-                                    contact.FolderId = roomFolder.FolderId;
-                                else
-                                    contact.FolderId = contactFolder.FolderId;
+                                contact.ParentFolderId = c.IsZoomRoom ? "rooms" : "contacts";
                             }
 
                             contacts.Add(contact);
@@ -577,7 +573,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             public string meetingID { get; set; }
             public string password { get; set; }
             public string meetingOption { get; set; }
-            public int MeetingNumber { get; set; }
+            public long MeetingNumber { get; set; }
             public string callerName { get; set; }
             public string avatarURL { get; set; }
             public int lifeTime { get; set; }
@@ -831,13 +827,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             {
                 get
                 {
-                    return this._volume;
+                    return _volume;
                 }
                 set
                 {
                     if (value != _volume)
                     {
-                        this._volume = value;
+                        _volume = value;
                         NotifyPropertyChanged("Volume");
                     }
                 }
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index ba5dc3e4..5fec376c 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -18,7 +18,7 @@ using PepperDash_Essentials_Core.Bridges.JoinMaps;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
-    public class ZoomRoom : VideoCodecBase, IHasCodecSelfView, IHasDirectory, ICommunicationMonitor, IRouting,
+    public class ZoomRoom : VideoCodecBase, IHasCodecSelfView, IHasDirectoryHistoryStack, ICommunicationMonitor, IRouting,
         IHasScheduleAwareness, IHasCodecCameras
     {
         private readonly CrestronQueue<string> ReceiveQueue;
@@ -277,19 +277,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public event EventHandler<DirectoryEventArgs> DirectoryResultReturned;
         public CodecDirectory DirectoryRoot { get; private set; }
 
+        private CodecDirectory _currentDirectoryResult;
         public CodecDirectory CurrentDirectoryResult
         {
-            get
-            {
-                if (DirectoryBrowseHistory.Count > 0)
-                {
-                    return DirectoryBrowseHistory[DirectoryBrowseHistory.Count - 1];
-                }
-                else
-                {
-                    return DirectoryRoot;
-                }
-            }
+            get { return _currentDirectoryResult; }
         }
 
         public CodecPhonebookSyncState PhonebookSyncState { get; private set; }
@@ -302,48 +293,42 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 DirectoryRoot.CurrentDirectoryResults.FindAll(
                     c => c.Name.IndexOf(searchString, 0, StringComparison.OrdinalIgnoreCase) > -1));
 
-            DirectoryBrowseHistory.Add(directoryResults);
+            DirectoryBrowseHistoryStack.Push(_currentDirectoryResult);
+            _currentDirectoryResult = directoryResults;
 
             OnDirectoryResultReturned(directoryResults);
         }
 
         public void GetDirectoryFolderContents(string folderId)
         {
-            var directoryResults = new CodecDirectory();
+            var directoryResults = new CodecDirectory {ResultsFolderId = folderId};
 
-            directoryResults.ResultsFolderId = folderId;
             directoryResults.AddContactsToDirectory(
-                DirectoryRoot.CurrentDirectoryResults.FindAll(c => c.FolderId.Equals(folderId)));
+                DirectoryRoot.CurrentDirectoryResults.FindAll(c => c.ParentFolderId.Equals(folderId)));
 
-            DirectoryBrowseHistory.Add(directoryResults);
+            DirectoryBrowseHistoryStack.Push(_currentDirectoryResult);
+
+            _currentDirectoryResult = directoryResults;
 
             OnDirectoryResultReturned(directoryResults);
         }
 
         public void SetCurrentDirectoryToRoot()
         {
-            DirectoryBrowseHistory.Clear();
+            DirectoryBrowseHistoryStack.Clear();
+
+            _currentDirectoryResult = DirectoryRoot;
 
             OnDirectoryResultReturned(DirectoryRoot);
         }
 
         public void GetDirectoryParentFolderContents()
         {
-            var currentDirectory = new CodecDirectory();
+            if (DirectoryBrowseHistoryStack.Count == 0) return;
 
-            if (DirectoryBrowseHistory.Count > 0)
-            {
-                var lastItemIndex = DirectoryBrowseHistory.Count - 1;
-                var parentDirectoryContents = DirectoryBrowseHistory[lastItemIndex];
+            var currentDirectory = DirectoryBrowseHistoryStack.Pop();
 
-                DirectoryBrowseHistory.Remove(DirectoryBrowseHistory[lastItemIndex]);
-
-                currentDirectory = parentDirectoryContents;
-            }
-            else
-            {
-                currentDirectory = DirectoryRoot;
-            }
+            _currentDirectoryResult = currentDirectory;
 
             OnDirectoryResultReturned(currentDirectory);
         }
@@ -352,6 +337,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public List<CodecDirectory> DirectoryBrowseHistory { get; private set; }
 
+        public Stack<CodecDirectory> DirectoryBrowseHistoryStack { get; private set; } 
+
         #endregion
 
         #region IHasScheduleAwareness Members
@@ -452,8 +439,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             DirectoryRoot = new CodecDirectory();
 
             DirectoryBrowseHistory = new List<CodecDirectory>();
+            DirectoryBrowseHistoryStack = new Stack<CodecDirectory>();
 
-            CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => DirectoryBrowseHistory.Count > 0);
+            CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => DirectoryBrowseHistoryStack.Count > 0);
 
             CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
         }
@@ -828,6 +816,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                                     PhonebookSyncState.PhonebookRootEntriesReceived();
                                     PhonebookSyncState.SetPhonebookHasFolders(false);
                                     PhonebookSyncState.SetNumberOfContacts(Status.Phonebook.Contacts.Count);
+
                                 }
 
                                 var directoryResults = new CodecDirectory();
@@ -837,6 +826,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                                 DirectoryRoot = directoryResults;
 
+                                _currentDirectoryResult = DirectoryRoot;
+
                                 OnDirectoryResultReturned(directoryResults);
 
                                 break;

From 9d15704b78a6338e614124c9685132580bde950d Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 23 Sep 2020 08:51:44 -0600
Subject: [PATCH 32/89] cleaning some things up and getting more pieces working

---
 .../JoinMaps/VideoCodecControllerJoinMap.cs   | 432 ++----------------
 .../VideoCodec/VideoCodecBase.cs              |  91 +++-
 .../VideoCodec/ZoomRoom/ResponseObjects.cs    |   6 +
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           | 407 ++++++++---------
 4 files changed, 311 insertions(+), 625 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index 617262f4..b1c46717 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -18,399 +18,6 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 
         #endregion
 
-        /*#region NearEndCameraControls
-
-        [JoinName("NearCamDown")] public JoinDataComplete NearEndCameraDown =
-            new JoinDataComplete(new JoinData {JoinNumber = 12, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Near Camera Down",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("NearCamFocusFar")] public JoinDataComplete NearEndCameraFocusFar =
-            new JoinDataComplete(new JoinData {JoinNumber = 18, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Near Camera Focus Far",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("NearCamFocusNear")] public JoinDataComplete NearEndCameraFocusNear =
-            new JoinDataComplete(new JoinData {JoinNumber = 17, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Near Camera Focus Near",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("NearCamLeft")] public JoinDataComplete NearEndCameraLeft =
-            new JoinDataComplete(new JoinData {JoinNumber = 13, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Near Camera Left",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("NearCamPresetNames")] public JoinDataComplete NearEndCameraNames =
-            new JoinDataComplete(new JoinData {JoinNumber = 11, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "XSig - Camera Names",
-                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                    JoinType = eJoinType.Serial
-                });
-
-        [JoinName("NearCamPresetSave")] public JoinDataComplete NearEndCameraPresetSave =
-            new JoinDataComplete(new JoinData {JoinNumber = 21, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Save Current Preset",
-                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("NearCamPresetSelect")] public JoinDataComplete NearEndCameraPresetSelect =
-            new JoinDataComplete(new JoinData {JoinNumber = 31, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Recall Preset",
-                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                    JoinType = eJoinType.Analog
-                });
-
-        [JoinName("NearCamRight")] public JoinDataComplete NearEndCameraRight =
-            new JoinDataComplete(new JoinData {JoinNumber = 14, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Near Camera Right",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("NearCamSelectAnalog")] public JoinDataComplete NearEndCameraSelectAnalog = new JoinDataComplete(
-            new JoinData {JoinNumber = 12, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Camera Select & Feedback by index",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("NearCamSelectSerial")] public JoinDataComplete NearEndCameraSelectSerial = new JoinDataComplete(
-            new JoinData {JoinNumber = 12, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Camera Select & Feedback by name",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("NearCamUp")] public JoinDataComplete NearEndCameraUp =
-            new JoinDataComplete(new JoinData {JoinNumber = 11, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Near Camera Up",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("NearCamZoomIn")] public JoinDataComplete NearEndCameraZoomIn =
-            new JoinDataComplete(new JoinData {JoinNumber = 15, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Near Camera Zoom In",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("NearCamZoomOut")] public JoinDataComplete NearEndCameraZoomOut =
-            new JoinDataComplete(new JoinData {JoinNumber = 16, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Near Camera Zoom Out",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        #endregion
-
-        #region Far End Camera Controls
-
-        [JoinName("FarCamDown")] public JoinDataComplete FarEndCameraDown =
-            new JoinDataComplete(new JoinData {JoinNumber = 32, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Far Camera Down",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("FarCamFocusFar")] public JoinDataComplete FarEndCameraFocusFar =
-            new JoinDataComplete(new JoinData {JoinNumber = 38, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Far Camera Focus Far",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("FarCamFocusNear")] public JoinDataComplete FarEndCameraFocusNear =
-            new JoinDataComplete(new JoinData {JoinNumber = 37, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Far Camera Focus Near",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("FarCamLeft")] public JoinDataComplete FarEndCameraLeft =
-            new JoinDataComplete(new JoinData {JoinNumber = 33, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Far Camera Left",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("FarCamPresetSelect")] public JoinDataComplete FarEndCameraPresetSelect =
-            new JoinDataComplete(new JoinData {JoinNumber = 41, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Recall Preset",
-                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                    JoinType = eJoinType.Analog
-                });
-
-        [JoinName("FarCamRight")] public JoinDataComplete FarEndCameraRight =
-            new JoinDataComplete(new JoinData {JoinNumber = 34, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Far Camera Right",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("FarCamUp")] public JoinDataComplete FarEndCameraUp =
-            new JoinDataComplete(new JoinData {JoinNumber = 31, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Far Camera Up",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("FarCamZoomIn")] public JoinDataComplete FarEndCameraZoomIn =
-            new JoinDataComplete(new JoinData {JoinNumber = 35, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Far Camera Zoom In",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("FarCamZoomOut")] public JoinDataComplete FarEndCameraZoomOut =
-            new JoinDataComplete(new JoinData {JoinNumber = 36, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Far Camera Zoom Out",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        #endregion
-
-        #region Camera Tracking Controls
-
-        [JoinName("CameraTrackingOff")] public JoinDataComplete CameraTrackingOff =
-            new JoinDataComplete(new JoinData {JoinNumber = 52, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Camera Tracking Off",
-                    JoinType = eJoinType.Digital,
-                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL
-                });
-
-        [JoinName("CameraTrackingOn")] public JoinDataComplete CameraTrackingOn =
-            new JoinDataComplete(new JoinData {JoinNumber = 51, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Camera Tracking On",
-                    JoinType = eJoinType.Digital,
-                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL
-                });
-
-        [JoinName("CameraTrackingToggle")] public JoinDataComplete CameraTrackingToggle = new JoinDataComplete(
-            new JoinData {JoinNumber = 53, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Camera Tracking Toggle",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        #endregion
-
-        #region Incoming Call
-
-        [JoinName("IncomingCallAnswer")] public JoinDataComplete IncomingCallAnswer =
-            new JoinDataComplete(new JoinData {JoinNumber = 61, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Answer Incoming Call & Incoming Call FB",
-                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("IncomingCallId")] public JoinDataComplete IncomingCallId =
-            new JoinDataComplete(new JoinData {JoinNumber = 64, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Incoming Call ID",
-                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                    JoinType = eJoinType.Serial
-                });
-
-        [JoinName("IncomingCallName")] public JoinDataComplete IncomingCallName =
-            new JoinDataComplete(new JoinData {JoinNumber = 61, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Incoming Call Name",
-                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                    JoinType = eJoinType.Serial
-                });
-
-        [JoinName("IncomingCallNumber")] public JoinDataComplete IncomingCallNumber =
-            new JoinDataComplete(new JoinData {JoinNumber = 62, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Incoming Call Number",
-                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                    JoinType = eJoinType.Serial
-                });
-
-        [JoinName("IncomingCallReject")] public JoinDataComplete IncomingCallReject =
-            new JoinDataComplete(new JoinData {JoinNumber = 62, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Reject Incoming Call",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("IncomingCallType")] public JoinDataComplete IncomingCallType =
-            new JoinDataComplete(new JoinData {JoinNumber = 63, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Incoming Call Type",
-                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                    JoinType = eJoinType.Serial
-                });
-
-        #endregion
-
-        #region Manual Dial
-        [JoinName("ManualDial")]
-        public JoinDataComplete ManualDial = new JoinDataComplete(new JoinData {JoinNumber = 71, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Dial Entered String",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("HangUpAllCalls")]
-        public JoinDataComplete HangUpAllCalls = new JoinDataComplete(new JoinData {JoinNumber = 72, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Hang up All calls",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        [JoinName("ManualDialString")]
-        public JoinDataComplete ManualDialString = new JoinDataComplete(new JoinData {JoinNumber = 71, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Manual String to dial",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        #endregion
-
-        #region Connected Calls
-
-        [JoinName("ConnectedCallCount")]
-        public JoinDataComplete ConnectedCallCount = new JoinDataComplete(new JoinData {JoinNumber = 81, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Connected Call Count",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("ConnectedCallHangup")]
-        public JoinDataComplete ConnectedCallHangupStart =
-            new JoinDataComplete(new JoinData {JoinNumber = 81, JoinSpan = 8},
-                new JoinMetadata
-                {
-                    Description = "Hang up selected call",
-                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                    JoinType = eJoinType.Digital
-                });
-
-        [JoinName("ConnectedCallData")] public JoinDataComplete ConnectedCallData =
-            new JoinDataComplete(new JoinData {JoinNumber = 81, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description =
-                        "XSig - Connected Call info\r\nDigital 1: Connecting\r\nDigital 2: Connected\r\nSerial 1: Name\r\nSerial 2: Number\r\nSerial 3: Status\r\nSerial 4: Type\r\nSerial 5: ID",
-                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                    JoinType = eJoinType.Serial
-                });
-
-        #endregion
-        #region NearEnd Source Select
-
-        [JoinName("NearEndSourceSelect")] public JoinDataComplete NearEndSourceSelect =
-            new JoinDataComplete(new JoinData {JoinNumber = 5, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Near End Source Select",
-                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                    JoinType = eJoinType.Analog,
-                    ValidValues = new[] {"1", "2", "3", "4"}
-                });
-        #endregion
-
-        #region Sharing 
-        //Putting share start/stop only in this base join map. The map can be extended for features of other codecs
-
-        public JoinDataComplete SharingStart = new JoinDataComplete(new JoinData {JoinNumber = 101, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Start sharing & feedback",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        public JoinDataComplete SharingStop = new JoinDataComplete(new JoinData {JoinNumber = 102, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "Stop Sharing & Feedback",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-        #endregion
-
-        #region Phonebook
-
-        #endregion*/
-
         [JoinName("CallDirection")] public JoinDataComplete CallDirection =
             new JoinDataComplete(new JoinData {JoinNumber = 22, JoinSpan = 1},
                 new JoinMetadata
@@ -572,15 +179,6 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                     JoinCapabilities = eJoinCapabilities.ToSIMPL,
                     JoinType = eJoinType.Serial
                 });
-        /*
-        [JoinName("CurrentCallNumber")] public JoinDataComplete CurrentCallNumber =
-            new JoinDataComplete(new JoinData {JoinNumber = 3, JoinSpan = 1},
-                new JoinMetadata
-                {
-                    Description = "Current Call Number",
-                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                    JoinType = eJoinType.Serial
-                });*/
 
         [JoinName("CurrentDialString")] public JoinDataComplete CurrentDialString =
             new JoinDataComplete(new JoinData {JoinNumber = 1, JoinSpan = 1},
@@ -915,6 +513,33 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                     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",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("Meeting Count Fb")] public JoinDataComplete MeetingCount =
+            new JoinDataComplete(new JoinData {JoinNumber = 161, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Meeting Count",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+
         [JoinName("CameraLayoutStringFb")]
         public JoinDataComplete CameraLayoutStringFb =
             new JoinDataComplete(new JoinData { JoinNumber = 141, JoinSpan = 1 },
@@ -925,6 +550,9 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
+        
+        
+
         [JoinName("ManualDial")] public JoinDataComplete ManualDial =
             new JoinDataComplete(new JoinData {JoinNumber = 71, JoinSpan = 1},
                 new JoinMetadata
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 7c5c784b..fb330049 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -313,6 +313,90 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 LinkVideoCodecDirectoryToApi(codec as IHasDirectory, trilist, joinMap);
             }
 
+            if (codec is IHasScheduleAwareness)
+            {
+                LinkVideoCodecScheduleToApi(codec as IHasScheduleAwareness, trilist, joinMap);
+            }
+    }
+
+        private void LinkVideoCodecScheduleToApi(IHasScheduleAwareness codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            trilist.SetSigFalseAction(joinMap.UpdateMeetings.JoinNumber, codec.GetSchedule);
+
+            codec.CodecSchedule.MeetingsListHasChanged += (sender, args) =>
+            {
+                var clearBytes = XSigHelpers.ClearOutputs();
+
+                trilist.SetString(joinMap.Schedule.JoinNumber,
+                    Encoding.GetEncoding(XSigEncoding).GetString(clearBytes, 0, clearBytes.Length));
+
+                var meetingsData = UpdateMeetingsListXSig(codec.CodecSchedule.Meetings);
+
+                trilist.SetString(joinMap.Schedule.JoinNumber, meetingsData);
+
+                trilist.SetSigFalseAction(joinMap.DialMeeting.JoinNumber, () =>
+                {
+                    if (codec.CodecSchedule.Meetings[0].Joinable)
+                    {
+                        Dial(codec.CodecSchedule.Meetings[0]);
+                    }
+                });
+            };
+        }
+
+        private string UpdateMeetingsListXSig(List<Meeting> meetings)
+        {
+            /*const int maxCalls = 8;
+            const int maxStrings = 5;
+            const int offset = 6;
+            var callIndex = 0;
+            var digitalIndex = maxStrings*maxCalls;
+             */
+
+            const int maxMeetings = 3;
+            const int maxDigitals = 1;
+            const int maxStrings = 4;
+            const int offset = maxDigitals + maxStrings;
+            var digitalIndex = maxStrings*maxMeetings; //15
+            var stringIndex = 0;
+            var meetingIndex = 0;
+
+            var tokenArray = new XSigToken[maxMeetings*offset];
+            /* 
+             * Digitals
+             * IsJoinable - 1
+             * 
+             * Serials
+             * Organizer - 1
+             * Title - 2
+             * Agenda - 3
+             * Start Time - 4
+             * End Time - 5
+            */
+            
+            foreach(var meeting in meetings)
+            {
+                var currentTime = DateTime.Now;
+                
+                if(meeting.StartTime < currentTime && meeting.EndTime < currentTime) continue;
+                
+                if (meetingIndex > maxMeetings*offset) break;
+                
+                //digitals
+                tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, meeting.Joinable);
+
+                //serials
+                tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, meeting.Organizer);
+                tokenArray[stringIndex + 1] = new XSigSerialToken(stringIndex + 2, meeting.Title);
+                tokenArray[stringIndex + 2] = new XSigSerialToken(stringIndex + 3, meeting.StartTime.ToString("MM/dd/yyyy h:mm"));
+                tokenArray[stringIndex + 3] = new XSigSerialToken(stringIndex + 4, meeting.EndTime.ToString("MM/dd/yyyy h:mm"));
+
+                digitalIndex += maxDigitals;
+                meetingIndex += offset;
+                stringIndex += maxStrings;
+            }
+
+            return GetXSigString(tokenArray);
         }
 
         private void LinkVideoCodecDirectoryToApi(IHasDirectory codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
@@ -613,11 +697,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             var tokenArray = new XSigToken[presets.Count];
 
-            string returnString;
-
-            foreach (var token in presets.Select(cameraPreset => new XSigSerialToken(i, cameraPreset.Description)))
+            foreach (var preset in presets)
             {
-                tokenArray[i - 1] = token;
+                var cameraPreset = new XSigSerialToken(i, preset.Description);
+                tokenArray[i - 1] = cameraPreset;
                 i++;
             }
             
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs
index 780b7d29..c81a47cb 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
@@ -979,6 +979,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 meeting.Privacy = b.IsPrivate ? eMeetingPrivacy.Private : eMeetingPrivacy.Public;
 
                 // No meeting.Calls data exists for Zoom Rooms.  Leaving out for now.
+                var now = DateTime.Now;
+                if (meeting.StartTime < now && meeting.EndTime < now)
+                {
+                    Debug.Console(1, "Skipping meeting {0}. Meeting is in the past.", meeting.Title);
+                    continue;
+                }
 
                 meetings.Add(meeting);
 
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 5fec376c..045d6482 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -14,25 +14,26 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash_Essentials_Core.Bridges.JoinMaps;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
-    public class ZoomRoom : VideoCodecBase, IHasCodecSelfView, IHasDirectoryHistoryStack, ICommunicationMonitor, IRouting,
+    public class ZoomRoom : VideoCodecBase, IHasCodecSelfView, IHasDirectoryHistoryStack, ICommunicationMonitor,
+        IRouting,
         IHasScheduleAwareness, IHasCodecCameras
     {
-        private readonly CrestronQueue<string> ReceiveQueue;
+        private const uint DefaultMeetingDurationMin = 30;
+        private const string Delimiter = "\x0D\x0A";
+        private readonly CrestronQueue<string> _receiveQueue;
 
-        private readonly Thread ReceiveThread;
+        private readonly Thread _receiveThread;
 
-        private readonly ZoomRoomSyncState SyncState;
+        private readonly ZoomRoomSyncState _syncState;
         public bool CommDebuggingIsOn;
-        private uint DefaultMeetingDurationMin = 30;
-        private string Delimiter = "\x0D\x0A";
-        private uint JsonCurlyBraceCounter = 0;
-        private bool JsonFeedbackMessageIsIncoming;
-        private StringBuilder JsonMessage;
-        private int PreviousVolumeLevel = 0;
+        private CodecDirectory _currentDirectoryResult;
+        private uint _jsonCurlyBraceCounter;
+        private bool _jsonFeedbackMessageIsIncoming;
+        private StringBuilder _jsonMessage;
+        private int _previousVolumeLevel;
         private CameraBase _selectedCamera;
 
         public ZoomRoom(DeviceConfig config, IBasicCommunication comm)
@@ -41,11 +42,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             var props = JsonConvert.DeserializeObject<ZoomRoomPropertiesConfig>(config.Properties.ToString());
 
             // The queue that will collect the repsonses in the order they are received
-            ReceiveQueue = new CrestronQueue<string>(25);
+            _receiveQueue = new CrestronQueue<string>(25);
 
             // The thread responsible for dequeuing and processing the messages
-            ReceiveThread = new Thread((o) => ProcessQueue(), null);
-            ReceiveThread.Priority = Thread.eThreadPriority.MediumPriority;
+            _receiveThread = new Thread(o => ProcessQueue(), null) {Priority = Thread.eThreadPriority.MediumPriority};
 
             Communication = comm;
 
@@ -68,15 +68,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
             CodecInfo = new ZoomRoomInfo(Status, Configuration);
 
-            SyncState = new ZoomRoomSyncState(Key + "--Sync", this);
+            _syncState = new ZoomRoomSyncState(Key + "--Sync", this);
 
-            SyncState.InitialSyncCompleted += new EventHandler<EventArgs>(SyncState_InitialSyncCompleted);
+            _syncState.InitialSyncCompleted += SyncState_InitialSyncCompleted;
 
             PhonebookSyncState = new CodecPhonebookSyncState(Key + "--PhonebookSync");
 
-            PortGather = new CommunicationGather(Communication, "\x0A");
-            PortGather.IncludeDelimiter = true;
-            PortGather.LineReceived += this.Port_LineReceived;
+            PortGather = new CommunicationGather(Communication, "\x0A") {IncludeDelimiter = true};
+            PortGather.LineReceived += Port_LineReceived;
 
             CodecOsdIn = new RoutingInputPort(RoutingPortNames.CodecOsd,
                 eRoutingSignalType.Audio | eRoutingSignalType.Video,
@@ -272,12 +271,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         #endregion
 
-        #region IHasDirectory Members
+        #region IHasDirectoryHistoryStack Members
 
         public event EventHandler<DirectoryEventArgs> DirectoryResultReturned;
         public CodecDirectory DirectoryRoot { get; private set; }
 
-        private CodecDirectory _currentDirectoryResult;
         public CodecDirectory CurrentDirectoryResult
         {
             get { return _currentDirectoryResult; }
@@ -293,7 +291,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 DirectoryRoot.CurrentDirectoryResults.FindAll(
                     c => c.Name.IndexOf(searchString, 0, StringComparison.OrdinalIgnoreCase) > -1));
 
-            DirectoryBrowseHistoryStack.Push(_currentDirectoryResult);
+            DirectoryBrowseHistoryStack.Clear();
             _currentDirectoryResult = directoryResults;
 
             OnDirectoryResultReturned(directoryResults);
@@ -324,7 +322,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public void GetDirectoryParentFolderContents()
         {
-            if (DirectoryBrowseHistoryStack.Count == 0) return;
+            if (DirectoryBrowseHistoryStack.Count == 0)
+            {
+                return;
+            }
 
             var currentDirectory = DirectoryBrowseHistoryStack.Pop();
 
@@ -337,7 +338,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public List<CodecDirectory> DirectoryBrowseHistory { get; private set; }
 
-        public Stack<CodecDirectory> DirectoryBrowseHistoryStack { get; private set; } 
+        public Stack<CodecDirectory> DirectoryBrowseHistoryStack { get; private set; }
 
         #endregion
 
@@ -374,64 +375,58 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// </summary>
         private void SetUpFeedbackActions()
         {
-            Configuration.Audio.Output.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(
-                (o, a) =>
+            Configuration.Audio.Output.PropertyChanged += (o, a) =>
+            {
+                if (a.PropertyName == "Volume")
                 {
-                    if (a.PropertyName == "Volume")
-                    {
-                        VolumeLevelFeedback.FireUpdate();
-                        MuteFeedback.FireUpdate();
-                    }
-                });
+                    VolumeLevelFeedback.FireUpdate();
+                    MuteFeedback.FireUpdate();
+                }
+            };
 
-            Configuration.Call.Microphone.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(
-                (o, a) =>
+            Configuration.Call.Microphone.PropertyChanged += (o, a) =>
+            {
+                if (a.PropertyName == "Mute")
                 {
-                    if (a.PropertyName == "Mute")
-                    {
-                        PrivacyModeIsOnFeedback.FireUpdate();
-                    }
-                });
+                    PrivacyModeIsOnFeedback.FireUpdate();
+                }
+            };
 
-            Configuration.Video.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(
-                (o, a) =>
+            Configuration.Video.PropertyChanged += (o, a) =>
+            {
+                if (a.PropertyName == "HideConfSelfVideo")
                 {
-                    if (a.PropertyName == "HideConfSelfVideo")
-                    {
-                        SelfviewIsOnFeedback.FireUpdate();
-                    }
-                });
-            Configuration.Video.Camera.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(
-                (o, a) =>
+                    SelfviewIsOnFeedback.FireUpdate();
+                }
+            };
+            Configuration.Video.Camera.PropertyChanged += (o, a) =>
+            {
+                if (a.PropertyName == "SelectedId")
                 {
-                    if (a.PropertyName == "SelectedId")
-                    {
-                        SelectCamera(Configuration.Video.Camera.SelectedId);
-                            // this will in turn fire the affected feedbacks
-                    }
-                });
+                    SelectCamera(Configuration.Video.Camera.SelectedId);
+                    // this will in turn fire the affected feedbacks
+                }
+            };
 
-            Status.Call.Sharing.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(
-                (o, a) =>
+            Status.Call.Sharing.PropertyChanged += (o, a) =>
+            {
+                if (a.PropertyName == "State")
                 {
-                    if (a.PropertyName == "State")
-                    {
-                        SharingContentIsOnFeedback.FireUpdate();
-                    }
-                });
+                    SharingContentIsOnFeedback.FireUpdate();
+                }
+            };
 
-            Status.Sharing.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(
-                (o, a) =>
+            Status.Sharing.PropertyChanged += (o, a) =>
+            {
+                switch (a.PropertyName)
                 {
-                    if (a.PropertyName == "dispState")
-                    {
+                    case "dispState":
                         SharingSourceFeedback.FireUpdate();
-                    }
-                    else if (a.PropertyName == "password")
-                    {
-                        //TODO: Fire Sharing Password Update
-                    }
-                });
+                        break;
+                    case "password":
+                        break;
+                }
+            };
         }
 
         private void SetUpDirectory()
@@ -441,7 +436,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             DirectoryBrowseHistory = new List<CodecDirectory>();
             DirectoryBrowseHistoryStack = new Stack<CodecDirectory>();
 
-            CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => DirectoryBrowseHistoryStack.Count > 0);
+            CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => _currentDirectoryResult != DirectoryRoot);
 
             CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
         }
@@ -478,20 +473,19 @@ 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"),
+            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",
+            CrestronConsole.AddNewConsoleCommand(s => GetBookings(), "GetZoomRoomBookings",
                 "Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator);
 
             var socket = Communication as ISocketStatus;
             if (socket != null)
             {
-                socket.ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(socket_ConnectionChange);
+                socket.ConnectionChange += socket_ConnectionChange;
             }
 
-            // TODO: Turn this off when done initial development
-            CommDebuggingIsOn = true;
+            CommDebuggingIsOn = false;
 
             Communication.Connect();
 
@@ -522,7 +516,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             }
             else
             {
-                SyncState.CodecDisconnected();
+                _syncState.CodecDisconnected();
                 PhonebookSyncState.CodecDisconnected();
             }
         }
@@ -547,12 +541,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             //if (CommDebuggingIsOn)
             //    Debug.Console(1, this, "Gathered: '{0}'", args.Text);
 
-            ReceiveQueue.Enqueue(args.Text);
+            _receiveQueue.Enqueue(args.Text);
 
             // If the receive thread has for some reason stopped, this will restart it
-            if (ReceiveThread.ThreadState != Thread.eThreadStates.ThreadRunning)
+            if (_receiveThread.ThreadState != Thread.eThreadStates.ThreadRunning)
             {
-                ReceiveThread.Start();
+                _receiveThread.Start();
             }
         }
 
@@ -567,7 +561,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             {
                 while (true)
                 {
-                    var message = ReceiveQueue.Dequeue();
+                    var message = _receiveQueue.Dequeue();
 
                     ProcessMessage(message);
                 }
@@ -587,50 +581,50 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         private void SetUpSyncQueries()
         {
             // zStatus
-            SyncState.AddQueryToQueue("zStatus Call Status");
-            SyncState.AddQueryToQueue("zStatus Audio Input Line");
-            SyncState.AddQueryToQueue("zStatus Audio Output Line");
-            SyncState.AddQueryToQueue("zStatus Video Camera Line");
-            SyncState.AddQueryToQueue("zStatus Video Optimizable");
-            SyncState.AddQueryToQueue("zStatus Capabilities");
-            SyncState.AddQueryToQueue("zStatus Sharing");
-            SyncState.AddQueryToQueue("zStatus CameraShare");
-            SyncState.AddQueryToQueue("zStatus Call Layout");
-            SyncState.AddQueryToQueue("zStatus Call ClosedCaption Available");
-            SyncState.AddQueryToQueue("zStatus NumberOfScreens");
+            _syncState.AddQueryToQueue("zStatus Call Status");
+            _syncState.AddQueryToQueue("zStatus Audio Input Line");
+            _syncState.AddQueryToQueue("zStatus Audio Output Line");
+            _syncState.AddQueryToQueue("zStatus Video Camera Line");
+            _syncState.AddQueryToQueue("zStatus Video Optimizable");
+            _syncState.AddQueryToQueue("zStatus Capabilities");
+            _syncState.AddQueryToQueue("zStatus Sharing");
+            _syncState.AddQueryToQueue("zStatus CameraShare");
+            _syncState.AddQueryToQueue("zStatus Call Layout");
+            _syncState.AddQueryToQueue("zStatus Call ClosedCaption Available");
+            _syncState.AddQueryToQueue("zStatus NumberOfScreens");
 
             // zConfiguration
 
-            SyncState.AddQueryToQueue("zConfiguration Call Sharing optimize_video_sharing");
-            SyncState.AddQueryToQueue("zConfiguration Call Microphone Mute");
-            SyncState.AddQueryToQueue("zConfiguration Call Camera Mute");
-            SyncState.AddQueryToQueue("zConfiguration Audio Input SelectedId");
-            SyncState.AddQueryToQueue("zConfiguration Audio Input is_sap_disabled");
-            SyncState.AddQueryToQueue("zConfiguration Audio Input reduce_reverb");
-            SyncState.AddQueryToQueue("zConfiguration Audio Input volume");
-            SyncState.AddQueryToQueue("zConfiguration Audio Output selectedId");
-            SyncState.AddQueryToQueue("zConfiguration Audio Output volume");
-            SyncState.AddQueryToQueue("zConfiguration Video hide_conf_self_video");
-            SyncState.AddQueryToQueue("zConfiguration Video Camera selectedId");
-            SyncState.AddQueryToQueue("zConfiguration Video Camera Mirror");
-            SyncState.AddQueryToQueue("zConfiguration Client appVersion");
-            SyncState.AddQueryToQueue("zConfiguration Client deviceSystem");
-            SyncState.AddQueryToQueue("zConfiguration Call Layout ShareThumb");
-            SyncState.AddQueryToQueue("zConfiguration Call Layout Style");
-            SyncState.AddQueryToQueue("zConfiguration Call Layout Size");
-            SyncState.AddQueryToQueue("zConfiguration Call Layout Position");
-            SyncState.AddQueryToQueue("zConfiguration Call Lock Enable");
-            SyncState.AddQueryToQueue("zConfiguration Call MuteUserOnEntry Enable");
-            SyncState.AddQueryToQueue("zConfiguration Call ClosedCaption FontSize ");
-            SyncState.AddQueryToQueue("zConfiguration Call ClosedCaption Visible");
+            _syncState.AddQueryToQueue("zConfiguration Call Sharing optimize_video_sharing");
+            _syncState.AddQueryToQueue("zConfiguration Call Microphone Mute");
+            _syncState.AddQueryToQueue("zConfiguration Call Camera Mute");
+            _syncState.AddQueryToQueue("zConfiguration Audio Input SelectedId");
+            _syncState.AddQueryToQueue("zConfiguration Audio Input is_sap_disabled");
+            _syncState.AddQueryToQueue("zConfiguration Audio Input reduce_reverb");
+            _syncState.AddQueryToQueue("zConfiguration Audio Input volume");
+            _syncState.AddQueryToQueue("zConfiguration Audio Output selectedId");
+            _syncState.AddQueryToQueue("zConfiguration Audio Output volume");
+            _syncState.AddQueryToQueue("zConfiguration Video hide_conf_self_video");
+            _syncState.AddQueryToQueue("zConfiguration Video Camera selectedId");
+            _syncState.AddQueryToQueue("zConfiguration Video Camera Mirror");
+            _syncState.AddQueryToQueue("zConfiguration Client appVersion");
+            _syncState.AddQueryToQueue("zConfiguration Client deviceSystem");
+            _syncState.AddQueryToQueue("zConfiguration Call Layout ShareThumb");
+            _syncState.AddQueryToQueue("zConfiguration Call Layout Style");
+            _syncState.AddQueryToQueue("zConfiguration Call Layout Size");
+            _syncState.AddQueryToQueue("zConfiguration Call Layout Position");
+            _syncState.AddQueryToQueue("zConfiguration Call Lock Enable");
+            _syncState.AddQueryToQueue("zConfiguration Call MuteUserOnEntry Enable");
+            _syncState.AddQueryToQueue("zConfiguration Call ClosedCaption FontSize ");
+            _syncState.AddQueryToQueue("zConfiguration Call ClosedCaption Visible");
 
             // zCommand
 
-            SyncState.AddQueryToQueue("zCommand Phonebook List Offset: 0 Limit: 512");
-            SyncState.AddQueryToQueue("zCommand Bookings List");
+            _syncState.AddQueryToQueue("zCommand Phonebook List Offset: 0 Limit: 512");
+            _syncState.AddQueryToQueue("zCommand Bookings List");
 
 
-            SyncState.StartSync();
+            _syncState.StartSync();
         }
 
         /// <summary>
@@ -642,25 +636,25 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             // Counts the curly braces
             if (message.Contains('{'))
             {
-                JsonCurlyBraceCounter++;
+                _jsonCurlyBraceCounter++;
             }
 
             if (message.Contains('}'))
             {
-                JsonCurlyBraceCounter--;
+                _jsonCurlyBraceCounter--;
             }
 
-            Debug.Console(2, this, "JSON Curly Brace Count: {0}", JsonCurlyBraceCounter);
+            Debug.Console(2, this, "JSON Curly Brace Count: {0}", _jsonCurlyBraceCounter);
 
-            if (!JsonFeedbackMessageIsIncoming && message.Trim('\x20') == "{" + Delimiter)
+            if (!_jsonFeedbackMessageIsIncoming && message.Trim('\x20') == "{" + Delimiter)
                 // Check for the beginning of a new JSON message
             {
-                JsonFeedbackMessageIsIncoming = true;
-                JsonCurlyBraceCounter = 1; // reset the counter for each new message
+                _jsonFeedbackMessageIsIncoming = true;
+                _jsonCurlyBraceCounter = 1; // reset the counter for each new message
 
-                JsonMessage = new StringBuilder();
+                _jsonMessage = new StringBuilder();
 
-                JsonMessage.Append(message);
+                _jsonMessage.Append(message);
 
                 if (CommDebuggingIsOn)
                 {
@@ -669,22 +663,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                 return;
             }
-            else if (JsonFeedbackMessageIsIncoming && message.Trim('\x20') == "}" + Delimiter)
+            if (_jsonFeedbackMessageIsIncoming && message.Trim('\x20') == "}" + Delimiter)
                 // Check for the end of a JSON message
             {
-                JsonMessage.Append(message);
+                _jsonMessage.Append(message);
 
-                if (JsonCurlyBraceCounter == 0)
+                if (_jsonCurlyBraceCounter == 0)
                 {
-                    JsonFeedbackMessageIsIncoming = false;
+                    _jsonFeedbackMessageIsIncoming = false;
 
                     if (CommDebuggingIsOn)
                     {
-                        Debug.Console(2, this, "Complete JSON Received:\n{0}", JsonMessage.ToString());
+                        Debug.Console(2, this, "Complete JSON Received:\n{0}", _jsonMessage.ToString());
                     }
 
                     // Forward the complete message to be deserialized
-                    DeserializeResponse(JsonMessage.ToString());
+                    DeserializeResponse(_jsonMessage.ToString());
                 }
 
                 //JsonMessage = new StringBuilder();
@@ -693,9 +687,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
             // NOTE: This must happen after the above conditions have been checked
             // Append subsequent partial JSON fragments to the string builder
-            if (JsonFeedbackMessageIsIncoming)
+            if (_jsonFeedbackMessageIsIncoming)
             {
-                JsonMessage.Append(message);
+                _jsonMessage.Append(message);
 
                 //Debug.Console(1, this, "Building JSON:\n{0}", JsonMessage.ToString());
                 return;
@@ -706,18 +700,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 Debug.Console(1, this, "Non-JSON response: '{0}'", message);
             }
 
-            JsonCurlyBraceCounter = 0; // reset on non-JSON response
+            _jsonCurlyBraceCounter = 0; // reset on non-JSON response
 
-            if (!SyncState.InitialSyncComplete)
+            if (!_syncState.InitialSyncComplete)
             {
                 switch (message.Trim().ToLower()) // remove the whitespace
                 {
                     case "*r login successful":
                     {
-                        SyncState.LoginMessageReceived();
+                        _syncState.LoginMessageReceived();
 
                         // Fire up a thread to send the intial commands.
-                        CrestronInvoke.BeginInvoke((o) =>
+                        CrestronInvoke.BeginInvoke(o =>
                         {
                             Thread.Sleep(100);
                             // disable echo of commands
@@ -755,7 +749,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                 var message = JObject.Parse(trimmedResponse);
 
-                eZoomRoomResponseType eType =
+                var eType =
                     (eZoomRoomResponseType)
                         Enum.Parse(typeof (eZoomRoomResponseType), message["type"].Value<string>(), true);
 
@@ -816,12 +810,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                                     PhonebookSyncState.PhonebookRootEntriesReceived();
                                     PhonebookSyncState.SetPhonebookHasFolders(false);
                                     PhonebookSyncState.SetNumberOfContacts(Status.Phonebook.Contacts.Count);
-
                                 }
 
-                                var directoryResults = new CodecDirectory();
-
-                                directoryResults =
+                                var directoryResults =
                                     zStatus.Phonebook.ConvertZoomContactsToGeneric(Status.Phonebook.Contacts);
 
                                 DirectoryRoot = directoryResults;
@@ -916,28 +907,29 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                                 }
                                 else if (responseObj["Added Contact"] != null)
                                 {
-                                    var newContact =
-                                        JsonConvert.DeserializeObject<zStatus.Contact>(
-                                            responseObj["Updated Contact"].ToString());
+                                    var jToken = responseObj["Updated Contact"];
+                                    if (jToken != null)
+                                    {
+                                        var newContact =
+                                            JsonConvert.DeserializeObject<zStatus.Contact>(
+                                                jToken.ToString());
 
-                                    // Add a new contact
-                                    Status.Phonebook.Contacts.Add(newContact);
+                                        // Add a new contact
+                                        Status.Phonebook.Contacts.Add(newContact);
+                                    }
                                 }
 
                                 break;
                             }
                             case "bookingslistresult":
                             {
-                                if (!SyncState.InitialSyncComplete)
+                                if (!_syncState.InitialSyncComplete)
                                 {
-                                    SyncState.LastQueryResponseReceived();
+                                    _syncState.LastQueryResponseReceived();
                                 }
 
-                                var codecBookings = new List<zCommand.BookingsListResult>();
-
-                                codecBookings =
-                                    JsonConvert.DeserializeObject<List<zCommand.BookingsListResult>>(
-                                        responseObj.ToString());
+                                var codecBookings = JsonConvert.DeserializeObject<List<zCommand.BookingsListResult>>(
+                                    responseObj.ToString());
 
                                 if (codecBookings != null && codecBookings.Count > 0)
                                 {
@@ -969,13 +961,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                                 if (incomingCall != null)
                                 {
-                                    var newCall = new CodecActiveCallItem();
-
-                                    newCall.Direction = eCodecCallDirection.Incoming;
-                                    newCall.Status = eCodecCallStatus.Ringing;
-                                    newCall.Type = eCodecCallType.Unknown;
-                                    newCall.Name = incomingCall.callerName;
-                                    newCall.Id = incomingCall.callerJID;
+                                    var newCall = new CodecActiveCallItem
+                                    {
+                                        Direction = eCodecCallDirection.Incoming,
+                                        Status = eCodecCallStatus.Ringing,
+                                        Type = eCodecCallType.Unknown,
+                                        Name = incomingCall.callerName,
+                                        Id = incomingCall.callerJID
+                                    };
 
                                     ActiveCalls.Add(newCall);
 
@@ -996,14 +989,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                                     if (existingCall != null)
                                     {
-                                        if (!incomingCall.accepted)
-                                        {
-                                            existingCall.Status = eCodecCallStatus.Disconnected;
-                                        }
-                                        else
-                                        {
-                                            existingCall.Status = eCodecCallStatus.Connecting;
-                                        }
+                                        existingCall.Status = !incomingCall.accepted
+                                            ? eCodecCallStatus.Disconnected
+                                            : eCodecCallStatus.Connecting;
 
                                         OnCallStatusChange(existingCall);
                                     }
@@ -1087,9 +1075,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                         {
                             case "login":
                             {
-                                SyncState.LoginMessageReceived();
+                                _syncState.LoginMessageReceived();
 
-                                if (!SyncState.InitialQueryMessagesWereSent)
+                                if (!_syncState.InitialQueryMessagesWereSent)
                                 {
                                     SetUpSyncQueries();
                                 }
@@ -1157,7 +1145,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                             {
                                 JsonConvert.PopulateObject(responseObj.ToString(), Status.Cameras);
 
-                                if (!SyncState.CamerasHaveBeenSetUp)
+                                if (!_syncState.CamerasHaveBeenSetUp)
                                 {
                                     SetUpCameras();
                                 }
@@ -1213,26 +1201,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         /// </summary>
         private void UpdateCallStatus()
         {
-            zStatus.eCallStatus callStatus;
-
             if (Status.Call != null)
             {
-                callStatus = Status.Call.Status;
+                var callStatus = Status.Call.Status;
 
                 // If not currently in a meeting, intialize the call object
                 if (callStatus != zStatus.eCallStatus.IN_MEETING || callStatus != zStatus.eCallStatus.CONNECTING_MEETING)
                 {
-                    Status.Call = new zStatus.Call();
-                    Status.Call.Status = callStatus; // set the status after initializing the object
+                    Status.Call = new zStatus.Call {Status = callStatus};
                 }
 
                 if (ActiveCalls.Count == 0)
                 {
                     if (callStatus == zStatus.eCallStatus.CONNECTING_MEETING)
                     {
-                        var newCall = new CodecActiveCallItem();
-
-                        newCall.Status = eCodecCallStatus.Connecting;
+                        var newCall = new CodecActiveCallItem {Status = eCodecCallStatus.Connecting};
 
                         ActiveCalls.Add(newCall);
 
@@ -1317,12 +1300,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public override void MuteOff()
         {
-            SetVolume((ushort) PreviousVolumeLevel);
+            SetVolume((ushort) _previousVolumeLevel);
         }
 
         public override void MuteOn()
         {
-            PreviousVolumeLevel = Configuration.Audio.Output.Volume; // Store the previous level for recall
+            _previousVolumeLevel = Configuration.Audio.Output.Volume; // Store the previous level for recall
 
             SetVolume(0);
         }
@@ -1484,6 +1467,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             throw new NotImplementedException();
         }
 
+        /// <summary>
         /// Call when directory results are updated
         /// </summary>
         /// <param name="result"></param>
@@ -1495,7 +1479,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             var handler = DirectoryResultReturned;
             if (handler != null)
             {
-                handler(this, new DirectoryEventArgs()
+                handler(this, new DirectoryEventArgs
                 {
                     Directory = result,
                     DirectoryIsOnRoot = !CurrentDirectoryResultIsNotDirectoryRoot.BoolValue
@@ -1531,7 +1515,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 UpdateFarEndCameras();
             }
 
-            SyncState.CamerasSetUp();
+            _syncState.CamerasSetUp();
         }
 
         /// <summary>
@@ -1570,10 +1554,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 {
                     return Status.SystemUnit.MeetingNumber;
                 }
-                else
-                {
-                    return string.Empty;
-                }
+                return string.Empty;
             }
         }
 
@@ -1585,10 +1566,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 {
                     return Status.Call.Info.meeting_list_item.third_party.h323_address;
                 }
-                else
-                {
-                    return string.Empty;
-                }
+                return string.Empty;
             }
         }
 
@@ -1600,10 +1578,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 {
                     return Status.SystemUnit.RoomInfo.AccountEmail;
                 }
-                else
-                {
-                    return string.Empty;
-                }
+                return string.Empty;
             }
         }
 
@@ -1620,10 +1595,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 {
                     return Status.Call.Info.dialIn;
                 }
-                else
-                {
-                    return string.Empty;
-                }
+                return string.Empty;
             }
         }
 
@@ -1635,10 +1607,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 {
                     return Status.Call.Info.meeting_list_item.third_party.sip_address;
                 }
-                else
-                {
-                    return string.Empty;
-                }
+                return string.Empty;
             }
         }
     }
@@ -1648,24 +1617,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
     /// </summary>
     public class ZoomRoomSyncState : IKeyed
     {
-        private readonly ZoomRoom Parent;
-        private readonly CrestronQueue<string> SyncQueries;
-        private bool _InitialSyncComplete;
+        private readonly ZoomRoom _parent;
+        private readonly CrestronQueue<string> _syncQueries;
+        private bool _initialSyncComplete;
 
         public ZoomRoomSyncState(string key, ZoomRoom parent)
         {
-            Parent = parent;
+            _parent = parent;
             Key = key;
-            SyncQueries = new CrestronQueue<string>(50);
+            _syncQueries = new CrestronQueue<string>(50);
             CodecDisconnected();
         }
 
         public bool InitialSyncComplete
         {
-            get { return _InitialSyncComplete; }
+            get { return _initialSyncComplete; }
             private set
             {
-                if (value == true)
+                if (value)
                 {
                     var handler = InitialSyncCompleted;
                     if (handler != null)
@@ -1673,7 +1642,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                         handler(this, new EventArgs());
                     }
                 }
-                _InitialSyncComplete = value;
+                _initialSyncComplete = value;
             }
         }
 
@@ -1700,11 +1669,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         private void DequeueQueries()
         {
-            while (!SyncQueries.IsEmpty)
+            while (!_syncQueries.IsEmpty)
             {
-                var query = SyncQueries.Dequeue();
+                var query = _syncQueries.Dequeue();
 
-                Parent.SendText(query);
+                _parent.SendText(query);
             }
 
             InitialQueryMessagesSent();
@@ -1712,7 +1681,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public void AddQueryToQueue(string query)
         {
-            SyncQueries.Enqueue(query);
+            _syncQueries.Enqueue(query);
         }
 
         public void LoginMessageReceived()
@@ -1745,7 +1714,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public void CodecDisconnected()
         {
-            SyncQueries.Clear();
+            _syncQueries.Clear();
             LoginMessageWasReceived = false;
             InitialQueryMessagesWereSent = false;
             LastQueryResponseWasReceived = false;
@@ -1772,7 +1741,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
     {
         public ZoomRoomFactory()
         {
-            TypeNames = new List<string>() {"zoomroom"};
+            TypeNames = new List<string> {"zoomroom"};
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)

From 88263ccc77ef8a80381d4d6a9b19bea033d42220 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 23 Sep 2020 15:54:11 -0600
Subject: [PATCH 33/89] finished up with some things

---
 .../JoinMaps/VideoCodecControllerJoinMap.cs   |  53 ++++++++
 .../Essentials Devices Common.csproj          |   1 +
 .../VideoCodec/Interfaces/IHasParticipants.cs |  59 +++++++++
 .../VideoCodec/VideoCodecBase.cs              |  83 ++++++++++++
 .../VideoCodec/ZoomRoom/ResponseObjects.cs    |  20 ++-
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           | 122 +++++++++++-------
 6 files changed, 288 insertions(+), 50 deletions(-)
 create mode 100644 essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasParticipants.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index b1c46717..dc2fe6c7 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -562,6 +562,59 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                     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("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
+            });
+
         public VideoCodecControllerJoinMap(uint joinStart) : base(joinStart, typeof (VideoCodecControllerJoinMap))
         {
         }
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
index d3d468fc..94988b7b 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
@@ -120,6 +120,7 @@
     <Compile Include="VideoCodec\CiscoCodec\RoomPresets.cs" />
     <Compile Include="Cameras\CameraControl.cs" />
     <Compile Include="Display\PanasonicThDisplay.cs" />
+    <Compile Include="VideoCodec\Interfaces\IHasParticipants.cs" />
     <Compile Include="VideoCodec\Interfaces\iVideoCodecInfo.cs" />
     <Compile Include="Codec\iHasCallFavorites.cs" />
     <Compile Include="Codec\iHasCallHistory.cs" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasParticipants.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasParticipants.cs
new file mode 100644
index 00000000..e0f1d1a3
--- /dev/null
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasParticipants.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
+{
+    public interface IHasParticipants
+    {
+        CodecParticipants Participants { get; }
+    }
+
+    public interface IHasParticipantVideoMute:IHasParticipants
+    {
+        void MuteVideoForParticipant(int userId);
+        void UnmuteVideoForParticipant(int userId);
+        void ToggleVideoForParticipant(int userId);
+    }
+
+    public interface IHasParticipantAudioMute:IHasParticipantVideoMute
+    {
+        void MuteAudioForParticipant(int userId);
+        void UnmuteAudioForParticipant(int userId);
+        void ToggleAudioForParticipant(int userId);
+    }
+
+    public class CodecParticipants
+    {
+        private List<Participant> _currentParticipants;
+ 
+        public List<Participant> CurrentParticipants {
+            get { return _currentParticipants; }
+            set
+            {
+                _currentParticipants = value;
+                var handler = ParticipantsListHasChanged;
+
+                if(handler == null) return;
+
+                handler(this, new EventArgs());
+            }
+        }
+
+        public event EventHandler<EventArgs> ParticipantsListHasChanged;
+
+        public CodecParticipants()
+        {
+            _currentParticipants = new List<Participant>();
+        }
+    }
+
+    public class Participant
+    {
+        public bool IsHost { get; set; }
+        public string Name { get; set; }
+        public bool CanMuteVideo { get; set; }       
+        public bool CanUnmuteVideo { get; set; }
+        public bool VideoMuteFb { get; set; }
+        public bool AudioMuteFb { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index fb330049..87ac8581 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -16,6 +16,7 @@ using PepperDash.Essentials.Core.Devices;
 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 Feedback = PepperDash.Essentials.Core.Feedback;
 
@@ -25,6 +26,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         IUsageTracking, IHasDialer, IHasContentSharing, ICodecAudio, iVideoCodecInfo, IBridgeAdvanced
     {
         private const int XSigEncoding = 28591;
+        private readonly byte[] _clearBytes = XSigHelpers.ClearOutputs();
         protected VideoCodecBase(DeviceConfig config)
             : base(config)
         {
@@ -287,6 +289,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             LinkVideoCodecCallControlsToApi(trilist, joinMap);
 
+            LinkVideoCodecContentSharingToApi(trilist, joinMap);
+
             if (codec is IHasCodecCameras)
             {
                 LinkVideoCodecCameraToApi(codec as IHasCodecCameras, trilist, joinMap);
@@ -317,8 +321,85 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             {
                 LinkVideoCodecScheduleToApi(codec as IHasScheduleAwareness, trilist, joinMap);
             }
+
+            if (codec is IHasParticipants)
+            {
+                LinkVideoCodecParticipantsToApi(codec as IHasParticipants, trilist, joinMap);
+            }
     }
 
+        private void LinkVideoCodecParticipantsToApi(IHasParticipants codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            codec.Participants.ParticipantsListHasChanged += (sender, args) =>
+            {
+                string participantsXSig;
+                if (codec.Participants.CurrentParticipants.Count == 0)
+                {
+                    participantsXSig = Encoding.GetEncoding(XSigEncoding).GetString(_clearBytes, 0, _clearBytes.Length);
+                    trilist.SetString(joinMap.CurrentParticipants.JoinNumber, participantsXSig);
+                    trilist.SetUshort(joinMap.ParticipantCount.JoinNumber, (ushort)codec.Participants.CurrentParticipants.Count);
+                    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);
+
+                trilist.SetUshort(joinMap.ParticipantCount.JoinNumber, (ushort) codec.Participants.CurrentParticipants.Count);
+            };
+        }
+
+        private string UpdateParticipantsXSig(List<Participant> currentParticipants)
+        {
+            const int maxParticipants = 255;
+            const int maxDigitals = 5;
+            const int maxStrings = 1;
+            const int offset = maxDigitals + maxStrings;
+            var digitalIndex = maxStrings * maxParticipants; //15
+            var stringIndex = 0;
+            var meetingIndex = 0;
+
+            var tokenArray = new XSigToken[maxParticipants * offset];
+
+            foreach (var participant in currentParticipants)
+            {
+                if (meetingIndex > maxParticipants * offset) break;
+
+                //digitals
+                tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, participant.AudioMuteFb);
+                tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, participant.VideoMuteFb);
+                tokenArray[digitalIndex + 2] = new XSigDigitalToken(digitalIndex + 3, participant.CanMuteVideo);
+                tokenArray[digitalIndex + 3] = new XSigDigitalToken(digitalIndex + 4, participant.CanUnmuteVideo);
+                tokenArray[digitalIndex + 4] = new XSigDigitalToken(digitalIndex + 5, participant.IsHost);
+
+                //serials
+                tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, participant.Name);
+
+                digitalIndex += maxDigitals;
+                meetingIndex += offset;
+                stringIndex += maxStrings;
+            }
+            
+            return GetXSigString(tokenArray);
+        }
+
+        private void LinkVideoCodecContentSharingToApi(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            SharingContentIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.SourceShareStart.JoinNumber]);
+            SharingContentIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.SourceShareEnd.JoinNumber]);
+
+            SharingSourceFeedback.LinkInputSig(trilist.StringInput[joinMap.CurrentSource.JoinNumber]);
+
+            trilist.SetSigFalseAction(joinMap.SourceShareStart.JoinNumber, StartSharing);
+            trilist.SetSigFalseAction(joinMap.SourceShareEnd.JoinNumber, StopSharing);
+
+            trilist.SetBoolSigAction(joinMap.SourceShareAutoStart.JoinNumber, (b) => AutoShareContentWhileInCall = b);
+        }
+
         private void LinkVideoCodecScheduleToApi(IHasScheduleAwareness codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
         {
             trilist.SetSigFalseAction(joinMap.UpdateMeetings.JoinNumber, codec.GetSchedule);
@@ -341,6 +422,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                         Dial(codec.CodecSchedule.Meetings[0]);
                     }
                 });
+
+                trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort) codec.CodecSchedule.Meetings.Count);
             };
         }
 
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs
index c81a47cb..3425e45b 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
@@ -11,6 +11,7 @@ using PepperDash.Essentials.Devices.Common.Codec;
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
@@ -909,7 +910,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
     /// </summary>
     public class zCommand
     {
-        public partial class BookingsListResult
+        public class BookingsListResult
         {
             [JsonProperty("accessRole")]
             public string AccessRole { get; set; }
@@ -1072,6 +1073,23 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             {
                 HandStatus = new HandStatus();
             }
+
+            public static List<Participant> GetGenericParticipantListFromParticipantsResult(
+                List<ListParticipant> participants)
+            {
+                return
+                    participants.Select(
+                        p =>
+                            new Participant
+                            {
+                                Name = p.UserName,
+                                IsHost = p.IsHost,
+                                CanMuteVideo = p.IsVideoCanMuteByHost,
+                                CanUnmuteVideo = p.IsVideoCanUnmuteByHost,
+                                AudioMuteFb = p.AudioStatusState == "AUDIO_MUTED",
+                                VideoMuteFb = p.VideoStatusIsSending
+                            }).ToList();
+            }
         }
 
         public class CallinCountryList
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 045d6482..14ef2d55 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -14,12 +14,13 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
     public class ZoomRoom : VideoCodecBase, IHasCodecSelfView, IHasDirectoryHistoryStack, ICommunicationMonitor,
         IRouting,
-        IHasScheduleAwareness, IHasCodecCameras
+        IHasScheduleAwareness, IHasCodecCameras, IHasParticipants
     {
         private const uint DefaultMeetingDurationMin = 30;
         private const string Delimiter = "\x0D\x0A";
@@ -94,6 +95,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             Cameras = new List<CameraBase>();
 
             SetUpDirectory();
+
+            Participants = new CodecParticipants();
         }
 
         public CommunicationGather PortGather { get; private set; }
@@ -827,51 +830,61 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                             {
                                 Debug.Console(1, this, "JTokenType: {0}", responseObj.Type);
 
-                                if (responseObj.Type == JTokenType.Array)
+                                switch (responseObj.Type)
                                 {
-                                    // if the type is array this must be the complete list
-                                    Status.Call.Participants =
-                                        JsonConvert.DeserializeObject<List<zCommand.ListParticipant>>(
-                                            responseObj.ToString());
-                                }
-                                else if (responseObj.Type == JTokenType.Object)
-                                {
-                                    // this is a single participant event notification
-
-                                    var participant =
-                                        JsonConvert.DeserializeObject<zCommand.ListParticipant>(responseObj.ToString());
-
-                                    if (participant != null)
+                                    case JTokenType.Array:
+                                        Status.Call.Participants =
+                                            JsonConvert.DeserializeObject<List<zCommand.ListParticipant>>(
+                                                responseObj.ToString());
+                                        break;
+                                    case JTokenType.Object:
                                     {
-                                        if (participant.Event == "ZRCUserChangedEventLeftMeeting" ||
-                                            participant.Event == "ZRCUserChangedEventUserInfoUpdated")
-                                        {
-                                            var existingParticipant =
-                                                Status.Call.Participants.FirstOrDefault(
-                                                    p => p.UserId.Equals(participant.UserId));
+                                        // this is a single participant event notification
 
-                                            if (existingParticipant != null)
+                                        var participant =
+                                            JsonConvert.DeserializeObject<zCommand.ListParticipant>(responseObj.ToString());
+
+                                        if (participant != null)
+                                        {
+                                            switch (participant.Event)
                                             {
-                                                if (participant.Event == "ZRCUserChangedEventLeftMeeting")
+                                                case "ZRCUserChangedEventUserInfoUpdated":
+                                                case "ZRCUserChangedEventLeftMeeting":
                                                 {
-                                                    // Remove participant
-                                                    Status.Call.Participants.Remove(existingParticipant);
-                                                }
-                                                else if (participant.Event == "ZRCUserChangedEventUserInfoUpdated")
-                                                {
-                                                    // Update participant
-                                                    JsonConvert.PopulateObject(responseObj.ToString(),
-                                                        existingParticipant);
+                                                    var existingParticipant =
+                                                        Status.Call.Participants.FirstOrDefault(
+                                                            p => p.UserId.Equals(participant.UserId));
+
+                                                    if (existingParticipant != null)
+                                                    {
+                                                        switch (participant.Event)
+                                                        {
+                                                            case "ZRCUserChangedEventLeftMeeting":
+                                                                Status.Call.Participants.Remove(existingParticipant);
+                                                                break;
+                                                            case "ZRCUserChangedEventUserInfoUpdated":
+                                                                JsonConvert.PopulateObject(responseObj.ToString(),
+                                                                    existingParticipant);
+                                                                break;
+                                                        }
+                                                    }
                                                 }
+                                                    break;
+                                                case "ZRCUserChangedEventJoinedMeeting":
+                                                    Status.Call.Participants.Add(participant);
+                                                    break;
                                             }
                                         }
-                                        else if (participant.Event == "ZRCUserChangedEventJoinedMeeting")
-                                        {
-                                            Status.Call.Participants.Add(participant);
-                                        }
                                     }
+                                        break;
                                 }
 
+                                var participants =
+                                    zCommand.ListParticipant.GetGenericParticipantListFromParticipantsResult(
+                                        Status.Call.Participants);
+
+                                Participants.CurrentParticipants = participants;
+
                                 PrintCurrentCallParticipants();
 
                                 break;
@@ -1019,6 +1032,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                                             OnCallStatusChange(activeCall);
                                         }
                                     }
+                                    var emptyList = new List<Participant>();
+                                    Participants.CurrentParticipants = emptyList;
                                 }
 
                                 UpdateCallStatus();
@@ -1175,16 +1190,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public void PrintCurrentCallParticipants()
         {
-            if (Debug.Level > 0)
+            if (Debug.Level <= 0)
             {
-                Debug.Console(1, this, "****************************Call Participants***************************");
-                foreach (var participant in Status.Call.Participants)
-                {
-                    Debug.Console(1, this, "Name: {0} Audio: {1} IsHost: {2}", participant.UserName,
-                        participant.AudioStatusState, participant.IsHost);
-                }
-                Debug.Console(1, this, "************************************************************************");
+                return;
             }
+
+            Debug.Console(1, this, "****************************Call Participants***************************");
+            foreach (var participant in Participants.CurrentParticipants)
+            {
+                Debug.Console(1, this, "Name: {0} Audio: {1} IsHost: {2}", participant.Name,
+                    participant.AudioMuteFb, participant.IsHost);
+            }
+            Debug.Console(1, this, "************************************************************************");
         }
 
         /// <summary>
@@ -1226,13 +1243,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 {
                     var existingCall = ActiveCalls.FirstOrDefault(c => !c.Status.Equals(eCodecCallStatus.Ringing));
 
-                    if (callStatus == zStatus.eCallStatus.IN_MEETING)
+                    switch (callStatus)
                     {
-                        existingCall.Status = eCodecCallStatus.Connected;
-                    }
-                    else if (callStatus == zStatus.eCallStatus.NOT_IN_MEETING)
-                    {
-                        existingCall.Status = eCodecCallStatus.Disconnected;
+                        case zStatus.eCallStatus.IN_MEETING:
+                            existingCall.Status = eCodecCallStatus.Connected;
+                            break;
+                        case zStatus.eCallStatus.NOT_IN_MEETING:
+                            existingCall.Status = eCodecCallStatus.Disconnected;
+                            break;
                     }
 
                     OnCallStatusChange(existingCall);
@@ -1525,6 +1543,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         {
             // TODO: set up far end cameras for the current call
         }
+
+        #region Implementation of IHasParticipants
+
+        public CodecParticipants Participants { get; private set; }
+
+        #endregion
     }
 
     /// <summary>

From 6a79f41367c6e79f071272498e97e3efe576c0c5 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 23 Sep 2020 16:10:39 -0600
Subject: [PATCH 34/89] Add Online updates.

---
 .../VideoCodec/VideoCodecBase.cs              | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 87ac8581..521aa8dc 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -326,7 +326,43 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             {
                 LinkVideoCodecParticipantsToApi(codec as IHasParticipants, trilist, joinMap);
             }
-    }
+
+            trilist.OnlineStatusChange += (device, args) =>
+            {
+                if (!args.DeviceOnLine) return;
+
+                if (codec is IHasDirectory)
+                {
+                    (codec as IHasDirectory).SetCurrentDirectoryToRoot();
+                }
+
+                if (codec is IHasScheduleAwareness)
+                {
+                    (codec as IHasScheduleAwareness).GetSchedule();
+                }
+
+                if (codec is IHasParticipants)
+                {
+                    UpdateParticipantsXSig((codec as IHasParticipants).Participants.CurrentParticipants);
+                }
+
+                if (codec is IHasCameraAutoMode)
+                {
+                    trilist.SetBool(joinMap.CameraSupportsAutoMode.JoinNumber, true);
+
+                    (codec as IHasCameraAutoMode).CameraAutoModeIsOnFeedback.InvokeFireUpdate();
+                }
+
+                if (codec is IHasCodecSelfView)
+                {
+                    (codec as IHasCodecSelfView).SelfviewIsOnFeedback.InvokeFireUpdate();
+                }
+
+                SharingContentIsOnFeedback.InvokeFireUpdate();
+
+                UpdateCallStatusXSig();
+            };
+        }
 
         private void LinkVideoCodecParticipantsToApi(IHasParticipants codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
         {

From aa38b13adfc674cd30e73949135aa0e8c336de0d Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 24 Sep 2020 15:52:40 -0600
Subject: [PATCH 35/89] add online status link

---
 .../VideoCodec/VideoCodecBase.cs                     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 521aa8dc..7684a33f 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -285,12 +285,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             Debug.Console(1, this, "Linking to Trilist {0}", trilist.ID.ToString("X"));
 
+            
+
             LinkVideoCodecDtmfToApi(trilist, joinMap);
 
             LinkVideoCodecCallControlsToApi(trilist, joinMap);
 
             LinkVideoCodecContentSharingToApi(trilist, joinMap);
 
+            if (codec is ICommunicationMonitor)
+            {
+                LinkVideoCodecCommMonitorToApi(codec as ICommunicationMonitor, trilist, joinMap);
+            }
+
             if (codec is IHasCodecCameras)
             {
                 LinkVideoCodecCameraToApi(codec as IHasCodecCameras, trilist, joinMap);
@@ -364,6 +371,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             };
         }
 
+        private void LinkVideoCodecCommMonitorToApi(ICommunicationMonitor codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            codec.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+        }
+
         private void LinkVideoCodecParticipantsToApi(IHasParticipants codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
         {
             codec.Participants.ParticipantsListHasChanged += (sender, args) =>

From 0fc6a73b30b1423c28d48e84c0e06e28f1b27dfc Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Fri, 25 Sep 2020 08:46:52 -0600
Subject: [PATCH 36/89] adjust factory and constructor for EiscApiAdvanced

Keep SystemMonitor from getting instantiated
if we're on a VC-4 instance
---
 PepperDashEssentials/ControlSystem.cs         |  6 +++-
 .../Bridges/BridgeBase.cs                     | 36 ++++++++++++++-----
 .../Bridges/VirtualControlEiscApiAdvanced.cs  |  7 ----
 .../PepperDash_Essentials_Core.csproj         |  1 -
 4 files changed, 33 insertions(+), 17 deletions(-)
 delete mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/VirtualControlEiscApiAdvanced.cs

diff --git a/PepperDashEssentials/ControlSystem.cs b/PepperDashEssentials/ControlSystem.cs
index 8803dc6c..9802c176 100644
--- a/PepperDashEssentials/ControlSystem.cs
+++ b/PepperDashEssentials/ControlSystem.cs
@@ -327,7 +327,11 @@ namespace PepperDash.Essentials
             DeviceManager.AddDevice(new PepperDash.Essentials.Core.Devices.CrestronProcessor("processor"));
 
             // Add global System Monitor device
-            DeviceManager.AddDevice(new PepperDash.Essentials.Core.Monitoring.SystemMonitorController("systemMonitor"));
+            if (CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance)
+            {
+                DeviceManager.AddDevice(
+                    new PepperDash.Essentials.Core.Monitoring.SystemMonitorController("systemMonitor"));
+            }
 
             foreach (var devConf in ConfigReader.ConfigObject.Devices)
             {
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs
index 9631ead5..91c51f49 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs	
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.EthernetCommunication;
 
 using Newtonsoft.Json;
@@ -82,9 +83,9 @@ namespace PepperDash.Essentials.Core.Bridges
 
         protected Dictionary<string, JoinMapBaseAdvanced> JoinMaps { get; private set; }
 
-        public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
+        public BasicTriList Eisc { get; private set; }
 
-        public EiscApiAdvanced(DeviceConfig dc) :
+        public EiscApiAdvanced(DeviceConfig dc, BasicTriList eisc) :
             base(dc.Key)
         {
             JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
@@ -92,7 +93,7 @@ namespace PepperDash.Essentials.Core.Bridges
             PropertiesConfig = dc.Properties.ToObject<EiscApiPropertiesConfig>();
             //PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
 
-            Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(PropertiesConfig.Control.IpIdInt, PropertiesConfig.Control.TcpSshProperties.Address, Global.ControlSystem);
+            Eisc = eisc;
 
             Eisc.SigChange += Eisc_SigChange;
 
@@ -160,7 +161,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <summary>
         /// Prints all the join maps on this bridge
         /// </summary>
-        public void PrintJoinMaps()
+        public virtual void PrintJoinMaps()
         {
             Debug.Console(0, this, "Join Maps for EISC IPID: {0}", Eisc.ID.ToString("X"));
 
@@ -255,7 +256,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         /// <param name="currentDevice"></param>
         /// <param name="args"></param>
-        void Eisc_SigChange(object currentDevice, SigEventArgs args)
+        protected void Eisc_SigChange(object currentDevice, SigEventArgs args)
         {
             try
             {
@@ -307,15 +308,34 @@ namespace PepperDash.Essentials.Core.Bridges
     {
         public EiscApiAdvancedFactory()
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "vceiscapiadv", "vceiscapiadvanced" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
             Debug.Console(1, "Factory Attempting to create new EiscApiAdvanced Device");
 
-            return new EiscApiAdvanced(dc);
-            
+            var controlProperties = dc.Properties["control"].ToObject<ControlPropertiesConfig>();
+
+            switch (dc.Type)
+            {
+                case "eiscapiadv":
+                case "eiscapiadvanced":
+                {
+                    var eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
+                        controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                    return new EiscApiAdvanced(dc, eisc);
+                }
+                case "vceiscapiadv":
+                case "vceiscapiadvanced":
+                {
+                    var eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
+                        Global.ControlSystem);
+                    return new EiscApiAdvanced(dc, eisc);
+                }
+                default:
+                    return null;
+            }
         }
     }
 
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/VirtualControlEiscApiAdvanced.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/VirtualControlEiscApiAdvanced.cs
deleted file mode 100644
index 35de694d..00000000
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/VirtualControlEiscApiAdvanced.cs	
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace PepperDash.Essentials.Core.Bridges
-{
-    public class VirtualControlEiscApiAdvanced
-    {
-         
-    }
-}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index ed70ab1d..ee97115f 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -158,7 +158,6 @@
     <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
-    <Compile Include="Bridges\VirtualControlEiscApiAdvanced.cs" />
     <Compile Include="Comm and IR\CecPortController.cs" />
     <Compile Include="Comm and IR\CommFactory.cs" />
     <Compile Include="Comm and IR\CommunicationExtras.cs" />

From d2eadcd2f5465736cf335163491b2cdae83a120b Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Fri, 25 Sep 2020 10:42:41 -0600
Subject: [PATCH 37/89] Use InitialParametersClass.RoomId instead of Config

---
 .../PepperDashEssentialsBase/Bridges/BridgeBase.cs             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs
index 91c51f49..13d1948a 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs	
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
@@ -329,7 +330,7 @@ namespace PepperDash.Essentials.Core.Bridges
                 case "vceiscapiadv":
                 case "vceiscapiadvanced":
                 {
-                    var eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
+                    var eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, InitialParametersClass.RoomId,
                         Global.ControlSystem);
                     return new EiscApiAdvanced(dc, eisc);
                 }

From 97701ef3c4c865d6b40d3a03d7639aae2de67cc0 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Fri, 25 Sep 2020 16:00:17 -0600
Subject: [PATCH 38/89] add privacy & volume controls to VC Join Map

---
 .../JoinMaps/VideoCodecControllerJoinMap.cs   | 87 +++++++++++++++++++
 .../VideoCodec/VideoCodecBase.cs              | 32 +++++++
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           |  5 +-
 3 files changed, 123 insertions(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index dc2fe6c7..035e2bff 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -615,6 +615,93 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
+        [JoinName("MicMuteOn")] public JoinDataComplete MicMuteOn =
+            new JoinDataComplete(new JoinData {JoinNumber = 171, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Mic Mute On",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    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
+                {
+                    Description = "Mic Mute Toggle",
+                    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("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("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},
+                new JoinMetadata
+                {
+                    Description = "Volume Up",
+                    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
+            });
+
+
         public VideoCodecControllerJoinMap(uint joinStart) : base(joinStart, typeof (VideoCodecControllerJoinMap))
         {
         }
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 7684a33f..b7602b3b 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -293,6 +293,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             LinkVideoCodecContentSharingToApi(trilist, joinMap);
 
+            LinkVideoCodecPrivacyToApi(trilist, joinMap);
+
+            LinkVideoCodecVolumeToApi(trilist, joinMap);
+
             if (codec is ICommunicationMonitor)
             {
                 LinkVideoCodecCommMonitorToApi(codec as ICommunicationMonitor, trilist, joinMap);
@@ -371,6 +375,34 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             };
         }
 
+        private void LinkVideoCodecVolumeToApi(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMuteOn.JoinNumber]);
+            MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.VolumeMuteOff.JoinNumber]);
+
+            trilist.SetSigFalseAction(joinMap.VolumeMuteOn.JoinNumber, MuteOn);
+            trilist.SetSigFalseAction(joinMap.VolumeMuteOff.JoinNumber, MuteOff);
+            trilist.SetSigFalseAction(joinMap.VolumeMuteToggle.JoinNumber, MuteToggle);
+
+            VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[joinMap.VolumeLevel.JoinNumber]);
+
+            trilist.SetBoolSigAction(joinMap.VolumeUp.JoinNumber, VolumeUp);
+            trilist.SetBoolSigAction(joinMap.VolumeDown.JoinNumber, VolumeDown);
+
+            trilist.SetUShortSigAction(joinMap.VolumeLevel.JoinNumber, SetVolume);
+
+        }
+
+        private void LinkVideoCodecPrivacyToApi(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            PrivacyModeIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.MicMuteOn.JoinNumber]);
+            PrivacyModeIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.MicMuteOff.JoinNumber]);
+
+            trilist.SetSigFalseAction(joinMap.MicMuteOn.JoinNumber, PrivacyModeOn);
+            trilist.SetSigFalseAction(joinMap.MicMuteOff.JoinNumber, PrivacyModeOff);
+            trilist.SetSigFalseAction(joinMap.MicMuteToggle.JoinNumber, PrivacyModeToggle);
+        }
+
         private void LinkVideoCodecCommMonitorToApi(ICommunicationMonitor codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
         {
             codec.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 14ef2d55..6113db4a 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -26,6 +26,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         private const string Delimiter = "\x0D\x0A";
         private readonly CrestronQueue<string> _receiveQueue;
 
+
         private readonly Thread _receiveThread;
 
         private readonly ZoomRoomSyncState _syncState;
@@ -1340,13 +1341,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             }
         }
 
+
+
         /// <summary>
         /// Increments the voluem
         /// </summary>
         /// <param name="pressRelease"></param>
         public override void VolumeUp(bool pressRelease)
         {
-            // TODO: Implment volume increment that calls SetVolume()
+            // TODO: Implment volume decrement that calls SetVolume()
         }
 
         /// <summary>

From 33c3822b7cf2db69bea331e24f7b1cc0036624e3 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Mon, 28 Sep 2020 14:53:02 -0600
Subject: [PATCH 39/89] fix join type for hook state

---
 .../Bridges/JoinMaps/VideoCodecControllerJoinMap.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index 035e2bff..147bc840 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -447,7 +447,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 {
                     Description = "Current Hook State",
                     JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                    JoinType = eJoinType.Serial
+                    JoinType = eJoinType.Digital
                 });
 
         [JoinName("IncomingAnswer")] public JoinDataComplete IncomingAnswer =

From c8e3f752dbb6056c187e17e28fc8a8cfd06569d1 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Mon, 28 Sep 2020 19:15:39 -0600
Subject: [PATCH 40/89] added properties to support dynamic time before meeting
 start for warnings

---
 .../JoinMaps/VideoCodecControllerJoinMap.cs        |  8 ++++++++
 .../Codec/iHasScheduleAwareness.cs                 | 14 ++++++++++++--
 .../VideoCodec/VideoCodecBase.cs                   | 10 +++++++---
 .../VideoCodec/ZoomRoom/ResponseObjects.cs         | 14 +++++++++++++-
 .../VideoCodec/ZoomRoom/ZoomRoom.cs                |  3 ++-
 5 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index 147bc840..77c19ca4 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -701,6 +701,14 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
+        [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
+                });
 
         public VideoCodecControllerJoinMap(uint joinStart) : base(joinStart, typeof (VideoCodecControllerJoinMap))
         {
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs
index 57839471..43cc0343 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs	
@@ -30,7 +30,15 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 
         public event EventHandler<EventArgs> MeetingsListHasChanged;
 
-		/// <summary>
+        private int _meetingWarningMinutes = 5;
+
+        public int MeetingWarningMinutes
+        {
+            get { return _meetingWarningMinutes; }
+            set { _meetingWarningMinutes = value; }
+        }
+
+        /// <summary>
 		/// Setter triggers MeetingsListHasChanged event
 		/// </summary>
         public List<Meeting> Meetings
@@ -102,6 +110,8 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     {
         public TimeSpan MeetingWarningMinutes = TimeSpan.FromMinutes(5);
 
+        public int MinutesBeforeMeeting;
+
         public string Id { get; set; }
         public string Organizer { get; set; }
         public string Title { get; set; }
@@ -134,7 +144,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         {
             get
             {
-                return StartTime.AddMinutes(-5) <= DateTime.Now
+                return StartTime.AddMinutes(-MinutesBeforeMeeting) <= DateTime.Now
                     && DateTime.Now <= EndTime; //.AddMinutes(-5);
             }
         }
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index b7602b3b..e91de18f 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -484,6 +484,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         {
             trilist.SetSigFalseAction(joinMap.UpdateMeetings.JoinNumber, codec.GetSchedule);
 
+            trilist.SetUShortSigAction(joinMap.MinutesBeforeMeetingStart.JoinNumber, (i) =>
+            {
+                codec.CodecSchedule.MeetingWarningMinutes = i;
+            });
+
             codec.CodecSchedule.MeetingsListHasChanged += (sender, args) =>
             {
                 var clearBytes = XSigHelpers.ClearOutputs();
@@ -532,9 +537,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
              * Serials
              * Organizer - 1
              * Title - 2
-             * Agenda - 3
-             * Start Time - 4
-             * End Time - 5
+             * Start Time - 3
+             * End Time - 4
             */
             
             foreach(var meeting in meetings)
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs
index 3425e45b..2c33317e 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
@@ -946,8 +946,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             public ThirdParty ThirdParty { get; set; }
         }
 
+        public static List<Meeting> GetGenericMeetingsFromBookingResult(List<BookingsListResult> bookings,
+            int minutesBeforeMeetingStart)
+        {
+            var rv = GetGenericMeetingsFromBookingResult(bookings);
+
+            foreach (var meeting in rv)
+            {
+                meeting.MinutesBeforeMeeting = minutesBeforeMeetingStart;
+            }
+
+            return rv;
+        } 
         /// <summary>
-        /// Extracts the necessary meeting values from the Cisco bookings response ans converts them to the generic class
+        /// Extracts the necessary meeting values from the Zoom bookings response and converts them to the generic class
         /// </summary>
         /// <param name="bookings"></param>
         /// <returns></returns>
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 6113db4a..3a57bb43 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -947,7 +947,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                                 if (codecBookings != null && codecBookings.Count > 0)
                                 {
-                                    CodecSchedule.Meetings = zCommand.GetGenericMeetingsFromBookingResult(codecBookings);
+                                    CodecSchedule.Meetings = zCommand.GetGenericMeetingsFromBookingResult(
+                                        codecBookings, CodecSchedule.MeetingWarningMinutes);
                                 }
 
                                 break;

From b286008403dacba1df91366ccb882fe3ee209ed3 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Mon, 28 Sep 2020 19:17:09 -0600
Subject: [PATCH 41/89] fix signal direction

---
 .../Bridges/JoinMaps/VideoCodecControllerJoinMap.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index 77c19ca4..e28edecf 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -266,7 +266,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 new JoinMetadata
                 {
                     Description = "Directory Line Selected FB",
-                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
                     JoinType = eJoinType.Digital
                 });
 

From 72515a79ca51ba89a2052c7bc7c2cae62432ed35 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 29 Sep 2020 12:08:29 -0600
Subject: [PATCH 42/89] fixes and additions

---
 .../VideoCodec/VideoCodecBase.cs                   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index e91de18f..66b977cc 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -523,7 +523,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             const int maxMeetings = 3;
             const int maxDigitals = 1;
-            const int maxStrings = 4;
+            const int maxStrings = 6;
             const int offset = maxDigitals + maxStrings;
             var digitalIndex = maxStrings*maxMeetings; //15
             var stringIndex = 0;
@@ -537,12 +537,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
              * Serials
              * Organizer - 1
              * Title - 2
+             * Start Date - 3
              * Start Time - 3
+             * End Date - 4
              * End Time - 4
             */
             
             foreach(var meeting in meetings)
             {
+                if (meetingIndex >= maxMeetings*offset)
+                {
+                    break;
+                }
                 var currentTime = DateTime.Now;
                 
                 if(meeting.StartTime < currentTime && meeting.EndTime < currentTime) continue;
@@ -555,8 +561,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 //serials
                 tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, meeting.Organizer);
                 tokenArray[stringIndex + 1] = new XSigSerialToken(stringIndex + 2, meeting.Title);
-                tokenArray[stringIndex + 2] = new XSigSerialToken(stringIndex + 3, meeting.StartTime.ToString("MM/dd/yyyy h:mm"));
-                tokenArray[stringIndex + 3] = new XSigSerialToken(stringIndex + 4, meeting.EndTime.ToString("MM/dd/yyyy h:mm"));
+                tokenArray[stringIndex + 2] = new XSigSerialToken(stringIndex + 3, meeting.StartTime.ToShortDateString());
+                tokenArray[stringIndex + 3] = new XSigSerialToken(stringIndex + 3, meeting.StartTime.ToShortTimeString());
+                tokenArray[stringIndex + 4] = new XSigSerialToken(stringIndex + 4, meeting.EndTime.ToShortDateString());
+                tokenArray[stringIndex + 5] = new XSigSerialToken(stringIndex + 5, meeting.EndTime.ToShortTimeString());
 
                 digitalIndex += maxDigitals;
                 meetingIndex += offset;

From 1e6d65fe53fd42b316ed96d68a7f16f64f5bc813 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 29 Sep 2020 13:24:53 -0600
Subject: [PATCH 43/89] changing some things to check for updates to meetings
 list

---
 .../Codec/iHasScheduleAwareness.cs            | 21 ++++----
 .../VideoCodec/VideoCodecBase.cs              | 49 +++++++++++--------
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           |  4 +-
 3 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs
index 43cc0343..5275ab03 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs	
@@ -24,7 +24,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 
     public class CodecScheduleAwareness
     {
-        List<Meeting> _Meetings;
+        List<Meeting> _meetings;
 
         public event EventHandler<MeetingEventArgs> MeetingEventChange;
 
@@ -45,11 +45,11 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         {
             get
             {
-                return _Meetings;
+                return _meetings;
             }
             set
             {
-                _Meetings = value;
+                _meetings = value;
 
                 var handler = MeetingsListHasChanged;
                 if (handler != null)
@@ -59,13 +59,13 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             }
         }
 
-        private CTimer ScheduleChecker;
+        private CTimer _scheduleChecker;
 
         public CodecScheduleAwareness()
         {
             Meetings = new List<Meeting>();
 
-            ScheduleChecker = new CTimer(CheckSchedule, null, 1000, 1000);
+            _scheduleChecker = new CTimer(CheckSchedule, null, 1000, 1000);
         }
 
         private void OnMeetingChange(eMeetingEventChangeType changeType, Meeting meeting)
@@ -82,9 +82,9 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             //  Iterate the meeting list and check if any meeting need to do anythingk
 
             const double meetingTimeEpsilon = 0.0001;
-            foreach (Meeting m in Meetings)
+            foreach (var m in Meetings)
             {
-                eMeetingEventChangeType changeType = eMeetingEventChangeType.Unkown;
+                var changeType = eMeetingEventChangeType.Unkown;
 
                 if (m.TimeToMeetingStart.TotalMinutes <= m.MeetingWarningMinutes.TotalMinutes)       // Meeting is about to start
                     changeType = eMeetingEventChangeType.MeetingStartWarning;
@@ -108,14 +108,17 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public class Meeting
     {
-        public TimeSpan MeetingWarningMinutes = TimeSpan.FromMinutes(5);
-
         public int MinutesBeforeMeeting;
 
         public string Id { get; set; }
         public string Organizer { get; set; }
         public string Title { get; set; }
         public string Agenda { get; set; }
+
+        public TimeSpan MeetingWarningMinutes
+        {
+            get { return TimeSpan.FromMinutes(MinutesBeforeMeeting); }
+        }
         public TimeSpan TimeToMeetingStart
         {
             get
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 66b977cc..5dc9c258 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -489,27 +489,38 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 codec.CodecSchedule.MeetingWarningMinutes = i;
             });
 
-            codec.CodecSchedule.MeetingsListHasChanged += (sender, args) =>
-            {
-                var clearBytes = XSigHelpers.ClearOutputs();
+            codec.CodecSchedule.MeetingsListHasChanged += (sender, args) => UpdateMeetingsList(codec, trilist, joinMap);
 
-                trilist.SetString(joinMap.Schedule.JoinNumber,
-                    Encoding.GetEncoding(XSigEncoding).GetString(clearBytes, 0, clearBytes.Length));
-
-                var meetingsData = UpdateMeetingsListXSig(codec.CodecSchedule.Meetings);
-
-                trilist.SetString(joinMap.Schedule.JoinNumber, meetingsData);
-
-                trilist.SetSigFalseAction(joinMap.DialMeeting.JoinNumber, () =>
+            codec.CodecSchedule.MeetingEventChange +=
+                (sender, args) =>
                 {
-                    if (codec.CodecSchedule.Meetings[0].Joinable)
+                    if (args.ChangeType == eMeetingEventChangeType.MeetingStartWarning)
                     {
-                        Dial(codec.CodecSchedule.Meetings[0]);
+                        UpdateMeetingsList(codec, trilist, joinMap);
                     }
-                });
+                };
+        }
 
-                trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort) codec.CodecSchedule.Meetings.Count);
-            };
+        private void UpdateMeetingsList(IHasScheduleAwareness codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            var clearBytes = XSigHelpers.ClearOutputs();
+
+            trilist.SetString(joinMap.Schedule.JoinNumber,
+                Encoding.GetEncoding(XSigEncoding).GetString(clearBytes, 0, clearBytes.Length));
+
+            var meetingsData = UpdateMeetingsListXSig(codec.CodecSchedule.Meetings);
+
+            trilist.SetString(joinMap.Schedule.JoinNumber, meetingsData);
+
+            trilist.SetSigFalseAction(joinMap.DialMeeting.JoinNumber, () =>
+            {
+                if (codec.CodecSchedule.Meetings[0].Joinable)
+                {
+                    Dial(codec.CodecSchedule.Meetings[0]);
+                }
+            });
+
+            trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort)codec.CodecSchedule.Meetings.Count);
         }
 
         private string UpdateMeetingsListXSig(List<Meeting> meetings)
@@ -545,15 +556,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             
             foreach(var meeting in meetings)
             {
-                if (meetingIndex >= maxMeetings*offset)
-                {
-                    break;
-                }
                 var currentTime = DateTime.Now;
                 
                 if(meeting.StartTime < currentTime && meeting.EndTime < currentTime) continue;
                 
-                if (meetingIndex > maxMeetings*offset) break;
+                if (meetingIndex >= maxMeetings*offset) break;
                 
                 //digitals
                 tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, meeting.Joinable);
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 3a57bb43..4dbe2355 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -843,7 +843,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                                         // this is a single participant event notification
 
                                         var participant =
-                                            JsonConvert.DeserializeObject<zCommand.ListParticipant>(responseObj.ToString());
+                                            JsonConvert.DeserializeObject<zCommand.ListParticipant>(
+                                                responseObj.ToString());
 
                                         if (participant != null)
                                         {
@@ -1343,7 +1344,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         }
 
 
-
         /// <summary>
         /// Increments the voluem
         /// </summary>

From b502007fff420f987271f1b603771e8529c778da Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 29 Sep 2020 14:41:55 -0600
Subject: [PATCH 44/89] Changes to keep from clearing meeting list

---
 .../VideoCodec/VideoCodecBase.cs              | 70 +++++++++++--------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 5dc9c258..8c159105 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -133,16 +133,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         {
             get
             {
-                bool value;
-
-                if (ActiveCalls != null)
-                {
-                    value = ActiveCalls.Any(c => c.IsActiveCall);
-                }
-                else
-                {
-                    value = false;
-                }
+                var value = ActiveCalls != null && ActiveCalls.Any(c => c.IsActiveCall);
                 return value;
             }
         }
@@ -503,12 +494,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         private void UpdateMeetingsList(IHasScheduleAwareness codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
         {
-            var clearBytes = XSigHelpers.ClearOutputs();
+            var currentTime = DateTime.Now;
+            var currentMeetings =
+                codec.CodecSchedule.Meetings.Where(m => m.StartTime >= currentTime || m.EndTime >= currentTime).ToList();
 
-            trilist.SetString(joinMap.Schedule.JoinNumber,
-                Encoding.GetEncoding(XSigEncoding).GetString(clearBytes, 0, clearBytes.Length));
-
-            var meetingsData = UpdateMeetingsListXSig(codec.CodecSchedule.Meetings);
+            var meetingsData = UpdateMeetingsListXSig(currentMeetings);
 
             trilist.SetString(joinMap.Schedule.JoinNumber, meetingsData);
 
@@ -520,21 +510,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 }
             });
 
-            trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort)codec.CodecSchedule.Meetings.Count);
+            trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort)currentMeetings.Count);
         }
 
         private string UpdateMeetingsListXSig(List<Meeting> meetings)
         {
-            /*const int maxCalls = 8;
-            const int maxStrings = 5;
-            const int offset = 6;
-            var callIndex = 0;
-            var digitalIndex = maxStrings*maxCalls;
-             */
-
             const int maxMeetings = 3;
-            const int maxDigitals = 1;
-            const int maxStrings = 6;
+            const int maxDigitals = 2;
+            const int maxStrings = 7;
             const int offset = maxDigitals + maxStrings;
             var digitalIndex = maxStrings*maxMeetings; //15
             var stringIndex = 0;
@@ -544,16 +527,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             /* 
              * Digitals
              * IsJoinable - 1
+             * IsDialable - 2
              * 
              * Serials
              * Organizer - 1
              * Title - 2
              * Start Date - 3
-             * Start Time - 3
-             * End Date - 4
-             * End Time - 4
+             * Start Time - 4
+             * End Date - 5
+             * End Time - 6
             */
             
+            
             foreach(var meeting in meetings)
             {
                 var currentTime = DateTime.Now;
@@ -564,20 +549,43 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 
                 //digitals
                 tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, meeting.Joinable);
+                tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, meeting.Id != "0");
 
                 //serials
                 tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, meeting.Organizer);
                 tokenArray[stringIndex + 1] = new XSigSerialToken(stringIndex + 2, meeting.Title);
                 tokenArray[stringIndex + 2] = new XSigSerialToken(stringIndex + 3, meeting.StartTime.ToShortDateString());
-                tokenArray[stringIndex + 3] = new XSigSerialToken(stringIndex + 3, meeting.StartTime.ToShortTimeString());
-                tokenArray[stringIndex + 4] = new XSigSerialToken(stringIndex + 4, meeting.EndTime.ToShortDateString());
-                tokenArray[stringIndex + 5] = new XSigSerialToken(stringIndex + 5, meeting.EndTime.ToShortTimeString());
+                tokenArray[stringIndex + 3] = new XSigSerialToken(stringIndex + 4, meeting.StartTime.ToShortTimeString());
+                tokenArray[stringIndex + 4] = new XSigSerialToken(stringIndex + 5, meeting.EndTime.ToShortDateString());
+                tokenArray[stringIndex + 5] = new XSigSerialToken(stringIndex + 6, meeting.EndTime.ToShortTimeString());
+                tokenArray[stringIndex + 6] = new XSigSerialToken(stringIndex + 7, meeting.Id);
+
 
                 digitalIndex += maxDigitals;
                 meetingIndex += offset;
                 stringIndex += maxStrings;
             }
 
+            while (meetingIndex < maxMeetings*offset)
+            {
+                digitalIndex += maxDigitals;
+                meetingIndex += offset;
+                stringIndex += maxStrings;
+
+                //digitals
+                tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, false);
+                tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, false);
+
+                //serials
+                tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, String.Empty);
+                tokenArray[stringIndex + 1] = new XSigSerialToken(stringIndex + 2, String.Empty);
+                tokenArray[stringIndex + 2] = new XSigSerialToken(stringIndex + 3, String.Empty);
+                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);
+            }
+
             return GetXSigString(tokenArray);
         }
 

From 753b4e69ee24bd89038fa644de4b7e9359ea6c55 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 29 Sep 2020 15:08:33 -0600
Subject: [PATCH 45/89] add constructor to CodecScheduleAwareness to chang
 refresh timer

---
 .../Codec/iHasScheduleAwareness.cs                         | 7 +++++++
 .../VideoCodec/ZoomRoom/ZoomRoom.cs                        | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs
index 5275ab03..7d6acdc2 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs	
@@ -68,6 +68,13 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             _scheduleChecker = new CTimer(CheckSchedule, null, 1000, 1000);
         }
 
+        public CodecScheduleAwareness(long pollTime)
+        {
+            Meetings = new List<Meeting>();
+
+            _scheduleChecker = new CTimer(CheckSchedule, null, pollTime, pollTime);
+        }
+
         private void OnMeetingChange(eMeetingEventChangeType changeType, Meeting meeting)
         {
             var handler = MeetingEventChange;
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 4dbe2355..efb7b94e 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -22,6 +22,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         IRouting,
         IHasScheduleAwareness, IHasCodecCameras, IHasParticipants
     {
+        private const long MeetingRefreshTimer = 60000;
         private const uint DefaultMeetingDurationMin = 30;
         private const string Delimiter = "\x0D\x0A";
         private readonly CrestronQueue<string> _receiveQueue;
@@ -89,7 +90,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
             SelfviewIsOnFeedback = new BoolFeedback(SelfViewIsOnFeedbackFunc);
 
-            CodecSchedule = new CodecScheduleAwareness();
+            CodecSchedule = new CodecScheduleAwareness(MeetingRefreshTimer);
 
             SetUpFeedbackActions();
 

From 3c794849bd60c65100bf38866d9b7bfd768d348e Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 29 Sep 2020 15:22:32 -0600
Subject: [PATCH 46/89] added a couple of debugging statements

---
 .../Essentials Devices Common/VideoCodec/VideoCodecBase.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 8c159105..445147ac 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -545,7 +545,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 
                 if(meeting.StartTime < currentTime && meeting.EndTime < currentTime) continue;
                 
-                if (meetingIndex >= maxMeetings*offset) break;
+                if (meetingIndex >= maxMeetings*offset)
+                {
+                    Debug.Console(2, this, "Max Meetings reached");
+                    break;}
                 
                 //digitals
                 tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, meeting.Joinable);
@@ -568,6 +571,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             while (meetingIndex < maxMeetings*offset)
             {
+                Debug.Console(2, this, "Clearing unused data. Meeting Index: {0} MaxMeetings * Offset: {1}",
+                    meetingIndex, maxMeetings*offset);
                 digitalIndex += maxDigitals;
                 meetingIndex += offset;
                 stringIndex += maxStrings;

From cb661313c25933571020d200d2da39c0a6474c8a Mon Sep 17 00:00:00 2001
From: Jason DeVito <jdevito@pepperdash.com>
Date: Tue, 29 Sep 2020 17:21:17 -0500
Subject: [PATCH 47/89] Fixes for indexing form xsig

---
 .../VideoCodec/VideoCodecBase.cs                      | 11 ++++++-----
 packages.config                                       |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 445147ac..d78b43b5 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -573,9 +573,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             {
                 Debug.Console(2, this, "Clearing unused data. Meeting Index: {0} MaxMeetings * Offset: {1}",
                     meetingIndex, maxMeetings*offset);
-                digitalIndex += maxDigitals;
-                meetingIndex += offset;
-                stringIndex += maxStrings;
 
                 //digitals
                 tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, false);
@@ -588,8 +585,12 @@ 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);
-            }
+                tokenArray[stringIndex + 6] = new XSigSerialToken(stringIndex + 7, String.Empty);
+
+				digitalIndex += maxDigitals;
+				meetingIndex += offset;
+				stringIndex += maxStrings;
+			}
 
             return GetXSigString(tokenArray);
         }
diff --git a/packages.config b/packages.config
index 296413b6..c138dd1b 100644
--- a/packages.config
+++ b/packages.config
@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.0.42" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+  <package id="PepperDashCore" version="1.0.43" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
 </packages>
\ No newline at end of file

From 741b401d8c2fe8d54e4cb9f8ee27c3aa6755c14a Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 30 Sep 2020 08:52:16 -0600
Subject: [PATCH 48/89] fix PepperDash Core version

---
 packages.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages.config b/packages.config
index c138dd1b..439c0438 100644
--- a/packages.config
+++ b/packages.config
@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.0.43" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+  <package id="PepperDashCore" version="1.0.42-alpha-170" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
 </packages>
\ No newline at end of file

From d6133905b2d18667255e583f31a6f4fc1b7200e2 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 30 Sep 2020 09:00:56 -0600
Subject: [PATCH 49/89] really fix pepperdash core version

---
 packages.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages.config b/packages.config
index 439c0438..40078601 100644
--- a/packages.config
+++ b/packages.config
@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.0.42-alpha-170" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+  <package id="PepperDashCore" version="1.0.43-alpha-170" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
 </packages>
\ No newline at end of file

From 4b9d7d1a1f4cd7e0284196672e6bbe6c1b64e374 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 30 Sep 2020 11:21:13 -0600
Subject: [PATCH 50/89] adjust queue size

---
 .../Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index efb7b94e..ae372b72 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -45,7 +45,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             var props = JsonConvert.DeserializeObject<ZoomRoomPropertiesConfig>(config.Properties.ToString());
 
             // The queue that will collect the repsonses in the order they are received
-            _receiveQueue = new CrestronQueue<string>(25);
+            _receiveQueue = new CrestronQueue<string>(1024);
 
             // The thread responsible for dequeuing and processing the messages
             _receiveThread = new Thread(o => ProcessQueue(), null) {Priority = Thread.eThreadPriority.MediumPriority};

From e48ec3af7cfaa88b67f246b90893450f86cbdc24 Mon Sep 17 00:00:00 2001
From: Neil Dorin <ndorin@pepperdash.com>
Date: Wed, 30 Sep 2020 13:15:23 -0600
Subject: [PATCH 51/89] Adds information about ethernet interfaces to Global
 class

---
 .../Comm and IR/CommFactory.cs                | 364 +++++++--------
 .../Config/InfoConfig.cs                      |  17 +-
 .../Global/EthernetAdapterInfo.cs             |  23 +
 .../PepperDashEssentialsBase/Global/Global.cs | 429 +++++++++++-------
 .../PepperDash_Essentials_Core.csproj         |   1 +
 5 files changed, 478 insertions(+), 356 deletions(-)
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/EthernetAdapterInfo.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/CommFactory.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/CommFactory.cs
index 7556cbcd..a8fa67e4 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/CommFactory.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/CommFactory.cs	
@@ -1,120 +1,120 @@
-using System;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public class CommFactory
-	{
-		public static EssentialsControlPropertiesConfig GetControlPropertiesConfig(DeviceConfig deviceConfig)
-		{
-			try
-			{
-				return JsonConvert.DeserializeObject<EssentialsControlPropertiesConfig>
-					(deviceConfig.Properties["control"].ToString());
-				//Debug.Console(2, "Control TEST: {0}", JsonConvert.SerializeObject(controlConfig));
-			}
-			catch (Exception e)
-			{
-
-				Debug.Console(0, "ERROR: [{0}] Control properties deserialize failed:\r{1}", deviceConfig.Key, e);
-				return null;
-			}
-		}
-
-
-		/// <summary>
-		/// Returns a comm method of either com port, TCP, SSH, and puts this into the DeviceManager
-		/// </summary>
-		/// <param name="deviceConfig">The Device config object</param>
-		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
-		{
-			EssentialsControlPropertiesConfig controlConfig = GetControlPropertiesConfig(deviceConfig);
-			if (controlConfig == null)
-				return null;
-
-			IBasicCommunication comm = null;
-			try
-			{
-				var c = controlConfig.TcpSshProperties;
-				switch (controlConfig.Method)
-				{
-					case eControlMethod.Com:
-						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams, controlConfig);
-						break;
-                    case eControlMethod.Cec:
-                        comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
-                        break;
-					case eControlMethod.IR:
-						break;
-                    case eControlMethod.Ssh:
-                        {
-                            var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
-                            ssh.AutoReconnect = c.AutoReconnect;
-                            if(ssh.AutoReconnect)
-                                ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-                            comm = ssh;
-                            break;
-                        }
-                    case eControlMethod.Tcpip:
-                        {
-                            var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
-                            tcp.AutoReconnect = c.AutoReconnect;
-                            if (tcp.AutoReconnect)
-                                tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-                            comm = tcp;
-                            break;
-                        }
-                    case eControlMethod.Udp:
-                        {
-                            var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
-                            comm = udp;
-                            break;
-                        }
-					case eControlMethod.Telnet:
-						break;
-					default:
-						break;
-				}				
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, "Cannot create communication from JSON:\r{0}\r\rException:\r{1}",
-					deviceConfig.Properties.ToString(), e);
-			}
-
-			// put it in the device manager if it's the right flavor
-			var comDev = comm as Device;
-			if (comDev != null)
-				DeviceManager.AddDevice(comDev);
-			return comm;
-		}
-
-		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
-		{
-			var comPar = config.ComParams;
-			var dev = GetIComPortsDeviceFromManagedDevice(config.ControlPortDevKey);
-			if (dev != null && config.ControlPortNumber <= dev.NumberOfComPorts)
-				return dev.ComPorts[config.ControlPortNumber];
-			Debug.Console(0, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
-			return null;
-		}
-
-        /// <summary>
-        ///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
-        /// </summary>
-        /// <param name="config"></param>
-        /// <returns></returns>
-        public static ICec GetCecPort(ControlPropertiesConfig config)
-        {
+using System;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DM;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class CommFactory
+	{
+		public static EssentialsControlPropertiesConfig GetControlPropertiesConfig(DeviceConfig deviceConfig)
+		{
+			try
+			{
+				return JsonConvert.DeserializeObject<EssentialsControlPropertiesConfig>
+					(deviceConfig.Properties["control"].ToString());
+				//Debug.Console(2, "Control TEST: {0}", JsonConvert.SerializeObject(controlConfig));
+			}
+			catch (Exception e)
+			{
+
+				Debug.Console(0, "ERROR: [{0}] Control properties deserialize failed:\r{1}", deviceConfig.Key, e);
+				return null;
+			}
+		}
+
+
+		/// <summary>
+		/// Returns a comm method of either com port, TCP, SSH, and puts this into the DeviceManager
+		/// </summary>
+		/// <param name="deviceConfig">The Device config object</param>
+		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
+		{
+			EssentialsControlPropertiesConfig controlConfig = GetControlPropertiesConfig(deviceConfig);
+			if (controlConfig == null)
+				return null;
+
+			IBasicCommunication comm = null;
+			try
+			{
+				var c = controlConfig.TcpSshProperties;
+				switch (controlConfig.Method)
+				{
+					case eControlMethod.Com:
+						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams, controlConfig);
+						break;
+                    case eControlMethod.Cec:
+                        comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
+                        break;
+					case eControlMethod.IR:
+						break;
+                    case eControlMethod.Ssh:
+                        {
+                            var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
+                            ssh.AutoReconnect = c.AutoReconnect;
+                            if(ssh.AutoReconnect)
+                                ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                            comm = ssh;
+                            break;
+                        }
+                    case eControlMethod.Tcpip:
+                        {
+                            var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
+                            tcp.AutoReconnect = c.AutoReconnect;
+                            if (tcp.AutoReconnect)
+                                tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                            comm = tcp;
+                            break;
+                        }
+                    case eControlMethod.Udp:
+                        {
+                            var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
+                            comm = udp;
+                            break;
+                        }
+					case eControlMethod.Telnet:
+						break;
+					default:
+						break;
+				}				
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, "Cannot create communication from JSON:\r{0}\r\rException:\r{1}",
+					deviceConfig.Properties.ToString(), e);
+			}
+
+			// put it in the device manager if it's the right flavor
+			var comDev = comm as Device;
+			if (comDev != null)
+				DeviceManager.AddDevice(comDev);
+			return comm;
+		}
+
+		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
+		{
+			var comPar = config.ComParams;
+			var dev = GetIComPortsDeviceFromManagedDevice(config.ControlPortDevKey);
+			if (dev != null && config.ControlPortNumber <= dev.NumberOfComPorts)
+				return dev.ComPorts[config.ControlPortNumber];
+			Debug.Console(0, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
+			return null;
+		}
+
+        /// <summary>
+        ///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
+        /// </summary>
+        /// <param name="config"></param>
+        /// <returns></returns>
+        public static ICec GetCecPort(ControlPropertiesConfig config)
+        {
             var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
 
             if (dev != null)
@@ -147,64 +147,64 @@ namespace PepperDash.Essentials.Core
                     Debug.Console(0, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
                 }
             }
-            Debug.Console(0, "GetCecPort: Device '{0}' is not a valid device.", config.ControlPortDevKey);
-
-            return null;
-        }
-
-		/// <summary>
-		/// Helper to grab the IComPorts device for this PortDeviceKey. Key "controlSystem" will
-		/// return the ControlSystem object from the Global class.
-		/// </summary>
-		/// <returns>IComPorts device or null if the device is not found or does not implement IComPorts</returns>
-		public static IComPorts GetIComPortsDeviceFromManagedDevice(string ComPortDevKey)
-		{
-			if ((ComPortDevKey.Equals("controlSystem", System.StringComparison.OrdinalIgnoreCase)
-				|| ComPortDevKey.Equals("processor", System.StringComparison.OrdinalIgnoreCase))
-				&& Global.ControlSystem is IComPorts)
-				return Global.ControlSystem;
-			else
-			{
-				var dev = DeviceManager.GetDeviceForKey(ComPortDevKey) as IComPorts;
-				if (dev == null)
-					Debug.Console(0, "ComPortConfig: Cannot find com port device '{0}'", ComPortDevKey);
-				return dev;
-			}
-		}
-	}
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public class EssentialsControlPropertiesConfig : 
-        PepperDash.Core.ControlPropertiesConfig
-    {
-
-        [JsonConverter(typeof(ComSpecJsonConverter))]
-        public ComPort.ComPortSpec ComParams { get; set; }
-
-		public string CresnetId { get; set; }
-
-        /// <summary>
-        /// Attempts to provide uint conversion of string CresnetId
-        /// </summary>
-        public uint CresnetIdInt
-        {
-            get
-            {
-                try 
-                {
-                    return Convert.ToUInt32(CresnetId, 16);
-                }
-                catch (Exception)
-                {
-                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
-                }
-            }
+            Debug.Console(0, "GetCecPort: Device '{0}' is not a valid device.", config.ControlPortDevKey);
+
+            return null;
         }
 
-        public string InfinetId { get; set; }
-
+		/// <summary>
+		/// Helper to grab the IComPorts device for this PortDeviceKey. Key "controlSystem" will
+		/// return the ControlSystem object from the Global class.
+		/// </summary>
+		/// <returns>IComPorts device or null if the device is not found or does not implement IComPorts</returns>
+		public static IComPorts GetIComPortsDeviceFromManagedDevice(string ComPortDevKey)
+		{
+			if ((ComPortDevKey.Equals("controlSystem", System.StringComparison.OrdinalIgnoreCase)
+				|| ComPortDevKey.Equals("processor", System.StringComparison.OrdinalIgnoreCase))
+				&& Global.ControlSystem is IComPorts)
+				return Global.ControlSystem;
+			else
+			{
+				var dev = DeviceManager.GetDeviceForKey(ComPortDevKey) as IComPorts;
+				if (dev == null)
+					Debug.Console(0, "ComPortConfig: Cannot find com port device '{0}'", ComPortDevKey);
+				return dev;
+			}
+		}
+	}
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EssentialsControlPropertiesConfig : 
+        PepperDash.Core.ControlPropertiesConfig
+    {
+
+        [JsonConverter(typeof(ComSpecJsonConverter))]
+        public ComPort.ComPortSpec ComParams { get; set; }
+
+		public string CresnetId { get; set; }
+
+        /// <summary>
+        /// Attempts to provide uint conversion of string CresnetId
+        /// </summary>
+        public uint CresnetIdInt
+        {
+            get
+            {
+                try 
+                {
+                    return Convert.ToUInt32(CresnetId, 16);
+                }
+                catch (Exception)
+                {
+                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
+                }
+            }
+        }
+
+        public string InfinetId { get; set; }
+
         /// <summary>
         /// Attepmts to provide uiont conversion of string InifinetId
         /// </summary>
@@ -221,13 +221,13 @@ namespace PepperDash.Essentials.Core
                     throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
                 }
             }
-        }
-    }
-
-    public class IrControlSpec
-    {
-        public string PortDeviceKey { get; set; }
-        public uint PortNumber { get; set; }
-        public string File { get; set; }
-    }
+        }
+    }
+
+    public class IrControlSpec
+    {
+        public string PortDeviceKey { get; set; }
+        public uint PortNumber { get; set; }
+        public string File { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/InfoConfig.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/InfoConfig.cs
index d5cf16f1..3191a8f6 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/InfoConfig.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/InfoConfig.cs	
@@ -1,5 +1,5 @@
 using System;
-
+using System.Collections.Generic;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
 
@@ -81,7 +81,7 @@ namespace PepperDash.Essentials.Core.Config
         //    }
         //} 
 
-        /// <summary>
+        /// <summary>, 
         /// The OS Version of the processor (Firmware Version)
         /// </summary>
         [JsonProperty("osVersion")]
@@ -92,5 +92,18 @@ namespace PepperDash.Essentials.Core.Config
 		//        return Crestron.SimplSharp.CrestronEnvironment.OSVersion.Firmware;
 		//    }
 		//} 
+
+        /// <summary>
+        /// The information gathered by the processor at runtime about it's NICs and their IP addresses.   
+        /// </summary>
+        [JsonProperty("ipInfo")]
+        public Dictionary<short, EthernetAdapterInfo> IpInfo
+        {
+            get
+            {
+                return Global.EthernetAdapterInfoCollection;
+            }
+        }
     }
+
 }
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/EthernetAdapterInfo.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/EthernetAdapterInfo.cs
new file mode 100644
index 00000000..c21df098
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/EthernetAdapterInfo.cs	
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Core
+{
+    public class EthernetAdapterInfo
+    {
+        public EthernetAdapterType Type { get; set; }
+        public bool DhcpIsOn { get; set; }
+        public string Hostname { get; set; }
+        public string MacAddress { get; set; }
+        public string IpAddress { get; set; }
+        public string Subnet { get; set; }
+        public string Gateway { get; set; }
+        public string Dns1 { get; set; }
+        public string Dns2 { get; set; }
+        public string Dns3 { get; set; }
+        public string Domain { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs
index b540b3d6..911c148e 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs	
@@ -1,175 +1,260 @@
-using System;
-using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharp.CrestronDataStore;
-using Crestron.SimplSharpPro;
-
-using PepperDash.Core;
-using PepperDash.Essentials.License;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Schema;
-
-
-namespace PepperDash.Essentials.Core
-{
-	public static class Global
-	{
+using System;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using System.Collections.Generic;
+using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharp.CrestronDataStore;
+using Crestron.SimplSharpPro;
+
+using PepperDash.Core;
+using PepperDash.Essentials.License;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Schema;
+
+
+namespace PepperDash.Essentials.Core
+{
+	public static class Global
+	{
 		public static CrestronControlSystem ControlSystem { get; set; }
 
-		public static LicenseManager LicenseManager { get; set; }
-
-        /// <summary>
-        /// The file path prefix to the folder containing configuration files
-        /// </summary>
-        public static string FilePathPrefix { get; private set; }
-
-        /// <summary>
-        /// The file path prefix to the applciation directory
-        /// </summary>
-        public static string ApplicationDirectoryPathPrefix 
-        {
-            get
-            {
-                return Crestron.SimplSharp.CrestronIO.Directory.GetApplicationDirectory();
-            }
-        }
-
-        /// <summary>
-        /// Returns the directory separator character based on the running OS
-        /// </summary>
-        public static char DirectorySeparator
-        {
-            get
-            {
-                return System.IO.Path.DirectorySeparatorChar;
-            }
-        }
-
-        /// <summary>
-        /// Wildcarded config file name for global reference
-        /// </summary>
-        public const string ConfigFileName = "*configurationFile*.json";
-
-        /// <summary>
-        /// Sets the file path prefix
-        /// </summary>
-        /// <param name="prefix"></param>
-        public static void SetFilePathPrefix(string prefix)
-        {
-            FilePathPrefix = prefix;
-        }
-
-        static string _AssemblyVersion;
-
-        /// <summary>
-        /// Gets the Assembly Version of Essentials
-        /// </summary>
-        /// <returns>The Assembly Version at Runtime</returns>
-        public static string AssemblyVersion
-        {
-            get
-            {
-                return _AssemblyVersion;
-            }
-            private set
-            {
-                _AssemblyVersion = value;
-            }
-        }
-
-        /// <summary>
-        /// Sets the Assembly version to the version of the Essentials Library
-        /// </summary>
-        /// <param name="assemblyVersion"></param>
-        public static void SetAssemblyVersion(string assemblyVersion)
-        {
-            AssemblyVersion = assemblyVersion;
-        }
-
-        /// <summary>
-        /// Checks to see if the running version meets or exceed the minimum specified version.  For beta versions (0.xx.yy), will always return true.
-        /// </summary>
-        /// <param name="minimumVersion">Minimum specified version in format of xx.yy.zz</param>
-        /// <returns>Returns true if the running version meets or exceeds the minimum specified version</returns>
-        public static bool IsRunningMinimumVersionOrHigher(string minimumVersion)
-        {
-            Debug.Console(2, "Comparing running version '{0}' to minimum version '{1}'", AssemblyVersion, minimumVersion);
-
-            if (String.IsNullOrEmpty(minimumVersion))
-            {
-                Debug.Console(0,"Plugin does not specify a minimum version. Loading plugin may not work as expected. Proceeding with loading plugin");
-                return true;
-            }
-            
-            var runtimeVersion = Regex.Match(AssemblyVersion, @"^(\d*).(\d*).(\d*).*");
-
-            var runtimeVersionMajor = Int16.Parse(runtimeVersion.Groups[1].Value);
-            var runtimeVersionMinor = Int16.Parse(runtimeVersion.Groups[2].Value);
-            var runtimeVersionBuild = Int16.Parse(runtimeVersion.Groups[3].Value);
-
-            var runtimeVer = new Version(runtimeVersionMajor, runtimeVersionMinor, runtimeVersionBuild);
-
-            Version minimumVer;
-            try
-            {
-                minimumVer = new Version(minimumVersion);
-            }
-            catch
-            {
-                Debug.Console(2, "unable to parse minimum version {0}. Bypassing plugin load.", minimumVersion);
-                return false;
-            }
-
-
-            // Check for beta build version
-            if (runtimeVer.Major != 0)
-            {
-                return runtimeVer.CompareTo(minimumVer) >= 0;
-            }
-
-            Debug.Console(2, "Running Local Build.  Bypassing Dependency Check.");
-            return true;
-
-            /*
-            var minVersion = Regex.Match(minimumVersion, @"^(\d*).(\d*).(\d*)$");
-
-            if(!minVersion.Success)
-            {
-                
-            }
-
-            var minVersionMajor = Int16.Parse(minVersion.Groups[1].Value);
-            var minVersionMinor = Int16.Parse(minVersion.Groups[2].Value);
-            var minVersionBuild = Int16.Parse(minVersion.Groups[3].Value);
-
-
-
-            if (minVersionMajor > runtimeVersionMajor)
-                return false;
-
-            if (minVersionMinor > runtimeVersionMinor)
-                return false;
-
-            if (minVersionBuild > runtimeVersionBuild)
-                return false;
-
-            return true;
-             */
-        }
-
-		static Global()
-		{
-			// Fire up CrestronDataStoreStatic
-			var err = CrestronDataStoreStatic.InitCrestronDataStore();
-			if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-			{
-				CrestronConsole.PrintLine("Error starting CrestronDataStoreStatic: {0}", err);
-				return;
-			}
-		}
-
-	}
+		public static LicenseManager LicenseManager { get; set; }
+
+        public static Dictionary<short, EthernetAdapterInfo> EthernetAdapterInfoCollection {get; private set;}
+
+        /// <summary>
+        /// The file path prefix to the folder containing configuration files
+        /// </summary>
+        public static string FilePathPrefix { get; private set; }
+
+        /// <summary>
+        /// The file path prefix to the applciation directory
+        /// </summary>
+        public static string ApplicationDirectoryPathPrefix 
+        {
+            get
+            {
+                return Crestron.SimplSharp.CrestronIO.Directory.GetApplicationDirectory();
+            }
+        }
+
+        /// <summary>
+        /// Returns the directory separator character based on the running OS
+        /// </summary>
+        public static char DirectorySeparator
+        {
+            get
+            {
+                return System.IO.Path.DirectorySeparatorChar;
+            }
+        }
+
+        /// <summary>
+        /// Wildcarded config file name for global reference
+        /// </summary>
+        public const string ConfigFileName = "*configurationFile*.json";
+
+        /// <summary>
+        /// Sets the file path prefix
+        /// </summary>
+        /// <param name="prefix"></param>
+        public static void SetFilePathPrefix(string prefix)
+        {
+            FilePathPrefix = prefix;
+        }
+
+        static string _AssemblyVersion;
+
+        /// <summary>
+        /// Gets the Assembly Version of Essentials
+        /// </summary>
+        /// <returns>The Assembly Version at Runtime</returns>
+        public static string AssemblyVersion
+        {
+            get
+            {
+                return _AssemblyVersion;
+            }
+            private set
+            {
+                _AssemblyVersion = value;
+            }
+        }
+
+        /// <summary>
+        /// Sets the Assembly version to the version of the Essentials Library
+        /// </summary>
+        /// <param name="assemblyVersion"></param>
+        public static void SetAssemblyVersion(string assemblyVersion)
+        {
+            AssemblyVersion = assemblyVersion;
+        }
+
+        /// <summary>
+        /// Checks to see if the running version meets or exceed the minimum specified version.  For beta versions (0.xx.yy), will always return true.
+        /// </summary>
+        /// <param name="minimumVersion">Minimum specified version in format of xx.yy.zz</param>
+        /// <returns>Returns true if the running version meets or exceeds the minimum specified version</returns>
+        public static bool IsRunningMinimumVersionOrHigher(string minimumVersion)
+        {
+            Debug.Console(2, "Comparing running version '{0}' to minimum version '{1}'", AssemblyVersion, minimumVersion);
+
+            if (String.IsNullOrEmpty(minimumVersion))
+            {
+                Debug.Console(0,"Plugin does not specify a minimum version. Loading plugin may not work as expected. Proceeding with loading plugin");
+                return true;
+            }
+            
+            var runtimeVersion = Regex.Match(AssemblyVersion, @"^(\d*).(\d*).(\d*).*");
+
+            var runtimeVersionMajor = Int16.Parse(runtimeVersion.Groups[1].Value);
+            var runtimeVersionMinor = Int16.Parse(runtimeVersion.Groups[2].Value);
+            var runtimeVersionBuild = Int16.Parse(runtimeVersion.Groups[3].Value);
+
+            var runtimeVer = new Version(runtimeVersionMajor, runtimeVersionMinor, runtimeVersionBuild);
+
+            Version minimumVer;
+            try
+            {
+                minimumVer = new Version(minimumVersion);
+            }
+            catch
+            {
+                Debug.Console(2, "unable to parse minimum version {0}. Bypassing plugin load.", minimumVersion);
+                return false;
+            }
+
+
+            // Check for beta build version
+            if (runtimeVer.Major != 0)
+            {
+                return runtimeVer.CompareTo(minimumVer) >= 0;
+            }
+
+            Debug.Console(2, "Running Local Build.  Bypassing Dependency Check.");
+            return true;
+
+            /*
+            var minVersion = Regex.Match(minimumVersion, @"^(\d*).(\d*).(\d*)$");
+
+            if(!minVersion.Success)
+            {
+                
+            }
+
+            var minVersionMajor = Int16.Parse(minVersion.Groups[1].Value);
+            var minVersionMinor = Int16.Parse(minVersion.Groups[2].Value);
+            var minVersionBuild = Int16.Parse(minVersion.Groups[3].Value);
+
+
+
+            if (minVersionMajor > runtimeVersionMajor)
+                return false;
+
+            if (minVersionMinor > runtimeVersionMinor)
+                return false;
+
+            if (minVersionBuild > runtimeVersionBuild)
+                return false;
+
+            return true;
+             */
+        }
+
+
+
+		static Global()
+		{
+			// Fire up CrestronDataStoreStatic
+			var err = CrestronDataStoreStatic.InitCrestronDataStore();
+			if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
+			{
+				CrestronConsole.PrintLine("Error starting CrestronDataStoreStatic: {0}", err);
+				return;
+			}
+
+            GetEthernetInformation();
+
+		}
+
+        /// <summary>
+        /// Populates EthernetInformationCollection
+        /// </summary>
+        static void GetEthernetInformation()
+        {
+
+            EthernetAdapterInfoCollection = new Dictionary<short, EthernetAdapterInfo>();
+
+            EthernetAdapterType adapterType = EthernetAdapterType.EthernetUnknownAdapter;
+
+            List<EthernetAdapterType> adapters = new List<EthernetAdapterType>() 
+                { EthernetAdapterType.EthernetLANAdapter, EthernetAdapterType.EthernetLAN2Adapter, EthernetAdapterType.EthernetCSAdapter, EthernetAdapterType.EthernetWIFIAdapter };
+
+            foreach (var adapter in adapters)
+            {
+                try
+                {
+                    adapterType = EthernetAdapterType.EthernetLANAdapter;
+
+                    var adapterId = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(adapterType);
+
+                    var adapterInfo = GetEthernetAdapterProperties(adapterId, adapterType);
+
+                    EthernetAdapterInfoCollection.Add(adapterId, adapterInfo);
+                }
+                catch (Exception e)
+                {
+                    if (e is System.ArgumentException)
+                    {
+                        Debug.Console(1, "Error: {0} not present", adapterType);
+                    }
+                    else
+                    {
+                        Debug.Console(1, "Error: {0}", e);
+                    }
+                }
+            }
+
+        }
+
+
+        static EthernetAdapterInfo GetEthernetAdapterProperties(short adapterId, EthernetAdapterType adapterType)
+        {
+            EthernetAdapterInfo adapterInfo = new EthernetAdapterInfo();
+
+            adapterInfo.Type = adapterType;
+            adapterInfo.DhcpIsOn = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_DHCP_STATE, adapterId) == "on" ? true : false;
+            adapterInfo.Hostname = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, adapterId);
+            adapterInfo.MacAddress = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, adapterId);
+            adapterInfo.IpAddress = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, adapterId);
+            adapterInfo.Subnet = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, adapterId);
+            adapterInfo.Gateway = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, adapterId);
+            adapterInfo.Domain = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DOMAIN_NAME, adapterId);
+
+            string dns = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DNS_SERVER, adapterId);
+            if (dns.Contains(","))
+            {
+                string[] dnsList = dns.Split(',');
+                for (var i = 0; i < dnsList.Length; i++)
+                {
+                    if (i == 0)
+                        adapterInfo.Dns1 = !string.IsNullOrEmpty(dnsList[0]) ? dnsList[0] : "0.0.0.0";
+                    if (i == 1)
+                        adapterInfo.Dns2 = !string.IsNullOrEmpty(dnsList[1]) ? dnsList[1] : "0.0.0.0";
+                    if (i == 2)
+                        adapterInfo.Dns3 = !string.IsNullOrEmpty(dnsList[2]) ? dnsList[2] : "0.0.0.0";
+                }
+            }
+            else
+            {
+                adapterInfo.Dns1 = !string.IsNullOrEmpty(dns) ? dns : "0.0.0.0";
+                adapterInfo.Dns2 = "0.0.0.0";
+                adapterInfo.Dns3 = "0.0.0.0";
+            }
+
+            return adapterInfo;
+        }
+	}
 }
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index ae420105..c79b198f 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -223,6 +223,7 @@
     <Compile Include="Fusion\FusionRviDataClasses.cs" />
     <Compile Include="Gateways\CenRfgwController.cs" />
     <Compile Include="Gateways\EssentialsRfGatewayConfig.cs" />
+    <Compile Include="Global\EthernetAdapterInfo.cs" />
     <Compile Include="Queues\ComsMessage.cs" />
     <Compile Include="Queues\ProcessStringMessage.cs" />
     <Compile Include="Queues\GenericQueue.cs" />

From e365944dc38ab7d6fb84e6a7c2c7cc54fe4a0669 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 30 Sep 2020 13:55:40 -0600
Subject: [PATCH 52/89] add config object to stop downloading large phonebooks

---
 .../VideoCodec/ZoomRoom/ZoomRoom.cs                | 14 ++++++++++----
 .../ZoomRoom/ZoomRoomPropertiesConfig.cs           |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index ae372b72..a142534e 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -39,10 +39,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         private int _previousVolumeLevel;
         private CameraBase _selectedCamera;
 
+        private readonly ZoomRoomPropertiesConfig _props;
+
         public ZoomRoom(DeviceConfig config, IBasicCommunication comm)
             : base(config)
         {
-            var props = JsonConvert.DeserializeObject<ZoomRoomPropertiesConfig>(config.Properties.ToString());
+            _props = JsonConvert.DeserializeObject<ZoomRoomPropertiesConfig>(config.Properties.ToString());
 
             // The queue that will collect the repsonses in the order they are received
             _receiveQueue = new CrestronQueue<string>(1024);
@@ -52,10 +54,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
             Communication = comm;
 
-            if (props.CommunicationMonitorProperties != null)
+            if (_props.CommunicationMonitorProperties != null)
             {
                 CommunicationMonitor = new GenericCommunicationMonitor(this, Communication,
-                    props.CommunicationMonitorProperties);
+                    _props.CommunicationMonitorProperties);
             }
             else
             {
@@ -625,7 +627,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
             // zCommand
 
-            _syncState.AddQueryToQueue("zCommand Phonebook List Offset: 0 Limit: 512");
+            if (!_props.DisablePhonebookAutoDownload)
+            {
+                _syncState.AddQueryToQueue("zCommand Phonebook List Offset: 0 Limit: 512");
+            }
+
             _syncState.AddQueryToQueue("zCommand Bookings List");
 
 
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs
index d60b63c2..f9249c5a 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs	
@@ -12,5 +12,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
     public class ZoomRoomPropertiesConfig
     {
         public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
+
+        public bool DisablePhonebookAutoDownload { get; set; }
     }
 }
\ No newline at end of file

From e784c08f8084d87165417163778f3b8b4634b47b Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 30 Sep 2020 15:47:32 -0600
Subject: [PATCH 53/89] Add camera off and auto stuff to Zoom Room

---
 .../VideoCodec/VideoCodecBase.cs              | 27 ++++++--
 .../VideoCodec/ZoomRoom/ResponseObjects.cs    | 22 ++++++-
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           | 61 ++++++++++++++++---
 .../ZoomRoom/ZoomRoomPropertiesConfig.cs      |  2 +
 4 files changed, 98 insertions(+), 14 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index d78b43b5..b4022232 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -60,8 +60,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         public List<CodecActiveCallItem> ActiveCalls { get; set; }
 
-        public bool ShowSelfViewByDefault { get; protected set; }
-
+        public bool ShowSelfViewByDefault { get; protected set; }
+
+        protected bool SupportsCameraOff;
+        protected bool SupportsCameraAutoMode;
 
         public bool IsReady { get; protected set; }
 
@@ -305,8 +307,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             if (codec is IHasCameraAutoMode)
             {
-                trilist.SetBool(joinMap.CameraSupportsAutoMode.JoinNumber, true);
+                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 IHasCodecLayouts)
@@ -364,8 +372,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
                 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 LinkVideoCodecVolumeToApi(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
         {
             MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMuteOn.JoinNumber]);
@@ -767,6 +782,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 trilist.BooleanInput[joinMap.CameraModeManual.JoinNumber]);
         }
 
+
+
         private void LinkVideoCodecSelfviewToApi(IHasCodecSelfView codec, BasicTriList trilist,
             VideoCodecControllerJoinMap joinMap)
         {
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs
index 2c33317e..0bb0b524 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
@@ -86,6 +86,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public zConfiguration.Audio Audio { get; set; }
         public zConfiguration.Video Video { get; set; }
         public zConfiguration.Client Client { get; set; }
+        public zConfiguration.Camera Camera { get; set; }
 
         public ZoomRoomConfiguration()
         {
@@ -93,6 +94,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             Audio = new zConfiguration.Audio();
             Video = new zConfiguration.Video();
             Client = new zConfiguration.Client();
+            Camera = new zConfiguration.Camera();
         }
     }
 
@@ -698,9 +700,25 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             public bool OptimizeVideoSharing { get; set; }
         }
 
-        public class Camera
+        public class Camera : NotifiableObject
         {
-            public bool Mute { get; set; }
+            private bool _mute;
+
+            public bool Mute
+            {
+                get
+                {
+                    return _mute;
+                }
+                set
+                {
+                    if (value != _mute)
+                    {
+                        _mute = value;
+                        NotifyPropertyChanged("Mute");
+                    }
+                }
+            }
         }
 
         public class Microphone : NotifiableObject
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index a142534e..f4d6a7c3 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
     public class ZoomRoom : VideoCodecBase, IHasCodecSelfView, IHasDirectoryHistoryStack, ICommunicationMonitor,
         IRouting,
-        IHasScheduleAwareness, IHasCodecCameras, IHasParticipants
+        IHasScheduleAwareness, IHasCodecCameras, IHasParticipants, IHasCameraOff, IHasCameraAutoMode
     {
         private const long MeetingRefreshTimer = 60000;
         private const uint DefaultMeetingDurationMin = 30;
@@ -92,6 +92,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
             SelfviewIsOnFeedback = new BoolFeedback(SelfViewIsOnFeedbackFunc);
 
+            CameraIsOffFeedback = new BoolFeedback(CameraIsOffFeedbackFunc);
+
             CodecSchedule = new CodecScheduleAwareness(MeetingRefreshTimer);
 
             SetUpFeedbackActions();
@@ -101,6 +103,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             SetUpDirectory();
 
             Participants = new CodecParticipants();
+
+            SupportsCameraOff = _props.SupportsCameraOff;
+            SupportsCameraAutoMode = _props.SupportsCameraAutoMode;
         }
 
         public CommunicationGather PortGather { get; private set; }
@@ -174,6 +179,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             get { return () => !Configuration.Video.HideConfSelfVideo; }
         }
 
+        protected Func<bool> CameraIsOffFeedbackFunc
+        {
+            get { return () => !Configuration.Camera.Mute; }
+        }
+
+
         protected Func<string> SelfviewPipPositionFeedbackFunc
         {
             get { return () => ""; }
@@ -415,6 +426,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 }
             };
 
+            Configuration.Camera.PropertyChanged += (o, a) =>
+            {
+                if (a.PropertyName != "Mute") return;
+
+                CameraIsOffFeedback.FireUpdate();
+            };
+
             Status.Call.Sharing.PropertyChanged += (o, a) =>
             {
                 if (a.PropertyName == "State")
@@ -961,13 +979,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                                 break;
                             }
-                            case "bookings":
+                            case "bookings updated":
                             {
-                                // Bookings have been updated, trigger a query to retreive the new bookings
-                                if (responseObj["Updated"] != null)
-                                {
-                                    GetBookings();
-                                }
+                                GetBookings();
 
                                 break;
                             }
@@ -1560,6 +1574,39 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public CodecParticipants Participants { get; private set; }
 
         #endregion
+
+        #region Implementation of IHasCameraOff
+
+        public BoolFeedback CameraIsOffFeedback { get; private set; }
+
+        public void CameraOff()
+        {
+            SendText("zCommand Call Camera Mute: On");
+        }
+
+        #endregion
+
+        #region Implementation of IHasCameraAutoMode
+        //Zoom doesn't support camera auto modes. Setting this to just unmute video
+        public void CameraAutoModeOn()
+        {
+            throw new NotImplementedException("Zoom Room Doesn't support camera auto mode");
+        }
+
+        //Zoom doesn't support camera auto modes. Setting this to just unmute video
+        public void CameraAutoModeOff()
+        {
+            SendText("zCommand Call Camera Mute: Off");
+        }
+
+        public void CameraAutoModeToggle()
+        {
+            throw new NotImplementedException("Zoom Room doesn't support camera auto mode");
+        }
+
+        public BoolFeedback CameraAutoModeIsOnFeedback { get; private set; }
+
+        #endregion
     }
 
     /// <summary>
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs
index f9249c5a..4e2545ec 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs	
@@ -14,5 +14,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
 
         public bool DisablePhonebookAutoDownload { get; set; }
+        public bool SupportsCameraAutoMode { get; set; }
+        public bool SupportsCameraOff { get; set; }
     }
 }
\ No newline at end of file

From b500b9f6cc8fe41bba59e86f03fde2a147ca1404 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 30 Sep 2020 16:26:48 -0600
Subject: [PATCH 54/89] Add feedbacks for Camera Auto Mode

---
 .../VideoCodec/ZoomRoom/ZoomRoom.cs                       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index f4d6a7c3..24554a23 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -94,6 +94,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
             CameraIsOffFeedback = new BoolFeedback(CameraIsOffFeedbackFunc);
 
+            CameraAutoModeIsOnFeedback = new BoolFeedback(CameraAutoModeIsOnFeedbackFunc);
+
             CodecSchedule = new CodecScheduleAwareness(MeetingRefreshTimer);
 
             SetUpFeedbackActions();
@@ -181,9 +183,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         protected Func<bool> CameraIsOffFeedbackFunc
         {
-            get { return () => !Configuration.Camera.Mute; }
+            get { return () => Configuration.Camera.Mute; }
         }
 
+        protected Func<bool> CameraAutoModeIsOnFeedbackFunc
+        {
+            get { return () => !Configuration.Camera.Mute; }
+        } 
 
         protected Func<string> SelfviewPipPositionFeedbackFunc
         {

From c7ccac2fe6e96b0341954c71999554472d79199a Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 30 Sep 2020 16:40:58 -0600
Subject: [PATCH 55/89] fix merge issue

---
 .../Essentials Core/PepperDashEssentialsBase/Global/Global.cs   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs
index f0a71436..4a846df7 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs	
@@ -22,6 +22,8 @@ namespace PepperDash.Essentials.Core
 
         public static eDevicePlatform Platform { get { return CrestronEnvironment.DevicePlatform; } }
 
+        public static Dictionary<short, EthernetAdapterInfo> EthernetAdapterInfoCollection { get; private set; }
+
 		public static LicenseManager LicenseManager { get; set; }
 
         /// <summary>

From 95016c3ec682a0cbb44b93b3c12a2ac5962c8af7 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 1 Oct 2020 10:07:08 -0600
Subject: [PATCH 56/89] fix camera mute command

---
 .../PepperDashEssentialsBase/Bridges/BridgeBase.cs            | 2 +-
 .../Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs
index 13d1948a..b85e6948 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs	
@@ -316,7 +316,7 @@ namespace PepperDash.Essentials.Core.Bridges
         {
             Debug.Console(1, "Factory Attempting to create new EiscApiAdvanced Device");
 
-            var controlProperties = dc.Properties["control"].ToObject<ControlPropertiesConfig>();
+            var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
 
             switch (dc.Type)
             {
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 24554a23..b192b4af 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -1587,7 +1587,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public void CameraOff()
         {
-            SendText("zCommand Call Camera Mute: On");
+            SendText("zConfiguration Call Camera Mute: On");
         }
 
         #endregion
@@ -1602,7 +1602,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         //Zoom doesn't support camera auto modes. Setting this to just unmute video
         public void CameraAutoModeOff()
         {
-            SendText("zCommand Call Camera Mute: Off");
+            SendText("zConfiguration Call Camera Mute: Off");
         }
 
         public void CameraAutoModeToggle()

From d50ad7345dd6f946e121698aac23b7685f15c6eb Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 1 Oct 2020 10:37:31 -0600
Subject: [PATCH 57/89] fix ZoomRoomCamera Timer

---
 .../VideoCodec/ZoomRoom/ZoomRoomCamera.cs                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs
index 4fa377ae..464c8b9a 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs	
@@ -79,8 +79,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         void StartContinueTimer()
         {
-            if(ContinueTimer == null)
-                ContinueTimer = new CTimer((o) => SendContinueAction(LastAction), ContinueTime);
+            if (ContinueTimer == null)
+                ContinueTimer = new CTimer((o) => SendContinueAction(LastAction), null, ContinueTime, ContinueTime);
         }
 
         void SendContinueAction(eZoomRoomCameraAction action)

From c0e3da92141676b19223be27455133396cb201cd Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 1 Oct 2020 12:15:54 -0600
Subject: [PATCH 58/89] fix for EiscApiAdvanced loading

---
 .../PepperDashEssentialsBase/Bridges/BridgeBase.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs
index b85e6948..151b5461 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs	
@@ -318,7 +318,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
             var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
 
-            switch (dc.Type)
+            switch (dc.Type.ToLower())
             {
                 case "eiscapiadv":
                 case "eiscapiadvanced":

From 34440af1c50a1f0e043e2097c470a9712af058b1 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 1 Oct 2020 13:25:33 -0600
Subject: [PATCH 59/89] fix for updating call status when in meeting & call is
 already connected

---
 .../VideoCodec/ZoomRoom/ZoomRoom.cs              | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index b192b4af..764898ca 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -1260,9 +1260,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                 if (ActiveCalls.Count == 0)
                 {
-                    if (callStatus == zStatus.eCallStatus.CONNECTING_MEETING)
+                    if (callStatus == zStatus.eCallStatus.CONNECTING_MEETING || callStatus == zStatus.eCallStatus.IN_MEETING )
                     {
-                        var newCall = new CodecActiveCallItem {Status = eCodecCallStatus.Connecting};
+                        var newStatus = eCodecCallStatus.Unknown;
+
+                        switch (callStatus)
+                        {
+                            case zStatus.eCallStatus.CONNECTING_MEETING:
+                                newStatus = eCodecCallStatus.Connecting;
+                                break;
+                            case zStatus.eCallStatus.IN_MEETING:
+                                newStatus = eCodecCallStatus.Connected;
+                                break;
+                        }
+
+                        var newCall = new CodecActiveCallItem {Status = newStatus};
 
                         ActiveCalls.Add(newCall);
 

From 27382a6be11d1473454e78d0259b10bcf4973cd5 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 1 Oct 2020 14:40:13 -0600
Subject: [PATCH 60/89] various fixes

---
 .../VideoCodec/VideoCodecBase.cs              |  8 +++++--
 .../VideoCodec/ZoomRoom/ResponseObjects.cs    | 23 +++++++++++++++----
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           |  6 +++++
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index b4022232..6874e049 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -368,7 +368,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                     (codec as IHasCodecSelfView).SelfviewIsOnFeedback.InvokeFireUpdate();
                 }
 
-                SharingContentIsOnFeedback.InvokeFireUpdate();
+                SharingContentIsOnFeedback.InvokeFireUpdate();
+
+                trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
 
                 UpdateCallStatusXSig();
             };
@@ -698,7 +700,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 () => Dial(trilist.StringOutput[joinMap.CurrentDialString.JoinNumber].StringValue));
 
             //End All calls for now
-            trilist.SetSigFalseAction(joinMap.EndCall.JoinNumber, EndAllCalls);
+            trilist.SetSigFalseAction(joinMap.EndCall.JoinNumber, EndAllCalls);
+
+            trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
 
             CallStatusChange += (sender, args) =>
             {
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs
index 0bb0b524..f49f6281 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
@@ -702,20 +702,35 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public class Camera : NotifiableObject
         {
+            private string _muteState;
             private bool _mute;
 
             public bool Mute
+            {
+                get { return _mute; }
+                set
+                {
+                    if (value == _mute) return;
+
+                    _mute = value;
+                    NotifyPropertyChanged("Mute");
+                }
+            }
+
+            [JsonProperty("mute")]
+            public string MuteState
             {
                 get
                 {
-                    return _mute;
+                    return _muteState;
                 }
                 set
                 {
-                    if (value != _mute)
+                    if (value != _muteState)
                     {
-                        _mute = value;
-                        NotifyPropertyChanged("Mute");
+                        _muteState = value;
+
+                        Mute = _muteState == "on";
                     }
                 }
             }
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 764898ca..657a27c8 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -657,6 +657,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             }
 
             _syncState.AddQueryToQueue("zCommand Bookings List");
+            _syncState.AddQueryToQueue("zCommand Call ListParticipants");
 
 
             _syncState.StartSync();
@@ -757,6 +758,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 ");
+                            }
                             // switch to json format
                             SendText("format json");
                         });

From decdaf9f1f5e88b79b3cdd535376edd90dd2078b Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Fri, 2 Oct 2020 16:58:18 -0600
Subject: [PATCH 61/89] lots of updates

---
 .../JoinMaps/VideoCodecControllerJoinMap.cs   | 366 ++++++++++--------
 .../IHasFarEndContentStatus.cs                |   7 +
 .../PepperDash_Essentials_Core.csproj         |   1 +
 .../Essentials Devices Common.csproj          |   1 +
 .../Interfaces/IHasSelfviewPosition.cs        |  14 +
 .../VideoCodec/VideoCodecBase.cs              | 198 ++++++++--
 .../VideoCodec/ZoomRoom/ResponseObjects.cs    |  50 +--
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           | 133 ++++++-
 .../VideoCodec/ZoomRoom/ZoomRoomCamera.cs     |  31 +-
 .../ZoomRoom/ZoomRoomPropertiesConfig.cs      |   9 +
 packages.config                               |   2 +-
 11 files changed, 568 insertions(+), 244 deletions(-)
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasFarEndContentStatus.cs
 create mode 100644 essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index e28edecf..7e71ec22 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials 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,12 +207,30 @@ 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("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
                 });
 
@@ -252,6 +288,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 +540,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 +559,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 +577,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 +586,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 = 162, 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,35 +740,6 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                     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("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
-                });
-
         public VideoCodecControllerJoinMap(uint joinStart) : base(joinStart, typeof (VideoCodecControllerJoinMap))
         {
         }
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasFarEndContentStatus.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasFarEndContentStatus.cs
new file mode 100644
index 00000000..21bde91f
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasFarEndContentStatus.cs	
@@ -0,0 +1,7 @@
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface IHasFarEndContentStatus
+    {
+         BoolFeedback ReceivingContent { get; }
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index 3bd74bdc..7524c8d7 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -196,6 +196,7 @@
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
+    <Compile Include="DeviceTypeInterfaces\IHasFarEndContentStatus.cs" />
     <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Factory\IDeviceFactory.cs" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
index 94988b7b..f115f401 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
@@ -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" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs
new file mode 100644
index 00000000..5360b80a
--- /dev/null
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices 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();
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 6874e049..1e9e96cd 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -12,7 +12,8 @@ using PepperDash.Core.WebApi.Presets;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Devices;
+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;
@@ -198,7 +199,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)
@@ -320,6 +321,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             if (codec is IHasCodecLayouts)
             {
                 LinkVideoCodecCameraLayoutsToApi(codec as IHasCodecLayouts, trilist, joinMap);
+            }
+
+            if (codec is IHasSelfviewPosition)
+            {
+                LinkVideoCodecSelfviewPositionToApi(codec as IHasSelfviewPosition, trilist, joinMap);
             }
 
             if (codec is IHasDirectory)
@@ -335,6 +341,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             if (codec is IHasParticipants)
             {
                 LinkVideoCodecParticipantsToApi(codec as IHasParticipants, trilist, joinMap);
+            }
+
+            if (codec is IHasFarEndContentStatus)
+            {
+                (codec as IHasFarEndContentStatus).ReceivingContent.LinkInputSig(trilist.BooleanInput[joinMap.RecievingContent.JoinNumber]);
             }
 
             trilist.OnlineStatusChange += (device, args) =>
@@ -360,15 +371,25 @@ 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();
+                }
+
+                if (codec is IHasCameraAutoMode)
+                {
+                    (codec as IHasCameraAutoMode).CameraAutoModeIsOnFeedback.FireUpdate();
+                }
+
+                if (codec is IHasCameraOff)
+                {
+                    (codec as IHasCameraOff).CameraIsOffFeedback.FireUpdate();
                 }
 
-                SharingContentIsOnFeedback.InvokeFireUpdate();
+                SharingContentIsOnFeedback.FireUpdate();
 
                 trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
 
@@ -376,11 +397,53 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             };
         }
 
+        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)
         {
-            codec.CameraIsOffFeedback.LinkInputSig(trilist.BooleanInput[joinMap.CameraModeOff.JoinNumber]);
-
             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)
@@ -779,15 +842,56 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         private void LinkVideoCodecCameraModeToApi(IHasCameraAutoMode codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
         {
             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]);
+            trilist.SetSigFalseAction(joinMap.CameraModeManual.JoinNumber, codec.CameraAutoModeOff);
+
+            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)
         {
@@ -875,9 +979,7 @@ 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)
+                if (codec is IHasCodecRoomPresets)
                 {
                     return;
                 }
@@ -890,25 +992,59 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 var cam = args.SelectedCamera as IHasCameraPresets;
                 SetCameraPresetNames(cam.Presets);
 
-                (args.SelectedCamera as IHasCameraPresets).PresetsListHasChanged += (o, eventArgs) => 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);
+            trilist.SetUShortSigAction(joinMap.CameraPresetSelect.JoinNumber, (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(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(List<CameraPreset> presets)
+        private string SetCameraPresetNames(ICollection<string> presets)
         {
             var i = 1; //start index for xsig;
 
@@ -916,7 +1052,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++;
             }
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs
index f49f6281..5f316523 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
@@ -370,7 +370,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()
             {
@@ -702,7 +715,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public class Camera : NotifiableObject
         {
-            private string _muteState;
             private bool _mute;
 
             public bool Mute
@@ -710,30 +722,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 get { return _mute; }
                 set
                 {
+                    Debug.Console(1, "Camera Mute response received: {0}", value);
+                    
                     if (value == _mute) return;
-
+                    
                     _mute = value;
                     NotifyPropertyChanged("Mute");
                 }
             }
-
-            [JsonProperty("mute")]
-            public string MuteState
-            {
-                get
-                {
-                    return _muteState;
-                }
-                set
-                {
-                    if (value != _muteState)
-                    {
-                        _muteState = value;
-
-                        Mute = _muteState == "on";
-                    }
-                }
-            }
         }
 
         public class Microphone : NotifiableObject
@@ -787,12 +783,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
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 657a27c8..1b7e6ec4 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -11,16 +11,18 @@ 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;
 
 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
     {
         private const long MeetingRefreshTimer = 60000;
         private const uint DefaultMeetingDurationMin = 30;
@@ -98,6 +100,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>();
@@ -152,7 +158,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 +189,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
@@ -432,11 +438,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 +462,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();
                 }
             };
 
@@ -658,6 +686,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
             _syncState.AddQueryToQueue("zCommand Bookings List");
             _syncState.AddQueryToQueue("zCommand Call ListParticipants");
+            _syncState.AddQueryToQueue("zCommand Call Info");
 
 
             _syncState.StartSync();
@@ -670,6 +699,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++;
@@ -759,9 +796,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                             SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callout_country_list");
                             Thread.Sleep(100);
 
-                            if (!_props.DisablePhonebookAutoDownload)
+                            if (_props.DisablePhonebookAutoDownload)
                             {
-                                SendText("zFeedback Register ");
+                                SendText("zFeedback Register Op: ex Path: /Event/Phonebook/AddedContact");
                             }
                             // switch to json format
                             SendText("format json");
@@ -841,6 +878,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);
@@ -1160,6 +1202,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                             {
                                 JsonConvert.PopulateObject(responseObj.ToString(), Status.Sharing);
 
+                                SetLayout();
+
                                 break;
                             }
                             case "numberofscreens":
@@ -1224,6 +1268,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)
@@ -1329,6 +1391,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             Debug.Console(1, this, "**************************************************************************");
         }
 
+        protected override void OnCallStatusChange(CodecActiveCallItem item)
+        {
+            base.OnCallStatusChange(item);
+
+            if (_props.AutoDefaultLayouts)
+            {
+                SetLayout();
+            }
+        }
         public override void StartSharing()
         {
             throw new NotImplementedException();
@@ -1631,6 +1702,52 @@ 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("DownLeft", "Lower Left"),
+            new CodecCommandWithLabel("DownRight", "Lower Right")
+        };
+
+        void ComputeSelfviewPipStatus()
+        {
+            _currentSelfviewPipPosition =
+                SelfviewPipPositions.FirstOrDefault(
+                    p => p.Command.ToLower().Equals(Configuration.Call.Layout.Position.ToString()));
+        }
+        #endregion
     }
 
     /// <summary>
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs
index 464c8b9a..7a3abdaa 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices 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()
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs
index 4e2545ec..38238023 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices 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; }
     }
 }
\ No newline at end of file
diff --git a/packages.config b/packages.config
index 40078601..296413b6 100644
--- 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.42" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
 </packages>
\ No newline at end of file

From ad4a6e938344e36c5c1326ba5cfb52a63c4e5386 Mon Sep 17 00:00:00 2001
From: Alex Johnson <ajohnson@pepperdash.com>
Date: Tue, 6 Oct 2020 16:59:27 -0400
Subject: [PATCH 62/89] Fixes for UpdateCallStatusXSig() method

---
 .../VideoCodec/VideoCodecBase.cs              | 414 +++++++++---------
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           |   2 +-
 2 files changed, 216 insertions(+), 200 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 1e9e96cd..ef9c4e1f 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -12,8 +12,8 @@ using PepperDash.Core.WebApi.Presets;
 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.Devices;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
@@ -61,9 +61,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; }
@@ -310,22 +310,22 @@ 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)
             {
                 LinkVideoCodecCameraLayoutsToApi(codec as IHasCodecLayouts, trilist, joinMap);
-            }
-
-            if (codec is IHasSelfviewPosition)
-            {
-                LinkVideoCodecSelfviewPositionToApi(codec as IHasSelfviewPosition, trilist, joinMap);
+            }
+
+            if (codec is IHasSelfviewPosition)
+            {
+                LinkVideoCodecSelfviewPositionToApi(codec as IHasSelfviewPosition, trilist, joinMap);
             }
 
             if (codec is IHasDirectory)
@@ -341,11 +341,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             if (codec is IHasParticipants)
             {
                 LinkVideoCodecParticipantsToApi(codec as IHasParticipants, trilist, joinMap);
-            }
-
-            if (codec is IHasFarEndContentStatus)
-            {
-                (codec as IHasFarEndContentStatus).ReceivingContent.LinkInputSig(trilist.BooleanInput[joinMap.RecievingContent.JoinNumber]);
+            }
+
+            if (codec is IHasFarEndContentStatus)
+            {
+                (codec as IHasFarEndContentStatus).ReceivingContent.LinkInputSig(trilist.BooleanInput[joinMap.RecievingContent.JoinNumber]);
             }
 
             trilist.OnlineStatusChange += (device, args) =>
@@ -377,75 +377,75 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 if (codec is IHasCodecSelfView)
                 {
                     (codec as IHasCodecSelfView).SelfviewIsOnFeedback.FireUpdate();
-                }
-
-                if (codec is IHasCameraAutoMode)
-                {
-                    (codec as IHasCameraAutoMode).CameraAutoModeIsOnFeedback.FireUpdate();
-                }
-
-                if (codec is IHasCameraOff)
-                {
-                    (codec as IHasCameraOff).CameraIsOffFeedback.FireUpdate();
                 }
 
-                SharingContentIsOnFeedback.FireUpdate();
-
+                if (codec is IHasCameraAutoMode)
+                {
+                    (codec as IHasCameraAutoMode).CameraAutoModeIsOnFeedback.FireUpdate();
+                }
+
+                if (codec is IHasCameraOff)
+                {
+                    (codec as IHasCameraOff).CameraIsOffFeedback.FireUpdate();
+                }
+
+                SharingContentIsOnFeedback.FireUpdate();
+
                 trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
 
-                UpdateCallStatusXSig();
+                trilist.SetString(joinMap.CurrentCallData.JoinNumber, UpdateCallStatusXSig());
             };
-        }
-
-        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 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]);
@@ -665,11 +665,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);
@@ -763,8 +763,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 () => Dial(trilist.StringOutput[joinMap.CurrentDialString.JoinNumber].StringValue));
 
             //End All calls for now
-            trilist.SetSigFalseAction(joinMap.EndCall.JoinNumber, EndAllCalls);
-
+            trilist.SetSigFalseAction(joinMap.EndCall.JoinNumber, EndAllCalls);
+
             trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
 
             CallStatusChange += (sender, args) =>
@@ -779,9 +779,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());
             };
         }
 
@@ -790,26 +788,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++;
             }
 
@@ -842,54 +858,54 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         private void LinkVideoCodecCameraModeToApi(IHasCameraAutoMode codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
         {
             trilist.SetSigFalseAction(joinMap.CameraModeAuto.JoinNumber, codec.CameraAutoModeOn);
-            trilist.SetSigFalseAction(joinMap.CameraModeManual.JoinNumber, codec.CameraAutoModeOff);
-
-            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);
+            trilist.SetSigFalseAction(joinMap.CameraModeManual.JoinNumber, codec.CameraAutoModeOff);
+
+            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,
@@ -979,7 +995,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             {
                 var i = (ushort) codec.Cameras.FindIndex((c) => c.Key == args.SelectedCamera.Key);
 
-                if (codec is IHasCodecRoomPresets)
+                if (codec is IHasCodecRoomPresets)
                 {
                     return;
                 }
@@ -992,56 +1008,56 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 var cam = args.SelectedCamera as IHasCameraPresets;
                 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 +=
+                (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) =>
-            {
+            trilist.SetUShortSigAction(joinMap.CameraPresetSelect.JoinNumber, (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);
+            });
+
+            trilist.SetSigFalseAction(joinMap.CameraPresetSave.JoinNumber,
+                    () =>
+                    {
+                        presetCodec.CodecRoomPresetStore(
+                            trilist.UShortOutput[joinMap.CameraPresetSelect.JoinNumber].UShortValue, String.Empty);
+                        trilist.PulseBool(joinMap.CameraPresetSave.JoinNumber, 3000);
                     });
-        }
-
-        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(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)
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 1b7e6ec4..6cb62a34 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -1402,7 +1402,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         }
         public override void StartSharing()
         {
-            throw new NotImplementedException();
+            SendText("zCommand Call Sharing HDMI Start");
         }
 
         /// <summary>

From f4fb9cd17312c9f38731d81f743607d1bd3a7507 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 7 Oct 2020 12:45:05 -0600
Subject: [PATCH 63/89] add fix for sharing status not updating

add fix for clearing participants list on meeting end
---
 .../VideoCodec/VideoCodecBase.cs              | 23 +++++++++++----
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           | 29 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index ef9c4e1f..05e17895 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -484,6 +484,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);
@@ -492,10 +493,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);
@@ -518,7 +515,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);
@@ -534,6 +531,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);
         }
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 6cb62a34..e6cc3fc2 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -399,6 +399,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.
@@ -1324,6 +1344,8 @@ 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)
@@ -1387,8 +1409,13 @@ 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)

From c58a1874cac77faccc3d16c82f7f50eae21f87c2 Mon Sep 17 00:00:00 2001
From: Alex Johnson <ajohnson@pepperdash.com>
Date: Wed, 7 Oct 2020 15:41:04 -0400
Subject: [PATCH 64/89] Limits max video participant list size to 50

---
 .../Essentials Devices Common/VideoCodec/VideoCodecBase.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 05e17895..494eea04 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -503,7 +503,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;

From 5f1b92ca623a35e11c0c589e56c13b3ef1599c0c Mon Sep 17 00:00:00 2001
From: Alex Johnson <ajohnson@pepperdash.com>
Date: Thu, 8 Oct 2020 11:43:12 -0400
Subject: [PATCH 65/89] Adds additional check for if
 DisablePhonebookAutoDownload is true to CustomActivate method. Fixes issue
 where layout was not being set properly on sharing end.

---
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index e6cc3fc2..1849f0ea 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -552,9 +552,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);
 
@@ -816,7 +820,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                             SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callout_country_list");
                             Thread.Sleep(100);
 
-                            if (_props.DisablePhonebookAutoDownload)
+                            if (!_props.DisablePhonebookAutoDownload)
                             {
                                 SendText("zFeedback Register Op: ex Path: /Event/Phonebook/AddedContact");
                             }
@@ -1062,6 +1066,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                             case "sharingstate":
                             {
                                 JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.Sharing);
+                                
+                                SetLayout();
 
                                 break;
                             }
@@ -1222,8 +1228,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                             {
                                 JsonConvert.PopulateObject(responseObj.ToString(), Status.Sharing);
 
-                                SetLayout();
-
                                 break;
                             }
                             case "numberofscreens":
@@ -1758,6 +1762,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                 SelfviewPipPositionSet(SelfviewPipPositions[nextPipPositionIndex]);
             }
+            else
+            {
+                SelfviewPipPositionSet(SelfviewPipPositions[0]);
+            }
         }
 
         public List<CodecCommandWithLabel> SelfviewPipPositions = new List<CodecCommandWithLabel>()

From 28e8a1fb11c81440d328d60138b2bbcae4145213 Mon Sep 17 00:00:00 2001
From: Alex Johnson <ajohnson@pepperdash.com>
Date: Thu, 8 Oct 2020 14:40:44 -0400
Subject: [PATCH 66/89] Fixes for selfview feedback. Rearranges order to happen
 in clockwise motion

---
 .../VideoCodec/ZoomRoom/ZoomRoom.cs                    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 1849f0ea..578e3dae 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -1762,25 +1762,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                 SelfviewPipPositionSet(SelfviewPipPositions[nextPipPositionIndex]);
             }
-            else
-            {
-                SelfviewPipPositionSet(SelfviewPipPositions[0]);
-            }
         }
 
         public List<CodecCommandWithLabel> SelfviewPipPositions = new List<CodecCommandWithLabel>()
         {
             new CodecCommandWithLabel("UpLeft", "Center Left"),
             new CodecCommandWithLabel("UpRight", "Center Right"),
-            new CodecCommandWithLabel("DownLeft", "Lower Left"),
-            new CodecCommandWithLabel("DownRight", "Lower Right")
+            new CodecCommandWithLabel("DownRight", "Lower Right"),
+            new CodecCommandWithLabel("DownLeft", "Lower Left")
         };
 
         void ComputeSelfviewPipStatus()
         {
             _currentSelfviewPipPosition =
                 SelfviewPipPositions.FirstOrDefault(
-                    p => p.Command.ToLower().Equals(Configuration.Call.Layout.Position.ToString()));
+                    p => p.Command.ToLower().Equals(Configuration.Call.Layout.Position.ToString().ToLower()));
         }
         #endregion
     }

From cdc9cdbe95b58379a1008aa3e8d4626e93b96bdf Mon Sep 17 00:00:00 2001
From: Alex Johnson <ajohnson@pepperdash.com>
Date: Thu, 8 Oct 2020 15:25:51 -0400
Subject: [PATCH 67/89] Adds joining meetings 2 and 3 if meetings exist

---
 .../JoinMaps/VideoCodecControllerJoinMap.cs   | 26 ++++++++++++++++---
 .../VideoCodec/VideoCodecBase.cs              | 16 +++++++++---
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index 7e71ec22..50813700 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -225,15 +225,35 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                     JoinType = eJoinType.Serial
                 });
 
-        [JoinName("DialMeeting")] public JoinDataComplete DialMeeting =
+        [JoinName("DialMeeting1")] public JoinDataComplete DialMeeting1 =
             new JoinDataComplete(new JoinData {JoinNumber = 161, JoinSpan = 1},
                 new JoinMetadata
                 {
-                    Description = "Join first joinable meeting",
+                    Description = "Join first meeting",
                     JoinCapabilities = eJoinCapabilities.FromSIMPL,
                     JoinType = eJoinType.Digital
                 });
 
+        [JoinName("DialMeeting2")]
+        public JoinDataComplete DialMeeting2 =
+            new JoinDataComplete(new JoinData { JoinNumber = 162, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Join second meeting",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("DialMeeting3")]
+        public JoinDataComplete DialMeeting3 =
+            new JoinDataComplete(new JoinData { JoinNumber = 163, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Join third meeting",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
         [JoinName("DirectoryDialSelectedLine")] public JoinDataComplete DirectoryDialSelectedLine =
             new JoinDataComplete(new JoinData {JoinNumber = 106, JoinSpan = 1},
                 new JoinMetadata
@@ -678,7 +698,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 });
 
         [JoinName("UpdateMeetings")] public JoinDataComplete UpdateMeetings =
-            new JoinDataComplete(new JoinData {JoinNumber = 162, JoinSpan = 1},
+            new JoinDataComplete(new JoinData {JoinNumber = 160, JoinSpan = 1},
                 new JoinMetadata
                 {
                     Description = "Update Meetings",
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 494eea04..b0f6395d 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -595,12 +595,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);

From 1676f5a9560335e0543c1cb8716a46b779bb6e4b Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 8 Oct 2020 17:09:59 -0600
Subject: [PATCH 68/89] add phone call logic and commands to Zoom Room

---
 .../JoinMaps/VideoCodecControllerJoinMap.cs   | 40 +++++++++
 .../DeviceTypeInterfaces/IHasPhoneDialing.cs  | 14 +++
 .../PepperDash_Essentials_Core.csproj         |  1 +
 .../VideoCodec/VideoCodecBase.cs              | 21 +++++
 .../VideoCodec/ZoomRoom/ResponseObjects.cs    | 80 +++++++++++++++++
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           | 87 ++++++++++++++++---
 6 files changed, 232 insertions(+), 11 deletions(-)
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasPhoneDialing.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index 50813700..8054a077 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -760,6 +760,46 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                     JoinType = eJoinType.Digital
                 });
 
+        [JoinName("DialPhoneCall")]
+        public JoinDataComplete DialPhone =
+            new JoinDataComplete(new JoinData { JoinNumber = 72, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Dial Phone",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("PhoneHookState")]
+        public JoinDataComplete PhoneHookState =
+            new JoinDataComplete(new JoinData { JoinNumber = 72, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Dial Phone",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [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))
         {
         }
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasPhoneDialing.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasPhoneDialing.cs
new file mode 100644
index 00000000..2b7af8ad
--- /dev/null
+++ b/essentials-framework/Essentials 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);
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index 7524c8d7..9cc4365f 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -197,6 +197,7 @@
     <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" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index b0f6395d..8b7b3bce 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -19,6 +19,7 @@ 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
@@ -348,6 +349,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 (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;
@@ -389,6 +395,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                     (codec as IHasCameraOff).CameraIsOffFeedback.FireUpdate();
                 }
 
+                if (codec is IHasPhoneDialing)
+                {
+                    (codec as IHasPhoneDialing).PhoneOffHookFeedback.FireUpdate();
+                }
+
                 SharingContentIsOnFeedback.FireUpdate();
 
                 trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
@@ -397,6 +408,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             };
         }
 
+        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);
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs
index 5f316523..45c4193c 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices 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();
         }
     }
 
@@ -700,6 +702,84 @@ 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;
+                } 
+            }
+
+            public bool OffHook
+            {
+                get { return _offHook; }
+                set
+                {
+                    if (value == _offHook) return;
+
+                    _offHook = value;
+                    NotifyPropertyChanged("OffHook");
+                }
+            }
+        }
+
+        public enum ePhoneCallStatus
+        {
+            PhoneCallStatus_Terminated,
+            PhoneCallStatus_Accepted,
+            PhoneCallStatus_InCall,
+            PhoneCallStatus_Init,
+        }
     }
     
     /// <summary>
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 578e3dae..b8d29077 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -17,12 +17,14 @@ 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, IHasFarEndContentStatus, IHasSelfviewPosition
+        IHasScheduleAwareness, IHasCodecCameras, IHasParticipants, IHasCameraOff, IHasCameraAutoMode,
+        IHasFarEndContentStatus, IHasSelfviewPosition, IHasPhoneDialing
     {
         private const long MeetingRefreshTimer = 60000;
         private const uint DefaultMeetingDurationMin = 30;
@@ -114,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; }
@@ -195,7 +201,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         protected Func<bool> CameraAutoModeIsOnFeedbackFunc
         {
             get { return () => false; }
-        } 
+        }
 
         protected Func<string> SelfviewPipPositionFeedbackFunc
         {
@@ -506,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()
@@ -555,8 +583,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             if (!_props.DisablePhonebookAutoDownload)
             {
                 CrestronConsole.AddNewConsoleCommand(s => SendText("zCommand Phonebook List Offset: 0 Limit: 512"),
-                     "GetZoomRoomContacts", "Triggers a refresh of the codec phonebook",
-                     ConsoleAccessLevelEnum.AccessOperator);
+                    "GetZoomRoomContacts", "Triggers a refresh of the codec phonebook",
+                    ConsoleAccessLevelEnum.AccessOperator);
             }
 
             CrestronConsole.AddNewConsoleCommand(s => GetBookings(), "GetZoomRoomBookings",
@@ -1066,7 +1094,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                             case "sharingstate":
                             {
                                 JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.Sharing);
-                                
+
                                 SetLayout();
 
                                 break;
@@ -1181,6 +1209,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                                 break;
                             }
+                            case "phonecallstatus":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.PhoneCall);
+                                break;
+                            }
                             default:
                             {
                                 break;
@@ -1294,8 +1327,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         private void SetLayout()
         {
-            if(!_props.AutoDefaultLayouts) return;
-            
+            if (!_props.AutoDefaultLayouts) return;
+
             if (
                 (Status.Call.Sharing.State == zEvent.eSharingState.Receiving ||
                  Status.Call.Sharing.State == zEvent.eSharingState.Sending))
@@ -1354,7 +1387,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                 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;
 
@@ -1431,6 +1465,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 SetLayout();
             }
         }
+
         public override void StartSharing()
         {
             SendText("zCommand Call Sharing HDMI Start");
@@ -1633,7 +1668,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public override void SendDtmf(string s)
         {
-            throw new NotImplementedException();
+            SendDtmfToPhone(s);
         }
 
         /// <summary>
@@ -1713,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()
         {
@@ -1757,7 +1793,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             {
                 var nextPipPositionIndex = SelfviewPipPositions.IndexOf(_currentSelfviewPipPosition) + 1;
 
-                if (nextPipPositionIndex >= SelfviewPipPositions.Count) // Check if we need to loop back to the first item in the list
+                if (nextPipPositionIndex >= SelfviewPipPositions.Count)
+                    // Check if we need to loop back to the first item in the list
                     nextPipPositionIndex = 0;
 
                 SelfviewPipPositionSet(SelfviewPipPositions[nextPipPositionIndex]);
@@ -1772,12 +1809,40 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             new CodecCommandWithLabel("DownLeft", "Lower Left")
         };
 
-        void ComputeSelfviewPipStatus()
+        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
     }
 

From 1ea80c3fabefda3446124fb848e505397905052f Mon Sep 17 00:00:00 2001
From: Alex Johnson <ajohnson@pepperdash.com>
Date: Mon, 12 Oct 2020 12:58:22 -0400
Subject: [PATCH 69/89] Adds phone call ringing status to zoom phone status
 enum

---
 .../VideoCodec/ZoomRoom/ResponseObjects.cs                    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs
index 45c4193c..4f4eddbc 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
@@ -756,7 +756,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                     _status = value;
                     OffHook = _status == ePhoneCallStatus.PhoneCallStatus_Accepted ||
                               _status == ePhoneCallStatus.PhoneCallStatus_InCall ||
-                              _status == ePhoneCallStatus.PhoneCallStatus_Init;
+                              _status == ePhoneCallStatus.PhoneCallStatus_Init ||
+                              _status == ePhoneCallStatus.PhoneCallStatus_Ringing;
                 } 
             }
 
@@ -775,6 +776,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public enum ePhoneCallStatus
         {
+            PhoneCallStatus_Ringing,
             PhoneCallStatus_Terminated,
             PhoneCallStatus_Accepted,
             PhoneCallStatus_InCall,

From 1862090a89790c152d7a58d539a0a360be6a07ff Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 13 Oct 2020 09:53:18 -0600
Subject: [PATCH 70/89] #440 add interfaces

---
 .../DeviceTypeInterfaces/ILanguageDefinition.cs    | 11 +++++++++++
 .../DeviceTypeInterfaces/ILanguageLabel.cs         |  8 ++++++++
 .../DeviceTypeInterfaces/ILanguageProvider.cs      | 14 ++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageLabel.cs
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageProvider.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs
new file mode 100644
index 00000000..8c81d6bb
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs	
@@ -0,0 +1,11 @@
+using System;
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    public interface ILanguageDefinition
+    {
+        ILanguageDefinition CurrentLanguage { get; set; }
+
+        event EventHandler CurrentLanguageChanged;
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageLabel.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageLabel.cs
new file mode 100644
index 00000000..7f3fecd7
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageLabel.cs	
@@ -0,0 +1,8 @@
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    public interface ILanguageLabel
+    {
+        string Description { get; set; } 
+        string DisplayText { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageProvider.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageProvider.cs
new file mode 100644
index 00000000..34047535
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageProvider.cs	
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    public interface ILanguageProvider
+    {
+        string LocaleName { get; set; }
+        string FriendlyName { get; set; }
+        bool Enable { get; set; }
+        List<ILanguageLabel> UiLabels { get; set; } 
+        List<ILanguageLabel> Sources { get; set; } 
+        List<ILanguageLabel> Destinations { get; set; } 
+    }
+}
\ No newline at end of file

From 08c929699fa5f966db007cbed2d4526a8360e94b Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 13 Oct 2020 10:29:30 -0600
Subject: [PATCH 71/89] #440 Updates for csproj file

---
 .../PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index 36afcac4..4b5d20b8 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -206,7 +206,10 @@
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
+    <Compile Include="DeviceTypeInterfaces\ILanguageLabel.cs" />
+    <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
+    <Compile Include="DeviceTypeInterfaces\ILanguageDefinition.cs" />
     <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Factory\IDeviceFactory.cs" />

From cb752850ffe2566cf85ecaf91be154fe6fccaa51 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 13 Oct 2020 13:30:29 -0600
Subject: [PATCH 72/89] correct interfaces

---
 .../DeviceTypeInterfaces/ILanguageDefinition.cs   | 10 +++++++---
 .../DeviceTypeInterfaces/ILanguageProvider.cs     | 15 +++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs
index 8c81d6bb..659b396a 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs	
@@ -1,11 +1,15 @@
 using System;
+using System.Collections.Generic;
 
 namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
 {
     public interface ILanguageDefinition
     {
-        ILanguageDefinition CurrentLanguage { get; set; }
-
-        event EventHandler CurrentLanguageChanged;
+        string LocaleName { get; set; }
+        string FriendlyName { get; set; }
+        bool Enable { get; set; }
+        List<ILanguageLabel> UiLabels { get; set; }
+        List<ILanguageLabel> Sources { get; set; }
+        List<ILanguageLabel> Destinations { get; set; }
     }
 }
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageProvider.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageProvider.cs
index 34047535..2ae483f6 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageProvider.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageProvider.cs	
@@ -1,14 +1,13 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
 {
-    public interface ILanguageProvider
+        public interface ILanguageProvider
     {
-        string LocaleName { get; set; }
-        string FriendlyName { get; set; }
-        bool Enable { get; set; }
-        List<ILanguageLabel> UiLabels { get; set; } 
-        List<ILanguageLabel> Sources { get; set; } 
-        List<ILanguageLabel> Destinations { get; set; } 
+        ILanguageDefinition CurrentLanguage { get; set; }
+
+        event EventHandler CurrentLanguageChanged;
     }
+
 }
\ No newline at end of file

From b373ab8708dce89aa53ae3e6b1a49194385dad52 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 13 Oct 2020 14:06:48 -0600
Subject: [PATCH 73/89] #443 Add SetString Overload

---
 .../Touchpanels/TriListExtensions.cs                        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Touchpanels/TriListExtensions.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Touchpanels/TriListExtensions.cs
index b282d475..d9cadb24 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Touchpanels/TriListExtensions.cs	
+++ b/essentials-framework/Essentials 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>

From 1150d9e497a3194a19598fc9fe48947b79687cdd Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Tue, 13 Oct 2020 15:18:31 -0600
Subject: [PATCH 74/89] add IKeyed to ILanguageLabel to easily get the key

---
 .../DeviceTypeInterfaces/ILanguageLabel.cs                  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageLabel.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageLabel.cs
index 7f3fecd7..3473ea60 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageLabel.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageLabel.cs	
@@ -1,6 +1,8 @@
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+using PepperDash.Core;
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
 {
-    public interface ILanguageLabel
+    public interface ILanguageLabel:IKeyed
     {
         string Description { get; set; } 
         string DisplayText { get; set; }

From e0fdefa28e143fdc47cf4258612accc8422456e3 Mon Sep 17 00:00:00 2001
From: Alex Johnson <ajohnson@pepperdash.com>
Date: Thu, 15 Oct 2020 12:36:14 -0400
Subject: [PATCH 75/89] Fix to allow card cage creation loop to continue even
 if a previous card encountered an issue

---
 .../Crestron IO/Cards/InternalCardCageController.cs         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Cards/InternalCardCageController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Cards/InternalCardCageController.cs
index b362a78d..964edd5c 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Cards/InternalCardCageController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron 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

From 085e1984098e354ca3e9250ee6e10ab0fe08e77b Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 15 Oct 2020 13:34:47 -0600
Subject: [PATCH 76/89] fix for incoming call stuff

---
 .../Essentials Devices Common/VideoCodec/VideoCodecBase.cs  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 8b7b3bce..5af3c655 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -812,8 +812,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             CallStatusChange += (sender, args) =>
             {
                 trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
-
-                trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming);
+                
+                Debug.Console(1, this, "Call Direction: {0}", args.CallItem.Direction);
+                Debug.Console(1, this, "Call is incoming: {0}", args.CallItem.Direction == eCodecCallDirection.Incoming);
+                trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming && args.CallItem.Status != eCodecCallStatus.Disconnected);
 
                 if (args.CallItem.Direction == eCodecCallDirection.Incoming)
                 {

From 59881d6b3bb06ea6e7dd3d4b7cdc8490389eac47 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 15 Oct 2020 16:14:27 -0600
Subject: [PATCH 77/89] fix for unanticipated messages from Zoom

---
 .../VideoCodec/ZoomRoom/ZoomRoom.cs                  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index b8d29077..8f7b6876 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -1605,6 +1605,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public override void AcceptCall(CodecActiveCallItem call)
         {
             SendText(string.Format("zCommand Call Accept callerJID: {0}", call.Id));
+
+            call.Status = eCodecCallStatus.Connected;
+
+            OnCallStatusChange(call);
+
+            UpdateCallStatus();
         }
 
         public void RejectCall()
@@ -1619,6 +1625,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public override void RejectCall(CodecActiveCallItem call)
         {
             SendText(string.Format("zCommand Call Reject callerJID: {0}", call.Id));
+
+            call.Status = eCodecCallStatus.Disconnected;
+
+            OnCallStatusChange(call);
+
+            UpdateCallStatus();
         }
 
         public override void Dial(Meeting meeting)

From 7bbdf434527b7a53f168409a3f3fd8f5ee6263ad Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 15 Oct 2020 16:37:41 -0600
Subject: [PATCH 78/89] add full implementation for LanguageLabel

---
 .../DeviceTypeInterfaces/ILanguageDefinition.cs      |  6 +++---
 .../DeviceTypeInterfaces/ILanguageLabel.cs           | 10 ----------
 .../DeviceTypeInterfaces/LanguageLabel.cs            | 12 ++++++++++++
 3 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageLabel.cs
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/LanguageLabel.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs
index 659b396a..f6849791 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs	
@@ -8,8 +8,8 @@ namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
         string LocaleName { get; set; }
         string FriendlyName { get; set; }
         bool Enable { get; set; }
-        List<ILanguageLabel> UiLabels { get; set; }
-        List<ILanguageLabel> Sources { get; set; }
-        List<ILanguageLabel> Destinations { get; set; }
+        List<LanguageLabel> UiLabels { get; set; }
+        List<LanguageLabel> Sources { get; set; }
+        List<LanguageLabel> Destinations { get; set; }
     }
 }
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageLabel.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageLabel.cs
deleted file mode 100644
index 3473ea60..00000000
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageLabel.cs	
+++ /dev/null
@@ -1,10 +0,0 @@
-using PepperDash.Core;
-
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
-{
-    public interface ILanguageLabel:IKeyed
-    {
-        string Description { get; set; } 
-        string DisplayText { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/LanguageLabel.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/LanguageLabel.cs
new file mode 100644
index 00000000..345da2ed
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/LanguageLabel.cs	
@@ -0,0 +1,12 @@
+using PepperDash.Core;
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    public class LanguageLabel
+    {
+        public string Key { get; set; }
+        public string Description { get; set; }
+        public string DisplayText { get; set; }
+        public uint JoinNumber { get; set; }
+    }
+}
\ No newline at end of file

From 36fd1dcda9d1da3347fbb9de5ff2ffdbcddd3750 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 15 Oct 2020 16:59:39 -0600
Subject: [PATCH 79/89] file name change

---
 .../PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index 4981c8a7..98e4e510 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -195,7 +195,7 @@
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
-    <Compile Include="DeviceTypeInterfaces\ILanguageLabel.cs" />
+    <Compile Include="DeviceTypeInterfaces\LanguageLabel.cs" />
     <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
     <Compile Include="DeviceTypeInterfaces\ILanguageDefinition.cs" />

From 415dbbb195ddb95bcacb5c0a2eed41b3371788b4 Mon Sep 17 00:00:00 2001
From: Andrew Welker <awelker@pepperdash.com>
Date: Fri, 16 Oct 2020 08:16:47 -0600
Subject: [PATCH 80/89] Update docker.yml

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 265a150e..0af60e3d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -60,7 +60,7 @@ jobs:
       - name: Build Solution
         shell: powershell
         run: |
-          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder:v1.4.1 c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
+          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
       # Zip up the output files as needed
       - name: Zip Build Output
         shell: powershell

From 061109c901b7e5aa33ee8f5ad0c613243f73c20d Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 21 Oct 2020 10:05:19 -0600
Subject: [PATCH 81/89] add method to create a rmc for DMPS chassis

---
 .../Endpoints/Receivers/DmRmcHelper.cs        | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs
index b3d9b478..ef42891f 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs	
@@ -221,6 +221,10 @@ namespace PepperDash.Essentials.DM
 	        DmRmcPropertiesConfig props, string pKey, uint ipid)
 	    {
 	        var parentDev = DeviceManager.GetDeviceForKey(pKey);
+	        if (parentDev is DmpsRoutingController)
+	        {
+	            return GetDmRmcControllerForDmps(key, name, typeName, parentDev as DmpsRoutingController, props.ParentOutputNumber);
+	        }
 	        if (!(parentDev is IDmSwitch))
 	        {
 	            Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a DM Chassis.",
@@ -285,6 +289,26 @@ namespace PepperDash.Essentials.DM
 	        return null;
 	    }
 
+	    private static CrestronGenericBaseDevice GetDmRmcControllerForDmps(string key, string name, string typeName,
+	        DmpsRoutingController controller, uint num)
+	    {
+	        Func<string, string, DMOutput, CrestronGenericBaseDevice> dmpsHandler;
+	        if (ChassisCpu3Dict.TryGetValue(typeName.ToLower(), out dmpsHandler))
+	        {
+	            var output = controller.Dmps.SwitcherOutputs[num] as DMOutput;
+
+	            if (output != null)
+	            {
+	                return dmpsHandler(key, name, output);
+	            }
+	            Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot attach DM-RMC of type '{0}' to output {1} on DMPS chassis. Output is not a DM Output", typeName, num);
+	            return null;
+	        }
+
+            Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot create DM-RMC of type '{0}' to output {1} on DMPS chassis", typeName, num);
+	        return null;
+	    }
+
 	    private static CrestronGenericBaseDevice GetDmRmcControllerForProcessor(string key, string name, string typeName, uint ipid)
 	    {
 	        try
@@ -305,6 +329,8 @@ namespace PepperDash.Essentials.DM
                 return null;
 	        }
 	    }
+
+        
 	}
 
     public class DmRmcControllerFactory : EssentialsDeviceFactory<DmRmcControllerBase>

From d8863142c71f686a0722058f2397258554f96be5 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 21 Oct 2020 10:21:40 -0600
Subject: [PATCH 82/89] Refactor CustomActivate & LinkToApi

---
 .../Chassis/DmpsRoutingController.cs          | 270 +++++++++++-------
 1 file changed, 160 insertions(+), 110 deletions(-)

diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs
index 8c36e209..55e0c037 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs	
@@ -128,32 +128,51 @@ namespace PepperDash.Essentials.DM
         public override bool CustomActivate()
         {
             // Set input and output names from config
-            if (InputNames != null)
-            {
-                foreach (var kvp in InputNames)
-                {
-                    var input = (Dmps.SwitcherInputs[kvp.Key] as DMInput);
-                    if (input != null)
-                        input.Name.StringValue = kvp.Value;
-                }
-            }
-            if (OutputNames != null)
-            {
-                foreach (var kvp in OutputNames)
-                {
-                    var output = (Dmps.SwitcherOutputs[kvp.Key] as DMOutput);
-                    if (output != null)
-                        output.Name.StringValue = kvp.Value;
-                }
-            }
+            SetInputNames();
+
+            SetOutputNames();
 
             // Subscribe to events
-            Dmps.DMInputChange += new DMInputEventHandler(Dmps_DMInputChange);
-            Dmps.DMOutputChange += new DMOutputEventHandler(Dmps_DMOutputChange);
+            Dmps.DMInputChange += Dmps_DMInputChange;
+            Dmps.DMOutputChange += Dmps_DMOutputChange;
 
             return base.CustomActivate();
-        }
-
+        }
+
+        private void SetOutputNames()
+        {
+            if (OutputNames == null)
+            {
+                return;
+            }
+
+            foreach (var kvp in OutputNames)
+            {
+                var output = (Dmps.SwitcherOutputs[kvp.Key] as DMOutput);
+                if (output != null && output.Name != null)
+                {
+                    
+                    output.Name.StringValue = kvp.Value;
+                }
+            }
+        }
+
+        private void SetInputNames()
+        {
+            if (InputNames == null)
+            {
+                return;
+            }
+            foreach (var kvp in InputNames)
+            {
+                var input = (Dmps.SwitcherInputs[kvp.Key] as DMInput);
+                if (input != null && input.Name != null)
+                {
+                    input.Name.StringValue = kvp.Value;
+                }
+            }
+        }
+
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
             var joinMap = new DmpsRoutingControllerJoinMap(joinStart);
@@ -175,105 +194,136 @@ namespace PepperDash.Essentials.DM
             Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
             // Link up outputs
-            for (uint i = 1; i <= Dmps.NumberOfSwitcherInputs; i++)
-            {
-                Debug.Console(2, this, "Linking Input Card {0}", i);
+            LinkInputsToApi(trilist, joinMap);
 
-                var ioSlot = i;
-                var ioSlotJoin = ioSlot - 1;
-
-                //if (TxDictionary.ContainsKey(ioSlot))
-                //{
-                //    Debug.Console(2, "Creating Tx Feedbacks {0}", ioSlot);
-                //    var TxKey = TxDictionary[ioSlot];
-                //    var TxDevice = DeviceManager.GetDeviceForKey(TxKey) as DmTxControllerBase;
-                //    //TxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
-                //    // TxDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
-                //    // trilist.SetUShortSigAction((ApiMap.HdcpSupport[ioSlot]), u => TxDevice.SetHdcpSupportAll((ePdtHdcpSupport)(u)));
-                //    // TxDevice.HdcpSupportAllFeedback.LinkInputSig(trilist.UShortInput[joinMap. + ioSlot]);
-                //    // trilist.UShortInput[ApiMap.HdcpSupportCapability[ioSlot]].UShortValue = TxDevice.HdcpSupportCapability;
-                //}
-                //else
-                //{
-                //    // dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[ApiMap.TxVideoSyncStatus[ioSlot]]);
-                //}
-
-                if (VideoInputSyncFeedbacks[ioSlot] != null)
-                    VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus.JoinNumber + ioSlotJoin]);
-
-                if (InputNameFeedbacks[ioSlot] != null)
-                    InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames.JoinNumber + ioSlotJoin]);
+            LinkOutputsToApi(trilist, joinMap);
+        }
+
+        private void LinkOutputsToApi(BasicTriList trilist, DmpsRoutingControllerJoinMap joinMap)
+        {
+            for (uint i = 1; i <= Dmps.NumberOfSwitcherOutputs; i++)
+            {
+                Debug.Console(2, this, "Linking Output Card {0}", i);
 
-                trilist.SetStringSigAction(joinMap.InputNames.JoinNumber + ioSlotJoin, new Action<string>(s =>
-                {
-                    var inputCard = Dmps.SwitcherInputs[ioSlot] as DMInput;
-
-                    if (inputCard != null)
-                    {
-                        if (inputCard.NameFeedback != null && !string.IsNullOrEmpty(inputCard.NameFeedback.StringValue) && inputCard.NameFeedback.StringValue != s)
-                            if (inputCard.Name != null)
-                                inputCard.Name.StringValue = s;
-                    }
-                }));
-
-
-                if (InputEndpointOnlineFeedbacks[ioSlot] != null)
-                    InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline.JoinNumber + ioSlotJoin]);
-            }
-
-            for (uint i = 1; i <= Dmps.NumberOfSwitcherOutputs; i++)
-            {
-                Debug.Console(2, this, "Linking Output Card {0}", i);
-
                 var ioSlot = i;
-                var ioSlotJoin = ioSlot - 1;
-
+                var ioSlotJoin = ioSlot - 1;
+
                 // Control
-                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
-                trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin, o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
+                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
+                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
+                trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
+                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
 
-                trilist.SetStringSigAction(joinMap.OutputNames.JoinNumber + ioSlotJoin, s =>
-                {
-                    var outputCard = Dmps.SwitcherOutputs[ioSlot] as DMOutput;
-
-                    //Debug.Console(2, dmpsRouter, "Output Name String Sig Action for Output Card  {0}", ioSlot);
-
-                    if (outputCard != null)
-                    {
-                        //Debug.Console(2, dmpsRouter, "Card Type: {0}", outputCard.CardInputOutputType);
-
-                        if (!(outputCard is Card.Dmps3CodecOutput) && outputCard.NameFeedback != null)
-                        {
-                            if (!string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
-                            {
-                                //Debug.Console(2, dmpsRouter, "NameFeedabck: {0}", outputCard.NameFeedback.StringValue);
-
-                                if (outputCard.NameFeedback.StringValue != s && outputCard.Name != null)
-                                {
-                                    outputCard.Name.StringValue = s;
-                                }
-                            }
-                        }
-                    }
-                });
-
-                // Feedback
+                trilist.SetStringSigAction(joinMap.OutputNames.JoinNumber + ioSlotJoin, s =>
+                {
+                    var outputCard = Dmps.SwitcherOutputs[ioSlot] as DMOutput;
+
+                    //Debug.Console(2, dmpsRouter, "Output Name String Sig Action for Output Card  {0}", ioSlot);
+
+                    if (outputCard == null)
+                    {
+                        return;
+                    }
+                    //Debug.Console(2, dmpsRouter, "Card Type: {0}", outputCard.CardInputOutputType);
+
+                    if (outputCard is Card.Dmps3CodecOutput || outputCard.NameFeedback == null)
+                    {
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
+                    {
+                        return;
+                    }
+                    //Debug.Console(2, dmpsRouter, "NameFeedabck: {0}", outputCard.NameFeedback.StringValue);
+
+                    if (outputCard.NameFeedback.StringValue != s && outputCard.Name != null)
+                    {
+                        outputCard.Name.StringValue = s;
+                    }
+                });
+
+                // Feedback
                 if (VideoOutputFeedbacks[ioSlot] != null)
-                    VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo.JoinNumber + ioSlotJoin]);
+                {
+                    VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo.JoinNumber + ioSlotJoin]);
+                }
                 if (AudioOutputFeedbacks[ioSlot] != null)
-                    AudioOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputAudio.JoinNumber + ioSlotJoin]);
+                {
+                    AudioOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputAudio.JoinNumber + ioSlotJoin]);
+                }
                 if (OutputNameFeedbacks[ioSlot] != null)
-                    OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames.JoinNumber + ioSlotJoin]);
+                {
+                    OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames.JoinNumber + ioSlotJoin]);
+                }
                 if (OutputVideoRouteNameFeedbacks[ioSlot] != null)
-                    OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentVideoInputNames.JoinNumber + ioSlotJoin]);
+                {
+                    OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(
+                        trilist.StringInput[joinMap.OutputCurrentVideoInputNames.JoinNumber + ioSlotJoin]);
+                }
                 if (OutputAudioRouteNameFeedbacks[ioSlot] != null)
-                    OutputAudioRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentAudioInputNames.JoinNumber + ioSlotJoin]);
+                {
+                    OutputAudioRouteNameFeedbacks[ioSlot].LinkInputSig(
+                        trilist.StringInput[joinMap.OutputCurrentAudioInputNames.JoinNumber + ioSlotJoin]);
+                }
                 if (OutputEndpointOnlineFeedbacks[ioSlot] != null)
-                    OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline.JoinNumber + ioSlotJoin]);
-            }
-        }
-
-
+                {
+                    OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(
+                        trilist.BooleanInput[joinMap.OutputEndpointOnline.JoinNumber + ioSlotJoin]);
+                }
+            }
+        }
+
+        private void LinkInputsToApi(BasicTriList trilist, DmpsRoutingControllerJoinMap joinMap)
+        {
+            for (uint i = 1; i <= Dmps.NumberOfSwitcherInputs; i++)
+            {
+                Debug.Console(2, this, "Linking Input Card {0}", i);
+
+                var ioSlot = i;
+                var ioSlotJoin = ioSlot - 1;
+
+                if (VideoInputSyncFeedbacks[ioSlot] != null)
+                {
+                    VideoInputSyncFeedbacks[ioSlot].LinkInputSig(
+                        trilist.BooleanInput[joinMap.VideoSyncStatus.JoinNumber + ioSlotJoin]);
+                }
+
+                if (InputNameFeedbacks[ioSlot] != null)
+                {
+                    InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames.JoinNumber + ioSlotJoin]);
+                }
+
+                trilist.SetStringSigAction(joinMap.InputNames.JoinNumber + ioSlotJoin, s =>
+                {
+                    var inputCard = Dmps.SwitcherInputs[ioSlot] as DMInput;
+
+                    if (inputCard == null)
+                    {
+                        return;
+                    }
+
+                    if (inputCard.NameFeedback == null || string.IsNullOrEmpty(inputCard.NameFeedback.StringValue) ||
+                        inputCard.NameFeedback.StringValue == s)
+                    {
+                        return;
+                    }
+
+                    if (inputCard.Name != null)
+                    {
+                        inputCard.Name.StringValue = s;
+                    }
+                });
+
+
+                if (InputEndpointOnlineFeedbacks[ioSlot] != null)
+                {
+                    InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(
+                        trilist.BooleanInput[joinMap.InputEndpointOnline.JoinNumber + ioSlotJoin]);
+                }
+            }
+        }
+
+
         /// <summary>
         /// Iterate the SwitcherOutputs collection to setup feedbacks and add routing ports
         /// </summary>

From 8feb7037aa455997d467edcf7e37a71e58ed2005 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 21 Oct 2020 11:53:32 -0600
Subject: [PATCH 83/89] Change cast to ACTUAL Dmps3Dmoutput

---
 .../Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs
index ef42891f..40c4b0aa 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs	
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Cards;
 using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
 using Newtonsoft.Json;
 using PepperDash.Core;
@@ -295,13 +296,15 @@ namespace PepperDash.Essentials.DM
 	        Func<string, string, DMOutput, CrestronGenericBaseDevice> dmpsHandler;
 	        if (ChassisCpu3Dict.TryGetValue(typeName.ToLower(), out dmpsHandler))
 	        {
-	            var output = controller.Dmps.SwitcherOutputs[num] as DMOutput;
+	            var output = controller.Dmps.SwitcherOutputs[num] as Card.Dmps3DmOutput;
 
 	            if (output != null)
 	            {
 	                return dmpsHandler(key, name, output);
 	            }
-	            Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot attach DM-RMC of type '{0}' to output {1} on DMPS chassis. Output is not a DM Output", typeName, num);
+	            Debug.Console(0, Debug.ErrorLogLevel.Error,
+	                "Cannot attach DM-RMC of type '{0}' to output {1} on DMPS chassis. Output is not a DM Output.",
+	                typeName, num);
 	            return null;
 	        }
 

From 36e8dc9fa59d4335f5166c1dcb9048124d53a1cf Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 21 Oct 2020 11:53:52 -0600
Subject: [PATCH 84/89] Add check for NameSig Support

---
 .../Chassis/DmpsRoutingController.cs          | 97 +++++++++----------
 1 file changed, 44 insertions(+), 53 deletions(-)

diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs
index 55e0c037..061f7557 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs	
@@ -149,9 +149,8 @@ namespace PepperDash.Essentials.DM
             foreach (var kvp in OutputNames)
             {
                 var output = (Dmps.SwitcherOutputs[kvp.Key] as DMOutput);
-                if (output != null && output.Name != null)
+                if (output != null && output.Name.Type != eSigType.NA)
                 {
-                    
                     output.Name.StringValue = kvp.Value;
                 }
             }
@@ -166,7 +165,7 @@ namespace PepperDash.Essentials.DM
             foreach (var kvp in InputNames)
             {
                 var input = (Dmps.SwitcherInputs[kvp.Key] as DMInput);
-                if (input != null && input.Name != null)
+                if (input != null && input.Name.Type != eSigType.NA)
                 {
                     input.Name.StringValue = kvp.Value;
                 }
@@ -331,65 +330,57 @@ namespace PepperDash.Essentials.DM
         {
             foreach (var card in Dmps.SwitcherOutputs)
             {
-
-                var outputCard = card as DMOutput;
-
+                var outputCard = card as DMOutput;
+
+                if (outputCard == null)
+                {
+                    continue;
+                }
+
                 Debug.Console(1, this, "Adding Output Card Number {0} Type: {1}", outputCard.Number, outputCard.CardInputOutputType.ToString());
-
-                if (outputCard != null)
+                VideoOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
                 {
-                    VideoOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
-                    {
-                        if (outputCard.VideoOutFeedback != null) { return (ushort)outputCard.VideoOutFeedback.Number; }
-                        else { return 0; };
-                    });
-                    AudioOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
-                    {
-                        if (outputCard.AudioOutFeedback != null) { return (ushort)outputCard.AudioOutFeedback.Number; }
-                        else { return 0; };
-                    });
+                    if (outputCard.VideoOutFeedback != null) { return (ushort)outputCard.VideoOutFeedback.Number; }
+                    return 0;
+                    ;
+                });
+                AudioOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
+                {
+                    if (outputCard.AudioOutFeedback != null) { return (ushort)outputCard.AudioOutFeedback.Number; }
+                    return 0;
+                    ;
+                });
 
-                    OutputNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                OutputNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                {
+                    if (outputCard.NameFeedback != null && !string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
                     {
-                        if (outputCard.NameFeedback != null && !string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
-                        {
-                            Debug.Console(2, this, "Output Card {0} Name: {1}", outputCard.Number, outputCard.NameFeedback.StringValue);
-                            return outputCard.NameFeedback.StringValue;
-                        }
-                        else
-                        {
-                            return "";
-                        }
-                    });
+                        Debug.Console(2, this, "Output Card {0} Name: {1}", outputCard.Number, outputCard.NameFeedback.StringValue);
+                        return outputCard.NameFeedback.StringValue;
+                    }
+                    return "";
+                });
 
-                    OutputVideoRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                OutputVideoRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                {
+                    if (outputCard.VideoOutFeedback != null && outputCard.VideoOutFeedback.NameFeedback != null)
                     {
-                        if (outputCard.VideoOutFeedback != null && outputCard.VideoOutFeedback.NameFeedback != null)
-                        {
-                            return outputCard.VideoOutFeedback.NameFeedback.StringValue;
-                        }
-                        else
-                        {
-                            return NoRouteText;
-                        }
-                    });
-                    OutputAudioRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                        return outputCard.VideoOutFeedback.NameFeedback.StringValue;
+                    }
+                    return NoRouteText;
+                });
+                OutputAudioRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                {
+                    if (outputCard.AudioOutFeedback != null && outputCard.AudioOutFeedback.NameFeedback != null)
                     {
-                        if (outputCard.AudioOutFeedback != null && outputCard.AudioOutFeedback.NameFeedback != null)
-                        {
-                            return outputCard.AudioOutFeedback.NameFeedback.StringValue;
-                        }
-                        else
-                        {
-                            return NoRouteText;
+                        return outputCard.AudioOutFeedback.NameFeedback.StringValue;
+                    }
+                    return NoRouteText;
+                });
 
-                        }
-                    });
+                OutputEndpointOnlineFeedbacks[outputCard.Number] = new BoolFeedback(() => outputCard.EndpointOnlineFeedback);
 
-                    OutputEndpointOnlineFeedbacks[outputCard.Number] = new BoolFeedback(() => { return outputCard.EndpointOnlineFeedback; });
-
-                    AddOutputCard(outputCard.Number, outputCard);
-                }
+                AddOutputCard(outputCard.Number, outputCard);
             }
         }
 

From 1484c26434e9b7c6fec6be1bd46fd687cd60a31f Mon Sep 17 00:00:00 2001
From: Trevor Payne <tpayne@pepperdash.com>
Date: Wed, 21 Oct 2020 12:55:41 -0500
Subject: [PATCH 85/89] added IDspPreset Interface

Implemented IDspPreset Interface on internal Tesira DSP

Resolves #457
---
 .../PepperDashEssentialsBase/Devices/IDspPreset.cs       | 9 +++++++++
 .../PepperDash_Essentials_Core.csproj                    | 1 +
 .../DSP/BiampTesira/BiampTesiraForteDsp.cs               | 9 +++++++--
 .../Essentials Devices Common/DSP/DspBase.cs             | 6 ++++--
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IDspPreset.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IDspPreset.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IDspPreset.cs
new file mode 100644
index 00000000..c565e0d9
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IDspPreset.cs	
@@ -0,0 +1,9 @@
+namespace PepperDash.Essentials.Core
+{
+    public interface IDspPreset
+    {
+        void RunPreset(string name);
+
+        void RunPreset(int id);
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index 98e4e510..2b45030c 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -190,6 +190,7 @@
     <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
     <Compile Include="Devices\EssentialsDevice.cs" />
     <Compile Include="Devices\GenericIRController.cs" />
+    <Compile Include="Devices\IDspPreset.cs" />
     <Compile Include="Devices\IProjectorInterfaces.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs
index 86850fea..9e397f19 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs	
@@ -296,8 +296,13 @@ namespace PepperDash.Essentials.Devices.Common.DSP
 
             if(!CommandQueueInProgress)
                 SendNextQueuedCommand();
-        }
-
+        }
+
+        public override void RunPreset(int data)
+        {
+            SendLine(String.Format("Device recallPreset {0}", data ));
+        }
+
         /// <summary>
         /// Adds a raw string command to the queue
         /// </summary>
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs
index cad57761..62043827 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs	
@@ -9,7 +9,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.DSP
 {
-	public abstract class DspBase : EssentialsDevice
+	public abstract class DspBase : EssentialsDevice, IDspPreset
 	{
 		public Dictionary<string, DspControlPoint> LevelControlPoints { get; private set; }
 
@@ -17,7 +17,9 @@ namespace PepperDash.Essentials.Devices.Common.DSP
 
         public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
 
-		public abstract void RunPreset(string name);
+		public abstract void RunPreset(string name);
+
+	    public abstract void RunPreset(int data);
 
 		public DspBase(string key, string name) :
 			base(key, name) { }

From 4b537cb79d6ce3ea0ec88449deeda8ba1b343881 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 21 Oct 2020 13:00:12 -0600
Subject: [PATCH 86/89] Fixing some things for Essentials routing and linking
 to bridge

---
 .../Chassis/DmpsRoutingController.cs          | 122 ++++++++++--------
 .../Endpoints/Receivers/DmRmcHelper.cs        |   2 +-
 2 files changed, 67 insertions(+), 57 deletions(-)

diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs
index 061f7557..adf73bde 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs	
@@ -118,7 +118,10 @@ namespace PepperDash.Essentials.DM
             OutputEndpointOnlineFeedbacks = new Dictionary<uint, BoolFeedback>();
 
             Debug.Console(1, this, "{0} Switcher Inputs Present.", Dmps.SwitcherInputs.Count);
-            Debug.Console(1, this, "{0} Switcher Outputs Present.", Dmps.SwitcherOutputs.Count);
+            Debug.Console(1, this, "{0} Switcher Outputs Present.", Dmps.SwitcherOutputs.Count);
+
+            Debug.Console(1, this, "{0} Inputs in ControlSystem", Dmps.NumberOfSwitcherInputs);
+            Debug.Console(1, this, "{0} Outputs in ControlSystem", Dmps.NumberOfSwitcherOutputs);
 
             SetupOutputCards();
 
@@ -200,7 +203,7 @@ namespace PepperDash.Essentials.DM
 
         private void LinkOutputsToApi(BasicTriList trilist, DmpsRoutingControllerJoinMap joinMap)
         {
-            for (uint i = 1; i <= Dmps.NumberOfSwitcherOutputs; i++)
+            for (uint i = 1; i <= Dmps.SwitcherOutputs.Count; i++)
             {
                 Debug.Console(2, this, "Linking Output Card {0}", i);
 
@@ -274,7 +277,7 @@ namespace PepperDash.Essentials.DM
 
         private void LinkInputsToApi(BasicTriList trilist, DmpsRoutingControllerJoinMap joinMap)
         {
-            for (uint i = 1; i <= Dmps.NumberOfSwitcherInputs; i++)
+            for (uint i = 1; i <= Dmps.SwitcherInputs.Count; i++)
             {
                 Debug.Console(2, this, "Linking Input Card {0}", i);
 
@@ -328,12 +331,15 @@ namespace PepperDash.Essentials.DM
         /// </summary>
         void SetupOutputCards()
         {
-            foreach (var card in Dmps.SwitcherOutputs)
-            {
+            foreach (var card in Dmps.SwitcherOutputs)
+            {
+                Debug.Console(1, this, "Output Card Type: {0}", card.CardInputOutputType);
+
                 var outputCard = card as DMOutput;
 
                 if (outputCard == null)
                 {
+                    Debug.Console(1, this, "Output card {0} is not a DMOutput", card.CardInputOutputType);
                     continue;
                 }
 
@@ -535,18 +541,23 @@ namespace PepperDash.Essentials.DM
 
                 var cecPort = hdmiOutputCard.HdmiOutputPort;
 
-                AddHdmiOutputPort(number, cecPort);
-
-                return;
+                AddHdmiOutputPort(number, cecPort);
+            }
+            else if (outputCard is Card.Dmps3HdmiOutputBackend)
+            {
+                var hdmiOutputCard = outputCard as Card.Dmps3HdmiOutputBackend;
+
+                var cecPort = hdmiOutputCard.HdmiOutputPort;
+
+                AddHdmiOutputPort(number, cecPort);
             }
             else if (outputCard is Card.Dmps3DmOutput)
-            {
-                var dmOutputCard = outputCard as Card.Dmps3DmOutput;
-
-                var cecPort = dmOutputCard.DmOutputPort;
-
-                AddDmOutputPort(number);
-                return;
+            {
+                AddDmOutputPort(number);
+            }
+            else if (outputCard is Card.Dmps3DmOutputBackend)
+            {
+                AddDmOutputPort(number);
             }
             else if (outputCard is Card.Dmps3ProgramOutput)
             {
@@ -554,50 +565,51 @@ namespace PepperDash.Essentials.DM
 
                 var programOutput = new DmpsAudioOutputController(string.Format("processor-programAudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
 
-                DeviceManager.AddDevice(programOutput);
-
-                return;
+                DeviceManager.AddDevice(programOutput);
             }
-            else if (outputCard is Card.Dmps3AuxOutput)
-            {
-                if (outputCard.CardInputOutputType == eCardInputOutputType.Dmps3Aux1Output)
-                {
-                    AddAudioOnlyOutputPort(number, "Aux1");
+            else if (outputCard is Card.Dmps3AuxOutput)
+            {
+                switch (outputCard.CardInputOutputType)
+                {
+                    case eCardInputOutputType.Dmps3Aux1Output:
+                    {
+                        AddAudioOnlyOutputPort(number, "Aux1");
 
-                    var aux1Output = new DmpsAudioOutputController(string.Format("processor-aux1AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
+                        var aux1Output = new DmpsAudioOutputController(string.Format("processor-aux1AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
 
-                    DeviceManager.AddDevice(aux1Output);
-                }
-                else if (outputCard.CardInputOutputType == eCardInputOutputType.Dmps3Aux2Output)
-                {
-                    AddAudioOnlyOutputPort(number, "Aux2");
+                        DeviceManager.AddDevice(aux1Output);
+                    }
+                        break;
+                    case eCardInputOutputType.Dmps3Aux2Output:
+                    {
+                        AddAudioOnlyOutputPort(number, "Aux2");
 
-                    var aux2Output = new DmpsAudioOutputController(string.Format("processor-aux2AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
+                        var aux2Output = new DmpsAudioOutputController(string.Format("processor-aux2AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
 
-                    DeviceManager.AddDevice(aux2Output);
-                }
-                return;
-            }
-            else if (outputCard is Card.Dmps3CodecOutput)
-            {
-                if (number == (uint)CrestronControlSystem.eDmps300cOutputs.Codec1 
-                    || number == (uint)CrestronControlSystem.eDmps3200cOutputs.Codec1
-                    || number == (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec1
-                    || number == (uint)CrestronControlSystem.eDmps34K250COutputs.Codec1
-                    || number == (uint)CrestronControlSystem.eDmps34K350COutputs.Codec1)
-                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec1.ToString());
-                else if (number == (uint)CrestronControlSystem.eDmps300cOutputs.Codec2
-                    || number == (uint)CrestronControlSystem.eDmps3200cOutputs.Codec2
-                    || number == (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec2
-                    || number == (uint)CrestronControlSystem.eDmps34K250COutputs.Codec2
-                    || number == (uint)CrestronControlSystem.eDmps34K350COutputs.Codec2)
-                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec2.ToString());
-                return;
-            }
+                        DeviceManager.AddDevice(aux2Output);
+                    }
+                        break;
+                }
+            }
+            else if (outputCard is Card.Dmps3CodecOutput)
+            {
+                switch (number)
+                {
+                    case (uint)CrestronControlSystem.eDmps34K350COutputs.Codec1:
+                    case (uint)CrestronControlSystem.eDmps34K250COutputs.Codec1:
+                    case (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec1:
+                        AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec1.ToString());
+                        break;
+                    case (uint)CrestronControlSystem.eDmps34K350COutputs.Codec2:
+                    case (uint)CrestronControlSystem.eDmps34K250COutputs.Codec2:
+                    case (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec2:
+                        AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec2.ToString());
+                        break;
+                }
+            }
             else if (outputCard is Card.Dmps3DialerOutput)
             {
-                AddAudioOnlyOutputPort(number, "Dialer");
-                return;
+                AddAudioOnlyOutputPort(number, "Dialer");
             }
             else if (outputCard is Card.Dmps3DigitalMixOutput)
             {
@@ -608,13 +620,11 @@ namespace PepperDash.Essentials.DM
                 if (number == (uint)CrestronControlSystem.eDmps34K250COutputs.Mix2
                     || number == (uint)CrestronControlSystem.eDmps34K300COutputs.Mix2
                     || number == (uint)CrestronControlSystem.eDmps34K350COutputs.Mix2)
-                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps34K250COutputs.Mix2.ToString());
-                return;
+                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps34K250COutputs.Mix2.ToString());
             }
             else if (outputCard is Card.Dmps3AecOutput)
             {
-                AddAudioOnlyOutputPort(number, "Aec");
-                return;
+                AddAudioOnlyOutputPort(number, "Aec");
             }
             else
             {
diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs
index 40c4b0aa..7cc913e2 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs	
@@ -296,7 +296,7 @@ namespace PepperDash.Essentials.DM
 	        Func<string, string, DMOutput, CrestronGenericBaseDevice> dmpsHandler;
 	        if (ChassisCpu3Dict.TryGetValue(typeName.ToLower(), out dmpsHandler))
 	        {
-	            var output = controller.Dmps.SwitcherOutputs[num] as Card.Dmps3DmOutput;
+	            var output = controller.Dmps.SwitcherOutputs[num] as DMOutput;
 
 	            if (output != null)
 	            {

From a9524bcc33a5494e92db07c666159cd8c9825f1f Mon Sep 17 00:00:00 2001
From: Trevor Payne <tpayne@pepperdash.com>
Date: Wed, 21 Oct 2020 16:30:48 -0500
Subject: [PATCH 87/89] Updated Interface to be more genericized

---
 .../Devices/IDspPreset.cs                     |  16 +-
 .../DSP/BiampTesira/BiampTesiraForteDsp.cs    | 807 +++++++++---------
 .../Essentials Devices Common/DSP/DspBase.cs  |  26 +-
 3 files changed, 448 insertions(+), 401 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IDspPreset.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IDspPreset.cs
index c565e0d9..2ec63fcb 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IDspPreset.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IDspPreset.cs	
@@ -1,9 +1,17 @@
-namespace PepperDash.Essentials.Core
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core
 {
+    public interface IHasDspPresets
+    {
+        List<IDspPreset> Presets { get; }
+
+        void RecallPreset(IDspPreset preset);
+
+    }
+
     public interface IDspPreset
     {
-        void RunPreset(string name);
-
-        void RunPreset(int id);
+        string Name { get; }
     }
 }
\ No newline at end of file
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs
index 9e397f19..9cce66f0 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs	
@@ -6,395 +6,426 @@ using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using System.Text.RegularExpressions;
-
-
-namespace PepperDash.Essentials.Devices.Common.DSP
-{
-
-	// QUESTIONS:
-	// 
-	// When subscribing, just use the Instance ID for Custom Name?
-	
-	// Verbose on subscriptions?
-
-    // Example subscription feedback responses
-	// ! "publishToken":"name" "value":-77.0
-	// ! "myLevelName" -77
-
-    public class BiampTesiraForteDsp : DspBase
-    {
-        public IBasicCommunication Communication { get; private set; }
-        public CommunicationGather PortGather { get; private set; }
-        public StatusMonitorBase CommunicationMonitor { get; private set; }
-
-        new public Dictionary<string, TesiraForteLevelControl> LevelControlPoints { get; private set; }
-
-        public bool isSubscribed;
-
-        private CTimer SubscriptionTimer;
-
-        CrestronQueue CommandQueue;
-
-        bool CommandQueueInProgress = false;
-
-        //new public Dictionary<string, DspControlPoint> DialerControlPoints { get; private set; }
-
-        //new public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
-
-        /// <summary>
-        /// Shows received lines as hex
-        /// </summary>
-        public bool ShowHexResponse { get; set; }
-
-        public BiampTesiraForteDsp(string key, string name, IBasicCommunication comm, BiampTesiraFortePropertiesConfig props) :
-            base(key, name)
-        {
-            CommandQueue = new CrestronQueue(100);
-
-            Communication = comm;
-            var socket = comm as ISocketStatus;
-            if (socket != null)
-            {
-                // This instance uses IP control
-				
-                socket.ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(socket_ConnectionChange);
-            }
-            else
-            {
-                // This instance uses RS-232 control
-            }
-            PortGather = new CommunicationGather(Communication, "\x0d\x0a");
-            PortGather.LineReceived += this.Port_LineReceived;
-            if (props.CommunicationMonitorProperties != null)
-            {
-                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, props.CommunicationMonitorProperties);
-            }
-            else
-            {
-//#warning Need to deal with this poll string
-                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 120000, 120000, 300000, "SESSION get aliases\x0d\x0a");
-            }
-
-            LevelControlPoints = new Dictionary<string, TesiraForteLevelControl>();
-
-            foreach (KeyValuePair<string, BiampTesiraForteLevelControlBlockConfig> block in props.LevelControlBlocks)
-            {
-                this.LevelControlPoints.Add(block.Key, new TesiraForteLevelControl(block.Key, block.Value, this));
-            }
-
-        }
-
-        public override bool CustomActivate()
-        {
-            Communication.Connect();
-            CommunicationMonitor.StatusChange += (o, a) => { Debug.Console(2, this, "Communication monitor state: {0}", CommunicationMonitor.Status); };
-            CommunicationMonitor.Start();
-
-            CrestronConsole.AddNewConsoleCommand(SendLine, "send" + Key, "", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(s => Communication.Connect(), "con" + Key, "", ConsoleAccessLevelEnum.AccessOperator);
-            return true;
-        }
-
-        void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
-        {
-            Debug.Console(2, this, "Socket Status Change: {0}", e.Client.ClientStatus.ToString());
-
-            if (e.Client.IsConnected)
-            {
-                // Tasks on connect
-            }
-            else
-            {
-                // Cleanup items from this session
-
-                if (SubscriptionTimer != null)
-                {
-                    SubscriptionTimer.Stop();
-                    SubscriptionTimer = null;
-                }
-
-                isSubscribed = false;
-                CommandQueue.Clear();
-                CommandQueueInProgress = false;
-            }
-        }
-
-        /// <summary>
-        /// Initiates the subscription process to the DSP
-        /// </summary>
-        void SubscribeToAttributes()
-        {
-            SendLine("SESSION set verbose true");
-
-            foreach (KeyValuePair<string, TesiraForteLevelControl> level in LevelControlPoints)
-            {
-                level.Value.Subscribe();
-            }
-
-            if (!CommandQueueInProgress)
-                SendNextQueuedCommand();
-
-            ResetSubscriptionTimer();
-        }
-
-        /// <summary>
-        /// Resets or Sets the subscription timer
-        /// </summary>
-        void ResetSubscriptionTimer()
-        {
-            isSubscribed = true;
-
-            if (SubscriptionTimer != null)
-            {
-                SubscriptionTimer = new CTimer(o => SubscribeToAttributes(), 30000);
-                SubscriptionTimer.Reset();
-
-            }
-        }
-
-        /// <summary>
-        /// Handles a response message from the DSP
-        /// </summary>
-        /// <param name="dev"></param>
-        /// <param name="args"></param>
-        void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
-        {
-            if (Debug.Level == 2)
-                Debug.Console(2, this, "RX: '{0}'",
-                    ShowHexResponse ? ComTextHelper.GetEscapedText(args.Text) : args.Text);
-
-            Debug.Console(1, this, "RX: '{0}'", args.Text);
-
-            try
-            {
-                if (args.Text.IndexOf("Welcome to the Tesira Text Protocol Server...") > -1)
-                {
-                    // Indicates a new TTP session
-
-                    SubscribeToAttributes();
-                }
-                else if (args.Text.IndexOf("publishToken") > -1)
-                {
-                    // response is from a subscribed attribute
-
-                    string pattern = "! \"publishToken\":[\"](.*)[\"] \"value\":(.*)";
-
-                    Match match = Regex.Match(args.Text, pattern);
-
-                    if (match.Success)
-                    {
-
-                        string key;
-
-                        string customName;
-
-                        string value;
-
-                        customName = match.Groups[1].Value;
-
-                        // Finds the key (everything before the '~' character
-                        key = customName.Substring(0, customName.IndexOf("~", 0) - 1);
-
-                        value = match.Groups[2].Value;
-
-                        foreach (KeyValuePair<string, TesiraForteLevelControl> controlPoint in LevelControlPoints)
-                        {
-                            if (customName == controlPoint.Value.LevelCustomName || customName == controlPoint.Value.MuteCustomName)
-                            {
-                                controlPoint.Value.ParseSubscriptionMessage(customName, value);
-                                return;
-                            }
-
-                        }
-                    }
-
-                    /// same for dialers
-                    /// same for switchers
-
-                }
-                else if (args.Text.IndexOf("+OK") > -1)
-                {
-                    if (args.Text == "+OK" || args.Text.IndexOf("list\":") > -1 )       // Check for a simple "+OK" only 'ack' repsonse or a list response and ignore
-                        return;
-
-                    // response is not from a subscribed attribute.  From a get/set/toggle/increment/decrement command
-                    
-                    if (!CommandQueue.IsEmpty)
-                    {
-                        if (CommandQueue.Peek() is QueuedCommand)
-                        {
-                            // Expected response belongs to a child class
-                            QueuedCommand tempCommand = (QueuedCommand)CommandQueue.TryToDequeue();
-                            //Debug.Console(1, this, "Command Dequeued. CommandQueue Size: {0}", CommandQueue.Count);
-
-                            tempCommand.ControlPoint.ParseGetMessage(tempCommand.AttributeCode, args.Text);
-                        }
-                        else
-                        {
-                            // Expected response belongs to this class
-                            string temp = (string)CommandQueue.TryToDequeue();
-                            //Debug.Console(1, this, "Command Dequeued. CommandQueue Size: {0}", CommandQueue.Count);
-
-                        }
-
-                        if (CommandQueue.IsEmpty)
-                            CommandQueueInProgress = false;
-                        else
-                            SendNextQueuedCommand();
-
-                    }
-
-
-                }
-                else if (args.Text.IndexOf("-ERR") > -1)
-                {
-                    // Error response
-
-                    switch (args.Text)
-                    {
-                        case "-ERR ALREADY_SUBSCRIBED":
-                            {
-                                ResetSubscriptionTimer();
-                                break;
-                            }
-                        default:
-                            {
-                                Debug.Console(0, this, "Error From DSP: '{0}'", args.Text);
-                                break;
-                            }
-                    }
-
-                }
-            }
-            catch (Exception e)
-            {
-                if (Debug.Level == 2)
-                    Debug.Console(2, this, "Error parsing response: '{0}'\n{1}", args.Text, e);
-            }
-
-        }
-
-        /// <summary>
-        /// Sends a command to the DSP (with delimiter appended)
-        /// </summary>
-        /// <param name="s">Command to send</param>
-        public void SendLine(string s)
-        {
-            Debug.Console(1, this, "TX: '{0}'", s);
-            Communication.SendText(s + "\x0a");
-        }
-
-        /// <summary>
-        /// Adds a command from a child module to the queue
-        /// </summary>
-        /// <param name="command">Command object from child module</param>
-        public void EnqueueCommand(QueuedCommand commandToEnqueue)
-        {
-            CommandQueue.Enqueue(commandToEnqueue);
-            //Debug.Console(1, this, "Command (QueuedCommand) Enqueued '{0}'.  CommandQueue has '{1}' Elements.", commandToEnqueue.Command, CommandQueue.Count);
-
-            if(!CommandQueueInProgress)
-                SendNextQueuedCommand();
-        }
+using System.Text.RegularExpressions;
 
-        public override void RunPreset(int data)
+
+namespace PepperDash.Essentials.Devices.Common.DSP
+{
+
+    // QUESTIONS:
+    // 
+    // When subscribing, just use the Instance ID for Custom Name?
+
+    // Verbose on subscriptions?
+
+    // Example subscription feedback responses
+    // ! "publishToken":"name" "value":-77.0
+    // ! "myLevelName" -77
+
+    public class BiampTesiraForteDsp : DspBase
+    {
+        public IBasicCommunication Communication { get; private set; }
+        public CommunicationGather PortGather { get; private set; }
+        public StatusMonitorBase CommunicationMonitor { get; private set; }
+
+        public new Dictionary<string, TesiraForteLevelControl> LevelControlPoints { get; private set; }
+
+        public bool isSubscribed;
+
+        private CTimer SubscriptionTimer;
+
+        private CrestronQueue CommandQueue;
+
+        private bool CommandQueueInProgress = false;
+
+        //new public Dictionary<string, DspControlPoint> DialerControlPoints { get; private set; }
+
+        //new public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
+
+        /// <summary>
+        /// Shows received lines as hex
+        /// </summary>
+        public bool ShowHexResponse { get; set; }
+
+        public BiampTesiraForteDsp(string key, string name, IBasicCommunication comm,
+            BiampTesiraFortePropertiesConfig props) :
+                base(key, name)
         {
-            SendLine(String.Format("Device recallPreset {0}", data ));
+            CommandQueue = new CrestronQueue(100);
+
+            Communication = comm;
+            var socket = comm as ISocketStatus;
+            if (socket != null)
+            {
+                // This instance uses IP control
+
+                socket.ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(socket_ConnectionChange);
+            }
+            else
+            {
+                // This instance uses RS-232 control
+            }
+            PortGather = new CommunicationGather(Communication, "\x0d\x0a");
+            PortGather.LineReceived += this.Port_LineReceived;
+            if (props.CommunicationMonitorProperties != null)
+            {
+                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication,
+                    props.CommunicationMonitorProperties);
+            }
+            else
+            {
+//#warning Need to deal with this poll string
+                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 120000, 120000, 300000,
+                    "SESSION get aliases\x0d\x0a");
+            }
+
+            LevelControlPoints = new Dictionary<string, TesiraForteLevelControl>();
+
+            foreach (KeyValuePair<string, BiampTesiraForteLevelControlBlockConfig> block in props.LevelControlBlocks)
+            {
+                this.LevelControlPoints.Add(block.Key, new TesiraForteLevelControl(block.Key, block.Value, this));
+            }
+
         }
 
-        /// <summary>
-        /// Adds a raw string command to the queue
-        /// </summary>
-        /// <param name="command"></param>
-        public void EnqueueCommand(string command)
-        {
-            CommandQueue.Enqueue(command);
-            //Debug.Console(1, this, "Command (string) Enqueued '{0}'.  CommandQueue has '{1}' Elements.", command, CommandQueue.Count);
-
-            if (!CommandQueueInProgress)
-                SendNextQueuedCommand();
-        }
-
-        /// <summary>
-        /// Sends the next queued command to the DSP
-        /// </summary>
-        void SendNextQueuedCommand()
-        {
-            //Debug.Console(2, this, "Attempting to send next queued command. CommandQueueInProgress: {0}  Communication isConnected: {1}", CommandQueueInProgress, Communication.IsConnected);
-
-                //if (CommandQueue.IsEmpty)
-                //    CommandQueueInProgress = false;
-
-                //Debug.Console(1, this, "CommandQueue has {0} Elements:\n", CommandQueue.Count);
-
-                //foreach (object o in CommandQueue)
-                //{
-                //    if (o is string)
-                //        Debug.Console(1, this, "{0}", o);
-                //    else if(o is QueuedCommand)
-                //    {
-                //        var item = (QueuedCommand)o;
-                //        Debug.Console(1, this, "{0}", item.Command);
-                //    }
-                //}
-
-                //Debug.Console(1, this, "End of CommandQueue");
-
-                if (Communication.IsConnected && !CommandQueue.IsEmpty)
-                {
-                    CommandQueueInProgress = true;
-
-                    if (CommandQueue.Peek() is QueuedCommand)
-                    {
-                        QueuedCommand nextCommand = new QueuedCommand();
-
-                        nextCommand = (QueuedCommand)CommandQueue.Peek();
-
-                        SendLine(nextCommand.Command);
-                    }
-                    else
-                    {
-                        string nextCommand = (string)CommandQueue.Peek();
-
-                        SendLine(nextCommand);
-                    }
-                }
-            
-        }
-
-        /// <summary>
-        /// Sends a command to execute a preset
-        /// </summary>
-        /// <param name="name">Preset Name</param>
-        public override void RunPreset(string name)
-        {
-            SendLine(string.Format("DEVICE recallPreset {0}", name));
-        }
-
-        public class QueuedCommand
-        {
-            public string Command { get; set; }
-            public string AttributeCode { get; set; }
-            public TesiraForteControlPoint ControlPoint { get; set; }
-        }
-    }
-
-    public class BiampTesiraForteDspFactory : EssentialsDeviceFactory<BiampTesiraForteDsp>
-    {
-        public BiampTesiraForteDspFactory()
-        {
-            TypeNames = new List<string>() { "biamptesira" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new BiampTesira Device");
-            var comm = CommFactory.CreateCommForDevice(dc);
-            var props = Newtonsoft.Json.JsonConvert.DeserializeObject<BiampTesiraFortePropertiesConfig>(
-                dc.Properties.ToString());
-            return new BiampTesiraForteDsp(dc.Key, dc.Name, comm, props);
-        }
-    }
-
-}
\ No newline at end of file
+        public override bool CustomActivate()
+        {
+            Communication.Connect();
+            CommunicationMonitor.StatusChange +=
+                (o, a) => { Debug.Console(2, this, "Communication monitor state: {0}", CommunicationMonitor.Status); };
+            CommunicationMonitor.Start();
+
+            CrestronConsole.AddNewConsoleCommand(SendLine, "send" + Key, "", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s => Communication.Connect(), "con" + Key, "",
+                ConsoleAccessLevelEnum.AccessOperator);
+            return true;
+        }
+
+        private void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
+        {
+            Debug.Console(2, this, "Socket Status Change: {0}", e.Client.ClientStatus.ToString());
+
+            if (e.Client.IsConnected)
+            {
+                // Tasks on connect
+            }
+            else
+            {
+                // Cleanup items from this session
+
+                if (SubscriptionTimer != null)
+                {
+                    SubscriptionTimer.Stop();
+                    SubscriptionTimer = null;
+                }
+
+                isSubscribed = false;
+                CommandQueue.Clear();
+                CommandQueueInProgress = false;
+            }
+        }
+
+        /// <summary>
+        /// Initiates the subscription process to the DSP
+        /// </summary>
+        private void SubscribeToAttributes()
+        {
+            SendLine("SESSION set verbose true");
+
+            foreach (KeyValuePair<string, TesiraForteLevelControl> level in LevelControlPoints)
+            {
+                level.Value.Subscribe();
+            }
+
+            if (!CommandQueueInProgress)
+                SendNextQueuedCommand();
+
+            ResetSubscriptionTimer();
+        }
+
+        /// <summary>
+        /// Resets or Sets the subscription timer
+        /// </summary>
+        private void ResetSubscriptionTimer()
+        {
+            isSubscribed = true;
+
+            if (SubscriptionTimer != null)
+            {
+                SubscriptionTimer = new CTimer(o => SubscribeToAttributes(), 30000);
+                SubscriptionTimer.Reset();
+
+            }
+        }
+
+        /// <summary>
+        /// Handles a response message from the DSP
+        /// </summary>
+        /// <param name="dev"></param>
+        /// <param name="args"></param>
+        private void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
+        {
+            if (Debug.Level == 2)
+                Debug.Console(2, this, "RX: '{0}'",
+                    ShowHexResponse ? ComTextHelper.GetEscapedText(args.Text) : args.Text);
+
+            Debug.Console(1, this, "RX: '{0}'", args.Text);
+
+            try
+            {
+                if (args.Text.IndexOf("Welcome to the Tesira Text Protocol Server...") > -1)
+                {
+                    // Indicates a new TTP session
+
+                    SubscribeToAttributes();
+                }
+                else if (args.Text.IndexOf("publishToken") > -1)
+                {
+                    // response is from a subscribed attribute
+
+                    string pattern = "! \"publishToken\":[\"](.*)[\"] \"value\":(.*)";
+
+                    Match match = Regex.Match(args.Text, pattern);
+
+                    if (match.Success)
+                    {
+
+                        string key;
+
+                        string customName;
+
+                        string value;
+
+                        customName = match.Groups[1].Value;
+
+                        // Finds the key (everything before the '~' character
+                        key = customName.Substring(0, customName.IndexOf("~", 0) - 1);
+
+                        value = match.Groups[2].Value;
+
+                        foreach (KeyValuePair<string, TesiraForteLevelControl> controlPoint in LevelControlPoints)
+                        {
+                            if (customName == controlPoint.Value.LevelCustomName ||
+                                customName == controlPoint.Value.MuteCustomName)
+                            {
+                                controlPoint.Value.ParseSubscriptionMessage(customName, value);
+                                return;
+                            }
+
+                        }
+                    }
+
+                    /// same for dialers
+                    /// same for switchers
+
+                }
+                else if (args.Text.IndexOf("+OK") > -1)
+                {
+                    if (args.Text == "+OK" || args.Text.IndexOf("list\":") > -1)
+                        // Check for a simple "+OK" only 'ack' repsonse or a list response and ignore
+                        return;
+
+                    // response is not from a subscribed attribute.  From a get/set/toggle/increment/decrement command
+
+                    if (!CommandQueue.IsEmpty)
+                    {
+                        if (CommandQueue.Peek() is QueuedCommand)
+                        {
+                            // Expected response belongs to a child class
+                            QueuedCommand tempCommand = (QueuedCommand) CommandQueue.TryToDequeue();
+                            //Debug.Console(1, this, "Command Dequeued. CommandQueue Size: {0}", CommandQueue.Count);
+
+                            tempCommand.ControlPoint.ParseGetMessage(tempCommand.AttributeCode, args.Text);
+                        }
+                        else
+                        {
+                            // Expected response belongs to this class
+                            string temp = (string) CommandQueue.TryToDequeue();
+                            //Debug.Console(1, this, "Command Dequeued. CommandQueue Size: {0}", CommandQueue.Count);
+
+                        }
+
+                        if (CommandQueue.IsEmpty)
+                            CommandQueueInProgress = false;
+                        else
+                            SendNextQueuedCommand();
+
+                    }
+
+
+                }
+                else if (args.Text.IndexOf("-ERR") > -1)
+                {
+                    // Error response
+
+                    switch (args.Text)
+                    {
+                        case "-ERR ALREADY_SUBSCRIBED":
+                        {
+                            ResetSubscriptionTimer();
+                            break;
+                        }
+                        default:
+                        {
+                            Debug.Console(0, this, "Error From DSP: '{0}'", args.Text);
+                            break;
+                        }
+                    }
+
+                }
+            }
+            catch (Exception e)
+            {
+                if (Debug.Level == 2)
+                    Debug.Console(2, this, "Error parsing response: '{0}'\n{1}", args.Text, e);
+            }
+
+        }
+
+        /// <summary>
+        /// Sends a command to the DSP (with delimiter appended)
+        /// </summary>
+        /// <param name="s">Command to send</param>
+        public void SendLine(string s)
+        {
+            Debug.Console(1, this, "TX: '{0}'", s);
+            Communication.SendText(s + "\x0a");
+        }
+
+        /// <summary>
+        /// Adds a command from a child module to the queue
+        /// </summary>
+        /// <param name="command">Command object from child module</param>
+        public void EnqueueCommand(QueuedCommand commandToEnqueue)
+        {
+            CommandQueue.Enqueue(commandToEnqueue);
+            //Debug.Console(1, this, "Command (QueuedCommand) Enqueued '{0}'.  CommandQueue has '{1}' Elements.", commandToEnqueue.Command, CommandQueue.Count);
+
+            if (!CommandQueueInProgress)
+                SendNextQueuedCommand();
+        }
+
+        public void RecallPreset(IDspPreset preset)
+        {
+            if (preset == null) return;
+
+            var tesiraPreset = preset as TesiraDspPreset;
+
+            if (tesiraPreset == null) return;
+            if (!String.IsNullOrEmpty(tesiraPreset.PresetName))
+            {
+                SendLine(String.Format("Device RecallPreset {0}", tesiraPreset.PresetName));
+            }
+            if (tesiraPreset.PresetId >= 1000)
+            {
+                SendLine(String.Format("Device RecallPreset {0}", tesiraPreset.PresetId));
+            }
+            else
+            {
+                Debug.Console(0, this, "Preset {0} unable to be recalled, missing identifier", tesiraPreset.Name);
+            }
+        }
+
+        /// <summary>
+        /// Adds a raw string command to the queue
+        /// </summary>
+        /// <param name="command"></param>
+        public void EnqueueCommand(string command)
+        {
+            CommandQueue.Enqueue(command);
+            //Debug.Console(1, this, "Command (string) Enqueued '{0}'.  CommandQueue has '{1}' Elements.", command, CommandQueue.Count);
+
+            if (!CommandQueueInProgress)
+                SendNextQueuedCommand();
+        }
+
+        /// <summary>
+        /// Sends the next queued command to the DSP
+        /// </summary>
+        private void SendNextQueuedCommand()
+        {
+            //Debug.Console(2, this, "Attempting to send next queued command. CommandQueueInProgress: {0}  Communication isConnected: {1}", CommandQueueInProgress, Communication.IsConnected);
+
+            //if (CommandQueue.IsEmpty)
+            //    CommandQueueInProgress = false;
+
+            //Debug.Console(1, this, "CommandQueue has {0} Elements:\n", CommandQueue.Count);
+
+            //foreach (object o in CommandQueue)
+            //{
+            //    if (o is string)
+            //        Debug.Console(1, this, "{0}", o);
+            //    else if(o is QueuedCommand)
+            //    {
+            //        var item = (QueuedCommand)o;
+            //        Debug.Console(1, this, "{0}", item.Command);
+            //    }
+            //}
+
+            //Debug.Console(1, this, "End of CommandQueue");
+
+            if (Communication.IsConnected && !CommandQueue.IsEmpty)
+            {
+                CommandQueueInProgress = true;
+
+                if (CommandQueue.Peek() is QueuedCommand)
+                {
+                    QueuedCommand nextCommand = new QueuedCommand();
+
+                    nextCommand = (QueuedCommand) CommandQueue.Peek();
+
+                    SendLine(nextCommand.Command);
+                }
+                else
+                {
+                    string nextCommand = (string) CommandQueue.Peek();
+
+                    SendLine(nextCommand);
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Sends a command to execute a preset
+        /// </summary>
+        /// <param name="name">Preset Name</param>
+        public void RunPreset(string name)
+        {
+            SendLine(string.Format("DEVICE recallPreset {0}", name));
+        }
+
+        public class QueuedCommand
+        {
+            public string Command { get; set; }
+            public string AttributeCode { get; set; }
+            public TesiraForteControlPoint ControlPoint { get; set; }
+        }
+    }
+
+    public class BiampTesiraForteDspFactory : EssentialsDeviceFactory<BiampTesiraForteDsp>
+    {
+        public BiampTesiraForteDspFactory()
+        {
+            TypeNames = new List<string>() {"biamptesira"};
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new BiampTesira Device");
+            var comm = CommFactory.CreateCommForDevice(dc);
+            var props = Newtonsoft.Json.JsonConvert.DeserializeObject<BiampTesiraFortePropertiesConfig>(
+                dc.Properties.ToString());
+            return new BiampTesiraForteDsp(dc.Key, dc.Name, comm, props);
+        }
+    }
+
+    public class TesiraDspPreset : IDspPreset
+    {
+        public string Name { get; set; }
+        public readonly string PresetName;
+        public readonly int PresetId;
+
+    }
+
+}
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs
index 62043827..e8e38598 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs	
@@ -9,26 +9,34 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.DSP
 {
-	public abstract class DspBase : EssentialsDevice, IDspPreset
+	public abstract class DspBase : EssentialsDevice, IHasDspPresets
 	{
 		public Dictionary<string, DspControlPoint> LevelControlPoints { get; private set; }
 
         public Dictionary<string, DspControlPoint> DialerControlPoints { get; private set; }
 
-        public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
-
-		public abstract void RunPreset(string name);
+        public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
 
-	    public abstract void RunPreset(int data);
-
-		public DspBase(string key, string name) :
-			base(key, name) { }
+	    public DspBase(string key, string name) :
+	        base(key, name)
+	    {
+	        Presets = new List<IDspPreset>();
+	    }
 
 
 		// in audio call feedback
 
 		// VOIP
-		// Phone dialer
+		// Phone dialer
+
+
+	    public List<IDspPreset> Presets { get; set; }
+
+
+	    public void RecallPreset(IDspPreset preset)
+	    {
+	    }
+
 	}
 
 	// Fusion

From d9f891dfb14402da647efa1e691c9724eb127c46 Mon Sep 17 00:00:00 2001
From: Trevor Payne <tpayne@pepperdash.com>
Date: Wed, 21 Oct 2020 16:59:45 -0500
Subject: [PATCH 88/89] removed IHasDspPreset from Tesira Classes

---
 .../Gateways/CenCn2Controller.cs              | 12 ++++++++
 .../DSP/BiampTesira/BiampTesiraForteDsp.cs    | 28 -------------------
 .../Essentials Devices Common/DSP/DspBase.cs  | 11 +-------
 3 files changed, 13 insertions(+), 38 deletions(-)
 create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Gateways/CenCn2Controller.cs

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Gateways/CenCn2Controller.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Gateways/CenCn2Controller.cs
new file mode 100644
index 00000000..bdd53bde
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Gateways/CenCn2Controller.cs	
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash_Essentials_Core.Gateways
+{
+    public class CenCn2Controller
+    {
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs
index 9cce66f0..2af9586e 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs	
@@ -305,26 +305,6 @@ namespace PepperDash.Essentials.Devices.Common.DSP
                 SendNextQueuedCommand();
         }
 
-        public void RecallPreset(IDspPreset preset)
-        {
-            if (preset == null) return;
-
-            var tesiraPreset = preset as TesiraDspPreset;
-
-            if (tesiraPreset == null) return;
-            if (!String.IsNullOrEmpty(tesiraPreset.PresetName))
-            {
-                SendLine(String.Format("Device RecallPreset {0}", tesiraPreset.PresetName));
-            }
-            if (tesiraPreset.PresetId >= 1000)
-            {
-                SendLine(String.Format("Device RecallPreset {0}", tesiraPreset.PresetId));
-            }
-            else
-            {
-                Debug.Console(0, this, "Preset {0} unable to be recalled, missing identifier", tesiraPreset.Name);
-            }
-        }
 
         /// <summary>
         /// Adds a raw string command to the queue
@@ -420,12 +400,4 @@ namespace PepperDash.Essentials.Devices.Common.DSP
         }
     }
 
-    public class TesiraDspPreset : IDspPreset
-    {
-        public string Name { get; set; }
-        public readonly string PresetName;
-        public readonly int PresetId;
-
-    }
-
 }
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs
index e8e38598..0890ca49 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs	
@@ -9,7 +9,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.DSP
 {
-	public abstract class DspBase : EssentialsDevice, IHasDspPresets
+	public abstract class DspBase : EssentialsDevice
 	{
 		public Dictionary<string, DspControlPoint> LevelControlPoints { get; private set; }
 
@@ -20,7 +20,6 @@ namespace PepperDash.Essentials.Devices.Common.DSP
 	    public DspBase(string key, string name) :
 	        base(key, name)
 	    {
-	        Presets = new List<IDspPreset>();
 	    }
 
 
@@ -29,14 +28,6 @@ namespace PepperDash.Essentials.Devices.Common.DSP
 		// VOIP
 		// Phone dialer
 
-
-	    public List<IDspPreset> Presets { get; set; }
-
-
-	    public void RecallPreset(IDspPreset preset)
-	    {
-	    }
-
 	}
 
 	// Fusion

From e1a4cfca4ee87fdc75e942cbb63a93d1d2816166 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 22 Oct 2020 11:23:32 -0600
Subject: [PATCH 89/89] Add lists for additional values

---
 .../DeviceTypeInterfaces/ILanguageDefinition.cs                | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs
index f6849791..f124240d 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs	
@@ -11,5 +11,8 @@ namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
         List<LanguageLabel> UiLabels { get; set; }
         List<LanguageLabel> Sources { get; set; }
         List<LanguageLabel> Destinations { get; set; }
+        List<LanguageLabel> SourceGroupNames { get; set; } 
+        List<LanguageLabel> DestinationGroupNames { get; set; }
+        List<LanguageLabel> RoomNames { get; set; } 
     }
 }
\ No newline at end of file