From 8231c0d3a0404a57b7e8b1246a28cf166a03c115 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 14 Dec 2022 14:24:49 +0100 Subject: [PATCH] Fix gestione InputReg x SAIM --- IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.ini | 3 +- IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.json | 40 +++++++++++----------- IOB-WIN-NEXT/IobGeneric.cs | 3 +- IOB-WIN-NEXT/IobModbusTCP.cs | 22 ++++++------ 4 files changed, 35 insertions(+), 33 deletions(-) diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.ini b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.ini index 409c0284..65f2c8dd 100644 --- a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.ini +++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.ini @@ -10,7 +10,8 @@ VENDOR=SAIM MODEL=Trattamento Ozono [CNC] -IP=192.168.18.10 +IP=192.168.18.12 +;IP=192.168.18.10 PORT=502 [SERVER] diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.json b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.json index 5731457b..7948433e 100644 --- a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.json +++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.json @@ -7,7 +7,7 @@ "tipoMem": "Int", "index": 31, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -19,7 +19,7 @@ "tipoMem": "Int", "index": 32, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -33,7 +33,7 @@ "tipoMem": "Int", "index": 31, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -45,7 +45,7 @@ "tipoMem": "Int", "index": 32, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -57,7 +57,7 @@ "tipoMem": "Int", "index": 33, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -69,7 +69,7 @@ "tipoMem": "Int", "index": 34, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -81,7 +81,7 @@ "tipoMem": "Int", "index": 33, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -93,7 +93,7 @@ "tipoMem": "Int", "index": 34, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -105,7 +105,7 @@ "tipoMem": "Int", "index": 33, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -117,7 +117,7 @@ "tipoMem": "Int", "index": 34, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -129,7 +129,7 @@ "tipoMem": "Int", "index": 33, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -141,7 +141,7 @@ "tipoMem": "Int", "index": 34, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -153,7 +153,7 @@ "tipoMem": "Int", "index": 33, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -165,7 +165,7 @@ "tipoMem": "Int", "index": 34, "size": 1, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -179,7 +179,7 @@ "size": 1, "func": "MAX", "period": 90, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 999999999, "unit": "#" @@ -193,7 +193,7 @@ "size": 1, "func": "MAX", "period": 90, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 999999999, "unit": "#" @@ -207,7 +207,7 @@ "size": 1, "func": "MAX", "period": 90, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 999999999, "unit": "#" @@ -221,7 +221,7 @@ "size": 1, "func": "MAX", "period": 90, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 999999999, "unit": "#" @@ -235,7 +235,7 @@ "size": 1, "func": "MAX", "period": 90, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 999999999, "unit": "#" @@ -249,7 +249,7 @@ "size": 1, "func": "MAX", "period": 90, - "factor": 1, + "factor": 0.01, "minVal": 0, "maxVal": 999999999, "unit": "#" diff --git a/IOB-WIN-NEXT/IobGeneric.cs b/IOB-WIN-NEXT/IobGeneric.cs index 0d4068a7..276a831d 100644 --- a/IOB-WIN-NEXT/IobGeneric.cs +++ b/IOB-WIN-NEXT/IobGeneric.cs @@ -5285,9 +5285,10 @@ namespace IOB_WIN_NEXT if (adesso.Subtract(VetoLog[message]).TotalSeconds > vetoSec) { doVeto = false; - message = $"{VetoLogCount[message]} x {message}"; + string newMessage = $"{VetoLogCount[message]} x {message}"; VetoLog.Remove(message); VetoLogCount.Remove(message); + message = newMessage; } } else diff --git a/IOB-WIN-NEXT/IobModbusTCP.cs b/IOB-WIN-NEXT/IobModbusTCP.cs index 841344aa..b32995c7 100644 --- a/IOB-WIN-NEXT/IobModbusTCP.cs +++ b/IOB-WIN-NEXT/IobModbusTCP.cs @@ -1557,16 +1557,16 @@ namespace IOB_WIN_NEXT else { listInt = readInputReg(item.Value.index, item.Value.size); - if (item.Value.tipoMem == plcDataType.String) - { - // valore string... - valString = ModbusClient.ConvertRegistersToString(listInt, 0, item.Value.size); - } - else - { - // valori numerici... - valore = convertFromReg(listInt, item.Value.size, item.Value.tipoMem); - } + } + if (item.Value.tipoMem == plcDataType.String) + { + // valore string... + valString = ModbusClient.ConvertRegistersToString(listInt, 0, item.Value.size); + } + else + { + // valori numerici... + valore = convertFromReg(listInt, item.Value.size, item.Value.tipoMem); } break; @@ -1669,7 +1669,7 @@ namespace IOB_WIN_NEXT } } } - catch(Exception exc) + catch (Exception exc) { lgError($"Eccezione in lettura variabile | item: {item.Key} | mem: {item.Value.memAddr}{Environment.NewLine}{exc}"); }