fix x gestione timer controllo contapezzi
This commit is contained in:
+2
-1
@@ -400,6 +400,8 @@ namespace IOB_WIN
|
||||
// controllo se è passato intervallo minimo pre invio
|
||||
if (DateTime.Now >= lastPzCountSend.AddMilliseconds(pzCountDelay))
|
||||
{
|
||||
// resetto timer...
|
||||
lastPzCountSend = DateTime.Now;
|
||||
if (utils.CRB("enableContapezzi"))
|
||||
{
|
||||
try
|
||||
@@ -462,7 +464,6 @@ namespace IOB_WIN
|
||||
B_input += 1 << 2;
|
||||
// registro contapezzi
|
||||
lg.Info(string.Format("Contapezzi FANUC: {0} | Contapezzi interno {1}", lastCount, contapezzi));
|
||||
lastPzCountSend = DateTime.Now;
|
||||
}
|
||||
else if (contapezzi > lastCount) // in questo caso resetto
|
||||
{
|
||||
|
||||
Vendored
+1
-1
@@ -14,7 +14,7 @@ pipeline {
|
||||
|
||||
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
|
||||
script {
|
||||
withEnv(['NEXT_BUILD_NUMBER=225']) {
|
||||
withEnv(['NEXT_BUILD_NUMBER=226']) {
|
||||
// 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'
|
||||
|
||||
Reference in New Issue
Block a user