Removed Layout Position properties and methods. Using SelfviewPipPosition properties and methods.

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

@@ -31,7 +31,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         BoolFeedback LayoutViewIsOnLastPageFeedback { get; } // TODO: #697 [*] Consider modifying to report button visibility in func 
         BoolFeedback CanSwapContentWithThumbnailFeedback { get; }
         BoolFeedback ContentSwappedWithThumbnailFeedback { get; }
-		//StringFeedback LayoutSizeFeedback { get; } // TOOD: #714 [ ] Feature Layout Size
+		StringFeedback LayoutSizeFeedback { get; } // TODO: #714 [ ] Feature Layout Size
 
         ZoomRoom.zConfiguration.eLayoutStyle LastSelectedLayout { get; }
         ZoomRoom.zConfiguration.eLayoutStyle AvailableLayouts { get; }
@@ -43,8 +43,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         void LayoutTurnNextPage();
         void LayoutTurnPreviousPage();
 
-		void GetCurrentLayoutSize(); // TOOD: #714 [ ] Feature Layout Size
-		void SetLayoutSize(ZoomRoom.zConfiguration.eLayoutSize layoutSize); // TOOD: #714 [ ] Feature Layout Size
+		void GetCurrentLayoutSize(); // TODO: #714 [ ] Feature Layout Size
+		void SetLayoutSize(ZoomRoom.zConfiguration.eLayoutSize layoutSize); // TODO: #714 [ ] Feature Layout Size
     }
 
     public class LayoutInfoChangedEventArgs : EventArgs

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

@@ -108,7 +108,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			ReceivingContent = new BoolFeedback(FarEndIsSharingContentFeedbackFunc);
 
 			SelfviewPipPositionFeedback = new StringFeedback(SelfviewPipPositionFeedbackFunc);
-
+			
 			SetUpFeedbackActions();
 
 			Cameras = new List<CameraBase>();
@@ -126,6 +126,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			LocalLayoutFeedback = new StringFeedback(LocalLayoutFeedbackFunc);
 
+			// TODO: #714 [ ] Feature Layout Size
+			LayoutSizeFeedback = new StringFeedback(LayoutSizeFeedbackFunc);			
+
 			LayoutViewIsOnFirstPageFeedback = new BoolFeedback(LayoutViewIsOnFirstPageFeedbackFunc);
 			LayoutViewIsOnLastPageFeedback = new BoolFeedback(LayoutViewIsOnLastPageFeedbackFunc);
 			CanSwapContentWithThumbnailFeedback = new BoolFeedback(CanSwapContentWithThumbnailFeedbackFunc);
@@ -511,6 +514,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 							LocalLayoutFeedback.FireUpdate();
 							break;
 						}
+					case "Size":
+					{
+						
+						break;
+					}
 
 				}
 			};
@@ -1483,7 +1491,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				return;
 			}
 
-			Debug.Console(1, this, "****************************Call Participants***************************");
+			Debug.Console(1, this, "*************************** Call Participants **************************");
 			foreach (var participant in Participants.CurrentParticipants)
 			{
 				Debug.Console(1, this, "Name: {0} Audio: {1} IsHost: {2}", participant.Name,
@@ -1570,7 +1578,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				}
 			}
 
-			Debug.Console(1, this, "****************************Active Calls*********************************");
+			Debug.Console(1, this, "*************************** Active Calls ********************************");
 
 			// Clean up any disconnected calls left in the list
 			for (int i = 0; i < ActiveCalls.Count; i++)
@@ -1586,7 +1594,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 				if (!call.IsActiveCall)
 				{
-					Debug.Console(1, this, "******Removing Inactive Call: {0}******", call.Name);
+					Debug.Console(1, this, "***** Removing Inactive Call: {0} *****", call.Name);
 					ActiveCalls.Remove(call);
 				}
 			}
@@ -1797,13 +1805,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 				layoutsCodec.LocalLayoutFeedback.LinkInputSig(trilist.StringInput[joinMap.GetSetCurrentLayout.JoinNumber]);
 
-				// TOOD: #714 [ ] Feature Layout Size				
+				// TODO: #714 [ ] Feature Layout Size				
 				trilist.SetSigFalseAction(joinMap.SetLayoutSizeOff.JoinNumber, () => layoutsCodec.SetLayoutSize(zConfiguration.eLayoutSize.Off));
 				trilist.SetSigFalseAction(joinMap.SetLayoutSize1.JoinNumber, () => layoutsCodec.SetLayoutSize(zConfiguration.eLayoutSize.Size1));
 				trilist.SetSigFalseAction(joinMap.SetLayoutSize2.JoinNumber, () => layoutsCodec.SetLayoutSize(zConfiguration.eLayoutSize.Size2));
 				trilist.SetSigFalseAction(joinMap.SetLayoutSize3.JoinNumber, () => layoutsCodec.SetLayoutSize(zConfiguration.eLayoutSize.Size3));
-				trilist.SetSigFalseAction(joinMap.SetLayoutSizeStrip.JoinNumber, () => layoutsCodec.SetLayoutSize(zConfiguration.eLayoutSize.Strip));
-				// TOOD: #714 [ ] Feature Layout Size
+				trilist.SetSigFalseAction(joinMap.SetLayoutSizeStrip.JoinNumber, () => layoutsCodec.SetLayoutSize(zConfiguration.eLayoutSize.Strip));				
 				trilist.SetSigFalseAction(joinMap.GetSetCurrentLayoutSize.JoinNumber, layoutsCodec.GetCurrentLayoutSize);
 				trilist.SetStringSigAction(joinMap.GetSetCurrentLayoutSize.JoinNumber, (s) =>
 				{
@@ -1817,6 +1824,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 						Debug.Console(1, this, "Unable to parse '{0}' to zConfiguration.eLayoutSize: {1}", s, e);
 					}
 				});
+				layoutsCodec.LayoutSizeFeedback.LinkInputSig(trilist.StringInput[joinMap.GetSetCurrentLayoutSize.JoinNumber]);				
 			}
 
 			var pinCodec = this as IHasParticipantPinUnpin;
@@ -2262,8 +2270,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		private void ComputeAvailableLayouts()
 		{
 			zConfiguration.eLayoutStyle availableLayouts = zConfiguration.eLayoutStyle.None;
-			// TODO: #697 [X] 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)
 			{
 				availableLayouts |= zConfiguration.eLayoutStyle.Gallery;
@@ -2327,22 +2333,46 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			SendText("zCommand Call Layout TurnPage Forward: Off");
 		}
 
-		// TOOD: #714 [ ] Feature Layout Size
+		// TODO: #714 [ ] Feature Layout Size
+		/// <summary>
+		/// Stores last selected layout size
+		/// </summary>
 		public zConfiguration.eLayoutSize LastSelectedLayoutSize { get; private set; }
 
-		// TOOD: #714 [ ] Feature Layout Size
+		// TODO: #714 [ ] Feature Layout Size
+		/// <summary>
+		/// Queries for current layout size
+		/// </summary>
 		public void GetCurrentLayoutSize()
 		{
 			SendText("zConfiguration Call Layout Size");
 		}
 
-		// TOOD: #714 [ ] Feature Layout Size
+		// TODO: #714 [ ] Feature Layout Size
+		/// <summary>
+		/// Sets selected layout size
+		/// </summary>
+		/// <param name="layoutSize">zConfiguration.eLayoutSize</param>
 		public void SetLayoutSize(zConfiguration.eLayoutSize layoutSize)
 		{
 			LastSelectedLayoutSize = layoutSize;
 			SendText(String.Format("zConfiguration Call Layout Size: {0}", layoutSize.ToString()));
 		}
 
+		// TODO: #714 [ ] Feature Layout Size
+		private Func<string> LayoutSizeFeedbackFunc
+		{
+			get
+			{
+				return () => Configuration.Call.Layout.Size.ToString();
+			}
+		}
+
+		/// <summary>
+		/// Layout size feedback 
+		/// </summary>
+		public StringFeedback LayoutSizeFeedback { get; private set; }
+
 		#endregion
 
 		#region IHasCodecLayouts Members
@@ -2376,7 +2406,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		public void MinMaxLayoutToggle()
 		{
 			throw new NotImplementedException();
-		}
+		}		
 
 		#endregion
 

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

@@ -6,8 +6,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
 	public class ZoomRoomJoinMap : VideoCodecControllerJoinMap
 	{
-		// TODO: #697 [X] Set join numbers
-
 		#region Digital
 
 		[JoinName("CanSwapContentWithThumbnail")]
@@ -162,24 +160,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				Description = "FB Indicates if layout 'ShareAll' is available",
 				JoinCapabilities = eJoinCapabilities.ToSIMPL,
 				JoinType = eJoinType.DigitalSerial
-			});
+			});		
 
-		// TOOD: #714 [ ] Feature Layout Size
-		//[JoinName("GetCurrentLayoutSize")]
-		//public JoinDataComplete GetCurrentLayoutSize = new JoinDataComplete(
-		//    new JoinData
-		//    {
-		//        JoinNumber = 230,
-		//        JoinSpan = 1
-		//    },
-		//    new JoinMetadata
-		//    {
-		//        Description = "Poll for the current layout size",
-		//        JoinCapabilities = eJoinCapabilities.FromSIMPL,
-		//        JoinType = eJoinType.Digital
-		//    });
-
-		// TOOD: #714 [ ] Feature Layout Size
+		// TODO: #714 [ ] Feature Layout Size
 		[JoinName("SetLayoutSizeOff")]
 		public JoinDataComplete SetLayoutSizeOff = new JoinDataComplete(
 			new JoinData
@@ -194,7 +177,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				JoinType = eJoinType.Digital
 			});
 
-		// TOOD: #714 [ ] Feature Layout Size
+		// TODO: #714 [ ] Feature Layout Size
 		[JoinName("SetLayoutSize1")]
 		public JoinDataComplete SetLayoutSize1 = new JoinDataComplete(
 			new JoinData
@@ -209,7 +192,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				JoinType = eJoinType.Digital
 			});
 
-		// TOOD: #714 [ ] Feature Layout Size
+		// TODO: #714 [ ] Feature Layout Size
 		[JoinName("SetLayoutSize2")]
 		public JoinDataComplete SetLayoutSize2 = new JoinDataComplete(
 			new JoinData
@@ -224,7 +207,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				JoinType = eJoinType.Digital
 			});
 
-		// TOOD: #714 [ ] Feature Layout Size
+		// TODO: #714 [ ] Feature Layout Size
 		[JoinName("SetLayoutSize3")]
 		public JoinDataComplete SetLayoutSize3 = new JoinDataComplete(
 			new JoinData
@@ -239,7 +222,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				JoinType = eJoinType.Digital
 			});
 
-		// TOOD: #714 [ ] Feature Layout Size
+		// TODO: #714 [ ] Feature Layout Size
 		[JoinName("SetLayoutSizeStrip")]
 		public JoinDataComplete SetLayoutSizeStrip = new JoinDataComplete(
 			new JoinData
@@ -348,7 +331,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				JoinType = eJoinType.Serial
 			});
 
-		// TOOD: #714 [ ] Feature Layout Size
+		// TODO: #714 [ ] Feature Layout Size
 		[JoinName("GetSetCurrentLayoutSize")]
 		public JoinDataComplete GetSetCurrentLayoutSize = new JoinDataComplete(
 			new JoinData