Merge branch 'develop'

This commit is contained in:
Samuele E. Locatelli
2019-12-03 17:34:17 +01:00
2 changed files with 17 additions and 5 deletions
+16 -4
View File
@@ -797,8 +797,6 @@ namespace IOB_WIN
string currExe = "";
string currRun = "";
string currUnOpStatus = "";
string currGettoOn = "";
string currAbilAbras = "";
try
{
var exeMode = dataItemMem["Path_01_EXE_MODE"];
@@ -842,6 +840,11 @@ namespace IOB_WIN
{
// se ho run mode != auto --> manual
B_input += (1 << 4);
// loggo cosa sia curr run!
if (utils.CRB("verbose"))
{
lgInfo($"Indicato manuale | currRun = {currRun}");
}
}
@@ -884,7 +887,7 @@ namespace IOB_WIN
// log opzionale!
if (verboseLog)
{
lgInfo(string.Format("Trasformazione B_input: {0}", B_input));
lgInfo($"Trasformazione B_input: {B_input} | currRun = {currRun} | currExe = {currExe} | currUnOpStatus {currUnOpStatus}");
}
}
/// <summary>
@@ -896,7 +899,16 @@ namespace IOB_WIN
protected bool checkDataItem(string itemName, string trueVal)
{
bool answ = false;
MtcDataItemExt currValue = null;
try
{
currValue = dataItemMem[itemName];
answ = (currValue.value.Equals(trueVal));
}
catch
{
lgError($"Errore in decodifica valore per {itemName} rispetto a {trueVal} | recuperato {currValue} / {currValue.value}");
}
return answ;
}
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=551']) {
withEnv(['NEXT_BUILD_NUMBER=552']) {
// 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'