From db08b1fcd9261264de9403eea060101dce069ca5 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Tue, 19 Nov 2019 18:02:50 -0700 Subject: [PATCH] Switches back to using EndpointOnlineFeedback for Rx online detection. Not currently working but believed to be a Crestron issue. --- .../Bridges/DmBladeChassisControllerBridge.cs | 16 ++++++++-------- .../Chassis/DmBladeChassisController.cs | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/PepperDashEssentials/Bridges/DmBladeChassisControllerBridge.cs b/PepperDashEssentials/Bridges/DmBladeChassisControllerBridge.cs index 5c58b5db..6daddbb0 100644 --- a/PepperDashEssentials/Bridges/DmBladeChassisControllerBridge.cs +++ b/PepperDashEssentials/Bridges/DmBladeChassisControllerBridge.cs @@ -137,15 +137,15 @@ namespace PepperDash.Essentials.Bridges { } if (dmChassis.RxDictionary.ContainsKey(ioSlot)) { Debug.Console(2, "Creating Rx Feedbacks {0}", ioSlot); - var rxKey = dmChassis.RxDictionary[ioSlot]; - var rxDevice = DeviceManager.GetDeviceForKey(rxKey) as DmRmcControllerBase; - var hdBaseTDevice = DeviceManager.GetDeviceForKey(rxKey) as DmHdBaseTControllerBase; - if (hdBaseTDevice != null) { + //var rxKey = dmChassis.RxDictionary[ioSlot]; + //var rxDevice = DeviceManager.GetDeviceForKey(rxKey) as DmRmcControllerBase; + //var hdBaseTDevice = DeviceManager.GetDeviceForKey(rxKey) as DmHdBaseTControllerBase; + //if (hdBaseTDevice != null) { dmChassis.OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]); - } - else if (rxDevice != null) { - rxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]); - } + //} + //else if (rxDevice != null) { + // rxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]); + //} } // Feedback diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmBladeChassisController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmBladeChassisController.cs index e816f253..7d57127a 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmBladeChassisController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmBladeChassisController.cs @@ -177,9 +177,9 @@ namespace PepperDash.Essentials.DM { }); OutputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => { - if (Chassis.Outputs[tempX].Endpoint != null) - return Chassis.Outputs[tempX].Endpoint.IsOnline; - else + //if (Chassis.Outputs[tempX].Endpoint != null) + // return Chassis.Outputs[tempX].Endpoint.IsOnline; + //else return Chassis.Outputs[tempX].EndpointOnlineFeedback; }); }