pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-01-28 03:45:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/ecs-994' into JTA

Browse Source
This commit is contained in:
Jason T Alborough
2019-01-10 10:51:38 -05:00
parent 4f726007b8 967d281b62
commit e145bfbaee
10 changed files with 323 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
PepperDashEssentials/ControlSystem.cs
View File

@@ -212,12 +212,13 @@ namespace PepperDash.Essentials
void Load()
{
LoadDevices();
LinkSystemMonitorToAppServer();
LoadTieLines();
LoadRooms();
LoadLogoServer();
DeviceManager.ActivateAll();
LinkSystemMonitorToAppServer();
}
void LinkSystemMonitorToAppServer()
@@ -235,9 +236,7 @@ namespace PepperDash.Essentials
messenger.RegisterWithAppServer(appServer);
DeviceManager.AddDevice(messenger);
DeviceManager.AddDevice(messenger);
}
}