Merge 955d68b3f3 into 3a4737b6f6

#671 switches to private Dispose() on program stop
Merge pull request #670 from PepperDash/hotfix/dm-routing-issues
2026-02-11 02:35:00 +00:00 · 2021-03-30 22:14:46 +00:00 · 2021-03-30 15:56:05 -06:00 · 2021-03-29 13:29:46 -06:00 · 2021-03-29 13:18:00 -06:00 · 2021-03-29 13:17:51 -06:00
4 changed files with 14 additions and 14 deletions
--- a/Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
+++ b/Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
@@ -155,7 +155,7 @@ namespace PepperDash.Essentials.Core.Queues
                if (programEvent != eProgramStatusEventType.Stopping)
                    return;

-                Dispose();
+                Dispose(true);
            };
        }
        
@@ -407,7 +407,7 @@ namespace PepperDash_Essentials_Core.Queues
                if (programEvent != eProgramStatusEventType.Stopping)
                    return;

-                Dispose();
+                Dispose(true);
            };
        }

--- a/DM/Essentials_DM/Chassis/DmBladeChassisController.cs
+++ b/DM/Essentials_DM/Chassis/DmBladeChassisController.cs
@@ -671,7 +671,7 @@ namespace PepperDash.Essentials.DM {
                var ioSlotJoin = ioSlot - 1;

                // Control
-                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
+                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));

                if (TxDictionary.ContainsKey(ioSlot))
                {
--- a/DM/Essentials_DM/Chassis/DmChassisController.cs
+++ b/DM/Essentials_DM/Chassis/DmChassisController.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
@@ -1184,7 +1185,6 @@ namespace PepperDash.Essentials.DM
                    "Unable to execute switch for inputSelector {0} to outputSelector {1}", inputSelector,
                    outputSelector);
                return;
-
            }

            // Check to see if there's an off timer waiting on this and if so, cancel
@@ -1643,13 +1643,13 @@ namespace PepperDash.Essentials.DM
        {
            // Routing Control
            trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
-                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
-            trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
-                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
-            trilist.SetUShortSigAction(joinMap.OutputUsb.JoinNumber + ioSlotJoin,
-                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.UsbOutput));
-            trilist.SetUShortSigAction(joinMap.InputUsb.JoinNumber + ioSlotJoin,
-                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.UsbInput));
+                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));
+            trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
+                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Audio));
+            trilist.SetUShortSigAction(joinMap.OutputUsb.JoinNumber + ioSlotJoin,
+                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.UsbOutput));
+            trilist.SetUShortSigAction(joinMap.InputUsb.JoinNumber + ioSlotJoin,
+                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.UsbInput));

            //Routing Feedbacks
            VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo.JoinNumber + ioSlotJoin]);
--- a/DM/Essentials_DM/Chassis/DmpsRoutingController.cs
+++ b/DM/Essentials_DM/Chassis/DmpsRoutingController.cs
@@ -228,9 +228,9 @@ namespace PepperDash.Essentials.DM

                // Control
                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
-                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
+                    o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));
                trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
-                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
+                    o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Audio));

                trilist.SetStringSigAction(joinMap.OutputNames.JoinNumber + ioSlotJoin, s =>
                {
Author	SHA1	Message	Date
Neil Dorin	f900665c2a	Merge `955d68b3f3` into `3a4737b6f6`	2021-03-30 22:14:46 +00:00
Neil Dorin	955d68b3f3	#671 switches to private Dispose() on program stop	2021-03-30 15:56:05 -06:00
Andrew Welker	3a4737b6f6	Merge pull request #670 from PepperDash/hotfix/dm-routing-issues Hotfix/dm routing issues	2021-03-29 13:29:46 -06:00
Andrew Welker	2b2308d5c2	Merge branch 'development' into hotfix/dm-routing-issues	2021-03-29 13:18:00 -06:00
Andrew Welker	185f03065e	Merge pull request #669 from PepperDash/hotfix/dm-routing-issues Fix LinkToApi methods for chassis to use ExecuteNumericSwitch	2021-03-29 13:17:51 -06:00
Andrew Welker	358fa1a9c0	Merge pull request #667 from PepperDash/hotfix/generic-queue-disposed-check Hotfix/generic queue disposed check	2021-03-29 12:53:43 -06:00
Andrew Welker	7fbbc9f2b8	Fix LinkToApi methods for chassis to use ExecuteNumericSwitch	2021-03-29 12:50:43 -06:00
Andrew Welker	d3383db890	Merge pull request #666 from PepperDash/hotfix/generic-queue-disposed-check added a Disposed check and Debug Message to prevent enqueing messages…	2021-03-29 07:55:29 -06:00