Merge pull request #840 from PepperDash/hotfix/PD-Core-update-initialize

Implement Initialize Method & Update PD Core

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

@@ -19,13 +19,34 @@ namespace PepperDash.Essentials.Core
         protected EssentialsDevice(string key)
             : base(key)
         {
-
+            SubscribeToActivateComplete();
         }
 
         protected EssentialsDevice(string key, string name)
             : base(key, name)
         {
+            SubscribeToActivateComplete();
+        }
 
+        private void SubscribeToActivateComplete()
+        {
+            DeviceManager.AllDevicesActivated += DeviceManagerOnAllDevicesActivated;
+        }
+
+        private void DeviceManagerOnAllDevicesActivated(object sender, EventArgs eventArgs)
+        {
+            CrestronInvoke.BeginInvoke((o) =>
+            {
+                try
+                {
+                    Initialize();
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Exception initializing device: {0}", ex.Message);
+                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stack Trace: {0}", ex.StackTrace);
+                }
+            });
         }
     }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Microphone Privacy/MicrophonePrivacyController.cs

@@ -88,11 +88,6 @@ namespace PepperDash.Essentials.Core.Privacy
             else
                 Debug.Console(0, this, "Unable to add Red LED device");
 
-            DeviceManager.AllDevicesActivated += (o, a) =>
-                {
-                    CheckPrivacyMode();
-                };
-
             AddPostActivationAction(() => {
                 PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
                 PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
@@ -103,6 +98,15 @@ namespace PepperDash.Essentials.Core.Privacy
             return base.CustomActivate();
         }
 
+        #region Overrides of Device
+
+        public override void Initialize()
+        {
+            CheckPrivacyMode();
+        }
+
+        #endregion
+
         public void SetPrivacyDevice(IPrivacy privacyDevice)
         {
             PrivacyDevice = privacyDevice;

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs

@@ -551,6 +551,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             CrestronConsole.AddNewConsoleCommand(GetPhonebook, "GetCodecPhonebook", "Triggers a refresh of the codec phonebook", ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(GetBookings, "GetCodecBookings", "Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator);
 
+            return base.CustomActivate();
+        }
+
+        #region Overrides of Device
+
+        public override void Initialize()
+        {
             var socket = Communication as ISocketStatus;
             if (socket != null)
             {
@@ -559,9 +566,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             Communication.Connect();
 
-			CommunicationMonitor.Start();
+            CommunicationMonitor.Start();
 
-            string prefix = "xFeedback register ";
+            const string prefix = "xFeedback register ";
 
             CliFeedbackRegistrationExpression =
                 prefix + "/Configuration" + Delimiter +
@@ -576,14 +583,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 prefix + "/Status/Video/Layout" + Delimiter +
                 prefix + "/Status/Video/Input/MainVideoMute" + Delimiter +
                 prefix + "/Bookings" + Delimiter +
-                prefix + "/Event/CallDisconnect" + Delimiter + 
+                prefix + "/Event/CallDisconnect" + Delimiter +
                 prefix + "/Event/Bookings" + Delimiter +
                 prefix + "/Event/CameraPresetListUpdated" + Delimiter +
-				prefix + "/Event/UserInterface/Presentation/ExternalSource/Selected/SourceIdentifier" + Delimiter;
+                prefix + "/Event/UserInterface/Presentation/ExternalSource/Selected/SourceIdentifier" + Delimiter;
-
-            return base.CustomActivate();
         }
 
+        #endregion
+
         /// <summary>
         /// Fires when initial codec sync is completed.  Used to then send commands to get call history, phonebook, bookings, etc.
         /// </summary>

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs

@@ -791,7 +791,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			CrestronConsole.AddNewConsoleCommand(s => GetBookings(), "GetZoomRoomBookings",
 				"Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator);
 
-			var socket = Communication as ISocketStatus;
+			
+
+			return base.CustomActivate();
+		}
+
+	    #region Overrides of Device
+
+	    public override void Initialize()
+	    {
+	        var socket = Communication as ISocketStatus;
 			if (socket != null)
 			{
 				socket.ConnectionChange += socket_ConnectionChange;
@@ -802,11 +811,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			Communication.Connect();
 
 			CommunicationMonitor.Start();
+	    }
 
-			return base.CustomActivate();
+	    #endregion
-		}
 
-		public void SetCommDebug(string s)
+	    public void SetCommDebug(string s)
 		{
 			if (s == "1")
 			{

packages.config

@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.0.47" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+  <package id="PepperDashCore" version="1.1.0" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
 </packages>