Merge branch 'develop' into MTC

This commit is contained in:
Samuele E. Locatelli
2019-12-04 15:24:16 +01:00
2 changed files with 13 additions and 3 deletions
+12 -2
View File
@@ -35,6 +35,14 @@ namespace IOB_WIN
/// </summary>
protected bool hasReadItems = false;
/// <summary>
/// Veto controllos tatus x log...
/// </summary>
protected DateTime vetoCheckStatus = DateTime.Now;
/// <summary>
/// Secondi standard x veto check status e log
/// </summary>
protected int vetoSeconds = 5;
/// <summary>
/// URL x salvataggio elenco dataItems MTC
/// </summary>
protected string urlSaveDataItems
@@ -1039,11 +1047,13 @@ namespace IOB_WIN
// se ho run mode != auto --> manual
B_input += (1 << 4);
}
// solo ogni 5 secondi
// solo se non ho veto check
DateTime adesso = DateTime.Now;
if ((adesso.Second % 5) == 0)
if (vetoCheckStatus < adesso)
{
lgInfo($"Stato variabili: currRun: {currRun} | currExe: {currExe} | currUnOpStatus: {currUnOpStatus}");
// imposto veto per vetoSeconds...
vetoCheckStatus = adesso.AddSeconds(vetoSeconds);
}
#if false
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=566']) {
withEnv(['NEXT_BUILD_NUMBER=567']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'