diff --git a/Jenkinsfile b/Jenkinsfile index 52e3a44..99ca62d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=330']) { + withEnv(['NEXT_BUILD_NUMBER=331']) { // env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'SCMA' diff --git a/MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs b/MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs index ffc7cdd..8e87489 100644 --- a/MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs +++ b/MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs @@ -105,7 +105,6 @@ namespace OPC_UA_REDIS redServAlive = newStatus; if (newStatus) checkRedisStatusAndSend(); } - //redServAlive = newStatus; } #if false @@ -199,7 +198,7 @@ namespace OPC_UA_REDIS refreshData2Send = true; if (redServAlive) { - sendChangedData(); + sendChangedData(false); } else { @@ -216,9 +215,9 @@ namespace OPC_UA_REDIS /// /// Invio dati modificati /// - /// + /// forza invio di TUTTO comunque... /// - private string sendChangedData() + private string sendChangedData(bool forceSend=false) { string timestamp = null; // var accessorie @@ -238,7 +237,7 @@ namespace OPC_UA_REDIS List together = new List(); foreach (DataItemRed di in mDataItems) { - List list = di.ItemList(); + List list = di.ItemList(forceSend); together.AddRange(list); } @@ -354,7 +353,7 @@ namespace OPC_UA_REDIS } if (refreshData2Send) { - sendChangedData(); + sendChangedData(true); lg.Info("Reinviati dati sendChangedData"); } if (stopData2Send)