From 85d8fd56ac739fab200f73de9e138896ea3ce05f Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 17 Dec 2021 16:55:48 +0100
Subject: [PATCH 1/3] fix condizioni poweron, ready, error di BLM

---
 IOB-WIN-NEXT/DATA/CONF/MECART_80.json | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/IOB-WIN-NEXT/DATA/CONF/MECART_80.json b/IOB-WIN-NEXT/DATA/CONF/MECART_80.json
index 5c341acc..c3e45cf8 100644
--- a/IOB-WIN-NEXT/DATA/CONF/MECART_80.json
+++ b/IOB-WIN-NEXT/DATA/CONF/MECART_80.json
@@ -29,20 +29,29 @@
   },
   "condPowerOn": {
     "checkMode": "OR",
+    "negateValue": true,
     "checkList": [
       {
         "keyName": "MachineStatus(0)",
-        "targetValue": "2"
+        "targetValue": "0"
       },
       {
         "keyName": "MachineStatus(0)",
-        "targetValue": "3"
+        "targetValue": "1"
+      },
+      {
+        "keyName": "MachineStatus(0)",
+        "targetValue": "2"
       }
     ]
   },
   "condReady": {
-    "checkMode": "AND",
+    "checkMode": "OR",
     "checkList": [
+      {
+        "keyName": "MachineStatus(0)",
+        "targetValue": "3"
+      },
       {
         "keyName": "MachineStatus(0)",
         "targetValue": "5"
@@ -69,7 +78,6 @@
   },
   "condError": {
     "checkMode": "AND",
-    "negateValue": true,
     "checkList": [
       {
         "keyName": "MachineStatus(0)",
@@ -83,6 +91,7 @@
   },
   "condWarmUpCoolDown": {
     "checkMode": "OR",
+    "negateValue": true,
     "checkList": []
   },
   "condWarning": {

From ae6e6d6ee87a3bf8f18259341b088f4c2006611e Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Sat, 18 Dec 2021 12:42:18 +0100
Subject: [PATCH 2/3] Test nuova conf allarmi con blink variabile (conf > 30)

---
 IOB-UT-NEXT/ToMapo.cs                   | 2 +-
 IOB-WIN-NEXT/DATA/CONF/MAIN.ini         | 8 ++++----
 IOB-WIN-NEXT/DATA/CONF/PIZ09_alarm.json | 2 ++
 IOB-WIN-NEXT/IobGeneric.cs              | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/IOB-UT-NEXT/ToMapo.cs b/IOB-UT-NEXT/ToMapo.cs
index 6db0f6a6..811f1d60 100644
--- a/IOB-UT-NEXT/ToMapo.cs
+++ b/IOB-UT-NEXT/ToMapo.cs
@@ -19,7 +19,7 @@ namespace IOB_UT_NEXT
         /// <summary>
         /// valore di partenza x un segnale di blink in caso di inizio variazione
         /// </summary>
-        public int blinkVal = 30;
+        public int blinkVal { get; set; } = 30;
 
         #endregion Public Fields
 
diff --git a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini
index 6558e382..ef10936e 100644
--- a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini
@@ -60,18 +60,18 @@ CLI_INST=SteamWareSim
 
 ; SIMULAZIONE verso server ufficio
 ;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04
-;STARTLIST=SIM_DP_01
 ;STARTLIST=TEST
+;STARTLIST=SIM_DP_01
 ;STARTLIST=SIMUL_01
 ;STARTLIST=1032
-;STARTLIST=1033
 ;STARTLIST=PIZ03
 ;STARTLIST=PIZ04
 ;STARTLIST=OPC_UA
 ;STARTLIST=FOV062
 ;STARTLIST=FP_TR2
-;STARTLIST=PING
 ;STARTLIST=SIM_PIZ03
-STARTLIST=MECART_80
+;STARTLIST=MECART_80
+;STARTLIST=PING
+STARTLIST=PIZ09
 
 MAXCNC=10
\ No newline at end of file
diff --git a/IOB-WIN-NEXT/DATA/CONF/PIZ09_alarm.json b/IOB-WIN-NEXT/DATA/CONF/PIZ09_alarm.json
index bcb583bc..e24aa3f0 100644
--- a/IOB-WIN-NEXT/DATA/CONF/PIZ09_alarm.json
+++ b/IOB-WIN-NEXT/DATA/CONF/PIZ09_alarm.json
@@ -1,5 +1,6 @@
 [
   {
+    "blinkVal": 100,
     "description": "Allarmi Impianto",
     "tipoMem": "DInt",
     "memAddr": "40901",
@@ -25,6 +26,7 @@
     ]
   },
   {
+    "blinkVal": 100,
     "description": "Emergenza",
     "tipoMem": "DInt",
     "memAddr": "40907",
diff --git a/IOB-WIN-NEXT/IobGeneric.cs b/IOB-WIN-NEXT/IobGeneric.cs
index deb4b133..c6b6314e 100644
--- a/IOB-WIN-NEXT/IobGeneric.cs
+++ b/IOB-WIN-NEXT/IobGeneric.cs
@@ -3001,7 +3001,7 @@ namespace IOB_WIN_NEXT
             {
                 item.setupData();
                 // loggo
-                lgInfo($"Decodifica aree alarmMap: {item.description} | {item.memAddr} x {item.size} byte | {item.messages} messaggi allarme");
+                lgDebug($"Decodifica aree alarmMap: {item.description} | {item.memAddr} x {item.size} byte | {item.messages} messaggi allarme");
             }
             // invio oggetto alarmMap al server x successiva decodifica
 
@@ -3018,7 +3018,7 @@ namespace IOB_WIN_NEXT
             if (utils.CRB("verbose"))
             {
                 string rawMemConf = JsonConvert.SerializeObject(memMap, Formatting.Indented);
-                lgInfo($"setupMemMap | configurazione memoria R/W:{Environment.NewLine}{rawMemConf}");
+                lgDebug($"setupMemMap | configurazione memoria R/W:{Environment.NewLine}{rawMemConf}");
             }
             // se ho variabili read --> genero dati TSVC...
             if (memMap.mMapRead.Count > 0)

From 1cb62fa7a0ba890c5e5ff444475f19830da349e1 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Sat, 18 Dec 2021 12:43:43 +0100
Subject: [PATCH 3/3] update log x mancato ACK invio allarme

---
 IOB-WIN-NEXT/IobGeneric.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IOB-WIN-NEXT/IobGeneric.cs b/IOB-WIN-NEXT/IobGeneric.cs
index c6b6314e..26982344 100644
--- a/IOB-WIN-NEXT/IobGeneric.cs
+++ b/IOB-WIN-NEXT/IobGeneric.cs
@@ -4735,6 +4735,10 @@ namespace IOB_WIN_NEXT
                         fatto = true;
                     }
                 }
+                else
+                {
+                    lgError($"Errore in invio richiesta registrazione allarme: URL: {lastUrl}{Environment.NewLine}Payload:{Environment.NewLine}{rawData}");
+                }
             }
             return fatto;
         }