feat: add support for mcdge1000 type in MobileControlTouchpanelController

fix: check for `SecondaryAudio | Video`

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

@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Core.Lighting
 
     }
 
-    public interface ILightingScenesDynamic
+    public interface ILightingScenesDynamic : ILightingScenes
     {
         event EventHandler LightingScenesUpdated;
     }

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,13 +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)
@@ -36,10 +37,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
             AddAction("/selectScene", (id, content) =>
             {
                 var s = content.ToObject<LightingScene>();
-                Device.SelectScene(s);
+                lightingScenesDevice.SelectScene(s);
             });
 
-            if(!(Device is ILightingScenesDynamic lightingScenesDynamic))
+            if(!(lightingScenesDevice is ILightingScenesDynamic lightingScenesDynamic))
                 return;
 
             lightingScenesDynamic.LightingScenesUpdated += (s, e) => SendFullStatus();
@@ -50,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);

src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs

@@ -491,7 +491,7 @@ namespace PepperDash.Essentials.Touchpanel
     {
         public MobileControlTouchpanelControllerFactory()
         {
-            TypeNames = new List<string>() { "mccrestronapp", "mctsw550", "mctsw750", "mctsw1050", "mctsw560", "mctsw760", "mctsw1060", "mctsw570", "mctsw770", "mcts770", "mctsw1070", "mcts1070", "mcxpanel" };
+            TypeNames = new List<string>() { "mccrestronapp", "mctsw550", "mctsw750", "mctsw1050", "mctsw560", "mctsw760", "mctsw1060", "mctsw570", "mctsw770", "mcts770", "mctsw1070", "mcts1070", "mcxpanel", "mcdge1000" };
             MinimumEssentialsFrameworkVersion = "2.0.0";
         }
 
@@ -555,7 +555,10 @@ namespace PepperDash.Essentials.Touchpanel
                     return new Tsw1070(id, Global.ControlSystem);
                 else if (type == "ts1070")
                     return new Ts1070(id, Global.ControlSystem);
-                else
+                else if (type == "dge1000")
+                    return new Dge1000(id, Global.ControlSystem);
+                else 
+
                 {
                     Debug.LogMessage(Serilog.Events.LogEventLevel.Warning, "WARNING: Cannot create TSW controller with type '{0}'", type);
                     return null;