From 15172a55094e37d790f821954a4b8ebda827db6f Mon Sep 17 00:00:00 2001 From: equinoy Date: Fri, 9 May 2025 16:06:33 -0400 Subject: [PATCH 1/3] feat: add support for mcdge1000 type in MobileControlTouchpanelController --- .../Touchpanel/MobileControlTouchpanelController.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs b/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs index 4f5078a3..9acd04f4 100644 --- a/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs +++ b/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs @@ -491,7 +491,7 @@ namespace PepperDash.Essentials.Touchpanel { public MobileControlTouchpanelControllerFactory() { - TypeNames = new List() { "mccrestronapp", "mctsw550", "mctsw750", "mctsw1050", "mctsw560", "mctsw760", "mctsw1060", "mctsw570", "mctsw770", "mcts770", "mctsw1070", "mcts1070", "mcxpanel" }; + TypeNames = new List() { "mccrestronapp", "mctsw550", "mctsw750", "mctsw1050", "mctsw560", "mctsw760", "mctsw1060", "mctsw570", "mctsw770", "mcts770", "mctsw1070", "mcts1070", "mcxpanel", "mcdge1000" }; MinimumEssentialsFrameworkVersion = "2.0.0"; } @@ -555,7 +555,10 @@ namespace PepperDash.Essentials.Touchpanel return new Tsw1070(id, Global.ControlSystem); else if (type == "ts1070") 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); return null; From feb99ecbb67a8bafe804e7a59ea9fd373884df3b Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 14 May 2025 10:39:42 -0500 Subject: [PATCH 2/3] fix: use correct join for preset select --- src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs index 92eff397..c008e969 100644 --- a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs +++ b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs @@ -227,7 +227,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras SendCameraPresetNamesToApi(presetsCamera, joinMap, trilist); - for (int i = 0; i < joinMap.NumberOfPresets.JoinSpan; i++) + for (int i = 0; i < joinMap.PresetRecallStart.JoinSpan; i++) { int tempNum = i; From 0c7ec825296ca1a20038a0b6e89ea79f3570e56c Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 14 May 2025 12:24:14 -0500 Subject: [PATCH 3/3] fix: initialize dictionaries fix #1167 --- .../DSP/DspBase.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs b/src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs index a40daac5..078dc9e7 100644 --- a/src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs +++ b/src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs @@ -18,9 +18,13 @@ namespace PepperDash.Essentials.Devices.Common.DSP public Dictionary SwitcherControlPoints { get; private set; } - public DspBase(string key, string name) : - base(key, name) - { + public DspBase(string key, string name) : + base(key, name) + { + + LevelControlPoints = new Dictionary(); + DialerControlPoints = new Dictionary(); + SwitcherControlPoints = new Dictionary(); }