From 097a0bc80acd8b4694f61149717b8a54261c6c2b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 13 Dec 2022 13:05:17 +0100 Subject: [PATCH 1/2] fix saim01: fattore e min/max mancanti --- IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_001.json | 807 ++++++++++++--------- 1 file changed, 450 insertions(+), 357 deletions(-) diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_001.json b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_001.json index 63475983..9377a7d2 100644 --- a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_001.json +++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_001.json @@ -1,361 +1,454 @@ { - "mMapWrite": { - "PPM_min_C1": { - "name": "PPM_min_C1", - "description": "PPM min Camera 1", - "memAddr": "40031", - "tipoMem": "Int", - "index": 31, - "size": 1, - "factor": 100, - "minVal": 0, - "maxVal": 1000, - "unit": "PPM" - }, - "PPM_max_C1": { - "name": "PPM_max_C1", - "description": "PPM MAX Camera 1", - "memAddr": "40032", - "tipoMem": "Int", - "index": 32, - "size": 1, - "factor": 100, - "minVal": 0, - "maxVal": 1000, - "unit": "PPM" - } + "mMapWrite": { + "PPM_min_C1": { + "name": "PPM_min_C1", + "description": "PPM min Camera 1", + "memAddr": "40031", + "tipoMem": "Int", + "index": 31, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" }, - "mMapRead": { - "PPM_min_C1": { - "name": "PPM_min_C1", - "description": "PPM min Camera 1", - "memAddr": "40031", - "tipoMem": "Int", - "index": 31, - "size": 1, - "factor": 100, - "minVal": 0, - "maxVal": 1000, - "unit": "PPM" - }, - "PPM_max_C1": { - "name": "PPM_max_C1", - "description": "PPM MAX Camera 1", - "memAddr": "40032", - "tipoMem": "Int", - "index": 32, - "size": 1, - "factor": 100, - "minVal": 0, - "maxVal": 1000, - "unit": "PPM" - }, - << - << << < HEAD "PPM_min_C2": { - "name": "PPM_min_C2", - "description": "PPM min Camera 2", - "memAddr": "40033", - "tipoMem": "Int", - "index": 33, - "size": 1, - "factor": 100, - "minVal": 0, - "maxVal": 1000, - "unit": "PPM" - }, - "PPM_max_C2": { - "name": "PPM_max_C2", - "description": "PPM MAX Camera 2", - "memAddr": "40034", - "tipoMem": "Int", - "index": 34, - "size": 1, - "factor": 100, - "minVal": 0, - "maxVal": 1000, - "unit": "PPM" - }, - === - === = >>> - >>> > 3 f58a527417de7c99b3e5f3943693ff2d5b36af0 "Sonda01": { - "name": "Sonda01", - "description": "Sonda 01", - "memAddr": "30110", - "tipoMem": "Int", - "index": 110, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Sonda02": { - "name": "Sonda02", - "description": "Sonda 02", - "memAddr": "30120", - "tipoMem": "Int", - "index": 120, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Sonda03": { - "name": "Sonda03", - "description": "Sonda 03", - "memAddr": "30130", - "tipoMem": "Int", - "index": 130, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Sonda04": { - "name": "Sonda04", - "description": "Sonda 04", - "memAddr": "30140", - "tipoMem": "Int", - "index": 140, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Sonda05": { - "name": "Sonda05", - "description": "Sonda 05", - "memAddr": "30150", - "tipoMem": "Int", - "index": 150, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Sonda06": { - "name": "Sonda06", - "description": "Sonda 06", - "memAddr": "30160", - "tipoMem": "Int", - "index": 160, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Amper01": { - "name": "Amper01", - "description": "Amper 01", - "memAddr": "30010", - "tipoMem": "Int", - "index": 10, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Amper02": { - "name": "Amper02", - "description": "Amper 02", - "memAddr": "30011", - "tipoMem": "Int", - "index": 11, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Amper03": { - "name": "Amper03", - "description": "Amper 03", - "memAddr": "30012", - "tipoMem": "Int", - "index": 12, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Amper04": { - "name": "Amper04", - "description": "Amper 04", - "memAddr": "30013", - "tipoMem": "Int", - "index": 13, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Amper05": { - "name": "Amper05", - "description": "Amper 05", - "memAddr": "30014", - "tipoMem": "Int", - "index": 14, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Amper06": { - "name": "Amper06", - "description": "Amper 06", - "memAddr": "30015", - "tipoMem": "Int", - "index": 15, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Amper07": { - "name": "Amper07", - "description": "Amper 07", - "memAddr": "30016", - "tipoMem": "Int", - "index": 16, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "Amper08": { - "name": "Amper08", - "description": "Amper 08", - "memAddr": "30017", - "tipoMem": "Int", - "index": 17, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "ContCam01": { - "name": "ContCam01", - "description": "Cont Camera 01", - "memAddr": "30021", - "tipoMem": "Int", - "index": 21, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "ContCam02": { - "name": "ContCam02", - "description": "Cont Camera 02", - "memAddr": "30022", - "tipoMem": "Int", - "index": 22, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "ContCam03": { - "name": "ContCam03", - "description": "Cont Camera 03", - "memAddr": "30023", - "tipoMem": "Int", - "index": 23, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "ContCam04": { - "name": "ContCam04", - "description": "Cont Camera 04", - "memAddr": "30024", - "tipoMem": "Int", - "index": 24, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "ContCam05": { - "name": "ContCam05", - "description": "Cont Camera 05", - "memAddr": "30025", - "tipoMem": "Int", - "index": 25, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - }, - "ContCam06": { - "name": "ContCam06", - "description": "Cont Camera 06", - "memAddr": "30026", - "tipoMem": "Int", - "index": 26, - "size": 1, - "func": "MAX", - "period": 90, - "factor": 1, - "minVal": 0, - "maxVal": 999999999, - "unit": "#" - } + "PPM_max_C1": { + "name": "PPM_max_C1", + "description": "PPM MAX Camera 1", + "memAddr": "40032", + "tipoMem": "Int", + "index": 32, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" } + }, + "mMapRead": { + "PPM_min_C1": { + "name": "PPM_min_C1", + "description": "PPM min Camera 1", + "memAddr": "40031", + "tipoMem": "Int", + "index": 31, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C1": { + "name": "PPM_max_C1", + "description": "PPM MAX Camera 1", + "memAddr": "40032", + "tipoMem": "Int", + "index": 32, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_min_C2": { + "name": "PPM_min_C2", + "description": "PPM min Camera 2", + "memAddr": "40033", + "tipoMem": "Int", + "index": 33, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C2": { + "name": "PPM_max_C2", + "description": "PPM MAX Camera 2", + "memAddr": "40034", + "tipoMem": "Int", + "index": 34, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_min_C3": { + "name": "PPM_min_C3", + "description": "PPM min Camera 3", + "memAddr": "40035", + "tipoMem": "Int", + "index": 33, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C3": { + "name": "PPM_max_C3", + "description": "PPM MAX Camera 3", + "memAddr": "40036", + "tipoMem": "Int", + "index": 34, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_min_C4": { + "name": "PPM_min_C4", + "description": "PPM min Camera 4", + "memAddr": "40037", + "tipoMem": "Int", + "index": 33, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C4": { + "name": "PPM_max_C4", + "description": "PPM MAX Camera 4", + "memAddr": "40038", + "tipoMem": "Int", + "index": 34, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_min_C5": { + "name": "PPM_min_C5", + "description": "PPM min Camera 5", + "memAddr": "40039", + "tipoMem": "Int", + "index": 33, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C5": { + "name": "PPM_max_C5", + "description": "PPM MAX Camera 5", + "memAddr": "40040", + "tipoMem": "Int", + "index": 34, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_min_C6": { + "name": "PPM_min_C6", + "description": "PPM min Camera 6", + "memAddr": "40041", + "tipoMem": "Int", + "index": 33, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C6": { + "name": "PPM_max_C6", + "description": "PPM MAX Camera 6", + "memAddr": "40042", + "tipoMem": "Int", + "index": 34, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "Sonda01": { + "name": "Sonda01", + "description": "Sonda 01", + "memAddr": "30110", + "tipoMem": "Int", + "index": 110, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Sonda02": { + "name": "Sonda02", + "description": "Sonda 02", + "memAddr": "30120", + "tipoMem": "Int", + "index": 120, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Sonda03": { + "name": "Sonda03", + "description": "Sonda 03", + "memAddr": "30130", + "tipoMem": "Int", + "index": 130, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Sonda04": { + "name": "Sonda04", + "description": "Sonda 04", + "memAddr": "30140", + "tipoMem": "Int", + "index": 140, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Sonda05": { + "name": "Sonda05", + "description": "Sonda 05", + "memAddr": "30150", + "tipoMem": "Int", + "index": 150, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Sonda06": { + "name": "Sonda06", + "description": "Sonda 06", + "memAddr": "30160", + "tipoMem": "Int", + "index": 160, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Amper01": { + "name": "Amper01", + "description": "Amper 01", + "memAddr": "30010", + "tipoMem": "Int", + "index": 10, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Amper02": { + "name": "Amper02", + "description": "Amper 02", + "memAddr": "30011", + "tipoMem": "Int", + "index": 11, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Amper03": { + "name": "Amper03", + "description": "Amper 03", + "memAddr": "30012", + "tipoMem": "Int", + "index": 12, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Amper04": { + "name": "Amper04", + "description": "Amper 04", + "memAddr": "30013", + "tipoMem": "Int", + "index": 13, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Amper05": { + "name": "Amper05", + "description": "Amper 05", + "memAddr": "30014", + "tipoMem": "Int", + "index": 14, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Amper06": { + "name": "Amper06", + "description": "Amper 06", + "memAddr": "30015", + "tipoMem": "Int", + "index": 15, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Amper07": { + "name": "Amper07", + "description": "Amper 07", + "memAddr": "30016", + "tipoMem": "Int", + "index": 16, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "Amper08": { + "name": "Amper08", + "description": "Amper 08", + "memAddr": "30017", + "tipoMem": "Int", + "index": 17, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "ContCam01": { + "name": "ContCam01", + "description": "Cont Camera 01", + "memAddr": "30021", + "tipoMem": "Int", + "index": 21, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "ContCam02": { + "name": "ContCam02", + "description": "Cont Camera 02", + "memAddr": "30022", + "tipoMem": "Int", + "index": 22, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "ContCam03": { + "name": "ContCam03", + "description": "Cont Camera 03", + "memAddr": "30023", + "tipoMem": "Int", + "index": 23, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "ContCam04": { + "name": "ContCam04", + "description": "Cont Camera 04", + "memAddr": "30024", + "tipoMem": "Int", + "index": 24, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "ContCam05": { + "name": "ContCam05", + "description": "Cont Camera 05", + "memAddr": "30025", + "tipoMem": "Int", + "index": 25, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + }, + "ContCam06": { + "name": "ContCam06", + "description": "Cont Camera 06", + "memAddr": "30026", + "tipoMem": "Int", + "index": 26, + "size": 1, + "func": "MAX", + "period": 90, + "factor": 1, + "minVal": 0, + "maxVal": 999999999, + "unit": "#" + } + } } \ No newline at end of file From b9e146ec9d5267d1affc4d6bb67453b491ccf556 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 13 Dec 2022 13:47:01 +0100 Subject: [PATCH 2/2] Fix modbus x lettura campi 1 int (SAIM) --- IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_001.ini | 8 +- IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_002.ini | 8 +- IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_002.json | 85 +++++++++++-- IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.ini | 14 ++- IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.json | 133 +++++++++++++++++++-- IOB-WIN-NEXT/DATA/CONF/MAIN.ini | 2 +- IOB-WIN-NEXT/IobModbusTCP.cs | 13 +- 7 files changed, 231 insertions(+), 32 deletions(-) diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_001.ini b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_001.ini index ea51fe16..c5a999e7 100644 --- a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_001.ini +++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_001.ini @@ -1,6 +1,6 @@ ;Configurazione IOB-WIN [IOB] -;Impianto SAIM 01 Locorotondo - Giacovelli +;Impianto SAIM 01 Locorotondo - Giacovelli CNCTYPE=MODBUS_TCP_SAIM PING_MS_TIMEOUT=1000 MinDeltaSec=5 @@ -32,7 +32,7 @@ HR_BASE_ADDR=40000 ;DELTA_BASE=1 DELTA_BASE=0 MODBUS_EXT_REG=0 - +INDEX_LUT_CORR=-1 [BLINK] ;MAX_COUNTER_BLINK = 30 @@ -59,7 +59,7 @@ MAX_SEND_PZC_BLOCK=100 ENABLE_DYN_DATA=TRUE FORCE_DYN_DATA=TRUE ; gestione delta minimo accettabile tra min/MAX -DELTA_VAL=0.1 +DELTA_VAL=0 ; clock base (da 10ms) timerIntMs=10 @@ -82,7 +82,7 @@ disDynDataRangeCheck=true ; conf file import FILE_IMPORT_FOLDER=C:\GiacenzeLocorotondo FILE_IMPORT_TYPE=*.xlsx -FILE_ARCHIVE_FOLDER=C:\GiacenzeLocorotondo\archivio +FILE_ARCHIVE_FOLDER=C:\GiacenzeLocorotondo\SAIM002 [BRANCH] NAME=master \ No newline at end of file diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_002.ini b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_002.ini index a34896ba..24888243 100644 --- a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_002.ini +++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_002.ini @@ -1,6 +1,6 @@ ;Configurazione IOB-WIN [IOB] -;Impianto SAIM 02 Locorotondo - Giacovelli +;Impianto SAIM 02 Locorotondo - Giacovelli CNCTYPE=MODBUS_TCP_SAIM PING_MS_TIMEOUT=1000 MinDeltaSec=5 @@ -32,7 +32,7 @@ HR_BASE_ADDR=40000 ;DELTA_BASE=1 DELTA_BASE=0 MODBUS_EXT_REG=0 - +INDEX_LUT_CORR=-1 [BLINK] ;MAX_COUNTER_BLINK = 30 @@ -59,7 +59,7 @@ MAX_SEND_PZC_BLOCK=100 ENABLE_DYN_DATA=TRUE FORCE_DYN_DATA=TRUE ; gestione delta minimo accettabile tra min/MAX -DELTA_VAL=0.1 +DELTA_VAL=0 ; clock base (da 10ms) timerIntMs=10 @@ -80,7 +80,7 @@ MEM_BLOCK=GIACO_SAIM_002_MBlock.json disDynDataRangeCheck=true ; conf file import -FILE_IMPORT_FOLDER=C:\GiacenzeLocorotondo +FILE_IMPORT_FOLDER=C:\GiacenzeLocorotondo\SAIM002 FILE_IMPORT_TYPE=*.xlsx FILE_ARCHIVE_FOLDER=C:\GiacenzeLocorotondo\archivio diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_002.json b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_002.json index 4c0a10a3..92fe702f 100644 --- a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_002.json +++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_002.json @@ -1,8 +1,5 @@ { "mMapWrite": { - - }, - "mMapRead": { "PPM_min_C1": { "name": "PPM_min_C1", "description": "PPM min Camera 1", @@ -10,7 +7,7 @@ "tipoMem": "Int", "index": 31, "size": 1, - "factor": 100, + "factor": 1, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -22,7 +19,33 @@ "tipoMem": "Int", "index": 32, "size": 1, - "factor": 100, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + } + }, + "mMapRead": { + "PPM_min_C1": { + "name": "PPM_min_C1", + "description": "PPM min Camera 1", + "memAddr": "40031", + "tipoMem": "Int", + "index": 31, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C1": { + "name": "PPM_max_C1", + "description": "PPM MAX Camera 1", + "memAddr": "40032", + "tipoMem": "Int", + "index": 32, + "size": 1, + "factor": 1, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -34,7 +57,7 @@ "tipoMem": "Int", "index": 33, "size": 1, - "factor": 100, + "factor": 1, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -46,7 +69,55 @@ "tipoMem": "Int", "index": 34, "size": 1, - "factor": 100, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_min_C3": { + "name": "PPM_min_C3", + "description": "PPM min Camera 3", + "memAddr": "40035", + "tipoMem": "Int", + "index": 33, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C3": { + "name": "PPM_max_C3", + "description": "PPM MAX Camera 3", + "memAddr": "40036", + "tipoMem": "Int", + "index": 34, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_min_C4": { + "name": "PPM_min_C4", + "description": "PPM min Camera 4", + "memAddr": "40037", + "tipoMem": "Int", + "index": 33, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C4": { + "name": "PPM_max_C4", + "description": "PPM MAX Camera 4", + "memAddr": "40038", + "tipoMem": "Int", + "index": 34, + "size": 1, + "factor": 1, "minVal": 0, "maxVal": 1000, "unit": "PPM" diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.ini b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.ini index 7678a885..409c0284 100644 --- a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.ini +++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.ini @@ -1,6 +1,6 @@ ;Configurazione IOB-WIN [IOB] -;Impianto SAIM Locorotondo - Giacovelli +;Impianto SAIM 03 Locorotondo - Giacovelli CNCTYPE=MODBUS_TCP_SAIM PING_MS_TIMEOUT=1000 MinDeltaSec=5 @@ -32,7 +32,7 @@ HR_BASE_ADDR=40000 ;DELTA_BASE=1 DELTA_BASE=0 MODBUS_EXT_REG=0 - +INDEX_LUT_CORR=-1 [BLINK] ;MAX_COUNTER_BLINK = 30 @@ -59,11 +59,14 @@ MAX_SEND_PZC_BLOCK=100 ENABLE_DYN_DATA=TRUE FORCE_DYN_DATA=TRUE ; gestione delta minimo accettabile tra min/MAX -DELTA_VAL=0.1 +DELTA_VAL=0 ; clock base (da 10ms) timerIntMs=10 +AUTO_CHANGE_ODL=TRUE +CHANGE_ODL_MODE=DAILY + ; conf parametri memoria READ/WRITE PARAM_CONF=GIACO_SAIM_003.json @@ -76,5 +79,10 @@ MEM_BLOCK=GIACO_SAIM_003_MBlock.json ; rimozione check limiti min/max dynData disDynDataRangeCheck=true +; conf file import +FILE_IMPORT_FOLDER=C:\GiacenzeLocorotondo +FILE_IMPORT_TYPE=*.xlsx +FILE_ARCHIVE_FOLDER=C:\GiacenzeLocorotondo\archivio + [BRANCH] NAME=master \ No newline at end of file diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.json b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.json index fd8a8853..9377a7d2 100644 --- a/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.json +++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.json @@ -1,8 +1,5 @@ { "mMapWrite": { - - }, - "mMapRead": { "PPM_min_C1": { "name": "PPM_min_C1", "description": "PPM min Camera 1", @@ -10,7 +7,7 @@ "tipoMem": "Int", "index": 31, "size": 1, - "factor": 100, + "factor": 1, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -22,7 +19,33 @@ "tipoMem": "Int", "index": 32, "size": 1, - "factor": 100, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + } + }, + "mMapRead": { + "PPM_min_C1": { + "name": "PPM_min_C1", + "description": "PPM min Camera 1", + "memAddr": "40031", + "tipoMem": "Int", + "index": 31, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C1": { + "name": "PPM_max_C1", + "description": "PPM MAX Camera 1", + "memAddr": "40032", + "tipoMem": "Int", + "index": 32, + "size": 1, + "factor": 1, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -34,7 +57,7 @@ "tipoMem": "Int", "index": 33, "size": 1, - "factor": 100, + "factor": 1, "minVal": 0, "maxVal": 1000, "unit": "PPM" @@ -46,7 +69,103 @@ "tipoMem": "Int", "index": 34, "size": 1, - "factor": 100, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_min_C3": { + "name": "PPM_min_C3", + "description": "PPM min Camera 3", + "memAddr": "40035", + "tipoMem": "Int", + "index": 33, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C3": { + "name": "PPM_max_C3", + "description": "PPM MAX Camera 3", + "memAddr": "40036", + "tipoMem": "Int", + "index": 34, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_min_C4": { + "name": "PPM_min_C4", + "description": "PPM min Camera 4", + "memAddr": "40037", + "tipoMem": "Int", + "index": 33, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C4": { + "name": "PPM_max_C4", + "description": "PPM MAX Camera 4", + "memAddr": "40038", + "tipoMem": "Int", + "index": 34, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_min_C5": { + "name": "PPM_min_C5", + "description": "PPM min Camera 5", + "memAddr": "40039", + "tipoMem": "Int", + "index": 33, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C5": { + "name": "PPM_max_C5", + "description": "PPM MAX Camera 5", + "memAddr": "40040", + "tipoMem": "Int", + "index": 34, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_min_C6": { + "name": "PPM_min_C6", + "description": "PPM min Camera 6", + "memAddr": "40041", + "tipoMem": "Int", + "index": 33, + "size": 1, + "factor": 1, + "minVal": 0, + "maxVal": 1000, + "unit": "PPM" + }, + "PPM_max_C6": { + "name": "PPM_max_C6", + "description": "PPM MAX Camera 6", + "memAddr": "40042", + "tipoMem": "Int", + "index": 34, + "size": 1, + "factor": 1, "minVal": 0, "maxVal": 1000, "unit": "PPM" diff --git a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini index a4979e62..794a370b 100644 --- a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini +++ b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini @@ -45,6 +45,6 @@ CLI_INST=SteamWareSim ;STARTLIST=BAGLIETTO_CIMOLAI_01 ;STARTLIST=SIMUL_01 ;STARTLIST=GIACO_SAIM_003 -STARTLIST=SIM_DP_01 +STARTLIST=GIACO_SAIM_003 MAXCNC=10 \ No newline at end of file diff --git a/IOB-WIN-NEXT/IobModbusTCP.cs b/IOB-WIN-NEXT/IobModbusTCP.cs index e426f02f..7bfd8d04 100644 --- a/IOB-WIN-NEXT/IobModbusTCP.cs +++ b/IOB-WIN-NEXT/IobModbusTCP.cs @@ -14,10 +14,10 @@ using System.Windows.Forms; namespace IOB_WIN_NEXT { /* -------------------------------------------------------------------------------- - * Controlli ModBusTCP COMECA - * - protocollo ModBus TCP - * - * -------------------------------------------------------------------------------- */ + * Controlli ModBusTCP (primo: COMECA) + * - protocollo ModBus TCP + * + * -------------------------------------------------------------------------------- */ public class IobModbusTCP : IobGeneric { @@ -1529,7 +1529,8 @@ namespace IOB_WIN_NEXT // se size = 1 --> devo cambiare modo recupero if (item.Value.size == 1) { - if (item.Value.index % 2 == 0) + //if (item.Value.index % 2 == 0) + if (lutAddress % 2 == 0) { //Array.Copy(HoldingRegisterLUT[lutAddress], listInt, 1); Array.Copy(HoldingRegisterLUT[lutAddress], 0, listInt, 0, 1); @@ -1594,7 +1595,7 @@ namespace IOB_WIN_NEXT else { // verifica limite... con delta da impianto - dataOk = (valore > (item.Value.minVal + deltaVal) && valore < (item.Value.maxVal - deltaVal)); + dataOk = (valore >= (item.Value.minVal + deltaVal) && valore <= (item.Value.maxVal - deltaVal)); if (dataOk || disDynDataRangeCheck) { // verifica valori EPOCH x convertirli in datetime...