fix(essentials): reworks logic for setting up cameras to wait until codec communication sync has finished

Adds ability to disable auto dialing behavior of selected directory contact.
Adds XSig to send contact method info across bridge
Adds XSig to send call history data across bridge and also joins to manipulate

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

@@ -46,6 +46,14 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete RawOccupancyUsFeedback = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Raw Occupancy Us Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        [JoinName("IdentityModeOn")]
+        public JoinDataComplete IdentityMode = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
+            new JoinMetadata { Description = "Enable Identity Mode", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("IdentityModeFeedback")]
+        public JoinDataComplete IdentityModeFeedback = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
+            new JoinMetadata { Description = "Identity Mode Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
         [JoinName("EnableLedFlash")]
         public JoinDataComplete EnableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Led Flash", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });

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

@@ -5,6 +5,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
     {
+
+        #region Digital
+
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(
             new JoinData
@@ -19,20 +22,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 1,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sensor Name",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
+        
         [JoinName("Enable")]
         public JoinDataComplete Enable = new JoinDataComplete(
             new JoinData
@@ -101,7 +91,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 Description = "Sensor Decrease Sensitivity",
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
-            });
+            });        
+
+        #endregion
+
+        #region Analog
 
         [JoinName("Sensitivity")]
         public JoinDataComplete Sensitivity = new JoinDataComplete(
@@ -117,6 +111,28 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
+        #endregion
+
+
+        #region Serial
+
+        [JoinName("Name")]
+        public JoinDataComplete Name = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 1,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Name",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        #endregion
+
+
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it
         /// </summary>

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

@@ -20,6 +20,20 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
+        [JoinName("SendDtmfToSpecificCallIndex")]
+        public JoinDataComplete SendDtmfToSpecificCallIndex = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 10,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "If High, will send DTMF tones to the call set by SelectCall analog.  If low sends DTMF tones to last connected call.",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
 		[JoinName("1")]
 		public JoinDataComplete Dtmf1 = new JoinDataComplete(
 			new JoinData
@@ -188,8 +202,8 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-		[JoinName("EndCall")]
-		public JoinDataComplete EndCall = new JoinDataComplete(
+        [JoinName("EndAllCalls")]
+		public JoinDataComplete EndAllCalls = new JoinDataComplete(
 			new JoinData
 			{
 				JoinNumber = 24,
@@ -197,7 +211,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Hang Up",
+				Description = "End All Calls",
 				JoinCapabilities = eJoinCapabilities.FromSIMPL,
 				JoinType = eJoinType.Digital
 			});
@@ -328,6 +342,48 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
+        [JoinName("EndCallStart")]
+        public JoinDataComplete EndCallStart = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 81,
+                JoinSpan = 8
+            },
+            new JoinMetadata
+            {
+                Description = "End a specific call by call index. ",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("JoinAllCalls")]
+        public JoinDataComplete JoinAllCalls = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 90,
+                JoinSpan = 8
+            },
+            new JoinMetadata
+            {
+                Description = "End a specific call by call index. ",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("JoinCallStart")]
+        public JoinDataComplete JoinCallStart = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 91,
+                JoinSpan = 8
+            },
+            new JoinMetadata
+            {
+                Description = "End a specific call by call index. ",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
 		[JoinName("DirectorySearchBusy")]
 		public JoinDataComplete DirectorySearchBusy = new JoinDataComplete(
 			new JoinData
@@ -440,6 +496,19 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
+        [JoinName("DirectoryDisableAutoDialSelectedLine")]
+        public JoinDataComplete DirectoryDisableAutoDialSelectedLine = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 107,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Set high to disable automatic dialing of a contact when selected",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
 
 		[JoinName("CameraTiltUp")]
 		public JoinDataComplete CameraTiltUp = new JoinDataComplete(
@@ -525,6 +594,48 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
+        [JoinName("CameraFocusNear")]
+        public JoinDataComplete CameraFocusNear = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 117,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Camera Focus Near",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("CameraFocusFar")]
+        public JoinDataComplete CameraFocusFar = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 118,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Camera Focus Far",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("CameraFocusAuto")]
+        public JoinDataComplete CameraFocusAuto = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 119,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Camera Auto Focus Trigger",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
 		[JoinName("CameraPresetSave")]
 		public JoinDataComplete CameraPresetSave = new JoinDataComplete(
 			new JoinData
@@ -534,7 +645,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Save Selected Preset",
+				Description = "Pulse to save selected preset.  FB will pulse for 3s when preset saved.",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
 			});
@@ -805,6 +916,20 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
+        [JoinName("RemoveSelectedRecentCallItem")]
+        public JoinDataComplete RemoveSelectedRecentCallItem = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 181,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Removes the selected recent call item",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
 		[JoinName("SourceShareStart")]
 		public JoinDataComplete SourceShareStart = new JoinDataComplete(
 			new JoinData
@@ -875,6 +1000,34 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
+        [JoinName("HoldCallsStart")]
+        public JoinDataComplete HoldCallsStart = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 221,
+                JoinSpan = 8
+            },
+            new JoinMetadata
+            {
+                Description = "Holds Call at specified index",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("ResumeCallsStart")]
+        public JoinDataComplete ResumeCallsStart = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 231,
+                JoinSpan = 8
+            },
+            new JoinMetadata
+            {
+                Description = "Resume Call at specified index",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
         [JoinName("ParticipantAudioMuteToggleStart")]
         public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
 			new JoinData 
@@ -924,6 +1077,35 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 
 		#region Analog
 
+        [JoinName("SelectCall")]
+        public JoinDataComplete SelectCall = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 24,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sets the selected Call for DTMF commands. Valid values 1-8",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
+
+        [JoinName("ConnectedCallCount")]
+        public JoinDataComplete ConnectedCallCount = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 25,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Reports the number of currently connected calls",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
 		[JoinName("MinutesBeforeMeetingStart")]
 		public JoinDataComplete MinutesBeforeMeetingStart = new JoinDataComplete(
 			new JoinData
@@ -947,11 +1129,25 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Camera Number Select/FB",
+				Description = "Camera Number Select/FB.  1 based index.  Valid range is 1 to the value reported by CameraCount.",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Analog
 			});
 
+        [JoinName("CameraCount")]
+        public JoinDataComplete CameraCount = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 61,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Reports the number of cameras",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
 		[JoinName("DirectoryRowCount")]
 		public JoinDataComplete DirectoryRowCount = new JoinDataComplete(
 			new JoinData
@@ -990,10 +1186,24 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			new JoinMetadata
 			{
 				Description = "Camera Preset Select",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
 				JoinType = eJoinType.Analog
 			});
 
+        [JoinName("FarEndPresetSelect")]
+        public JoinDataComplete FarEndPresetSelect = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 122,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Far End Preset Preset Select",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
 		[JoinName("ParticipantCount")]
 		public JoinDataComplete ParticipantCount = new JoinDataComplete(
 			new JoinData
@@ -1036,6 +1246,34 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Analog
 			});
 
+        [JoinName("SelectRecentCallItem")]
+        public JoinDataComplete SelectRecentCallItem = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 180,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Select/FB for Recent Call Item.  Valid values 1 - 10",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
+        [JoinName("RecentCallOccurrenceType")]
+        public JoinDataComplete RecentCallOccurrenceType = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 181,
+                JoinSpan = 10
+            },
+            new JoinMetadata
+            {
+                Description = "Recent Call Occurrence Type. [0-3] 0 = Unknown, 1 = Placed, 2 = Received, 3 = NoAnswer",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
 		#endregion
 
 
@@ -1169,6 +1407,20 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Serial
 			});
 
+        [JoinName("ContactMethods")]
+        public JoinDataComplete ContactMethods = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 103,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Contact Methods - XSig, 10 entries",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
 		[JoinName("CameraPresetNames")]
 		public JoinDataComplete CameraPresetNames = new JoinDataComplete(
 			new JoinData
@@ -1211,6 +1463,76 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Serial
 			});
 
+        [JoinName("CameraNamesFb")]
+        public JoinDataComplete CameraNamesFb = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 161,
+                JoinSpan = 10
+            },
+            new JoinMetadata
+            {
+                Description = "Camera Name Fb",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        [JoinName("SelectedRecentCallName")]
+        public JoinDataComplete SelectedRecentCallName = new JoinDataComplete(
+         new JoinData
+         {
+             JoinNumber = 171,
+             JoinSpan = 1
+         },
+         new JoinMetadata
+         {
+             Description = "Selected Recent Call Name",
+             JoinCapabilities = eJoinCapabilities.ToSIMPL,
+             JoinType = eJoinType.Serial
+         });
+
+        [JoinName("SelectedRecentCallNumber")]
+        public JoinDataComplete SelectedRecentCallNumber = new JoinDataComplete(
+         new JoinData
+         {
+             JoinNumber = 172,
+             JoinSpan = 1
+         },
+         new JoinMetadata
+         {
+             Description = "Selected Recent Call Number",
+             JoinCapabilities = eJoinCapabilities.ToSIMPL,
+             JoinType = eJoinType.Serial
+         });
+
+        [JoinName("RecentCallNamesStart")]
+        public JoinDataComplete RecentCallNamesStart = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 181,
+                JoinSpan = 10
+            },
+            new JoinMetadata
+            {
+                Description = "Recent Call Names",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        [JoinName("RecentCallTimesStart")]
+        public JoinDataComplete RecentCallTimesStart = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 191,
+                JoinSpan = 10
+            },
+            new JoinMetadata
+            {
+                Description = "Recent Calls Times",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
 		[JoinName("CurrentSource")]
 		public JoinDataComplete CurrentSource = new JoinDataComplete(
 			new JoinData

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/CenOdtOccupancySensorBaseController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Resources;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
@@ -61,6 +62,8 @@ namespace PepperDash.Essentials.Core
 
 		public BoolFeedback RawOccupancyUsFeedback { get; private set; }
 
+        public BoolFeedback IdentityModeFeedback { get; private set; }
+
 		// Debug properties
 		public bool InTestMode { get; private set; }
 
@@ -117,6 +120,8 @@ namespace PepperDash.Essentials.Core
 
 			RawOccupancyUsFeedback = new BoolFeedback(() => OccSensor.RawOccupancyDetectedByUltrasonicSensorFeedback.BoolValue);
 
+            IdentityModeFeedback = new BoolFeedback(()=>OccSensor.IdentityModeOnFeedback.BoolValue);
+
 			UltrasonicSensitivityInVacantStateFeedback = new IntFeedback(() => (int)OccSensor.UltrasonicSensorSensitivityInVacantStateFeedback);
 
 			UltrasonicSensitivityInOccupiedStateFeedback = new IntFeedback(() => (int)OccSensor.UltrasonicSensorSensitivityInOccupiedStateFeedback);
@@ -199,6 +204,27 @@ namespace PepperDash.Essentials.Core
             {
                 SetAndWhenVacatedState((bool)PropertiesConfig.AndWhenVacatedState);
             }
+
+            // TODO [ ] feature/cenoodtcpoe-sensor-sensitivity-configuration
+            if (PropertiesConfig.UsSensitivityOccupied != null)
+            {
+                SetUsSensitivityOccupied((ushort)PropertiesConfig.UsSensitivityOccupied);
+            }
+
+            if (PropertiesConfig.UsSensitivityVacant != null)
+            {
+                SetUsSensitivityVacant((ushort)PropertiesConfig.UsSensitivityVacant);
+            }
+
+            if (PropertiesConfig.PirSensitivityOccupied != null)
+            {
+                SetPirSensitivityOccupied((ushort)PropertiesConfig.PirSensitivityOccupied);
+            }
+
+            if (PropertiesConfig.PirSensitivityVacant != null)
+            {
+                SetPirSensitivityVacant((ushort)PropertiesConfig.PirSensitivityVacant);
+            }
         }
 
 		/// <summary>
@@ -279,7 +305,21 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 
-		/// <summary>
+        /// <summary>
+        /// Sets the identity mode on or off
+        /// </summary>
+        /// <param name="state"></param>
+	    public void SetIdentityMode(bool state)
+        {
+            if (state)
+                OccSensor.IdentityModeOn();
+            else
+                OccSensor.IdentityModeOff();
+
+            Debug.Console(1, this, "Identity Mode: {0}", OccSensor.IdentityModeOnFeedback.BoolValue ? "On" : "Off");
+        }
+
+	    /// <summary>
 		/// Enables or disables the PIR sensor
 		/// </summary>
 		/// <param name="state"></param>
@@ -506,6 +546,54 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 
+        /// <summary>
+        /// Sets the US sensor sensitivity for occupied state
+        /// </summary>
+        /// <param name="sensitivity"></param>
+	    public void SetUsSensitivityOccupied(ushort sensitivity)
+        {
+            var level = (eSensitivityLevel) sensitivity;
+            if (level == 0) return;
+
+            OccSensor.UltrasonicSensorSensitivityInOccupiedState = level;
+        }
+
+        /// <summary>
+        /// Sets the US sensor sensitivity for vacant state
+        /// </summary>
+        /// <param name="sensitivity"></param>
+        public void SetUsSensitivityVacant(ushort sensitivity)
+        {
+            var level = (eSensitivityLevel)sensitivity;
+            if (level == 0) return;
+
+            OccSensor.UltrasonicSensorSensitivityInVacantState = level;
+        }
+
+        /// <summary>
+        /// Sets the PIR sensor sensitivity for occupied state
+        /// </summary>
+        /// <param name="sensitivity"></param>
+        public void SetPirSensitivityOccupied(ushort sensitivity)
+        {
+            var level = (eSensitivityLevel)sensitivity;
+            if (level == 0) return;
+
+            OccSensor.PassiveInfraredSensorSensitivityInOccupiedState = level;
+        }
+
+        /// <summary>
+        /// Sets the PIR sensor sensitivity for vacant state
+        /// </summary>
+        /// <param name="sensitivity"></param>
+        public void SetPirSensitivityVacant(ushort sensitivity)
+        {
+            var level = (eSensitivityLevel)sensitivity;
+            if (level == 0) return;
+
+            OccSensor.PassiveInfraredSensorSensitivityInVacantState = level;
+        }
+
 		/// <summary>
 		/// Method to print current settings to console
 		/// </summary>
@@ -647,8 +735,11 @@ namespace PepperDash.Essentials.Core
 
 			//Sensor Raw States
 			occController.RawOccupancyPirFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyPirFeedback.JoinNumber]);
-			occController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback.JoinNumber]);
-
+			occController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback.JoinNumber]);  
+         
+            // Identity mode
+		    trilist.SetBoolSigAction(joinMap.IdentityMode.JoinNumber, occController.SetIdentityMode);
+            occController.IdentityModeFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IdentityModeFeedback.JoinNumber]);
 		}
 
 		public class CenOdtOccupancySensorBaseControllerFactory : EssentialsDeviceFactory<CenOdtOccupancySensorBaseController>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorPropertiesConfig.cs

@@ -47,5 +47,35 @@ namespace PepperDash.Essentials.Core
 
         [JsonProperty("andWhenVacatedState")]
         public bool? AndWhenVacatedState { get; set; }
+
+        // PoE Sensors: CenOdtCPoe
+
+        /// <summary>
+        /// Sets the sensitivity level for US while sensor is in occupied state
+        /// 1 = low; 2 = medium; 3 = high; 4 = xlow; 5 = 2xlow; 6 = 3xlow
+        /// </summary>
+        [JsonProperty("usSensitivityOccupied")]
+        public ushort? UsSensitivityOccupied { get; set; }
+
+        /// <summary>
+        /// Sets the sensitivity level for US while sensor is in vacant state
+        /// 1 = low; 2 = medium; 3 = high; 4 = xlow; 5 = 2xlow; 6 = 3xlow
+        /// </summary>
+        [JsonProperty("usSensitivityVacant")]
+        public ushort? UsSensitivityVacant { get; set; }
+
+        /// <summary>
+        /// Sets the sensitivity level for PIR while sensor is in occupied state
+        /// 1 = low; 2 = medium; 3 = high
+        /// </summary>
+        [JsonProperty("pirSensitivityOccupied")]
+        public ushort? PirSensitivityOccupied { get; set; }
+
+        /// <summary>
+        /// Sets the sensitivity level for PIR while sensor is in vacant state
+        /// 1 = low; 2 = medium; 3 = high
+        /// </summary>
+        [JsonProperty("pirSensitivityVacant")]
+        public ushort? PirSensitivityVacant { get; set; }
     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorController.cs

@@ -1,4 +1,5 @@
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.GeneralIO;
 using Newtonsoft.Json;
@@ -9,15 +10,18 @@ using PepperDash.Essentials.Core.Bridges.JoinMaps;
 using System;
 using System.Collections.Generic;
 using PepperDash.Essentials.Core.Config;
+using PepperDash_Essentials_Core.PartitionSensor;
 
 namespace PepperDash.Essentials.Core
 {
 	[Description("Wrapper class for GLS Cresnet Partition Sensor")]
 	public class GlsPartitionSensorController : CrestronGenericBridgeableBaseDevice, IPartitionStateProvider
 	{
-		private GlsPartCn _partitionSensor;
 
-		public StringFeedback NameFeedback { get; private set; }
+        public GlsPartitionSensorPropertiesConfig PropertiesConfig { get; private set; }
+        
+        private GlsPartCn _partitionSensor;
+
 		public BoolFeedback EnableFeedback { get; private set; }
 		public BoolFeedback PartitionPresentFeedback { get; private set; }
 		public BoolFeedback PartitionNotSensedFeedback { get; private set; }
@@ -32,23 +36,71 @@ namespace PepperDash.Essentials.Core
 		public GlsPartitionSensorController(string key, Func<DeviceConfig, GlsPartCn> preActivationFunc, DeviceConfig config)
 			: base(key, config.Name)
 		{
+
+		    var props = config.Properties.ToObject<GlsPartitionSensorPropertiesConfig>();
+		    if (props != null)
+		    {
+		        PropertiesConfig = props;
+		    }
+		    else
+		    {
+		        Debug.Console(1, this, "props are null.  Unable to deserialize into GlsPartSensorPropertiesConfig");
+		    }
+
             AddPreActivationAction(() =>
             {
                 _partitionSensor = preActivationFunc(config);
-
+                
                 RegisterCrestronGenericBase(_partitionSensor);
-
-                NameFeedback = new StringFeedback(() => Name);
+                                
                 EnableFeedback = new BoolFeedback(() => InTestMode ? TestEnableFeedback : _partitionSensor.EnableFeedback.BoolValue);
                 PartitionPresentFeedback = new BoolFeedback(() => InTestMode ? TestPartitionSensedFeedback : _partitionSensor.PartitionSensedFeedback.BoolValue);
                 PartitionNotSensedFeedback = new BoolFeedback(() => InTestMode ? !TestPartitionSensedFeedback : _partitionSensor.PartitionNotSensedFeedback.BoolValue);
                 SensitivityFeedback = new IntFeedback(() => InTestMode ? TestSensitivityFeedback : _partitionSensor.SensitivityFeedback.UShortValue);
 
-                if (_partitionSensor != null) _partitionSensor.BaseEvent += PartitionSensor_BaseEvent;
+                if (_partitionSensor != null)
+                {
+                    _partitionSensor.BaseEvent += PartitionSensor_BaseEvent;                    
+                }
             });
-		}
 
-		private void PartitionSensor_BaseEvent(GenericBase device, BaseEventArgs args)
+            AddPostActivationAction(() =>
+            {
+                _partitionSensor.OnlineStatusChange += (o, a) =>
+                {
+                    if (a.DeviceOnLine)
+                    {
+                        ApplySettingsToSensorFromConfig();
+                    }
+                };
+
+                if (_partitionSensor.IsOnline)
+                {
+                    ApplySettingsToSensorFromConfig();
+                }
+            });
+		}        
+
+	    private void ApplySettingsToSensorFromConfig()
+	    {
+	        if (_partitionSensor.IsOnline == false) return;
+
+	        Debug.Console(1, this, "Attempting to apply settings to sensor from config");            
+
+	        if (PropertiesConfig.Sensitivity != null)
+	        {
+	            Debug.Console(1, this, "Sensitivity found, attempting to set value '{0}' from config",
+	                PropertiesConfig.Sensitivity);
+                _partitionSensor.Sensitivity.UShortValue = (ushort) PropertiesConfig.Sensitivity;
+	        }	        
+	        else
+	        {
+	            Debug.Console(1, this, "Sensitivity null, no value specified in config");
+	        }
+
+	    }
+
+	    private void PartitionSensor_BaseEvent(GenericBase device, BaseEventArgs args)
 		{
 			Debug.Console(2, this, "EventId: {0}, Index: {1}", args.EventId, args.Index);
 
@@ -61,11 +113,13 @@ namespace PepperDash.Essentials.Core
 					}
 				case (GlsPartCn.PartitionSensedFeedbackEventId):
 					{
+                        Debug.Console(1, this, "Partition Sensed State: {0}", _partitionSensor.PartitionSensedFeedback.BoolValue);
 						PartitionPresentFeedback.FireUpdate();
 						break;
 					}
 				case (GlsPartCn.PartitionNotSensedFeedbackEventId):
 					{
+                        Debug.Console(1, this, "Partition Not Sensed State: {0}", _partitionSensor.PartitionNotSensedFeedback.BoolValue);
 						PartitionNotSensedFeedback.FireUpdate();
 						break;
 					}
@@ -73,7 +127,7 @@ namespace PepperDash.Essentials.Core
 					{
 						SensitivityFeedback.FireUpdate();
 						break;
-					}
+					}                    
 				default:
 					{
 						Debug.Console(2, this, "Unhandled args.EventId: {0}", args.EventId);
@@ -133,7 +187,22 @@ namespace PepperDash.Essentials.Core
 			Debug.Console(1, this, "InTestMode: {0}, unable to set sensitivity value: {1}", InTestMode.ToString(), value);
 		}
 
-		public void SetEnableState(bool state)
+	    public void GetSettings()
+	    {
+	        var dash = new string('*', 50);
+	        CrestronConsole.PrintLine(string.Format("{0}\n", dash));
+
+	        Debug.Console(0, this, "Enabled State: {0}", _partitionSensor.EnableFeedback.BoolValue);
+
+	        Debug.Console(0, this, "Partition Sensed State: {0}", _partitionSensor.PartitionSensedFeedback.BoolValue);
+	        Debug.Console(0, this, "Partition Not Sensed State: {0}", _partitionSensor.PartitionNotSensedFeedback.BoolValue);
+
+	        Debug.Console(0, this, "Sensitivity Value: {0}", _partitionSensor.SensitivityFeedback.UShortValue);
+
+	        CrestronConsole.PrintLine(string.Format("{0}\n", dash));
+	    }
+
+	    public void SetEnableState(bool state)
 		{
             Debug.Console(2, this, "Sensor is {0}, SetEnableState: {1}", _partitionSensor == null ? "null" : "not null", state);
 			if (_partitionSensor == null)
@@ -189,18 +258,20 @@ namespace PepperDash.Essentials.Core
 			Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 			Debug.Console(0, this, "Linking to Bridge Type {0}", GetType().Name);
 
-			// link input from simpl
+            IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);            
+		    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = _partitionSensor.Name;
+			
 		    trilist.SetBoolSigAction(joinMap.Enable.JoinNumber, SetEnableState);
+            EnableFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Enable.JoinNumber]);
+
+            PartitionPresentFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionSensed.JoinNumber]);
+            PartitionNotSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionNotSensed.JoinNumber]);
+
 			trilist.SetSigTrueAction(joinMap.IncreaseSensitivity.JoinNumber, IncreaseSensitivity);
 			trilist.SetSigTrueAction(joinMap.DecreaseSensitivity.JoinNumber, DecreaseSensitivity);
-			trilist.SetUShortSigAction(joinMap.Sensitivity.JoinNumber, SetSensitivity);
 
-			// link output to simpl
-			IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-			EnableFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Enable.JoinNumber]);
-			PartitionPresentFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionSensed.JoinNumber]);
-			PartitionNotSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionNotSensed.JoinNumber]);
-			SensitivityFeedback.LinkInputSig(trilist.UShortInput[joinMap.Sensitivity.JoinNumber]);
+            SensitivityFeedback.LinkInputSig(trilist.UShortInput[joinMap.Sensitivity.JoinNumber]);
+            trilist.SetUShortSigAction(joinMap.Sensitivity.JoinNumber, SetSensitivity);
 
 			FeedbacksFireUpdates();
 
@@ -218,6 +289,7 @@ namespace PepperDash.Essentials.Core
 			{
 				if (a.DeviceOnLine)
 				{
+				    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = _partitionSensor.Name;
 					FeedbacksFireUpdates();
 				}
 			};
@@ -225,8 +297,7 @@ namespace PepperDash.Essentials.Core
 
 		private void FeedbacksFireUpdates()
 		{
-			IsOnline.FireUpdate();
-			NameFeedback.FireUpdate();
+			IsOnline.FireUpdate();			
 			EnableFeedback.FireUpdate();
 			PartitionPresentFeedback.FireUpdate();
 			PartitionNotSensedFeedback.FireUpdate();

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorPropertiesConfig.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+
+namespace PepperDash_Essentials_Core.PartitionSensor
+{
+    public class GlsPartitionSensorPropertiesConfig
+    {
+        /// <summary>
+        /// Sets the sensor sensitivity        
+        /// </summary>
+        /// <remarks>
+        /// The sensitivity range shall be between 1(lowest) to 10 (highest).
+        /// </remarks>
+        [JsonProperty("sensitivity")]
+        public ushort? Sensitivity { get; set; }
+    }
+}

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

@@ -236,6 +236,7 @@
     <Compile Include="Occupancy\GlsOccupancySensorPropertiesConfig.cs" />
     <Compile Include="Occupancy\GlsOirOccupancySensorController.cs" />
     <Compile Include="PartitionSensor\EssentialsPartitionController.cs" />
+    <Compile Include="PartitionSensor\GlsPartitionSensorPropertiesConfig.cs" />
     <Compile Include="PartitionSensor\IPartitionStateProvider.cs" />
     <Compile Include="Occupancy\OccupancyAggregatorConfig.cs" />
     <Compile Include="Queues\ComsMessage.cs" />

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

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

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

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

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

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

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

@@ -108,6 +108,7 @@
     <Compile Include="Codec\eCodecCallStatus.cs" />
     <Compile Include="Codec\eMeetingPrivacy.cs" />
     <Compile Include="Codec\iCodecAudio.cs" />
+    <Compile Include="Codec\IHasCallHold.cs" />
     <Compile Include="Codec\IHasDoNotDisturb.cs" />
     <Compile Include="Codec\IHasExternalSourceSwitching.cs" />
     <Compile Include="ImageProcessors\TVOneCorio.cs" />
@@ -129,6 +130,7 @@
     <Compile Include="VideoCodec\Interfaces\IHasSelfviewSize.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasStandbyMode.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasStartMeeting.cs" />
+    <Compile Include="VideoCodec\Interfaces\IJoinCalls.cs" />
     <Compile Include="VideoCodec\Interfaces\iVideoCodecInfo.cs" />
     <Compile Include="Codec\iHasCallFavorites.cs" />
     <Compile Include="Codec\iHasCallHistory.cs" />

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

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

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

@@ -9,6 +9,34 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
     {
         #region Digital
 
+        [JoinName("PresentationLocalOnly")]
+        public JoinDataComplete PresentationLocalOnly = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 205,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Presentation Local Only Feedback",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("PresentationLocalRemote")]
+        public JoinDataComplete PresentationLocalRemote = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 206,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Presentation Local Only Feedback",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
         [JoinName("ActivateDoNotDisturbMode")]
         public JoinDataComplete ActivateDoNotDisturbMode = new JoinDataComplete(
             new JoinData
@@ -112,6 +140,34 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         #region Analog
 
+        [JoinName("RingtoneVolume")]
+        public JoinDataComplete RingtoneVolume = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 21,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Ringtone volume set/FB.  Valid values are 0 - 100 in increments of 5 (5, 10, 15, 20, etc.)",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
+        [JoinName("PresentationSource")]
+        public JoinDataComplete PresentationSource = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 201,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Presentation set/FB.  Valid values are 0 - 6 depending on the codec model.",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
 
         #endregion
 

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

@@ -30,8 +30,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         IHasScheduleAwareness, IOccupancyStatusProvider, IHasCodecLayouts, IHasCodecSelfView,
         ICommunicationMonitor, IRouting, IHasCodecCameras, IHasCameraAutoMode, IHasCodecRoomPresets, 
         IHasExternalSourceSwitching, IHasBranding, IHasCameraOff, IHasCameraMute, IHasDoNotDisturbMode,
-        IHasHalfWakeMode
+        IHasHalfWakeMode, IHasCallHold, IJoinCalls
     {
+        private CiscoSparkCodecPropertiesConfig _config;
+
         private bool _externalSourceChangeRequested;
 
         public event EventHandler<DirectoryEventArgs> DirectoryResultReturned;
@@ -42,11 +44,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public StatusMonitorBase CommunicationMonitor { get; private set; }
 
-        private GenericQueue ReceiveQueue;
+        private GenericQueue _receiveQueue;
 
 		public BoolFeedback PresentationViewMaximizedFeedback { get; private set; }
 
-		string CurrentPresentationView;
+		private string _currentPresentationView;
 
         public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
 
@@ -64,9 +66,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public BoolFeedback FarEndIsSharingContentFeedback { get; private set; }
 
-        private CodecCommandWithLabel CurrentSelfviewPipPosition;
+        public IntFeedback RingtoneVolumeFeedback { get; private set; }
 
-        private CodecCommandWithLabel CurrentLocalLayout;
+        private CodecCommandWithLabel _currentSelfviewPipPosition;
+
+        private CodecCommandWithLabel _currentLocalLayout;
 
         /// <summary>
         /// List the available positions for the selfview PIP window
@@ -165,7 +169,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             get 
             {
-                return () => PresentationSourceKey;
+                return () => _presentationSourceKey;
             }
         }
 
@@ -229,7 +233,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             get
             {               
-                return () => CurrentSelfviewPipPosition.Label;
+                return () => _currentSelfviewPipPosition.Label;
             }
         }
 
@@ -237,7 +241,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             get
             {
-                return () => CurrentLocalLayout.Label;
+                return () => _currentLocalLayout.Label;
             }
         }
 
@@ -245,43 +249,58 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             get
             {
-                return () => CurrentLocalLayout.Label == "Prominent";
+                return () => _currentLocalLayout.Label == "Prominent";
             }
         }
 
 
-        private string CliFeedbackRegistrationExpression;
+        private string _cliFeedbackRegistrationExpression;
 
-        private CodecSyncState SyncState;
+        private CodecSyncState _syncState;
 
         public CodecPhonebookSyncState PhonebookSyncState { get; private set; }
 
-        private StringBuilder JsonMessage;
+        private StringBuilder _jsonMessage;
 
-        private bool JsonFeedbackMessageIsIncoming;
+        private bool _jsonFeedbackMessageIsIncoming;
 
         public bool CommDebuggingIsOn;
 
         string Delimiter = "\r\n";
 
+        public IntFeedback PresentationSourceFeedback { get; private set; }
+
+        public BoolFeedback PresentationSendingLocalOnlyFeedback { get; private set; }
+
+        public BoolFeedback PresentationSendingLocalRemoteFeedback { get; private set; }
+
         /// <summary>
         /// Used to track the current connector used for the presentation source
         /// </summary>
-        int PresentationSource;
+        private int _presentationSource;
 
-        string PresentationSourceKey;
+        /// <summary>
+        /// Used to track the connector that is desired to be the current presentation source (until the command is send)
+        /// </summary>
+        private int _desiredPresentationSource;
 
-        string PhonebookMode = "Local"; // Default to Local
+        private string _presentationSourceKey;
 
-        uint PhonebookResultsLimit = 255; // Could be set later by config.
+        private bool _presentationLocalOnly;
 
-        CTimer LoginMessageReceivedTimer;
-		CTimer RetryConnectionTimer;
+        private bool _presentationLocalRemote;
+
+        private string _phonebookMode = "Local"; // Default to Local
+
+        private uint _phonebookResultsLimit = 255; // Could be set later by config.
+
+        private CTimer _loginMessageReceivedTimer;
+        private CTimer _retryConnectionTimer;
 
         // **___________________________________________________________________**
         //  Timers to be moved to the global system timer at a later point....
-        CTimer BookingsRefreshTimer;
-        CTimer PhonebookRefreshTimer;
+        private CTimer BookingsRefreshTimer;
+        private CTimer PhonebookRefreshTimer;
         // **___________________________________________________________________**
 
         public RoutingInputPort CodecOsdIn { get; private set; }
@@ -297,14 +316,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             var props = JsonConvert.DeserializeObject<Codec.CiscoSparkCodecPropertiesConfig>(config.Properties.ToString());
 
+            _config = props;
+
             // Use the configured phonebook results limit if present
             if (props.PhonebookResultsLimit > 0)
             {
-                PhonebookResultsLimit = props.PhonebookResultsLimit;
+                _phonebookResultsLimit = props.PhonebookResultsLimit;
             }
 
             // The queue that will collect the repsonses in the order they are received
-            ReceiveQueue = new GenericQueue(this.Key + "-rxQueue", 25);
+            _receiveQueue = new GenericQueue(this.Key + "-rxQueue", 25);
 
             RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
             PeopleCountFeedback = new IntFeedback(PeopleCountFeedbackFunc);
@@ -322,7 +343,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             HalfWakeModeIsOnFeedback = new BoolFeedback(() => CodecStatus.Status.Standby.State.Value.ToLower() == "halfwake");
             EnteringStandbyModeFeedback = new BoolFeedback(() => CodecStatus.Status.Standby.State.Value.ToLower() == "enteringstandby");
 
-			PresentationViewMaximizedFeedback = new BoolFeedback(() => CurrentPresentationView == "Maximized");
+			PresentationViewMaximizedFeedback = new BoolFeedback(() => _currentPresentationView == "Maximized");
+
+            RingtoneVolumeFeedback = new IntFeedback(() => CodecConfiguration.Configuration.Audio.SoundsAndAlerts.RingVolume.Volume);
+
+            PresentationSourceFeedback = new IntFeedback(() => _presentationSource);
+            PresentationSendingLocalOnlyFeedback = new BoolFeedback(() => _presentationLocalOnly);
+            PresentationSendingLocalRemoteFeedback = new BoolFeedback(() => _presentationLocalRemote);
 
             Communication = comm;
 
@@ -342,13 +369,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             DeviceManager.AddDevice(CommunicationMonitor);
 
-            PhonebookMode = props.PhonebookMode;
+            _phonebookMode = props.PhonebookMode;
 
-            SyncState = new CodecSyncState(Key + "--Sync");
+            _syncState = new CodecSyncState(Key + "--Sync");
 
             PhonebookSyncState = new CodecPhonebookSyncState(Key + "--PhonebookSync");
 
-            SyncState.InitialSyncCompleted += new EventHandler<EventArgs>(SyncState_InitialSyncCompleted);
+            _syncState.InitialSyncCompleted += new EventHandler<EventArgs>(SyncState_InitialSyncCompleted);
 
             PortGather = new CommunicationGather(Communication, Delimiter);
             PortGather.IncludeDelimiter = true;
@@ -394,9 +421,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			InputPorts.Add(HdmiIn2);
 			InputPorts.Add(HdmiIn3);
 			OutputPorts.Add(HdmiOut1);
-
-            SetUpCameras();
-
 			CreateOsdSource();
 
             ExternalSourceListEnabled = props.ExternalSourceListEnabled;
@@ -436,6 +460,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = FarEndIsSharingContentFeedback.FireUpdate;
             CodecStatus.Status.Conference.DoNotDisturb.ValueChangedAction = DoNotDisturbModeIsOnFeedback.FireUpdate;
 
+            CodecConfiguration.Configuration.Audio.SoundsAndAlerts.RingVolume.ValueChangedAction = RingtoneVolumeFeedback.FireUpdate;
+
             try
             {
                 CodecStatus.Status.Video.Input.MainVideoMute.ValueChangedAction = CameraIsOffFeedback.FireUpdate;
@@ -583,7 +609,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             const string prefix = "xFeedback register ";
 
-            CliFeedbackRegistrationExpression =
+            _cliFeedbackRegistrationExpression =
                 prefix + "/Configuration" + Delimiter +
                 prefix + "/Status/Audio" + Delimiter +
                 prefix + "/Status/Call" + Delimiter +
@@ -613,6 +639,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// <param name="e"></param>
         void SyncState_InitialSyncCompleted(object sender, EventArgs e)
         {
+            SetUpCameras(_config.CameraInfo);
+
             // Fire the ready event
             SetIsReady();
             //CommDebuggingIsOn = false;
@@ -645,12 +673,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			Debug.Console(1, this, "Socket status change {0}", e.Client.ClientStatus);
             if (e.Client.IsConnected)
             {
-                if(!SyncState.LoginMessageWasReceived)
-				    LoginMessageReceivedTimer = new CTimer(o => DisconnectClientAndReconnect(), 5000);
+                if(!_syncState.LoginMessageWasReceived)
+				    _loginMessageReceivedTimer = new CTimer(o => DisconnectClientAndReconnect(), 5000);
             }
             else
             {
-                SyncState.CodecDisconnected();
+                _syncState.CodecDisconnected();
                 PhonebookSyncState.CodecDisconnected();
 
                 if (PhonebookRefreshTimer != null)
@@ -673,7 +701,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             Communication.Disconnect();
 
-			RetryConnectionTimer = new CTimer(o => Communication.Connect(), 2000);
+			_retryConnectionTimer = new CTimer(o => Communication.Connect(), 2000);
 
 			//CrestronEnvironment.Sleep(2000);
 
@@ -690,66 +718,66 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             if (CommDebuggingIsOn)
             {
-                if (!JsonFeedbackMessageIsIncoming)
+                if (!_jsonFeedbackMessageIsIncoming)
                     Debug.Console(1, this, "RX: '{0}'", args.Text);
             }
 
             if (args.Text == "{" + Delimiter)        // Check for the beginning of a new JSON message
             {
-                JsonFeedbackMessageIsIncoming = true;
+                _jsonFeedbackMessageIsIncoming = true;
 
                 if (CommDebuggingIsOn)
                     Debug.Console(1, this, "Incoming JSON message...");
 
-                JsonMessage = new StringBuilder();
+                _jsonMessage = new StringBuilder();
             }
             else if (args.Text == "}" + Delimiter)  // Check for the end of a JSON message
             {
-                JsonFeedbackMessageIsIncoming = false;
+                _jsonFeedbackMessageIsIncoming = false;
 
-                JsonMessage.Append(args.Text);
+                _jsonMessage.Append(args.Text);
 
                 if (CommDebuggingIsOn)
-                    Debug.Console(1, this, "Complete JSON Received:\n{0}", JsonMessage.ToString());
+                    Debug.Console(1, this, "Complete JSON Received:\n{0}", _jsonMessage.ToString());
 
                 // Enqueue the complete message to be deserialized
 
-                ReceiveQueue.Enqueue(new ProcessStringMessage(JsonMessage.ToString(), DeserializeResponse));
+                _receiveQueue.Enqueue(new ProcessStringMessage(_jsonMessage.ToString(), DeserializeResponse));
 
                 return;
             }
 
-            if(JsonFeedbackMessageIsIncoming)
+            if(_jsonFeedbackMessageIsIncoming)
             {
-                JsonMessage.Append(args.Text);
+                _jsonMessage.Append(args.Text);
 
                 //Debug.Console(1, this, "Building JSON:\n{0}", JsonMessage.ToString());
                 return;
             }
 
-            if (!SyncState.InitialSyncComplete)
+            if (!_syncState.InitialSyncComplete)
             {
                 switch (args.Text.Trim().ToLower()) // remove the whitespace
                 {
                     case "*r login successful":
                         {
-                            SyncState.LoginMessageReceived();
+                            _syncState.LoginMessageReceived();
 
-                            if(LoginMessageReceivedTimer != null)
-                                LoginMessageReceivedTimer.Stop();
+                            if(_loginMessageReceivedTimer != null)
+                                _loginMessageReceivedTimer.Stop();
 
                             SendText("xPreferences outputmode json");
                             break;
                         }
                     case "xpreferences outputmode json":
                         {
-                            if (!SyncState.InitialStatusMessageWasReceived)
+                            if (!_syncState.InitialStatusMessageWasReceived)
                                 SendText("xStatus");
                             break;
                         }
                     case "xfeedback register /event/calldisconnect":
                         {
-                            SyncState.FeedbackRegistered();
+                            _syncState.FeedbackRegistered();
                             break;
                         }
                 }
@@ -795,11 +823,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                     if (conference.Presentation.LocalInstance.Count > 0)
                     {
                         if (!string.IsNullOrEmpty(conference.Presentation.LocalInstance[0].ghost))
-                            PresentationSource = 0;
+                            _presentationSource = 0;
                         else if (conference.Presentation.LocalInstance[0].Source != null)
                         {
-                            PresentationSource = conference.Presentation.LocalInstance[0].Source.IntValue;
+                            _presentationSource = conference.Presentation.LocalInstance[0].Source.IntValue;
                         }
+
+                        _presentationLocalOnly = conference.Presentation.LocalInstance.Any((i) => i.SendingMode.LocalOnly);
+                        _presentationLocalRemote = conference.Presentation.LocalInstance.Any((i) => i.SendingMode.LocalRemote);
+
+                        PresentationSourceFeedback.FireUpdate();
+                        PresentationSendingLocalOnlyFeedback.FireUpdate();
+                        PresentationSendingLocalRemoteFeedback.FireUpdate();
                     }
 
                     // Check to see if this is a call status message received after the initial status message
@@ -847,6 +882,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                                         changeDetected = true;
                                     }
                                 }
+                                if(call.Duration != null)
+                                {
+                                    if(!string.IsNullOrEmpty(call.Duration.Value))
+                                    {
+                                        tempActiveCall.Duration = call.Duration.DurationValue;
+                                        changeDetected = true;
+                                    }
+                                }
+                                if(call.PlacedOnHold != null)
+                                {
+                                    tempActiveCall.IsOnHold = call.PlacedOnHold.BoolValue;
+                                    changeDetected = true;
+                                }
 
                                 if (changeDetected)
                                 {
@@ -865,7 +913,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                                     Name = call.DisplayName.Value,
                                     Number = call.RemoteNumber.Value,
                                     Type = CodecCallType.ConvertToTypeEnum(call.CallType.Value),
-                                    Direction = CodecCallDirection.ConvertToDirectionEnum(call.Direction.Value)
+                                    Direction = CodecCallDirection.ConvertToDirectionEnum(call.Direction.Value),
+                                    Duration = call.Duration.DurationValue,
+                                    IsOnHold = call.PlacedOnHold.BoolValue,
                                 };
 
                                 // Add it to the ActiveCalls List
@@ -945,11 +995,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                         JsonConvert.PopulateObject(response, CodecStatus);
                     }
 
-                    if (!SyncState.InitialStatusMessageWasReceived)
+                    if (!_syncState.InitialStatusMessageWasReceived)
                     {
-                        SyncState.InitialStatusMessageReceived();
+                        _syncState.InitialStatusMessageReceived();
 
-                        if (!SyncState.InitialConfigurationMessageWasReceived)
+                        if (!_syncState.InitialConfigurationMessageWasReceived)
                             SendText("xConfiguration");
                     }
                 }
@@ -959,12 +1009,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
                     JsonConvert.PopulateObject(response, CodecConfiguration);
 
-                    if (!SyncState.InitialConfigurationMessageWasReceived)
+                    if (!_syncState.InitialConfigurationMessageWasReceived)
                     {
-                        SyncState.InitialConfigurationMessageReceived();
-                        if (!SyncState.FeedbackWasRegistered)
+                        _syncState.InitialConfigurationMessageReceived();
+                        if (!_syncState.FeedbackWasRegistered)
                         {
-                            SendText(CliFeedbackRegistrationExpression);
+                            SendText(_cliFeedbackRegistrationExpression);
                         }
                     }
 
@@ -1137,7 +1187,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 		public override void ExecuteSwitch(object selector)
 		{
 			(selector as Action)();
-			PresentationSourceKey = selector.ToString();
+			_presentationSourceKey = selector.ToString();
 		}
 
 		/// <summary>
@@ -1147,7 +1197,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
         {
 			ExecuteSwitch(inputSelector);
-            PresentationSourceKey = inputSelector.ToString();
+            _presentationSourceKey = inputSelector.ToString();
         }
 
 
@@ -1226,13 +1276,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         private void GetPhonebookFolders()
         {
             // Get Phonebook Folders (determine local/corporate from config, and set results limit)
-            SendText(string.Format("xCommand Phonebook Search PhonebookType: {0} ContactType: Folder", PhonebookMode));
+            SendText(string.Format("xCommand Phonebook Search PhonebookType: {0} ContactType: Folder", _phonebookMode));
         }
 
         private void GetPhonebookContacts()
         {
             // Get Phonebook Folders (determine local/corporate from config, and set results limit)
-            SendText(string.Format("xCommand Phonebook Search PhonebookType: {0} ContactType: Contact Limit: {1}", PhonebookMode, PhonebookResultsLimit));
+            SendText(string.Format("xCommand Phonebook Search PhonebookType: {0} ContactType: Contact Limit: {1}", _phonebookMode, _phonebookResultsLimit));
         }
 
         /// <summary>
@@ -1241,7 +1291,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// <param name="searchString"></param>
         public void SearchDirectory(string searchString)
         {
-            SendText(string.Format("xCommand Phonebook Search SearchString: \"{0}\" PhonebookType: {1} ContactType: Contact Limit: {2}", searchString, PhonebookMode, PhonebookResultsLimit));
+            SendText(string.Format("xCommand Phonebook Search SearchString: \"{0}\" PhonebookType: {1} ContactType: Contact Limit: {2}", searchString, _phonebookMode, _phonebookResultsLimit));
         }
 
         /// <summary>
@@ -1250,7 +1300,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// <param name="folderId"></param>
         public void GetDirectoryFolderContents(string folderId)
         {
-            SendText(string.Format("xCommand Phonebook Search FolderId: {0} PhonebookType: {1} ContactType: Any Limit: {2}", folderId, PhonebookMode, PhonebookResultsLimit));
+            SendText(string.Format("xCommand Phonebook Search FolderId: {0} PhonebookType: {1} ContactType: Any Limit: {2}", folderId, _phonebookMode, _phonebookResultsLimit));
         }
 
         /// <summary>
@@ -1348,7 +1398,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             SendText(string.Format("xCommand Dial Number: \"{0}\" Protocol: {1} CallRate: {2} CallType: {3} BookingId: {4}", number, protocol, callRate, callType, meetingId));
         }
- 
+
+
         public override void EndCall(CodecActiveCallItem activeCall)
         {
             SendText(string.Format("xCommand Call Disconnect CallId: {0}", activeCall.Id));
@@ -1372,18 +1423,94 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             SendText("xCommand Call Reject");
         }
 
+        #region IHasCallHold Members
+
+        public void HoldCall(CodecActiveCallItem activeCall)
+        {
+            SendText(string.Format("xCommand Call Hold CallId: {0}", activeCall.Id));
+        }
+
+        public void ResumeCall(CodecActiveCallItem activeCall)
+        {
+            SendText(string.Format("xCommand Call Resume CallId: {0}", activeCall.Id));
+        }
+
+        #endregion
+
+        #region IJoinCalls
+
+        public void JoinCall(CodecActiveCallItem activeCall)
+        {
+            SendText(string.Format("xCommand Call Join CallId: {0}", activeCall.Id));
+        }
+
+        public void JoinAllCalls()
+        {
+            StringBuilder ids = new StringBuilder();
+
+            foreach (var call in ActiveCalls)
+            {
+                if (call.IsActiveCall)
+                {
+                    ids.Append(string.Format(" CallId: {0}", call.Id));
+                }
+            }
+
+            if (ids.Length > 0)
+            {
+                SendText(string.Format("xCommand Call Join {0}", ids.ToString()));
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Sends tones to the last connected call
+        /// </summary>
+        /// <param name="s"></param>
         public override void SendDtmf(string s)
         {
             SendText(string.Format("xCommand Call DTMFSend CallId: {0} DTMFString: \"{1}\"", GetCallId(), s));
         }
 
+        /// <summary>
+        /// Sends tones to a specific call
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="activeCall"></param>
+        public override void SendDtmf(string s, CodecActiveCallItem activeCall)
+        {
+            SendText(string.Format("xCommand Call DTMFSend CallId: {0} DTMFString: \"{1}\"", activeCall.Id, s));
+        }
+
         public void SelectPresentationSource(int source)
         {
-            PresentationSource = source;
+            _desiredPresentationSource = source;
 
             StartSharing();
         }
 
+        /// <summary>
+        /// Sets the ringtone volume level
+        /// </summary>
+        /// <param name="volume">level from 0 - 100 in increments of 5</param>
+        public void SetRingtoneVolume(int volume)
+        {
+            if (volume < 0 || volume > 100)
+            {
+                Debug.Console(0, this, "Cannot set ringtone volume to '{0}'. Value must be between 0 - 100", volume);
+                return;
+            }
+
+            if (volume % 5 != 0)
+            {
+                Debug.Console(0, this, "Cannot set ringtone volume to '{0}'. Value must be between 0 - 100 and a multiple of 5", volume);
+                return;
+            }
+
+            SendText(string.Format("xConfiguration Audio SoundsAndAlerts RingVolume: [0]", volume));
+        }
+
         /// <summary>
         /// Select source 1 as the presetnation source
         /// </summary>
@@ -1400,6 +1527,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             SelectPresentationSource(3);
         }
 
+
+
         /// <summary>
         /// Starts presentation sharing
         /// </summary>
@@ -1412,8 +1541,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             else
                 sendingMode = "LocalOnly";
 
-            if(PresentationSource > 0)
-                SendText(string.Format("xCommand Presentation Start PresentationSource: {0} SendingMode: {1}", PresentationSource, sendingMode));
+            if (_desiredPresentationSource > 0)
+                SendText(string.Format("xCommand Presentation Start PresentationSource: {0} SendingMode: {1}", _desiredPresentationSource, sendingMode));
         }
 
         /// <summary>
@@ -1421,11 +1550,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         public override void StopSharing()
         {
-            PresentationSource = 0;
+            _desiredPresentationSource = 0;
 
             SendText("xCommand Presentation Stop");
         }
 
+
+
         public override void PrivacyModeOn()
         {
             SendText("xCommand Audio Microphones Mute");
@@ -1554,6 +1685,17 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 trilist.SetSigFalseAction(joinMap.DeactivateStandby.JoinNumber, () => halfwakeCodec.StandbyDeactivate());
                 trilist.SetSigFalseAction(joinMap.ActivateHalfWakeMode.JoinNumber, () => halfwakeCodec.HalfwakeActivate());
             }
+
+            // Ringtone volume
+            trilist.SetUShortSigAction(joinMap.RingtoneVolume.JoinNumber, (u) => SetRingtoneVolume(u));
+            RingtoneVolumeFeedback.LinkInputSig(trilist.UShortInput[joinMap.RingtoneVolume.JoinNumber]);
+
+            // Presentation Source
+            trilist.SetUShortSigAction(joinMap.PresentationSource.JoinNumber, (u) => SelectPresentationSource(u));
+            PresentationSourceFeedback.LinkInputSig(trilist.UShortInput[joinMap.PresentationSource.JoinNumber]);
+
+            PresentationSendingLocalOnlyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PresentationLocalOnly.JoinNumber]);
+            PresentationSendingLocalRemoteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PresentationLocalRemote.JoinNumber]);
         }
 
         /// <summary>
@@ -1627,9 +1769,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         public void SelfviewPipPositionToggle()
         {
-            if (CurrentSelfviewPipPosition != null)
+            if (_currentSelfviewPipPosition != null)
             {
-                var nextPipPositionIndex = SelfviewPipPositions.IndexOf(CurrentSelfviewPipPosition) + 1;
+                var nextPipPositionIndex = SelfviewPipPositions.IndexOf(_currentSelfviewPipPosition) + 1;
 
                 if (nextPipPositionIndex >= SelfviewPipPositions.Count) // Check if we need to loop back to the first item in the list
                     nextPipPositionIndex = 0;                  
@@ -1652,9 +1794,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         public void LocalLayoutToggle()
         {
-            if(CurrentLocalLayout != null)
+            if(_currentLocalLayout != null)
             {
-                var nextLocalLayoutIndex = LocalLayouts.IndexOf(CurrentLocalLayout) + 1;
+                var nextLocalLayoutIndex = LocalLayouts.IndexOf(_currentLocalLayout) + 1;
 
                 if (nextLocalLayoutIndex >= LocalLayouts.Count)  // Check if we need to loop back to the first item in the list
                     nextLocalLayoutIndex = 0;
@@ -1668,9 +1810,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         public void LocalLayoutToggleSingleProminent()
         {
-            if (CurrentLocalLayout != null)
+            if (_currentLocalLayout != null)
             {
-                if (CurrentLocalLayout.Label != "Prominent")
+                if (_currentLocalLayout.Label != "Prominent")
                     LocalLayoutSet(LocalLayouts.FirstOrDefault(l => l.Label.Equals("Prominent")));
                 else
                     LocalLayoutSet(LocalLayouts.FirstOrDefault(l => l.Label.Equals("Single")));
@@ -1684,11 +1826,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 		public void MinMaxLayoutToggle()
 		{
 			if (PresentationViewMaximizedFeedback.BoolValue)
-				CurrentPresentationView = "Minimized";
+				_currentPresentationView = "Minimized";
 			else
-				CurrentPresentationView = "Maximized";
+				_currentPresentationView = "Maximized";
 
-			SendText(string.Format("xCommand Video PresentationView Set View:  {0}", CurrentPresentationView));
+			SendText(string.Format("xCommand Video PresentationView Set View:  {0}", _currentPresentationView));
 			PresentationViewMaximizedFeedback.FireUpdate();
 		}
 
@@ -1697,9 +1839,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         void ComputeSelfviewPipStatus()
         {
-            CurrentSelfviewPipPosition = SelfviewPipPositions.FirstOrDefault(p => p.Command.ToLower().Equals(CodecStatus.Status.Video.Selfview.PIPPosition.Value.ToLower()));
+            _currentSelfviewPipPosition = SelfviewPipPositions.FirstOrDefault(p => p.Command.ToLower().Equals(CodecStatus.Status.Video.Selfview.PIPPosition.Value.ToLower()));
 
-            if(CurrentSelfviewPipPosition != null)
+            if(_currentSelfviewPipPosition != null)
                 SelfviewIsOnFeedback.FireUpdate();
         }
 
@@ -1708,9 +1850,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         void ComputeLocalLayout()
         {
-            CurrentLocalLayout = LocalLayouts.FirstOrDefault(l => l.Command.ToLower().Equals(CodecStatus.Status.Video.Layout.LayoutFamily.Local.Value.ToLower()));
+            _currentLocalLayout = LocalLayouts.FirstOrDefault(l => l.Command.ToLower().Equals(CodecStatus.Status.Video.Layout.LayoutFamily.Local.Value.ToLower()));
 
-            if (CurrentLocalLayout != null)
+            if (_currentLocalLayout != null)
                 LocalLayoutFeedback.FireUpdate();
         }
 
@@ -1758,19 +1900,63 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// <summary>
         /// Builds the cameras List.  Could later be modified to build from config data
         /// </summary>
-        void SetUpCameras()
+        void SetUpCameras(List<CameraInfo> cameraInfo)
         {
             // Add the internal camera
             Cameras = new List<CameraBase>();
 
-            var internalCamera = new CiscoSparkCamera(Key + "-camera1", "Near End", this, 1);
+            var camCount = CodecStatus.Status.Cameras.Camera.Count;
 
-            if(CodecStatus.Status.Cameras.Camera.Count > 0)
-                internalCamera.SetCapabilites(CodecStatus.Status.Cameras.Camera[0].Capabilities.Options.Value);
+            Debug.Console(0, this, "Codec reports {0} cameras", camCount);
+
+
+            // Deal with the case of 1 or no reported cameras
+            if (camCount <= 1)
+            {
+                var internalCamera = new CiscoSparkCamera(Key + "-camera1", "Near End", this, 1);
+
+                if (camCount > 0)
+                {
+                    // Try to get the capabilities from the codec
+                    if (CodecStatus.Status.Cameras.Camera[0] != null && CodecStatus.Status.Cameras.Camera[0].Capabilities != null)
+                    {
+                        internalCamera.SetCapabilites(CodecStatus.Status.Cameras.Camera[0].Capabilities.Options.Value);
+                    }
+                }
+
+                Cameras.Add(internalCamera);
+                DeviceManager.AddDevice(internalCamera);
+            }
             else
-                // Somehow subscribe to the event on the Options.Value property and update when it changes.
+            {
+                // Setup all the cameras
+                for (int i = 0; i < camCount; i++)
+                {
+                    var cam = CodecStatus.Status.Cameras.Camera[i];
 
-            Cameras.Add(internalCamera);
+                    var id = (uint)i;
+                    var name = string.Format("Camera {0}", id);
+
+                    // Check for a config object that matches the camera number
+                    var camInfo = cameraInfo.FirstOrDefault(c => c.CameraNumber == i + 1);
+                    if (camInfo != null)
+                    {
+                        id = (uint)camInfo.SourceId;
+                        name = camInfo.Name;
+                    }
+
+                    var key = string.Format("{0}-camera{1}", Key, id);
+                    var camera = new CiscoSparkCamera(key, name, this, id);
+
+                    if (cam.Capabilities != null)
+                    {
+                        camera.SetCapabilites(cam.Capabilities.Options.Value);
+                    }
+
+                    Cameras.Add(camera);
+                    DeviceManager.AddDevice(camera);
+                }
+            }
 
             // Add the far end camera
             var farEndCamera = new CiscoFarEndCamera(Key + "-cameraFar", "Far End", this);
@@ -1780,7 +1966,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             ControllingFarEndCameraFeedback = new BoolFeedback(() => SelectedCamera is IAmFarEndCamera);
 
-            DeviceManager.AddDevice(internalCamera);
             DeviceManager.AddDevice(farEndCamera);
 
             NearEndPresets = new List<CodecRoomPreset>(15);
@@ -1794,7 +1979,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 FarEndRoomPresets.Add(new CodecRoomPreset(i, label, true, false));
             }
 
-            SelectedCamera = internalCamera; ; // call the method to select the camera and ensure the feedbacks get updated.
+            SelectedCamera = Cameras[0]; ; // call the method to select the camera and ensure the feedbacks get updated.
         }
 
         #region IHasCodecCameras Members
@@ -1842,6 +2027,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             }
             else
                 Debug.Console(2, this, "Unable to select camera with key: '{0}'", key);
+
+            var ciscoCam = camera as CiscoSparkCamera;
+            if (ciscoCam != null)
+            {
+                SendText(string.Format("xCommand Video Input SetMainVideoSource SourceId: {0}", ciscoCam.CameraId));
+            }
         }
 
         public CameraBase FarEndCamera { get; private set; }

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

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

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

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

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

@@ -112,16 +112,46 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class RingVolume
+        public class RingVolume : ValueProperty
         {
             public string valueSpaceRef { get; set; }
-            public string Value { get; set; }
+
+            string _Value;
+
+            /// <summary>
+            /// Sets Value and triggers the action when set
+            /// </summary>
+            public string Value
+            {
+                get
+                {
+                    return _Value;
+                }
+                set
+                {
+                    _Value = value;
+                    OnValueChanged();
+                }
+            }
+
+            public int Volume
+            {
+                get
+                {
+                    return Int32.Parse(_Value);
+                }
+            }
         }
 
         public class SoundsAndAlerts
         {
             public RingTone RingTone { get; set; }
             public RingVolume RingVolume { get; set; }
+
+            public SoundsAndAlerts()
+            {
+                RingVolume = new RingVolume();
+            }
         }
 
         public class Audio
@@ -131,6 +161,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Microphones Microphones { get; set; }
             public Output Output { get; set; }
             public SoundsAndAlerts SoundsAndAlerts { get; set; }
+
+
+            public Audio()
+            {
+                SoundsAndAlerts = new SoundsAndAlerts();
+            }
         }
 
         public class DefaultMode
@@ -1797,11 +1833,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public UserInterface UserInterface { get; set; }
             public UserManagement UserManagement { get; set; }
             public Video2 Video { get; set; }
+
+            public Configuration()
+            {
+                Audio = new Audio();
+            }
         }
 
         public class RootObject
         {
             public Configuration Configuration { get; set; }
+
+            public RootObject()
+            {
+                Configuration = new Configuration();
+            }   
         }
     }
 }

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

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

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

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

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

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

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

@@ -149,6 +149,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		public abstract void AcceptCall(CodecActiveCallItem call);
 		public abstract void RejectCall(CodecActiveCallItem call);
 		public abstract void SendDtmf(string s);
+        public virtual void SendDtmf(string s, CodecActiveCallItem call) { }
 
 		#endregion
 
@@ -327,15 +328,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 			LinkVideoCodecVolumeToApi(trilist, joinMap);
 
+            // Register for this event to link any functions that require the codec to be ready first
+            codec.IsReadyChange += (o, a) =>
+                {
+                    if (codec is IHasCodecCameras)
+                    {
+                        LinkVideoCodecCameraToApi(codec as IHasCodecCameras, trilist, joinMap);
+                    }
+                };
+
 			if (codec is ICommunicationMonitor)
 			{
 				LinkVideoCodecCommMonitorToApi(codec as ICommunicationMonitor, trilist, joinMap);
 			}
 
-			if (codec is IHasCodecCameras)
-			{
-				LinkVideoCodecCameraToApi(codec as IHasCodecCameras, trilist, joinMap);
-			}
 
 			if (codec is IHasCodecSelfView)
 			{
@@ -389,6 +395,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				LinkVideoCodecPhoneToApi(codec as IHasPhoneDialing, trilist, joinMap);
 			}
 
+            if (codec is IHasCallHistory)
+            {
+                LinkVideoCodecCallHistoryToApi(codec as IHasCallHistory, trilist, joinMap);
+            }
+
 			trilist.OnlineStatusChange += (device, args) =>
 			{
 				if (!args.DeviceOnLine) return;
@@ -435,6 +446,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 					(codec as IHasPhoneDialing).PhoneOffHookFeedback.FireUpdate();
 				}
 
+                if (codec is IHasCallHistory)
+                {
+                    UpdateCallHistory((codec as IHasCallHistory), trilist, joinMap);
+                }
+
 				SharingContentIsOnFeedback.FireUpdate();
 
 				trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
@@ -900,7 +916,9 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 
 			trilist.SetStringSigAction(joinMap.DirectorySearchString.JoinNumber, codec.SearchDirectory);
 
-			trilist.SetUShortSigAction(joinMap.DirectorySelectRow.JoinNumber, (i) => SelectDirectoryEntry(codec, i));
+			trilist.SetUShortSigAction(joinMap.DirectorySelectRow.JoinNumber, (i) => SelectDirectoryEntry(codec, i, trilist, joinMap));
+
+            // Report feedback for number of contact methods for selected contact
 
 			trilist.SetSigFalseAction(joinMap.DirectoryRoot.JoinNumber, codec.SetCurrentDirectoryToRoot);
 
@@ -920,7 +938,7 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 			};
 		}
 
-		private void SelectDirectoryEntry(IHasDirectory codec, ushort i)
+		private void SelectDirectoryEntry(IHasDirectory codec, ushort i, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
 			var entry = codec.CurrentDirectoryResult.CurrentDirectoryResults[i - 1];
 
@@ -930,21 +948,87 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				return;
 			}
 
-			var dialableEntry = entry as IInvitableContact;
+            // Allow auto dial of selected line
+            if (!trilist.GetBool(joinMap.DirectoryDisableAutoDialSelectedLine.JoinNumber))
+            {
+			    var dialableEntry = entry as IInvitableContact;
 
-			if (dialableEntry != null)
-			{
-				Dial(dialableEntry);
-				return;
-			}
+			    if (dialableEntry != null)
+			    {
+				    Dial(dialableEntry);
+				    return;
+			    }
 
-			var entryToDial = entry as DirectoryContact;
+    			var entryToDial = entry as DirectoryContact;
 
-			if (entryToDial == null) return;
+		        if (entryToDial == null) return;
+
+			    Dial(entryToDial.ContactMethods[0].Number);
+                return;
+            }
+            else
+            {
+                // If auto dial is disabled...
+    			var entryToDial = entry as DirectoryContact;
+
+		        if (entryToDial == null) return;
+
+                trilist.SetSigFalseAction(joinMap.DirectoryDialSelectedLine.JoinNumber, () => Dial(entryToDial.ContactMethods[0].Number));
+
+                var clearBytes = XSigHelpers.ClearOutputs();
+
+                trilist.SetString(joinMap.ContactMethods.JoinNumber,
+                    Encoding.GetEncoding(XSigEncoding).GetString(clearBytes, 0, clearBytes.Length));
+                var contactMethodsXSig = UpdateContactMethodsXSig(entryToDial);
+
+                trilist.SetString(joinMap.ContactMethods.JoinNumber, contactMethodsXSig);
+            }
 
-			Dial(entryToDial.ContactMethods[0].Number);
 		}
 
+        /// <summary>
+        /// Generates the XSig data representing the available contact methods for the selected DirectoryContact
+        /// </summary>
+        /// <param name="contact"></param>
+        /// <returns></returns>
+        private string UpdateContactMethodsXSig(DirectoryContact contact)
+        {
+            const int maxMethods = 10;
+            const int maxStrings = 3;
+            const int offset = maxStrings;
+            var stringIndex = 0;
+            var arrayIndex = 0;
+            var tokenArray = new XSigToken[contact.ContactMethods.Count];
+
+            // TODO: Add code to generate XSig data
+
+            foreach (var method in contact.ContactMethods)
+            {
+                if (arrayIndex >= maxMethods * offset)
+                    break;
+
+                //serials
+                tokenArray[arrayIndex + 1] = new XSigSerialToken(stringIndex + 1, method.Number);
+                tokenArray[arrayIndex + 2] = new XSigSerialToken(stringIndex + 2, method.ContactMethodId.ToString());
+                tokenArray[arrayIndex + 3] = new XSigSerialToken(stringIndex + 3, method.Device.ToString());
+
+				arrayIndex += offset;
+				stringIndex += maxStrings;
+            }
+
+            while (arrayIndex < maxMethods)
+            {
+                tokenArray[arrayIndex + 1] = new XSigSerialToken(stringIndex + 1, String.Empty);
+                tokenArray[arrayIndex + 2] = new XSigSerialToken(stringIndex + 2, String.Empty);
+                tokenArray[arrayIndex + 3] = new XSigSerialToken(stringIndex + 3, String.Empty);
+
+				arrayIndex += offset;
+				stringIndex += maxStrings;
+            }
+
+            return GetXSigString(tokenArray);
+        }
+
 		private string UpdateDirectoryXSig(CodecDirectory directory, bool isRoot)
 		{
 			var contactIndex = 1;
@@ -978,8 +1062,25 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 			trilist.SetSigFalseAction(joinMap.ManualDial.JoinNumber,
 				() => Dial(trilist.StringOutput[joinMap.CurrentDialString.JoinNumber].StringValue));
 
-			//End All calls for now
-			trilist.SetSigFalseAction(joinMap.EndCall.JoinNumber, EndAllCalls);
+			//End All calls
+			trilist.SetSigFalseAction(joinMap.EndAllCalls.JoinNumber, EndAllCalls);
+
+            //End a specific call, specified by index. Maximum 8 calls supported
+            for (int i = 0; i < joinMap.EndCallStart.JoinSpan; i++)
+            {
+                trilist.SetSigFalseAction((uint)(joinMap.EndCallStart.JoinNumber + i), () =>
+                    {
+                        var call = ActiveCalls[i];
+                        if (call != null)
+                        {
+                            EndCall(call);
+                        }
+                        else
+                        {
+                            Debug.Console(0, this, "[End Call] Unable to find call at index '{0}'", i);
+                        }
+                    });
+            }
 
 			trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
 
@@ -998,13 +1099,70 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				}
 
 				trilist.SetString(joinMap.CurrentCallData.JoinNumber, UpdateCallStatusXSig());
+
+                trilist.SetUshort(joinMap.ConnectedCallCount.JoinNumber, (ushort)ActiveCalls.Count);
 			};
+
+            var joinCodec = this as IJoinCalls;
+            if (joinCodec != null)
+            {
+                trilist.SetSigFalseAction(joinMap.JoinAllCalls.JoinNumber, () => joinCodec.JoinAllCalls());
+
+                for (int i = 0; i < joinMap.JoinCallStart.JoinSpan; i++)
+                {
+                    trilist.SetSigFalseAction((uint)(joinMap.JoinCallStart.JoinNumber + i), () =>
+                        {
+                            var call = ActiveCalls[i];
+                            if (call != null)
+                            {
+                                joinCodec.JoinCall(call);
+                            } 
+                            else
+                            {
+                                Debug.Console(0, this, "[Join Call] Unable to find call at index '{0}'", i);
+                            }
+                        });
+                }
+            }
+
+            var holdCodec = this as IHasCallHold;
+            if (holdCodec != null)
+            {
+                for (int i = 0; i < joinMap.JoinCallStart.JoinSpan; i++)
+                {
+                    trilist.SetSigFalseAction((uint)(joinMap.HoldCallsStart.JoinNumber + i), () =>
+                        {
+                            var call = ActiveCalls[i];
+                            if (call != null)
+                            {
+                                holdCodec.HoldCall(call);
+                            } 
+                            else
+                            {
+                                Debug.Console(0, this, "[Hold Call] Unable to find call at index '{0}'", i);
+                            }
+                        });
+
+                    trilist.SetSigFalseAction((uint)(joinMap.ResumeCallsStart.JoinNumber + i), () =>
+                        {
+                            var call = ActiveCalls[i];
+                            if (call != null)
+                            {
+                                holdCodec.ResumeCall(call);
+                            } 
+                            else
+                            {
+                                Debug.Console(0, this, "[Resume Call] Unable to find call at index '{0}'", i);
+                            }
+                        });
+                }
+            }
 		}
 
 		private string UpdateCallStatusXSig()
 		{
 			const int maxCalls = 8;
-			const int maxStrings = 5;
+			const int maxStrings = 6;
 			const int offset = 6;
 			var stringIndex = 0;
 			var digitalIndex = maxStrings * maxCalls;
@@ -1018,6 +1176,7 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 					break;
 				//digitals
 				tokenArray[arrayIndex] = new XSigDigitalToken(digitalIndex + 1, call.IsActiveCall);
+                tokenArray[arrayIndex + 1] = new XSigDigitalToken(digitalIndex + 2, call.IsOnHold);
 
 				//serials
 				tokenArray[arrayIndex + 1] = new XSigSerialToken(stringIndex + 1, call.Name ?? String.Empty);
@@ -1025,6 +1184,12 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				tokenArray[arrayIndex + 3] = new XSigSerialToken(stringIndex + 3, call.Direction.ToString());
 				tokenArray[arrayIndex + 4] = new XSigSerialToken(stringIndex + 4, call.Type.ToString());
 				tokenArray[arrayIndex + 5] = new XSigSerialToken(stringIndex + 5, call.Status.ToString());
+                if(call.Duration != null)
+                {
+                    // May need to verify correct string format here
+                    var dur = string.Format("{0:c}", call.Duration);
+                    tokenArray[arrayIndex + 6] = new XSigSerialToken(stringIndex + 6, dur);
+                }
 
 				arrayIndex += offset;
 				stringIndex += maxStrings;
@@ -1034,13 +1199,16 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 			{
 				//digitals
 				tokenArray[arrayIndex] = new XSigDigitalToken(digitalIndex + 1, false);
+                tokenArray[arrayIndex + 1] = new XSigDigitalToken(digitalIndex + 2, false);
 
-				//serials
+
+                //serials
 				tokenArray[arrayIndex + 1] = new XSigSerialToken(stringIndex + 1, String.Empty);
 				tokenArray[arrayIndex + 2] = new XSigSerialToken(stringIndex + 2, String.Empty);
 				tokenArray[arrayIndex + 3] = new XSigSerialToken(stringIndex + 3, String.Empty);
 				tokenArray[arrayIndex + 4] = new XSigSerialToken(stringIndex + 4, String.Empty);
 				tokenArray[arrayIndex + 5] = new XSigSerialToken(stringIndex + 5, String.Empty);
+                tokenArray[arrayIndex + 6] = new XSigSerialToken(stringIndex + 6, String.Empty);
 
 				arrayIndex += offset;
 				stringIndex += maxStrings;
@@ -1052,20 +1220,56 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 
 		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("#"));
+            trilist.SetSigFalseAction(joinMap.Dtmf0.JoinNumber, () => SendDtmfAction("0", trilist, joinMap));
+            trilist.SetSigFalseAction(joinMap.Dtmf1.JoinNumber, () => SendDtmfAction("1", trilist, joinMap));
+            trilist.SetSigFalseAction(joinMap.Dtmf2.JoinNumber, () => SendDtmfAction("2", trilist, joinMap));
+            trilist.SetSigFalseAction(joinMap.Dtmf3.JoinNumber, () => SendDtmfAction("3", trilist, joinMap));
+            trilist.SetSigFalseAction(joinMap.Dtmf4.JoinNumber, () => SendDtmfAction("4", trilist, joinMap));
+            trilist.SetSigFalseAction(joinMap.Dtmf5.JoinNumber, () => SendDtmfAction("5", trilist, joinMap));
+            trilist.SetSigFalseAction(joinMap.Dtmf6.JoinNumber, () => SendDtmfAction("6", trilist, joinMap));
+            trilist.SetSigFalseAction(joinMap.Dtmf7.JoinNumber, () => SendDtmfAction("7", trilist, joinMap));
+            trilist.SetSigFalseAction(joinMap.Dtmf8.JoinNumber, () => SendDtmfAction("8", trilist, joinMap));
+            trilist.SetSigFalseAction(joinMap.Dtmf9.JoinNumber, () => SendDtmfAction("9", trilist, joinMap));
+            trilist.SetSigFalseAction(joinMap.DtmfStar.JoinNumber, () => SendDtmfAction("*", trilist, joinMap));
+            trilist.SetSigFalseAction(joinMap.DtmfPound.JoinNumber, () => SendDtmfAction("#", trilist, joinMap));       
 		}
 
+        /// <summary>
+        /// Sends the specified string as a DTMF command.
+        /// Reads the value of the SendDtmfToSpecificCallInstance digital join and SelectCall analog join to determine
+        /// Whther to send to a specific call index or to the last connected call
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="trilist"></param>
+        /// <param name="joinMap"></param>
+        private void SendDtmfAction(string s, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            if (!trilist.GetBool(joinMap.SendDtmfToSpecificCallIndex.JoinNumber))
+            {
+                SendDtmf(s);
+            }
+            else
+            {
+                var callIndex = trilist.GetUshort(joinMap.SelectCall.JoinNumber);
+                if (callIndex > 0 && callIndex <= 8)
+                {
+                    var call = ActiveCalls[callIndex - 1];
+                    if (call != null && call.IsActiveCall)
+                    {
+                        SendDtmf(s, call);
+                    }
+                    else
+                    {
+                        Debug.Console(0, this, "Warning: No call found at index {0} or call is not active.", callIndex);
+                    }
+                }
+                else
+                {
+                    Debug.Console(0, this, "Warning: Invalid call index specified.  Please use a value of 1-8.");
+                }
+            }
+        }
+
 		private void LinkVideoCodecCameraLayoutsToApi(IHasCodecLayouts codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
 			trilist.SetSigFalseAction(joinMap.CameraLayout.JoinNumber, codec.LocalLayoutToggle);
@@ -1201,18 +1405,80 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				else camera.ZoomStop();
 			});
 
+
+            trilist.SetBoolSigAction(joinMap.CameraFocusNear.JoinNumber, (b) =>
+            {
+                if (codec.SelectedCamera == null) return;
+                var camera = codec.SelectedCamera as IHasCameraFocusControl;
+
+                if (camera == null) return;
+
+                if (b) camera.FocusNear();
+                else camera.FocusStop();
+            });
+
+            trilist.SetBoolSigAction(joinMap.CameraFocusFar.JoinNumber, (b) =>
+            {
+                if (codec.SelectedCamera == null) return;
+                var camera = codec.SelectedCamera as IHasCameraFocusControl;
+
+                if (camera == null) return;
+
+                if (b) camera.FocusFar();
+                else camera.FocusStop();
+            });
+
+            trilist.SetSigFalseAction(joinMap.CameraFocusAuto.JoinNumber, () =>
+            {
+                if (codec.SelectedCamera == null) return;
+                var camera = codec.SelectedCamera as IHasCameraFocusControl;
+
+                if (camera == null) return;
+
+                camera.TriggerAutoFocus();
+            });
+
+            // Camera count
+            trilist.SetUshort(joinMap.CameraCount.JoinNumber, (ushort)codec.Cameras.Count);
+
+            // Camera names
+            for (uint i = 0; i < joinMap.CameraNamesFb.JoinSpan; i++)
+            {
+                if (codec.Cameras[(int)i] != null)
+                {
+                    trilist.SetString(joinMap.CameraNamesFb.JoinNumber + i, codec.Cameras[(int)i].Name);
+                }
+                else
+                {
+                    trilist.SetString(joinMap.CameraNamesFb.JoinNumber + i, "");
+                }
+            }
+
 			//Camera Select
 			trilist.SetUShortSigAction(joinMap.CameraNumberSelect.JoinNumber, (i) =>
 			{
-				if (codec.SelectedCamera == null) return;
-
-				codec.SelectCamera(codec.Cameras[i].Key);
+                if (i > 0 && i <= codec.Cameras.Count)
+                {
+                    codec.SelectCamera(codec.Cameras[i - 1].Key);
+                }
+                else
+                {
+                    Debug.Console(0, this, "Unable to select.  No camera found at index {0}", i);
+                }
 			});
 
+            // Set initial selected camera feedback
+            if (codec.SelectedCamera != null)
+            {
+                trilist.SetUshort(joinMap.CameraNumberSelect.JoinNumber, (ushort)codec.Cameras.FindIndex((c) => c.Key == codec.SelectedCamera.Key));
+            }
+
 			codec.CameraSelected += (sender, args) =>
 			{
 				var i = (ushort)codec.Cameras.FindIndex((c) => c.Key == args.SelectedCamera.Key);
 
+                trilist.SetUshort(joinMap.CameraNumberSelect.JoinNumber, (ushort)(i + 1));
+
 				if (codec is IHasCodecRoomPresets)
 				{
 					return;
@@ -1255,10 +1521,16 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 			trilist.SetUShortSigAction(joinMap.CameraPresetSelect.JoinNumber, (i) =>
 			{
 				presetCodec.CodecRoomPresetSelect(i);
-
-				trilist.SetUshort(joinMap.CameraPresetSelect.JoinNumber, i);
 			});
 
+
+            // Far End Presets
+            trilist.SetUShortSigAction(joinMap.FarEndPresetSelect.JoinNumber, (i) =>
+            {
+                presetCodec.SelectFarEndPreset(i);
+            });
+
+
 			trilist.SetSigFalseAction(joinMap.CameraPresetSave.JoinNumber,
 					() =>
 					{
@@ -1268,7 +1540,75 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 					});
 		}
 
-		private string SetCameraPresetNames(IEnumerable<CodecRoomPreset> presets)
+        // Following fields only used for Bridging
+        private int _selectedRecentCallItemIndex;
+        private CodecCallHistory.CallHistoryEntry _selectedRecentCallItem;
+
+        private void LinkVideoCodecCallHistoryToApi(IHasCallHistory codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            codec.CallHistory.RecentCallsListHasChanged += (o, a) =>
+                {
+                    UpdateCallHistory(codec, trilist, joinMap);  
+                };
+
+            // Selected item action and feedback
+            trilist.SetUShortSigAction(joinMap.SelectRecentCallItem.JoinNumber, (u) =>
+                {
+                    _selectedRecentCallItemIndex = (int)(u - 1);
+                    trilist.SetUshort(joinMap.SelectRecentCallItem.JoinNumber, u);
+
+                    var _selectedRecentCallItem = codec.CallHistory.RecentCalls[_selectedRecentCallItemIndex];
+
+                    if (_selectedRecentCallItem != null)
+                    {
+                        trilist.SetString(joinMap.SelectedRecentCallName.JoinNumber, _selectedRecentCallItem.Name);
+                        trilist.SetString(joinMap.SelectedRecentCallNumber.JoinNumber, _selectedRecentCallItem.Number);
+                        trilist.SetSigFalseAction(joinMap.RemoveSelectedRecentCallItem.JoinNumber, () => codec.RemoveCallHistoryEntry(_selectedRecentCallItem));
+                    }
+                    else
+                    {
+                        trilist.SetString(joinMap.SelectedRecentCallName.JoinNumber, string.Empty);
+                        trilist.SetString(joinMap.SelectedRecentCallNumber.JoinNumber, string.Empty);
+                        trilist.ClearBoolSigAction(joinMap.RemoveSelectedRecentCallItem.JoinNumber);
+                    }
+                });
+        }
+
+
+
+        private void UpdateCallHistory(IHasCallHistory codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
+        {
+            // Clear out selected item
+            _selectedRecentCallItemIndex = 0;
+            _selectedRecentCallItem = null;
+            trilist.SetUshort(joinMap.SelectRecentCallItem.JoinNumber, 0);
+            trilist.SetString(joinMap.SelectedRecentCallName.JoinNumber, string.Empty);
+            trilist.SetString(joinMap.SelectedRecentCallNumber.JoinNumber, string.Empty);
+            trilist.ClearBoolSigAction(joinMap.RemoveSelectedRecentCallItem.JoinNumber);
+            //
+
+
+            // Update the call history joins
+            var maxItems = joinMap.RecentCallNamesStart.JoinSpan;
+
+            uint i = 0;
+            foreach(var item in codec.CallHistory.RecentCalls)
+            {
+                trilist.SetString(joinMap.RecentCallNamesStart.JoinNumber + i, item.Name);
+                trilist.SetString(joinMap.RecentCallTimesStart.JoinNumber + i, item.StartTime.ToShortTimeString());
+                trilist.SetUshort(joinMap.RecentCallOccurrenceType.JoinNumber + i, (ushort)item.OccurrenceType);
+                i++;
+            }
+
+            for (uint index = i; i < maxItems; index++)
+            {
+                trilist.SetString(joinMap.RecentCallNamesStart.JoinNumber + index, string.Empty);
+                trilist.SetString(joinMap.RecentCallTimesStart.JoinNumber + index, string.Empty);
+                trilist.SetUshort(joinMap.RecentCallOccurrenceType.JoinNumber + index, 0);
+            }
+        }
+
+        private string SetCameraPresetNames(IEnumerable<CodecRoomPreset> presets)
 		{
 			return SetCameraPresetNames(presets.Select(p => p.Description).ToList());
 		}