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

Merge branch 'main' into release/1.6.0

Browse Source
This commit is contained in:
Andrew Welker
2020-07-30 09:49:34 -07:00
committed by GitHub
parent 41aae794b6 5e24bb6cd3
commit 8d13de0e8c
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,29 +165,34 @@ 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);
SetUpSources();
SetUpCommunitcationMonitors();
SetUpDisplay();
SetUpError();
ExecuteCustomSteps();
if (Room.RoomOccupancy != null) AddPostActivationAction(() =>
{ {
if (Room.OccupancyStatusProviderIsRemote) CreateSymbolAndBasicSigs(IpId);
SetUpRemoteOccupancy(); SetUpSources();
else SetUpCommunitcationMonitors();
{ SetUpDisplay();
SetUpLocalOccupancy(); SetUpError();
} ExecuteCustomSteps();
}
FusionRVI.GenerateFileForAllFusionDevices();
GenerateGuidFile(guidFilePath);
});
// Make it so!
FusionRVI.GenerateFileForAllFusionDevices();
GenerateGuidFile(guidFilePath);
} }
catch (Exception e) catch (Exception e)
{ {