Adds ClientJoined event

#675 Adds UserPromptedForCode event and method to show code on CiscoSparkCodec
Merge pull request #670 from PepperDash/hotfix/dm-routing-issues
2026-02-02 06:14:52 +00:00 · 2021-04-06 12:25:33 -06:00 · 2021-04-05 17:01:34 -06:00 · 2021-03-29 13:29:46 -06:00 · 2021-03-29 13:18:00 -06:00 · 2021-03-29 12:53:43 -06:00
15 changed files with 45 additions and 135 deletions
--- a/PepperDashEssentials/PepperDashEssentials.csproj
+++ b/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" />
--- a/PepperDashEssentials/Room/Config/DDVC01RoomPropertiesConfig.cs
+++ b/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; }
--- a/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs
+++ b/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
--- a/Core/PepperDashEssentialsBase/Config/BasicConfig.cs
+++ b/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>
--- a/Core/PepperDashEssentialsBase/Config/Essentials/EssentialsConfig.cs
+++ b/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>
--- a/Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs
+++ b/Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs
@@ -20,6 +20,10 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
    {
        event EventHandler<EventArgs> UserCodeChanged;

+        event EventHandler<EventArgs> UserPromptedForCode;
+
+        event EventHandler<EventArgs> ClientJoined;
+
        string UserCode { get; }

        string QrCodeUrl { get; }
--- a/Core/PepperDashEssentialsBase/Devices/DestinationListItem.cs
+++ b/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; }
-    }
-}
--- a/Core/PepperDashEssentialsBase/Devices/SourceListItem.cs
+++ b/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
--- a/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
+++ b/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" />
--- a/Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs
+++ b/Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs
@@ -381,7 +381,7 @@ namespace PepperDash.Essentials
                        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;
                        }

--- a/Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
+++ b/Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
@@ -199,6 +199,12 @@ namespace PepperDash.Essentials.Core.Queues

        public void Enqueue(IQueueMessage item)
        {
+            if (Disposed)
+            {
+                Debug.Console(1, this, "I've been disposed so you can't enqueue any messages.  Are you trying to dispatch a message while the program is stopping?");
+                return;
+            }
+
            _queue.Enqueue(item);
            _waitHandle.Set();
        }
--- a/DM/Essentials_DM/Chassis/DmBladeChassisController.cs
+++ b/DM/Essentials_DM/Chassis/DmBladeChassisController.cs
@@ -671,7 +671,7 @@ namespace PepperDash.Essentials.DM {
                var ioSlotJoin = ioSlot - 1;

                // Control
-                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
+                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));

                if (TxDictionary.ContainsKey(ioSlot))
                {
--- a/DM/Essentials_DM/Chassis/DmChassisController.cs
+++ b/DM/Essentials_DM/Chassis/DmChassisController.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
@@ -1184,7 +1185,6 @@ namespace PepperDash.Essentials.DM
                    "Unable to execute switch for inputSelector {0} to outputSelector {1}", inputSelector,
                    outputSelector);
                return;
-
            }

            // Check to see if there's an off timer waiting on this and if so, cancel
@@ -1643,13 +1643,13 @@ namespace PepperDash.Essentials.DM
        {
            // Routing Control
            trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
-                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
-            trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
-                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
-            trilist.SetUShortSigAction(joinMap.OutputUsb.JoinNumber + ioSlotJoin,
-                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.UsbOutput));
-            trilist.SetUShortSigAction(joinMap.InputUsb.JoinNumber + ioSlotJoin,
-                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.UsbInput));
+                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));
+            trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
+                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Audio));
+            trilist.SetUShortSigAction(joinMap.OutputUsb.JoinNumber + ioSlotJoin,
+                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.UsbOutput));
+            trilist.SetUShortSigAction(joinMap.InputUsb.JoinNumber + ioSlotJoin,
+                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.UsbInput));

            //Routing Feedbacks
            VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo.JoinNumber + ioSlotJoin]);
--- a/DM/Essentials_DM/Chassis/DmpsRoutingController.cs
+++ b/DM/Essentials_DM/Chassis/DmpsRoutingController.cs
@@ -228,9 +228,9 @@ namespace PepperDash.Essentials.DM

                // Control
                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
-                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
+                    o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));
                trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
-                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
+                    o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Audio));

                trilist.SetStringSigAction(joinMap.OutputNames.JoinNumber + ioSlotJoin, s =>
                {
--- a/Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
+++ b/Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
@@ -490,11 +490,21 @@ 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"));
+        }
+
        private void SendMcBrandingUrl(IMobileControlRoomBridge mcBridge)
        {
            if (mcBridge == null)
Author	SHA1	Message	Date
Neil Dorin	cf8e673677	Adds ClientJoined event	2021-04-06 12:25:33 -06:00
Neil Dorin	1e755df9bb	#675 Adds UserPromptedForCode event and method to show code on CiscoSparkCodec	2021-04-05 17:01:34 -06:00
Andrew Welker	3a4737b6f6	Merge pull request #670 from PepperDash/hotfix/dm-routing-issues Hotfix/dm routing issues	2021-03-29 13:29:46 -06:00
Andrew Welker	2b2308d5c2	Merge branch 'development' into hotfix/dm-routing-issues	2021-03-29 13:18:00 -06:00
Andrew Welker	358fa1a9c0	Merge pull request #667 from PepperDash/hotfix/generic-queue-disposed-check Hotfix/generic queue disposed check	2021-03-29 12:53:43 -06:00
Andrew Welker	7fbbc9f2b8	Fix LinkToApi methods for chassis to use ExecuteNumericSwitch	2021-03-29 12:50:43 -06:00
Andrew Welker	f4f400f9b6	Merge branch 'development' into hotfix/generic-queue-disposed-check	2021-03-29 09:55:40 -06:00
Andrew Welker	d3383db890	Merge pull request #666 from PepperDash/hotfix/generic-queue-disposed-check added a Disposed check and Debug Message to prevent enqueing messages…	2021-03-29 07:55:29 -06:00
Nick Genovese	139e5370ea	added a Disposed check and Debug Message to prevent enqueing messages after the Generic Queue has been disposed; typically happens at program stop	2021-03-29 09:42:31 -04:00
Andrew Welker	bdd17dfa27	Merge pull request #661 from PepperDash/hotfix/scheduler-fixes Hotfix/scheduler fixes	2021-03-25 15:48:45 -06:00