Merge branch 'MTC'

This commit is contained in:
Samuele E. Locatelli
2019-12-04 09:44:40 +01:00
2 changed files with 11 additions and 2 deletions
+10 -1
View File
@@ -173,6 +173,8 @@ namespace IOB_WIN
private short doConnect()
{
short esitoLink = 0;
// reset memoria dataItem..
dataItemMem = new Dictionary<string, MtcDataItemExt>();
// avvio un oggetto di comunicazione MTC
#if false
MTC_ref = new MTConnectClient($"http://{cIobConf.cncIpAddr}:{port}");
@@ -399,7 +401,7 @@ namespace IOB_WIN
thresholdDeadBand = threshDBand,
samplePeriod = dSamplePeriod
};
// lo g x capire COME ho chiamato alcune cosette...
// log x capire COME ho chiamato alcune cosette...
if (dataItem.Id.Contains("EXE_MODE") || dataItem.Id.Contains("RUN_MODE") || dataItem.Id.Contains("POWER") || dataItem.Id.EndsWith("_Status"))
{
lgInfo($"DEBUG DATA | dataItem.Id : {dataItem.Id}");
@@ -1004,6 +1006,12 @@ namespace IOB_WIN
//lgError($"Eccezione in decodifica UnOp_Status: {Environment.NewLine}{exc}");
}
// log!
if (verboseLog)
{
lgInfo($"Stato variabili: currRun: {currRun} | currExe: {currExe} | currUnOpStatus: {currUnOpStatus}");
}
// controllo lavora...
if (currRun == "AUTOMATIC" || currRun == "SEMI_AUTO")
{
@@ -1015,6 +1023,7 @@ namespace IOB_WIN
B_input += (1 << 1);
}
}
}
// se ho almeno 1 allarme E NON SONO IN AUTO --> ALARM!
else if (hasError)
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=562']) {
withEnv(['NEXT_BUILD_NUMBER=563']) {
// 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'