From 88de2a2ee0057e2531cce3e6896196508f27875f Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 31 Aug 2017 16:41:31 -0600 Subject: [PATCH] Updates to Fusion SetUpCommunicationMonitors() method to properly link TPs vs Xpanels by base class type. --- .../Fusion/FusionSystemController.cs | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs b/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs index 1e314bd6..23d0eace 100644 --- a/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs +++ b/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs @@ -955,24 +955,23 @@ namespace PepperDash.Essentials.Fusion string attrName = null; uint attrNum = Convert.ToUInt32(keyNum); - - - if (dev is BasicTriListWithSmartObject) + if (dev is EssentialsTouchpanelController) { - if (attrNum > 10) - continue; - attrName = "Online - Touch Panel " + attrNum; - attrNum += 150; - } - // add xpanel here - - if (dev is Crestron.SimplSharpPro.UI.XpanelForSmartGraphics) - { - if (attrNum > 10) - continue; - attrName = "Online - XPanel " + attrNum; - attrNum += 160; - } + if ((dev as EssentialsTouchpanelController).Panel is Crestron.SimplSharpPro.DeviceSupport.TswFt5Button) + { + if (attrNum > 10) + continue; + attrName = "Online - Touch Panel " + attrNum; + attrNum += 150; + } + else if (dev is Crestron.SimplSharpPro.UI.XpanelForSmartGraphics) + { + if (attrNum > 10) + continue; + attrName = "Online - XPanel " + attrNum; + attrNum += 160; + } + } //else if (dev is DisplayBase)