pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 12:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move some activation steps to PostActivation

Browse Source
This commit is contained in:
Andrew Welker
2020-07-23 08:48:05 -06:00
parent 7c4222a598
commit c7e6e0c250
1 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
View File

@@ -165,24 +165,19 @@ namespace PepperDash.Essentials.Core.Fusion
{ {
// Exists. Read GUIDs // Exists. Read GUIDs
ReadGuidFile(guidFilePath); ReadGuidFile(guidFilePath);
}
if (Room.RoomOccupancy != null)
{
if (Room.OccupancyStatusProviderIsRemote)
SetUpRemoteOccupancy();
else
{
SetUpLocalOccupancy();
}
} }
CreateSymbolAndBasicSigs(IpId); CreateSymbolAndBasicSigs(IpId);
SetUpSources();
SetUpCommunitcationMonitors();
SetUpDisplay();
SetUpError();
ExecuteCustomSteps();
if (Room.RoomOccupancy != null)
{
if (Room.OccupancyStatusProviderIsRemote)
SetUpRemoteOccupancy();
else
{
SetUpLocalOccupancy();
}
}
AddPostActivationAction(() => AddPostActivationAction(() =>
{ {
@@ -192,17 +187,6 @@ namespace PepperDash.Essentials.Core.Fusion
SetUpError(); SetUpError();
ExecuteCustomSteps(); ExecuteCustomSteps();
if (Room.RoomOccupancy == null)
{
return;
}
if (Room.OccupancyStatusProviderIsRemote)
SetUpRemoteOccupancy();
else
{
SetUpLocalOccupancy();
}
FusionRVI.GenerateFileForAllFusionDevices(); FusionRVI.GenerateFileForAllFusionDevices();
GenerateGuidFile(guidFilePath); GenerateGuidFile(guidFilePath);