From fda888b095d561cad8c8fff0a48edcaed7a102bd Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 23 Jul 2020 08:22:27 -0600 Subject: [PATCH 1/4] fixes for activation sequence issues --- .../Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs index 2fb9db12..1db09b14 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs @@ -307,7 +307,7 @@ namespace PepperDash.Essentials.Core.Fusion } - protected virtual void CreateSymbolAndBasicSigs(uint ipId) + protected void CreateSymbolAndBasicSigs(uint ipId) { Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Creating Fusion Room symbol with GUID: {0}", RoomGuid); From 7c4222a598bb4f324e345d3fbd5c2dc98529c4a1 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 23 Jul 2020 08:30:00 -0600 Subject: [PATCH 2/4] move most init actions to PostActivationAction --- ...lsHuddleSpaceFusionSystemControllerBase.cs | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs index 1db09b14..de4c444e 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs @@ -184,10 +184,30 @@ namespace PepperDash.Essentials.Core.Fusion } } - // Make it so! - FusionRVI.GenerateFileForAllFusionDevices(); + AddPostActivationAction(() => + { + SetUpSources(); + SetUpCommunitcationMonitors(); + SetUpDisplay(); + SetUpError(); + ExecuteCustomSteps(); + + if (Room.RoomOccupancy == null) + { + return; + } + if (Room.OccupancyStatusProviderIsRemote) + SetUpRemoteOccupancy(); + else + { + SetUpLocalOccupancy(); + } + + FusionRVI.GenerateFileForAllFusionDevices(); + + GenerateGuidFile(guidFilePath); + }); - GenerateGuidFile(guidFilePath); } catch (Exception e) { From c7e6e0c250961077504aba62efd3708d04f0fc8a Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 23 Jul 2020 08:48:05 -0600 Subject: [PATCH 3/4] Move some activation steps to PostActivation --- ...lsHuddleSpaceFusionSystemControllerBase.cs | 36 ++++++------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs index de4c444e..594cae83 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs @@ -165,24 +165,19 @@ namespace PepperDash.Essentials.Core.Fusion { // Exists. Read GUIDs ReadGuidFile(guidFilePath); + } + + if (Room.RoomOccupancy != null) + { + if (Room.OccupancyStatusProviderIsRemote) + SetUpRemoteOccupancy(); + else + { + SetUpLocalOccupancy(); + } } CreateSymbolAndBasicSigs(IpId); - SetUpSources(); - SetUpCommunitcationMonitors(); - SetUpDisplay(); - SetUpError(); - ExecuteCustomSteps(); - - if (Room.RoomOccupancy != null) - { - if (Room.OccupancyStatusProviderIsRemote) - SetUpRemoteOccupancy(); - else - { - SetUpLocalOccupancy(); - } - } AddPostActivationAction(() => { @@ -192,17 +187,6 @@ namespace PepperDash.Essentials.Core.Fusion SetUpError(); ExecuteCustomSteps(); - if (Room.RoomOccupancy == null) - { - return; - } - if (Room.OccupancyStatusProviderIsRemote) - SetUpRemoteOccupancy(); - else - { - SetUpLocalOccupancy(); - } - FusionRVI.GenerateFileForAllFusionDevices(); GenerateGuidFile(guidFilePath); From 35d7c2381568675385ea52a4374d73cc5adba2ff Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 23 Jul 2020 09:10:15 -0600 Subject: [PATCH 4/4] move method to postactivation action --- .../EssentialsHuddleSpaceFusionSystemControllerBase.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs index 594cae83..52c30e19 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs @@ -177,10 +177,11 @@ namespace PepperDash.Essentials.Core.Fusion } } - CreateSymbolAndBasicSigs(IpId); + AddPostActivationAction(() => { + CreateSymbolAndBasicSigs(IpId); SetUpSources(); SetUpCommunitcationMonitors(); SetUpDisplay(); @@ -311,7 +312,7 @@ namespace PepperDash.Essentials.Core.Fusion } - protected void CreateSymbolAndBasicSigs(uint ipId) + protected virtual void CreateSymbolAndBasicSigs(uint ipId) { Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Creating Fusion Room symbol with GUID: {0}", RoomGuid);