diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 62fbf136..ff2cb6ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,8 +49,9 @@ variables: } Set-Alias 7zip $7zipPath $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip" - $Source = "$env:APP_NAME\bin\*" - 7zip a -tzip $Target $Source + cd "$env:APP_NAME\bin\" + $Source = "*" + 7zip a -tzip $Target $Source -xr!DATA echo "called ZIP $Source --> $Target" # helper creazione hash files diff --git a/CVCncLib/CVCncLib.dll b/CVCncLib/CVCncLib.dll index 2a41f481..ec112015 100644 Binary files a/CVCncLib/CVCncLib.dll and b/CVCncLib/CVCncLib.dll differ diff --git a/IOB-UT-NEXT/Enums.cs b/IOB-UT-NEXT/Enums.cs index 9e8c3e6d..090da652 100644 --- a/IOB-UT-NEXT/Enums.cs +++ b/IOB-UT-NEXT/Enums.cs @@ -319,6 +319,11 @@ namespace IOB_UT_NEXT /// OpcUaEwon, + /// + /// Adapter OPC-UA per Ewon x Monti / Tenditalia + /// + OpcUaEwonMonti, + /// /// Adapter OSAI CNDEX (Cndex) /// diff --git a/IOB-UT-NEXT/IOB-UT-NEXT.csproj b/IOB-UT-NEXT/IOB-UT-NEXT.csproj index 844550cf..07ce0ea2 100644 --- a/IOB-UT-NEXT/IOB-UT-NEXT.csproj +++ b/IOB-UT-NEXT/IOB-UT-NEXT.csproj @@ -62,8 +62,8 @@ ..\packages\MapoSDK.6.14.2109.2809\lib\net40\MapoSDK.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll @@ -83,14 +83,14 @@ - - ..\packages\System.Diagnostics.PerformanceCounter.5.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll + + ..\packages\System.Diagnostics.PerformanceCounter.6.0.0\lib\net461\System.Diagnostics.PerformanceCounter.dll ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - - ..\packages\System.IO.Pipelines.5.0.1\lib\net461\System.IO.Pipelines.dll + + ..\packages\System.IO.Pipelines.6.0.0\lib\net461\System.IO.Pipelines.dll ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll @@ -100,16 +100,16 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - ..\packages\System.Threading.Channels.5.0.0\lib\net461\System.Threading.Channels.dll + + ..\packages\System.Threading.Channels.6.0.0\lib\net461\System.Threading.Channels.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/IOB-UT-NEXT/ToMapo.cs b/IOB-UT-NEXT/ToMapo.cs index 3208a847..0e9f1724 100644 --- a/IOB-UT-NEXT/ToMapo.cs +++ b/IOB-UT-NEXT/ToMapo.cs @@ -328,6 +328,29 @@ namespace IOB_UT_NEXT #endregion Public Properties } + /// + /// Definizione parametri watchdog + /// + public class WatchDogConf + { + /// + /// Abilitazione WatchDog + /// + public bool IsEnabled { get; set; } = false; + /// + /// Conf memoria x lettura WatchDog (ToMes), se !="" è gestito + /// + public string MemConfRead { get; set; } = ""; + /// + /// Conf memoria x scrittura WatchDog (FromMes), se !="" è gestito + /// + public string MemConfWrite { get; set; } = ""; + /// + /// Valore max contatore prima di resettare + /// + public int MaxVal { get; set; } = 9999; + } + /// /// Classe gestione configurazione parametri specifici OPC-UA da BaseParamConf /// @@ -385,6 +408,15 @@ namespace IOB_UT_NEXT /// public diCheckCondSetup condWarmUpCoolDown { get; set; } = new diCheckCondSetup(); + /// + /// Struttura dati x check condizione Warning + /// + public diCheckCondSetup condWarning { get; set; } = new diCheckCondSetup(); + /// + /// Struttura dati x check condizione Setup + /// + public diCheckCondSetup condSetup { get; set; } = new diCheckCondSetup(); + /// /// Elenco dei NodeId da ignorare intesi come interi rami (se vuoto NON filtro) /// @@ -405,6 +437,11 @@ namespace IOB_UT_NEXT /// public List subscribedItems { get; set; } = new List(); + /// + /// Conf Gestione WatchDog + /// + public WatchDogConf WatchDog{get;set;} = new WatchDogConf(); + #endregion Public Properties } } \ No newline at end of file diff --git a/IOB-UT-NEXT/app.config b/IOB-UT-NEXT/app.config index 8a32f100..1b1d33ee 100644 --- a/IOB-UT-NEXT/app.config +++ b/IOB-UT-NEXT/app.config @@ -16,16 +16,24 @@ - + - + + + + + + + + + diff --git a/IOB-UT-NEXT/packages.config b/IOB-UT-NEXT/packages.config index 293f0a8d..ae2cdab6 100644 --- a/IOB-UT-NEXT/packages.config +++ b/IOB-UT-NEXT/packages.config @@ -1,20 +1,20 @@  - + - + - + - + - + \ No newline at end of file diff --git a/IOB-WIN-NEXT/App.config b/IOB-WIN-NEXT/App.config index 8abdeb17..99cbf1fd 100644 --- a/IOB-WIN-NEXT/App.config +++ b/IOB-WIN-NEXT/App.config @@ -104,33 +104,25 @@ - - - - - - - - - - - - - - - - - - + + - - + + + + + + + + + + diff --git a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini index 06eaebb3..cf107e9e 100644 --- a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini +++ b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini @@ -72,6 +72,6 @@ CLI_INST=SteamWareSim ;STARTLIST=FP_TR2 ;STARTLIST=PING ;STARTLIST=SIM_PIZ03 -STARTLIST=PIZ09 +STARTLIST=PING MAXCNC=10 \ No newline at end of file diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj index 9dd02d87..b283f2e8 100644 --- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj +++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj @@ -1,6 +1,6 @@  - + Debug @@ -103,13 +103,13 @@ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.12\lib\net45\NLog.dll + ..\packages\NLog.4.7.13\lib\net45\NLog.dll ..\packages\OmronFinsTCP.Net.3.0.0.0\lib\net40\OmronFinsTCP.Net.dll - ..\packages\OPCFoundation.NetStandard.Opc.Ua.Client.1.4.367.42\lib\net462\Opc.Ua.Client.dll + ..\packages\OPCFoundation.NetStandard.Opc.Ua.Client.1.4.367.75\lib\net462\Opc.Ua.Client.dll ..\packages\OPCFoundation.NetStandard.Opc.Ua.Configuration.1.4.367.75\lib\net462\Opc.Ua.Configuration.dll @@ -121,8 +121,9 @@ ..\packages\OPCFoundation.NetStandard.Opc.Ua.Security.Certificates.1.4.367.75\lib\net462\Opc.Ua.Security.Certificates.dll - - ..\packages\RestSharp.106.13.0\lib\net452\RestSharp.dll + + ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + True ..\packages\S7netplus.0.1.9\lib\net45\S7.Net.dll @@ -148,8 +149,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -173,7 +174,7 @@ ..\ExtLibs\AdsApi\.NET\v4.0.30319\TwinCAT.Ads.dll - ..\packages\Selenium.WebDriver.4.0.1\lib\net46\WebDriver.dll + ..\packages\Selenium.WebDriver.4.1.0\lib\net46\WebDriver.dll @@ -825,8 +826,8 @@ - - + + @@ -845,14 +846,14 @@ Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}. - - - - + + + + - - - + + + \ No newline at end of file diff --git a/IOB-WIN-NEXT/packages.config b/IOB-WIN-NEXT/packages.config index 49053227..0d438dba 100644 --- a/IOB-WIN-NEXT/packages.config +++ b/IOB-WIN-NEXT/packages.config @@ -4,28 +4,28 @@ - - + + - + - + - + - - + + - + \ No newline at end of file