Prova fix MemMap!

This commit is contained in:
Samuele E. Locatelli
2019-10-30 17:38:02 +01:00
parent 1590a79fa2
commit 3e8fd79e1d
2 changed files with 19 additions and 6 deletions
+18 -5
View File
@@ -47,7 +47,7 @@ namespace IOB_WIN
/// <summary>
/// Struttura memoria SIEMENS x lettura/scrittura da JSON file
/// </summary>
public siemensMemMap memMap = new siemensMemMap();
public siemensMemMap memMap;
#endregion
@@ -323,6 +323,7 @@ namespace IOB_WIN
/// <param name="adpConf"></param>
public IobSiemens(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
{
memMap = new siemensMemMap();
// gestione invio ritardato contapezzi
pzCountDelay = utils.CRI("pzCountDelay");
lastPzCountSend = DateTime.Now;
@@ -620,24 +621,28 @@ namespace IOB_WIN
/// </summary>
private void loadMemConf()
{
lgInfo("BEGIN reloadParametersConf");
lgInfo("BEGIN loadMemConf");
// inizializzo LUT decodifica
string jsonConf = getOptPar("PARAM_CONF");
if (jsonConf != "")
{
StreamReader reader = new StreamReader($"DATA/CONF/{jsonConf}");
string jsonFileName = $"DATA/CONF/{jsonConf}";
lgInfo($"Apertura file {jsonFileName}");
StreamReader reader = new StreamReader(jsonFileName);
string jsonData = reader.ReadToEnd();
if (jsonData != "")
{
lgInfo($"File json composto da {jsonData.Length} caratteri");
try
{
memMap = JsonConvert.DeserializeObject<siemensMemMap>(jsonData);
lgInfo($"Decodifica aree memMap: trovati {memMap.mMapRead.Count} valori TSVC");
lgInfo($"Decodifica aree memMap: trovati {memMap.mMapWrite.Count} parametri ");
// se ho variabili read --> genero dati TSVC...
if (memMap.mMapRead.Count > 0)
{
TSVC_Data.Clear();
LastTSVC.Clear();
lgInfo($"Trovate {memMap.mMapRead.Count} chiavi TSVC");
VCData currConf;
int periodo = 0;
VC_func funz = VC_func.POINT;
@@ -669,9 +674,17 @@ namespace IOB_WIN
lgError($"Eccezione in decodifica conf json{Environment.NewLine}{exc}");
}
}
else
{
lgError("Errore in loadMemConf: file json vuoto!");
}
}
else
{
lgInfo("loadMemConf: non trovata opzione PARAM_CONF in file INI");
}
// loggo
lgInfo("DONE reloadParametersConf");
lgInfo("DONE loadMemConf");
}
/// <summary>
/// Restituisce path completo file da chiave configurazione
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=476']) {
withEnv(['NEXT_BUILD_NUMBER=477']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'