From a043f778c07265151bbbda272006611ed299e5ba Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 10 Sep 2021 10:13:55 +0200 Subject: [PATCH] Fix condizione controllo scrittura aprametri x vari adapter siemens + fix log --- IOB-WIN-NEXT/IobGeneric.cs | 13 +++++++------ IOB-WIN-NEXT/IobSiemens.cs | 7 ++++--- IOB-WIN-NEXT/IobSiemensAt2001.cs | 2 +- IOB-WIN-NEXT/IobSiemensComeca.cs | 4 ++-- IOB-WIN-NEXT/IobSiemensComur.cs | 4 ++-- IOB-WIN-NEXT/IobSiemensCosmap.cs | 6 +++--- IOB-WIN-NEXT/IobSiemensIngenia.cs | 2 +- IOB-WIN-NEXT/IobSiemensSimec.cs | 4 ++-- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/IOB-WIN-NEXT/IobGeneric.cs b/IOB-WIN-NEXT/IobGeneric.cs index 393b123b..a2016101 100644 --- a/IOB-WIN-NEXT/IobGeneric.cs +++ b/IOB-WIN-NEXT/IobGeneric.cs @@ -2597,7 +2597,7 @@ namespace IOB_WIN_NEXT string jsonData = reader.ReadToEnd(); if (!string.IsNullOrEmpty(jsonData)) { - lgInfo($"File json composto da {jsonData.Length} caratteri"); + lgInfo($"File json PARAMETRI composto da {jsonData.Length} caratteri"); try { memMap = JsonConvert.DeserializeObject(jsonData); @@ -2629,7 +2629,7 @@ namespace IOB_WIN_NEXT string jsonData = reader.ReadToEnd(); if (!string.IsNullOrEmpty(jsonData)) { - lgInfo($"File json composto da {jsonData.Length} caratteri"); + lgInfo($"File json ALLARMI composto da {jsonData.Length} caratteri"); try { alarmMaps = JsonConvert.DeserializeObject>(jsonData); @@ -2648,7 +2648,7 @@ namespace IOB_WIN_NEXT } else { - lgInfo("loadMemConf: non trovata opzione PARAM_CONF in file INI"); + lgInfo("loadMemConf: non trovata opzione ALARM_CONF in file INI"); } // loggo @@ -2886,10 +2886,10 @@ namespace IOB_WIN_NEXT /// protected void setupMemMap() { - lgInfo($"Decodifica aree memMap: trovati {memMap.mMapRead.Count} valori Read TSVC"); - lgInfo($"Decodifica aree memMap: trovati {memMap.mMapWrite.Count} parametri da scrivere"); + lgInfo($"setupMemMap | trovati {memMap.mMapRead.Count} parametri Read (TSVC)"); + lgInfo($"setupMemMap | trovati {memMap.mMapWrite.Count} parametri Write"); string rawMemConf = JsonConvert.SerializeObject(memMap, Formatting.Indented); - lgInfo($"Configurazione memoria R/W:{Environment.NewLine}{rawMemConf}"); + lgInfo($"setupMemMap | configurazione memoria R/W:{Environment.NewLine}{rawMemConf}"); // se ho variabili read --> genero dati TSVC... if (memMap.mMapRead.Count > 0) { @@ -2954,6 +2954,7 @@ namespace IOB_WIN_NEXT // invio su cloud parametri! rawData = JsonConvert.SerializeObject(allParam); utils.callUrl($"{urlSaveAllParams}", rawData); + lgInfo($"setupMemMap | salvata conf memoria R/W"); } } diff --git a/IOB-WIN-NEXT/IobSiemens.cs b/IOB-WIN-NEXT/IobSiemens.cs index 459c43df..b1b2804d 100644 --- a/IOB-WIN-NEXT/IobSiemens.cs +++ b/IOB-WIN-NEXT/IobSiemens.cs @@ -100,7 +100,7 @@ namespace IOB_WIN_NEXT string iobConfSer = ""; try { - iobConfSer = JsonConvert.SerializeObject(IOBConf); + iobConfSer = JsonConvert.SerializeObject(IOBConf, Formatting.Indented); } catch { } @@ -1143,7 +1143,7 @@ namespace IOB_WIN_NEXT switch (errorCode) { case ErrorCode.NoError: - maybeLogWrite(memAddrWrite, $"Effettuata correttamente scrittura su PLC: MEMORIA {memAddrWrite} | numByte: {Value.Length} | BIN: {Value.ValToBinString()}"); + maybeLogWrite(memAddrWrite, $"S7WriteBB-01 Effettuata correttamente scrittura su PLC: MEMORIA {memAddrWrite} | numByte: {Value.Length} | BIN: {Value.ValToBinString()}"); answ = true; break; @@ -1206,7 +1206,7 @@ namespace IOB_WIN_NEXT switch (errorCode) { case ErrorCode.NoError: - lgInfo($"Effettuata correttamente scrittura su PLC: DB {DbNum}.{IndiceMem} | numByte: {Value.Length}| {Value.ValToBinString()}"); + lgInfo($"S7WriteBB-02 Effettuata correttamente scrittura su PLC: DB {DbNum}.{IndiceMem} | numByte: {Value.Length}| {Value.ValToBinString()}"); break; case ErrorCode.WrongCPU_Type: @@ -1447,6 +1447,7 @@ namespace IOB_WIN_NEXT Buffer.BlockCopy(stringPar, 0, MemBlock, startPos, shiftStrByte); } Buffer.BlockCopy(strByte, 0, MemBlock, startPos + shiftStrByte, byteLen); + lgInfo($"saveStringOnMemBlock: Final MemBlock{Environment.NewLine}{MemBlock.ValToBinString()}"); } catch (Exception exc) { diff --git a/IOB-WIN-NEXT/IobSiemensAt2001.cs b/IOB-WIN-NEXT/IobSiemensAt2001.cs index 57f6c587..93559a0c 100644 --- a/IOB-WIN-NEXT/IobSiemensAt2001.cs +++ b/IOB-WIN-NEXT/IobSiemensAt2001.cs @@ -287,7 +287,7 @@ namespace IOB_WIN_NEXT taskDone.Add(item.Key, taskVal); if (!string.IsNullOrEmpty(memAddrWrite)) { - // scrivo comunque! + // scrivo! taskOk = S7WriteBB(ref MemBlock, memAddrWrite); } if (!taskOk) diff --git a/IOB-WIN-NEXT/IobSiemensComeca.cs b/IOB-WIN-NEXT/IobSiemensComeca.cs index 735ac58e..68316cf6 100644 --- a/IOB-WIN-NEXT/IobSiemensComeca.cs +++ b/IOB-WIN-NEXT/IobSiemensComeca.cs @@ -253,9 +253,9 @@ namespace IOB_WIN_NEXT } // aggiungo task! taskDone.Add(item.Key, taskVal); - if (string.IsNullOrEmpty(memAddrWrite)) + if (!string.IsNullOrEmpty(memAddrWrite)) { - // scrivo comunque! + // scrivo! taskOk = S7WriteBB(ref MemBlock, memAddrWrite); } if (!taskOk) diff --git a/IOB-WIN-NEXT/IobSiemensComur.cs b/IOB-WIN-NEXT/IobSiemensComur.cs index a240f687..d9ce976a 100644 --- a/IOB-WIN-NEXT/IobSiemensComur.cs +++ b/IOB-WIN-NEXT/IobSiemensComur.cs @@ -262,9 +262,9 @@ namespace IOB_WIN_NEXT } // aggiungo task! taskDone.Add(item.Key, taskVal); - if (string.IsNullOrEmpty(memAddrWrite)) + if (!string.IsNullOrEmpty(memAddrWrite)) { - // scrivo comunque! + // scrivo! taskOk = S7WriteBB(ref MemBlock, memAddrWrite); } if (!taskOk) diff --git a/IOB-WIN-NEXT/IobSiemensCosmap.cs b/IOB-WIN-NEXT/IobSiemensCosmap.cs index ecaffd5a..c2b44a10 100644 --- a/IOB-WIN-NEXT/IobSiemensCosmap.cs +++ b/IOB-WIN-NEXT/IobSiemensCosmap.cs @@ -140,7 +140,7 @@ namespace IOB_WIN_NEXT /// public override Dictionary executeTasks(Dictionary task2exe) { - lgInfo($"Chiamata executeTasks specifica IobSiemensComeca: {task2exe.Count} task ricevuti"); + lgInfo($"Chiamata executeTasks specifica IobSiemensCosmap: {task2exe.Count} task ricevuti"); // Verificare il protocollo: dovrebeb togliere SOLO i task eseguiti... Dictionary taskDone = new Dictionary(); bool taskOk = false; @@ -253,9 +253,9 @@ namespace IOB_WIN_NEXT } // aggiungo task! taskDone.Add(item.Key, taskVal); - if (string.IsNullOrEmpty(memAddrWrite)) + if (!string.IsNullOrEmpty(memAddrWrite)) { - // scrivo comunque! + // scrivo! taskOk = S7WriteBB(ref MemBlock, memAddrWrite); } if (!taskOk) diff --git a/IOB-WIN-NEXT/IobSiemensIngenia.cs b/IOB-WIN-NEXT/IobSiemensIngenia.cs index f3bd5d9f..fd06c066 100644 --- a/IOB-WIN-NEXT/IobSiemensIngenia.cs +++ b/IOB-WIN-NEXT/IobSiemensIngenia.cs @@ -235,7 +235,7 @@ namespace IOB_WIN_NEXT taskDone.Add(item.Key, taskVal); if (!string.IsNullOrEmpty(memAddrWrite)) { - // scrivo comunque! + // scrivo! taskOk = S7WriteBB(ref MemBlock, memAddrWrite); } if (!taskOk) diff --git a/IOB-WIN-NEXT/IobSiemensSimec.cs b/IOB-WIN-NEXT/IobSiemensSimec.cs index 81d72e75..fe8ffca3 100644 --- a/IOB-WIN-NEXT/IobSiemensSimec.cs +++ b/IOB-WIN-NEXT/IobSiemensSimec.cs @@ -244,9 +244,9 @@ namespace IOB_WIN_NEXT } // aggiungo task! taskDone.Add(item.Key, taskVal); - if (string.IsNullOrEmpty(memAddrWrite)) + if (!string.IsNullOrEmpty(memAddrWrite)) { - // scrivo comunque! + // scrivo! taskOk = S7WriteBB(ref MemBlock, memAddrWrite); } if (!taskOk)