Updated Interface to be more genericized

Implemented IDspPreset Interface on internal Tesira DSP

Resolves #457

.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

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",
@@ -740,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))
         {
         }

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

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);
+    }
+}

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

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    public interface ILanguageDefinition
+    {
+        string LocaleName { get; set; }
+        string FriendlyName { get; set; }
+        bool Enable { get; set; }
+        List<LanguageLabel> UiLabels { get; set; }
+        List<LanguageLabel> Sources { get; set; }
+        List<LanguageLabel> Destinations { get; set; }
+    }
+}

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

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+        public interface ILanguageProvider
+    {
+        ILanguageDefinition CurrentLanguage { get; set; }
+
+        event EventHandler CurrentLanguageChanged;
+    }
+
+}

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; }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IDspPreset.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core
+{
+    public interface IHasDspPresets
+    {
+        List<IDspPreset> Presets { get; }
+
+        void RecallPreset(IDspPreset preset);
+
+    }
+
+    public interface IDspPreset
+    {
+        string Name { get; }
+    }
+}

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

@@ -190,13 +190,18 @@
     <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" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
+    <Compile Include="DeviceTypeInterfaces\LanguageLabel.cs" />
+    <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
+    <Compile Include="DeviceTypeInterfaces\ILanguageDefinition.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" />

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>

essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs

@@ -6,390 +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();
-        }
-
-        /// <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);
-        }
-    }
-
-}
+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; }
+
+        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)
+        {
+            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;
+        }
+
+        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;
+
+    }
+
+}

essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs

@@ -9,24 +9,34 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.DSP
 {
-	public abstract class DspBase : EssentialsDevice
+	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 DspBase(string key, string name) :
-			base(key, name) { }
+        public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
+
+	    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

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);
@@ -595,12 +616,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             trilist.SetString(joinMap.Schedule.JoinNumber, meetingsData);
 
-            trilist.SetSigFalseAction(joinMap.DialMeeting.JoinNumber, () =>
+            trilist.SetSigFalseAction(joinMap.DialMeeting1.JoinNumber, () =>
             {
-                if (codec.CodecSchedule.Meetings[0].Joinable)
-                {
+                if(codec.CodecSchedule.Meetings[0] != null)
                     Dial(codec.CodecSchedule.Meetings[0]);
-                }
+            });
+            trilist.SetSigFalseAction(joinMap.DialMeeting2.JoinNumber, () =>
+            {
+                if (codec.CodecSchedule.Meetings[1] != null)
+                    Dial(codec.CodecSchedule.Meetings[1]);
+            });
+            trilist.SetSigFalseAction(joinMap.DialMeeting3.JoinNumber, () =>
+            {
+                if (codec.CodecSchedule.Meetings[2] != null)
+                    Dial(codec.CodecSchedule.Meetings[2]);
             });
 
             trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort)currentMeetings.Count);
@@ -783,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)
                 {

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

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()
@@ -552,9 +580,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         {
             CrestronConsole.AddNewConsoleCommand(SetCommDebug, "SetCodecCommDebug", "0 for Off, 1 for on",
                 ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(s => SendText("zCommand Phonebook List Offset: 0 Limit: 512"),
-                "GetZoomRoomContacts", "Triggers a refresh of the codec phonebook",
-                ConsoleAccessLevelEnum.AccessOperator);
+            if (!_props.DisablePhonebookAutoDownload)
+            {
+                CrestronConsole.AddNewConsoleCommand(s => SendText("zCommand Phonebook List Offset: 0 Limit: 512"),
+                    "GetZoomRoomContacts", "Triggers a refresh of the codec phonebook",
+                    ConsoleAccessLevelEnum.AccessOperator);
+            }
+
             CrestronConsole.AddNewConsoleCommand(s => GetBookings(), "GetZoomRoomBookings",
                 "Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator);
 
@@ -816,7 +848,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");
                             }
@@ -1063,6 +1095,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                             {
                                 JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.Sharing);
 
+                                SetLayout();
+
                                 break;
                             }
                             case "incomingcallindication":
@@ -1175,6 +1209,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                                 break;
                             }
+                            case "phonecallstatus":
+                            {
+                                JsonConvert.PopulateObject(responseObj.ToString(), Status.PhoneCall);
+                                break;
+                            }
                             default:
                             {
                                 break;
@@ -1222,8 +1261,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                             {
                                 JsonConvert.PopulateObject(responseObj.ToString(), Status.Sharing);
 
-                                SetLayout();
-
                                 break;
                             }
                             case "numberofscreens":
@@ -1290,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))
@@ -1350,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;
 
@@ -1427,6 +1465,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 SetLayout();
             }
         }
+
         public override void StartSharing()
         {
             SendText("zCommand Call Sharing HDMI Start");
@@ -1566,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()
@@ -1580,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)
@@ -1629,7 +1680,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public override void SendDtmf(string s)
         {
-            throw new NotImplementedException();
+            SendDtmfToPhone(s);
         }
 
         /// <summary>
@@ -1709,6 +1760,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()
         {
@@ -1753,7 +1805,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]);
@@ -1764,16 +1817,44 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         {
             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()
+        private 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
+
+        #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
     }