Merge pull request #1333 from PepperDash:main

feat: merge main into custom branch
feat: updated Crestron db
2026-02-03 14:55:05 +00:00 · 2025-09-22 13:47:03 -07:00 · 2025-09-22 13:39:58 -07:00 · 2025-09-22 13:33:04 -07:00 · 2025-09-17 15:53:08 -07:00 · 2025-09-17 18:38:21 -04:00
9 changed files with 41 additions and 7 deletions
--- a/src/PepperDash.Core/PepperDash.Core.csproj
+++ b/src/PepperDash.Core/PepperDash.Core.csproj
@@ -43,7 +43,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
-    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.157" />
    <PackageReference Include="Serilog" Version="3.1.1" />
    <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
    <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
--- a/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
+++ b/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
@@ -25,7 +25,7 @@
    <DocumentationFile>bin\$(Configuration)\PepperDash_Essentials_Core.xml</DocumentationFile>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.157" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />
--- a/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs
+++ b/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs
@@ -103,6 +103,12 @@ namespace PepperDash.Essentials.Core
        [JsonProperty("name")]
        public string Name { get; set; }

+        /// <summary>
+        /// Gets or sets a value indicating whether to hide this scenario in the UI.
+        /// </summary>
+        [JsonProperty("hideInUi", NullValueHandling = NullValueHandling.Ignore)]
+        public bool HideInUi { get; set; }
+
        /// <summary>
        /// Gets or sets the collection of partition states.
        /// </summary>
--- a/src/PepperDash.Essentials.Core/Room/Combining/IEssentialsRoomCombiner.cs
+++ b/src/PepperDash.Essentials.Core/Room/Combining/IEssentialsRoomCombiner.cs
@@ -109,6 +109,12 @@ namespace PepperDash.Essentials.Core
        [JsonProperty("isActive")]
        bool IsActive { get; }

+        /// <summary>
+        /// Gets a value indicating whether this scenario should be hidden in the UI.
+        /// </summary>
+        [JsonProperty("hideInUi")]
+        bool HideInUi { get; }
+
        /// <summary>
        /// Activates this room combination scenario
        /// </summary>
--- a/src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs
+++ b/src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs
@@ -14,18 +14,40 @@ namespace PepperDash.Essentials.Core
    {
        private RoomCombinationScenarioConfig _config;

+        /// <summary>
+        /// Gets or sets the key associated with the object.
+        /// </summary>
        [JsonProperty("key")]
        public string Key { get; set; }

+        /// <summary>
+        /// Gets or sets the name associated with the object.
+        /// </summary>
        [JsonProperty("name")]
        public string Name { get; set; }

-        [JsonProperty("partitionStates")]
+        /// <summary>
+        /// Gets a value indicating whether to hide this scenario in the UI.
+        /// </summary>
+        ///        
+        [JsonProperty("hideInUi")]
+
+        public bool HideInUi
+        {
+            get { return _config.HideInUi; }
+        }
+
        /// <summary>
        /// Gets or sets the PartitionStates
        /// </summary>
+        ///
+        [JsonProperty("partitionStates")]
+
        public List<PartitionState> PartitionStates { get; private set; }

+        /// <summary>
+        /// Determines which UI devices get mapped to which room in this scenario.  The Key should be the key of the UI device and the Value should be the key of the room to map to
+        /// </summary>
        [JsonProperty("uiMap")]
        public Dictionary<string, string> UiMap { get; set; }

--- a/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
+++ b/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
@@ -29,6 +29,6 @@
    <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.157" />
  </ItemGroup>
 </Project>
--- a/src/PepperDash.Essentials.MobileControl.Messengers/PepperDash.Essentials.MobileControl.Messengers.csproj
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/PepperDash.Essentials.MobileControl.Messengers.csproj
@@ -33,7 +33,7 @@
    <Compile Remove="Messengers\SIMPLVtcMessenger.cs" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.157" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\PepperDash.Core\PepperDash.Core.csproj" />
--- a/src/PepperDash.Essentials.MobileControl/PepperDash.Essentials.MobileControl.csproj
+++ b/src/PepperDash.Essentials.MobileControl/PepperDash.Essentials.MobileControl.csproj
@@ -38,7 +38,7 @@
    <Compile Remove="RoomBridges\SourceDeviceMapDictionary.cs" />
  </ItemGroup>  
  <ItemGroup>    
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.157" />
    <PackageReference Include="WebSocketSharp-netstandard" Version="1.0.1" />
  </ItemGroup>
  <ItemGroup>
--- a/src/PepperDash.Essentials/PepperDash.Essentials.csproj
+++ b/src/PepperDash.Essentials/PepperDash.Essentials.csproj
@@ -48,7 +48,7 @@
    </None>
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.157" />
    <PackageReference Include="System.IO.Compression" Version="4.0.0" />
  </ItemGroup>
  <ItemGroup>
Author	SHA1	Message	Date
Jonathan Arndt	ea983a6f37	Merge pull request #1333 from PepperDash:main feat: merge main into custom branch	2025-09-22 13:47:03 -07:00
Jonathan Arndt	937a64f996	feat: updated Crestron db	2025-09-22 13:39:58 -07:00
Jonathan Arndt	54328536a8	feat: updated Crestron db	2025-09-22 13:33:04 -07:00
Jonathan Arndt	591f12f086	feature: update Crestron.SimplSharp.SDK.ProgramLibrary version to 2.21.157 across multiple projects	2025-09-17 15:53:08 -07:00
erikdred	cae1bbd6e6	Merge pull request #1332 from PepperDash/feature/add-hide-property-to-room-combine-scenario feat: Add HideInUi property to room combiner classes	2025-09-17 18:38:21 -04:00
Neil Dorin	dea4407e3e	Update src/PepperDash.Essentials.Core/Room/Combining/IEssentialsRoomCombiner.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-09-17 16:36:33 -06:00
Neil Dorin	ab08a546f7	feat: Add HideInUi property to room combiner classes - Introduced `HideInUi` property in `EssentialsRoomCombinerPropertiesConfig` to control UI visibility. - Added `HideInUi` interface property in `IEssentialsRoomCombiner`. - Implemented `HideInUi` in `RoomCombinationScenario`, along with new `Key` and `Name` properties for improved data representation.	2025-09-17 15:25:23 -06:00
Neil Dorin	ef98d47792	Merge pull request #1331 from PepperDash/dev-list-fix	2025-09-17 08:36:04 -06:00