From f7c7160bf07e9a2efbc5732a3305b0d71fc8b68a Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 26 Nov 2025 15:48:14 -0700 Subject: [PATCH 1/7] feat: Add on/off dsp keys to EssentialsAvRoomPropertiesConfig clean up XML comments and improve property definitions in EssentialsRoomConfig --- .../Devices/SourceListItem.cs | 4 +- .../Room/Config/EssentialsRoomConfig.cs | 116 +++++++++++++----- 2 files changed, 83 insertions(+), 37 deletions(-) diff --git a/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs b/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs index e6724760..ebe3403d 100644 --- a/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs +++ b/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs @@ -77,9 +77,7 @@ namespace PepperDash.Essentials.Core /// A name that will override the source's name on the UI /// [JsonProperty("name")] - /// - /// Gets or sets the Name - /// + public string Name { get; set; } /// diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs index b5584f93..abb5aa89 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs @@ -105,12 +105,21 @@ namespace PepperDash.Essentials.Room.Config /// public class EssentialsRoomPropertiesConfig { + /// + /// Gets or sets the Addresses + /// [JsonProperty("addresses")] public EssentialsRoomAddressPropertiesConfig Addresses { get; set; } + /// + /// Gets or sets the Description + /// [JsonProperty("description")] public string Description { get; set; } + /// + /// Gets or sets the Emergency + /// [JsonProperty("emergency")] public EssentialsRoomEmergencyConfig Emergency { get; set; } @@ -226,11 +235,11 @@ namespace PepperDash.Essentials.Room.Config /// Indicates if this room represents a combination of other rooms /// [JsonProperty("isRoomCombinationScenario")] - /// - /// Gets or sets the IsRoomCombinationScenario - /// public bool IsRoomCombinationScenario { get; set; } + /// + /// Constructor + /// public EssentialsRoomPropertiesConfig() { LogoLight = new EssentialsLogoPropertiesConfig(); @@ -243,10 +252,11 @@ namespace PepperDash.Essentials.Room.Config /// public class EssentialsRoomUiBehaviorConfig { - [JsonProperty("disableActivityButtonsWhileWarmingCooling")] /// /// Gets or sets the DisableActivityButtonsWhileWarmingCooling /// + [JsonProperty("disableActivityButtonsWhileWarmingCooling")] + public bool DisableActivityButtonsWhileWarmingCooling { get; set; } } @@ -255,74 +265,86 @@ namespace PepperDash.Essentials.Room.Config /// public class EssentialsAvRoomPropertiesConfig : EssentialsRoomPropertiesConfig { - [JsonProperty("defaultAudioKey")] /// /// Gets or sets the DefaultAudioKey /// + [JsonProperty("defaultAudioKey")] public string DefaultAudioKey { get; set; } - [JsonProperty("sourceListKey")] + + /// + /// Gets or sets the DefaultOnDspPresetKey + /// + [JsonProperty("defaultOnDspPresetKey")] + public string DefaultOnDspPresetKey { get; set; } + + /// + /// Gets or sets the DefaultOffDspPresetKey + /// + [JsonProperty("defaultOffDspPresetKey")] + public string DefaultOffDspPresetKey { get; set; } + + /// /// Gets or sets the SourceListKey /// + [JsonProperty("sourceListKey")] public string SourceListKey { get; set; } - [JsonProperty("destinationListKey")] /// /// Gets or sets the DestinationListKey /// + [JsonProperty("destinationListKey")] public string DestinationListKey { get; set; } - [JsonProperty("audioControlPointListKey")] /// /// Gets or sets the AudioControlPointListKey /// + [JsonProperty("audioControlPointListKey")] public string AudioControlPointListKey { get; set; } - [JsonProperty("cameraListKey")] /// /// Gets or sets the CameraListKey /// + [JsonProperty("cameraListKey")] public string CameraListKey { get; set; } - [JsonProperty("defaultSourceItem")] /// /// Gets or sets the DefaultSourceItem /// + [JsonProperty("defaultSourceItem")] public string DefaultSourceItem { get; set; } /// /// Indicates if the room supports advanced sharing /// [JsonProperty("supportsAdvancedSharing")] - /// - /// Gets or sets the SupportsAdvancedSharing - /// public bool SupportsAdvancedSharing { get; set; } + /// /// Indicates if non-tech users can change the share mode /// [JsonProperty("userCanChangeShareMode")] - /// - /// Gets or sets the UserCanChangeShareMode - /// public bool UserCanChangeShareMode { get; set; } - [JsonProperty("matrixRoutingKey", NullValueHandling = NullValueHandling.Ignore)] /// /// Gets or sets the MatrixRoutingKey /// + [JsonProperty("matrixRoutingKey", NullValueHandling = NullValueHandling.Ignore)] public string MatrixRoutingKey { get; set; } } + /// + /// Represents a EssentialsConferenceRoomPropertiesConfig + /// public class EssentialsConferenceRoomPropertiesConfig : EssentialsAvRoomPropertiesConfig { - [JsonProperty("videoCodecKey")] /// /// Gets or sets the VideoCodecKey /// + [JsonProperty("videoCodecKey")] public string VideoCodecKey { get; set; } - [JsonProperty("audioCodecKey")] /// /// Gets or sets the AudioCodecKey /// + [JsonProperty("audioCodecKey")] public string AudioCodecKey { get; set; } } @@ -337,12 +359,15 @@ namespace PepperDash.Essentials.Room.Config /// public bool Enabled { get; set; } - [JsonProperty("deviceKeys")] /// /// Gets or sets the DeviceKeys /// + [JsonProperty("deviceKeys")] public List DeviceKeys { get; set; } + /// + /// Constructor + /// public EssentialsEnvironmentPropertiesConfig() { DeviceKeys = new List(); @@ -355,6 +380,9 @@ namespace PepperDash.Essentials.Room.Config /// public class EssentialsRoomFusionConfig { + /// + /// Gets the the IpId as a UInt16 + /// public uint IpIdInt { get @@ -371,16 +399,16 @@ namespace PepperDash.Essentials.Room.Config } } - [JsonProperty("ipId")] /// /// Gets or sets the IpId /// + [JsonProperty("ipId")] public string IpId { get; set; } - [JsonProperty("joinMapKey")] /// /// Gets or sets the JoinMapKey /// + [JsonProperty("joinMapKey")] public string JoinMapKey { get; set; } } @@ -390,16 +418,16 @@ namespace PepperDash.Essentials.Room.Config /// public class EssentialsRoomMicrophonePrivacyConfig { - [JsonProperty("deviceKey")] /// /// Gets or sets the DeviceKey /// + [JsonProperty("deviceKey")] public string DeviceKey { get; set; } - [JsonProperty("behaviour")] /// /// Gets or sets the Behaviour /// + [JsonProperty("behaviour")] public string Behaviour { get; set; } } @@ -408,12 +436,15 @@ namespace PepperDash.Essentials.Room.Config /// public class EssentialsHelpPropertiesConfig { - [JsonProperty("message")] /// /// Gets or sets the Message /// + [JsonProperty("message")] public string Message { get; set; } + /// + /// Gets or sets the ShowCallButton + /// [JsonProperty("showCallButton")] public bool ShowCallButton { get; set; } @@ -421,11 +452,11 @@ namespace PepperDash.Essentials.Room.Config /// Defaults to "Call Help Desk" /// [JsonProperty("callButtonText")] - /// - /// Gets or sets the CallButtonText - /// public string CallButtonText { get; set; } + /// + /// Constructor + /// public EssentialsHelpPropertiesConfig() { CallButtonText = "Call Help Desk"; @@ -437,22 +468,28 @@ namespace PepperDash.Essentials.Room.Config /// public class EssentialsOneButtonMeetingPropertiesConfig { - [JsonProperty("enable")] /// /// Gets or sets the Enable /// - public bool Enable { get; set; } + [JsonProperty("enable")] + public bool Enable { get; set; } } + /// + /// Represents a EssentialsRoomAddressPropertiesConfig + /// public class EssentialsRoomAddressPropertiesConfig { + /// + /// Gets or sets the PhoneNumber + /// [JsonProperty("phoneNumber")] public string PhoneNumber { get; set; } - [JsonProperty("sipAddress")] /// /// Gets or sets the SipAddress /// + [JsonProperty("sipAddress")] public string SipAddress { get; set; } } @@ -462,14 +499,19 @@ namespace PepperDash.Essentials.Room.Config /// public class EssentialsLogoPropertiesConfig { - [JsonProperty("type")] /// /// Gets or sets the Type /// + [JsonProperty("type")] public string Type { get; set; } + /// + /// Gets or sets the Url + /// [JsonProperty("url")] public string Url { get; set; } + + /// /// GetLogoUrlLight method /// @@ -502,22 +544,28 @@ namespace PepperDash.Essentials.Room.Config /// public class EssentialsRoomOccSensorConfig { - [JsonProperty("deviceKey")] /// /// Gets or sets the DeviceKey /// + [JsonProperty("deviceKey")] public string DeviceKey { get; set; } + /// + /// Gets or sets the TimeoutMinutes + /// [JsonProperty("timeoutMinutes")] public int TimeoutMinutes { get; set; } } + /// + /// Represents a EssentialsRoomVolumesConfig + /// public class EssentialsRoomTechConfig { - [JsonProperty("password")] /// /// Gets or sets the Password /// + [JsonProperty("password")] public string Password { get; set; } } } \ No newline at end of file From 9ef4aedcce10987ec21ada2ac37683336eb33d04 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 26 Nov 2025 15:53:07 -0700 Subject: [PATCH 2/7] Update src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../Room/Config/EssentialsRoomConfig.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs index abb5aa89..3c422367 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs @@ -256,7 +256,6 @@ namespace PepperDash.Essentials.Room.Config /// Gets or sets the DisableActivityButtonsWhileWarmingCooling /// [JsonProperty("disableActivityButtonsWhileWarmingCooling")] - public bool DisableActivityButtonsWhileWarmingCooling { get; set; } } From a5e60591609ebd4931f97d80c7ee34790c76c2d5 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 26 Nov 2025 15:53:14 -0700 Subject: [PATCH 3/7] Update src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../Room/Config/EssentialsRoomConfig.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs index 3c422367..c0316ea5 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs @@ -282,10 +282,10 @@ namespace PepperDash.Essentials.Room.Config [JsonProperty("defaultOffDspPresetKey")] public string DefaultOffDspPresetKey { get; set; } - /// /// Gets or sets the SourceListKey /// + /// [JsonProperty("sourceListKey")] public string SourceListKey { get; set; } /// From 2187c9fb0d932bc336ffa2d5e05910178c067bfd Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 26 Nov 2025 15:53:22 -0700 Subject: [PATCH 4/7] Update src/PepperDash.Essentials.Core/Devices/SourceListItem.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/PepperDash.Essentials.Core/Devices/SourceListItem.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs b/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs index ebe3403d..deaeeae3 100644 --- a/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs +++ b/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs @@ -77,7 +77,6 @@ namespace PepperDash.Essentials.Core /// A name that will override the source's name on the UI /// [JsonProperty("name")] - public string Name { get; set; } /// From d1babf6b9bc87981bf09dfb47c24328f4788874d Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 26 Nov 2025 15:53:31 -0700 Subject: [PATCH 5/7] Update src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../Room/Config/EssentialsRoomConfig.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs index c0316ea5..f124e47f 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs @@ -557,7 +557,7 @@ namespace PepperDash.Essentials.Room.Config } /// - /// Represents a EssentialsRoomVolumesConfig + /// Represents a EssentialsRoomTechConfig /// public class EssentialsRoomTechConfig { From 7594b22096cbdc7bbffd3c6bb8de99070dccb505 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 26 Nov 2025 15:53:39 -0700 Subject: [PATCH 6/7] Update src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../Room/Config/EssentialsRoomConfig.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs index f124e47f..27a207d8 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs @@ -510,7 +510,6 @@ namespace PepperDash.Essentials.Room.Config [JsonProperty("url")] public string Url { get; set; } - /// /// GetLogoUrlLight method /// From 08fbec416ff9a8fe61fd5fd5c224fbd0c47c53c7 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 26 Nov 2025 15:53:45 -0700 Subject: [PATCH 7/7] Update src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../Room/Config/EssentialsRoomConfig.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs index 27a207d8..8de477f3 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs @@ -470,8 +470,8 @@ namespace PepperDash.Essentials.Room.Config /// /// Gets or sets the Enable /// - [JsonProperty("enable")] - public bool Enable { get; set; } + [JsonProperty("enable")] + public bool Enable { get; set; } } ///