diff --git a/IOB-UT-NEXT/Iob/BaseObj.cs b/IOB-UT-NEXT/Iob/BaseObj.cs index 6702d662..17de8ce6 100644 --- a/IOB-UT-NEXT/Iob/BaseObj.cs +++ b/IOB-UT-NEXT/Iob/BaseObj.cs @@ -102,12 +102,12 @@ namespace IOB_UT_NEXT.Iob /// /// Collettore di tutte le variabili scadenza DateTime /// - public DateTimeHelper DtHelp; + public DateTimeHelper DtHelp = new DateTimeHelper(); /// /// Collettore di tutte le Queue gestite /// - public QueueHelper QHelp; + public QueueHelper QHelp = new QueueHelper(); /// /// Abilitazione lettura PrgName diff --git a/IOB-WIN-BECKHOFF/App.config b/IOB-WIN-BECKHOFF/App.config index f66d9734..32fc9001 100644 --- a/IOB-WIN-BECKHOFF/App.config +++ b/IOB-WIN-BECKHOFF/App.config @@ -1,185 +1,185 @@ - + -
+
- + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - + + - - - - + + + + - + - - - + + + - - - + + + - + - - - + + + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + diff --git a/IOB-WIN-BECKHOFF/IOB-WIN-BECKHOFF.csproj b/IOB-WIN-BECKHOFF/IOB-WIN-BECKHOFF.csproj index 267ec3a9..7c856e6f 100644 --- a/IOB-WIN-BECKHOFF/IOB-WIN-BECKHOFF.csproj +++ b/IOB-WIN-BECKHOFF/IOB-WIN-BECKHOFF.csproj @@ -39,6 +39,9 @@ + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + diff --git a/IOB-WIN-BECKHOFF/packages.config b/IOB-WIN-BECKHOFF/packages.config index 2dcb60a9..802807ab 100644 --- a/IOB-WIN-BECKHOFF/packages.config +++ b/IOB-WIN-BECKHOFF/packages.config @@ -16,6 +16,7 @@ + diff --git a/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj b/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj index 18661df6..1a3502ab 100644 --- a/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj +++ b/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj @@ -98,6 +98,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-FANUC/packages.config b/IOB-WIN-FANUC/packages.config index bae8657c..7d90367b 100644 --- a/IOB-WIN-FANUC/packages.config +++ b/IOB-WIN-FANUC/packages.config @@ -18,6 +18,7 @@ + diff --git a/IOB-WIN-FILE/IOB-WIN-FILE.csproj b/IOB-WIN-FILE/IOB-WIN-FILE.csproj index 07d13125..d5afb5e7 100644 --- a/IOB-WIN-FILE/IOB-WIN-FILE.csproj +++ b/IOB-WIN-FILE/IOB-WIN-FILE.csproj @@ -79,6 +79,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-FILE/packages.config b/IOB-WIN-FILE/packages.config index 5b715800..47194ab1 100644 --- a/IOB-WIN-FILE/packages.config +++ b/IOB-WIN-FILE/packages.config @@ -17,6 +17,7 @@ + diff --git a/IOB-WIN-FORM/Iob/Generic.cs b/IOB-WIN-FORM/Iob/Generic.cs index 7eccfbdd..724f0a55 100644 --- a/IOB-WIN-FORM/Iob/Generic.cs +++ b/IOB-WIN-FORM/Iob/Generic.cs @@ -69,6 +69,11 @@ namespace IOB_WIN_FORM.Iob // init oggetto TCMan var tcMan = new TCMan(IobConfNew.TCDataConf.Lambda, IobConfNew.TCDataConf.MaxDelayFactor, IobConfNew.TCDataConf.MaxIncrPz); + // aggiungo altri defaults + setDefaults(true); + // imposta valori memoria (e resetta parametri su server) + setParamPlc(); + // init communication services commService = new CommunicationService(IobConfNew, redisMan); machineCommService = new MachineCommunicationService(IobConfNew, tcMan, memMap); @@ -87,10 +92,6 @@ namespace IOB_WIN_FORM.Iob // i last li avvio a VUOTI... x evitare errore mancata riscrittura SIMEC che ha memorie NON ritentive lastProdData = new Dictionary(); //lastProdData = new Dictionary(currProdData); - // aggiungo altri defaults - setDefaults(true); - // imposta valori memoria (e resetta parametri su server) - setParamPlc(); // checkLogDir x shrink! checkShrinkDir(); @@ -9123,9 +9124,9 @@ namespace IOB_WIN_FORM.Iob { string codIob = IOBConfFull.General.FilenameIOB; bool useRedis = IOBConfFull.General.EnabRedisQue; - QHelp.QueueIN.Dispose(); + if(QHelp.QueueIN!=null) QHelp.QueueIN.Dispose(); QHelp.QueueIN = new DataQueue(codIob, "QueueIN", useRedis, redisMan); - QHelp.QueueSrvResp.Dispose(); + if (QHelp.QueueSrvResp != null) QHelp.QueueSrvResp.Dispose(); QHelp.QueueSrvResp = new DataQueue(codIob, "QueueServResp", useRedis, redisMan); // no coda redis QHelp.QueueAlarm = new DataQueue(codIob, "QueueAlarm", false, redisMan); diff --git a/IOB-WIN-FORM/MainForm.cs b/IOB-WIN-FORM/MainForm.cs index 6746702c..7624385d 100644 --- a/IOB-WIN-FORM/MainForm.cs +++ b/IOB-WIN-FORM/MainForm.cs @@ -29,7 +29,7 @@ namespace IOB_WIN_FORM /// /// oggetto logging /// - public static Logger lg; + protected static Logger lg = LogManager.GetCurrentClassLogger(); /// /// Configurazione gerarchica completa (v 4.x.x.x) diff --git a/IOB-WIN-FTP/IOB-WIN-FTP.csproj b/IOB-WIN-FTP/IOB-WIN-FTP.csproj index a087cf66..a1d65d30 100644 --- a/IOB-WIN-FTP/IOB-WIN-FTP.csproj +++ b/IOB-WIN-FTP/IOB-WIN-FTP.csproj @@ -97,6 +97,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-FTP/packages.config b/IOB-WIN-FTP/packages.config index 7f6b3836..d0c1835a 100644 --- a/IOB-WIN-FTP/packages.config +++ b/IOB-WIN-FTP/packages.config @@ -19,6 +19,7 @@ + diff --git a/IOB-WIN-KAWASAKI/IOB-WIN-KAWASAKI.csproj b/IOB-WIN-KAWASAKI/IOB-WIN-KAWASAKI.csproj index 2fb29c7c..68cc12ce 100644 --- a/IOB-WIN-KAWASAKI/IOB-WIN-KAWASAKI.csproj +++ b/IOB-WIN-KAWASAKI/IOB-WIN-KAWASAKI.csproj @@ -93,6 +93,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-KAWASAKI/packages.config b/IOB-WIN-KAWASAKI/packages.config index 5b715800..47194ab1 100644 --- a/IOB-WIN-KAWASAKI/packages.config +++ b/IOB-WIN-KAWASAKI/packages.config @@ -17,6 +17,7 @@ + diff --git a/IOB-WIN-MBUS/IOB-WIN-MBUS.csproj b/IOB-WIN-MBUS/IOB-WIN-MBUS.csproj index 8199c1a7..69df9115 100644 --- a/IOB-WIN-MBUS/IOB-WIN-MBUS.csproj +++ b/IOB-WIN-MBUS/IOB-WIN-MBUS.csproj @@ -100,6 +100,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-MBUS/packages.config b/IOB-WIN-MBUS/packages.config index de54edca..226522d9 100644 --- a/IOB-WIN-MBUS/packages.config +++ b/IOB-WIN-MBUS/packages.config @@ -18,6 +18,7 @@ + diff --git a/IOB-WIN-MITSUBISHI/IOB-WIN-MITSUBISHI.csproj b/IOB-WIN-MITSUBISHI/IOB-WIN-MITSUBISHI.csproj index 0313b9d1..5c8f27a4 100644 --- a/IOB-WIN-MITSUBISHI/IOB-WIN-MITSUBISHI.csproj +++ b/IOB-WIN-MITSUBISHI/IOB-WIN-MITSUBISHI.csproj @@ -85,6 +85,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-MITSUBISHI/packages.config b/IOB-WIN-MITSUBISHI/packages.config index bae8657c..7d90367b 100644 --- a/IOB-WIN-MITSUBISHI/packages.config +++ b/IOB-WIN-MITSUBISHI/packages.config @@ -18,6 +18,7 @@ + diff --git a/IOB-WIN-MTC/IOB-WIN-MTC.csproj b/IOB-WIN-MTC/IOB-WIN-MTC.csproj index a3cd8dfe..06bf1a28 100644 --- a/IOB-WIN-MTC/IOB-WIN-MTC.csproj +++ b/IOB-WIN-MTC/IOB-WIN-MTC.csproj @@ -205,6 +205,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll True diff --git a/IOB-WIN-MTC/packages.config b/IOB-WIN-MTC/packages.config index add1e42b..11dfe02a 100644 --- a/IOB-WIN-MTC/packages.config +++ b/IOB-WIN-MTC/packages.config @@ -51,6 +51,7 @@ + diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj index 08972f0b..69183426 100644 --- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj +++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj @@ -269,6 +269,9 @@ True True + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll True diff --git a/IOB-WIN-NEXT/packages.config b/IOB-WIN-NEXT/packages.config index d1f15de0..ddb48e1b 100644 --- a/IOB-WIN-NEXT/packages.config +++ b/IOB-WIN-NEXT/packages.config @@ -54,6 +54,7 @@ + diff --git a/IOB-WIN-OMRON/IOB-WIN-OMRON.csproj b/IOB-WIN-OMRON/IOB-WIN-OMRON.csproj index 0bbb51b4..f0450575 100644 --- a/IOB-WIN-OMRON/IOB-WIN-OMRON.csproj +++ b/IOB-WIN-OMRON/IOB-WIN-OMRON.csproj @@ -82,6 +82,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-OMRON/packages.config b/IOB-WIN-OMRON/packages.config index 0d9690a2..605eda07 100644 --- a/IOB-WIN-OMRON/packages.config +++ b/IOB-WIN-OMRON/packages.config @@ -18,6 +18,7 @@ + diff --git a/IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj b/IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj index 43b2d8c3..c9600677 100644 --- a/IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj +++ b/IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj @@ -140,6 +140,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll True + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-OPC-UA/packages.config b/IOB-WIN-OPC-UA/packages.config index 8412ffed..ed7e0fbd 100644 --- a/IOB-WIN-OPC-UA/packages.config +++ b/IOB-WIN-OPC-UA/packages.config @@ -25,6 +25,7 @@ + diff --git a/IOB-WIN-OSAI/IOB-WIN-OSAI.csproj b/IOB-WIN-OSAI/IOB-WIN-OSAI.csproj index 575baa5d..b8294def 100644 --- a/IOB-WIN-OSAI/IOB-WIN-OSAI.csproj +++ b/IOB-WIN-OSAI/IOB-WIN-OSAI.csproj @@ -94,6 +94,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-OSAI/packages.config b/IOB-WIN-OSAI/packages.config index c3cffd5f..87702b14 100644 --- a/IOB-WIN-OSAI/packages.config +++ b/IOB-WIN-OSAI/packages.config @@ -19,6 +19,7 @@ + diff --git a/IOB-WIN-PING/App.config b/IOB-WIN-PING/App.config index 934a1b99..d510a3da 100644 --- a/IOB-WIN-PING/App.config +++ b/IOB-WIN-PING/App.config @@ -166,6 +166,10 @@ + + + + diff --git a/IOB-WIN-PING/IOB-WIN-PING.csproj b/IOB-WIN-PING/IOB-WIN-PING.csproj index 203ad1f2..08b78605 100644 --- a/IOB-WIN-PING/IOB-WIN-PING.csproj +++ b/IOB-WIN-PING/IOB-WIN-PING.csproj @@ -96,6 +96,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-PING/packages.config b/IOB-WIN-PING/packages.config index 4f52baf2..d6788a32 100644 --- a/IOB-WIN-PING/packages.config +++ b/IOB-WIN-PING/packages.config @@ -16,6 +16,7 @@ + diff --git a/IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj b/IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj index 522771f4..0d2f8d9f 100644 --- a/IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj +++ b/IOB-WIN-SHELLY/IOB-WIN-SHELLY.csproj @@ -100,6 +100,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-SHELLY/packages.config b/IOB-WIN-SHELLY/packages.config index c1627220..a2a42529 100644 --- a/IOB-WIN-SHELLY/packages.config +++ b/IOB-WIN-SHELLY/packages.config @@ -20,6 +20,7 @@ + diff --git a/IOB-WIN-SIEMENS/IOB-WIN-SIEMENS.csproj b/IOB-WIN-SIEMENS/IOB-WIN-SIEMENS.csproj index 88c6d09c..73cd5e90 100644 --- a/IOB-WIN-SIEMENS/IOB-WIN-SIEMENS.csproj +++ b/IOB-WIN-SIEMENS/IOB-WIN-SIEMENS.csproj @@ -94,6 +94,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-SIEMENS/packages.config b/IOB-WIN-SIEMENS/packages.config index 793fb325..ebf12d8c 100644 --- a/IOB-WIN-SIEMENS/packages.config +++ b/IOB-WIN-SIEMENS/packages.config @@ -17,6 +17,7 @@ + diff --git a/IOB-WIN-SQL/IOB-WIN-SQL.csproj b/IOB-WIN-SQL/IOB-WIN-SQL.csproj index 434962c1..dbb399e2 100644 --- a/IOB-WIN-SQL/IOB-WIN-SQL.csproj +++ b/IOB-WIN-SQL/IOB-WIN-SQL.csproj @@ -106,6 +106,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-SQL/packages.config b/IOB-WIN-SQL/packages.config index 361c1475..6f5a8a02 100644 --- a/IOB-WIN-SQL/packages.config +++ b/IOB-WIN-SQL/packages.config @@ -19,6 +19,7 @@ + diff --git a/IOB-WIN-WPS/IOB-WIN-WPS.csproj b/IOB-WIN-WPS/IOB-WIN-WPS.csproj index 3a85728c..7ffed764 100644 --- a/IOB-WIN-WPS/IOB-WIN-WPS.csproj +++ b/IOB-WIN-WPS/IOB-WIN-WPS.csproj @@ -79,6 +79,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-WPS/packages.config b/IOB-WIN-WPS/packages.config index 1029472c..e0aa24b8 100644 --- a/IOB-WIN-WPS/packages.config +++ b/IOB-WIN-WPS/packages.config @@ -15,6 +15,7 @@ + diff --git a/IOB-WIN-WS/IOB-WIN-WS.csproj b/IOB-WIN-WS/IOB-WIN-WS.csproj index ad865a2d..82d65175 100644 --- a/IOB-WIN-WS/IOB-WIN-WS.csproj +++ b/IOB-WIN-WS/IOB-WIN-WS.csproj @@ -109,6 +109,9 @@ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/IOB-WIN-WS/packages.config b/IOB-WIN-WS/packages.config index e3c424b4..b8c6581e 100644 --- a/IOB-WIN-WS/packages.config +++ b/IOB-WIN-WS/packages.config @@ -20,6 +20,7 @@ +