Merge branch 'develop' into IobMan

This commit is contained in:
Samuele E. Locatelli
2020-02-27 15:31:26 +01:00
3 changed files with 20 additions and 2 deletions
+1 -1
View File
@@ -39,7 +39,7 @@ PZCOUNT_MODE=BIT
ENABLE_PZ_RESET=TRUE
;gestione invio pezzi in blocco
ENABLE_SEND_PZC_BLOCK=TRUE
MIN_SEND_PZC_BLOCK=5
MIN_SEND_PZC_BLOCK=0
MAX_SEND_PZC_BLOCK=100
; conf parametri memoria READ/WRITE
PARAM_CONF=SIMUL_01.json
+18
View File
@@ -1422,6 +1422,9 @@ namespace IOB_WIN
private void svuotaCodaContapezzi()
{
// permetto al max 2 tentativi infruttuosi...
int maxTry = 2;
int oldContapezzi = contapezzi;
// se ho contapezzi OLTRE limite...
while ((MPOnline) && (lastCountCNC > contapezzi + minSendPzCountBlock))
{
@@ -1429,6 +1432,21 @@ namespace IOB_WIN
pzCntReload(true);
// provo invio
trySendPzCountBlock();
// verifica per evitare loop infinito invio fallito
if (oldContapezzi == contapezzi)
{
maxTry--;
}
else
{
maxTry = 2;
oldContapezzi = contapezzi;
}
// verifico maxTry: se li ho esauriti esco!
if (maxTry <= 0)
{
return;
}
// aspetto x dare tempo calcolo
Thread.Sleep(300);
}
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=679']) {
withEnv(['NEXT_BUILD_NUMBER=680']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'