diff --git a/PepperDashEssentials/OTHER/Fusion/FusionCustomPropertiesBridge.cs b/PepperDashEssentials/OTHER/Fusion/FusionCustomPropertiesBridge.cs index 42b43f13..ea04a73d 100644 --- a/PepperDashEssentials/OTHER/Fusion/FusionCustomPropertiesBridge.cs +++ b/PepperDashEssentials/OTHER/Fusion/FusionCustomPropertiesBridge.cs @@ -89,7 +89,9 @@ namespace PepperDash.Essentials.Fusion if (!string.IsNullOrEmpty(roomInfo.Name)) { Debug.Console(1, "Current Room Name: {0}. New Room Name: {1}", deviceConfig.Name, roomInfo.Name); + // Set the name in config deviceConfig.Name = roomInfo.Name; + Debug.Console(1, "Room Name Successfully Changed."); } diff --git a/PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs b/PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs index 2c2e761d..f1b86477 100644 --- a/PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs +++ b/PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs @@ -722,6 +722,10 @@ namespace PepperDash.Essentials CurrentRoom.CurrentVolumeControls.VolumeDown(state); } + + /// + /// Helper for property setter. Sets the panel to the given room, latching up all functionality + /// public void RefreshCurrentRoom(EssentialsHuddleSpaceRoom room) { if (_CurrentRoom != null) @@ -811,17 +815,27 @@ namespace PepperDash.Essentials } } - /// - /// Helper for property setter. Sets the panel to the given room, latching up all functionality - /// void SetCurrentRoom(EssentialsHuddleSpaceRoom room) { if (_CurrentRoom == room) return; // Disconnect current (probably never called) + room.ConfigChanged -= room_ConfigChanged; + room.ConfigChanged += room_ConfigChanged; + RefreshCurrentRoom(room); } + /// + /// Fires when room config of current room has changed. Meant to refresh room values to propegate any updates to UI + /// + /// + /// + void room_ConfigChanged(object sender, EventArgs e) + { + RefreshCurrentRoom(_CurrentRoom); + } + /// /// For room on/off changes /// diff --git a/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs b/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs index b000cf42..4b1f2188 100644 --- a/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs +++ b/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs @@ -877,10 +877,9 @@ namespace PepperDash.Essentials /// /// Helper for property setter. Sets the panel to the given room, latching up all functionality /// - void SetCurrentRoom(EssentialsHuddleVtc1Room room) + void RefreshCurrentRoom(EssentialsHuddleVtc1Room room) { - if (_CurrentRoom == room) return; - // Disconnect current (probably never called) + if (_CurrentRoom != null) { // Disconnect current room @@ -950,6 +949,27 @@ namespace PepperDash.Essentials } } + void SetCurrentRoom(EssentialsHuddleVtc1Room room) + { + if (_CurrentRoom == room) return; + // Disconnect current (probably never called) + + room.ConfigChanged -= room_ConfigChanged; + room.ConfigChanged += room_ConfigChanged; + + RefreshCurrentRoom(room); + } + + /// + /// Fires when room config of current room has changed. Meant to refresh room values to propegate any updates to UI + /// + /// + /// + void room_ConfigChanged(object sender, EventArgs e) + { + RefreshCurrentRoom(_CurrentRoom); + } + /// /// /// diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz index e5e96c8f..47114c83 100644 Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll index 5046c694..b888de8f 100644 Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ diff --git a/essentials-framework b/essentials-framework index 7422e08b..5f438394 160000 --- a/essentials-framework +++ b/essentials-framework @@ -1 +1 @@ -Subproject commit 7422e08b5d09d7156a4f68848e9f24c3382b77db +Subproject commit 5f438394e02474347ed8c18c47e98b4e95bef3af