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

Merge branch 'main' into hotfix/videocodecbase-max-meeting-xsig-value-set

Browse Source
This commit is contained in:
Neil Dorin
2022-01-19 14:43:00 -07:00
committed by GitHub
parent 99580ae8b5 379498aea1
commit eea59d682a
6 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
essentials-framework/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs
View File

@@ -113,9 +113,12 @@ namespace PepperDash.Essentials.Core.Lighting
public class LightingScene
{
[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
public string Name { get; set; }
[JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
public string ID { get; set; }
bool _IsActive;
[JsonProperty("isActive", NullValueHandling = NullValueHandling.Ignore)]
public bool IsActive
{
get
@@ -128,6 +131,8 @@ namespace PepperDash.Essentials.Core.Lighting
IsActiveFeedback.FireUpdate();
}
}
[JsonIgnore]
public BoolFeedback IsActiveFeedback { get; set; }
public LightingScene()

2
essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs
View File

@@ -69,6 +69,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
[JsonProperty("directoryResults")]
public List<DirectoryItem> CurrentDirectoryResults { get; private set; }
[JsonProperty("contacts")]
public List<DirectoryItem> Contacts
{
get
@@ -77,6 +78,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
}
}
[JsonProperty("folders")]
public List<DirectoryItem> Folders
{
get