diff --git a/IOB-UT-NEXT/Enums.cs b/IOB-UT-NEXT/Enums.cs
index 489df0d3..501d4cba 100644
--- a/IOB-UT-NEXT/Enums.cs
+++ b/IOB-UT-NEXT/Enums.cs
@@ -513,4 +513,5 @@ namespace IOB_UT_NEXT
///
ULog
}
+
}
\ No newline at end of file
diff --git a/IOB-UT-NEXT/IOB-UT-NEXT.csproj b/IOB-UT-NEXT/IOB-UT-NEXT.csproj
index 99354ab9..afe65aef 100644
--- a/IOB-UT-NEXT/IOB-UT-NEXT.csproj
+++ b/IOB-UT-NEXT/IOB-UT-NEXT.csproj
@@ -59,8 +59,8 @@
..\packages\SharpZipLib.1.3.1\lib\net45\ICSharpCode.SharpZipLib.dll
-
- ..\packages\MapoSDK.6.14.2207.1318\lib\MapoSDK.dll
+
+ ..\packages\MapoSDK.6.14.2207.2913\lib\MapoSDK.dll
..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
diff --git a/IOB-UT-NEXT/packages.config b/IOB-UT-NEXT/packages.config
index 860e4d82..e0669a95 100644
--- a/IOB-UT-NEXT/packages.config
+++ b/IOB-UT-NEXT/packages.config
@@ -1,6 +1,6 @@
-
+
diff --git a/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.ini b/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.ini
index eed6e817..f9293f27 100644
--- a/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.ini
+++ b/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.ini
@@ -14,7 +14,7 @@ IP=10.150.0.20
PORT=502
[SERVER]
-MPIP=https://10.150.0.1
+MPIP=http://10.150.0.1
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
diff --git a/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json b/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json
index 6152a1c9..8312493c 100644
--- a/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json
+++ b/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json
@@ -105,7 +105,7 @@
"name": "NumPacchi",
"description": "Numero Pacchi Richiesti",
"memAddr": "41098",
- "tipoMem": "INT",
+ "tipoMem": "IntLH",
"index": 1098,
"size": 2,
"unit": "#",
@@ -117,7 +117,7 @@
"name": "NumPacchiFatti",
"description": "Numero Pacchi Fatti",
"memAddr": "41100",
- "tipoMem": "INT",
+ "tipoMem": "IntLH",
"index": 1100,
"size": 2,
"unit": "#",
@@ -129,7 +129,7 @@
"name": "EpochStart",
"description": "DateTime inizio lavorazione formato EPOCH",
"memAddr": "41102",
- "tipoMem": "INT",
+ "tipoMem": "IntLH",
"index": 1102,
"size": 2,
"unit": "EPOCH",
@@ -141,7 +141,7 @@
"name": "EpochStop",
"description": "DateTime fine lavorazione formato EPOCH",
"memAddr": "41104",
- "tipoMem": "INT",
+ "tipoMem": "IntLH",
"index": 1104,
"size": 2,
"unit": "EPOCH",
diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
index 06381f4b..14075fa5 100644
--- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
@@ -112,8 +112,8 @@
False
ExtLib\krcc.dll
-
- ..\packages\MapoSDK.6.14.2207.1318\lib\MapoSDK.dll
+
+ ..\packages\MapoSDK.6.14.2207.2913\lib\MapoSDK.dll
..\packages\MathNet.Numerics.4.15.0\lib\net461\MathNet.Numerics.dll
diff --git a/IOB-WIN-NEXT/IobModbusTCP.cs b/IOB-WIN-NEXT/IobModbusTCP.cs
index c18eb2e8..87b68de3 100644
--- a/IOB-WIN-NEXT/IobModbusTCP.cs
+++ b/IOB-WIN-NEXT/IobModbusTCP.cs
@@ -1199,6 +1199,21 @@ namespace IOB_WIN_NEXT
valore = listInt[0];
}
break;
+
+ case plcDataType.IntLH:
+ case plcDataType.DIntLH:
+ if (size == 4)
+ {
+ Array.Reverse(listInt);
+ valore = ModbusClient.ConvertRegistersToLong(listInt);
+ }
+ else if (size == 2)
+ {
+ Array.Reverse(listInt);
+ valore = ModbusClient.ConvertRegistersToInt(listInt);
+ }
+ break;
+
}
return valore;
}
@@ -1333,6 +1348,14 @@ namespace IOB_WIN_NEXT
// valore string...
valString = ModbusClient.ConvertRegistersToString(listInt, 0, item.Value.size);
}
+ //else if (item.Value.unit == "EPOCH")
+ //{
+ // // devo prendere i dati come UInt quindi li metto insieme upper/lower
+ // UInt32 uint32 = (uint)listInt[0];
+ // uint32 <<= 16;
+ // uint32 |= (uint)listInt[1];
+ // valore = (double)uint32;
+ //}
else
{
// valori numerici...
@@ -1394,6 +1417,21 @@ namespace IOB_WIN_NEXT
// valore string...
valString = ModbusClient.ConvertRegistersToString(listInt, 0, item.Value.size);
}
+ //else if (item.Value.unit == "EPOCH")
+ //{
+ // // devo prendere i dati come UInt quindi li metto insieme upper/lower
+ // var hVal = BitConverter.ToUInt16(BitConverter.GetBytes(listInt[0]), 0);
+ // var lVal = BitConverter.ToUInt16(BitConverter.GetBytes(listInt[1]), 0);
+ // // ricostruisco da due Uint16 un Uint32
+ // UInt32 uint32 = hVal;
+ // uint32 <<= 16;
+ // uint32 |= lVal;
+ // valore = (double)uint32;
+ // //byte[] rawData = new byte[4];
+ // //Array.Copy(BitConverter.GetBytes(listInt[0]), 0, rawData, 2, 2);
+ // //Array.Copy(BitConverter.GetBytes(listInt[1]), 0, rawData, 0, 2);
+ // //var valTest = BitConverter.ToUInt32(rawData, 0);
+ //}
else
{
valore = convertFromReg(listInt, item.Value.size, item.Value.tipoMem);
diff --git a/IOB-WIN-NEXT/packages.config b/IOB-WIN-NEXT/packages.config
index ad4d2632..88567de8 100644
--- a/IOB-WIN-NEXT/packages.config
+++ b/IOB-WIN-NEXT/packages.config
@@ -6,7 +6,7 @@
-
+