Merge branch 'MTC'

This commit is contained in:
Samuele E. Locatelli
2019-12-03 21:49:41 +01:00
3 changed files with 11 additions and 4 deletions
Binary file not shown.
+10 -3
View File
@@ -185,10 +185,14 @@ namespace IOB_WIN
lgInfo($"---------------- Elenco Devices ----------------");
// loggo devices principali...
logDevicesList(probe.Devices);
// chiamo il device succesful!
DevicesSuccessful(probe);
}
}
catch
{ }
catch(Exception exc)
{
lgError($"Eccezione durante test probe:{Environment.NewLine}{exc}");
}
// ora avvio
try
{
@@ -543,11 +547,14 @@ namespace IOB_WIN
locTStamp = dataItem.Timestamp.ToLocalTime();
sVal = $"SAMPLE: {locTStamp.ToString()} | descr: {descr} | Id: {dataItem.DataItemId} | | Name: {dataItem.Name} | Val: {dataItem.CDATA}";
lgInfo(sVal);
DateTime tStamp = dataItem.Timestamp;
var time2 = tStamp.ToLocalTime();
// verifico se salvare
bool changed = checkSaveSample(dataItem);
if (changed)
{
accodaFLog(sVal, qEncodeFLog(locTStamp, descr, dataItem.CDATA));
accodaFLog(sVal, qEncodeFLog(time2, descr, dataItem.CDATA));
//accodaFLog(sVal, qEncodeFLog(locTStamp, descr, dataItem.CDATA));
}
else
{
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=557']) {
withEnv(['NEXT_BUILD_NUMBER=558']) {
// 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'