From 27acd2f32b5d46399d5bbb3df10e457a5f0b985d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 13 Apr 2018 12:43:28 +0200 Subject: [PATCH] modifico condizione byteCheck x CMZ (testing) --- IOB-WIN/IobFanuc.cs | 4 +++- Jenkinsfile | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs index 1456c622..b77e2b75 100644 --- a/IOB-WIN/IobFanuc.cs +++ b/IOB-WIN/IobFanuc.cs @@ -397,7 +397,8 @@ namespace IOB_WIN break; } // controllo se il bit sia attivo... - if ((byte2check & (long)Math.Pow(2, bitNum)) > 0) + //if ((byte2check & (long)Math.Pow(2, bitNum)) > 0) + if ((byte2check & (1 << bitNum)) == (1 << bitNum)) { B_input += 1 << i; } @@ -407,6 +408,7 @@ namespace IOB_WIN // verifico se variato contapezzi in 6711... if (lastCount != contapezzi) { + // FARE!!! deve incrementare di 1 il contapezzi e poi mettere un WAIT prima del successivo conteggio... da testare PRIMA di tutto... // salvo nuovo contapezzi contapezzi = lastCount; // salvo in semaforo! diff --git a/Jenkinsfile b/Jenkinsfile index 590726b1..441aa3d6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=219']) { + withEnv(['NEXT_BUILD_NUMBER=220']) { // env.versionNumber = VersionNumber(versionNumberString : '1.17.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.17.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'