diff --git a/IOB-MAN/IOB-MAN.csproj b/IOB-MAN/IOB-MAN.csproj index dd7de986..fdb08748 100644 --- a/IOB-MAN/IOB-MAN.csproj +++ b/IOB-MAN/IOB-MAN.csproj @@ -198,9 +198,15 @@ + + Always + + + + IOBManPanel.cs diff --git a/IOB-WIN-NEXT/DATA/CONF/PIZ03.json b/IOB-WIN-NEXT/DATA/CONF/PIZ03.json index 055c1184..115d3deb 100644 --- a/IOB-WIN-NEXT/DATA/CONF/PIZ03.json +++ b/IOB-WIN-NEXT/DATA/CONF/PIZ03.json @@ -1,231 +1,231 @@ { - "mMapWrite": { - "setTE04": { - "name": "setTE04", - "description": "Impostazione temperatura min TE04 Linea sfiato Gas", - "tipoMem": "Real", - "memAddr": "DB85.DBB280", - "index": 280, - "size": 4 - }, - "setTT17": { - "name": "setTT17", - "description": "Impostazione temperatura min TT17 Linea sfiato Gas Torcia Serbatoio", - "tipoMem": "Real", - "memAddr": "DB85.DBB284", - "index": 284, - "size": 4 - } + "mMapWrite": { + "MinTemp01": { + "name": "MinTemp01", + "description": "Impostazione temperatura min TE04 Linea sfiato Gas", + "tipoMem": "Real", + "memAddr": "DB85.DBB280", + "index": 280, + "size": 4 }, - "mMapRead": { - "TE2A": { - "name": "TE2A", - "description": "Temperatura Controllo Tenute Pompa A", - "memAddr": "DB85.DBB0", - "tipoMem": "Real", - "index": 0, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "TE1A": { - "name": "TE1A", - "description": "Temperatura Raffreddamento Pompa A", - "memAddr": "DB85.DBB4", - "tipoMem": "Real", - "index": 4, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "TE3A": { - "name": "TE3A", - "description": "Temperatura Cavitazione Pompa A", - "memAddr": "DB85.DBB8", - "tipoMem": "Real", - "index": 8, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "Temp01": { - "name": "TE04", - "description": "Temperatura Torcia Aria Fredda", - "memAddr": "DB85.DBB12", - "tipoMem": "Real", - "index": 12, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "Level": { - "name": "LT15", - "description": "Livello Serbatoio", - "memAddr": "DB85.DBB16", - "tipoMem": "Real", - "index": 16, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "PressBH": { - "name": "PT01", - "description": "Pressione Linea CNG", - "memAddr": "DB85.DBB20", - "tipoMem": "Real", - "index": 20, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "PressBL": { - "name": "PT100", - "description": "Pressione Riduttrice", - "memAddr": "DB85.DBB24", - "tipoMem": "Real", - "index": 24, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "MainPress": { - "name": "PT16", - "description": "Pressione Serbatoio", - "memAddr": "DB85.DBB28", - "tipoMem": "Real", - "index": 28, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "Temp02": { - "name": "TT17", - "description": "Temperatura Spurgo Torcia Serbatoio", - "memAddr": "DB85.DBB36", - "tipoMem": "Real", - "index": 36, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "TE06": { - "name": "TE06", - "description": "Temperatura Uscita Vaporizzatore", - "memAddr": "DB85.DBB40", - "tipoMem": "Real", - "index": 40, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "TE05": { - "name": "TE05", - "description": "Temperatura Carica Fredda", - "memAddr": "DB85.DBB60", - "tipoMem": "Real", - "index": 60, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "TE2B ": { - "name": "TE2B", - "description": "Temperatura Controllo Tenute Pompa B", - "memAddr": "DB85.DBB64", - "tipoMem": "Real", - "index": 64, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "TE1B ": { - "name": "TE1B", - "description": "Temperatura Raffreddamento Pompa B", - "memAddr": "DB85.DBB68", - "tipoMem": "Real", - "index": 68, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "TE3B": { - "name": "TE3B", - "description": "Temperatura Cavitazione Pompa B", - "memAddr": "DB85.DBB72", - "tipoMem": "Real", - "index": 72, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "PressH": { - "name": "PT300A", - "description": "Alta Pressione", - "memAddr": "DB85.DBB120", - "tipoMem": "Real", - "index": 120, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "PressM": { - "name": "PT300M", - "description": "Media Pressione", - "memAddr": "DB85.DBB124", - "tipoMem": "Real", - "index": 124, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "LivelloPerc": { - "name": "LT15%", - "description": "Livello Serbatorio %", - "memAddr": "DB85.DBB148", - "tipoMem": "Real", - "index": 148, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "MinTemp01": { - "name": "MinTempTE04", - "description": "Minima Temperatura Linea Sfiato Gas TE04", - "memAddr": "DB85.DBB152", - "tipoMem": "Real", - "index": 152, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - }, - "MinTemp02": { - "name": "MinTempTT17", - "description": "Minima Temperatura Linea Sfiato Gas Torcia Serbatoio TT17", - "memAddr": "DB85.DBB156", - "tipoMem": "Real", - "index": 156, - "size": 4, - "func": "MAX", - "period": 60, - "factor": 1 - } + "MinTemp02": { + "name": "MinTemp02", + "description": "Impostazione temperatura min TT17 Linea sfiato Gas Torcia Serbatoio", + "tipoMem": "Real", + "memAddr": "DB85.DBB284", + "index": 284, + "size": 4 } + }, + "mMapRead": { + "TE2A": { + "name": "TE2A", + "description": "Temperatura Controllo Tenute Pompa A (TE2A)", + "memAddr": "DB85.DBB0", + "tipoMem": "Real", + "index": 0, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "TE1A": { + "name": "TE1A", + "description": "Temperatura Raffreddamento Pompa A (TE1A)", + "memAddr": "DB85.DBB4", + "tipoMem": "Real", + "index": 4, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "TE3A": { + "name": "TE3A", + "description": "Temperatura Cavitazione Pompa A (TE3A)", + "memAddr": "DB85.DBB8", + "tipoMem": "Real", + "index": 8, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "Temp01": { + "name": "Temp01", + "description": "Temperatura Torcia Aria Fredda (TE04)", + "memAddr": "DB85.DBB12", + "tipoMem": "Real", + "index": 12, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "Level": { + "name": "Level", + "description": "Livello Serbatoio (LT15)", + "memAddr": "DB85.DBB16", + "tipoMem": "Real", + "index": 16, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "PressBH": { + "name": "PressBH", + "description": "Pressione Linea CNG (PT01)", + "memAddr": "DB85.DBB20", + "tipoMem": "Real", + "index": 20, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "PressBL": { + "name": "PressBL", + "description": "Pressione Riduttrice (PT100)", + "memAddr": "DB85.DBB24", + "tipoMem": "Real", + "index": 24, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "MainPress": { + "name": "MainPress", + "description": "Pressione Serbatoio (PT16)", + "memAddr": "DB85.DBB28", + "tipoMem": "Real", + "index": 28, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "Temp02": { + "name": "Temp02", + "description": "Temperatura Spurgo Torcia Serbatoio (TT17)", + "memAddr": "DB85.DBB36", + "tipoMem": "Real", + "index": 36, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "TE06": { + "name": "TE06", + "description": "Temperatura Uscita Vaporizzatore (TE06)", + "memAddr": "DB85.DBB40", + "tipoMem": "Real", + "index": 40, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "TE05": { + "name": "TE05", + "description": "Temperatura Carica Fredda (TE05)", + "memAddr": "DB85.DBB60", + "tipoMem": "Real", + "index": 60, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "TE2B ": { + "name": "TE2B", + "description": "Temperatura Controllo Tenute Pompa B (TE2B)", + "memAddr": "DB85.DBB64", + "tipoMem": "Real", + "index": 64, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "TE1B ": { + "name": "TE1B", + "description": "Temperatura Raffreddamento Pompa B (TE1B)", + "memAddr": "DB85.DBB68", + "tipoMem": "Real", + "index": 68, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "TE3B": { + "name": "TE3B", + "description": "Temperatura Cavitazione Pompa B (TE3B)", + "memAddr": "DB85.DBB72", + "tipoMem": "Real", + "index": 72, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "PressH": { + "name": "PressH", + "description": "Alta Pressione (PT300A)", + "memAddr": "DB85.DBB120", + "tipoMem": "Real", + "index": 120, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "PressM": { + "name": "PressM", + "description": "Media Pressione (PT300M)", + "memAddr": "DB85.DBB124", + "tipoMem": "Real", + "index": 124, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "LivelloPerc": { + "name": "LivelloPerc", + "description": "Livello Serbatorio % (LT15%)", + "memAddr": "DB85.DBB148", + "tipoMem": "Real", + "index": 148, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "MinTemp01": { + "name": "MinTemp01", + "description": "Minima Temperatura Linea Sfiato Gas (TE04)", + "memAddr": "DB85.DBB152", + "tipoMem": "Real", + "index": 152, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + }, + "MinTemp02": { + "name": "MinTemp02", + "description": "Minima Temperatura Linea Sfiato Gas Torcia Serbatoio (TT17)", + "memAddr": "DB85.DBB156", + "tipoMem": "Real", + "index": 156, + "size": 4, + "func": "MAX", + "period": 60, + "factor": 1 + } + } } \ No newline at end of file diff --git a/IOB-WIN-NEXT/IobGeneric.cs b/IOB-WIN-NEXT/IobGeneric.cs index 17a18b0d..aa178416 100644 --- a/IOB-WIN-NEXT/IobGeneric.cs +++ b/IOB-WIN-NEXT/IobGeneric.cs @@ -4571,7 +4571,7 @@ namespace IOB_WIN_NEXT valore = getVal_TSVC(chiave, scaduto); if (scaduto) { - outVal.Add(chiave, $"{valore}"); + outVal.Add(chiave, $"{valore:N3}"); } LastTSVC[chiave] = valore; }