pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 13:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Issues with USB routing

Browse Source 
#931
#930
This commit is contained in:
Andrew Welker
2022-04-15 10:09:55 -06:00
parent b42d487c4c
commit 5fcf746124
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs
View File

@@ -1408,23 +1408,27 @@ namespace PepperDash.Essentials.DM
if ((sigType & eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput) if ((sigType & eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput)
{ {
Debug.Console(2, this, "Executing USB Input switch.\r\n in:{0} output: {1}", inputSelector, outputSelector); Debug.Console(2, this, "Executing USB Input switch.\r\n in:{0} output: {1}", inputSelector, outputSelector);
if (outputSelector > chassisSize) if (inputSelector > chassisSize)
{ {
uint outputIndex; uint inputIndex;
if (chassisSize == 8) if (chassisSize == 8)
{ {
outputIndex = (uint) inputSelector - 16; inputIndex = (uint) inputSelector - 16;
} }
else else
{ {
outputIndex = inputSelector - chassisSize; inputIndex = inputSelector - chassisSize;
} }
dmCard = Chassis.Outputs[outputIndex]; dmCard = Chassis.Outputs[inputIndex];
}
else if (inputSelector > 0)
{
dmCard = Chassis.Inputs[inputSelector];
} }
else else
{ {
dmCard = Chassis.Inputs[inputSelector]; dmCard = null;
} }
ExecuteSwitch(dmCard, Chassis.Inputs[outputSelector], sigType); ExecuteSwitch(dmCard, Chassis.Inputs[outputSelector], sigType);
@@ -1455,13 +1459,16 @@ namespace PepperDash.Essentials.DM
dmCard = Chassis.Outputs[outputIndex]; dmCard = Chassis.Outputs[outputIndex];
} }
else else if (inputSelector > 0)
{ {
dmCard = Chassis.Inputs[inputSelector]; dmCard = Chassis.Inputs[inputSelector];
} }
else
{
dmCard = null;
}
Chassis.USBEnter.BoolValue = true; Chassis.USBEnter.BoolValue = true;
Debug.Console(2, this, "Routing USB for input {0} to {1}", inputSelector, dmCard);
ExecuteSwitch(dmCard, Chassis.Outputs[outputSelector], sigType); ExecuteSwitch(dmCard, Chassis.Outputs[outputSelector], sigType);
return; return;
} }