diff --git a/IOB-WIN/DATA/CONF/SIM_DP_01.ini b/IOB-WIN/DATA/CONF/SIM_DP_01.ini index 797e5fbf..bbb6c100 100644 --- a/IOB-WIN/DATA/CONF/SIM_DP_01.ini +++ b/IOB-WIN/DATA/CONF/SIM_DP_01.ini @@ -32,7 +32,7 @@ BLINK_FILT=0 PZCOUNT_MODE=BIT ; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE in ms, default 1 secondo) PER_BASE=800 -SIM_PZCNT=10|2 +SIM_PZCNT=10|3 SIM_ALARM=1000|20 SIM_MANU=50|6 ; 1 = indica che la macchina รจ multi --> allo scadere del contapezzo gestisce ANCHE il giro tavola sui bit relativi diff --git a/IOB-WIN/IobSimula.cs b/IOB-WIN/IobSimula.cs index 140d2673..b6ab76bb 100644 --- a/IOB-WIN/IobSimula.cs +++ b/IOB-WIN/IobSimula.cs @@ -118,10 +118,10 @@ namespace IOB_WIN string[] param = fullVal.Split('|'); int.TryParse(param[0], out answ.wait); int.TryParse(param[1], out answ.duration); - // aggiongo noise, +/- 20%... + // aggiongo noise, +/- 40%... Random rnd = new Random(); - int noise = rnd.Next(1, answ.wait / 5); - answ.wait += noise - (answ.wait / 10); + int noise = rnd.Next(1, answ.wait * 40 / 100); + answ.wait += noise - (answ.wait * 20 / 100); } } } @@ -343,10 +343,10 @@ namespace IOB_WIN } } - // se multi gestisco il bit delel tavole... + // se multi gestisco il bit delle tavole... if (isMulti) { - // se sono in fase di fronte d'usita (invio contapezzi) INVERTO nP... + // se sono in fase di fronte d'uscita (invio contapezzi) INVERTO nP... if (sendContapezzi) { nP = nP == 1 ? 2 : 1; diff --git a/Jenkinsfile b/Jenkinsfile index 10e638be..7f08555f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=360']) { + withEnv(['NEXT_BUILD_NUMBER=361']) { // 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'