From b4d0ca19432c080e843959dce9fc5ca920eb5750 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 22 Jul 2019 18:20:29 +0200 Subject: [PATCH] FIX proc sel che mostro solo se >1 processo oppure MTC.. --- MTC_Adapter/SCMA/AdapterGeneric.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/MTC_Adapter/SCMA/AdapterGeneric.cs b/MTC_Adapter/SCMA/AdapterGeneric.cs index c935272..de7d8f3 100644 --- a/MTC_Adapter/SCMA/AdapterGeneric.cs +++ b/MTC_Adapter/SCMA/AdapterGeneric.cs @@ -576,7 +576,7 @@ namespace SCMA currGateway.addItemNodeAndSet("Emergency", itemType.Event, availStatus.NULL.ToString().ToLower()); } // solo se sono in modalità MTC aggiungo item cablati... - else + else { // item disponibilità currGateway.addItemNodeAndSet("AVAIL", itemType.Event, availStatus.AVAILABLE.ToString()); @@ -600,7 +600,6 @@ namespace SCMA currGateway.addItemNodeAndSet("ACC_TIME_WORK", itemType.Event, availStatus.NULL.ToString().ToLower()); currGateway.addItemNodeAndSet("POWER", itemType.Event, availStatus.NULL.ToString().ToLower()); - currGateway.addItemNodeAndSet("PROC_SEL", itemType.Event, availStatus.NULL.ToString().ToLower()); // testing e autodiagnostica currGateway.addItemNodeAndSet("TESTING_DATA", itemType.Message, ""); @@ -682,6 +681,11 @@ namespace SCMA currGateway.addItemNodeAndSet(vettTempe[i].valueKey, itemType.Sample, availStatus.NULL.ToString().ToLower()); } // Path + // lo riporto SOLO SE HO almeno 2 processi oppure protocollo NON OPC-UA + if (currGateway.protocollo != gwProtocol.SOURS || currAdpConf.nPath > 1) + { + currGateway.addItemNodeAndSet("PROC_SEL", itemType.Event, availStatus.NULL.ToString().ToLower()); + } vettPath = new Path[adpConf.nPath]; for (int i = 0; i < adpConf.nPath; i++) { @@ -3660,7 +3664,11 @@ namespace SCMA if (currGateway.getItemNode("PROC_SEL").ToString() != procSel) { - currGateway.updateItemNodeValue("PROC_SEL", procSel); + // lo riporto SOLO SE HO almeno 2 processi oppure protocollo NON OPC-UA + if (currGateway.protocollo != gwProtocol.SOURS || currAdpConf.nPath > 1) + { + currGateway.updateItemNodeValue("PROC_SEL", procSel); + } } // processo ora i dai dei path... di sicuro il primo