removed duplicate method that somehow crept in...

Update DM USB Routing to match SIMPL Windows

.github/workflows/docker.yml

@@ -56,8 +56,8 @@ jobs:
       - name: Login to Docker
         uses: azure/docker-login@v1
         with:
-          username: ${{ secrets.dockerhub_user }}
-          password: ${{ secrets.dockerhub_password }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
       # Build the solutions in the docker image
       - name: Build Solution
         shell: powershell

.github/workflows/master.yml

@@ -44,6 +44,12 @@ jobs:
         run: |
           Write-Output ${{ env.VERSION }}
           ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
+      # Login to Docker
+      - name: Login to Docker
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
       # Build the solutions in the docker image
       - name: Build Solution
         shell: powershell

PepperDashEssentials/UI/EssentialsTouchpanelController.cs

@@ -211,7 +211,7 @@ namespace PepperDash.Essentials
             var comm = CommFactory.GetControlPropertiesConfig(dc);
             var props = Newtonsoft.Json.JsonConvert.DeserializeObject<CrestronTouchpanelPropertiesConfig>(dc.Properties.ToString());
 
-            Debug.Console(1, "Factory Attempting to create new EssentialsTouchpanelController");
+            Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
 
             var panelController = new EssentialsTouchpanelController(dc.Key, dc.Name, dc.Type, props, comm.IpIdInt);
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -9,6 +9,25 @@ namespace PepperDash.Essentials.Core.Bridges
 {
     public class DmChassisControllerJoinMap : JoinMapBaseAdvanced
     {
+        [JoinName("EnableAudioBreakaway")]
+        public JoinDataComplete EnableAudioBreakaway = new JoinDataComplete(
+            new JoinData {JoinNumber = 4, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Label = "DM Chassis enable audio breakaway routing",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("EnableUsbBreakaway")]
+        public JoinDataComplete EnableUsbBreakaway = new JoinDataComplete(
+            new JoinData { JoinNumber = 5, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Label = "DM Chassis enable USB breakaway routing",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
 
         [JoinName("SystemId")]
         public JoinDataComplete SystemId = new JoinDataComplete(new JoinData() { JoinNumber = 10, JoinSpan = 1 },

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/HdMdNxM4kEControllerJoinMap.cs

@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Core.Bridges
-{
-    public class HdMdNxM4kEControllerJoinMap : JoinMapBaseAdvanced
-    {
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata() { Label = "Device Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("EnableAutoRoute")]
-        public JoinDataComplete EnableAutoRoute = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata() { Label = "Enable Automatic Routing on 4x1 Switchers", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DisableAutoRoute")]
-        public JoinDataComplete DisableAutoRoute = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata() { Label = "Disable Automatic Routing on 4x1 Switchers", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("InputName")]
-        public JoinDataComplete InputName = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 8 },
-            new JoinMetadata() { Label = "Device Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("InputSync")]
-        public JoinDataComplete InputSync = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 8 },
-            new JoinMetadata() { Label = "Device Input Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OutputName")]
-        public JoinDataComplete OutputName = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 2 },
-            new JoinMetadata() { Label = "Device Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("OutputRoute")]
-        public JoinDataComplete OutputRoute = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 2 },
-            new JoinMetadata() { Label = "Device Output Route Set/Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("OutputRoutedName")]
-        public JoinDataComplete OutputRoutedName = new JoinDataComplete(new JoinData() { JoinNumber = 16, JoinSpan = 2 },
-            new JoinMetadata() { Label = "Device Output Route Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("EnableInputHdcp")]
-        public JoinDataComplete EnableInputHdcp = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 8 },
-            new JoinMetadata() { Label = "Device Enable Input Hdcp", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DisableInputHdcp")]
-        public JoinDataComplete DisableInputHdcp = new JoinDataComplete(new JoinData() { JoinNumber = 21, JoinSpan = 8 },
-            new JoinMetadata() { Label = "Device Disnable Input Hdcp", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData() { JoinNumber = 30, JoinSpan = 1 },
-            new JoinMetadata() { Label = "Device Onlne", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        public HdMdNxM4kEControllerJoinMap(uint joinStart)
-            : base(joinStart, typeof(HdMdNxM4kEControllerJoinMap))
-        {
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/StatusSign/StatusSignController.cs

@@ -1,127 +1,127 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.GeneralIO;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    [Description("Wrapper class for the Crestron StatusSign device")]
-    public class StatusSignController : CrestronGenericBridgeableBaseDevice
-    {
-        private readonly StatusSign _device;
-
-        public BoolFeedback RedLedEnabledFeedback { get; private set; }
-        public BoolFeedback GreenLedEnabledFeedback { get; private set; }
-        public BoolFeedback BlueLedEnabledFeedback { get; private set; }
-
-        public IntFeedback RedLedBrightnessFeedback { get; private set; }
-        public IntFeedback GreenLedBrightnessFeedback { get; private set; }
-        public IntFeedback BlueLedBrightnessFeedback { get; private set; }
-
-        public StatusSignController(string key, string name, GenericBase hardware) : base(key, name, hardware)
-        {
-            _device = hardware as StatusSign;
-
-            RedLedEnabledFeedback =
-                new BoolFeedback(
-                    () =>
-                        _device.Leds[(uint) StatusSign.Led.eLedColor.Red]
-                            .ControlFeedback.BoolValue);
-            GreenLedEnabledFeedback =
-                new BoolFeedback(
-                    () =>
-                        _device.Leds[(uint) StatusSign.Led.eLedColor.Green]
-                            .ControlFeedback.BoolValue);
-            BlueLedEnabledFeedback =
-                new BoolFeedback(
-                    () =>
-                        _device.Leds[(uint) StatusSign.Led.eLedColor.Blue]
-                            .ControlFeedback.BoolValue);
-
-            RedLedBrightnessFeedback =
-                new IntFeedback(() => (int) _device.Leds[(uint) StatusSign.Led.eLedColor.Red].BrightnessFeedback);
-            GreenLedBrightnessFeedback =
-                new IntFeedback(() => (int) _device.Leds[(uint) StatusSign.Led.eLedColor.Green].BrightnessFeedback);
-            BlueLedBrightnessFeedback =
-                new IntFeedback(() => (int) _device.Leds[(uint) StatusSign.Led.eLedColor.Blue].BrightnessFeedback);
-
-            if (_device != null) _device.BaseEvent += _device_BaseEvent;
-        }
-
-        void _device_BaseEvent(GenericBase device, BaseEventArgs args)
-        {
-            switch (args.EventId)
-            {
-                case StatusSign.LedBrightnessFeedbackEventId:
-                    RedLedBrightnessFeedback.FireUpdate();
-                    GreenLedBrightnessFeedback.FireUpdate();
-                    BlueLedBrightnessFeedback.FireUpdate();
-                    break;
-                case StatusSign.LedControlFeedbackEventId:
-                    RedLedEnabledFeedback.FireUpdate();
-                    GreenLedEnabledFeedback.FireUpdate();
-                    BlueLedEnabledFeedback.FireUpdate();
-                    break;
-            }
-        }
-
-        public void EnableLedControl(bool red, bool green, bool blue)
-        {
-            _device.Leds[(uint) StatusSign.Led.eLedColor.Red].Control.BoolValue = red;
-            _device.Leds[(uint)StatusSign.Led.eLedColor.Green].Control.BoolValue = green;
-            _device.Leds[(uint)StatusSign.Led.eLedColor.Blue].Control.BoolValue = blue;
-        }
-
-        public void SetColor(uint red, uint green, uint blue)
-        {
-            try
-            {
-                _device.Leds[(uint)StatusSign.Led.eLedColor.Red].Brightness =
-                    (StatusSign.Led.eBrightnessPercentageValues)SimplSharpDeviceHelper.PercentToUshort(red);
-            }
-            catch (InvalidOperationException)
-            {
-                Debug.Console(1, this, "Error converting value to Red LED brightness. value: {0}", red);
-            }
-            try
-            {
-                _device.Leds[(uint)StatusSign.Led.eLedColor.Green].Brightness =
-                    (StatusSign.Led.eBrightnessPercentageValues)SimplSharpDeviceHelper.PercentToUshort(green);
-            }
-            catch (InvalidOperationException)
-            {
-                Debug.Console(1, this, "Error converting value to Green LED brightness. value: {0}", green);
-            }
-
-            try
-            {
-                _device.Leds[(uint)StatusSign.Led.eLedColor.Blue].Brightness =
-                    (StatusSign.Led.eBrightnessPercentageValues)SimplSharpDeviceHelper.PercentToUshort(blue);
-            }
-            catch (InvalidOperationException)
-            {
-                Debug.Console(1, this, "Error converting value to Blue LED brightness. value: {0}", blue);
-            }
-        }
-
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.GeneralIO;
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.CrestronIO
+{
+    [Description("Wrapper class for the Crestron StatusSign device")]
+    public class StatusSignController : CrestronGenericBridgeableBaseDevice
+    {
+        private readonly StatusSign _device;
+
+        public BoolFeedback RedLedEnabledFeedback { get; private set; }
+        public BoolFeedback GreenLedEnabledFeedback { get; private set; }
+        public BoolFeedback BlueLedEnabledFeedback { get; private set; }
+
+        public IntFeedback RedLedBrightnessFeedback { get; private set; }
+        public IntFeedback GreenLedBrightnessFeedback { get; private set; }
+        public IntFeedback BlueLedBrightnessFeedback { get; private set; }
+
+        public StatusSignController(string key, string name, GenericBase hardware) : base(key, name, hardware)
         {
-            var joinMap = new StatusSignControllerJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
+            _device = hardware as StatusSign;
+
+            RedLedEnabledFeedback =
+                new BoolFeedback(
+                    () =>
+                        _device.Leds[(uint) StatusSign.Led.eLedColor.Red]
+                            .ControlFeedback.BoolValue);
+            GreenLedEnabledFeedback =
+                new BoolFeedback(
+                    () =>
+                        _device.Leds[(uint) StatusSign.Led.eLedColor.Green]
+                            .ControlFeedback.BoolValue);
+            BlueLedEnabledFeedback =
+                new BoolFeedback(
+                    () =>
+                        _device.Leds[(uint) StatusSign.Led.eLedColor.Blue]
+                            .ControlFeedback.BoolValue);
+
+            RedLedBrightnessFeedback =
+                new IntFeedback(() => (int) _device.Leds[(uint) StatusSign.Led.eLedColor.Red].BrightnessFeedback);
+            GreenLedBrightnessFeedback =
+                new IntFeedback(() => (int) _device.Leds[(uint) StatusSign.Led.eLedColor.Green].BrightnessFeedback);
+            BlueLedBrightnessFeedback =
+                new IntFeedback(() => (int) _device.Leds[(uint) StatusSign.Led.eLedColor.Blue].BrightnessFeedback);
+
+            if (_device != null) _device.BaseEvent += _device_BaseEvent;
+        }
+
+        void _device_BaseEvent(GenericBase device, BaseEventArgs args)
+        {
+            switch (args.EventId)
+            {
+                case StatusSign.LedBrightnessFeedbackEventId:
+                    RedLedBrightnessFeedback.FireUpdate();
+                    GreenLedBrightnessFeedback.FireUpdate();
+                    BlueLedBrightnessFeedback.FireUpdate();
+                    break;
+                case StatusSign.LedControlFeedbackEventId:
+                    RedLedEnabledFeedback.FireUpdate();
+                    GreenLedEnabledFeedback.FireUpdate();
+                    BlueLedEnabledFeedback.FireUpdate();
+                    break;
+            }
+        }
+
+        public void EnableLedControl(bool red, bool green, bool blue)
+        {
+            _device.Leds[(uint) StatusSign.Led.eLedColor.Red].Control.BoolValue = red;
+            _device.Leds[(uint)StatusSign.Led.eLedColor.Green].Control.BoolValue = green;
+            _device.Leds[(uint)StatusSign.Led.eLedColor.Blue].Control.BoolValue = blue;
+        }
+
+        public void SetColor(uint red, uint green, uint blue)
+        {
+            try
+            {
+                _device.Leds[(uint)StatusSign.Led.eLedColor.Red].Brightness =
+                    (StatusSign.Led.eBrightnessPercentageValues)SimplSharpDeviceHelper.PercentToUshort(red);
+            }
+            catch (InvalidOperationException)
+            {
+                Debug.Console(1, this, "Error converting value to Red LED brightness. value: {0}", red);
+            }
+            try
+            {
+                _device.Leds[(uint)StatusSign.Led.eLedColor.Green].Brightness =
+                    (StatusSign.Led.eBrightnessPercentageValues)SimplSharpDeviceHelper.PercentToUshort(green);
+            }
+            catch (InvalidOperationException)
+            {
+                Debug.Console(1, this, "Error converting value to Green LED brightness. value: {0}", green);
+            }
+
+            try
+            {
+                _device.Leds[(uint)StatusSign.Led.eLedColor.Blue].Brightness =
+                    (StatusSign.Led.eBrightnessPercentageValues)SimplSharpDeviceHelper.PercentToUshort(blue);
+            }
+            catch (InvalidOperationException)
+            {
+                Debug.Console(1, this, "Error converting value to Blue LED brightness. value: {0}", blue);
+            }
+        }
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            var joinMap = new StatusSignControllerJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<StatusSignControllerJoinMap>(joinMapSerialized);
 
-            bridge.AddJoinMap(Key, joinMap);
-
-            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
+            bridge.AddJoinMap(Key, joinMap);
+
+            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
             trilist.SetBoolSigAction(joinMap.RedControl.JoinNumber, b => EnableControl(trilist, joinMap, this));
             trilist.SetBoolSigAction(joinMap.GreenControl.JoinNumber, b => EnableControl(trilist, joinMap, this));
             trilist.SetBoolSigAction(joinMap.BlueControl.JoinNumber, b => EnableControl(trilist, joinMap, this));
@@ -139,44 +139,44 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
             RedLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.RedLed.JoinNumber]);
             BlueLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.BlueLed.JoinNumber]);
-            GreenLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.GreenLed.JoinNumber]);
-        }
-
-        private static void EnableControl(BasicTriList triList, StatusSignControllerJoinMap joinMap,
-            StatusSignController device)
+            GreenLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.GreenLed.JoinNumber]);
+        }
+
+        private static void EnableControl(BasicTriList triList, StatusSignControllerJoinMap joinMap,
+            StatusSignController device)
         {
             var redEnable = triList.BooleanOutput[joinMap.RedControl.JoinNumber].BoolValue;
             var greenEnable = triList.BooleanOutput[joinMap.GreenControl.JoinNumber].BoolValue;
-            var blueEnable = triList.BooleanOutput[joinMap.BlueControl.JoinNumber].BoolValue;
-            device.EnableLedControl(redEnable, greenEnable, blueEnable);
-        }
-
-        private static void SetColor(BasicTriList triList, StatusSignControllerJoinMap joinMap,
-            StatusSignController device)
+            var blueEnable = triList.BooleanOutput[joinMap.BlueControl.JoinNumber].BoolValue;
+            device.EnableLedControl(redEnable, greenEnable, blueEnable);
+        }
+
+        private static void SetColor(BasicTriList triList, StatusSignControllerJoinMap joinMap,
+            StatusSignController device)
         {
             var redBrightness = triList.UShortOutput[joinMap.RedLed.JoinNumber].UShortValue;
             var greenBrightness = triList.UShortOutput[joinMap.GreenLed.JoinNumber].UShortValue;
-            var blueBrightness = triList.UShortOutput[joinMap.BlueLed.JoinNumber].UShortValue;
-
-            device.SetColor(redBrightness, greenBrightness, blueBrightness);
-        }
-    }
-
-    public class StatusSignControllerFactory : EssentialsDeviceFactory<StatusSignController>
-    {
-        public StatusSignControllerFactory()
-        {
-            TypeNames = new List<string>() { "statussign" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new StatusSign Device");
-
-            var control = CommFactory.GetControlPropertiesConfig(dc);
-            var cresnetId = control.CresnetIdInt;
-
-            return new StatusSignController(dc.Key, dc.Name, new StatusSign(cresnetId, Global.ControlSystem));
-        }
-    }
+            var blueBrightness = triList.UShortOutput[joinMap.BlueLed.JoinNumber].UShortValue;
+
+            device.SetColor(redBrightness, greenBrightness, blueBrightness);
+        }
+    }
+
+    public class StatusSignControllerFactory : EssentialsDeviceFactory<StatusSignController>
+    {
+        public StatusSignControllerFactory()
+        {
+            TypeNames = new List<string>() { "statussign" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new StatusSign Device");
+
+            var control = CommFactory.GetControlPropertiesConfig(dc);
+            var cresnetId = control.CresnetIdInt;
+
+            return new StatusSignController(dc.Key, dc.Name, new StatusSign(cresnetId, Global.ControlSystem));
+        }
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.UI;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 
@@ -31,19 +30,7 @@ namespace PepperDash.Essentials.Core
 
 	    protected CrestronGenericBaseDevice(string key, string name, GenericBase hardware)
             : base(key, name)
-	    {
-	        SetHardwareAndRegisterEvents(hardware);
-	    }
-
-        //Added to support creating RMC and DM TX hardware during pre-activation
-	    protected CrestronGenericBaseDevice(string key, string name) : base(key, name)
-	    {
-	        
-	    }
-
-        //Added to support creating RMC and DM TX hardware during pre-activation
-	    protected void SetHardwareAndRegisterEvents(GenericBase hardware)
-	    {
+        {
             Feedbacks = new FeedbackCollection<Feedback>();
 
             Hardware = hardware;
@@ -53,7 +40,7 @@ namespace PepperDash.Essentials.Core
             AddToFeedbackList(IsOnline, IpConnectionsText);
 
             CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, hardware, 120000, 300000);
-	    }
+        }
 
 		/// <summary>
 		/// Make sure that overriding classes call this!
@@ -148,13 +135,8 @@ namespace PepperDash.Essentials.Core
         {
         }
 
-        //Added to support creating RMC and DM TX hardware during pre-activation
-        protected CrestronGenericBridgeableBaseDevice(string key, string name):base(key, name)
-        {
-        }
 
         public abstract void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
-
     }
 
 

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

@@ -53,7 +53,7 @@ namespace PepperDash.Essentials.Core
 
         public ConfigSnippetAttribute(string configSnippet)
         {
-            Debug.Console(2, "Setting Config Snippet {0}", configSnippet);
+            Debug.Console(2, "Setting Description {0}", configSnippet);
             _ConfigSnippet = configSnippet;
         }
 
@@ -83,9 +83,8 @@ namespace PepperDash.Essentials.Core
             foreach (var typeName in TypeNames)
             {
                 Debug.Console(2, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
-                var descriptionAttribute = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
-                string description = descriptionAttribute[0].Description;
-                var snippetAttribute = typeof(T).GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];
+                var attributes = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
+                string description = attributes[0].Description;
                 DeviceFactory.AddFactoryForType(typeName.ToLower(), description, typeof(T), BuildDevice);
             }
         }

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

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    public interface IBasicVideoMute
-    {
-        void VideoMuteToggle();
-    }
-
-    public interface IBasicVideoMuteWithFeedback : IBasicVideoMute
-    {
-        BoolFeedback VideoMuteIsOn { get; }
-
-        void VideoMuteOn();
-        void VideoMuteOff();
- 
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs

@@ -27,6 +27,16 @@ namespace PepperDash.Essentials.Core
             return joinMap;
         }
 
+        /// <summary>
+        /// Attempts to get the serialized join map from config
+        /// </summary>
+        /// <param name="joinMapKey"></param>
+        /// <returns></returns>
+        public static string GetJoinMapForDevice(string joinMapKey)
+        {
+            return GetSerializedJoinMapForDevice(joinMapKey);
+        }
+
         /// <summary>
         /// Attempts to find a custom join map by key and returns it deserialized if found
         /// </summary>

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

@@ -129,7 +129,6 @@
     <Compile Include="Bridges\JoinMaps\GenericLightingJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\GenericRelayControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\GlsOccupancySensorBaseJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\HdMdNxM4kEControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\HdMdxxxCEControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IBasicCommunicationJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IDigitalInputJoinMap.cs" />
@@ -159,7 +158,6 @@
     <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
     <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
     <Compile Include="Devices\EssentialsDevice.cs" />
-    <Compile Include="Devices\IProjectorInterfaces.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
 using Crestron.SimplSharpPro.DM.Cards;
@@ -42,6 +43,8 @@ namespace PepperDash.Essentials.DM
 
         public IntFeedback SystemIdFeebdack { get; private set; }
         public BoolFeedback SystemIdBusyFeedback { get; private set; }
+        public BoolFeedback EnableAudioBreakawayFeedback { get; private set; }
+        public BoolFeedback EnableUsbBreakawayFeedback { get; private set; }
 
         public Dictionary<uint, IntFeedback> InputCardHdcpCapabilityFeedbacks { get; private set; }
 
@@ -210,6 +213,11 @@ namespace PepperDash.Essentials.DM
 
             SystemIdFeebdack = new IntFeedback(() => { return (Chassis as DmMDMnxn).SystemIdFeedback.UShortValue; });
             SystemIdBusyFeedback = new BoolFeedback(() => { return (Chassis as DmMDMnxn).SystemIdBusy.BoolValue; });
+            EnableAudioBreakawayFeedback =
+                new BoolFeedback(() => (Chassis as DmMDMnxn).EnableAudioBreakawayFeedback.BoolValue);
+            EnableUsbBreakawayFeedback =
+                new BoolFeedback(() => (Chassis as DmMDMnxn).EnableUSBBreakawayFeedback.BoolValue);
+
             InputCardHdcpCapabilityFeedbacks = new Dictionary<uint, IntFeedback>();
             InputCardHdcpCapabilityTypes = new Dictionary<uint, eHdcpCapabilityType>();
 
@@ -376,6 +384,11 @@ namespace PepperDash.Essentials.DM
             }
         }
 
+        private void ChassisOnBaseEvent(GenericBase device, BaseEventArgs args)
+        {
+            
+        }
+
         /// <summary>
         /// 
         /// </summary>
@@ -768,6 +781,20 @@ namespace PepperDash.Essentials.DM
                     SystemIdBusyFeedback.FireUpdate();
                     break;
                 }
+                case DMSystemEventIds.AudioBreakawayEventId:
+                {
+                    Debug.Console(2, this, "AudioBreakaway Event: value: {0}",
+                        (Chassis as DmMDMnxn).EnableAudioBreakawayFeedback.BoolValue);
+                    EnableAudioBreakawayFeedback.FireUpdate();
+                    break;
+                }
+                case DMSystemEventIds.USBBreakawayEventId:
+                {
+                    Debug.Console(2, this, "USBBreakaway Event: value: {0}",
+                        (Chassis as DmMDMnxn).EnableUSBBreakawayFeedback.BoolValue);
+                    EnableUsbBreakawayFeedback.FireUpdate();
+                    break;
+                }
             }
         }
 
@@ -927,6 +954,10 @@ namespace PepperDash.Essentials.DM
                 (Chassis as DmMDMnxn).EnableAudioBreakaway.BoolValue = true;
                 (Chassis as DmMDMnxn).EnableUSBBreakaway.BoolValue = true;
 
+
+                EnableAudioBreakawayFeedback.FireUpdate();
+                EnableUsbBreakawayFeedback.FireUpdate();
+
                 if (InputNames != null)
                     foreach (var kvp in InputNames)
                         Chassis.Inputs[kvp.Key].Name.StringValue = kvp.Value;
@@ -944,6 +975,10 @@ namespace PepperDash.Essentials.DM
             var input = Convert.ToUInt32(inputSelector); // Cast can sometimes fail
             var output = Convert.ToUInt32(outputSelector);
 
+            var chassisSize = (uint) Chassis.NumberOfInputs; //need this to determine USB routing values 8x8 -> 1-8 is inputs 1-8, 17-24 is outputs 1-8
+                                                      //16x16 1-16 is inputs 1-16, 17-32 is outputs 1-16
+                                                      //32x32 1-32 is inputs 1-32, 33-64 is outputs 1-32
+
             // Check to see if there's an off timer waiting on this and if so, cancel
             var key = new PortNumberType(output, sigType);
             if (input == 0)
@@ -964,30 +999,97 @@ namespace PepperDash.Essentials.DM
             var outCard = input == 0 ? null : Chassis.Outputs[output];
 
             // NOTE THAT BITWISE COMPARISONS - TO CATCH ALL ROUTING TYPES 
-            if ((sigType | eRoutingSignalType.Video) == eRoutingSignalType.Video)
+            if ((sigType & eRoutingSignalType.Video) == eRoutingSignalType.Video)
             {
                 Chassis.VideoEnter.BoolValue = true;
                 Chassis.Outputs[output].VideoOut = inCard;
             }
 
-            if ((sigType | eRoutingSignalType.Audio) == eRoutingSignalType.Audio)
+            if ((sigType & eRoutingSignalType.Audio) == eRoutingSignalType.Audio)
             {
                 (Chassis as DmMDMnxn).AudioEnter.BoolValue = true;
                 Chassis.Outputs[output].AudioOut = inCard;
             }
 
-            if ((sigType | eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput)
+            if ((sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput)
             {
+                //using base here because USB can be routed between 2 output cards or 2 input cards
+                DMInputOutputBase dmCard;
+
+                Debug.Console(2, this, "Executing USB Output switch.\r\n in:{0} output: {1}", input, output);
+
+                if (input > chassisSize)
+                {
+                    //wanting to route an output to an output. Subtract chassis size and get output, unless it's 8x8
+                    //need this to determine USB routing values
+                    //8x8 -> 1-8 is inputs 1-8, 17-24 is outputs 1-8
+                    //16x16 1-16 is inputs 1-16, 17-32 is outputs 1-16
+                    //32x32 1-32 is inputs 1-32, 33-64 is outputs 1-32
+                    uint outputIndex;
+
+                    if (chassisSize == 8)
+                    {
+                        outputIndex = input - 16;
+                    }
+                    else
+                    {
+                        outputIndex = input - chassisSize;
+                    }
+                    dmCard = Chassis.Outputs[outputIndex];
+                }
+                else
+                {
+                    dmCard = inCard;
+                }
                 Chassis.USBEnter.BoolValue = true;
                 if (Chassis.Outputs[output] != null)
-                    Chassis.Outputs[output].USBRoutedTo = inCard;
+                {
+                    Debug.Console(2, this, "Routing USB for input {0} to {1}", Chassis.Outputs[input], dmCard);
+                    Chassis.Outputs[output].USBRoutedTo = dmCard;
+                }
             }
 
-            if ((sigType | eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput)
+            if ((sigType & eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput)
             {
+                //using base here because USB can be routed between 2 output cards or 2 input cards
+                DMInputOutputBase dmCard;
+
+                Debug.Console(2, this, "Executing USB Input switch.\r\n in:{0} output: {1}", input, output);
+
+                if (output > chassisSize)
+                {
+                    //wanting to route an input to an output. Subtract chassis size and get output, unless it's 8x8
+                    //need this to determine USB routing values
+                    //8x8 -> 1-8 is inputs 1-8, 17-24 is outputs 1-8
+                    //16x16 1-16 is inputs 1-16, 17-32 is outputs 1-16
+                    //32x32 1-32 is inputs 1-32, 33-64 is outputs 1-32
+                    uint outputIndex;
+
+                    if (chassisSize == 8)
+                    {
+                        outputIndex = input - 16;
+                    }
+                    else
+                    {
+                        outputIndex = input - chassisSize;
+                    }
+                    dmCard = Chassis.Outputs[outputIndex];
+                }
+                else
+                {
+                    dmCard = Chassis.Inputs[input];
+                }
+
+                
+
                 Chassis.USBEnter.BoolValue = true;
-                if (Chassis.Inputs[input] != null)
-                    Chassis.Inputs[input].USBRoutedTo = outCard;
+
+                if (Chassis.Inputs[output] == null)
+                {
+                    return;
+                }
+                Debug.Console(2, this, "Routing USB for input {0} to {1}", Chassis.Inputs[output], dmCard);
+                Chassis.Inputs[output].USBRoutedTo = dmCard;
             }
         }
         #endregion
@@ -1023,6 +1125,19 @@ namespace PepperDash.Essentials.DM
             SystemIdFeebdack.LinkInputSig(trilist.UShortInput[joinMap.SystemId.JoinNumber]);
             SystemIdBusyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.SystemId.JoinNumber]);
 
+            EnableAudioBreakawayFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableAudioBreakaway.JoinNumber]);
+            EnableUsbBreakawayFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsbBreakaway.JoinNumber]);
+
+            trilist.OnlineStatusChange += (o, a) =>
+            {
+                if (!a.DeviceOnLine) return;
+
+                EnableAudioBreakawayFeedback.FireUpdate();
+                EnableUsbBreakawayFeedback.FireUpdate();
+                SystemIdBusyFeedback.FireUpdate();
+                SystemIdFeebdack.FireUpdate();
+            };
+
             // Link up outputs
             for (uint i = 1; i <= Chassis.NumberOfOutputs; i++)
             {

essentials-framework/Essentials DM/Essentials_DM/Chassis/HdMdNxM4kEBridgeableController.cs

@@ -1,394 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.DM;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM.Config;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.DM.Chassis
-{
-    [Description("Wrapper class for all HdMdNxM4E switchers")]
-    public class HdMdNxM4kEBridgeableController : CrestronGenericBridgeableBaseDevice, IRoutingInputsOutputs, IRouting, IHasFeedback
-    {
-        private HdMdNxM _Chassis;
-        private HdMd4x14kE _Chassis4x1;
-
-        public Dictionary<uint, string> InputNames { get; set; }
-        public Dictionary<uint, string> OutputNames { get; set; }
-
-        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-
-        public FeedbackCollection<BoolFeedback> VideoInputSyncFeedbacks { get; private set; }
-        public FeedbackCollection<IntFeedback> VideoOutputRouteFeedbacks { get; private set; }
-        public FeedbackCollection<StringFeedback> InputNameFeedbacks { get; private set; }
-        public FeedbackCollection<StringFeedback> OutputNameFeedbacks { get; private set; }
-        public FeedbackCollection<StringFeedback> OutputRouteNameFeedbacks { get; private set; }
-        public FeedbackCollection<BoolFeedback> InputHdcpEnableFeedback { get; private set; }
-        public FeedbackCollection<StringFeedback> DeviceNameFeedback { get; private set; }
-        public FeedbackCollection<BoolFeedback> AutoRouteFeedback { get; private set; }
-
-        #region Constructor
-
-        public HdMdNxM4kEBridgeableController(string key, string name, HdMdNxM chassis,
-            HdMdNxM4kEBridgeablePropertiesConfig props)
-            : base(key, name, chassis)
-        {
-            _Chassis = chassis;
-            var _props = props;
-
-            InputNames = props.Inputs;
-            OutputNames = props.Outputs;
-
-            VideoInputSyncFeedbacks = new FeedbackCollection<BoolFeedback>();
-            VideoOutputRouteFeedbacks = new FeedbackCollection<IntFeedback>();
-            InputNameFeedbacks = new FeedbackCollection<StringFeedback>();
-            OutputNameFeedbacks = new FeedbackCollection<StringFeedback>();
-            OutputRouteNameFeedbacks = new FeedbackCollection<StringFeedback>();
-            InputHdcpEnableFeedback = new FeedbackCollection<BoolFeedback>();
-            DeviceNameFeedback = new FeedbackCollection<StringFeedback>();
-            AutoRouteFeedback = new FeedbackCollection<BoolFeedback>();
-
-            InputPorts = new RoutingPortCollection<RoutingInputPort>();
-            OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-
-            DeviceNameFeedback.Add(new StringFeedback(this.Name, () => this.Name));
-
-            if (_Chassis.NumberOfInputs == 1)
-            {
-                _Chassis4x1 = _Chassis as HdMd4x14kE;
-                AutoRouteFeedback.Add(new BoolFeedback(this.Name + "-" + InputNames[1], () => _Chassis4x1.AutoModeOnFeedback.BoolValue));
-            }
-
-            for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
-            {
-                var inputName = InputNames[i];
-                _Chassis.Inputs[i].Name.StringValue = inputName;
-
-                InputPorts.Add(new RoutingInputPort(inputName, eRoutingSignalType.AudioVideo,
-                    eRoutingPortConnectionType.Hdmi, i, this));
-                VideoInputSyncFeedbacks.Add(new BoolFeedback(inputName, () => _Chassis.Inputs[i].VideoDetectedFeedback.BoolValue));
-                InputNameFeedbacks.Add(new StringFeedback(inputName, () => _Chassis.Inputs[i].Name.StringValue));
-                InputHdcpEnableFeedback.Add(new BoolFeedback(inputName, () => _Chassis.HdmiInputs[i].HdmiInputPort.HdcpSupportOnFeedback.BoolValue));
-            }
-
-            for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
-            {
-                var outputName = OutputNames[i];
-                _Chassis.Outputs[i].Name.StringValue = outputName;
-
-                OutputPorts.Add(new RoutingOutputPort(outputName, eRoutingSignalType.AudioVideo,
-                    eRoutingPortConnectionType.Hdmi, i, this));
-                VideoOutputRouteFeedbacks.Add(new IntFeedback(outputName, () => (int)_Chassis.Outputs[i].VideoOutFeedback.Number));
-                OutputNameFeedbacks.Add(new StringFeedback(outputName, () => _Chassis.Outputs[i].Name.StringValue));
-                OutputRouteNameFeedbacks.Add(new StringFeedback(outputName, () => _Chassis.Outputs[i].VideoOutFeedback.NameFeedback.StringValue));
-            }
-
-            _Chassis.DMInputChange += new DMInputEventHandler(Chassis_DMInputChange);
-            _Chassis.DMOutputChange += new DMOutputEventHandler(Chassis_DMOutputChange);
-
-            AddPostActivationAction(AddFeedbackCollections);
-        }
-
-        #endregion
-
-        #region Methods
-
-        public void EnableHdcp(uint port)
-        {
-            if (port > _Chassis.NumberOfInputs) return;
-            if (port <= 0) return;
-
-            _Chassis.HdmiInputs[port].HdmiInputPort.HdcpSupportOn();
-            InputHdcpEnableFeedback[InputNames[port]].FireUpdate();
-        }
-
-        public void DisableHdcp(uint port)
-        {
-            if (port > _Chassis.NumberOfInputs) return;
-            if (port <= 0) return;
-
-            _Chassis.HdmiInputs[port].HdmiInputPort.HdcpSupportOff();
-            InputHdcpEnableFeedback[InputNames[port]].FireUpdate();
-        }
-
-        public void EnableAutoRoute()
-        {
-            if (_Chassis.NumberOfInputs != 1) return;
-
-            if (_Chassis4x1 == null) return;
-
-            _Chassis4x1.AutoModeOn();
-        }
-
-        public void DisableAutoRoute()
-        {
-            if (_Chassis.NumberOfInputs != 1) return;
-
-            if (_Chassis4x1 == null) return;
-
-            _Chassis4x1.AutoModeOff();
-        }
-
-        #region PostActivate
-
-        public void AddFeedbackCollections()
-        {
-            AddCollectionsToList(VideoInputSyncFeedbacks, InputHdcpEnableFeedback);
-            AddCollectionsToList(VideoOutputRouteFeedbacks);
-            AddCollectionsToList(InputNameFeedbacks, OutputNameFeedbacks, OutputRouteNameFeedbacks, DeviceNameFeedback);
-        }
-
-        #endregion
-
-        #region FeedbackCollection Methods
-
-        //Add arrays of collections
-        public void AddCollectionsToList(params FeedbackCollection<BoolFeedback>[] newFbs)
-        {
-            foreach (FeedbackCollection<BoolFeedback> fbCollection in newFbs)
-            {
-                foreach (var item in newFbs)
-                {
-                    AddCollectionToList(item);
-                }
-            }
-        }
-        public void AddCollectionsToList(params FeedbackCollection<IntFeedback>[] newFbs)
-        {
-            foreach (FeedbackCollection<IntFeedback> fbCollection in newFbs)
-            {
-                foreach (var item in newFbs)
-                {
-                    AddCollectionToList(item);
-                }
-            }
-        }
-
-        public void AddCollectionsToList(params FeedbackCollection<StringFeedback>[] newFbs)
-        {
-            foreach (FeedbackCollection<StringFeedback> fbCollection in newFbs)
-            {
-                foreach (var item in newFbs)
-                {
-                    AddCollectionToList(item);
-                }
-            }
-        }
-
-        //Add Collections
-        public void AddCollectionToList(FeedbackCollection<BoolFeedback> newFbs)
-        {
-            foreach (var f in newFbs)
-            {
-                if (f == null) continue;
-
-                AddFeedbackToList(f);
-            }
-        }
-
-        public void AddCollectionToList(FeedbackCollection<IntFeedback> newFbs)
-        {
-            foreach (var f in newFbs)
-            {
-                if (f == null) continue;
-
-                AddFeedbackToList(f);
-            }
-        }
-
-        public void AddCollectionToList(FeedbackCollection<StringFeedback> newFbs)
-        {
-            foreach (var f in newFbs)
-            {
-                if (f == null) continue;
-
-                AddFeedbackToList(f);
-            }
-        }
-
-        //Add Individual Feedbacks
-        public void AddFeedbackToList(PepperDash.Essentials.Core.Feedback newFb)
-        {
-            if (newFb == null) return;
-
-            if (!Feedbacks.Contains(newFb))
-            {
-                Feedbacks.Add(newFb);
-            }
-        }
-
-        #endregion
-
-        #region IRouting Members
-
-        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
-        {
-            // Try to make switch only when necessary.  The unit appears to toggle when already selected.
-            var current = _Chassis.HdmiOutputs[(uint)outputSelector].VideoOut;
-            if (current != _Chassis.HdmiInputs[(uint)inputSelector])
-                _Chassis.HdmiOutputs[(uint)outputSelector].VideoOut = _Chassis.HdmiInputs[(uint)inputSelector];
-        }
-
-        #endregion
-
-        #endregion
-
-        #region Bridge Linking
-
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            var joinMap = new HdMdNxM4kEControllerJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<HdMdNxM4kEControllerJoinMap>(joinMapSerialized);
-
-            bridge.AddJoinMap(Key, joinMap);
-
-            IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-            DeviceNameFeedback[this.Name].LinkInputSig(trilist.StringInput[joinMap.Name.JoinNumber]);
-
-            if (_Chassis4x1 != null)
-            {
-                AutoRouteFeedback[this.Name + "-" + InputNames[1]].LinkInputSig(trilist.BooleanInput[joinMap.EnableAutoRoute.JoinNumber]);
-                AutoRouteFeedback[this.Name + "-" + InputNames[1]].LinkComplementInputSig(trilist.BooleanInput[joinMap.DisableAutoRoute.JoinNumber]);
-            }
-
-            for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
-            {
-                var joinIndex = i - 1;
-                //Digital
-                VideoInputSyncFeedbacks[InputNames[i]].LinkInputSig(trilist.BooleanInput[joinMap.InputSync.JoinNumber + joinIndex]);
-                InputHdcpEnableFeedback[InputNames[i]].LinkInputSig(trilist.BooleanInput[joinMap.EnableInputHdcp.JoinNumber + joinIndex]);
-                InputHdcpEnableFeedback[InputNames[i]].LinkComplementInputSig(trilist.BooleanInput[joinMap.DisableInputHdcp.JoinNumber + joinIndex]);
-                trilist.SetSigTrueAction(joinMap.EnableInputHdcp.JoinNumber + joinIndex, () => EnableHdcp(i));
-                trilist.SetSigTrueAction(joinMap.DisableInputHdcp.JoinNumber + joinIndex, () => DisableHdcp(i));
-
-                //Serial
-                InputNameFeedbacks[InputNames[i]].LinkInputSig(trilist.StringInput[joinMap.InputName.JoinNumber + joinIndex]);
-            }
-
-            for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
-            {
-                var joinIndex = i - 1;
-                //Analog
-                VideoOutputRouteFeedbacks[OutputNames[i]].LinkInputSig(trilist.UShortInput[joinMap.OutputRoute.JoinNumber + joinIndex]);
-                trilist.SetUShortSigAction(joinMap.OutputRoute.JoinNumber + joinIndex, (a) => ExecuteSwitch(a, i, eRoutingSignalType.AudioVideo));
-
-                //Serial
-                OutputNameFeedbacks[OutputNames[i]].LinkInputSig(trilist.StringInput[joinMap.OutputName.JoinNumber + joinIndex]);
-                OutputRouteNameFeedbacks[OutputNames[i]].LinkInputSig(trilist.StringInput[joinMap.OutputRoutedName.JoinNumber + joinIndex]);
-            }
-
-            _Chassis.OnlineStatusChange += new Crestron.SimplSharpPro.OnlineStatusChangeEventHandler(Chassis_OnlineStatusChange);
-
-            trilist.OnlineStatusChange += new Crestron.SimplSharpPro.OnlineStatusChangeEventHandler((d, args) =>
-            {
-                if (args.DeviceOnLine)
-                {
-                    foreach (var feedback in Feedbacks)
-                    {
-                        feedback.FireUpdate();
-                    }
-                }
-            });
-        }
-
-
-        #endregion
-
-        #region Events
-
-        void Chassis_OnlineStatusChange(Crestron.SimplSharpPro.GenericBase currentDevice, Crestron.SimplSharpPro.OnlineOfflineEventArgs args)
-        {
-            if (args.DeviceOnLine)
-            {
-                for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
-                {
-                    _Chassis.Inputs[i].Name.StringValue = InputNames[i];
-                }
-                for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
-                {
-                    _Chassis.Outputs[i].Name.StringValue = OutputNames[i];
-                }
-
-                foreach (var feedback in Feedbacks)
-                {
-                    feedback.FireUpdate();
-                }
-            }
-            
-        }
-
-        void Chassis_DMOutputChange(Switch device, DMOutputEventArgs args)
-        {
-            if (args.EventId == DMOutputEventIds.VideoOutEventId)
-            {
-                foreach (var item in VideoOutputRouteFeedbacks)
-                {
-                    item.FireUpdate();
-                }
-            }
-        }
-
-        void Chassis_DMInputChange(Switch device, DMInputEventArgs args)
-        {
-            if (args.EventId == DMInputEventIds.VideoDetectedEventId)
-            {
-                foreach (var item in VideoInputSyncFeedbacks)
-                {
-                    item.FireUpdate();
-                }
-            }
-        }
-
-        #endregion
-
-        #region Factory
-
-        public class HdMdNxM4kEControllerFactory : EssentialsDeviceFactory<HdMdNxM4kEBridgeableController>
-        {
-            public HdMdNxM4kEControllerFactory()
-            {
-                TypeNames = new List<string>() { "hdmd4x14ke-bridgeable", "hdmd4x24ke", "hdmd6x24ke" };
-            }
-
-            public override EssentialsDevice BuildDevice(DeviceConfig dc)
-            {
-                Debug.Console(1, "Factory Attempting to create new HD-MD-NxM-4K-E Device");
-
-                var props = JsonConvert.DeserializeObject<HdMdNxM4kEBridgeablePropertiesConfig>(dc.Properties.ToString());
-
-                var type = dc.Type.ToLower();
-                var control = props.Control;
-                var ipid = control.IpIdInt;
-                var address = control.TcpSshProperties.Address;
-
-                switch (type)
-                {
-                    case ("hdmd4x14ke-bridgeable"):
-                        return new HdMdNxM4kEBridgeableController(dc.Key, dc.Name, new HdMd4x14kE(ipid, address, Global.ControlSystem), props);
-                    case ("hdmd4x24ke"):
-                        return new HdMdNxM4kEBridgeableController(dc.Key, dc.Name, new HdMd4x24kE(ipid, address, Global.ControlSystem), props);
-                    case ("hdmd6x24ke"):
-                        return new HdMdNxM4kEBridgeableController(dc.Key, dc.Name, new HdMd6x24kE(ipid, address, Global.ControlSystem), props);
-                    default:
-                        return null;
-                }
-            }
-        }
-
-        #endregion
- 
-    }
-}

essentials-framework/Essentials DM/Essentials_DM/Chassis/HdMdNxM4kEController.cs

@@ -1,128 +1,125 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DM;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM.Config;
-
-namespace PepperDash.Essentials.DM.Chassis
-{
-    public class HdMdNxM4kEController : Device, IRoutingInputsOutputs, IRouting
-    {
-        public HdMdNxM Chassis { get; private set; }
-
-        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="name"></param>
-        /// <param name="chassis"></param>
-        public HdMdNxM4kEController(string key, string name, HdMdNxM chassis,
-            HdMdNxM4kEPropertiesConfig props)
-            : base(key, name)
-        {
-            Chassis = chassis;
-
-            // logical ports
-            InputPorts = new RoutingPortCollection<RoutingInputPort>();
-            for (uint i = 1; i <= 4; i++)
-            {
-                InputPorts.Add(new RoutingInputPort("hdmiIn" + i, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                    eRoutingPortConnectionType.Hdmi, i, this));
-            }
-            OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-            OutputPorts.Add(new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.Hdmi, null, this));
-
-            // physical settings
-            if (props != null && props.Inputs != null)
-            {
-                foreach (var kvp in props.Inputs)
-                {
-                    // strip "hdmiIn"
-                    var inputNum = Convert.ToUInt32(kvp.Key.Substring(6));
-
-                    var port = chassis.HdmiInputs[inputNum].HdmiInputPort;
-                    // set hdcp disables
-                    if (kvp.Value.DisableHdcp)
-                    {
-                        Debug.Console(0, this, "Configuration disables HDCP support on {0}", kvp.Key);
-                        port.HdcpSupportOff();
-                    }
-                    else
-                        port.HdcpSupportOn();
-                }
-            }
-        }
-
-        public override bool CustomActivate()
-        {
-            var result = Chassis.Register();
-            if (result != Crestron.SimplSharpPro.eDeviceRegistrationUnRegistrationResponse.Success)
-            {
-                Debug.Console(0, this, "Device registration failed: {0}", result);
-                return false;
-            }
-
-            return base.CustomActivate();
-        }
-
-
-
-        #region IRouting Members
-
-        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
-        {
-            // Try to make switch only when necessary.  The unit appears to toggle when already selected.
-            var current = Chassis.HdmiOutputs[1].VideoOut;
-            if (current != Chassis.HdmiInputs[(uint)inputSelector])
-                Chassis.HdmiOutputs[1].VideoOut = Chassis.HdmiInputs[(uint)inputSelector];
-        }
-
-        #endregion
-
-        /////////////////////////////////////////////////////
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="name"></param>
-        /// <param name="type"></param>
-        /// <param name="properties"></param>
-        /// <returns></returns>
-        public static HdMdNxM4kEController GetController(string key, string name,
-            string type, HdMdNxM4kEPropertiesConfig properties)
-        {
-            try
-            {
-                var ipid = properties.Control.IpIdInt;
-                var address = properties.Control.TcpSshProperties.Address;
-
-                type = type.ToLower();
-                if (type == "hdmd4x14ke")
-                {
-                    Debug.Console(0, @"The 'hdmd4x14ke' device is not an Essentials Bridgeable device.  
-                        If an essentials Bridgeable Device is required, use the 'hdmd4x14ke-bridgeable' type");
-  
-                    var chassis = new HdMd4x14kE(ipid, address, Global.ControlSystem);
-                    return new HdMdNxM4kEController(key, name, chassis, properties);
-                }
-                return null;
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, "ERROR Creating device key {0}: \r{1}", key, e);
-                return null;
-            }
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DM;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.DM.Config;
+
+namespace PepperDash.Essentials.DM.Chassis
+{
+	public class HdMdNxM4kEController : Device, IRoutingInputsOutputs, IRouting
+	{
+		public HdMdNxM Chassis { get; private set; }
+
+		public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
+		public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="key"></param>
+		/// <param name="name"></param>
+		/// <param name="chassis"></param>
+		public HdMdNxM4kEController(string key, string name, HdMdNxM chassis, 
+			HdMdNxM4kEPropertiesConfig props)
+			: base(key, name)
+		{
+			Chassis = chassis;
+
+			// logical ports
+			InputPorts = new RoutingPortCollection<RoutingInputPort>();
+			for (uint i = 1; i <= 4; i++)
+			{
+				InputPorts.Add(new RoutingInputPort("hdmiIn" + i, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+					eRoutingPortConnectionType.Hdmi, i, this));
+			}
+			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
+			OutputPorts.Add(new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+				eRoutingPortConnectionType.Hdmi, null, this));
+
+			// physical settings
+			if (props != null && props.Inputs != null)
+			{
+				foreach (var kvp in props.Inputs)
+				{
+					// strip "hdmiIn"
+					var inputNum =  Convert.ToUInt32(kvp.Key.Substring(6));
+
+					var port = chassis.HdmiInputs[inputNum].HdmiInputPort;
+					// set hdcp disables
+					if (kvp.Value.DisableHdcp)
+					{
+						Debug.Console(0, this, "Configuration disables HDCP support on {0}", kvp.Key);
+						port.HdcpSupportOff();
+					}
+					else
+						port.HdcpSupportOn();
+				}
+			}
+		}
+
+		public override bool CustomActivate()
+		{
+			var result = Chassis.Register();
+			if (result != Crestron.SimplSharpPro.eDeviceRegistrationUnRegistrationResponse.Success)
+			{
+				Debug.Console(0, this, "Device registration failed: {0}", result);
+				return false;
+			}
+
+			return base.CustomActivate();
+		}
+
+
+
+		#region IRouting Members
+
+		public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
+		{
+			// Try to make switch only when necessary.  The unit appears to toggle when already selected.
+			var current = Chassis.HdmiOutputs[1].VideoOut;
+			if(current != Chassis.HdmiInputs[(uint)inputSelector])
+				Chassis.HdmiOutputs[1].VideoOut = Chassis.HdmiInputs[(uint)inputSelector];
+		}
+
+		#endregion
+
+		/////////////////////////////////////////////////////
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="key"></param>
+		/// <param name="name"></param>
+		/// <param name="type"></param>
+		/// <param name="properties"></param>
+		/// <returns></returns>
+		public static HdMdNxM4kEController GetController(string key, string name,
+			string type, HdMdNxM4kEPropertiesConfig properties)
+		{
+			try
+			{
+				var ipid = properties.Control.IpIdInt;
+				var address = properties.Control.TcpSshProperties.Address;
+
+				type = type.ToLower();
+				if (type == "hdmd4x14ke")
+				{
+					var chassis = new HdMd4x14kE(ipid, address, Global.ControlSystem);
+					return new HdMdNxM4kEController(key, name, chassis, properties);
+				}
+				return null;
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, "ERROR Creating device key {0}: \r{1}", key, e);
+				return null;
+			}
+		}
+	}
 }

essentials-framework/Essentials DM/Essentials_DM/Config/HdMdNxM4kEPropertiesConfig.cs

@@ -8,28 +8,16 @@ using Newtonsoft.Json;
 using PepperDash.Core;
 
 namespace PepperDash.Essentials.DM.Config
-{
-    /// <summary>
-    /// Defines the properties section of HdMdNxM boxes
-    /// </summary>
-    public class HdMdNxM4kEPropertiesConfig
-    {
-        [JsonProperty("control")]
-        public ControlPropertiesConfig Control { get; set; }
-
-        [JsonProperty("inputs")]
-        public Dictionary<string, InputPropertiesConfig> Inputs { get; set; }
-    }
-
-    public class HdMdNxM4kEBridgeablePropertiesConfig
-    {
-        [JsonProperty("control")]
-        public ControlPropertiesConfig Control { get; set; }
-
-        [JsonProperty("inputs")]
-        public Dictionary<uint, string> Inputs { get; set; }
-
-        [JsonProperty("outputs")]
-        public Dictionary<uint, string> Outputs { get; set; }
-    }
+{
+	/// <summary>
+	/// Defines the properties section of HdMdNxM boxes
+	/// </summary>
+	public class HdMdNxM4kEPropertiesConfig
+	{
+		[JsonProperty("control")]
+		public ControlPropertiesConfig Control { get; set; }
+
+		[JsonProperty("inputs")]
+		public Dictionary<string, InputPropertiesConfig> Inputs { get; set; }
+	}
 }

essentials-framework/Essentials DM/Essentials_DM/Config/InputPropertiesConfig.cs

@@ -1,16 +1,15 @@
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.DM.Config
-{
-    public class InputPropertiesConfig
-    {
-        public string Name { get; set; }
-
-        public bool DisableHdcp { get; set; }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.DM.Config
+{
+	public class InputPropertiesConfig
+	{
+		public string Name { get; set; }
+
+		public bool DisableHdcp { get; set; }
+	}
 }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc100SController.cs

@@ -1,12 +1,10 @@
-using System;
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
 using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
 
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.DM.Config;
 
 namespace PepperDash.Essentials.DM
 {
@@ -17,7 +15,7 @@ namespace PepperDash.Essentials.DM
     public class DmRmc100SController : DmRmcControllerBase, IRoutingInputsOutputs,
         IIROutputPorts, IComPorts, ICec
     {
-        private DmRmc100S _rmc;
+        private readonly DmRmc100S _rmc;
 
         public RoutingInputPort DmIn { get; private set; }
         public RoutingOutputPort HdmiOut { get; private set; }
@@ -34,63 +32,13 @@ namespace PepperDash.Essentials.DM
         {
             _rmc = rmc;
 
-            InitializeRouting();
-        }
-
-        /// <summary>
-        /// Defers creation of the actual hardware until the Preactivation phase
-        /// </summary>
-        /// <param name="key">Device Key</param>
-        /// <param name="name">Device Name</param>
-        /// <param name="props">Config from file</param>
-        /// <param name="preActivationFunc">Function to run to get the DM Chassis</param>
-        public DmRmc100SController(string key, string name, DmRmcPropertiesConfig props, Func<string, string, IDmSwitch> preActivationFunc ):base(key, name)
-        {
-            AddPreActivationAction(() =>
-            {
-                var dmSwitch = preActivationFunc(Key, props.ParentDeviceKey);
-
-                var chassis = dmSwitch.Chassis;
-
-                var dmOut = DmRmcHelper.AddRmcAndGetDmOutput(Key, props.ParentOutputNumber, dmSwitch);
-
-                if (chassis is DmMd8x8Cpu3 || chassis is DmMd16x16Cpu3 ||
-                    chassis is DmMd32x32Cpu3 || chassis is DmMd8x8Cpu3rps ||
-                    chassis is DmMd16x16Cpu3rps || chassis is DmMd32x32Cpu3rps ||
-                    chassis is DmMd128x128 || chassis is DmMd64x64)
-                {
-
-                    _rmc = new DmRmc100S(dmOut);
-                }
-                else
-                {
-                    _rmc = new DmRmc100S(props.Control.IpIdInt, dmOut);    
-                }
-
-                SetBaseClassRmcs();
-
-                InitializeRouting();
-            });
-        }
-
-        private void SetBaseClassRmcs()
-        {
-            //Set Rmc in DmRmcControllerBase Class
-            SetRmc(_rmc);
-
-            //Set Rmc In CrestronGenericBaseDevice
-            SetHardwareAndRegisterEvents(_rmc);
-        }
-
-        private void InitializeRouting()
-        {
             DmIn = new RoutingInputPort(DmPortName.DmIn, eRoutingSignalType.AudioVideo,
                 eRoutingPortConnectionType.DmCat, 0, this);
             HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.Hdmi, null, this) { Port = _rmc };
+                eRoutingPortConnectionType.Hdmi, null, this) {Port = _rmc};
 
-            InputPorts = new RoutingPortCollection<RoutingInputPort> { DmIn };
-            OutputPorts = new RoutingPortCollection<RoutingOutputPort> { HdmiOut };
+            InputPorts = new RoutingPortCollection<RoutingInputPort> {DmIn};
+            OutputPorts = new RoutingPortCollection<RoutingOutputPort> {HdmiOut};
         }
 
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs

@@ -15,7 +15,7 @@ namespace PepperDash.Essentials.DM
     [Description("Wrapper class for all DM-RMC variants")]
 	public abstract class DmRmcControllerBase : CrestronGenericBridgeableBaseDevice
     {
-        private EndpointReceiverBase _rmc; //kept here just in case. Only property or method on this class that's not device-specific is the DMOutput that it's attached to.
+        private readonly EndpointReceiverBase _rmc; //kept here just in case. Only property or method on this class that's not device-specific is the DMOutput that it's attached to.
 
         public StringFeedback VideoOutputResolutionFeedback { get; protected set; }
         public StringFeedback EdidManufacturerFeedback { get; protected set; }
@@ -26,20 +26,10 @@ namespace PepperDash.Essentials.DM
         protected DmRmcControllerBase(string key, string name, EndpointReceiverBase device)
 			: base(key, name, device)
         {
-            SetRmc(device);
-        }
-
-        protected DmRmcControllerBase(string key, string name):base(key, name)
-        {
-            
-        }
-
-        protected void SetRmc(EndpointReceiverBase rmc)
-        {
-            _rmc = rmc;
-            // if wired to a chassis, skip registration step in base class
+            _rmc = device;
+			// if wired to a chassis, skip registration step in base class
             PreventRegistration = _rmc.DMOutput != null;
-
+			
             AddToFeedbackList(VideoOutputResolutionFeedback, EdidManufacturerFeedback, EdidSerialNumberFeedback, EdidNameFeedback, EdidPreferredTimingFeedback);
         }
 
@@ -92,16 +82,6 @@ namespace PepperDash.Essentials.DM
         /// </summary>
         protected DmHdBaseTControllerBase(string key, string name, HDBaseTBase rmc)
             : base(key, name, rmc)
-        {
-            SetRmc(rmc);
-        }
-
-        protected DmHdBaseTControllerBase(string key, string name) : base(key, name)
-        {
-            
-        }
-
-        protected void SetRmc(HDBaseTBase rmc)
         {
             Rmc = rmc;
         }
@@ -110,11 +90,9 @@ namespace PepperDash.Essentials.DM
 	public class DmRmcHelper
 	{
 	    private static readonly Dictionary<string, Func<string, string, uint, CrestronGenericBaseDevice>> ProcessorFactoryDict;
+	    private static readonly Dictionary<string, Func<string, string, DMOutput, CrestronGenericBaseDevice>> ChassisCpu3Dict;
 
-	    private static readonly
-	        Dictionary
-	            <string,
-	                Func<string, string, DmRmcPropertiesConfig, Func<string, string, IDmSwitch>, CrestronGenericBaseDevice>>
+	    private static readonly Dictionary<string, Func<string, string, uint, DMOutput, CrestronGenericBaseDevice>>
 	        ChassisDict; 
 
 	    static DmRmcHelper()
@@ -149,10 +127,10 @@ namespace PepperDash.Essentials.DM
 	            }
 	        };
 
-            /*ChassisCpu3Dict = new Dictionary<string, Func<string, string, DMOutput, CrestronGenericBaseDevice>>
+            ChassisCpu3Dict = new Dictionary<string, Func<string, string, DMOutput, CrestronGenericBaseDevice>>
 	        {
 	            {"dmrmc100c", (k, n, d) => new DmRmcX100CController(k, n, new DmRmc100C(d))},
-	            {"dmrmc100s", (k, n, d) => new DmRmc100SController(k, n, d)},
+	            {"dmrmc100s", (k, n, d) => new DmRmc100SController(k, n, new DmRmc100S(d))},
 	            {"dmrmc4k100c", (k, n, d) => new DmRmcX100CController(k, n, new DmRmc4k100C(d))},
 	            {"dmrmc4kz100c", (k, n, d) => new DmRmc4kZ100CController(k, n, new DmRmc4kz100C(d))},
 	            {"dmrmc150s", (k, n, d) => new DmRmc150SController(k, n, new DmRmc150S(d))},
@@ -179,48 +157,40 @@ namespace PepperDash.Essentials.DM
 	            },
                 {"hdbasetrx", (k,n,d) => new HDBaseTRxController(k,n, new HDRx3CB(d))},
                 {"dmrmc4k100c1g", (k,n,d) => new DmRmc4k100C1GController(k,n, new DmRmc4K100C1G(d))}
-	        };*/
-
-	        ChassisDict = new Dictionary
-	            <string,
-	                Func<string, string, DmRmcPropertiesConfig, Func<string, string, IDmSwitch>, CrestronGenericBaseDevice>
-	                >
-	        {
-	            {"dmrmc100s", (k, n, p, f) => new DmRmc100SController(k, n, p, f)}
 	        };
 
-	        /*ChassisDict = new Dictionary<string, Func<string, string, uint, DMOutput, CrestronGenericBaseDevice>>
+            ChassisDict = new Dictionary<string, Func<string, string, uint, DMOutput, CrestronGenericBaseDevice>>
 	        {
-	            {"dmrmc100c", (k, n, i, d) => new DmRmcX100CController(k, n, new DmRmc100C(i, d))},
-	            {"dmrmc100s", (k, n, i, d) => new DmRmc100SController(k, n, i, d)},
-	            {"dmrmc4k100c", (k, n, i, d) => new DmRmcX100CController(k, n, new DmRmc4k100C(i, d))},
-	            {"dmrmc4kz100c", (k, n, i, d) => new DmRmc4kZ100CController(k, n, new DmRmc4kz100C(i, d))},
-	            {"dmrmc150s", (k, n, i, d) => new DmRmc150SController(k, n, new DmRmc150S(i, d))},
-	            {"dmrmc200c", (k, n, i, d) => new DmRmc200CController(k, n, new DmRmc200C(i, d))},
-	            {"dmrmc200s", (k, n, i, d) => new DmRmc200SController(k, n, new DmRmc200S(i, d))},
-	            {"dmrmc200s2", (k, n, i, d) => new DmRmc200S2Controller(k, n, new DmRmc200S2(i, d))},
-	            {"dmrmcscalerc", (k, n, i, d) => new DmRmcScalerCController(k, n, new DmRmcScalerC(i, d))},
-	            {"dmrmcscalers", (k, n, i, d) => new DmRmcScalerSController(k, n, new DmRmcScalerS(i, d))},
+	            {"dmrmc100c", (k, n, i, d) => new DmRmcX100CController(k, n, new DmRmc100C(i,d))},
+	            {"dmrmc100s", (k, n,i, d) => new DmRmc100SController(k, n, new DmRmc100S(i,d))},
+	            {"dmrmc4k100c", (k, n,i, d) => new DmRmcX100CController(k, n, new DmRmc4k100C(i,d))},
+	            {"dmrmc4kz100c", (k, n,i, d) => new DmRmc4kZ100CController(k, n, new DmRmc4kz100C(i,d))},
+	            {"dmrmc150s", (k, n,i, d) => new DmRmc150SController(k, n, new DmRmc150S(i,d))},
+	            {"dmrmc200c", (k, n,i, d) => new DmRmc200CController(k, n, new DmRmc200C(i,d))},
+	            {"dmrmc200s", (k, n,i, d) => new DmRmc200SController(k, n, new DmRmc200S(i,d))},
+	            {"dmrmc200s2", (k, n,i, d) => new DmRmc200S2Controller(k, n, new DmRmc200S2(i,d))},
+	            {"dmrmcscalerc", (k, n,i, d) => new DmRmcScalerCController(k, n, new DmRmcScalerC(i,d))},
+	            {"dmrmcscalers", (k, n,i, d) => new DmRmcScalerSController(k, n, new DmRmcScalerS(i,d))},
 	            {
 	                "dmrmcscalers2",
-	                (k, n, i, d) => new DmRmcScalerS2Controller(k, n, new DmRmcScalerS2(d))
+	                (k, n,i, d) => new DmRmcScalerS2Controller(k, n, new DmRmcScalerS2(d))
 	            },
 	            {
 	                "dmrmc4kscalerc",
-	                (k, n, i, d) => new DmRmc4kScalerCController(k, n, new DmRmc4kScalerC(d))
+	                (k, n,i, d) => new DmRmc4kScalerCController(k, n, new DmRmc4kScalerC(d))
 	            },
 	            {
 	                "dmrmc4kscalercdsp",
-	                (k, n, i, d) => new DmRmc4kScalerCDspController(k, n, new DmRmc4kScalerCDsp(d))
+	                (k, n,i, d) => new DmRmc4kScalerCDspController(k, n, new DmRmc4kScalerCDsp(d))
 	            },
 	            {
 	                "dmrmc4kzscalerc",
-	                (k, n, i, d) => new DmRmc4kZScalerCController(k, n, new DmRmc4kzScalerC(d))
+	                (k, n,i, d) => new DmRmc4kZScalerCController(k, n, new DmRmc4kzScalerC(d))
 	            },
-	            {"hdbasetrx", (k, n, i, d) => new HDBaseTRxController(k, n, new HDRx3CB(d))},
-	            {"dmrmc4k100c1g", (k, n, i, d) => new DmRmc4k100C1GController(k, n, new DmRmc4K100C1G(d))}
-	        };*/
-	    }
+                {"hdbasetrx", (k,n,i,d) => new HDBaseTRxController(k,n, new HDRx3CB(d))},
+                {"dmrmc4k100c1g", (k,n,i,d) => new DmRmc4k100C1GController(k,n, new DmRmc4K100C1G(d))}
+	        };
+        }
 	    /// <summary>
 	    /// A factory method for various DmRmcControllers
 	    /// </summary>
@@ -237,20 +207,74 @@ namespace PepperDash.Essentials.DM
 			var pKey = props.ParentDeviceKey.ToLower();
 
 			// Non-DM-chassis endpoints
-			return pKey == "processor" ? GetDmRmcControllerForProcessor(key, name, typeName, ipid) : GetDmRmcControllerForChassis(key, name, typeName, props);
+			return pKey == "processor" ? GetDmRmcControllerForProcessor(key, name, typeName, ipid) : GetDmRmcControllerForChassis(key, name, typeName, props, pKey, ipid);
 		}
 
 	    private static CrestronGenericBaseDevice GetDmRmcControllerForChassis(string key, string name, string typeName,
-	        DmRmcPropertiesConfig props)
+	        DmRmcPropertiesConfig props, string pKey, uint ipid)
 	    {
-	        Func<string, string, DmRmcPropertiesConfig, Func<string, string, IDmSwitch>, CrestronGenericBaseDevice> handler;
-
-	        if (ChassisDict.TryGetValue(typeName.ToLower(), out handler))
+	        var parentDev = DeviceManager.GetDeviceForKey(pKey);
+	        if (!(parentDev is IDmSwitch))
 	        {
-	            return handler(key, name, props, GetDmSwitch);
+	            Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a DM Chassis.",
+	                key, pKey);
+	            return null;
 	        }
 
-	        Debug.Console(0, "Cannot create DM-RMC of type '{0}' with parent device {1}", typeName, props.ParentDeviceKey);
+	        var chassis = (parentDev as IDmSwitch).Chassis;
+	        var num = props.ParentOutputNumber;
+
+	        if (num <= 0 || num > chassis.NumberOfOutputs)
+	        {
+	            Debug.Console(0, "Cannot create DM device '{0}'. Output number '{1}' is out of range",
+	                key, num);
+	            return null;
+	        }
+
+	        var controller = parentDev as IDmSwitch;
+	        controller.RxDictionary.Add(num, key);
+	        // Catch constructor failures, mainly dues to IPID
+	        try
+	        {
+	            // Must use different constructor for CPU3 chassis types. No IPID
+	            if (chassis is DmMd8x8Cpu3 || chassis is DmMd16x16Cpu3 ||
+	                chassis is DmMd32x32Cpu3 || chassis is DmMd8x8Cpu3rps ||
+	                chassis is DmMd16x16Cpu3rps || chassis is DmMd32x32Cpu3rps ||
+	                chassis is DmMd128x128 || chassis is DmMd64x64)
+	            {
+	                return GetDmRmcControllerForCpu3Chassis(key, name, typeName, chassis, num, parentDev);
+	            }
+
+	            return GetDmRmcControllerForCpu2Chassis(key, name, typeName, ipid, chassis, num, parentDev);
+	        }
+	        catch (Exception e)
+	        {
+	            Debug.Console(0, "[{0}] WARNING: Cannot create DM-RMC device: {1}", key, e.Message);
+	            return null;
+	        }
+	    }
+
+	    private static CrestronGenericBaseDevice GetDmRmcControllerForCpu2Chassis(string key, string name, string typeName,
+	        uint ipid, Switch chassis, uint num, IKeyed parentDev)
+	    {
+	        Func<string, string, uint, DMOutput, CrestronGenericBaseDevice> handler;
+	        if (ChassisDict.TryGetValue(typeName.ToLower(), out handler))
+	        {
+	            return handler(key, name, ipid, chassis.Outputs[num]);
+	        }
+	        Debug.Console(0, "Cannot create DM-RMC of type '{0}' with parent device {1}", typeName, parentDev.Key);
+	        return null;
+	    }
+
+	    private static CrestronGenericBaseDevice GetDmRmcControllerForCpu3Chassis(string key, string name, string typeName,
+	        Switch chassis, uint num, IKeyed parentDev)
+	    {
+	        Func<string, string, DMOutput, CrestronGenericBaseDevice> cpu3Handler;
+	        if (ChassisCpu3Dict.TryGetValue(typeName.ToLower(), out cpu3Handler))
+	        {
+	            return cpu3Handler(key, name, chassis.Outputs[num]);
+	        }
+	        Debug.Console(0, "Cannot create DM-RMC of type '{0}' with parent device {1}", typeName, parentDev.Key);
 	        return null;
 	    }
 
@@ -274,34 +298,6 @@ namespace PepperDash.Essentials.DM
                 return null;
 	        }
 	    }
-
-	    public static IDmSwitch GetDmSwitch(string key, string pKey)
-	    {
-            var parentDev = DeviceManager.GetDeviceForKey(pKey) as IDmSwitch;
-
-	        if (parentDev != null)
-	        {
-	            return parentDev;
-	        }
-
-	        Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a DM Chassis.",
-	            key, pKey);
-	        return null;
-	    }
-
-	    public static DMOutput AddRmcAndGetDmOutput(string key, uint output, IDmSwitch dmSwitch)
-	    {
-	        var chassis = dmSwitch.Chassis;
-
-            if (output <= 0 || output > chassis.NumberOfOutputs)
-            {
-                Debug.Console(0, "Cannot add DM device '{0}' to switch '{2}'. Output number '{1}' is out of range",
-                    key, output, dmSwitch);
-            }
-            dmSwitch.RxDictionary.Add(output, key);
-
-	        return dmSwitch.Chassis.Outputs[output];
-	    }
 	}
 
     public class DmRmcControllerFactory : EssentialsDeviceFactory<DmRmcControllerBase>

essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj

@@ -0,0 +1,159 @@
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9199CE8A-0C9F-4952-8672-3EED798B284F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PepperDash.Essentials.DM</RootNamespace>
+    <AssemblyName>PepperDash_Essentials_DM</AssemblyName>
+    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
+    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
+    <OSVersion>5.0</OSVersion>
+    <DeployDirSuffix>SmartDeviceProject1</DeployDirSuffix>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <NativePlatformName>Windows CE</NativePlatformName>
+    <FormFactorID>
+    </FormFactorID>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <FileAlignment>512</FileAlignment>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <FileAlignment>512</FileAlignment>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
+    </Reference>
+    <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+    </Reference>
+    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AirMedia\AirMediaPropertiesConfig.cs" />
+    <Compile Include="AirMedia\AirMediaController.cs" />
+    <Compile Include="Chassis\DmBladeChassisController.cs" />
+    <Compile Include="Chassis\DmCardAudioOutput.cs" />
+    <Compile Include="Chassis\DmChassisController.cs" />
+    <Compile Include="Chassis\DmpsAudioOutputController.cs" />
+    <Compile Include="Chassis\DmpsInternalVirtualDmTxController.cs" />
+    <Compile Include="Chassis\DmpsRoutingController.cs" />
+    <Compile Include="Chassis\HdMdNxM4kEController.cs" />
+    <Compile Include="Endpoints\Transmitters\TxInterfaces.cs" />
+    <Compile Include="IDmSwitch.cs" />
+    <Compile Include="Config\DmpsRoutingConfig.cs" />
+    <Compile Include="Config\DmRmcConfig.cs" />
+    <Compile Include="Config\DmTxConfig.cs" />
+    <Compile Include="Config\DMChassisConfig.cs" />
+    <Compile Include="Config\HdMdNxM4kEPropertiesConfig.cs" />
+    <Compile Include="Config\InputPropertiesConfig.cs" />
+    <Compile Include="DmPortName.cs" />
+    <Compile Include="Endpoints\DGEs\DgeController.cs" />
+    <Compile Include="Endpoints\DGEs\DgePropertiesConfig.cs" />
+    <Compile Include="DmLite\HdMdxxxCEController.cs" />
+    <Compile Include="Endpoints\Receivers\DmHdBaseTEndpointController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc100SController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc150SController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc200CController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc200S2Controller.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc200SController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc4k100C1GController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc4KScalerCController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc4kScalerCDspController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmcScalerCController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmcX100CController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmcHelper.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmcScalerS2Controller.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmcScalerSController.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx200Controller.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx401CController.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx4k100Controller.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx4k202CController.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx4k302CController.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx201CController.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx4kz302CController.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTxHelpers.cs" />
+    <Compile Include="Extensions.cs" />
+    <Compile Include="Config\DeviceFactory.cs" />
+    <Compile Include="IDmHdmiInputExtensions.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="VideoStatusHelpers.cs" />
+    <None Include="app.config" />
+    <None Include="Properties\ControlSystem.cfg" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj">
+      <Project>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</Project>
+      <Name>PepperDash_Essentials_Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
+  <PropertyGroup>
+    <PostBuildEvent>rem S# Pro preparation will execute after these operations</PostBuildEvent>
+  </PropertyGroup>
+</Project>

essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj

@@ -99,9 +99,7 @@
     <Compile Include="Chassis\DmpsAudioOutputController.cs" />
     <Compile Include="Chassis\DmpsInternalVirtualDmTxController.cs" />
     <Compile Include="Chassis\DmpsRoutingController.cs" />
-    <Compile Include="Chassis\HdMdNxM4kEBridgeableController.cs" />
     <Compile Include="Chassis\HdMdNxM4kEController.cs" />
-    <Compile Include="Config\InputPropertiesConfig.cs" />
     <Compile Include="Endpoints\DGEs\DmDge200CController.cs" />
     <Compile Include="Endpoints\Receivers\DmRmc4kZ100CController.cs" />
     <Compile Include="Endpoints\Receivers\DmRmc4kZScalerCController.cs" />
@@ -114,6 +112,7 @@
     <Compile Include="Config\DmTxConfig.cs" />
     <Compile Include="Config\DMChassisConfig.cs" />
     <Compile Include="Config\HdMdNxM4kEPropertiesConfig.cs" />
+    <Compile Include="Config\InputPropertiesConfig.cs" />
     <Compile Include="DmPortName.cs" />
     <Compile Include="Endpoints\DGEs\Dge100Controller.cs" />
     <Compile Include="Endpoints\DGEs\DgePropertiesConfig.cs" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/Display/InputInterfaces.cs

@@ -12,6 +12,6 @@ namespace PepperDash.Essentials.Devices.Displays
     public interface IInputHdmi4 { void InputHdmi4(); }
     public interface IInputDisplayPort1 { void InputDisplayPort1(); }
     public interface IInputDisplayPort2 { void InputDisplayPort2(); }
-    public interface IInputVga1 { void InputVga1(); }
-
+    public interface IInputVga1 { void InputVga1(); }
+
 }