initial pass at fixing RMC activation issues

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

@@ -30,6 +30,18 @@ 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>();
 
@@ -135,6 +147,10 @@ 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 DM/Essentials_DM/Endpoints/Receivers/DmRmc100SController.cs

@@ -1,4 +1,5 @@
-using Crestron.SimplSharpPro;
+using System;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
 using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
@@ -15,7 +16,7 @@ namespace PepperDash.Essentials.DM
     public class DmRmc100SController : DmRmcControllerBase, IRoutingInputsOutputs,
         IIROutputPorts, IComPorts, ICec
     {
-        private readonly DmRmc100S _rmc;
+        private DmRmc100S _rmc;
 
         public RoutingInputPort DmIn { get; private set; }
         public RoutingOutputPort HdmiOut { get; private set; }
@@ -32,6 +33,44 @@ namespace PepperDash.Essentials.DM
         {
             _rmc = rmc;
 
+            InitializeRouting();
+        }
+
+        public DmRmc100SController(string key, string name, DMOutput dmOutput):base(key, name)
+        {
+            AddPreActivationAction(() =>
+            {
+                _rmc = new DmRmc100S(dmOutput);
+
+                SetBaseClassRmcs();
+
+                InitializeRouting();
+            });
+        }
+
+        public DmRmc100SController(string key, string name, uint ipId, DMOutput dmOutput) : base(key, name)
+        {
+            AddPreActivationAction(() =>
+            {
+                _rmc = new DmRmc100S(ipId, dmOutput);
+
+                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,

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 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.
+        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.
 
         public StringFeedback VideoOutputResolutionFeedback { get; protected set; }
         public StringFeedback EdidManufacturerFeedback { get; protected set; }
@@ -26,7 +26,17 @@ namespace PepperDash.Essentials.DM
         protected DmRmcControllerBase(string key, string name, EndpointReceiverBase device)
 			: base(key, name, device)
         {
-            _rmc = 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
             PreventRegistration = _rmc.DMOutput != null;
 
@@ -82,6 +92,16 @@ 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;
         }
@@ -130,7 +150,7 @@ namespace PepperDash.Essentials.DM
             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, new DmRmc100S(d))},
+	            {"dmrmc100s", (k, n, d) => new DmRmc100SController(k, n, 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))},
@@ -162,7 +182,7 @@ namespace PepperDash.Essentials.DM
 	        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, new DmRmc100S(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))},