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

Merge pull request #1271 from PepperDash/temp-to-dev

Browse source 
Temp to dev
This commit is contained in:
Andrew Welker 2025-05-19 16:52:45 -05:00 • committed by GitHub
commit ec6aeb17f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs
View file

@ -18,9 +18,13 @@ namespace PepperDash.Essentials.Devices.Common.DSP
public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; } public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
public DspBase(string key, string name) : public DspBase(string key, string name) :
base(key, name) base(key, name)
{ {
LevelControlPoints = new Dictionary<string, IBasicVolumeWithFeedback>();
DialerControlPoints = new Dictionary<string, DspControlPoint>();
SwitcherControlPoints = new Dictionary<string, DspControlPoint>();
} }

7
src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs
View file

@ -491,7 +491,7 @@ namespace PepperDash.Essentials.Touchpanel
{ {
public MobileControlTouchpanelControllerFactory() public MobileControlTouchpanelControllerFactory()
{ {
TypeNames = new List<string>() { "mccrestronapp", "mctsw550", "mctsw750", "mctsw1050", "mctsw560", "mctsw760", "mctsw1060", "mctsw570", "mctsw770", "mcts770", "mctsw1070", "mcts1070", "mcxpanel" }; TypeNames = new List<string>() { "mccrestronapp", "mctsw550", "mctsw750", "mctsw1050", "mctsw560", "mctsw760", "mctsw1060", "mctsw570", "mctsw770", "mcts770", "mctsw1070", "mcts1070", "mcxpanel", "mcdge1000" };
MinimumEssentialsFrameworkVersion = "2.0.0"; MinimumEssentialsFrameworkVersion = "2.0.0";
} }
@ -555,7 +555,10 @@ namespace PepperDash.Essentials.Touchpanel
return new Tsw1070(id, Global.ControlSystem); return new Tsw1070(id, Global.ControlSystem);
else if (type == "ts1070") else if (type == "ts1070")
return new Ts1070(id, Global.ControlSystem); return new Ts1070(id, Global.ControlSystem);
else else if (type == "dge1000")
return new Dge1000(id, Global.ControlSystem);
else
{ {
Debug.LogMessage(Serilog.Events.LogEventLevel.Warning, "WARNING: Cannot create TSW controller with type '{0}'", type); Debug.LogMessage(Serilog.Events.LogEventLevel.Warning, "WARNING: Cannot create TSW controller with type '{0}'", type);
return null; return null;