diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll index bac9f0f6..67856c44 100644 Binary files a/CVCncLib/testSam.dll and b/CVCncLib/testSam.dll differ diff --git a/IOB-WIN/App.config b/IOB-WIN/App.config index da9d9574..f2ebe325 100644 --- a/IOB-WIN/App.config +++ b/IOB-WIN/App.config @@ -74,6 +74,8 @@ + + diff --git a/IOB-WIN/IobSiemensTorri.cs b/IOB-WIN/IobSiemensTorri.cs index 298276e6..31d47fe6 100644 --- a/IOB-WIN/IobSiemensTorri.cs +++ b/IOB-WIN/IobSiemensTorri.cs @@ -71,6 +71,18 @@ namespace IOB_WIN B_input = 0; // TORRI: leggo i primi 8 bit hard coded... int byteSem = RawInput[0]; + // Verifico se usare powerOn by connessione... SE funziona diventerà SENZA CONF di default... + if (utils.CRB("powerOnByConn")) + { + // azzero powerOn... + byteSem &= ~(1 << 0); + // bit 0 (powerOn) imposto a 1 SE connected... + if (currPLC.IsConnected) + { + byteSem += (1 << 0); + } + } + // azzero i bit NON gestiti (2-5-6-7) byteSem &= ~(1 << 2); byteSem &= ~(1 << 5); @@ -78,7 +90,7 @@ namespace IOB_WIN byteSem &= ~(1 << 7); // leggo bit 701.4 e lo porto al bit 5 --> ciclo test/accensione/spegnimento if ((RawInput[1] & (1 << 4)) != 0) //se RawInput[1] & 16-- > 5° bit-- > TEST - { + { byteSem += (1 << 5); } // salvo infine variabile bit x invio diff --git a/Jenkinsfile b/Jenkinsfile index f6db8996..ad7203c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=362']) { + withEnv(['NEXT_BUILD_NUMBER=363']) { // env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'