Merge branch 'development' into hotfix/genericqueue-dispose-issue

PepperDashEssentials/ControlSystem.cs

@@ -36,7 +36,6 @@ namespace PepperDash.Essentials
             Thread.MaxNumberOfUserThreads = 400;
             Global.ControlSystem = this;
             DeviceManager.Initialize(this);
-            SecretsManager.Initialize();
             SystemMonitor.ProgramInitialization.ProgramInitializationUnderUserControl = true;
         }
 
@@ -72,7 +71,7 @@ namespace PepperDash.Essentials
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 foreach (var tl in TieLineCollection.Default)
-                    CrestronConsole.ConsoleCommandResponse("  {0}\r\n", tl);
+                    CrestronConsole.ConsoleCommandResponse("  {0}\r", tl);
             },
             "listtielines", "Prints out all tie lines", ConsoleAccessLevelEnum.AccessOperator);
 
@@ -86,8 +85,8 @@ namespace PepperDash.Essentials
 
             CrestronConsole.AddNewConsoleCommand(s =>
             {
-                CrestronConsole.ConsoleCommandResponse("This system can be found at the following URLs:\r\n" +
-                    "System URL:   {0}\r\n" +
+                CrestronConsole.ConsoleCommandResponse("This system can be found at the following URLs:\r" +
+                    "System URL:   {0}\r" +
                     "Template URL: {1}", ConfigReader.ConfigObject.SystemUrl, ConfigReader.ConfigObject.TemplateUrl);
             }, "portalinfo", "Shows portal URLS from configuration", ConsoleAccessLevelEnum.AccessOperator);
 

PepperDashEssentials/PepperDashEssentials.csproj

@@ -137,7 +137,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\SimplRoomPropertiesConfig.cs" />
+    <Compile Include="Room\Config\DDVC01RoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsPresentationPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsHuddleRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsHuddleVtc1PropertiesConfig.cs" />

PepperDashEssentials/Room/Config/DDVC01RoomPropertiesConfig.cs

@@ -8,19 +8,19 @@ using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Room.Config
 {
-	public class SimplRoomPropertiesConfig : EssentialsHuddleVtc1PropertiesConfig
+	public class DDVC01RoomPropertiesConfig : EssentialsHuddleVtc1PropertiesConfig
 	{
 		[JsonProperty("roomPhoneNumber")]
 		public string RoomPhoneNumber { get; set; }
 		[JsonProperty("roomURI")]
 		public string RoomURI { get; set; }
 		[JsonProperty("speedDials")]
-		public List<SimplSpeedDial> SpeedDials { get; set; }
+		public List<DDVC01SpeedDial> SpeedDials { get; set; }
 		[JsonProperty("volumeSliderNames")]
 		public List<string> VolumeSliderNames { get; set; }
 	}
 
-	public class SimplSpeedDial
+	public class DDVC01SpeedDial
 	{
 		[JsonProperty("name")]
 		public string Name { get; set; }

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -196,20 +196,9 @@ namespace PepperDash.Essentials.Room.Config
         public string DefaultAudioKey { get; set; }
         [JsonProperty("sourceListKey")]
         public string SourceListKey { get; set; }
-        [JsonProperty("destinationListKey")]
-        public string DestinationListKey { get; set; }
         [JsonProperty("defaultSourceItem")]
         public string DefaultSourceItem { get; set; }
-        /// <summary>
-        /// Indicates if the room supports advanced sharing
-        /// </summary>
-        [JsonProperty("supportsAdvancedSharing")]
-        public bool SupportsAdvancedSharing { get; set; }
-        /// <summary>
-        /// Indicates if non-tech users can change the share mode
-        /// </summary>
-        [JsonProperty("userCanChangeShareMode")]
-        public bool UserCanChangeShareMode { get; set; }
+
     }
 
     public class EssentialsConferenceRoomPropertiesConfig : EssentialsAvRoomPropertiesConfig

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -19,8 +19,7 @@ namespace PepperDash.Essentials
 {
     public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IHasCurrentSourceInfoChange,
         IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
-    {
-        private bool _codecExternalSourceChange;
+	{
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
 		public event SourceInfoChangeHandler CurrentSourceChange;
 
@@ -179,12 +178,10 @@ namespace PepperDash.Essentials
 					handler(_CurrentSourceInfo, ChangeType.DidChange);
 
                 var vc = VideoCodec as IHasExternalSourceSwitching;
-                if (vc != null && !_codecExternalSourceChange)
+                if (vc != null)
                 {
                     vc.SetSelectedSource(CurrentSourceInfoKey);
                 }
-
-			    _codecExternalSourceChange = false;
 			}
 		}
 		SourceListItem _CurrentSourceInfo;
@@ -424,12 +421,6 @@ namespace PepperDash.Essentials
             return true;
         }
 
-        public void RunRouteActionCodec(string routeKey, string sourceListKey)
-        {
-            _codecExternalSourceChange = true;
-            RunRouteAction(routeKey, sourceListKey);
-        }
-
         /// <summary>
         /// 
         /// </summary>
@@ -759,7 +750,7 @@ namespace PepperDash.Essentials
                     x => x.DestinationKey == VideoCodec.Key && x.DestinationPort == videoCodecWithExternalSwitching.ExternalSourceInputPort).DestinationPort;
 
                 videoCodecWithExternalSwitching.ClearExternalSources();
-                videoCodecWithExternalSwitching.RunRouteAction = RunRouteActionCodec;
+                videoCodecWithExternalSwitching.RunRouteAction = RunRouteAction;
                 var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
 
                 foreach (var kvp in srcList)

essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/GenericComm.cs

@@ -25,7 +25,6 @@ namespace PepperDash.Essentials.Core
         public GenericComm(DeviceConfig config)
             : base(config)
         {
-
             PropertiesConfig = CommFactory.GetControlPropertiesConfig(config);
 
             var commPort = CommFactory.CreateCommForDevice(config);

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

@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
 
 using Newtonsoft.Json.Linq;
 
@@ -20,25 +25,12 @@ namespace PepperDash.Essentials.Core.Config
 		[JsonProperty("sourceLists")]
 		public Dictionary<string, Dictionary<string, SourceListItem>> SourceLists { get; set; }
 
-        [JsonProperty("destinationLists")]
-        public Dictionary<string, Dictionary<string,DestinationListItem>> DestinationLists { get; set; }
-
-        [JsonProperty("tieLines")]
+		[JsonProperty("tieLines")]
 		public List<TieLineConfig> TieLines { get; set; }
 
         [JsonProperty("joinMaps")]
         public Dictionary<string, JObject> JoinMaps { get; set; }
 
-        public BasicConfig()
-        {
-            Info = new InfoConfig();
-            Devices = new List<DeviceConfig>();
-            SourceLists = new Dictionary<string, Dictionary<string, SourceListItem>>();
-            DestinationLists = new Dictionary<string, Dictionary<string, DestinationListItem>>();
-            TieLines = new List<TieLineConfig>();
-            JoinMaps = new Dictionary<string, JObject>();
-        }
-
 		/// <summary>
 		/// Checks SourceLists for a given list and returns it if found. Otherwise, returns null
 		/// </summary>
@@ -50,21 +42,6 @@ namespace PepperDash.Essentials.Core.Config
 			return SourceLists[key];
 		}
 
-        /// <summary>
-        /// Retrieves a DestinationListItem based on the key
-        /// </summary>
-        /// <param name="key">key of the item to retrieve</param>
-        /// <returns>DestinationListItem if the key exists, null otherwise</returns>
-	    public Dictionary<string, DestinationListItem> GetDestinationListForKey(string key)
-	    {
-	        if (string.IsNullOrEmpty(key) || !DestinationLists.ContainsKey(key))
-	        {
-	            return null;
-	        }
-
-	        return DestinationLists[key];
-	    } 
-
         /// <summary>
         /// Checks Devices for an item with a Key that matches and returns it if found. Otherwise, retunes null
         /// </summary>

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

@@ -30,19 +30,7 @@ namespace PepperDash.Essentials.Core.Config
 
         [JsonProperty("properties")]
         [JsonConverter(typeof(DevicePropertiesConverter))]
-        public JToken Properties { get; set; }
-
-        public DeviceConfig(DeviceConfig dc)
-        {
-            Key = dc.Key;
-            Uid = dc.Uid;
-            Name = dc.Name;
-            Group = dc.Group;
-            Type = dc.Type;
-            Properties = JToken.FromObject(dc.Properties);
-        }
-
-        public DeviceConfig() {}
+        public JToken Properties { get; set; }
     }
 
     /// <summary>

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

@@ -51,13 +51,6 @@ namespace PepperDash.Essentials.Core.Config
 
 		[JsonProperty("rooms")]
         public List<DeviceConfig> Rooms { get; set; }
-
-
-        public EssentialsConfig()
-            : base()
-        {
-            Rooms = new List<DeviceConfig>();
-        }
 	}
 		
 	/// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs

@@ -20,10 +20,6 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     {
         event EventHandler<EventArgs> UserCodeChanged;
 
-        event EventHandler<EventArgs> UserPromptedForCode;
-
-        event EventHandler<EventArgs> ClientJoined;
-
         string UserCode { get; }
 
         string QrCodeUrl { get; }

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

@@ -1,54 +0,0 @@
-using Newtonsoft.Json;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    public class DestinationListItem
-    {
-        [JsonProperty("sinkKey")]
-        public string SinkKey { get; set; }
-
-        private EssentialsDevice _sinkDevice;
-
-        [JsonIgnore]
-        public EssentialsDevice SinkDevice
-        {
-            get { return _sinkDevice ?? (_sinkDevice = DeviceManager.GetDeviceForKey(SinkKey) as EssentialsDevice); }
-        }
-
-        [JsonProperty("preferredName")]
-        public string PreferredName
-        {
-            get
-            {
-                if (!string.IsNullOrEmpty(Name))
-                {
-                    return Name;
-                }
-
-                return SinkDevice == null ? "---" : SinkDevice.Name;
-            }
-        }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("includeInDestinationList")]
-        public bool IncludeInDestinationList { get; set; }
-
-        [JsonProperty("order")]
-        public int Order { get; set; }
-
-        [JsonProperty("surfaceLocation")]
-        public int SurfaceLocation { get; set; }
-
-        [JsonProperty("verticalLocation")]
-        public int VerticalLocation { get; set; }
-        
-        [JsonProperty("horizontalLocation")]
-        public int HorizontalLocation { get; set; }
-
-        [JsonProperty("sinkType")]
-        public eRoutingSignalType SinkType { get; set; }
-    }
-}

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

@@ -130,24 +130,10 @@ namespace PepperDash.Essentials.Core
         [JsonProperty("sourceListKey")]
         public string SourceListKey { get; set; }
 
-        /// <summary>
-        /// Indicates if the device associated with this source is controllable
-        /// </summary>
-        [JsonProperty("isControllable")]
-        public bool IsControllable { get; set; }
-
-        /// <summary>
-        /// Indicates that the device associated with this source has audio available
-        /// </summary>
-        [JsonProperty("isAudioSource")]
-        public bool IsAudioSource { get; set; }
-
 		public SourceListItem()
 		{
 			Icon = "Blank";
 		}
-
-        
 	}
 
 	public class SourceRouteListItem

essentials-framework/Essentials Core/PepperDashEssentialsBase/Extensions/JsonExtensions.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace PepperDash.Essentials.Core
-{
-    public static class JsonExtensions
-    {
-        public static List<JToken> FindTokens(this JToken containerToken, string name)
-        {
-            List<JToken> matches = new List<JToken>();
-            FindTokens(containerToken, name, matches);
-            return matches;
-        }
-
-        private static void FindTokens(JToken containerToken, string name, List<JToken> matches)
-        {
-            if (containerToken.Type == JTokenType.Object)
-            {
-                foreach (JProperty child in containerToken.Children<JProperty>())
-                {
-                    if (child.Name == name)
-                    {
-                        matches.Add(child.Value);
-                    }
-                    FindTokens(child.Value, name, matches);
-                }
-            }
-            else if (containerToken.Type == JTokenType.Array)
-            {
-                foreach (JToken child in containerToken.Children())
-                {
-                    FindTokens(child, name, matches);
-                }
-            }
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs

@@ -7,8 +7,6 @@ using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.GeneralIO;
 using Crestron.SimplSharp.Reflection;
 using PepperDash.Core;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.CrestronIO;
@@ -85,81 +83,33 @@ namespace PepperDash.Essentials.Core
 
             var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
             DeviceFactory.FactoryMethods.Add(typeName, wrapper);
-        }
-
-        private static void CheckForSecrets(IEnumerable<JProperty> obj)
-        {
-            foreach (var prop in obj.Where(prop => prop.Value as JObject != null))
-            {
-                if (prop.Name.ToLower() == "secret")
-                {
-                    var secret = GetSecret(prop.Children().First().ToObject<SecretsPropertiesConfig>());
-                    //var secret = GetSecret(JsonConvert.DeserializeObject<SecretsPropertiesConfig>(prop.Children().First().ToString()));
-                    prop.Parent.Replace(secret);
-                }
-                var recurseProp = prop.Value as JObject;
-                if (recurseProp == null) return;
-                CheckForSecrets(recurseProp.Properties());
-            }
-        }
-
-        private static string GetSecret(SecretsPropertiesConfig data)
-        {
-            var secretProvider = SecretsManager.GetSecretProviderByKey(data.Provider);
-            if (secretProvider == null) return null;
-            var secret = secretProvider.GetSecret(data.Key);
-            if (secret != null) return (string) secret.Value;
-            Debug.Console(1,
-                "Unable to retrieve secret {0}{1} - Make sure you've added it to the secrets provider",
-                data.Provider, data.Key);
-            return String.Empty;
-        }
-
-
-        /// <summary>
-        /// The factory method for Core "things". Also iterates the Factory methods that have
-        /// been loaded from plugins
-        /// </summary>
-        /// <param name="dc"></param>
-        /// <returns></returns>
-        public static IKeyed GetDevice(DeviceConfig dc)
-        {
-            try
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading '{0}' from Essentials Core", dc.Type);
-
-                var localDc = new DeviceConfig(dc);
-
-                var key = localDc.Key;
-                var name = localDc.Name;
-                var type = localDc.Type;
-                var properties = localDc.Properties;
-                //var propRecurse = properties;
-
-                var typeName = localDc.Type.ToLower();
-
-
-                var jObject = properties as JObject;
-                if (jObject != null)
-                {
-                    var jProp = jObject.Properties();
-
-                    CheckForSecrets(jProp);
-                }
-
-                Debug.Console(2, "typeName = {0}", typeName);
-                // Check for types that have been added by plugin dlls. 
-                return !FactoryMethods.ContainsKey(typeName) ? null : FactoryMethods[typeName].FactoryMethod(localDc);
-            }
-            catch (Exception ex)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Exception occurred while creating device {0}: {1}", dc.Key, ex.Message);
-
-                Debug.Console(2, "{0}", ex.StackTrace);
-                return null;
-            }
-        }
-
+        }
+
+		/// <summary>
+		/// The factory method for Core "things". Also iterates the Factory methods that have
+		/// been loaded from plugins
+		/// </summary>
+		/// <param name="dc"></param>
+		/// <returns></returns>
+        public static IKeyed GetDevice(DeviceConfig dc)
+        {
+            var key = dc.Key;
+            var name = dc.Name;
+            var type = dc.Type;
+            var properties = dc.Properties;	
+
+            var typeName = dc.Type.ToLower();
+
+            // Check for types that have been added by plugin dlls. 
+            if (FactoryMethods.ContainsKey(typeName))
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading '{0}' from Essentials Core", dc.Type);
+                return FactoryMethods[typeName].FactoryMethod(dc);
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Prints the type names and associated metadata from the FactoryMethods collection.
         /// </summary>

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

@@ -189,7 +189,6 @@
     <Compile Include="Device Info\IDeviceInfoProvider.cs" />
     <Compile Include="Devices\CodecInterfaces.cs" />
     <Compile Include="Devices\CrestronProcessor.cs" />
-    <Compile Include="Devices\DestinationListItem.cs" />
     <Compile Include="Devices\DeviceApiBase.cs" />
     <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
     <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
@@ -209,7 +208,6 @@
     <Compile Include="DeviceTypeInterfaces\IHasFarEndContentStatus.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasPhoneDialing.cs" />
     <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />
-    <Compile Include="Extensions\JsonExtensions.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Factory\IDeviceFactory.cs" />
     <Compile Include="Factory\ReadyEventArgs.cs" />
@@ -321,10 +319,6 @@
     <Compile Include="Feedbacks\BoolFeedbackPulseExtender.cs" />
     <Compile Include="Routing\RoutingPortNames.cs" />
     <Compile Include="Routing\TieLineConfig.cs" />
-    <Compile Include="Secrets\CrestronSecretsProvider.cs" />
-    <Compile Include="Secrets\Interfaces.cs" />
-    <Compile Include="Secrets\SecretsManager.cs" />
-    <Compile Include="Secrets\SecretsPropertiesConfig.cs" />
     <Compile Include="Shades\Shade Interfaces.cs" />
     <Compile Include="Shades\ShadeBase.cs" />
     <Compile Include="Shades\ShadeController.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs

@@ -358,27 +358,14 @@ namespace PepperDash.Essentials
                 try
                 {
                     var assy = loadedAssembly.Assembly;
-                    CType[] types = {};
-                    try
-                    {
-                        types = assy.GetTypes();
-                    }
-                    catch (TypeLoadException e)
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Warning, "Unable to get types for assembly {0}: {1}",
-                            loadedAssembly.Name, e.Message);
-                        Debug.Console(2, e.StackTrace);
-                        continue;
-                    }
-
+                    var types = assy.GetTypes();
                     foreach (var type in types)
                     {
                         try
                         {
-                            if (typeof (IPluginDeviceFactory).IsAssignableFrom(type))
+                            if (typeof(IPluginDeviceFactory).IsAssignableFrom(type))
                             {
-                                var plugin =
-                                    (IPluginDeviceFactory) Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
+                                var plugin = (IPluginDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
                                 LoadCustomPlugin(plugin, loadedAssembly);
                             }
                             else
@@ -391,15 +378,10 @@ namespace PepperDash.Essentials
                                 }
                             }
                         }
-                        catch (NotSupportedException e)
-                        {
-                            //this happens for dlls that aren't PD dlls, like ports of Mono classes into S#. Swallowing.
-                               
-                        }
                         catch (Exception e)
                         {
                             Debug.Console(2, "Load Plugin not found. {0}.{2} is not a plugin factory. Exception: {1}",
-                                loadedAssembly.Name, e.Message, type.Name);
+                                loadedAssembly.Name, e, type.Name);
                             continue;
                         }
 
@@ -407,9 +389,7 @@ namespace PepperDash.Essentials
                 }
                 catch (Exception e)
                 {
-                    Debug.Console(0, Debug.ErrorLogLevel.Warning, "Error Loading assembly {0}: {1}",
-                           loadedAssembly.Name, e.Message);
-                    Debug.Console(2, "{0}", e.StackTrace);
+                    Debug.Console(2, "Error Loading Assembly: {0} Exception: {1} ", loadedAssembly.Name, e);
                     continue;
                 }
             }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs

@@ -180,7 +180,7 @@ namespace PepperDash.Essentials.Core.Queues
                 {
                     try
                     {
-                        //Debug.Console(2, this, "Processing queue item: '{0}'", item.ToString());
+                        Debug.Console(2, this, "Processing queue item: '{0}'", item.ToString());
                         item.Dispatch();
 
                         if (_delayEnabled)

essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/IRoutingInputsExtensions.cs

@@ -123,34 +123,25 @@ namespace PepperDash.Essentials.Core
 				// No direct tie? Run back out on the inputs' attached devices... 
 				// Only the ones that are routing devices
 				var attachedMidpoints = destDevInputTies.Where(t => t.SourcePort.ParentDevice is IRoutingInputsOutputs);
-
-                //Create a list for tracking already checked devices to avoid loops, if it doesn't already exist from previous iteration
-                if (alreadyCheckedDevices == null)
-                    alreadyCheckedDevices = new List<IRoutingInputsOutputs>();
-                alreadyCheckedDevices.Add(destination as IRoutingInputsOutputs);
-
 				foreach (var inputTieToTry in attachedMidpoints)
 				{
+					Debug.Console(2, destination, "Trying to find route on {0}", inputTieToTry.SourcePort.ParentDevice.Key);
 					var upstreamDeviceOutputPort = inputTieToTry.SourcePort;
 					var upstreamRoutingDevice = upstreamDeviceOutputPort.ParentDevice as IRoutingInputsOutputs;
-                    Debug.Console(2, destination, "Trying to find route on {0}", upstreamRoutingDevice.Key);
-
 					// Check if this previous device has already been walked
-                    if (alreadyCheckedDevices.Contains(upstreamRoutingDevice))
-                    {
-                        Debug.Console(2, destination, "Skipping input {0} on {1}, this was already checked", upstreamRoutingDevice.Key, destination.Key);
-                        continue;
-                    }
-                    // haven't seen this device yet.  Do it.  Pass the output port to the next
-                    // level to enable switching on success
-                    var upstreamRoutingSuccess = upstreamRoutingDevice.GetRouteToSource(source, upstreamDeviceOutputPort,
-                        alreadyCheckedDevices, signalType, cycle, routeTable);
-                    if (upstreamRoutingSuccess)
-                    {
-                        Debug.Console(2, destination, "Upstream device route found");
-                        goodInputPort = inputTieToTry.DestinationPort;
-                        break; // Stop looping the inputs in this cycle
-                    }
+					if (!(alreadyCheckedDevices != null && alreadyCheckedDevices.Contains(upstreamRoutingDevice)))
+					{
+						// haven't seen this device yet.  Do it.  Pass the output port to the next
+						// level to enable switching on success
+						var upstreamRoutingSuccess = upstreamRoutingDevice.GetRouteToSource(source, upstreamDeviceOutputPort, 
+							alreadyCheckedDevices, signalType, cycle, routeTable);
+						if (upstreamRoutingSuccess)
+						{
+							Debug.Console(2, destination, "Upstream device route found");
+							goodInputPort = inputTieToTry.DestinationPort;
+							break; // Stop looping the inputs in this cycle
+						}
+					}
 				}
 			}
 
@@ -172,6 +163,10 @@ namespace PepperDash.Essentials.Core
                 //Debug.Console(2, destination, "Exiting cycle {0}", cycle);
 				return true;
 			}
+	
+			if(alreadyCheckedDevices == null)
+				alreadyCheckedDevices = new List<IRoutingInputsOutputs>();
+			alreadyCheckedDevices.Add(destination as IRoutingInputsOutputs);
 
 			Debug.Console(2, destination, "No route found to {0}", source.Key);
 			return false;

essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronSecretsProvider.cs

@@ -1,97 +0,0 @@
-using System;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronDataStore;
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-    public class CrestronSecretsProvider : ISecretProvider
-    {
-        public string Key { get; set; }
-        //Added for reference
-        private static readonly bool SecureSupported;
-        public CrestronSecretsProvider(string key)
-        {
-            Key = key;
-        }
-
-        static CrestronSecretsProvider()
-        {
-            //Added for future encrypted reference
-            SecureSupported = CrestronSecureStorage.Supported;
-
-            CrestronDataStoreStatic.InitCrestronDataStore();
-            if (SecureSupported)
-            {
-                //doThingsFuture
-            }
-        }
-
-        /// <summary>
-        /// Set secret for item in the CrestronSecretsProvider
-        /// </summary>
-        /// <param name="key">Secret Key</param>
-        /// <param name="value">Secret Value</param>
-        public bool SetSecret(string key, object value)
-        {
-            var secret = value as string;
-            if (String.IsNullOrEmpty(secret))
-            {
-                Debug.Console(2, this, "Unable to set secret for {0}:{1} - value is empty.", Key, key);
-                return false;
-            }
-            var setErrorCode = CrestronDataStoreStatic.SetLocalStringValue(key, secret);
-            switch (setErrorCode)
-            {
-                case CrestronDataStore.CDS_ERROR.CDS_SUCCESS:
-                    Debug.Console(1, this,"Secret Successfully Set for {0}:{1}", Key, key);
-                    return true;
-                default:
-                    Debug.Console(2, this, Debug.ErrorLogLevel.Notice, "Unable to set secret for {0}:{1} - {2}", Key, key, setErrorCode.ToString());
-                    return false;
-            }
-        }
-
-        /// <summary>
-        /// Retrieve secret for item in the CrestronSecretsProvider
-        /// </summary>
-        /// <param name="key">Secret Key</param>
-        /// <returns>ISecret Object containing key, provider, and value</returns>
-        public ISecret GetSecret(string key)
-        {
-            string mySecret;
-            var getErrorCode = CrestronDataStoreStatic.GetLocalStringValue(key, out mySecret);
-
-            switch (getErrorCode)
-            {
-                case CrestronDataStore.CDS_ERROR.CDS_SUCCESS:
-                    Debug.Console(2, this, "Secret Successfully retrieved for {0}:{1}", Key, key);
-                    return new CrestronSecret(key, mySecret, this);
-                default:
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Unable to retrieve secret for {0}:{1} - {2}",
-                        Key, key, getErrorCode.ToString());
-                    return null;
-            }
-        }
-    }
-
-    /// <summary>
-    /// Special container class for CrestronSecret provider
-    /// </summary>
-    public class CrestronSecret : ISecret
-    {
-        public ISecretProvider Provider { get; private set; }
-        public string Key { get; private set; }
-
-        public object Value { get; private set; }
-
-        public CrestronSecret(string key, string value, ISecretProvider provider)
-        {
-            Key = key;
-            Value = value;
-            Provider = provider;
-        }
-
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/Interfaces.cs

@@ -1,24 +0,0 @@
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// All ISecrecretProvider classes must implement this interface.
-    /// </summary>
-    public interface ISecretProvider : IKeyed
-    {
-        bool SetSecret(string key, object value);
-
-        ISecret GetSecret(string key);
-    }
-
-    /// <summary>
-    /// interface for delivering secrets in Essentials.
-    /// </summary>
-    public interface ISecret
-    {
-        ISecretProvider Provider { get; }
-        string Key { get; }
-        object Value { get; }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/SecretsManager.cs

@@ -1,281 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-    public static class SecretsManager
-    {
-        public static Dictionary<string, ISecretProvider> Secrets { get; private set; }
-
-        /// <summary>
-        /// Initialize the SecretsManager
-        /// </summary>
-        public static void Initialize()
-        {
-
-            AddSecretProvider("default", new CrestronSecretsProvider("default"));
-
-            CrestronConsole.AddNewConsoleCommand(SetSecretProcess, "setsecret",
-                "Adds secrets to secret provider",
-                ConsoleAccessLevelEnum.AccessOperator);
-
-            CrestronConsole.AddNewConsoleCommand(UpdateSecretProcess, "updatesecret",
-                "Updates secrets in secret provider",
-                ConsoleAccessLevelEnum.AccessAdministrator);
-
-            CrestronConsole.AddNewConsoleCommand(DeleteSecretProcess, "deletesecret",
-                "Deletes secrets in secret provider",
-                ConsoleAccessLevelEnum.AccessAdministrator);
-        }
-
-        static SecretsManager()
-        {
-            Secrets = new Dictionary<string, ISecretProvider>();
-        }
-
-        /// <summary>
-        /// Get Secret Provider from dictionary by key
-        /// </summary>
-        /// <param name="key">Dictionary Key for provider</param>
-        /// <returns>ISecretProvider</returns>
-        public static ISecretProvider GetSecretProviderByKey(string key)
-        {
-            ISecretProvider secret;
-
-            Secrets.TryGetValue(key, out secret);
-
-            if (secret == null)
-            {
-                Debug.Console(1, "SecretsManager unable to retrieve SecretProvider with the key '{0}'", key);
-            }
-            return secret;
-        }
-
-        /// <summary>
-        /// Add secret provider to secrets dictionary
-        /// </summary>
-        /// <param name="key">Key of new entry</param>
-        /// <param name="provider">New Provider Entry</param>
-        public static void AddSecretProvider(string key, ISecretProvider provider)
-        {
-            if (!Secrets.ContainsKey(key))
-            {
-                Secrets.Add(key, provider);
-                Debug.Console(1, "Secrets provider '{0}' added to SecretsManager", key);
-            }
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Unable to add Provider '{0}' to Secrets.  Provider with that key already exists", key );
-        }
-
-        /// <summary>
-        /// Add secret provider to secrets dictionary, with optional overwrite parameter
-        /// </summary>
-        /// <param name="key">Key of new entry</param>
-        /// <param name="provider">New provider entry</param>
-        /// <param name="overwrite">true to overwrite any existing providers in the dictionary</param>
-        public static void AddSecretProvider(string key, ISecretProvider provider, bool overwrite)
-        {
-            if (!Secrets.ContainsKey(key))
-            {
-                Secrets.Add(key, provider);
-                Debug.Console(1, "Secrets provider '{0}' added to SecretsManager", key);
-
-            }
-            if (overwrite)
-            {
-                Secrets.Add(key, provider);
-                Debug.Console(1, Debug.ErrorLogLevel.Notice, "Provider with the key '{0}' already exists in secrets.  Overwriting with new secrets provider.", key);
-
-            }
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Unable to add Provider '{0}' to Secrets.  Provider with that key already exists", key);
-        }
-
-        private static void SetSecretProcess(string cmd)
-        {
-            string response;
-            var args = cmd.Split(' ');
-
-            if (args.Length == 0)
-            {
-                //some Instructional Text
-                response = "Adds secrets to secret provider. Format 'setsecret <provider> <secretKey> <secret>";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-            }
-
-            if (args.Length == 1 && args[0] == "?")
-            {
-                response = "Adds secrets to secret provider. Format 'setsecret <provider> <secretKey> <secret>";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-            }
-
-            if (args.Length < 3)
-            {
-                response =  "Improper number of arguments";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-
-            }
-
-            var provider = GetSecretProviderByKey(args[0]);
-
-            if (provider == null)
-            {
-                //someFail
-                response =  "Provider key invalid";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-
-            }
-
-            var key = args[1];
-            var secret = args[2];
-
-            if (provider.GetSecret(key) == null)
-            {
-
-                response = provider.SetSecret(key, secret)
-                    ? String.Format(
-                        "Secret successfully set for {0}:{1}",
-                        provider.Key, key)
-                    : String.Format(
-                        "Unable to set secret for {0}:{1}",
-                        provider.Key, key);                    
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-            }
-            response =
-                String.Format(
-                    "Unable to set secret for {0}:{1} - Please use the 'UpdateSecret' command to modify it");
-            CrestronConsole.ConsoleCommandResponse(response);
-        }
-
-        private static void UpdateSecretProcess(string cmd)
-        {
-            string response;
-            var args = cmd.Split(' ');
-
-            if (args.Length == 0)
-            {
-                //some Instructional Text
-                response = "Updates secrets in secret provider. Format 'updatesecret <provider> <secretKey> <secret>";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-
-            }
-
-            if (args.Length == 1 && args[0] == "?")
-            {
-                response = "Updates secrets in secret provider. Format 'updatesecret <provider> <secretKey> <secret>";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-            }
-
-
-            if (args.Length < 3)
-            {
-                //someFail
-                response = "Improper number of arguments";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-
-            }
-
-            var provider = GetSecretProviderByKey(args[0]);
-
-            if (provider == null)
-            {
-                //someFail
-                response = "Provider key invalid";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-
-            }
-
-            var key = args[1];
-            var secret = args[2];
-
-            if (provider.GetSecret(key) != null)
-            {
-                response = provider.SetSecret(key, secret)
-                    ? String.Format(
-                        "Secret successfully set for {0}:{1}",
-                        provider.Key, key)
-                    : String.Format(
-                        "Unable to set secret for {0}:{1}",
-                        provider.Key, key);
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-            }
-
-            response =
-                String.Format(
-                    "Unable to update secret for {0}:{1} - Please use the 'SetSecret' command to create a new secret");
-            CrestronConsole.ConsoleCommandResponse(response);
-        }
-
-        private static void DeleteSecretProcess(string cmd)
-        {
-            string response;
-            var args = cmd.Split(' ');
-
-            if (args.Length == 0)
-            {
-                //some Instructional Text
-                response = "Deletes secrets in secret provider. Format 'deletesecret <provider> <secretKey>";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-
-            }
-            if (args.Length == 1 && args[0] == "?")
-            {
-                response = "Deletes secrets in secret provider. Format 'deletesecret <provider> <secretKey>";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-            }
-
-
-
-            if (args.Length < 2)
-            {
-                //someFail
-                response =  "Improper number of arguments";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-
-            }
-
-            var provider = GetSecretProviderByKey(args[0]);
-
-            if (provider == null)
-            {
-                //someFail
-                response =  "Provider key invalid";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-
-            }
-
-            var key = args[1];
-
-
-            provider.SetSecret(key, "");
-            response = provider.SetSecret(key, "")
-                ? String.Format(
-                    "Secret successfully deleted for {0}:{1}",
-                    provider.Key, key)
-                : String.Format(
-                    "Unable to delete secret for {0}:{1}",
-                    provider.Key, key);
-            CrestronConsole.ConsoleCommandResponse(response);
-            return;
-
-
-        }
-    }
-
-
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/SecretsPropertiesConfig.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Provide a way to easily deserialize into a secret object from config
-    /// </summary>
-    public class SecretsPropertiesConfig
-    {
-        [JsonProperty("provider")]
-        public string Provider { get; set; }
-        [JsonProperty("key")]
-        public string Key { get; set; }
-    }
-}

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

@@ -176,7 +176,6 @@
     <Compile Include="VideoCodec\ZoomRoom\ResponseObjects.cs" />
     <Compile Include="VideoCodec\ZoomRoom\ZoomRoom.cs" />
     <Compile Include="VideoCodec\ZoomRoom\ZoomRoomCamera.cs" />
-    <Compile Include="VideoCodec\ZoomRoom\ZoomRoomJoinMap.cs" />
     <Compile Include="VideoCodec\ZoomRoom\ZoomRoomPropertiesConfig.cs" />
     <None Include="Properties\ControlSystem.cfg" />
   </ItemGroup>

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

@@ -30,8 +30,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         IHasScheduleAwareness, IOccupancyStatusProvider, IHasCodecLayouts, IHasCodecSelfView,
         ICommunicationMonitor, IRouting, IHasCodecCameras, IHasCameraAutoMode, IHasCodecRoomPresets, IHasExternalSourceSwitching, IHasBranding, IHasCameraOff, IHasCameraMute
     {
-        private bool _externalSourceChangeRequested;
-
         public event EventHandler<DirectoryEventArgs> DirectoryResultReturned;
 
         private CTimer _brandingTimer;
@@ -492,21 +490,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 Debug.Console(2, this, "Setting QR code URL: {0}", mcBridge.QrCodeUrl);
 
                 mcBridge.UserCodeChanged += (o, a) => SendMcBrandingUrl(mcBridge);
-                mcBridge.UserPromptedForCode += (o, a) => DisplayUserCode(mcBridge.UserCode);
 
                 SendMcBrandingUrl(mcBridge);
             }
         }
 
-        /// <summary>
-        /// Displays the code for the specified duration
-        /// </summary>
-        /// <param name="code">Mobile Control user code</param>
-        private void DisplayUserCode(string code)
-        {
-            SendText(string.Format("xcommand userinterface message alert display title:\"Mobile Control User Code:\" text:\"{0}\" duration: 30", code));
-        }
-
         private void SendMcBrandingUrl(IMobileControlRoomBridge mcBridge)
         {
             if (mcBridge == null)
@@ -573,7 +561,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 prefix + "/Status/Standby" + Delimiter +
                 prefix + "/Status/Video/Selfview" + Delimiter +
                 prefix + "/Status/Video/Layout" + Delimiter +
-                prefix + "/Status/Video/Input/MainVideoMute" + Delimiter +
                 prefix + "/Bookings" + Delimiter +
                 prefix + "/Event/CallDisconnect" + Delimiter + 
                 prefix + "/Event/Bookings" + Delimiter +
@@ -963,12 +950,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                         JsonConvert.PopulateObject(response, eventReceived);
 						Debug.Console(2, this, "*** Got an External Source Selection {0} {1}", eventReceived, eventReceived.Event.UserInterface, eventReceived.Event.UserInterface.Presentation.ExternalSource.Selected.SourceIdentifier.Value);
 
-						if (RunRouteAction != null && !_externalSourceChangeRequested)
+						if (RunRouteAction != null)
 						{
 							RunRouteAction(eventReceived.Event.UserInterface.Presentation.ExternalSource.Selected.SourceIdentifier.Value, null);
 						}
-
-					    _externalSourceChangeRequested = false;
 					}
                 }
                 else if (response.IndexOf("\"CommandResponse\":{") > -1 || response.IndexOf("\"CommandResponse\": {") > -1)
@@ -1665,21 +1650,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public void CameraAutoModeOn()
         {
-            if (CameraIsOffFeedback.BoolValue)
-            {
-                CameraMuteOff();
-            }
-
             SendText("xCommand Cameras SpeakerTrack Activate");
+            CameraMuteOff();
         }
 
         public void CameraAutoModeOff()
         {
-            if (CameraIsOffFeedback.BoolValue)
-            {
-                CameraMuteOff();
-            }
-
             SendText("xCommand Cameras SpeakerTrack Deactivate");
         }
 
@@ -1998,7 +1974,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public void SetSelectedSource(string key)
         {
             SendText(string.Format("xCommand UserInterface Presentation ExternalSource Select SourceIdentifier: {0}", key));
-            _externalSourceChangeRequested = true;
         }
 
 		/// <summary>
@@ -2036,7 +2011,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         public void CameraMuteOn()
         {
-            SendText("xCommand Video Input MainVideo Mute");
+            SendText("xCommand Video InputMainVideo Mute");
         }
 
         /// <summary>
@@ -2044,7 +2019,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         public void CameraMuteOff()
         {
-            SendText("xCommand Video Input MainVideo Unmute");
+            SendText("xCommand Video InputMainVideo Unmute");
         }
 
         /// <summary>

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

@@ -19,32 +19,4 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		void LocalLayoutToggleSingleProminent();
 		void MinMaxLayoutToggle();
     }
-
-    /// <summary>
-    /// Defines the requirements for Zoom Room layout control
-    /// </summary>
-    public interface IHasZoomRoomLayouts : IHasCodecLayouts
-    {
-        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 CanSwapContentWithThumbnailFeedback { get; }
-        BoolFeedback ContentSwappedWithThumbnailFeedback { get; }
-
-        ZoomRoom.zConfiguration.eLayoutStyle LastSelectedLayout { get; }
-        ZoomRoom.zConfiguration.eLayoutStyle AvailableLayouts { get; }
-
-        void GetAvailableLayouts(); // Mot sure this is necessary if we're already subscribed to zStatus Call Layout
-        void SetLayout(ZoomRoom.zConfiguration.eLayoutStyle layoutStyle);
-        void SwapContentWithThumbnail();
-
-        void LayoutTurnNextPage();
-        void LayoutTurnPreviousPage();
-    }
-
-    public class LayoutInfoChangedEventArgs : EventArgs
-    {
-        public ZoomRoom.zConfiguration.eLayoutStyle AvailableLayouts { get; set; }
-    }
 }

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

@@ -1,20 +1,13 @@
 using System;
 using System.Collections.Generic;
-using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
 {
-    /// <summary>
-    /// Describes a device that has call participants
-    /// </summary>
     public interface IHasParticipants
     {
         CodecParticipants Participants { get; }
     }
 
-    /// <summary>
-    /// Describes the ability to mute and unmute a participant's video in a meeting
-    /// </summary>
     public interface IHasParticipantVideoMute:IHasParticipants
     {
         void MuteVideoForParticipant(int userId);
@@ -22,29 +15,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
         void ToggleVideoForParticipant(int userId);
     }
 
-    /// <summary>
-    /// Describes the ability to mute and unmute a participant's audio in a meeting
-    /// </summary>
-    public interface IHasParticipantAudioMute : IHasParticipantVideoMute
+    public interface IHasParticipantAudioMute:IHasParticipantVideoMute
     {
         void MuteAudioForParticipant(int userId);
         void UnmuteAudioForParticipant(int userId);
         void ToggleAudioForParticipant(int userId);
     }
 
-    /// <summary>
-    /// Describes the ability to pin and unpin a participant in a meeting
-    /// </summary>
-    public interface IHasParticipantPinUnpin : IHasParticipants
-    {
-        IntFeedback NumberOfScreensFeedback { get; }
-        int ScreenIndexToPinUserTo { get; }
-
-        void PinParticipant(int userId, int screenIndex);
-        void UnPinParticipant(int userId);
-        void ToggleParticipantPinState(int userId, int screenIndex);
-    }
-
     public class CodecParticipants
     {
         private List<Participant> _currentParticipants;
@@ -54,7 +31,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
             set
             {
                 _currentParticipants = value;
-                OnParticipantsChanged();
+                var handler = ParticipantsListHasChanged;
+
+                if(handler == null) return;
+
+                handler(this, new EventArgs());
             }
         }
 
@@ -64,31 +45,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
         {
             _currentParticipants = new List<Participant>();
         }
-
-        public void OnParticipantsChanged()
-        {
-            var handler = ParticipantsListHasChanged;
-
-            if (handler == null) return;
-
-            handler(this, new EventArgs());
-        }
     }
 
-    /// <summary>
-    /// Represents a call participant
-    /// </summary>
     public class Participant
     {
-        public int UserId { get; set; }
         public bool IsHost { get; set; }
         public string Name { get; set; }
         public bool CanMuteVideo { get; set; }       
         public bool CanUnmuteVideo { get; set; }
         public bool VideoMuteFb { get; set; }
         public bool AudioMuteFb { get; set; }
-        public bool HandIsRaisedFb { get; set; }
-        public bool IsPinnedFb { get; set; }
-        public int ScreenIndexIsPinnedToFb { get; set; }
     }
 }

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

@@ -28,7 +28,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		IUsageTracking, IHasDialer, IHasContentSharing, ICodecAudio, iVideoCodecInfo, IBridgeAdvanced
 	{
 		private const int XSigEncoding = 28591;
-        protected const int MaxParticipants = 50;
 		private readonly byte[] _clearBytes = XSigHelpers.ClearOutputs();
 		protected VideoCodecBase(DeviceConfig config)
 			: base(config)
@@ -272,14 +271,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 		public abstract void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
 
-		/// <summary>
-		/// Use this method when using a plain VideoCodecControllerJoinMap
-		/// </summary>
-		/// <param name="codec"></param>
-		/// <param name="trilist"></param>
-		/// <param name="joinStart"></param>
-		/// <param name="joinMapKey"></param>
-		/// <param name="bridge"></param>
 		protected void LinkVideoCodecToApi(VideoCodecBase codec, BasicTriList trilist, uint joinStart, string joinMapKey,
 			EiscApiAdvanced bridge)
 		{
@@ -297,19 +288,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				bridge.AddJoinMap(Key, joinMap);
 			}
 
-			LinkVideoCodecToApi(codec, trilist, joinMap);
-		}
-
-		/// <summary>
-		/// Use this method when you need to pass in a join map that extends VideoCodecControllerJoinMap
-		/// </summary>
-		/// <param name="codec"></param>
-		/// <param name="trilist"></param>
-		/// <param name="joinMap"></param>
-		protected void LinkVideoCodecToApi(VideoCodecBase codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
-		{
 			Debug.Console(1, this, "Linking to Trilist {0}", trilist.ID.ToString("X"));
 
+
+
 			LinkVideoCodecDtmfToApi(trilist, joinMap);
 
 			LinkVideoCodecCallControlsToApi(trilist, joinMap);
@@ -542,8 +524,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 					return;
 				}
 
-                SetParticipantActions(trilist, joinMap, codec.Participants.CurrentParticipants);
-
 				participantsXSig = UpdateParticipantsXSig(codec.Participants.CurrentParticipants);
 
 				trilist.SetString(joinMap.CurrentParticipants.JoinNumber, participantsXSig);
@@ -552,59 +532,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			};
 		}
 
-        /// <summary>
-        /// Sets the actions for each participant in the list
-        /// </summary>
-        private void SetParticipantActions(BasicTriList trilist, VideoCodecControllerJoinMap joinMap, List<Participant> currentParticipants)
-        {
-            uint index = 0; // track the index of the participant in the 
-
-            foreach (var participant in currentParticipants)
-            {
-                var p = participant;
-                if (index > MaxParticipants) break;
-
-                var audioMuteCodec = this as IHasParticipantAudioMute;
-                if (audioMuteCodec != null)
-                {
-                    trilist.SetSigFalseAction(joinMap.ParticipantAudioMuteToggleStart.JoinNumber + index,
-                        () => audioMuteCodec.ToggleAudioForParticipant(p.UserId));
-
-                    trilist.SetSigFalseAction(joinMap.ParticipantVideoMuteToggleStart.JoinNumber + index,
-                        () => audioMuteCodec.ToggleVideoForParticipant(p.UserId));
-                }
-
-                var pinCodec = this as IHasParticipantPinUnpin;
-                if (pinCodec != null)
-                {
-                    trilist.SetSigFalseAction(joinMap.ParticipantPinToggleStart.JoinNumber + index,
-                        () => pinCodec.ToggleParticipantPinState(p.UserId, pinCodec.ScreenIndexToPinUserTo));
-                }
-
-                index++;
-            }
-
-            // Clear out any previously set actions
-            while (index < MaxParticipants)
-            {
-                trilist.ClearBoolSigAction(joinMap.ParticipantAudioMuteToggleStart.JoinNumber + index);
-                trilist.ClearBoolSigAction(joinMap.ParticipantVideoMuteToggleStart.JoinNumber + index);
-                trilist.ClearBoolSigAction(joinMap.ParticipantPinToggleStart.JoinNumber + index);
-
-                index++;
-            }
-        }
-
 		private string UpdateParticipantsXSig(List<Participant> currentParticipants)
 		{
-			const int maxParticipants = MaxParticipants;
-			const int maxDigitals = 7;
+			const int maxParticipants = 50;
+			const int maxDigitals = 5;
 			const int maxStrings = 1;
-			const int maxAnalogs = 1;
-			const int offset = maxDigitals + maxStrings + maxAnalogs; // 9
-			var digitalIndex = (maxStrings + maxAnalogs) * maxParticipants; // 100
+			const int offset = maxDigitals + maxStrings;
+			var digitalIndex = maxStrings * maxParticipants; //15
 			var stringIndex = 0;
-			var analogIndex = stringIndex + maxParticipants;
 			var meetingIndex = 0;
 
 			var tokenArray = new XSigToken[maxParticipants * offset];
@@ -619,42 +554,29 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				tokenArray[digitalIndex + 2] = new XSigDigitalToken(digitalIndex + 3, participant.CanMuteVideo);
 				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 + 7, participant.IsPinnedFb);
 
 				//serials
 				tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, participant.Name);
 
-				//analogs
-				tokenArray[analogIndex] = new XSigAnalogToken(analogIndex + 1, (ushort)participant.ScreenIndexIsPinnedToFb);
-
 				digitalIndex += maxDigitals;
 				meetingIndex += offset;
 				stringIndex += maxStrings;
-				analogIndex += maxAnalogs;
 			}
 
 			while (meetingIndex < maxParticipants * offset)
 			{
-				//digitals
 				tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, false);
 				tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, false);
 				tokenArray[digitalIndex + 2] = new XSigDigitalToken(digitalIndex + 3, false);
 				tokenArray[digitalIndex + 3] = new XSigDigitalToken(digitalIndex + 4, false);
 				tokenArray[digitalIndex + 4] = new XSigDigitalToken(digitalIndex + 5, false);
-				tokenArray[digitalIndex + 5] = new XSigDigitalToken(digitalIndex + 6, false);
-				tokenArray[digitalIndex + 6] = new XSigDigitalToken(digitalIndex + 7, false);
 
 				//serials
 				tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, String.Empty);
 
-				//analogs
-				tokenArray[analogIndex] = new XSigAnalogToken(analogIndex + 1, 0);
-
 				digitalIndex += maxDigitals;
 				meetingIndex += offset;
 				stringIndex += maxStrings;
-				analogIndex += maxAnalogs;
 			}
 
 			return GetXSigString(tokenArray);
@@ -925,7 +847,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 				Debug.Console(1, this, "Call Direction: {0}", args.CallItem.Direction);
 				Debug.Console(1, this, "Call is incoming: {0}", args.CallItem.Direction == eCodecCallDirection.Incoming);
-				trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming && args.CallItem.Status == eCodecCallStatus.Ringing);
+				trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming && args.CallItem.Status == eCodecCallStatus.Ringing);				
 
 				if (args.CallItem.Direction == eCodecCallDirection.Incoming)
 				{

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

@@ -480,28 +480,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             public string wifiName { get; set; }
         }
 
-        public class NumberOfScreens : NotifiableObject
+        public class NumberOfScreens
         {
-            private int _numOfScreens;
-
             [JsonProperty("NumberOfCECScreens")]
             public int NumOfCECScreens { get; set; }
             [JsonProperty("NumberOfScreens")]
-            public int NumOfScreens
-            {
-                get
-                {
-                    return _numOfScreens;
-                }
-                set
-                {
-                    if (value != _numOfScreens)
-                    {
-                        _numOfScreens = value;
-                        NotifyPropertyChanged("NumberOfScreens");
-                    }
-                }        
-            }
+            public int NumOfScreens { get; set; }
         }
 
         /// <summary>
@@ -567,136 +551,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         }
 
-        public class Layout : NotifiableObject
+        public class Layout
         {
-            // backer variables
-            private bool _can_Switch_Speaker_View;
-            private bool _can_Switch_Wall_View;
-            private bool _can_Switch_Share_On_All_Screens;
-            private bool _is_In_First_Page;
-            private bool _is_In_Last_Page;
-            private string _video_type;
-
-
             public bool can_Adjust_Floating_Video { get; set; }
             public bool can_Switch_Floating_Share_Content { get; set; }
-
-            /// <summary>
-            /// [on/off] // Set to On if it is possible to invoke zConfiguration Call Layout Style: ShareAll, to switch to the ShareAll mode, where the content sharing is shown full screen on all monitors.
-            /// </summary>
-            [JsonProperty("can_Switch_Share_On_All_Screens")]
-            public bool can_Switch_Share_On_All_Screens
-            {
-                get
-                {
-                    return _can_Switch_Share_On_All_Screens;
-                }
-                set
-                {
-                    if (value != _can_Switch_Share_On_All_Screens)
-                    {
-                        _can_Switch_Share_On_All_Screens = value;
-                        NotifyPropertyChanged("can_Switch_Share_On_All_Screens");
-                    }
-                }
-            }
-
-            /// <summary>
-            /// [on/off] // Set to On if it is possible to switch to Speaker view by invoking zConfiguration Call Layout Style: Speaker. The active speaker is shown full screen, and other video streams, like self-view, are shown in thumbnails.
-            /// </summary>
-            [JsonProperty("can_Switch_Speaker_View")]
-            public bool can_Switch_Speaker_View
-            { 
-                get 
-                {
-                    return _can_Switch_Speaker_View;
-                }
-                set
-                {
-                    if (value != _can_Switch_Speaker_View)
-                    {
-                        _can_Switch_Speaker_View = value;
-                        NotifyPropertyChanged("can_Switch_Speaker_View");
-                    }
-                }
-            }
-
-            /// <summary>
-            /// [on/off] On if it is possible to invoke zConfiguration Call Layout Style: Gallery, to switch to the Gallery mode, showing video participants in tiled windows: The Zoom Room shows up to a 5x5 array of tiled windows per page.
-            /// </summary>
-            [JsonProperty("can_Switch_Wall_View")]
-            public bool can_Switch_Wall_View
-            {
-                get
-                {
-                    return _can_Switch_Wall_View;
-                }
-                set
-                {
-                    if (value != _can_Switch_Wall_View)
-                    {
-                        _can_Switch_Wall_View = value;
-                        NotifyPropertyChanged("can_Switch_Wall_View");
-                    }
-                }
-            }
-
-            [JsonProperty("is_In_First_Page")]
-            public bool is_In_First_Page
-            {
-                get
-                {
-                    return _is_In_First_Page;
-                }
-                set
-                {
-                    if (value != _is_In_First_Page)
-                    {
-                        _is_In_First_Page = value;
-                        NotifyPropertyChanged("is_In_First_Page");
-                    }
-                }
-            }
-            
-            [JsonProperty("is_In_Last_Page")]
-            public bool is_In_Last_Page
-            {
-                get
-                {
-                    return _is_In_Last_Page;
-                }
-                set
-                {
-                    if (value != _is_In_Last_Page)
-                    {
-                        _is_In_Last_Page = value;
-                        NotifyPropertyChanged("is_In_Last_Page");
-                    }
-                }
-            }
-
+            public bool can_Switch_Share_On_All_Screens { get; set; }
+            public bool can_Switch_Speaker_View { get; set; }
+            public bool can_Switch_Wall_View { get; set; }
+            public bool is_In_First_Page { get; set; }
+            public bool is_In_Last_Page { get; set; }
             public bool is_supported { get; set; }
             public int video_Count_In_Current_Page { get; set; }
-
-            /// <summary>
-            ///  [Gallery | Strip] Indicates which mode applies: Strip or Gallery.
-            /// </summary>
-            [JsonProperty("video_type")]
-            public string video_type
-            {
-                get
-                {
-                    return _video_type;
-                }
-                set
-                {
-                    if (value != _video_type)
-                    {
-                        _video_type = value;
-                        NotifyPropertyChanged("video_type");
-                    }
-                }
-            }
+            public string video_type { get; set; }
         }
 
         public class CallRecordInfo
@@ -819,8 +685,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public class PinStatusOfScreenNotification
         {
-
-
             [JsonProperty("can_be_pinned")]
             public bool CanBePinned { get; set; }
             [JsonProperty("can_pin_share")]
@@ -971,14 +835,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             }
         }
 
-        [Flags]
         public enum eLayoutStyle
         {
-            None = 0,
-            Gallery = 1,
-            Speaker = 2,
-            Strip = 4,
-            ShareAll = 8,
+            Gallery,
+            Speaker,
+            Strip,
+            ShareAll
         }
 
         public enum eLayoutSize
@@ -1003,64 +865,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             DownLeft
         }
 
-        public class Layout : NotifiableObject
+        public class Layout:NotifiableObject
         {
-            private bool _shareThumb;
-            private eLayoutStyle _style;
-            private eLayoutSize _size;
+            public bool ShareThumb { get; set; }
+            public eLayoutStyle Style { get; set; }
+            public eLayoutSize Size { get; set; }
+
             private eLayoutPosition _position;
-
-            public bool ShareThumb
-            {
-                get { return _shareThumb; }
-                set
-                {
-                    if (value != _shareThumb)
-                    {
-                        _shareThumb = value;
-                        NotifyPropertyChanged("ShareThumb");
-                    }
-                } 
-            }
-
-            public eLayoutStyle Style
-            {
-                get { return _style; }
-                set
-                {
-                    if (value != _style)
-                    {
-                        _style = value;
-                        NotifyPropertyChanged("Style");
-                    }
-                } 
-            }
-
-            public eLayoutSize Size
-            {
-                get { return _size; }
-                set
-                {
-                    if (value != _size)
-                    {
-                        _size = value;
-                        NotifyPropertyChanged("Size");
-                    }
-                }
-            }
-
-            public eLayoutPosition Position 
-            {
+            public eLayoutPosition Position {
                 get { return _position; }
                 set
                 {
-                    if (value != _position)
-                    {
-                        _position = value;
-                        NotifyPropertyChanged("Position");
-                    }
-                } 
-            }
+                    _position = value;
+                    NotifyPropertyChanged("Position");
+                } }
         }
 
         public class Lock
@@ -1319,8 +1137,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         {
             [JsonProperty("is_raise_hand")]
             public bool IsRaiseHand { get; set; }
-            [JsonProperty("is_valid")]
-            public bool IsValid { get; set; }
+            [JsonProperty("optimize_vis_validideo_sharing")]
+            public string IsValid { get; set; }
             [JsonProperty("time_stamp")]
             public string TimeStamp { get; set; }
         }
@@ -1395,14 +1213,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                         p =>
                             new Participant
                             {
-                                UserId = p.UserId,
                                 Name = p.UserName,
                                 IsHost = p.IsHost,
                                 CanMuteVideo = p.IsVideoCanMuteByHost,
                                 CanUnmuteVideo = p.IsVideoCanUnmuteByHost,
                                 AudioMuteFb = p.AudioStatusState == "AUDIO_MUTED",
-                                VideoMuteFb = p.VideoStatusIsSending,
-                                HandIsRaisedFb = p.HandStatus.IsValid && p.HandStatus.IsRaiseHand,
+                                VideoMuteFb = p.VideoStatusIsSending
                             }).ToList();
             }
         }

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

@@ -1,273 +0,0 @@
-using System;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges.JoinMaps;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
-{
-	public class ZoomRoomJoinMap : VideoCodecControllerJoinMap
-	{
-		// TODO: #697 [X] Set join numbers
-
-		#region Digital
-
-		[JoinName("CanSwapContentWithThumbnail")]
-		public JoinDataComplete CanSwapContentWithThumbnail = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 206,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "FB Indicates if content can be swapped with thumbnail",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-		[JoinName("SwapContentWithThumbnail")]
-		public JoinDataComplete SwapContentWithThumbnail = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 206,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Pulse to swap content with thumbnail.  FB reports current state",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-		[JoinName("GetAvailableLayouts")]
-		public JoinDataComplete GetAvailableLayouts = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 215,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Gets the available layouts.  Will update the LayoutXXXXXIsAvailbale signals.",
-				JoinCapabilities = eJoinCapabilities.FromSIMPL,
-				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 = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 221,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "FB Indicates if layout 'Gallery' is available",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.DigitalSerial
-			});
-
-		[JoinName("LayoutSpeakerIsAvailable")]
-		public JoinDataComplete LayoutSpeakerIsAvailable = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 222,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "FB Indicates if layout 'Speaker' is available",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.DigitalSerial
-			});
-
-		[JoinName("LayoutStripIsAvailable")]
-		public JoinDataComplete LayoutStripIsAvailable = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 223,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "FB Indicates if layout 'Strip' is available",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.DigitalSerial
-			});
-
-		[JoinName("LayoutShareAllIsAvailable")]
-		public JoinDataComplete LayoutShareAllIsAvailable = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 224,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "FB Indicates if layout 'ShareAll' is available",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.DigitalSerial
-			});
-
-        //[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
-
-
-		#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))
-		{
-		}
-
-		public ZoomRoomJoinMap(uint joinStart, Type type)
-			: base(joinStart, type)
-		{
-		}
-	}
-}