Merge pull request #1259 from PepperDash/routing-updates

fix: check for `SecondaryAudio | Video`

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.0.0-local</Version>
+    <Version>2.4.0-local</Version>
     <InformationalVersion>$(Version)</InformationalVersion>
     <Authors>PepperDash Technology</Authors>
     <Company>PepperDash Technology</Company>

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISelectableItems.cs

@@ -4,19 +4,24 @@ using System.Collections.Generic;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
-    /// <summary>
-    /// Describes a collection of items that can be selected
-    /// </summary>
-    /// <typeparam name="TKey">type for the keys in the collection.  Probably a string or enum</typeparam>
-    public interface ISelectableItems<TKey>
+    public interface ISelectableItems<TKey, TValue> where TValue : ISelectableItem
     {
         event EventHandler ItemsUpdated;
         event EventHandler CurrentItemChanged;
 
         [JsonProperty("items")]
-        Dictionary<TKey, ISelectableItem> Items { get; set; }
+        Dictionary<TKey, TValue> Items { get; set; }
 
         [JsonProperty("currentItem")]
         TKey CurrentItem { get; set; }
+
+    }
+
+    /// <summary>
+    /// Describes a collection of items that can be selected
+    /// </summary>
+    /// <typeparam name="TKey">type for the keys in the collection.  Probably a string or enum</typeparam>
+    public interface ISelectableItems<TKey> : ISelectableItems<TKey, ISelectableItem>
+    {        
     }
 }

src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs

@@ -1,10 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.Lighting
 {
@@ -23,6 +18,11 @@ namespace PepperDash.Essentials.Core.Lighting
 
     }
 
+    public interface ILightingScenesDynamic : ILightingScenes
+    {
+        event EventHandler LightingScenesUpdated;
+    }
+
     /// <summary>
     /// Requirements for a device that implements master raise/lower
     /// </summary>

src/PepperDash.Essentials.Core/Lighting/LightingScene.cs

@@ -26,6 +26,9 @@ namespace PepperDash.Essentials.Core.Lighting
             }
         }
 
+        [JsonProperty("sortOrder", NullValueHandling = NullValueHandling.Ignore)]
+        public int SortOrder { get; set; }
+
         [JsonIgnore]
         public BoolFeedback IsActiveFeedback { get; set; }
 

src/PepperDash.Essentials.Core/Monitoring/GenericCommunicationMonitor.cs

@@ -30,6 +30,8 @@ namespace PepperDash.Essentials.Core
 
 		private Timer PollTimer;
 
+        private SemaphoreSlim semaphore = new SemaphoreSlim(1, 1);
+
         /// <summary>
         /// GenericCommunicationMonitor constructor
         /// 
@@ -201,14 +203,21 @@ namespace PepperDash.Essentials.Core
 
         private void BeginPolling()
         {
-            lock (_pollTimerLock)
+            try
             {
-                if (PollTimer != null)
+                semaphore.Wait();
                 {
-                    return;
-                }
+                    if (PollTimer != null)
+                    {
+                        return;
+                    }
 
-                PollTimer = new Timer(o => Poll(), null, 0, PollTime);
+                    PollTimer = new Timer(o => Poll(), null, 0, PollTime);
+                }
+            }
+            finally
+            {
+                semaphore.Release();
             }
         }
 

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

@@ -69,7 +69,8 @@ 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);
                 Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {sourceKey} of type {type}", destination, source.Key, signalType);

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs

@@ -8,15 +8,14 @@ namespace PepperDash.Essentials.AppServer.Messengers
 {
     public class ILightingScenesMessenger : MessengerBase
     {
-        protected ILightingScenes Device { get; private set; }
+        private ILightingScenes lightingScenesDevice;
 
         public ILightingScenesMessenger(string key, ILightingScenes device, string messagePath)
             : base(key, messagePath, device as IKeyName)
         {
-            Device = device ?? throw new ArgumentNullException("device");
-            Device.LightingSceneChange += new EventHandler<LightingSceneChangeEventArgs>(LightingDevice_LightingSceneChange);
-
+            lightingScenesDevice = device ?? throw new ArgumentNullException("device");
 
+            lightingScenesDevice.LightingSceneChange += new EventHandler<LightingSceneChangeEventArgs>(LightingDevice_LightingSceneChange);
         }
 
         private void LightingDevice_LightingSceneChange(object sender, LightingSceneChangeEventArgs e)
@@ -38,8 +37,13 @@ namespace PepperDash.Essentials.AppServer.Messengers
             AddAction("/selectScene", (id, content) =>
             {
                 var s = content.ToObject<LightingScene>();
-                Device.SelectScene(s);
+                lightingScenesDevice.SelectScene(s);
             });
+
+            if(!(lightingScenesDevice is ILightingScenesDynamic lightingScenesDynamic))
+                return;
+
+            lightingScenesDynamic.LightingScenesUpdated += (s, e) => SendFullStatus();
         }
 
 
@@ -47,8 +51,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             var state = new LightingBaseStateMessage
             {
-                Scenes = Device.LightingScenes,
-                CurrentLightingScene = Device.CurrentLightingScene
+                Scenes = lightingScenesDevice.LightingScenes,
+                CurrentLightingScene = lightingScenesDevice.CurrentLightingScene
             };
 
             PostStatusMessage(state);