Skip to content

Commit

Permalink
Merge pull request #3 from PepperDash/feature/IPrivacy
Browse files Browse the repository at this point in the history
Add IPrivacy
  • Loading branch information
TrevorPayne authored Apr 21, 2023
2 parents ea0f7b8 + b4e3087 commit 300fd76
Show file tree
Hide file tree
Showing 10 changed files with 169 additions and 78 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,3 @@ jobs:
branch: ${{ github.ref_name }}
default-branch: "main"


18 changes: 18 additions & 0 deletions pdt_shureMXA_epi/Bridge/JoinMap/ShureMxwDeviceJoinMap.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,15 @@ public ShureMxwDeviceJoinMap(uint joinStart)
JoinCapabilities = eJoinCapabilities.ToSIMPL,
JoinType = eJoinType.Serial
});
[JoinName("DeviceName")]
public JoinDataComplete DeviceName =
new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1 },
new JoinMetadata
{
Description = "Device Name Name",
JoinCapabilities = eJoinCapabilities.ToSIMPL,
JoinType = eJoinType.Serial
});

[JoinName("ErrorString")]
public JoinDataComplete ErrorString =
Expand All @@ -125,6 +134,15 @@ public ShureMxwDeviceJoinMap(uint joinStart)
JoinCapabilities = eJoinCapabilities.ToSIMPL,
JoinType = eJoinType.Serial
});
[JoinName("AnyPress")]
public JoinDataComplete AnyPress =
new JoinDataComplete(new JoinData() { JoinNumber = 48, JoinSpan = 1},
new JoinMetadata
{
Description = "Any Button WasPressed",
JoinCapabilities = eJoinCapabilities.ToSIMPL,
JoinType = eJoinType.Digital
});



Expand Down
43 changes: 29 additions & 14 deletions pdt_shureMXA_epi/Properties.cs
Original file line number Diff line number Diff line change
@@ -1,28 +1,43 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Crestron.SimplSharp;

using Newtonsoft.Json;
using PepperDash.Core;
using PepperDash.Essentials.Core;

namespace pdt_shureMXW_epi
{
public class Properties
{
public ControlPropertiesConfig Control { get; set; }

public List<Mics> Mics { get; set; }
[JsonProperty("cautionThreshold")]
public int CautionThreshold { get; set; }
[JsonProperty("WarningThreshold")]
public int WarningThreshold { get; set; }
}

public class Mic : IKeyed
{
public string Key { get; set; }
public int Index { get; set; }
public bool Enabled { get; set; }
public string Name { get; set; }

public int cautionthreshold { get; set; }
public int warningThreshold { get; set; }
public Mic(string key, MicDict mic)
{
Key = key;
Index = mic.Index;
Enabled = mic.Enabled || mic.Enable;
Name = mic.Name;
}
}

public class Mics
public class MicDict
{
public int index { get; set; }
public bool enabled { get; set; }
public string name { get; set; }
[JsonProperty("index")]
public int Index { get; set; }
[JsonProperty("enabled")]
public bool Enabled { get; set; }
[JsonProperty("enable")]
public bool Enable { get; set; }
[JsonProperty("name")]
public string Name { get; set; }
}
}
Loading

0 comments on commit 300fd76

Please sign in to comment.