Updated IHasCodecLayouts and ZoomRoom to test feedback of Layout Size and Layout Position.

1.9.0

.github/ISSUE_TEMPLATE/rfi_request.md

@@ -0,0 +1,27 @@
+---
+name: Request for Information
+about: Request specific information about capabilities of the framework
+title: "[RFI]-"
+labels: RFI
+assignees: ''
+
+---
+
+**What is your request?**
+Please provide as much detail as possible.
+
+
+**What is the intended use case**
+- [ ] Essentials Standalone Application
+- [ ] Essentials + SIMPL Windows Hybrid
+
+**User Interface Requirements**
+- [ ] Not Applicable (logic only)
+- [ ] Crestron Smart Graphics Touchpanel
+- [ ] Cisco Touch10
+- [ ] Mobile Control
+- [ ] Crestron CH5 Touchpanel interface
+
+
+**Additional context**
+Add any other context or screenshots about the request here.

PepperDashEssentials/Room/Types/EssentialsTechRoom.cs

@@ -107,14 +107,18 @@ namespace PepperDash.Essentials
 
         private void TunerPresetsOnPresetRecalled(ISetTopBoxNumericKeypad device, string channel)
         {
+            //Debug.Console(2, this, "TunerPresetsOnPresetRecalled");
+
             if (!_currentPresets.ContainsKey(device.Key))
             {
                 return;
             }
 
+            //Debug.Console(2, this, "Tuner Key: {0} Channel: {1}", device.Key, channel);
+
             _currentPresets[device.Key] = channel;
 
-            if (!CurrentPresetsFeedbacks.ContainsKey(device.Key))
+            if (CurrentPresetsFeedbacks.ContainsKey(device.Key))
             {
                 CurrentPresetsFeedbacks[device.Key].FireUpdate();
             }

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

@@ -875,12 +875,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-			        // TODO: #698 Set Join number
         [JoinName("ParticipantAudioMuteToggleStart")]
         public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
 			new JoinData 
 			{ 
-				JoinNumber = 2001,
+				JoinNumber = 501,
 				JoinSpan = 50 
 			},
             new JoinMetadata
@@ -890,12 +889,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        // TODO: #698 Set Join number
         [JoinName("ParticipantVideoMuteToggleStart")]
         public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
 			new JoinData 
 			{ 
-				JoinNumber = 2101, 
+				JoinNumber = 801, 
 				JoinSpan = 50 
 			},
             new JoinMetadata
@@ -905,12 +903,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        // TODO: #698 Set Join number
         [JoinName("ParticipantPinToggleStart")]
         public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
 			new JoinData 
 			{ 
-				JoinNumber = 2201, 
+				JoinNumber = 1101, 
 				JoinSpan = 50 
 			},
             new JoinMetadata
@@ -1240,7 +1237,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				Description = "advance selfview position",
 				JoinCapabilities = eJoinCapabilities.ToSIMPL,
 				JoinType = eJoinType.Serial
-			});
+			});		
 
 		[JoinName("DirectoryEntrySelectedName")]
 		public JoinDataComplete DirectoryEntrySelectedName = new JoinDataComplete(
@@ -2177,14 +2174,13 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-		// TODO: #698 Set Join number
         [JoinName("ParticipantAudioMuteToggleStart")]
         public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
-			new JoinData 
-			{ 
-				JoinNumber = 2001,
-				JoinSpan = 50 
-			},
+            new JoinData
+            {
+                JoinNumber = 500,
+                JoinSpan = 50
+            },
             new JoinMetadata
             {
                 Description = "Toggles the participant's audio mute status",
@@ -2192,14 +2188,13 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        // TODO: #698 Set Join number
         [JoinName("ParticipantVideoMuteToggleStart")]
         public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
-			new JoinData 
-			{ 
-				JoinNumber = 2101, 
-				JoinSpan = 50 
-			},
+            new JoinData
+            {
+                JoinNumber = 800,
+                JoinSpan = 50
+            },
             new JoinMetadata
             {
                 Description = "Toggles the participant's video mute status",
@@ -2207,14 +2202,13 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        // TODO: #698 Set Join number
         [JoinName("ParticipantPinToggleStart")]
         public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
-			new JoinData 
-			{ 
-				JoinNumber = 2201, 
-				JoinSpan = 50 
-			},
+            new JoinData
+            {
+                JoinNumber = 1100,
+                JoinSpan = 50
+            },
             new JoinMetadata
             {
                 Description = "Toggles the participant's pin status",

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigWriter.cs

@@ -1,162 +1,162 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.Config
-{
-    /// <summary>
-    /// Responsible for updating config at runtime, and writing the updates out to a local file
-    /// </summary>
-    public class ConfigWriter
-    {
-        public const string LocalConfigFolder = "LocalConfig";
-
-        public const long WriteTimeout = 30000;
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Config
+{
+    /// <summary>
+    /// Responsible for updating config at runtime, and writing the updates out to a local file
+    /// </summary>
+    public class ConfigWriter
+    {
+        public const string LocalConfigFolder = "LocalConfig";
+
+        public const long WriteTimeout = 30000;
+
         public static CTimer WriteTimer;
-		static CCriticalSection fileLock = new CCriticalSection();
-
-        /// <summary>
-        /// Updates the config properties of a device
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        /// <param name="properties"></param>
-        /// <returns></returns>
-        public static bool UpdateDeviceProperties(string deviceKey, JToken properties)
-        {
-            bool success = false;
-
-            // Get the current device config
-            var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(deviceKey));
-
-            if (deviceConfig != null)
-            {
-                // Replace the current properties JToken with the new one passed into this method
-                deviceConfig.Properties = properties;
-
-                Debug.Console(1, "Updated properties of device: '{0}'", deviceKey);
-
-                success = true;
-            }
-
-            ResetTimer();
-
-            return success;
-        }
-
-        public static bool UpdateDeviceConfig(DeviceConfig config)
-        {
-            bool success = false;
-
-            var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(config.Key));
-
-            if (deviceConfig != null)
-            {
-                deviceConfig = config;
-
-                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
-
-                success = true;
-            }
-
-            ResetTimer();
-
-            return success;
-        }
-
-        public static bool UpdateRoomConfig(DeviceConfig config)
-        {
-            bool success = false;
-
-            var deviceConfig = ConfigReader.ConfigObject.Rooms.FirstOrDefault(d => d.Key.Equals(config.Key));
-
-            if (deviceConfig != null)
-            {
-                deviceConfig = config;
-
-                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
-
-                success = true;
-            }
-
-            ResetTimer();
-
-            return success;
-        }
-
-        /// <summary>
-        /// Resets (or starts) the write timer
-        /// </summary>
-        static void ResetTimer()
-        {
-            if (WriteTimer == null)
-                WriteTimer = new CTimer(WriteConfigFile, WriteTimeout);
-
-            WriteTimer.Reset(WriteTimeout);
-
-            Debug.Console(1, "Config File write timer has been reset.");
-        }
-
-        /// <summary>
-        /// Writes the current config to a file in the LocalConfig subfolder
-        /// </summary>
-        /// <returns></returns>
-        private static void WriteConfigFile(object o)
-        {
-            var filePath = Global.FilePathPrefix + LocalConfigFolder + Global.DirectorySeparator + "configurationFile.json";
-
-            var configData = JsonConvert.SerializeObject(ConfigReader.ConfigObject);
-
-            WriteFile(filePath, configData);
-        }
-
-        /// <summary>
-        /// Writes
-        /// </summary>
-        /// <param name="filepath"></param>
-        /// <param name="o"></param>
-        public static void WriteFile(string filePath, string configData)
-        {
-            if (WriteTimer != null)
-                WriteTimer.Stop();
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Writing Configuration to file");
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write config file: '{0}'", filePath);
-
-            try
-            {
-                if (fileLock.TryEnter())
-                {
-                    using (StreamWriter sw = new StreamWriter(filePath))
-                    {
-                        sw.Write(configData);
-                        sw.Flush();
-                    }
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to enter FileLock");
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Config write failed: \r{0}", e);
-            }
-            finally
-            {
-                if (fileLock != null && !fileLock.Disposed)
-                    fileLock.Leave();
-
-            }
-        }
-
-
-    }
+		static CCriticalSection fileLock = new CCriticalSection();
+
+        /// <summary>
+        /// Updates the config properties of a device
+        /// </summary>
+        /// <param name="deviceKey"></param>
+        /// <param name="properties"></param>
+        /// <returns></returns>
+        public static bool UpdateDeviceProperties(string deviceKey, JToken properties)
+        {
+            bool success = false;
+
+            // Get the current device config
+            var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(deviceKey));
+
+            if (deviceConfig != null)
+            {
+                // Replace the current properties JToken with the new one passed into this method
+                deviceConfig.Properties = properties;
+
+                Debug.Console(1, "Updated properties of device: '{0}'", deviceKey);
+
+                success = true;
+            }
+
+            ResetTimer();
+
+            return success;
+        }
+
+        public static bool UpdateDeviceConfig(DeviceConfig config)
+        {
+            bool success = false;
+
+            var deviceConfigIndex = ConfigReader.ConfigObject.Devices.FindIndex(d => d.Key.Equals(config.Key));
+
+            if (deviceConfigIndex >= 0)
+            {
+                ConfigReader.ConfigObject.Devices[deviceConfigIndex] = config;
+
+                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
+
+                success = true;
+            }
+
+            ResetTimer();
+
+            return success;
+        }
+
+        public static bool UpdateRoomConfig(DeviceConfig config)
+        {
+            bool success = false;
+
+			var roomConfigIndex = ConfigReader.ConfigObject.Rooms.FindIndex(d => d.Key.Equals(config.Key));
+
+			if (roomConfigIndex >= 0)
+            {
+                ConfigReader.ConfigObject.Rooms[roomConfigIndex] = config;
+
+                Debug.Console(1, "Updated room of device: '{0}'", config.Key);
+
+                success = true;
+            }
+
+            ResetTimer();
+
+            return success;
+        }
+
+        /// <summary>
+        /// Resets (or starts) the write timer
+        /// </summary>
+        static void ResetTimer()
+        {
+            if (WriteTimer == null)
+                WriteTimer = new CTimer(WriteConfigFile, WriteTimeout);
+
+            WriteTimer.Reset(WriteTimeout);
+
+            Debug.Console(1, "Config File write timer has been reset.");
+        }
+
+        /// <summary>
+        /// Writes the current config to a file in the LocalConfig subfolder
+        /// </summary>
+        /// <returns></returns>
+        private static void WriteConfigFile(object o)
+        {
+            var filePath = Global.FilePathPrefix + LocalConfigFolder + Global.DirectorySeparator + "configurationFile.json";
+
+            var configData = JsonConvert.SerializeObject(ConfigReader.ConfigObject);
+
+            WriteFile(filePath, configData);
+        }
+
+        /// <summary>
+        /// Writes
+        /// </summary>
+        /// <param name="filepath"></param>
+        /// <param name="o"></param>
+        public static void WriteFile(string filePath, string configData)
+        {
+            if (WriteTimer != null)
+                WriteTimer.Stop();
+
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Writing Configuration to file");
+
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write config file: '{0}'", filePath);
+
+            try
+            {
+                if (fileLock.TryEnter())
+                {
+                    using (StreamWriter sw = new StreamWriter(filePath))
+                    {
+                        sw.Write(configData);
+                        sw.Flush();
+                    }
+                }
+                else
+                {
+                    Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to enter FileLock");
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Config write failed: \r{0}", e);
+            }
+            finally
+            {
+                if (fileLock != null && !fileLock.Disposed)
+                    fileLock.Leave();
+
+            }
+        }
+
+
+    }
 }

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

@@ -20,8 +20,23 @@ namespace PepperDash.Essentials.Core
 		/// <param name="json"></param>
 		public static void DoDeviceActionWithJson(string json)
 		{
-			var action = JsonConvert.DeserializeObject<DeviceActionWrapper>(json);
-			DoDeviceAction(action);
+		    if (String.IsNullOrEmpty(json))
+		    {
+		        CrestronConsole.ConsoleCommandResponse(
+		            "Please provide a JSON object matching the format {\"deviceKey\":\"myDevice\", \"methodName\":\"someMethod\", \"params\": [\"param1\", true]}.\r\nIf the method has no parameters, the \"params\" object may be omitted.");
+		        return;
+		    }
+		    try
+		    {
+		        var action = JsonConvert.DeserializeObject<DeviceActionWrapper>(json);
+
+		        DoDeviceAction(action);
+		    }
+		    catch (Exception ex)
+		    {
+		        CrestronConsole.ConsoleCommandResponse("Incorrect format for JSON. Please check that the format matches {\"deviceKey\":\"myDevice\", \"methodName\":\"someMethod\", \"params\": [\"param1\", true]}");
+		    }
+		    
 		}
 
 
@@ -33,29 +48,47 @@ namespace PepperDash.Essentials.Core
 		{
 			var key = action.DeviceKey;
 			var obj = FindObjectOnPath(key);
-			if (obj == null)
-				return;
+		    if (obj == null)
+		    {
+		        CrestronConsole.ConsoleCommandResponse("Unable to find object at path {0}", key);
+		        return;
+		    }
 
-			CType t = obj.GetType();
-			var method = t.GetMethod(action.MethodName);
-			if (method == null)
-			{
-				Debug.Console(0, "Method '{0}' not found", action.MethodName);
-				return;
-			}
-			var mParams = method.GetParameters();
-			// Add empty params if not provided
-			if (action.Params == null) action.Params = new object[0];
-			if (mParams.Length > action.Params.Length)
-			{
-				Debug.Console(0, "Method '{0}' requires {1} params", action.MethodName, mParams.Length);
-				return;
-			}
-			object[] convertedParams = mParams
-								.Select((p, i) => Convert.ChangeType(action.Params[i], p.ParameterType,
-									System.Globalization.CultureInfo.InvariantCulture))
-								.ToArray();
-			object ret = method.Invoke(obj, convertedParams);
+		    if (action.Params == null)
+		    {
+                //no params, so setting action.Params to empty array
+		        action.Params = new object[0];
+		    }
+
+		    CType t = obj.GetType();
+		    try
+		    {
+		        var methods = t.GetMethods().Where(m => m.Name == action.MethodName).ToList();
+
+		        var method = methods.Count == 1 ? methods[0] : methods.FirstOrDefault(m => m.GetParameters().Length == action.Params.Length);
+
+		        if (method == null)
+		        {
+		            CrestronConsole.ConsoleCommandResponse(
+		                "Unable to find method with name {0} and that matches parameters {1}", action.MethodName,
+		                action.Params);
+		            return;
+		        }
+                var mParams = method.GetParameters();
+
+                var convertedParams = mParams
+                                    .Select((p, i) => Convert.ChangeType(action.Params[i], p.ParameterType,
+                                        System.Globalization.CultureInfo.InvariantCulture))
+                                    .ToArray();
+                var ret = method.Invoke(obj, convertedParams);
+
+		        CrestronConsole.ConsoleCommandResponse("Method {0} successfully called on device {1}", method.Name,
+		            action.DeviceKey);
+		    }
+		    catch (Exception ex)
+		    {
+		        CrestronConsole.ConsoleCommandResponse("Unable to call method with name {0}. {1}", action.MethodName,
+		            ex.Message);}
 		}
 
 		/// <summary>

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

@@ -7,6 +7,8 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Essentials.Core.Devices
 {
@@ -52,6 +54,8 @@ namespace PepperDash.Essentials.Core.Devices
                 Name = config.Name;
         }
 
+
+
         /// <summary>
         /// Used by the extending class to allow for any custom actions to be taken (tell the ConfigWriter to write config, etc)
         /// </summary>

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraBase.cs

@@ -8,6 +8,8 @@ using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Presets;
 using PepperDash.Essentials.Devices.Common.Codec;
@@ -25,7 +27,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         Focus = 8
     }
 
-    public abstract class CameraBase : EssentialsDevice, IRoutingOutputs
+    public abstract class CameraBase : ReconfigurableDevice, IRoutingOutputs
 	{
         public eCameraControlMode ControlMode { get; protected set; }
 
@@ -70,12 +72,18 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         // A bitmasked value to indicate the movement capabilites of this camera
         protected eCameraCapabilities Capabilities { get; set; }
 
-        protected CameraBase(string key, string name) :
-			base(key, name) 
-        {
-            OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
+		protected CameraBase(DeviceConfig config) : base(config)
+		{
+			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
 
-            ControlMode = eCameraControlMode.Manual;
+			ControlMode = eCameraControlMode.Manual;
+
+		}
+
+        protected CameraBase(string key, string name) : 
+			this (new DeviceConfig{Name = name, Key = key})
+        {
+				
         }
 
         protected void LinkCameraToApi(CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey,

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

@@ -27,10 +27,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
     {
         event EventHandler<LayoutInfoChangedEventArgs> AvailableLayoutsChanged;
 
-        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 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 CanSwapContentWithThumbnailFeedback { get; }
         BoolFeedback ContentSwappedWithThumbnailFeedback { get; }
+		StringFeedback LayoutSizeFeedback { get; } // TODO: #714 [ ] Feature Layout Size
+		//StringFeedback LayoutPositionFeedback { get; } // TODO: #714 [ ] Feature Layout Size
 
         ZoomRoom.zConfiguration.eLayoutStyle LastSelectedLayout { get; }
         ZoomRoom.zConfiguration.eLayoutStyle AvailableLayouts { get; }
@@ -41,6 +43,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         void LayoutTurnNextPage();
         void LayoutTurnPreviousPage();
+
+		void GetCurrentLayoutSize(); // TODO: #714 [ ] Feature Layout Size
+		void SetLayoutSize(ZoomRoom.zConfiguration.eLayoutSize layoutSize); // TODO: #714 [ ] Feature Layout Size
+
+		void GetCurrentLayoutPosition(); // TODO: #714 [ ] Feature Layout Size
+		void SetLayoutPosition(ZoomRoom.zConfiguration.eLayoutPosition layoutPosition);  // TODO: #714 [ ] Feature Layout Size
     }
 
     public class LayoutInfoChangedEventArgs : EventArgs

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

@@ -673,7 +673,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			trilist.SetBoolSigAction(joinMap.SourceShareAutoStart.JoinNumber, (b) => AutoShareContentWhileInCall = b);
 		}
 
-		// TODO [ ] 2021-01-06, jkd: Added to debug OBTP dialing issues
 		private List<Meeting> _currentMeetings = new List<Meeting>();
 
 		private void LinkVideoCodecScheduleToApi(IHasScheduleAwareness codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
@@ -685,7 +684,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				codec.CodecSchedule.MeetingWarningMinutes = i;
 			});
 
-			// TODO [ ] 2021-01-06, jkd: Added to debug OBTP dialing issues
 			trilist.SetSigFalseAction(joinMap.DialMeeting1.JoinNumber, () =>
 			{
 				var mtg = 1;
@@ -695,7 +693,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				if (_currentMeetings[index] != null)
 					Dial(_currentMeetings[index]);
 			});
-			// TODO [ ] 2021-01-06, jkd: Added to debug OBTP dialing issues				
+			
 			trilist.SetSigFalseAction(joinMap.DialMeeting2.JoinNumber, () =>
 			{
 				var mtg = 2;
@@ -705,7 +703,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				if (_currentMeetings[index] != null)
 					Dial(_currentMeetings[index]);
 			});
-			// TODO [ ] 2021-01-06, jkd: Added to debug OBTP dialing issues
+			
 			trilist.SetSigFalseAction(joinMap.DialMeeting3.JoinNumber, () =>
 			{
 				var mtg = 3;
@@ -730,14 +728,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		{
 			var currentTime = DateTime.Now;
 
-			// TODO [ ] 2021-01-06, jkd: Added to debug OBTP dialing issues				
-			// - changed var currentMeetings >> field _currentMeetings
-			//_currentMeetings.Clear();
 			_currentMeetings = codec.CodecSchedule.Meetings.Where(m => m.StartTime >= currentTime || m.EndTime >= currentTime).ToList();
 
-			// TODO [ ] 2021-01-06, jkd: Added to debug OBTP dialing issues				
-			// - moved the trilist.SetSigFlaseAction(joinMap.DialMeeting1..3.JoinNumber) lambda's to LinkVideoCodecScheduleToApi
-
 			var meetingsData = UpdateMeetingsListXSig(_currentMeetings);
 			trilist.SetString(joinMap.Schedule.JoinNumber, meetingsData);
 			trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort)_currentMeetings.Count);

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

@@ -119,7 +119,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			{
 				Description = "FB Indicates if layout 'Gallery' is available",
 				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
+				JoinType = eJoinType.DigitalSerial
 			});
 
 		[JoinName("LayoutSpeakerIsAvailable")]
@@ -133,7 +133,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			{
 				Description = "FB Indicates if layout 'Speaker' is available",
 				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
+				JoinType = eJoinType.DigitalSerial
 			});
 
 		[JoinName("LayoutStripIsAvailable")]
@@ -147,7 +147,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			{
 				Description = "FB Indicates if layout 'Strip' is available",
 				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
+				JoinType = eJoinType.DigitalSerial
 			});
 
 		[JoinName("LayoutShareAllIsAvailable")]
@@ -161,51 +161,261 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			{
 				Description = "FB Indicates if layout 'ShareAll' is available",
 				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
+				JoinType = eJoinType.DigitalSerial
+			});		
 
-		[JoinName("ParticipantAudioMuteToggleStart")]
-		public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutSizeOff")]
+		public JoinDataComplete SetLayoutSizeOff = new JoinDataComplete(
 			new JoinData
 			{
-				JoinNumber = 500,
-				JoinSpan = 100
+				JoinNumber = 231,
+				JoinSpan = 1
 			},
 			new JoinMetadata
 			{
-				Description = "Toggles the participant's audio mute status",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				Description = "Sets layout size off",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
 			});
 
-		[JoinName("ParticipantVideoMuteToggleStart")]
-		public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutSize1")]
+		public JoinDataComplete SetLayoutSize1 = new JoinDataComplete(
 			new JoinData
 			{
-				JoinNumber = 800,
-				JoinSpan = 100
+				JoinNumber = 232,
+				JoinSpan = 1
 			},
 			new JoinMetadata
 			{
-				Description = "Toggles the participant's video mute status",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				Description = "Sets layout size 1",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
 			});
 
-		[JoinName("ParticipantPinToggleStart")]
-		public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutSize2")]
+		public JoinDataComplete SetLayoutSize2 = new JoinDataComplete(
 			new JoinData
 			{
-				JoinNumber = 1100,
-				JoinSpan = 100
+				JoinNumber = 233,
+				JoinSpan = 1
 			},
 			new JoinMetadata
 			{
-				Description = "Toggles the participant's pin status",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				Description = "Sets layout size 2",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
 			});
 
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutSize3")]
+		public JoinDataComplete SetLayoutSize3 = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 234,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets layout size 3",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutSizeStrip")]
+		public JoinDataComplete SetLayoutSizeStrip = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 235,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets layout size strip",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});		
+
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutPositionCenter")]
+		public JoinDataComplete SetLayoutPositionCenter = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 241,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets layout position to center",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutPositionUp")]
+		public JoinDataComplete SetLayoutPositionUp = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 242,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets layout position to up",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutPositionRight")]
+		public JoinDataComplete SetLayoutPositionRight = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 243,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets layout position to right",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutPositionUpRight")]
+		public JoinDataComplete SetLayoutPositionUpRight = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 244,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets layout position to up right",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutPositionDown")]
+		public JoinDataComplete SetLayoutPositionDown = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 245,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets layout position to down",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutPositionDownRight")]
+		public JoinDataComplete SetLayoutPositionDownRight = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 246,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets layout position to down right",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutPositionLeft")]
+		public JoinDataComplete SetLayoutPositionLeft = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 247,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets layout position todown left",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutPositionUpLeft")]
+		public JoinDataComplete SetLayoutPositionUpLeft = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 248,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets layout position to up left",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("SetLayoutPositionDownLeft")]
+		public JoinDataComplete SetLayoutPositionDownLeft = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 249,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets layout position to down left",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+        //[JoinName("ParticipantAudioMuteToggleStart")]
+        //public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
+        //    new JoinData
+        //    {
+        //        JoinNumber = 500,
+        //        JoinSpan = 100
+        //    },
+        //    new JoinMetadata
+        //    {
+        //        Description = "Toggles the participant's audio mute status",
+        //        JoinCapabilities = eJoinCapabilities.ToSIMPL,
+        //        JoinType = eJoinType.Digital
+        //    });
+
+        //[JoinName("ParticipantVideoMuteToggleStart")]
+        //public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
+        //    new JoinData
+        //    {
+        //        JoinNumber = 800,
+        //        JoinSpan = 100
+        //    },
+        //    new JoinMetadata
+        //    {
+        //        Description = "Toggles the participant's video mute status",
+        //        JoinCapabilities = eJoinCapabilities.ToSIMPL,
+        //        JoinType = eJoinType.Digital
+        //    });
+
+        //[JoinName("ParticipantPinToggleStart")]
+        //public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
+        //    new JoinData
+        //    {
+        //        JoinNumber = 1100,
+        //        JoinSpan = 100
+        //    },
+        //    new JoinMetadata
+        //    {
+        //        Description = "Toggles the participant's pin status",
+        //        JoinCapabilities = eJoinCapabilities.ToSIMPL,
+        //        JoinType = eJoinType.Digital
+        //    });
+
 		#endregion
 
 
@@ -256,7 +466,38 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				Description = "Sets and reports the current layout.  Use the LayoutXXXXIsAvailable signals to determine valid layouts",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Serial
-			});		
+			});
+
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("GetSetCurrentLayoutSize")]
+		public JoinDataComplete GetSetCurrentLayoutSize = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 230,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets and reports the current layout size.",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.DigitalSerial
+			});
+
+		// TODO: #714 [ ] Feature Layout Size
+		[JoinName("GetSetCurrentLayoutPosition")]
+		public JoinDataComplete GetSetCurrentLayoutPosition = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 240,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Sets and reports the current layout position.",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.DigitalSerial
+			});
+
 
 		#endregion