Merge branch 'release/OpcUaRamaRed27'

IOB-WIN-NEXT/DATA/CONF/TFT_RAMA_001_alarm.json

@@ -802,7 +802,7 @@
   {
     "description": "Alarm Word 32 ",
     "tipoMem": "Byte",
-    "memAddr": "Alarm Word 32",
+    "memAddr": "Present Value.Alarm Word 32",
     "index": 32,
     "size": 2,
     "messages": [

IOB-WIN-NEXT/Iob/Generic.cs

@@ -1698,6 +1698,10 @@ namespace IOB_WIN_NEXT.Iob
                     }
                 }
             }
+            else
+            {
+                lgTrace("No alarm found in alarmMaps");
+            }
 
             if (periodicLog || outVal.Count > 0)
             {
@@ -5483,8 +5487,10 @@ namespace IOB_WIN_NEXT.Iob
                     lgInfoStartup($"File json ALLARMI composto da {jsonData.Length} caratteri");
                     try
                     {
+                        lgInfo("loadMemConf | Inizio setup allarmi");
                         alarmMaps = JsonConvert.DeserializeObject<List<BaseAlarmConf>>(jsonData);
                         setupAlarmMap();
+                        lgInfo("loadMemConf | Fine setup allarmi");
                     }
                     catch (Exception exc)
                     {

IOB-WIN-NEXT/IobOpc/OpcUa.cs

@@ -590,6 +590,11 @@ namespace IOB_WIN_NEXT.IobOpc
                     changed = checkSaveValue(MonIt, currVal, true) || forceSend;
                     // cerco se non sia un dato filtrato in FLUXLOG...
                     bool isFiltered = opcUaParams.fluxLogVeto.Contains(uuid);
+                    // cerco filtro ANCHE PER solo display name x contains...
+                    if(!isFiltered)
+                    {
+                        isFiltered = opcUaParams.fluxLogVetoContains.Contains(uuid) || opcUaParams.fluxLogVetoContains.Contains(MonIt.DisplayName) ;
+                    }
                     if (isFiltered)
                     {
                         lgTrace($"NON ACCODATO sample per {uuid} - trovato VETO in fluxLogVeto", false);
@@ -1213,6 +1218,7 @@ namespace IOB_WIN_NEXT.IobOpc
             int answ = 0;
             // recupero valore in formato stringa...
             string currStatus = getDataItemValue(item.memAddr);
+            lgTrace($"getAlarmStatus {item.memAddr} | currStatus: {currStatus}");
             // se non nullo --> recupero int
             if (!string.IsNullOrEmpty(currStatus))
             {