From f73d6994b8d6d869037d0b6ef50794582640a04b Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 19 Jul 2023 16:22:20 -0600 Subject: [PATCH] Additional updates to allow occupancy sensor to be cleared when room not active --- .../Room/Types/EssentialsCombinedHuddleVtc1Room.cs | 7 +++++++ .../Room/Types/EssentialsHuddleVtc1Room.cs | 8 +++++++- .../PepperDashEssentialsBase/Room/EssentialsRoomBase.cs | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs b/PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs index 3ed0946d..8ffd63e5 100644 --- a/PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs +++ b/PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs @@ -393,6 +393,11 @@ namespace PepperDash.Essentials // Stop listining to this event when room deactivated VideoCodec.IsReadyChange -= VideoCodec_IsReadyChange; + // Clear occupancy + RoomOccupancy = null; + + Debug.Console(0, this, "Room '{0}' Deactivated", Name); + return base.Deactivate(); } @@ -488,6 +493,8 @@ namespace PepperDash.Essentials Debug.Console(0, this, "Error Activiating Room: {0}", e); } + + Debug.Console(0, this, "Room '{0}' Activated", Name); return base.CustomActivate(); } diff --git a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs index 457e4ae2..3df86b9a 100644 --- a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs +++ b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs @@ -293,6 +293,11 @@ namespace PepperDash.Essentials // Stop listining to this event when room deactivated VideoCodec.IsReadyChange -= VideoCodec_IsReadyChange; + // Clear occupancy + RoomOccupancy = null; + + Debug.Console(0, this, "Room '{0}' Deactivated", Name); + return base.Deactivate(); } @@ -406,7 +411,8 @@ namespace PepperDash.Essentials { Debug.Console(0, this, "Error Activiating Room: {0}", e); } - + + Debug.Console(0, this, "Room '{0}' Activated", Name); return base.CustomActivate(); } diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/EssentialsRoomBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/EssentialsRoomBase.cs index f5e3dee8..0c7e0de0 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/EssentialsRoomBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/EssentialsRoomBase.cs @@ -35,7 +35,7 @@ namespace PepperDash.Essentials.Core public BoolFeedback IsWarmingUpFeedback { get; private set; } public BoolFeedback IsCoolingDownFeedback { get; private set; } - public IOccupancyStatusProvider RoomOccupancy { get; private set; } + public IOccupancyStatusProvider RoomOccupancy { get; protected set; } public bool OccupancyStatusProviderIsRemote { get; private set; }