From b7435c8703ad501b8a351240bbb7e49de3d32ecd Mon Sep 17 00:00:00 2001
From: "S.E.Locatelli" <samuele@steamware.net>
Date: Tue, 24 May 2022 18:03:47 +0200
Subject: [PATCH] Correzione stack variabili da SOAP client...

---
 IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json |  2 +-
 IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.ini   |  3 +-
 IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.json  | 40 ++++++++++++++++++++
 IOB-WIN-NEXT/IOB-WIN-NEXT.csproj             |  3 ++
 IOB-WIN-NEXT/IobGeneric.cs                   | 14 ++++---
 IOB-WIN-NEXT/IobIcoelSoap.cs                 |  6 ++-
 6 files changed, 59 insertions(+), 9 deletions(-)
 create mode 100644 IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.json

diff --git a/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json b/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json
index aa1a3a1c..c0f4eb4f 100644
--- a/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json
+++ b/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json
@@ -151,7 +151,7 @@
     },
     "PPM": {
       "name": "PPM",
-      "description": "Velocità espressa come Pacchi Per Minuto",
+      "description": "Velocit� espressa come Pacchi Per Minuto",
       "memAddr": "41106",
       "tipoMem": "Real",
       "index": 1106,
diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.ini b/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.ini
index 5f31ebca..d5ce3b98 100644
--- a/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.ini
+++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.ini
@@ -67,8 +67,9 @@ ENABLE_DATA_FILTER=TRUE
 ENABLE_CLI_RESTART=TRUE
 VETO_SIG_IN=TRUE
 
+
 ; conf parametri memoria READ/WRITE
-OPC_PARAM_CONF=GIACO_ICOEL_001.json
+PARAM_CONF=GIACO_ICOEL_002.json
 
 [BRANCH]
 NAME=master
\ No newline at end of file
diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.json b/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.json
new file mode 100644
index 00000000..0a64c117
--- /dev/null
+++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.json
@@ -0,0 +1,40 @@
+{
+  "mMapWrite": {
+
+  },
+  "mMapRead": {
+    "VelTonnOra": {
+      "name": "VelTonnOra",
+      "description": "Velocità Impianto Tonnellate / Ora",
+      "memAddr": "VelTonnOra",
+      "tipoMem": "Real",
+      "index": 0,
+      "size": 0,
+      "func": "MEDIAN",
+      "period": 60,
+      "factor": 1
+    },
+    "VelFruttiMinuto": {
+      "name": "VelFruttiMinuto",
+      "description": "Velocità Impianto Frutti / Minuto",
+      "memAddr": "VelFruttiMinuto",
+      "tipoMem": "Real",
+      "index": 0,
+      "size": 0,
+      "func": "MEDIAN",
+      "period": 60,
+      "factor": 1
+    },
+    "PercRiemp": {
+      "name": "PercRiemp",
+      "description": "Percentuale riempimento carrelli",
+      "memAddr": "PercRiemp",
+      "tipoMem": "Real",
+      "index": 0,
+      "size": 0,
+      "func": "MEDIAN",
+      "period": 60,
+      "factor": 1
+    }
+  }
+}
diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
index 56559ae5..92634acb 100644
--- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
@@ -272,6 +272,9 @@
     <None Include="DATA\CONF\1033.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="DATA\CONF\GIACO_ICOEL_002.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="DATA\CONF\1034.ini" />
     <None Include="DATA\CONF\1034.json" />
     <None Include="DATA\CONF\1035.ini" />
diff --git a/IOB-WIN-NEXT/IobGeneric.cs b/IOB-WIN-NEXT/IobGeneric.cs
index 96bc2a7a..872d6408 100644
--- a/IOB-WIN-NEXT/IobGeneric.cs
+++ b/IOB-WIN-NEXT/IobGeneric.cs
@@ -2961,7 +2961,7 @@ namespace IOB_WIN_NEXT
             string jsonParams = getOptPar("PARAM_CONF");
             if (!string.IsNullOrEmpty(jsonParams))
             {
-                string jsonFileName = $"{Application.StartupPath}/DATA/CONF/{jsonParams}";
+                string jsonFileName = $"{Application.StartupPath}\\DATA\\CONF\\{jsonParams}";
                 lgInfoStartup($"Apertura file {jsonFileName}");
                 StreamReader reader = new StreamReader(jsonFileName);
                 string jsonData = reader.ReadToEnd();
@@ -5398,16 +5398,18 @@ namespace IOB_WIN_NEXT
         /// <param name="resetQueue">indica se sia richeisto di SVUOTARE le code delel info</param>
         public virtual void startAdapter(bool resetQueue)
         {
+            DateTime adesso= DateTime.Now; ;
+            DateTime scaduto = adesso.AddMinutes(-10);
             lgInfo("Starting adapter...");
             maxJsonData = utils.CRI("maxJsonData");
             maxJsonDataEv = utils.CRI("maxJsonDataEv");
             parentForm.commPlcActive = false;
             adpRunning = true;
-            dtAvvioAdp = DateTime.Now;
-            lastWatchDog = dtAvvioAdp;
-            lastPING = dtAvvioAdp;
-            lastReadPLC = dtAvvioAdp.AddMinutes(-1);
-            lastDisconnCheck = dtAvvioAdp;
+            dtAvvioAdp = adesso;
+            lastWatchDog = scaduto;
+            lastPING = scaduto;
+            lastReadPLC = scaduto;
+            lastDisconnCheck = scaduto;
             TimingData.resetData();
             // aggiungo altri defaults
             setDefaults(resetQueue);
diff --git a/IOB-WIN-NEXT/IobIcoelSoap.cs b/IOB-WIN-NEXT/IobIcoelSoap.cs
index 9e27f126..736cc80d 100644
--- a/IOB-WIN-NEXT/IobIcoelSoap.cs
+++ b/IOB-WIN-NEXT/IobIcoelSoap.cs
@@ -41,6 +41,7 @@ namespace IOB_WIN_NEXT
              */
 
             IcoelSizer = new Connector(IOBConf.cncIpAddr, IOBConf.cncPort);
+            lastPING = DateTime.Now.AddHours(-1);
         }
 
         /// <summary>
@@ -95,7 +96,10 @@ namespace IOB_WIN_NEXT
             var perfParamDict = IcoelSizer.GetPerfMeters();
             foreach (var item in perfParamDict)
             {
-                outVal.Add(item.Key, $"{item.Value:N2}");
+                saveValue(ref outVal, item.Value, item.Key);
+#if false
+                outVal.Add(item.Key, $"{item.Value:N2}"); 
+#endif
             }
             return outVal;
         }