feat(essentials): #865 Updates to Bridging

Adds ability to end individual calls, report connected call count, report call duration and hold status, send DTMF tones to individual call index and select far end presets

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")]
+        [JoinName("EndAllCalls")]
-		public JoinDataComplete EndCall = new JoinDataComplete(
+		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
 			});
@@ -576,7 +590,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
 			});
@@ -966,6 +980,48 @@ 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. Valid values 1-8",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
+        [JoinName("EndCall")]
+        public JoinDataComplete EndCall = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 24,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "End a specific call by call index. 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
@@ -1032,10 +1088,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

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

@@ -1407,6 +1407,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         }
 
         #endregion
+
         #region IJoinCalls
 
         public void JoinCall(CodecActiveCallItem activeCall)
@@ -1416,10 +1417,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public void JoinAllCalls()
         {
+            StringBuilder ids = new StringBuilder();
+
             foreach (var call in ActiveCalls)
             {
-                if(call.IsActiveCall)
+                if (call.IsActiveCall)
-                    JoinCall(call);
+                {
+                    ids.Append(string.Format(" CallId: {0}", call.Id));
+                }
+            }
+
+            if (ids.Length > 0)
+            {
+                SendText(string.Format("xCommand Call Join {0}", ids.ToString()));
             }
         }
 

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/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
 
@@ -978,8 +979,21 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 			trilist.SetSigFalseAction(joinMap.ManualDial.JoinNumber,
 				() => Dial(trilist.StringOutput[joinMap.CurrentDialString.JoinNumber].StringValue));
 
-			//End All calls for now
+			//End All calls
-			trilist.SetSigFalseAction(joinMap.EndCall.JoinNumber, EndAllCalls);
+			trilist.SetSigFalseAction(joinMap.EndAllCalls.JoinNumber, EndAllCalls);
+
+            //End a specific call, specified by index
+            trilist.SetUShortSigAction(joinMap.EndCall.JoinNumber, (i) =>
+                {
+                    if (i > 0 && i <= 8)
+                    {
+                        var call = ActiveCalls[i - 1];
+                        if (call != null)
+                        {
+                            EndCall(call);
+                        }
+                    }
+                });
 
 			trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
 
@@ -998,6 +1012,8 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				}
 
 				trilist.SetString(joinMap.CurrentCallData.JoinNumber, UpdateCallStatusXSig());
+
+                trilist.SetUshort(joinMap.ConnectedCallCount.JoinNumber, (ushort)ActiveCalls.Count);
 			};
 		}
 
@@ -1018,6 +1034,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 +1042,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 +1057,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 +1078,56 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 
 		private void LinkVideoCodecDtmfToApi(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
-			trilist.SetSigFalseAction(joinMap.Dtmf0.JoinNumber, () => SendDtmf("0"));
+            trilist.SetSigFalseAction(joinMap.Dtmf0.JoinNumber, () => SendDtmfAction("0", trilist, joinMap));
-			trilist.SetSigFalseAction(joinMap.Dtmf1.JoinNumber, () => SendDtmf("1"));
+            trilist.SetSigFalseAction(joinMap.Dtmf1.JoinNumber, () => SendDtmfAction("1", trilist, joinMap));
-			trilist.SetSigFalseAction(joinMap.Dtmf2.JoinNumber, () => SendDtmf("2"));
+            trilist.SetSigFalseAction(joinMap.Dtmf2.JoinNumber, () => SendDtmfAction("2", trilist, joinMap));
-			trilist.SetSigFalseAction(joinMap.Dtmf3.JoinNumber, () => SendDtmf("3"));
+            trilist.SetSigFalseAction(joinMap.Dtmf3.JoinNumber, () => SendDtmfAction("3", trilist, joinMap));
-			trilist.SetSigFalseAction(joinMap.Dtmf4.JoinNumber, () => SendDtmf("4"));
+            trilist.SetSigFalseAction(joinMap.Dtmf4.JoinNumber, () => SendDtmfAction("4", trilist, joinMap));
-			trilist.SetSigFalseAction(joinMap.Dtmf5.JoinNumber, () => SendDtmf("5"));
+            trilist.SetSigFalseAction(joinMap.Dtmf5.JoinNumber, () => SendDtmfAction("5", trilist, joinMap));
-			trilist.SetSigFalseAction(joinMap.Dtmf6.JoinNumber, () => SendDtmf("6"));
+            trilist.SetSigFalseAction(joinMap.Dtmf6.JoinNumber, () => SendDtmfAction("6", trilist, joinMap));
-			trilist.SetSigFalseAction(joinMap.Dtmf7.JoinNumber, () => SendDtmf("7"));
+            trilist.SetSigFalseAction(joinMap.Dtmf7.JoinNumber, () => SendDtmfAction("7", trilist, joinMap));
-			trilist.SetSigFalseAction(joinMap.Dtmf8.JoinNumber, () => SendDtmf("8"));
+            trilist.SetSigFalseAction(joinMap.Dtmf8.JoinNumber, () => SendDtmfAction("8", trilist, joinMap));
-			trilist.SetSigFalseAction(joinMap.Dtmf9.JoinNumber, () => SendDtmf("9"));
+            trilist.SetSigFalseAction(joinMap.Dtmf9.JoinNumber, () => SendDtmfAction("9", trilist, joinMap));
-			trilist.SetSigFalseAction(joinMap.DtmfStar.JoinNumber, () => SendDtmf("*"));
+            trilist.SetSigFalseAction(joinMap.DtmfStar.JoinNumber, () => SendDtmfAction("*", trilist, joinMap));
-			trilist.SetSigFalseAction(joinMap.DtmfPound.JoinNumber, () => SendDtmf("#"));
+            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);
@@ -1288,10 +1350,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,
 					() =>
 					{