Move some activation steps to PostActivation

This commit is contained in:
Andrew Welker
2020-07-23 08:48:05 -06:00
parent 7c4222a598
commit c7e6e0c250

View File

@@ -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);