Merge branch 'development' into hotfix/program-initialization

Add bulk device add method and update Eisc

PepperDashEssentials/Bridges/EiscBridge.cs

@@ -151,12 +151,12 @@ namespace PepperDash.Essentials.Bridges
             try
             {
                 if (Debug.Level >= 1)
-                    Debug.Console(1, this, "EiscApi change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+                    Debug.Console(2, this, "EiscApi change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
                 var uo = args.Sig.UserObject;
 
                 if (uo == null) return;
 
-                Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
+                Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
                 if (uo is Action<bool>)
                     (uo as Action<bool>)(args.Sig.BoolValue);
                 else if (uo is Action<ushort>)

PepperDashEssentials/ControlSystem.cs

@@ -35,6 +35,7 @@ namespace PepperDash.Essentials
             Thread.MaxNumberOfUserThreads = 400;
             Global.ControlSystem = this;
             DeviceManager.Initialize(this);
+            SystemMonitor.ProgramInitialization.ProgramInitializationUnderUserControl = true;
         }
 
         /// <summary>
@@ -90,7 +91,12 @@ namespace PepperDash.Essentials
 
 
             if (!Debug.DoNotLoadOnNextBoot)
+            {
                 GoWithLoad();
+                return;
+            }
+
+            SystemMonitor.ProgramInitialization.ProgramInitializationComplete = true;
         }
 
         /// <summary>
@@ -168,7 +174,7 @@ namespace PepperDash.Essentials
         public void GoWithLoad()
         {
             try
-            {             
+            {
                 Debug.SetDoNotLoadOnNextBoot(false);
 
                 PluginLoader.AddProgramAssemblies();
@@ -188,11 +194,14 @@ namespace PepperDash.Essentials
 
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Folder structure verified. Loading config...");
                     if (!ConfigReader.LoadConfig2())
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Essentials Load complete with errors");
                         return;
+                    }
 
                     Load();
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Essentials load complete\r" +
-                        "-------------------------------------------------------------");
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Essentials load complete\r\n" +
+                                                                 "-------------------------------------------------------------");
                 }
                 else
                 {
@@ -211,11 +220,13 @@ namespace PepperDash.Essentials
             }
             catch (Exception e)
             {
-                Debug.Console(0, "FATAL INITIALIZE ERROR. System is in an inconsistent state:\r{0}", e);
+                Debug.Console(0, "FATAL INITIALIZE ERROR. System is in an inconsistent state:\r\n{0}", e);
+            }
+            finally
+            {
+                // Notify the OS that the program intitialization has completed
+                SystemMonitor.ProgramInitialization.ProgramInitializationComplete = true;
             }
-
-            // Notify the OS that the program intitialization has completed
-            SystemMonitor.ProgramInitialization.ProgramInitializationComplete = true;
 
         }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/GenericRelayDevice.cs

@@ -31,13 +31,14 @@ namespace PepperDash.Essentials.Core.CrestronIO
             RelayOutput = relay;
             RelayOutput.Register();
 
-            RelayOutput.StateChange += new RelayEventHandler(RelayOutput_StateChange);
+            RelayOutput.StateChange += RelayOutput_StateChange;
         }
 
         public GenericRelayDevice(string key, string name, Func<IOPortConfig, Relay> postActivationFunc,
             IOPortConfig config)
             : base(key, name)
         {
+            OutputIsOnFeedback = new BoolFeedback(() => RelayOutput.State);
 
             AddPostActivationAction(() =>
             {
@@ -46,7 +47,6 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 RelayOutput.Register();
 
                 RelayOutput.StateChange += RelayOutput_StateChange;
-
             });
         }