diff --git a/CONF-IOB-WIN/Freeplast/FP_R6.ini b/CONF-IOB-WIN/Freeplast/FP_R6.ini new file mode 100644 index 00000000..1f2d1a5b --- /dev/null +++ b/CONF-IOB-WIN/Freeplast/FP_R6.ini @@ -0,0 +1,55 @@ +;Configurazione IOB-WIN +[IOB] +CNCTYPE=OSAI_OPEN + +[MACHINE] +VENDOR=CMS +MODEL=ATHENA + +[CNC] +IP=192.168.139.1 + +[SERVER] +MPIP=SRV-MAPO +MPURL=/MP/IO +CMDBASE=/IOB/input/ +CMDFLOG=/IOB/flog/ +CMDALIVE=/IOB +CMDENABLED=/IOB/enabled/ +CMDADV1=?valore= +CMDREBO=/sendReboot.aspx?idxMacchina= + +[MEMORY] +BITRED=Y8.4 +BITYELLOW=Y8.5 +BITGREEN=Y8.6 +AREAD_START=0 +AREAD_SIZE=9999 +AREAY_START=0 +AREAY_SIZE=64 + +[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=BIT +PZ_CAD_MADDR=1602 +PZ_REQ_MADDR=1603 +PZ_DONE_MADDR=1604 +PZ_GTOT_MADDR=1605 + +[BRANCH] +NAME=master \ No newline at end of file diff --git a/CONF-IOB-WIN/Freeplast/FP_R7.ini b/CONF-IOB-WIN/Freeplast/FP_R7.ini new file mode 100644 index 00000000..0b869270 --- /dev/null +++ b/CONF-IOB-WIN/Freeplast/FP_R7.ini @@ -0,0 +1,56 @@ +;Configurazione IOB-WIN +[IOB] +CNCTYPE=OSAI_CNDEX + +[MACHINE] +VENDOR=CMS +MODEL=SINTESY + +[CNC] +IP=NC4368 +;PORT=8193 + +[SERVER] +MPIP=SRV-MAPO +MPURL=/MP/IO +CMDBASE=/IOB/input/ +CMDFLOG=/IOB/flog/ +CMDALIVE=/IOB +CMDENABLED=/IOB/enabled/ +CMDADV1=?valore= +CMDREBO=/sendReboot.aspx?idxMacchina= + +[MEMORY] +BITRED=Y8.4 +BITYELLOW=Y8.5 +BITGREEN=Y8.6 +AREAD_START=0 +AREAD_SIZE=9999 +AREAY_START=0 +AREAY_SIZE=64 + +[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=BIT +PZ_CAD_MADDR=1602 +PZ_REQ_MADDR=1603 +PZ_DONE_MADDR=1604 +PZ_GTOT_MADDR=1605 + +[BRANCH] +NAME=master \ No newline at end of file diff --git a/CONF-IOB-WIN/Freeplast/MAIN.ini b/CONF-IOB-WIN/Freeplast/MAIN.ini new file mode 100644 index 00000000..63674a66 --- /dev/null +++ b/CONF-IOB-WIN/Freeplast/MAIN.ini @@ -0,0 +1,17 @@ +;Configurazione IOB-WIN GENERALE + +[BRANCH] +NAME=develop + +[SERVER] +MPIP=192.168.2.252 +MPURL=/MP/IO +CMDREBO=/IOB/sendRebootGateway?GWIP= +CMDIOB2CALL=/IOB/getIob2call?GWIP= + +[IOB] +; Freeplast CMS ATHENA OSAI_OPEN +STARTLIST=FP_R6 + +MAXCNC=4 +;STARTLIST=3001,3002,3003,3004,3005 \ No newline at end of file diff --git a/IOB-WIN/DATA/CONF/FP_R6.ini b/IOB-WIN/DATA/CONF/FP_R6.ini index d0292a2f..1f2d1a5b 100644 --- a/IOB-WIN/DATA/CONF/FP_R6.ini +++ b/IOB-WIN/DATA/CONF/FP_R6.ini @@ -7,8 +7,7 @@ VENDOR=CMS MODEL=ATHENA [CNC] -IP=192.168.2.10 -;PORT=8193 +IP=192.168.139.1 [SERVER] MPIP=SRV-MAPO diff --git a/IOB-WIN/DATA/CONF/FP_R7.ini b/IOB-WIN/DATA/CONF/FP_R7.ini index 74633896..0b869270 100644 --- a/IOB-WIN/DATA/CONF/FP_R7.ini +++ b/IOB-WIN/DATA/CONF/FP_R7.ini @@ -7,7 +7,7 @@ VENDOR=CMS MODEL=SINTESY [CNC] -IP=192.168.2.11 +IP=NC4368 ;PORT=8193 [SERVER] diff --git a/Jenkinsfile b/Jenkinsfile index 036bbc02..4a48efa4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=291']) { + withEnv(['NEXT_BUILD_NUMBER=292']) { // 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'