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

merge branch 'development' into feature-2.0.0/move-dm-to-library

Browse Source
This commit is contained in:
Andrew Welker
2023-10-26 23:07:55 -05:00
parent 48a5bd64a4 552a315ac0
commit 8537630e03
82 changed files with 4763 additions and 2412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
View File

@@ -150,15 +150,20 @@ namespace PepperDash.Essentials.Core.Fusion
ReadGuidFile(guidFilePath);
}
if (Room.RoomOccupancy != null)
var occupancyRoom = Room as IRoomOccupancy;
if (occupancyRoom != null)
{
if (Room.OccupancyStatusProviderIsRemote)
if (occupancyRoom.RoomOccupancy != null)
{
SetUpRemoteOccupancy();
}
else
{
SetUpLocalOccupancy();
if (occupancyRoom.OccupancyStatusProviderIsRemote)
{
SetUpRemoteOccupancy();
}
else
{
SetUpLocalOccupancy();
}
}
}
@@ -1525,10 +1530,15 @@ namespace PepperDash.Essentials.Core.Fusion
// Tie to method on occupancy object
//occSensorShutdownMinutes.OutputSig.UserObject(new Action(ushort)(b => Room.OccupancyObj.SetShutdownMinutes(b));
var occRoom = Room as IRoomOccupancy;
if (occRoom != null)
{
occRoom.RoomOccupancy.RoomIsOccupiedFeedback.LinkInputSig(occSensorAsset.RoomOccupied.InputSig);
occRoom.RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
}
RoomOccupancyRemoteStringFeedback = new StringFeedback(() => _roomOccupancyRemoteString);
Room.RoomOccupancy.RoomIsOccupiedFeedback.LinkInputSig(occSensorAsset.RoomOccupied.InputSig);
Room.RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
RoomOccupancyRemoteStringFeedback.LinkInputSig(occSensorAsset.RoomOccupancyInfo.InputSig);
//}