diff --git a/IOB-UT-NEXT/IOB-UT-NEXT.csproj b/IOB-UT-NEXT/IOB-UT-NEXT.csproj index 1fdf8d09..6c00d9c9 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.2205.2808\lib\MapoSDK.dll + + ..\packages\MapoSDK.6.14.2207.1318\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 26591de3..860e4d82 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/GIACO_CENTERFRIGO.json b/IOB-WIN-NEXT/DATA/CONF/GIACO_CENTERFRIGO.json index 3d53fc48..8dcb58fc 100644 --- a/IOB-WIN-NEXT/DATA/CONF/GIACO_CENTERFRIGO.json +++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_CENTERFRIGO.json @@ -1,88 +1,64 @@ { "mMapWrite": { - "TestWrite01": { - "name": "TestWrite01", - "description": "Test Scrittura 01", + "SetPoint_Tunnel_Req": { + "name": "SetPoint_Tunnel_Req", + "description": "Setpoint Tunnel", "memAddr": "44010", - "tipoMem": "FloatBADC", + "tipoMem": "RealLH", "index": 4010, "size": 2, - "func": "MEDIAN", - "period": 60, "factor": 1, - "minVal": 0, + "minVal": -5, "maxVal": 15, "unit": "°C" }, - "TestWrite02": { - "name": "TestWrite02", - "description": "Test Scrittura 02", + "SetPoint_Cella_01_Req": { + "name": "SetPoint_Cella_01_Req", + "description": "Setpoint Cella 01", "memAddr": "44012", - "tipoMem": "FloatBADC", + "tipoMem": "RealLH", "index": 4012, "size": 2, - "func": "MEDIAN", - "period": 60, "factor": 1, - "minVal": 0, + "minVal": -5, "maxVal": 15, "unit": "°C" }, - "TestWrite03": { - "name": "TestWrite03", - "description": "Test Scrittura 03", + "SetPoint_Cella_02_Req": { + "name": "SetPoint_Cella_02_Req", + "description": "Setpoint Cella 02", "memAddr": "44014", - "tipoMem": "FloatBADC", + "tipoMem": "RealLH", "index": 4014, "size": 2, - "func": "MEDIAN", - "period": 60, "factor": 1, - "minVal": 0, + "minVal": -5, "maxVal": 15, "unit": "°C" }, - "TestWrite04": { - "name": "TestWrite04", - "description": "Test Scrittura 04", + "SetPoint_Cella_03_Req": { + "name": "SetPoint_Cella_03_Req", + "description": "Setpoint Cella 03", "memAddr": "44016", - "tipoMem": "FloatBADC", + "tipoMem": "RealLH", "index": 4016, "size": 2, - "func": "MEDIAN", - "period": 60, "factor": 1, - "minVal": 0, + "minVal": -5, "maxVal": 15, "unit": "°C" }, - "TestWrite05": { - "name": "TestWrite05", - "description": "Test Scrittura 05", + "SetPoint_Cella_04_Req": { + "name": "SetPoint_Cella_04_Req", + "description": "Setpoint Cella 04", "memAddr": "44018", - "tipoMem": "FloatBADC", + "tipoMem": "RealLH", "index": 4018, "size": 2, - "func": "MEDIAN", - "period": 60, "factor": 1, - "minVal": 0, + "minVal": -5, "maxVal": 15, "unit": "°C" - }, - "SetPoint_Tunnel": { - "name": "SetPoint_Tunnel", - "description": "Setpoint Tunnel", - "memAddr": "41560", - "tipoMem": "Real", - "index": 1560, - "size": 2, - "func": "MEDIAN", - "period": 60, - "factor": 1, - "minVal": -100, - "maxVal": 100, - "unit": "°C" } }, "mMapRead": { diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj index fcd58840..45662c9c 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.2206.2718\lib\MapoSDK.dll + + ..\packages\MapoSDK.6.14.2207.1318\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 9f8e8a57..f5a1349c 100644 --- a/IOB-WIN-NEXT/IobModbusTCP.cs +++ b/IOB-WIN-NEXT/IobModbusTCP.cs @@ -817,12 +817,14 @@ namespace IOB_WIN_NEXT // break; case plcDataType.Real: + case plcDataType.RealHL: valDouble = getScaledDouble(currMem); CurrVal = ModbusClient.ConvertFloatToRegisters((float)valDouble, ModbusClient.RegisterOrder.HighLow); fatto = writeInputReg(currMem.index, CurrVal); break; case plcDataType.FloatBADC: + case plcDataType.RealLH: valDouble = getScaledDouble(currMem); CurrVal = ModbusClient.ConvertFloatToRegisters((float)valDouble, ModbusClient.RegisterOrder.LowHigh); fatto = writeInputReg(currMem.index, CurrVal); diff --git a/IOB-WIN-NEXT/packages.config b/IOB-WIN-NEXT/packages.config index 39da1e80..ad4d2632 100644 --- a/IOB-WIN-NEXT/packages.config +++ b/IOB-WIN-NEXT/packages.config @@ -6,7 +6,7 @@ - +