From 87944bd8d4be97d4acc7399469d7f2b1113b2b7f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 17 Apr 2018 08:52:13 +0200 Subject: [PATCH] reset timing con disconnect --- IOB-WIN/DATA/CONF/3004.ini | 3 +-- IOB-WIN/IobFanuc.cs | 2 ++ Jenkinsfile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/IOB-WIN/DATA/CONF/3004.ini b/IOB-WIN/DATA/CONF/3004.ini index 443ae4eb..81fa18b2 100644 --- a/IOB-WIN/DATA/CONF/3004.ini +++ b/IOB-WIN/DATA/CONF/3004.ini @@ -12,8 +12,7 @@ IP=192.168.0.20 PORT=8193 [SERVER] -MPIP=http://192.168.1.7 -;MPIP=http://10.74.82.219 +MPIP=http://10.74.82.219 MPURL=/MP/IO CMDBASE=/IOB/input/ CMDFLOG=/IOB/flog/ diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs index ad862cdc..9b24b5a1 100644 --- a/IOB-WIN/IobFanuc.cs +++ b/IOB-WIN/IobFanuc.cs @@ -211,6 +211,8 @@ namespace IOB_WIN { FANUC_ref.Disconnect(ref szStatusConnection); connectionOk = false; + // resetto timing! + TimingData.resetData(); lg.Info(szStatusConnection); lg.Info("Effettuata disconnessione adapter FANUC!"); } diff --git a/Jenkinsfile b/Jenkinsfile index 19aeb8e9..fc5d577d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=234']) { + withEnv(['NEXT_BUILD_NUMBER=235']) { // 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'