Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/FixInputRegLUT'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2022-12-14 14:25:37 +01:00
parent 347c479fb0 8231c0d3a0
commit 656d0ed525
4 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.ini
+2 -1
View File
@@ -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]
IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.json
+20 -20
View File
@@ -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": "#"
IOB-WIN-NEXT/IobGeneric.cs
+2 -1
View File
@@ -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
IOB-WIN-NEXT/IobModbusTCP.cs
+11 -11
View File
@@ -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}");
}