diff --git a/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.ini b/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.ini index 3d57000e..1fb48a94 100644 --- a/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.ini +++ b/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.ini @@ -32,20 +32,20 @@ SIZE_WRITE=0 [BLINK] ;MAX_COUNTER_BLINK = 30 -MAX_COUNTER_BLINK = 15 -;bit0 = 0 +MAX_COUNTER_BLINK = 30 +;bit0 = 1 ;bit1 = 0 -;bit2 = 1 -;bit3 = 1 +;bit2 = 0 +;bit3 = 0 ;bit4 = 1 ;bit5 = 0 ;bit6 = 0 ;bit7 = 0 -;BLINK_FILT=28 +;BLINK_FILT=145 BLINK_FILT=0 [OPTPAR] -AUTO_CHANGE_ODL=false +AUTO_CHANGE_ODL=true CHANGE_ODL_MODE=TIME CHANGE_ODL_HOURS=24 CHANGE_ODL_IDLE_MIN=5 @@ -69,7 +69,7 @@ FTP_LOC_DIR=temp\csv FTP_REM_DIR= CSV_ADD_HEADER=true -VETO_SEND_SNAPSHOT=5 +VETO_SEND_SNAPSHOT=3 ;NO_PING=FALSE diff --git a/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json b/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json index a1f91771..4166f851 100644 --- a/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json +++ b/IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json @@ -23,8 +23,17 @@ } ], "condWorkOpc": { - "checkMode": "OR", - "checkList": [] + "checkMode": "AND", + "checkList": [ + { + "keyName": "PLC/DB13/Gen/Marcia_AUX", + "targetValue": "2" + }, + { + "keyName": "PLC/DB231/InCorso", + "targetValue": "1" + } + ] }, "condPowerOn": { "checkMode": "AND", @@ -41,7 +50,16 @@ }, "condManual": { "checkMode": "AND", - "checkList": [] + "checkList": [ + { + "keyName": "PLC/DB13/Gen/Marcia_AUX", + "targetValue": "2" + }, + { + "keyName": "PLC/DB231/InCorso", + "targetValue": "0" + } + ] }, "condEStop": { "checkMode": "AND", diff --git a/IOB-WIN-NEXT/IobOpcUaMBHCimolai.cs b/IOB-WIN-NEXT/IobOpcUaMBHCimolai.cs index ba3913d1..f64a1ec6 100644 --- a/IOB-WIN-NEXT/IobOpcUaMBHCimolai.cs +++ b/IOB-WIN-NEXT/IobOpcUaMBHCimolai.cs @@ -386,7 +386,15 @@ namespace IOB_WIN_NEXT * 8: Inizio comando sollevamento * 9: Termine comando sollevamento * 10: richiesta snapshot parametri - + * + *------------------------------------------------------ + * SEMPLIFICAZIONE POST CERTIFICAZIONE + *------------------------------------------------------ + * + * Visto che la rete potrebbe saltare ad intermittenza, conviene gestire in modo semplificato il lavora + * torno a condizione work base: AUX = 2, marcia = in corso + * + * ---------------------------------------------------- */ // controllo emergenza... se zero --> emergenza! @@ -454,14 +462,14 @@ namespace IOB_WIN_NEXT { B_input += (1 << 3); } - if (isWorkingCimolai) + if (isWorkingCimolai || isWorking) { // RUN = LAVORA! B_input += (1 << 1); } else { - if (!isReady || isManualCimolai) + if (!isReady || isManualCimolai || isManual) { // se NON ready --> manual B_input += (1 << 4);