From 026e3b91a96b6755e83139a74ad9ae610f0e62c1 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 14 Dec 2021 11:52:17 +0100 Subject: [PATCH 1/2] OPC-UA: fir recupero subscribed list --- IOB-WIN-NEXT/IobOpcUa.cs | 5 +++++ IOB-WIN-NEXT/IobOpcUaEwon.cs | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/IOB-WIN-NEXT/IobOpcUa.cs b/IOB-WIN-NEXT/IobOpcUa.cs index 1507b508..f626961f 100644 --- a/IOB-WIN-NEXT/IobOpcUa.cs +++ b/IOB-WIN-NEXT/IobOpcUa.cs @@ -360,10 +360,15 @@ namespace IOB_WIN_NEXT // cerco e aggiungo SOLO quelle indicati foreach (var currItem in opcUaParams.subscribedItems) { + string fullName = $"ns={opcUaParams.BrowseNSIndex},s={currItem}"; if (nodeIdNameList.ContainsKey(currItem)) { selectedItemList.Add(currItem, nodeIdNameList[currItem]); } + else if (nodeIdNameList.ContainsKey(fullName)) + { + selectedItemList.Add(fullName, nodeIdNameList[fullName]); + } } } // altrimenti tutti! diff --git a/IOB-WIN-NEXT/IobOpcUaEwon.cs b/IOB-WIN-NEXT/IobOpcUaEwon.cs index 9a7ac7f2..5196459c 100644 --- a/IOB-WIN-NEXT/IobOpcUaEwon.cs +++ b/IOB-WIN-NEXT/IobOpcUaEwon.cs @@ -64,8 +64,8 @@ namespace IOB_WIN_NEXT * B3: allarme * B4: manuale * B5: SlowTC (NON gestito qui) - * B6: warm-up / cool-down - * B7: emergenza + * B6: warm-up / cool-down / setup + * B7: emergenza ARMATA (1=ok, 0 = premuta) ---------------------------------------------------- */ // se valido il check ping lo eseguo... altrimenti lo do x buono From 8320074cac3084978fbb8fc09ce63572b9a65983 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 14 Dec 2021 11:52:21 +0100 Subject: [PATCH 2/2] update conf STEL --- IOB-WIN-NEXT/DATA/CONF/STEL_200.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IOB-WIN-NEXT/DATA/CONF/STEL_200.json b/IOB-WIN-NEXT/DATA/CONF/STEL_200.json index 6cc6df49..7b6a2ef6 100644 --- a/IOB-WIN-NEXT/DATA/CONF/STEL_200.json +++ b/IOB-WIN-NEXT/DATA/CONF/STEL_200.json @@ -76,7 +76,7 @@ ] }, "fluxLogVeto": [ - "L2p1CommonVariable" + "" ], "itemTranslation": { "avail": "Machine Available",