diff --git a/IOB-WIN/DATA/CONF/GT507.ini b/IOB-WIN/DATA/CONF/GT507.ini new file mode 100644 index 00000000..2598ba62 --- /dev/null +++ b/IOB-WIN/DATA/CONF/GT507.ini @@ -0,0 +1,63 @@ +;Configurazione IOB-WIN +[IOB] +;Punzonatrice FAPE, isola Trevisan 424 con robot Kawasaki (NO industria 4.0) +CNCTYPE=SIEMENS +PING_MS_TIMEOUT=500 + +[MACHINE] +VENDOR=Tecnomeccanica +MODEL=Punzonatrice Fape + +[CNC] +IP=192.168.1.57 +CPUTYPE=S71200 +RACK=0 +SLOT=0 + +[SERVER] +MPIP=http://192.168.1.64 +MPURL=/MP/IO +CMDBASE=/IOB/input/ +CMDFLOG=/IOB/flog/ +CMDALIVE=/IOB +CMDENABLED=/IOB/enabled/ +CMDADV1=?valore= +CMDREBO=/sendReboot.aspx?idxMacchina= + +[MEMORY] +ADDR_READ=DB15.DBB0 +ADDR_WRITE=DB16.DBB0 +SIZE_READ=48 +SIZE_WRITE=48 +;BIT0=CONN +BIT1=DB15.DBB1 +;BIT2=PZCOUNT.STD.DB700.DBW22 +BIT3=DB15.DBB3 +BIT4=DB15.DBB4 + + +[BLINK] +;MAX_COUNTER_BLINK = 30 +MAX_COUNTER_BLINK = 15 +;bit0 = 0 +;bit1 = 0 +;bit2 = 1 +;bit3 = 1 +;bit4 = 1 +;bit5 = 0 +;bit6 = 0 +;bit7 = 0 +BLINK_FILT=0 +;BLINK_FILT=28 + +[OPTPAR] +;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice +; attenzione memoria sempre base BYTE (1604 DW --> 6416...) +PZCOUNT_MODE=STD.DB15.DBDW40 +;PZ_CAD_MADDR=1602 +;PZ_REQ_MADDR=1603 +;PZ_DONE_MADDR=1604 +;PZ_GTOT_MADDR=1605 + +[BRANCH] +NAME=develop \ No newline at end of file diff --git a/IOB-WIN/DATA/CONF/GT547.ini b/IOB-WIN/DATA/CONF/GT547.ini index bea96913..52510104 100644 --- a/IOB-WIN/DATA/CONF/GT547.ini +++ b/IOB-WIN/DATA/CONF/GT547.ini @@ -1,6 +1,6 @@ ;Configurazione IOB-WIN [IOB] -;ROBOT KAWASAKI, isola Trevisan 547 +;ROBOT KAWASAKI 553, isola Trevisan 547 CNCTYPE=KAWASAKI [MACHINE] diff --git a/IOB-WIN/DATA/CONF/GT554.ini b/IOB-WIN/DATA/CONF/GT554.ini new file mode 100644 index 00000000..e4077e4b --- /dev/null +++ b/IOB-WIN/DATA/CONF/GT554.ini @@ -0,0 +1,63 @@ +;Configurazione IOB-WIN +[IOB] +;Punzonatrice FAPE, isola Trevisan 547 +CNCTYPE=SIEMENS +PING_MS_TIMEOUT=500 + +[MACHINE] +VENDOR=Tecnomeccanica +MODEL=Punzonatrice Fape + +[CNC] +IP=192.168.1.55 +CPUTYPE=S71200 +RACK=0 +SLOT=0 + +[SERVER] +MPIP=http://192.168.1.64 +MPURL=/MP/IO +CMDBASE=/IOB/input/ +CMDFLOG=/IOB/flog/ +CMDALIVE=/IOB +CMDENABLED=/IOB/enabled/ +CMDADV1=?valore= +CMDREBO=/sendReboot.aspx?idxMacchina= + +[MEMORY] +ADDR_READ=DB15.DBB0 +ADDR_WRITE=DB16.DBB0 +SIZE_READ=48 +SIZE_WRITE=48 +;BIT0=CONN +BIT1=DB15.DBB1 +;BIT2=PZCOUNT.STD.DB700.DBW22 +BIT3=DB15.DBB3 +BIT4=DB15.DBB4 + + +[BLINK] +;MAX_COUNTER_BLINK = 30 +MAX_COUNTER_BLINK = 15 +;bit0 = 0 +;bit1 = 0 +;bit2 = 1 +;bit3 = 1 +;bit4 = 1 +;bit5 = 0 +;bit6 = 0 +;bit7 = 0 +BLINK_FILT=0 +;BLINK_FILT=28 + +[OPTPAR] +;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice +; attenzione memoria sempre base BYTE (1604 DW --> 6416...) +PZCOUNT_MODE=STD.DB15.DBDW40 +;PZ_CAD_MADDR=1602 +;PZ_REQ_MADDR=1603 +;PZ_DONE_MADDR=1604 +;PZ_GTOT_MADDR=1605 + +[BRANCH] +NAME=develop \ No newline at end of file diff --git a/IOB-WIN/DATA/CONF/GT557.ini b/IOB-WIN/DATA/CONF/GT557.ini index 4169f77c..d7d6fae7 100644 --- a/IOB-WIN/DATA/CONF/GT557.ini +++ b/IOB-WIN/DATA/CONF/GT557.ini @@ -1,5 +1,6 @@ ;Configurazione IOB-WIN -[IOB] +[IOB] +;Punzonatrice FAPE, isola BTB1 CNCTYPE=SIEMENS PING_MS_TIMEOUT=500 @@ -8,7 +9,6 @@ VENDOR=Tecnomeccanica MODEL=Punzonatrice Fape [CNC] -; Siemens (FAPE) isola BTB1 IP=192.168.1.56 CPUTYPE=S71200 RACK=0 diff --git a/IOB-WIN/DATA/CONF/MAIN.ini b/IOB-WIN/DATA/CONF/MAIN.ini index 80a689fe..cb55eb62 100644 --- a/IOB-WIN/DATA/CONF/MAIN.ini +++ b/IOB-WIN/DATA/CONF/MAIN.ini @@ -26,7 +26,7 @@ CMDIOB2CALL=/IOB/getIob2call?GWIP= ;--- SIEMENS TORRI --- ;STARTLIST=3013 ;--- LVF -STARTLIST=GT547 +STARTLIST=GT547,GT554,GT557 MAXCNC=4 ;STARTLIST=3001,3002,3003,3004,3005 \ No newline at end of file diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj index 47449274..04011a9d 100644 --- a/IOB-WIN/IOB-WIN.csproj +++ b/IOB-WIN/IOB-WIN.csproj @@ -223,6 +223,9 @@ Always + + Always + Always diff --git a/Jenkinsfile b/Jenkinsfile index cbd1c983..9d9597ac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=314']) { + withEnv(['NEXT_BUILD_NUMBER=315']) { // env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'