From bc6d144c2b8077fd96397a2d73f1df971ed29d5d Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 19 Sep 2023 09:21:04 +0200
Subject: [PATCH] Update x gestione display ordinal

---
 IOB-UT-NEXT/IOB-UT-NEXT.csproj         |  4 ++--
 IOB-UT-NEXT/packages.config            |  2 +-
 IOB-WIN-NEXT/DATA/CONF/IMI_GOMBA.json  | 26 ++++++++++----------
 IOB-WIN-NEXT/DATA/CONF/MAIN.ini        |  9 ++++---
 IOB-WIN-NEXT/DATA/CONF/SIMUL_01.json   | 33 +++++++++++++++++---------
 IOB-WIN-NEXT/IOB-WIN-NEXT.csproj       | 12 ++++------
 IOB-WIN-NEXT/Iob/Generic.cs            | 14 +++++------
 IOB-WIN-NEXT/Iob/Simula.cs             |  9 +++++++
 IOB-WIN-NEXT/IobModbusTCP/ModbusTCP.cs |  3 ++-
 IOB-WIN-NEXT/packages.config           |  2 +-
 10 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/IOB-UT-NEXT/IOB-UT-NEXT.csproj b/IOB-UT-NEXT/IOB-UT-NEXT.csproj
index 146ef077..6dce956f 100644
--- a/IOB-UT-NEXT/IOB-UT-NEXT.csproj
+++ b/IOB-UT-NEXT/IOB-UT-NEXT.csproj
@@ -81,8 +81,8 @@
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.4.2.13, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="MapoSDK, Version=6.14.2309.1610, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MapoSDK.6.14.2309.1610\lib\MapoSDK.dll</HintPath>
+    <Reference Include="MapoSDK, Version=6.14.2309.1908, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MapoSDK.6.14.2309.1908\lib\MapoSDK.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
diff --git a/IOB-UT-NEXT/packages.config b/IOB-UT-NEXT/packages.config
index 0fa92e81..5c2a3f51 100644
--- a/IOB-UT-NEXT/packages.config
+++ b/IOB-UT-NEXT/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MapoSDK" version="6.14.2309.1610" targetFramework="net462" />
+  <package id="MapoSDK" version="6.14.2309.1908" targetFramework="net462" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="NLog" version="5.2.3" targetFramework="net462" />
diff --git a/IOB-WIN-NEXT/DATA/CONF/IMI_GOMBA.json b/IOB-WIN-NEXT/DATA/CONF/IMI_GOMBA.json
index 3bfa8a2c..d3065b70 100644
--- a/IOB-WIN-NEXT/DATA/CONF/IMI_GOMBA.json
+++ b/IOB-WIN-NEXT/DATA/CONF/IMI_GOMBA.json
@@ -7,7 +7,7 @@
       "tipoMem": "String",
       "index": 0,
       "size": 1,
-      "displayOrder": 5
+      "displOrdinal": 5
     },
     "reqOUT": {
       "name": "reqOUT",
@@ -16,7 +16,7 @@
       "tipoMem": "String",
       "index": 0,
       "size": 1,
-      "displayOrder": 6
+      "displOrdinal": 6
     },
     "RM": {
       "name": "RM",
@@ -25,7 +25,7 @@
       "tipoMem": "String",
       "index": 0,
       "size": 1,
-      "displayOrder": 7
+      "displOrdinal": 7
     },
     "Cod1": {
       "name": "Cod1",
@@ -34,7 +34,7 @@
       "tipoMem": "String",
       "index": 0,
       "size": 1,
-      "displayOrder": 8
+      "displOrdinal": 8
     },
     "Cod2": {
       "name": "Cod2",
@@ -43,7 +43,7 @@
       "tipoMem": "String",
       "index": 0,
       "size": 1,
-      "displayOrder": 9
+      "displOrdinal": 9
     },
     "Cod3": {
       "name": "Cod3",
@@ -52,7 +52,7 @@
       "tipoMem": "String",
       "index": 0,
       "size": 1,
-      "displayOrder": 10
+      "displOrdinal": 10
     },
     "Cod4": {
       "name": "Cod4",
@@ -61,7 +61,7 @@
       "tipoMem": "String",
       "index": 0,
       "size": 1,
-      "displayOrder": 11
+      "displOrdinal": 11
     },
     "Cod5": {
       "name": "Cod5",
@@ -70,7 +70,7 @@
       "tipoMem": "String",
       "index": 0,
       "size": 1,
-      "displayOrder": 12
+      "displOrdinal": 12
     },
     "Cod6": {
       "name": "Cod6",
@@ -79,7 +79,7 @@
       "tipoMem": "String",
       "index": 0,
       "size": 1,
-      "displayOrder": 13
+      "displOrdinal": 13
     }
   },
   "mMapRead": {
@@ -93,7 +93,7 @@
       "func": "MAX",
       "period": 60,
       "factor": 1,
-      "displayOrder": 1
+      "displOrdinal": 1
     },
     "lastWeightOut": {
       "name": "lastWeightOut",
@@ -105,7 +105,7 @@
       "func": "MAX",
       "period": 60,
       "factor": 1,
-      "displayOrder": 2
+      "displOrdinal": 2
     },
     "lastRecIn": {
       "name": "lastRecIn",
@@ -117,7 +117,7 @@
       "func": "MAX",
       "period": 60,
       "factor": 1,
-      "displayOrder": 3
+      "displOrdinal": 3
     },
     "lastRecOut": {
       "name": "lastRecOut",
@@ -129,7 +129,7 @@
       "func": "MAX",
       "period": 60,
       "factor": 1,
-      "displayOrder": 4
+      "displOrdinal": 4
     }
   }
 }
diff --git a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini
index f961022f..419b72e8 100644
--- a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini
@@ -55,11 +55,10 @@ CLI_INST=SteamWareSim
 ;STARTLIST=PIZ10
 ;STARTLIST=IMI_SOITAAB_Z2342_02
 ;STARTLIST=IMI_GOMBA
-
-;STARTLIST=SIMUL_02
-;NB: mettere copy always ai file di conf x fare test...
-;STARTLIST=SIMUL_01
 ;STARTLIST=PING
-STARTLIST=IMI_GOMBA
+;STARTLIST=SIMUL_02
+
+;NB: mettere copy always ai file di conf x fare test...
+STARTLIST=SIMUL_01
 
 MAXCNC=10
\ No newline at end of file
diff --git a/IOB-WIN-NEXT/DATA/CONF/SIMUL_01.json b/IOB-WIN-NEXT/DATA/CONF/SIMUL_01.json
index e6057ae6..1421c1e1 100644
--- a/IOB-WIN-NEXT/DATA/CONF/SIMUL_01.json
+++ b/IOB-WIN-NEXT/DATA/CONF/SIMUL_01.json
@@ -6,7 +6,8 @@
       "memAddr": "DB150.DBB12",
       "tipoMem": "String",
       "index": 12,
-      "size": 20
+      "size": 20,
+      "displOrdinal": 1
     },
     "setComm": {
       "name": "setComm",
@@ -14,7 +15,8 @@
       "memAddr": "DB150.DBB32",
       "tipoMem": "String",
       "index": 32,
-      "size": 20
+      "size": 20,
+      "displOrdinal": 2
     },
     "setPzComm": {
       "name": "setPzComm",
@@ -22,7 +24,8 @@
       "memAddr": "DB150.DBB8",
       "tipoMem": "Int",
       "index": 8,
-      "size": 4
+      "size": 4,
+      "displOrdinal": 3
     },
     "forceSetPzCount": {
       "name": "forceSetPzCount",
@@ -30,7 +33,8 @@
       "memAddr": "DB150.DBB8",
       "tipoMem": "Int",
       "index": 8,
-      "size": 4
+      "size": 4,
+      "displOrdinal": 11
     }
   },
   "mMapRead": {
@@ -39,49 +43,56 @@
       "description": "Temperatura 01",
       "tipoMem": "Real",
       "minVal": 18,
-      "maxVal": 24
+      "maxVal": 24,
+      "displOrdinal": 4
     },
     "POWER_01": {
       "name": "POWER_01",
       "description": "Potenza impianto",
       "tipoMem": "Int",
       "minVal": 40,
-      "maxVal": 80
+      "maxVal": 80,
+      "displOrdinal": 5
     },
     "FEED_OVER": {
       "name": "FEED_OVER",
       "description": "FEED override",
       "tipoMem": "Int",
       "minVal": 0,
-      "maxVal": 100
+      "maxVal": 100,
+      "displOrdinal": 6
     },
     "RAPID_OVER": {
       "name": "RAPID_OVER",
       "description": "RAPID override",
       "tipoMem": "Int",
       "minVal": 50,
-      "maxVal": 120
+      "maxVal": 120,
+      "displOrdinal": 7
     },
     "POS_X": {
       "name": "POS_X",
       "description": "Asse X",
       "tipoMem": "Int",
       "minVal": -2000,
-      "maxVal": 2000
+      "maxVal": 2000,
+      "displOrdinal": 8
     },
     "POS_Y": {
       "name": "POS_Y",
       "description": "Asse Y",
       "tipoMem": "Int",
       "minVal": 0,
-      "maxVal": 2000
+      "maxVal": 2000,
+      "displOrdinal": 9
     },
     "POS_Z": {
       "name": "POS_Z",
       "description": "Asse Z",
       "tipoMem": "Int",
       "minVal": 0,
-      "maxVal": 1500
+      "maxVal": 1500,
+      "displOrdinal": 10
     }
   },
   "optKVP": {
diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
index 3b777385..16546474 100644
--- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
@@ -147,8 +147,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>ExtLib\krcc.dll</HintPath>
     </Reference>
-    <Reference Include="MapoSDK, Version=6.14.2309.1610, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MapoSDK.6.14.2309.1610\lib\MapoSDK.dll</HintPath>
+    <Reference Include="MapoSDK, Version=6.14.2309.1908, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MapoSDK.6.14.2309.1908\lib\MapoSDK.dll</HintPath>
     </Reference>
     <Reference Include="MathNet.Numerics, Version=4.15.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MathNet.Numerics.4.15.0\lib\net461\MathNet.Numerics.dll</HintPath>
@@ -489,14 +489,10 @@
     </Compile>
     <Compile Include="UAClient.cs" />
     <Compile Include="utils.cs" />
-    <None Include="DATA\CONF\IMI_GOMBA.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <None Include="DATA\CONF\IMI_GOMBA.json" />
     <None Include="DATA\CONF\IMI_PAMA_392.ini" />
     <None Include="DATA\CONF\IMI_PAMA_392.json" />
-    <None Include="DATA\CONF\IMI_GOMBA.ini">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <None Include="DATA\CONF\IMI_GOMBA.ini" />
     <None Include="DATA\CONF\IMI_SOITAAB_Z2342_02.ini" />
     <None Include="DATA\CONF\IMI_SOITAAB_Z2342_02.json" />
     <None Include="DATA\CONF\IMI_SOITAAB_Z2342_01.ini" />
diff --git a/IOB-WIN-NEXT/Iob/Generic.cs b/IOB-WIN-NEXT/Iob/Generic.cs
index c29915a1..a202bebb 100644
--- a/IOB-WIN-NEXT/Iob/Generic.cs
+++ b/IOB-WIN-NEXT/Iob/Generic.cs
@@ -61,10 +61,7 @@ namespace IOB_WIN_NEXT.Iob
                 lastLogStartup = DateTime.Now;
 
                 // setup currProdData & last prod data
-                currProdData = redisMan.redGetHashDict(rKeyCurrProdData); 
-#if false
-                lastProdData = redisMan.redGetHashDict(rKeyCurrProdData);
-#endif
+                currProdData = redisMan.redGetHashDict(rKeyCurrProdData);
 
                 // aggiungo altri defaults
                 setDefaults(true);
@@ -6089,7 +6086,8 @@ namespace IOB_WIN_NEXT.Iob
                         writable = true,
                         UM = item.Value.unit,
                         valMin = item.Value.minVal,
-                        valMax = item.Value.maxVal
+                        valMax = item.Value.maxVal,
+                        displOrdinal = item.Value.displOrdinal
                     };
                     allParam.Add(currItem);
                 }
@@ -6108,7 +6106,8 @@ namespace IOB_WIN_NEXT.Iob
                             writable = false,
                             UM = item.Value.unit,
                             valMin = item.Value.minVal,
-                            valMax = item.Value.maxVal
+                            valMax = item.Value.maxVal,
+                            displOrdinal = item.Value.displOrdinal
                         };
                         allParam.Add(currItem);
                     }
@@ -7073,7 +7072,8 @@ namespace IOB_WIN_NEXT.Iob
                             reqValue = memMap.mMapWrite[item.Key].value,
                             value = item.Value,
                             lastRequest = DateTime.Now,
-                            writable = true
+                            writable = true,
+                            displOrdinal = memMap.mMapWrite[item.Key].displOrdinal
                         };
                         updatedPar.Add(newWrite);
                     }
diff --git a/IOB-WIN-NEXT/Iob/Simula.cs b/IOB-WIN-NEXT/Iob/Simula.cs
index 32f2e160..f23d85e2 100644
--- a/IOB-WIN-NEXT/Iob/Simula.cs
+++ b/IOB-WIN-NEXT/Iob/Simula.cs
@@ -745,6 +745,15 @@ namespace IOB_WIN_NEXT.Iob
                             serObj = JsonConvert.SerializeObject(currMem, Formatting.Indented);
                             lgInfo($"---------------MEMORY CONTENT---------------{Environment.NewLine}{serObj}{Environment.NewLine}---------------");
                             lgInfo($"---------------MemBlock data---------------{Environment.NewLine}{BitConverter.ToString(MemBlock)}{Environment.NewLine}--------------- END data ---------------");
+
+                            // registro x invio
+                            item.value = item.reqValue;
+                            item.reqValue = "";
+                            // invio su server i parametri aggiornati!
+                            string rawData = JsonConvert.SerializeObject(updatedPar);
+                            lgInfo("Notifica a server scrittura parametri");
+                            utils.callUrl($"{urlUpdateWriteParams}", rawData);
+
                         }
                         else
                         {
diff --git a/IOB-WIN-NEXT/IobModbusTCP/ModbusTCP.cs b/IOB-WIN-NEXT/IobModbusTCP/ModbusTCP.cs
index 32e547ff..2c1f40eb 100644
--- a/IOB-WIN-NEXT/IobModbusTCP/ModbusTCP.cs
+++ b/IOB-WIN-NEXT/IobModbusTCP/ModbusTCP.cs
@@ -131,7 +131,8 @@ namespace IOB_WIN_NEXT.IobModbusTCP
                                     value = item.Value,
                                     reqValue = "",
                                     writable = true,
-                                    lastRequest = DateTime.Now
+                                    lastRequest = DateTime.Now,
+                                    displOrdinal= memMap.mMapWrite[item.Key].displOrdinal
                                 };
                                 updatedPar.Add(newParam);
                                 // richiamo scrittura parametri su PLC
diff --git a/IOB-WIN-NEXT/packages.config b/IOB-WIN-NEXT/packages.config
index 871b285d..e95858d9 100644
--- a/IOB-WIN-NEXT/packages.config
+++ b/IOB-WIN-NEXT/packages.config
@@ -12,7 +12,7 @@
   <package id="EntityFramework" version="6.4.4" targetFramework="net462" />
   <package id="FluentFTP" version="41.0.0" targetFramework="net462" />
   <package id="Fody" version="6.8.0" targetFramework="net462" developmentDependency="true" />
-  <package id="MapoSDK" version="6.14.2309.1610" targetFramework="net462" />
+  <package id="MapoSDK" version="6.14.2309.1908" targetFramework="net462" />
   <package id="MathNet.Numerics" version="4.15.0" targetFramework="net462" />
   <package id="Microsoft.CodeAnalysis.NetAnalyzers" version="6.0.0" targetFramework="net462" developmentDependency="true" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.0" targetFramework="net462" />