pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 12:44:58 +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

2
PepperDashEssentials/ControlSystem.cs
View File

@@ -343,7 +343,7 @@ namespace PepperDash.Essentials
{ {
var prompt = Global.ControlSystem.ControllerPrompt; var prompt = Global.ControlSystem.ControllerPrompt;
var typeMatch = String.Equals(devConf.Type, prompt, StringComparison.OrdinalIgnoreCase) && var typeMatch = String.Equals(devConf.Type, prompt, StringComparison.OrdinalIgnoreCase) ||
String.Equals(devConf.Type, prompt.Replace("-", ""), StringComparison.OrdinalIgnoreCase); String.Equals(devConf.Type, prompt.Replace("-", ""), StringComparison.OrdinalIgnoreCase);
if (!typeMatch) if (!typeMatch)

2
PepperDashEssentials/Example Configuration/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json
View File

@@ -88,7 +88,7 @@
{ {
"name": "Wireless Video", "name": "Wireless Video",
"key": "wePresent-1", "key": "wePresent-1",
"type": "wePresent", "type": "genericSource",
"group": "genericSource", "group": "genericSource",
"uid": 9, "uid": 9,
"properties": { "properties": {

2
PepperDashEssentials/Example Configuration/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json
View File

@@ -114,7 +114,7 @@
{ {
"name": "Wireless Video", "name": "Wireless Video",
"key": "wePresent-1", "key": "wePresent-1",
"type": "wePresent", "type": "genericSource",
"properties": {}, "properties": {},
"group": "genericSource", "group": "genericSource",
"uid": 3 "uid": 3

2
PepperDashEssentials/UI/EssentialsTouchpanelController.cs
View File

@@ -213,7 +213,7 @@ namespace PepperDash.Essentials
{ {
public EssentialsTouchpanelControllerFactory() public EssentialsTouchpanelControllerFactory()
{ {
TypeNames = new List<string>() { "tsw550", "tsw750", "tsw1050", "tsw560", "tsw760", "tsw1060", "tsw570", "tsw770", "ts770", "tsw1070", "ts1070", "xpanel" }; TypeNames = new List<string>() { "crestronapp", "tsw550", "tsw750", "tsw1050", "tsw560", "tsw760", "tsw1060", "tsw570", "tsw770", "ts770", "tsw1070", "ts1070", "xpanel" };
} }
public override EssentialsDevice BuildDevice(DeviceConfig dc) public override EssentialsDevice BuildDevice(DeviceConfig dc)

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

@@ -113,9 +113,12 @@ namespace PepperDash.Essentials.Core.Lighting
public class LightingScene public class LightingScene
{ {
[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
public string Name { get; set; } public string Name { get; set; }
[JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
public string ID { get; set; } public string ID { get; set; }
bool _IsActive; bool _IsActive;
[JsonProperty("isActive", NullValueHandling = NullValueHandling.Ignore)]
public bool IsActive public bool IsActive
{ {
get get
@@ -128,6 +131,8 @@ namespace PepperDash.Essentials.Core.Lighting
IsActiveFeedback.FireUpdate(); IsActiveFeedback.FireUpdate();
} }
} }
[JsonIgnore]
public BoolFeedback IsActiveFeedback { get; set; } public BoolFeedback IsActiveFeedback { get; set; }
public LightingScene() 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")] [JsonProperty("directoryResults")]
public List<DirectoryItem> CurrentDirectoryResults { get; private set; } public List<DirectoryItem> CurrentDirectoryResults { get; private set; }
[JsonProperty("contacts")]
public List<DirectoryItem> Contacts public List<DirectoryItem> Contacts
{ {
get get
@@ -77,6 +78,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
} }
} }
[JsonProperty("folders")]
public List<DirectoryItem> Folders public List<DirectoryItem> Folders
{ {
get get