fix: initialize current sources dictionaries

feat: Add on/off dsp keys to EssentialsAvRoomPropertiesConfig

src/PepperDash.Core/PepperDash.Core.csproj

@@ -43,7 +43,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
-    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.171" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />

src/PepperDash.Essentials.Core/Devices/SourceListItem.cs

@@ -77,9 +77,6 @@ namespace PepperDash.Essentials.Core
         /// A name that will override the source's name on the UI
         /// </summary>
         [JsonProperty("name")]
-        /// <summary>
-        /// Gets or sets the Name
-        /// </summary>
         public string Name { get; set; }
 
         /// <summary>

src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj

@@ -25,7 +25,7 @@
     <DocumentationFile>bin\$(Configuration)\PepperDash_Essentials_Core.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.171" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />

src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs

@@ -105,12 +105,21 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomPropertiesConfig
     {
+        /// <summary>
+        /// Gets or sets the Addresses
+        /// </summary>
         [JsonProperty("addresses")]
         public EssentialsRoomAddressPropertiesConfig Addresses { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Description
+        /// </summary>
         [JsonProperty("description")]
         public string Description { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Emergency
+        /// </summary>
         [JsonProperty("emergency")]
         public EssentialsRoomEmergencyConfig Emergency { get; set; }
 
@@ -226,11 +235,11 @@ namespace PepperDash.Essentials.Room.Config
         /// Indicates if this room represents a combination of other rooms
         /// </summary>
         [JsonProperty("isRoomCombinationScenario")]
-        /// <summary>
-        /// Gets or sets the IsRoomCombinationScenario
-        /// </summary>
         public bool IsRoomCombinationScenario { get; set; }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
         public EssentialsRoomPropertiesConfig()
         {
             LogoLight = new EssentialsLogoPropertiesConfig();
@@ -243,10 +252,10 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomUiBehaviorConfig
     {
-        [JsonProperty("disableActivityButtonsWhileWarmingCooling")]
         /// <summary>
         /// Gets or sets the DisableActivityButtonsWhileWarmingCooling
         /// </summary>
+        [JsonProperty("disableActivityButtonsWhileWarmingCooling")]
         public bool DisableActivityButtonsWhileWarmingCooling { get; set; }
     }
 
@@ -255,74 +264,86 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsAvRoomPropertiesConfig : EssentialsRoomPropertiesConfig
     {
-        [JsonProperty("defaultAudioKey")]
         /// <summary>
         /// Gets or sets the DefaultAudioKey
         /// </summary>
+        [JsonProperty("defaultAudioKey")]
         public string DefaultAudioKey { get; set; }
-        [JsonProperty("sourceListKey")]
+
+        /// <summary>
+        /// Gets or sets the DefaultOnDspPresetKey
+        /// </summary>
+        [JsonProperty("defaultOnDspPresetKey")]
+        public string DefaultOnDspPresetKey { get; set; }
+
+        /// <summary>
+        /// Gets or sets the DefaultOffDspPresetKey
+        /// </summary>
+        [JsonProperty("defaultOffDspPresetKey")]
+        public string DefaultOffDspPresetKey { get; set; }
+
         /// <summary>
         /// Gets or sets the SourceListKey
         /// </summary>
+        /// </summary>
+        [JsonProperty("sourceListKey")]
         public string SourceListKey { get; set; }
-        [JsonProperty("destinationListKey")]
         /// <summary>
         /// Gets or sets the DestinationListKey
         /// </summary>
+        [JsonProperty("destinationListKey")]
         public string DestinationListKey { get; set; }
-        [JsonProperty("audioControlPointListKey")]
         /// <summary>
         /// Gets or sets the AudioControlPointListKey
         /// </summary>
+        [JsonProperty("audioControlPointListKey")]
         public string AudioControlPointListKey { get; set; }
-        [JsonProperty("cameraListKey")]
         /// <summary>
         /// Gets or sets the CameraListKey
         /// </summary>
+        [JsonProperty("cameraListKey")]
         public string CameraListKey { get; set; }
 
 
-        [JsonProperty("defaultSourceItem")]
         /// <summary>
         /// Gets or sets the DefaultSourceItem
         /// </summary>
+        [JsonProperty("defaultSourceItem")]
         public string DefaultSourceItem { get; set; }
         /// <summary>
         /// Indicates if the room supports advanced sharing
         /// </summary>
         [JsonProperty("supportsAdvancedSharing")]
-        /// <summary>
-        /// Gets or sets the SupportsAdvancedSharing
-        /// </summary>
         public bool SupportsAdvancedSharing { get; set; }
+
         /// <summary>
         /// Indicates if non-tech users can change the share mode
         /// </summary>
         [JsonProperty("userCanChangeShareMode")]
-        /// <summary>
-        /// Gets or sets the UserCanChangeShareMode
-        /// </summary>
         public bool UserCanChangeShareMode { get; set; }
 
 
-        [JsonProperty("matrixRoutingKey", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the MatrixRoutingKey
         /// </summary>
+        [JsonProperty("matrixRoutingKey", NullValueHandling = NullValueHandling.Ignore)]
         public string MatrixRoutingKey { get; set; }
     }
 
+    /// <summary>
+    /// Represents a EssentialsConferenceRoomPropertiesConfig
+    /// </summary>
     public class EssentialsConferenceRoomPropertiesConfig : EssentialsAvRoomPropertiesConfig
     {
-        [JsonProperty("videoCodecKey")]
         /// <summary>
         /// Gets or sets the VideoCodecKey
         /// </summary>
+        [JsonProperty("videoCodecKey")]
         public string VideoCodecKey { get; set; }
-        [JsonProperty("audioCodecKey")]
         /// <summary>
         /// Gets or sets the AudioCodecKey
         /// </summary>
+        [JsonProperty("audioCodecKey")]
         public string AudioCodecKey { get; set; }
 
     }
@@ -337,12 +358,15 @@ namespace PepperDash.Essentials.Room.Config
         /// </summary>
         public bool Enabled { get; set; }
 
-        [JsonProperty("deviceKeys")]
         /// <summary>
         /// Gets or sets the DeviceKeys
         /// </summary>
+        [JsonProperty("deviceKeys")]
         public List<string> DeviceKeys { get; set; }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
         public EssentialsEnvironmentPropertiesConfig()
         {
             DeviceKeys = new List<string>();
@@ -355,6 +379,9 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomFusionConfig
     {
+        /// <summary>
+        /// Gets the the IpId as a UInt16
+        /// </summary>
         public uint IpIdInt
         {
             get
@@ -371,16 +398,16 @@ namespace PepperDash.Essentials.Room.Config
             }
         }
 
-        [JsonProperty("ipId")]
         /// <summary>
         /// Gets or sets the IpId
         /// </summary>
+        [JsonProperty("ipId")]
         public string IpId { get; set; }
 
-        [JsonProperty("joinMapKey")]
         /// <summary>
         /// Gets or sets the JoinMapKey
         /// </summary>
+        [JsonProperty("joinMapKey")]
         public string JoinMapKey { get; set; }
 
     }
@@ -390,16 +417,16 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomMicrophonePrivacyConfig
     {
-        [JsonProperty("deviceKey")]
         /// <summary>
         /// Gets or sets the DeviceKey
         /// </summary>
+        [JsonProperty("deviceKey")]
         public string DeviceKey { get; set; }
 
-        [JsonProperty("behaviour")]
         /// <summary>
         /// Gets or sets the Behaviour
         /// </summary>
+        [JsonProperty("behaviour")]
         public string Behaviour { get; set; }
     }
 
@@ -408,12 +435,15 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsHelpPropertiesConfig
     {
-        [JsonProperty("message")]
         /// <summary>
         /// Gets or sets the Message
         /// </summary>
+        [JsonProperty("message")]
         public string Message { get; set; }
 
+        /// <summary>
+        /// Gets or sets the ShowCallButton
+        /// </summary>
         [JsonProperty("showCallButton")]
         public bool ShowCallButton { get; set; }
 
@@ -421,11 +451,11 @@ namespace PepperDash.Essentials.Room.Config
         /// Defaults to "Call Help Desk"
         /// </summary>
         [JsonProperty("callButtonText")]
-        /// <summary>
-        /// Gets or sets the CallButtonText
-        /// </summary>
         public string CallButtonText { get; set; }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
         public EssentialsHelpPropertiesConfig()
         {
             CallButtonText = "Call Help Desk";
@@ -437,22 +467,28 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsOneButtonMeetingPropertiesConfig
     {
-        [JsonProperty("enable")]
         /// <summary>
         /// Gets or sets the Enable
         /// </summary>
+        [JsonProperty("enable")]
         public bool Enable { get; set; }
     }
 
+    /// <summary>
+    /// Represents a EssentialsRoomAddressPropertiesConfig
+    /// </summary>
     public class EssentialsRoomAddressPropertiesConfig
     {
+        /// <summary>
+        /// Gets or sets the PhoneNumber
+        /// </summary>
         [JsonProperty("phoneNumber")]
         public string PhoneNumber { get; set; }
 
-        [JsonProperty("sipAddress")]
         /// <summary>
         /// Gets or sets the SipAddress
         /// </summary>
+        [JsonProperty("sipAddress")]
         public string SipAddress { get; set; }
     }
 
@@ -462,14 +498,18 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsLogoPropertiesConfig
     {
-        [JsonProperty("type")]
         /// <summary>
         /// Gets or sets the Type
         /// </summary>
+        [JsonProperty("type")]
         public string Type { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Url
+        /// </summary>
         [JsonProperty("url")]
         public string Url { get; set; }
+
         /// <summary>
         /// GetLogoUrlLight method
         /// </summary>
@@ -502,22 +542,28 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomOccSensorConfig
     {
-        [JsonProperty("deviceKey")]
         /// <summary>
         /// Gets or sets the DeviceKey
         /// </summary>
+        [JsonProperty("deviceKey")]
         public string DeviceKey { get; set; }
 
+        /// <summary>
+        /// Gets or sets the TimeoutMinutes
+        /// </summary>
         [JsonProperty("timeoutMinutes")]
         public int TimeoutMinutes { get; set; }
     }
 
+    /// <summary>
+    /// Represents a EssentialsRoomTechConfig
+    /// </summary>
     public class EssentialsRoomTechConfig
     {
-        [JsonProperty("password")]
         /// <summary>
         /// Gets or sets the Password
         /// </summary>
+        [JsonProperty("password")]
         public string Password { get; set; }
     }
 }

src/PepperDash.Essentials.Core/Routing/Extensions.cs

@@ -1,11 +1,11 @@
-using Crestron.SimplSharpPro.Keypads;
-using PepperDash.Essentials.Core.Queues;
-using PepperDash.Essentials.Core.Routing;
-using Serilog.Events;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using Crestron.SimplSharpPro.Keypads;
+using PepperDash.Essentials.Core.Queues;
+using PepperDash.Essentials.Core.Routing;
+using Serilog.Events;
 using Debug = PepperDash.Core.Debug;
 
 
@@ -115,7 +115,7 @@ namespace PepperDash.Essentials.Core
         public static (RouteDescriptor, RouteDescriptor) GetRouteToSource(this IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType, RoutingInputPort destinationPort, RoutingOutputPort sourcePort)
         {
             // if it's a single signal type, find the route
-            if (!signalType.HasFlag(eRoutingSignalType.AudioVideo) && 
+            if (!signalType.HasFlag(eRoutingSignalType.AudioVideo) &&
                 !(signalType.HasFlag(eRoutingSignalType.Video) && signalType.HasFlag(eRoutingSignalType.SecondaryAudio)))
             {
                 var singleTypeRouteDescriptor = new RouteDescriptor(source, destination, destinationPort, signalType);
@@ -134,14 +134,15 @@ namespace PepperDash.Essentials.Core
             }
             // otherwise, audioVideo needs to be handled as two steps.
 
-            Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {sourceKey} of type {type}", destination, source.Key);
+            Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {sourceKey} of type {type}", destination, source.Key, signalType);
 
             RouteDescriptor audioRouteDescriptor;
 
             if (signalType.HasFlag(eRoutingSignalType.SecondaryAudio))
             {
                 audioRouteDescriptor = new RouteDescriptor(source, destination, destinationPort, eRoutingSignalType.SecondaryAudio);
-            } else
+            }
+            else
             {
                 audioRouteDescriptor = new RouteDescriptor(source, destination, destinationPort, eRoutingSignalType.Audio);
             }
@@ -199,13 +200,13 @@ namespace PepperDash.Essentials.Core
                 Source = source,
                 SourcePort = sourcePort,
                 SignalType = signalType
-            };            
+            };
 
             var coolingDevice = destination as IWarmingCooling;
 
             //We already have a route request for this device, and it's a cooling device and is cooling
             if (RouteRequests.TryGetValue(destination.Key, out RouteRequest existingRouteRequest) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {                
+            {
                 coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRouteRequest.HandleCooldown;
 
                 coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
@@ -219,7 +220,7 @@ namespace PepperDash.Essentials.Core
 
             //New Request
             if (coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {               
+            {
                 coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
 
                 RouteRequests.Add(destination.Key, routeRequest);
@@ -239,9 +240,9 @@ namespace PepperDash.Essentials.Core
                 Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is NOT cooling down.  Removing stored route request and routing to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
             }
 
-            routeRequestQueue.Enqueue(new ReleaseRouteQueueItem(ReleaseRouteInternal, destination,destinationPort?.Key ?? string.Empty, false));
+            routeRequestQueue.Enqueue(new ReleaseRouteQueueItem(ReleaseRouteInternal, destination, destinationPort?.Key ?? string.Empty, false));
 
-            routeRequestQueue.Enqueue(new RouteRequestQueueItem(RunRouteRequest, routeRequest));            
+            routeRequestQueue.Enqueue(new RouteRequestQueueItem(RunRouteRequest, routeRequest));
         }
 
         /// <summary>
@@ -272,7 +273,8 @@ namespace PepperDash.Essentials.Core
 
                 audioOrSingleRoute.ExecuteRoutes();
                 videoRoute?.ExecuteRoutes();
-            } catch(Exception ex)
+            }
+            catch (Exception ex)
             {
                 Debug.LogMessage(ex, "Exception Running Route Request {request}", null, request);
             }
@@ -305,9 +307,10 @@ namespace PepperDash.Essentials.Core
                     Debug.LogMessage(LogEventLevel.Information, "Releasing current route: {0}", destination, current.Source.Key);
                     current.ReleaseRoutes(clearRoute);
                 }
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
-                Debug.LogMessage(ex, "Exception releasing route for '{destination}':'{inputPortKey}'",null, destination?.Key ?? null, string.IsNullOrEmpty(inputPortKey) ? "auto" : inputPortKey);
+                Debug.LogMessage(ex, "Exception releasing route for '{destination}':'{inputPortKey}'", null, destination?.Key ?? null, string.IsNullOrEmpty(inputPortKey) ? "auto" : inputPortKey);
             }
         }
 

src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs

@@ -1,8 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using PepperDash.Core;
 using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common.Generic
@@ -10,8 +12,17 @@ namespace PepperDash.Essentials.Devices.Common.Generic
     /// <summary>
     /// Represents a GenericSink
     /// </summary>
-    public class GenericSink : EssentialsDevice, IRoutingSinkWithSwitchingWithInputPort
+    public class GenericSink : EssentialsDevice, IRoutingSinkWithSwitchingWithInputPort, ICurrentSources
     {
+        /// <inheritdoc/> 
+		public Dictionary<eRoutingSignalType, SourceListItem> CurrentSources { get; private set; }
+
+        /// <inheritdoc/>
+        public Dictionary<eRoutingSignalType, string> CurrentSourceKeys { get; private set; }
+
+        /// <inheritdoc />
+        public event EventHandler CurrentSourcesChanged;
+
         /// <summary>
         /// Initializes a new instance of the GenericSink class
         /// </summary>
@@ -24,6 +35,65 @@ namespace PepperDash.Essentials.Devices.Common.Generic
             var inputPort = new RoutingInputPort(RoutingPortNames.AnyVideoIn, eRoutingSignalType.AudioVideo | eRoutingSignalType.SecondaryAudio, eRoutingPortConnectionType.Hdmi, null, this);
 
             InputPorts.Add(inputPort);
+
+            CurrentSources = new Dictionary<eRoutingSignalType, SourceListItem>
+            {
+                { eRoutingSignalType.Audio, null },
+                { eRoutingSignalType.Video, null },
+            };
+
+            CurrentSourceKeys = new Dictionary<eRoutingSignalType, string>
+            {
+                { eRoutingSignalType.Audio, string.Empty },
+                { eRoutingSignalType.Video, string.Empty },
+            };
+        }
+
+        /// <inheritdoc />
+		public void SetCurrentSource(eRoutingSignalType signalType, string sourceListKey, SourceListItem sourceListItem)
+        {
+            foreach (eRoutingSignalType type in Enum.GetValues(typeof(eRoutingSignalType)))
+            {
+                var flagValue = Convert.ToInt32(type);
+                // Skip if flagValue is 0 or not a power of two (i.e., not a single-bit flag).
+                // (flagValue & (flagValue - 1)) != 0 checks if more than one bit is set.
+                if (flagValue == 0 || (flagValue & (flagValue - 1)) != 0)
+                {
+                    this.LogDebug("Skipping {type}", type);
+                    continue;
+                }
+
+                this.LogDebug("setting {type}", type);
+
+                if (signalType.HasFlag(type))
+                {
+                    UpdateCurrentSources(type, sourceListKey, sourceListItem);
+                }
+            }
+            // Raise the CurrentSourcesChanged event
+            CurrentSourcesChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void UpdateCurrentSources(eRoutingSignalType signalType, string sourceListKey, SourceListItem sourceListItem)
+        {
+            if (CurrentSources.ContainsKey(signalType))
+            {
+                CurrentSources[signalType] = sourceListItem;
+            }
+            else
+            {
+                CurrentSources.Add(signalType, sourceListItem);
+            }
+
+            // Update the current source key for the specified signal type
+            if (CurrentSourceKeys.ContainsKey(signalType))
+            {
+                CurrentSourceKeys[signalType] = sourceListKey;
+            }
+            else
+            {
+                CurrentSourceKeys.Add(signalType, sourceListKey);
+            }
         }
 
         /// <summary>

src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj

@@ -29,6 +29,6 @@
     <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.171" />
   </ItemGroup>
 </Project>

src/PepperDash.Essentials.MobileControl.Messengers/PepperDash.Essentials.MobileControl.Messengers.csproj

@@ -33,7 +33,7 @@
     <Compile Remove="Messengers\SIMPLVtcMessenger.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.171" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PepperDash.Core\PepperDash.Core.csproj" />

src/PepperDash.Essentials.MobileControl/PepperDash.Essentials.MobileControl.csproj

@@ -38,7 +38,7 @@
     <Compile Remove="RoomBridges\SourceDeviceMapDictionary.cs" />
   </ItemGroup>  
   <ItemGroup>    
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.171" />
     <PackageReference Include="WebSocketSharp-netstandard" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>

src/PepperDash.Essentials/PepperDash.Essentials.csproj

@@ -48,7 +48,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.171" />
     <PackageReference Include="System.IO.Compression" Version="4.0.0" />
   </ItemGroup>
   <ItemGroup>