From dd8cfa848ec1069145806159092019af9b8ab4f5 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Nov 2023 17:05:46 +0100 Subject: [PATCH] modifica log lettura conf memoria --- IOB-WIN-NEXT/Iob/Generic.cs | 14 ++++++++++++-- IOB-WIN-NEXT/IobModbusTCP/ModbusTCP.cs | 1 - 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/IOB-WIN-NEXT/Iob/Generic.cs b/IOB-WIN-NEXT/Iob/Generic.cs index 37931907..aae59da6 100644 --- a/IOB-WIN-NEXT/Iob/Generic.cs +++ b/IOB-WIN-NEXT/Iob/Generic.cs @@ -1982,9 +1982,12 @@ namespace IOB_WIN_NEXT.Iob { string answ = ""; // controllo SE HO il parametro - if (memMap.optKVP.ContainsKey(key)) + if (memMap.optKVP != null && memMap.optKVP.Count > 0) { - answ = memMap.optKVP[key]; + if (memMap.optKVP.ContainsKey(key)) + { + answ = memMap.optKVP[key]; + } } return answ; } @@ -5345,6 +5348,7 @@ namespace IOB_WIN_NEXT.Iob /// protected virtual void loadMemConf() { + lgInfo("loadMemConf.01"); lgInfoStartup("BEGIN loadMemConf"); // variabili x gestione send contapezzi in blocco string currPar = getOptPar("ENABLE_SEND_PZC_BLOCK"); @@ -5362,6 +5366,7 @@ namespace IOB_WIN_NEXT.Iob { lgError("loadMemConf: parametro ENABLE_SEND_PZC_BLOCK non trovato, verificare anche MAX_SEND_PZC_BLOCK e MIN_SEND_PZC_BLOCK"); } + lgInfo("loadMemConf.02"); // gruppo macchina CodGruppoIob = getOptPar("CodGruppoIob"); @@ -5389,6 +5394,7 @@ namespace IOB_WIN_NEXT.Iob bool.TryParse(getOptPar("disDynDataRangeCheck"), out checkDis); disDynDataRangeCheck = checkDis; } + lgInfo("loadMemConf.03"); // inizializzo LUT decodifica PARAMETRI string jsonParams = getOptPar("PARAM_CONF"); @@ -5401,6 +5407,7 @@ namespace IOB_WIN_NEXT.Iob if (!string.IsNullOrEmpty(jsonData)) { lgInfoStartup($"File json PARAMETRI composto da {jsonData.Length} caratteri"); + lgInfo("loadMemConf.04"); try { memMap = JsonConvert.DeserializeObject(jsonData); @@ -5408,6 +5415,7 @@ namespace IOB_WIN_NEXT.Iob setupOptMemPar(); setupFileDecod(); setupSpecialParams(); + lgInfo("loadMemConf.05"); } catch (Exception exc) { @@ -5425,6 +5433,7 @@ namespace IOB_WIN_NEXT.Iob lgInfoStartup("loadMemConf: non trovata opzione PARAM_CONF in file INI"); } + lgInfo("loadMemConf.06"); // inizializzo LUT decodifica ALLARMI string jsonAlarms = getOptPar("ALARM_CONF"); if (!string.IsNullOrEmpty(jsonAlarms)) @@ -5458,6 +5467,7 @@ namespace IOB_WIN_NEXT.Iob } // loggo + lgInfo("loadMemConf.07"); lgInfoStartup("DONE loadMemConf"); } diff --git a/IOB-WIN-NEXT/IobModbusTCP/ModbusTCP.cs b/IOB-WIN-NEXT/IobModbusTCP/ModbusTCP.cs index d4446484..7cd59f9a 100644 --- a/IOB-WIN-NEXT/IobModbusTCP/ModbusTCP.cs +++ b/IOB-WIN-NEXT/IobModbusTCP/ModbusTCP.cs @@ -32,7 +32,6 @@ namespace IOB_WIN_NEXT.IobModbusTCP { lgInfo("NEW IOB ModBus TCP"); - setupSpecialParams(); DateTime adesso = DateTime.Now; memMap = new plcMemMapExt(); if (IOBConf != null)