Updates ZoomRoomJoinMap.cs with join numbers. Updated VideoCodecControllerJoinMap.cs to organize the joins in a logical pattern. Update VideoCodecBase to add the maxAnalogs to the logic calculating xsig indexes and offsets.

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

@@ -27,8 +27,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
     {
         event EventHandler<LayoutInfoChangedEventArgs> AvailableLayoutsChanged;
 
-        BoolFeedback LayoutViewIsOnFirstPageFeedback { get; }  // TODO: #697 Consider modifying to report button visibility in func
+        BoolFeedback LayoutViewIsOnFirstPageFeedback { get; }  // TODO: #697 [ ] Consider modifying to report button visibility in func
-        BoolFeedback LayoutViewIsOnLastPageFeedback { get; } // TODO: #697 Consider modifying to report button visibility in func 
+        BoolFeedback LayoutViewIsOnLastPageFeedback { get; } // TODO: #697 [ ] Consider modifying to report button visibility in func 
         BoolFeedback CanSwapContentWithThumbnailFeedback { get; }
         BoolFeedback ContentSwappedWithThumbnailFeedback { get; }
 

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

@@ -548,8 +548,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				trilist.SetUshort(joinMap.ParticipantCount.JoinNumber, (ushort)codec.Participants.CurrentParticipants.Count);
 			};
 
-            // TODO: #698 Figure out how to decode xsig data and trigger actions based on values from SIMPL
+			// TODO: #698 [ ] Figure out how to decode xsig data and trigger actions based on values from SIMPL
-            // trilist.SetStringSigAction(joinMap.CurrentParticipants.JoinNumber, // add method here to decode the xsig info and trigger actions
+			// add method here to decode the xsig info and trigger actions			
+			//trilist.SetStringSigAction(joinMap.CurrentParticipants.JoinNumber, DecodeParticipantsXSig);				
 		}
 
 		private string UpdateParticipantsXSig(List<Participant> currentParticipants)
@@ -558,8 +559,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			const int maxDigitals = 7;
 			const int maxStrings = 1;
 			const int maxAnalogs = 1;
-			const int offset = maxDigitals + maxStrings;
+			const int offset = maxDigitals + maxStrings + maxAnalogs;
-			var digitalIndex = maxStrings * maxParticipants; //15
+			var digitalIndex = maxStrings + maxAnalogs * maxParticipants; //15
 			var stringIndex = 0;
 			var analogIndex = 0;
 			var meetingIndex = 0;
@@ -577,7 +578,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				tokenArray[digitalIndex + 3] = new XSigDigitalToken(digitalIndex + 4, participant.CanUnmuteVideo);
 				tokenArray[digitalIndex + 4] = new XSigDigitalToken(digitalIndex + 5, participant.IsHost);
 				tokenArray[digitalIndex + 5] = new XSigDigitalToken(digitalIndex + 6, participant.HandIsRaisedFb);
-                tokenArray[digitalIndex + 6] = new XSigDigitalToken(digitalIndex + 6, participant.IsPinnedFb);
+				tokenArray[digitalIndex + 6] = new XSigDigitalToken(digitalIndex + 7, participant.IsPinnedFb);
 
 				//serials
 				tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, participant.Name);
@@ -617,6 +618,47 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			return GetXSigString(tokenArray);
 		}
 
+		// TODO: #698 [ ] Figure out how to decode xsig data and trigger actions based on values from SIMPL
+		private void DecodeParticipantsXSig(string xsigData)
+		{
+			if (string.IsNullOrEmpty(xsigData)) return;
+			var bytes = Encoding.GetEncoding(XSigEncoding).GetBytes(xsigData);
+			using (var xsigStream = new XSigTokenStreamReader(new MemoryStream(bytes)))
+			{
+				XSigToken token = null;
+				while ((token = xsigStream.ReadXSigToken()) != null)
+				{
+					switch (token.TokenType)
+					{
+						case XSigTokenType.Digital:
+							{
+								var data = token as XSigDigitalToken;
+								if (data == null) return;
+								Debug.Console(1, this, "xSig Data TokenType: {0} | Index: {1} | Value: {2}",
+									data.TokenType, data.Index, data.Value.ToString());
+								break;
+							}
+						case XSigTokenType.Analog:
+							{
+								var data = token as XSigAnalogToken;
+								if (data == null) return;
+								Debug.Console(1, this, "xSig Data TokenType: {0} | Index: {1} | Value: {2}",
+									data.TokenType, data.Index, data.Value);
+								break;
+							}
+						case XSigTokenType.Serial:
+							{
+								var data = token as XSigSerialToken;
+								if (data == null) return;
+								Debug.Console(1, this, "xSig Data TokenType: {0} | Index: {1} | Value: {2}", data.TokenType, data.Index,
+									data.Value);
+								break;
+							}
+					}
+				}
+			}
+		}
+
 		private void LinkVideoCodecContentSharingToApi(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
 			SharingContentIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.SourceShareStart.JoinNumber]);

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

@@ -1723,7 +1723,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public void LinkZoomRoomToApi(BasicTriList trilist, ZoomRoomJoinMap joinMap)
         {
             var layoutsCodec = this as IHasZoomRoomLayouts;
-
             if (layoutsCodec != null)
             {
                 layoutsCodec.AvailableLayoutsChanged += (o, a) =>
@@ -1746,7 +1745,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 layoutsCodec.LayoutViewIsOnLastPageFeedback.LinkInputSig(trilist.BooleanInput[joinMap.LayoutIsOnLastPage.JoinNumber]);
                 trilist.SetSigFalseAction(joinMap.LayoutTurnToNextPage.JoinNumber, () => layoutsCodec.LayoutTurnNextPage());
                 trilist.SetSigFalseAction(joinMap.LayoutTurnToPreviousPage.JoinNumber, () => layoutsCodec.LayoutTurnPreviousPage());
-
+	            trilist.SetSigFalseAction(joinMap.GetAvailableLayouts.JoinNumber, () => layoutsCodec.GetAvailableLayouts());
 
                 trilist.SetStringSigAction(joinMap.GetSetCurrentLayout.JoinNumber, (s) =>
                     {
@@ -1757,7 +1756,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                         }
                         catch (Exception e)
                         {
-                            Debug.Console(2, this, "Unable to parse '{0}' to zConfiguration.eLayoutStyle: {1}", s, e);
+                            Debug.Console(1, this, "Unable to parse '{0}' to zConfiguration.eLayoutStyle: {1}", s, e);
                         }
                     });
 
@@ -1765,7 +1764,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             }
 
             var pinCodec = this as IHasParticipantPinUnpin;
-
 			if (pinCodec != null)
 			{
 				pinCodec.NumberOfScreensFeedback.LinkInputSig(trilist.UShortInput[joinMap.NumberOfScreens.JoinNumber]);
@@ -2208,7 +2206,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         private void ComputeAvailableLayouts()
         {
             zConfiguration.eLayoutStyle availableLayouts = zConfiguration.eLayoutStyle.None;
-            // TODO: #697 Compute the avaialble layouts and set the value of AvailableLayouts
+            // TODO: #697 [ ] Compute the avaialble layouts and set the value of AvailableLayouts
             // Will need to test and confirm that this logic evaluates correctly
             if (Status.Layout.can_Switch_Wall_View)
             {
@@ -2257,7 +2255,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             if (CanSwapContentWithThumbnailFeedback.BoolValue)
             {
                 var oppositeValue = ContentSwappedWithThumbnailFeedback.BoolValue ? "on" : "off"; // Get the value based on the opposite of the current state
-                // TODO: #697 Need to verify the ternary above and make sure that the correct on/off value is being send based on the true/false value of the feedback
+                // TODO: #697 [ ] Need to verify the ternary above and make sure that the correct on/off value is being send based on the true/false value of the feedback
                 // to toggle the state
                 SendText(String.Format("zConfiguration Call Layout ShareThumb: {0}", oppositeValue));
             }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomJoinMap.cs

@@ -6,51 +6,17 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
 	public class ZoomRoomJoinMap : VideoCodecControllerJoinMap
 	{
-        // TODO: #697 Set join numbers
+		// TODO: #697 [X] Set join numbers
 
-        [JoinName("LayoutIsOnFirstPage")]
+		#region Digital
-        public JoinDataComplete LayoutIsOnFirstPage =
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Indicates if layout is on first page",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("LayoutIsOnLastPage")]
-        public JoinDataComplete LayoutIsOnLastPage =
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Indicates if layout is on first page",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("LayoutTurnToNextPage")]
-        public JoinDataComplete LayoutTurnToNextPage =
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Turns layout view to next page",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("LayoutTurnToPreviousPage")]
-        public JoinDataComplete LayoutTurnToPreviousPage =
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Turns layout view to previous page",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
 
 		[JoinName("CanSwapContentWithThumbnail")]
-        public JoinDataComplete CanSwapContentWithThumbnail =
+		public JoinDataComplete CanSwapContentWithThumbnail = new JoinDataComplete(
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
+			new JoinData
+			{
+				JoinNumber = 206,
+				JoinSpan = 1
+			},
 			new JoinMetadata
 			{
 				Description = "FB Indicates if content can be swapped with thumbnail",
@@ -59,8 +25,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			});
 
 		[JoinName("SwapContentWithThumbnail")]
-        public JoinDataComplete SwapContentWithThumbnail =
+		public JoinDataComplete SwapContentWithThumbnail = new JoinDataComplete(
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
+			new JoinData
+			{
+				JoinNumber = 206,
+				JoinSpan = 1
+			},
 			new JoinMetadata
 			{
 				Description = "Pulse to swap content with thumbnail.  FB reports current state",
@@ -68,29 +38,83 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("GetSetCurrentLayout")]
-        public JoinDataComplete GetSetCurrentLayout =
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Sets and reports the current layout.  Use the LayoutXXXXIsAvailable signals to determine valid layouts",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
 		[JoinName("GetAvailableLayouts")]
-        public JoinDataComplete GetAvailableLayouts =
+		public JoinDataComplete GetAvailableLayouts = new JoinDataComplete(
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
+			new JoinData
+			{
+				JoinNumber = 215,
+				JoinSpan = 1
+			},
 			new JoinMetadata
 			{
 				Description = "Gets the available layouts.  Will update the LayoutXXXXXIsAvailbale signals.",
 				JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Serial
+				JoinType = eJoinType.Digital
+			});
+
+		[JoinName("LayoutIsOnFirstPage")]
+		public JoinDataComplete LayoutIsOnFirstPage = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 216,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Indicates if layout is on first page",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		[JoinName("LayoutIsOnLastPage")]
+		public JoinDataComplete LayoutIsOnLastPage = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 217,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Indicates if layout is on first page",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		[JoinName("LayoutTurnToNextPage")]
+		public JoinDataComplete LayoutTurnToNextPage = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 216,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Turns layout view to next page",
+				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		[JoinName("LayoutTurnToPreviousPage")]
+		public JoinDataComplete LayoutTurnToPreviousPage = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 217,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Turns layout view to previous page",
+				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinType = eJoinType.Digital
 			});	
 
 		[JoinName("LayoutGalleryIsAvailable")]
-        public JoinDataComplete LayoutGalleryIsAvailable =
+		public JoinDataComplete LayoutGalleryIsAvailable = new JoinDataComplete(
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
+			new JoinData
+			{
+				JoinNumber = 221,
+				JoinSpan = 1
+			},
 			new JoinMetadata
 			{
 				Description = "FB Indicates if layout 'Gallery' is available",
@@ -99,8 +123,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			});
 
 		[JoinName("LayoutSpeakerIsAvailable")]
-        public JoinDataComplete LayoutSpeakerIsAvailable =
+		public JoinDataComplete LayoutSpeakerIsAvailable = new JoinDataComplete(
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
+			new JoinData
+			{
+				JoinNumber = 222,
+				JoinSpan = 1
+			},
 			new JoinMetadata
 			{
 				Description = "FB Indicates if layout 'Speaker' is available",
@@ -109,8 +137,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			});
 
 		[JoinName("LayoutStripIsAvailable")]
-        public JoinDataComplete LayoutStripIsAvailable =
+		public JoinDataComplete LayoutStripIsAvailable = new JoinDataComplete(
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
+			new JoinData
+			{
+				JoinNumber = 223,
+				JoinSpan = 1
+			},
 			new JoinMetadata
 			{
 				Description = "FB Indicates if layout 'Strip' is available",
@@ -119,8 +151,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			});
 
 		[JoinName("LayoutShareAllIsAvailable")]
-        public JoinDataComplete LayoutShareAllIsAvailable =
+		public JoinDataComplete LayoutShareAllIsAvailable = new JoinDataComplete(
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
+			new JoinData
+			{
+				JoinNumber = 224,
+				JoinSpan = 1
+			},
 			new JoinMetadata
 			{
 				Description = "FB Indicates if layout 'ShareAll' is available",
@@ -128,29 +164,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("ScreenIndexToPinUserTo")]
-        public JoinDataComplete ScreenIndexToPinUserTo =
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Specifies the screen index a participant should be pinned to",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("NumberOfScreens")]
-        public JoinDataComplete NumberOfScreens =
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "Reports the number of screens connected",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
 		[JoinName("ParticipantAudioMuteToggleStart")]
-        public JoinDataComplete ParticipantAudioMuteToggleStart =
+		public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
+			new JoinData
+			{
+				JoinNumber = 500,
+				JoinSpan = 100
+			},
 			new JoinMetadata
 			{
 				Description = "Toggles the participant's audio mute status",
@@ -159,8 +179,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			});
 
 		[JoinName("ParticipantVideoMuteToggleStart")]
-        public JoinDataComplete ParticipantVideoMuteToggleStart =
+		public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
+			new JoinData
+			{
+				JoinNumber = 800,
+				JoinSpan = 100
+			},
 			new JoinMetadata
 			{
 				Description = "Toggles the participant's video mute status",
@@ -169,8 +193,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			});
 
 		[JoinName("ParticipantPinToggleStart")]
-        public JoinDataComplete ParticipantPinToggleStart =
+		public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
-            new JoinDataComplete(new JoinData { JoinNumber = 999, JoinSpan = 1 },
+			new JoinData
+			{
+				JoinNumber = 1100,
+				JoinSpan = 100
+			},
 			new JoinMetadata
 			{
 				Description = "Toggles the participant's pin status",
@@ -178,6 +206,60 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				JoinType = eJoinType.Digital
 			});
 
+		#endregion
+
+
+		#region Analog
+
+		[JoinName("NumberOfScreens")]
+		public JoinDataComplete NumberOfScreens = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 11,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Reports the number of screens connected",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Analog
+			});
+
+		[JoinName("ScreenIndexToPinUserTo")]
+		public JoinDataComplete ScreenIndexToPinUserTo = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 11,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Specifies the screen index a participant should be pinned to",
+				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinType = eJoinType.Analog
+			});
+
+		#endregion
+
+
+		#region Serials
+
+		[JoinName("GetSetCurrentLayout")]
+		public JoinDataComplete GetSetCurrentLayout = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 215,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets and reports the current layout.  Use the LayoutXXXXIsAvailable signals to determine valid layouts",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Serial
+			});		
+
+		#endregion
+
 		public ZoomRoomJoinMap(uint joinStart)
 			: base(joinStart, typeof(ZoomRoomJoinMap))
 		{