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

Merge and a whole bunch of work before committing merge, moron

Browse source
This commit is contained in:
Heath Volmer 2018-08-01 14:23:58 -06:00
commit 1371c728c5
25 changed files with 2809 additions and 2227 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PepperDashEssentials/ControlSystem.cs
View file

@ -291,7 +291,7 @@ namespace PepperDash.Essentials
foreach (var roomConfig in ConfigReader.ConfigObject.Rooms)
{
var room = roomConfig.GetRoomObject();
var room = roomConfig.GetRoomObject() as EssentialsRoomBase;
if (room != null)
{
if (room is EssentialsHuddleSpaceRoom)
@ -319,7 +319,7 @@ namespace PepperDash.Essentials
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Cotija Bridge...");
// Cotija bridge
var bridge = new CotijaEssentialsHuddleSpaceRoomBridge(room as EssentialsHuddleSpaceRoom);
var bridge = new CotijaEssentialsHuddleSpaceRoomBridge(room);
AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
DeviceManager.AddDevice(bridge);
}