Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modifico condizione byteCheck x CMZ (testing)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-04-13 12:43:28 +02:00
parent c1b7dfb462
commit 27acd2f32b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IobFanuc.cs
+3 -1
View File
@@ -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!
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'