From 9c9e9392aa955255d7919c5078c8c2bf63ca7183 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 8 Jan 2025 19:18:05 +0100 Subject: [PATCH] Completato repulisti nuget x NEXT da MTConnect - da eliminare vari if false... - da eliminare files esclusi --- IOB-WIN-NEXT.sln | 4 +- IOB-WIN-NEXT/DATA/CONF/3025.ini | 34 +++++--- IOB-WIN-NEXT/DATA/CONF/MAIN.ini | 4 +- IOB-WIN-NEXT/IOB-WIN-NEXT.csproj | 134 +------------------------------ IOB-WIN-NEXT/Iob/GenericNext.cs | 2 - IOB-WIN-NEXT/packages.config | 31 ------- 6 files changed, 29 insertions(+), 180 deletions(-) diff --git a/IOB-WIN-NEXT.sln b/IOB-WIN-NEXT.sln index 3c7a3e16..855ab074 100644 --- a/IOB-WIN-NEXT.sln +++ b/IOB-WIN-NEXT.sln @@ -68,8 +68,8 @@ Global {9BA331BB-9BF1-40E0-AC03-74B43D73A097}.Release|Any CPU.Build.0 = Release|Any CPU {9BA331BB-9BF1-40E0-AC03-74B43D73A097}.Release|x86.ActiveCfg = Release|Any CPU {9BA331BB-9BF1-40E0-AC03-74B43D73A097}.Release|x86.Build.0 = Release|Any CPU - {9BA331BB-9BF1-40E0-AC03-74B43D73A097}.Remote_DEBUG|Any CPU.ActiveCfg = Release|Any CPU - {9BA331BB-9BF1-40E0-AC03-74B43D73A097}.Remote_DEBUG|Any CPU.Build.0 = Release|Any CPU + {9BA331BB-9BF1-40E0-AC03-74B43D73A097}.Remote_DEBUG|Any CPU.ActiveCfg = Debug|Any CPU + {9BA331BB-9BF1-40E0-AC03-74B43D73A097}.Remote_DEBUG|Any CPU.Build.0 = Debug|Any CPU {9BA331BB-9BF1-40E0-AC03-74B43D73A097}.Remote_DEBUG|x86.ActiveCfg = Release|Any CPU {9BA331BB-9BF1-40E0-AC03-74B43D73A097}.Remote_DEBUG|x86.Build.0 = Release|Any CPU {9BA331BB-9BF1-40E0-AC03-74B43D73A097}.SIEMENS|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/IOB-WIN-NEXT/DATA/CONF/3025.ini b/IOB-WIN-NEXT/DATA/CONF/3025.ini index 6895cf60..2fa97d5b 100644 --- a/IOB-WIN-NEXT/DATA/CONF/3025.ini +++ b/IOB-WIN-NEXT/DATA/CONF/3025.ini @@ -26,18 +26,21 @@ CMDREBO=/sendReboot.aspx?idxMacchina= ; Red: Y31.4 | Yellow: Y31.5 | Green Y31.6 | riscaldamento Y7.4 ??? ;BIT0=CONN BIT1=Y31.6 +;BIT2=PZCOUNT.PAR.6711 BIT2=PZCOUNT.MACRO.10100 +;BIT2=STD.MACRO.10100 BIT3=Y31.4 BIT4=Y31.5 -BIT5=Y7.4 -BIT6=X8.4 +; 8.4 --> emg armata= true, 0 = attiva mettere !8.4 (da verificare) +BIT5=!X8.4 +;BIT6=X8.4 AREAD_START=0 AREAD_SIZE=0 AREAG_SIZE=48 AREAR_START=0 AREAR_SIZE=0 AREAX_START=0 -AREAX_SIZE=8 +AREAX_SIZE=40 AREAY_START=0 AREAY_SIZE=32 PAR_START=6711 @@ -45,32 +48,39 @@ PAR_SIZE=3 [BLINK] ;MAX_COUNTER_BLINK = 30 -MAX_COUNTER_BLINK = 15 +MAX_COUNTER_BLINK = 60 ;bit0 = 0 -;bit1 = 0 +;bit1 = 1 ;bit2 = 0 ;bit3 = 0 -;bit4 = 1 +;bit4 = 0 ;bit5 = 0 ;bit6 = 0 ;bit7 = 0 -BLINK_FILT=0 +BLINK_FILT=2 ;BLINK_FILT=16 [OPTPAR] -;PZCOUNT_MODE=STD.PAR.6711 -;PZREQ_MODE=STD.PAR.6713 +;PZCOUNT_MODE=STD|BIT +;PZCOUNT_MODE=STD.PAR.6711 PZCOUNT_MODE=STD.MACRO.10100 PZREQ_MODE=STD.MACRO.10000 PZGTOT_MODE=STD.PAR.6712 -;PZREQ_MODE=STD.PAR.6713 ;PZCAD_MODE=STD.D.6408.DW ENABLE_PZ_RESET=TRUE ENABLE_PZ_RESET_stopSetup=TRUE ;gestione invio pezzi in blocco ENABLE_SEND_PZC_BLOCK=TRUE -MIN_SEND_PZC_BLOCK=5 +MIN_SEND_PZC_BLOCK=0 MAX_SEND_PZC_BLOCK=100 +DISABLE_SEND_WDST=TRUE [BRANCH] -NAME=master \ No newline at end of file +NAME=master + +; Tags manuali +[TAGS] +Customer=JETCO +HostOS=WIN +HostName=IOB-WIN-09 +HostAddr=192.168.1.133 diff --git a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini index 2533e40d..1be77771 100644 --- a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini +++ b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini @@ -52,8 +52,8 @@ CLI_INST=SteamWareSim ;STARTLIST=Tend_RAMA_10_47 ;STARTLIST=3024-PING ;STARTLIST=2015 -STARTLIST=SIMUL_01 -;STARTLIST=3024 +;STARTLIST=SIMUL_01 +STARTLIST=3025 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 f324d935..c1cf4bb5 100644 --- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj +++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj @@ -155,78 +155,12 @@ ..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll - - ..\packages\Microsoft.Extensions.Configuration.7.0.0\lib\net462\Microsoft.Extensions.Configuration.dll - - - ..\packages\Microsoft.Extensions.Configuration.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Configuration.Binder.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Binder.dll - - - ..\packages\Microsoft.Extensions.Configuration.CommandLine.7.0.0\lib\net462\Microsoft.Extensions.Configuration.CommandLine.dll - - - ..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.7.0.0\lib\net462\Microsoft.Extensions.Configuration.EnvironmentVariables.dll - - - ..\packages\Microsoft.Extensions.Configuration.FileExtensions.7.0.0\lib\net462\Microsoft.Extensions.Configuration.FileExtensions.dll - - - ..\packages\Microsoft.Extensions.Configuration.Json.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Json.dll - - - ..\packages\Microsoft.Extensions.Configuration.UserSecrets.7.0.0\lib\net462\Microsoft.Extensions.Configuration.UserSecrets.dll - - - ..\packages\Microsoft.Extensions.DependencyInjection.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\packages\Microsoft.Extensions.FileProviders.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.FileProviders.Abstractions.dll - - - ..\packages\Microsoft.Extensions.FileProviders.Physical.7.0.0\lib\net462\Microsoft.Extensions.FileProviders.Physical.dll - - - ..\packages\Microsoft.Extensions.FileSystemGlobbing.7.0.0\lib\net462\Microsoft.Extensions.FileSystemGlobbing.dll - - - ..\packages\Microsoft.Extensions.Hosting.7.0.0\lib\net462\Microsoft.Extensions.Hosting.dll - - - ..\packages\Microsoft.Extensions.Hosting.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Hosting.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Logging.7.0.0\lib\net462\Microsoft.Extensions.Logging.dll - ..\packages\Microsoft.Extensions.Logging.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll - - ..\packages\Microsoft.Extensions.Logging.Configuration.7.0.0\lib\net462\Microsoft.Extensions.Logging.Configuration.dll - - - ..\packages\Microsoft.Extensions.Logging.Console.7.0.0\lib\net462\Microsoft.Extensions.Logging.Console.dll - - - ..\packages\Microsoft.Extensions.Logging.Debug.7.0.0\lib\net462\Microsoft.Extensions.Logging.Debug.dll - - - ..\packages\Microsoft.Extensions.Logging.EventLog.7.0.0\lib\net462\Microsoft.Extensions.Logging.EventLog.dll - - - ..\packages\Microsoft.Extensions.Logging.EventSource.7.0.0\lib\net462\Microsoft.Extensions.Logging.EventSource.dll - - - ..\packages\Microsoft.Extensions.Options.7.0.0\lib\net462\Microsoft.Extensions.Options.dll - - - ..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.7.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll - ..\packages\Microsoft.Extensions.Primitives.7.0.0\lib\net462\Microsoft.Extensions.Primitives.dll @@ -259,33 +193,6 @@ ..\packages\MQTTnet.Extensions.ManagedClient.4.3.3.952\lib\net461\MQTTnet.Extensions.ManagedClient.dll - - ..\packages\MTConnect.NET.6.5.1\lib\net462\MTConnect.NET.dll - - - ..\packages\MTConnect.NET-Common.6.5.1\lib\net462\MTConnect.NET-Common.dll - - - ..\packages\MTConnect.NET-HTTP.6.5.1\lib\net462\MTConnect.NET-HTTP.dll - - - ..\packages\MTConnect.NET-JSON.6.5.1\lib\net462\MTConnect.NET-JSON.dll - - - ..\packages\MTConnect.NET-JSON-cppagent.6.5.1\lib\net462\MTConnect.NET-JSON-cppagent.dll - - - ..\packages\MTConnect.NET-MQTT.6.5.1\lib\net462\MTConnect.NET-MQTT.dll - - - ..\packages\MTConnect.NET-SHDR.6.5.1\lib\net462\MTConnect.NET-SHDR.dll - - - ..\packages\MTConnect.NET-TLS.6.5.1\lib\net462\MTConnect.NET-TLS.dll - - - ..\packages\MTConnect.NET-XML.6.5.1\lib\net462\MTConnect.NET-XML.dll - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -616,21 +523,12 @@ - - Always - - - - - - - @@ -647,9 +545,6 @@ - - Always - Always @@ -750,17 +645,11 @@ - + + Always + - - Always - - - Always - - - @@ -788,8 +677,6 @@ - - @@ -865,8 +752,6 @@ - - @@ -877,14 +762,8 @@ Always - - - - - - @@ -899,9 +778,6 @@ - - Always - @@ -919,8 +795,6 @@ - - @@ -1012,8 +886,6 @@ - - Always diff --git a/IOB-WIN-NEXT/Iob/GenericNext.cs b/IOB-WIN-NEXT/Iob/GenericNext.cs index 76a1e168..49bf970e 100644 --- a/IOB-WIN-NEXT/Iob/GenericNext.cs +++ b/IOB-WIN-NEXT/Iob/GenericNext.cs @@ -4,8 +4,6 @@ using IOB_UT_NEXT; using IOB_WIN_FORM; using MapoSDK; using MathNet.Numerics.Statistics; -using MTConnect; -using MTConnect.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; diff --git a/IOB-WIN-NEXT/packages.config b/IOB-WIN-NEXT/packages.config index 78c3685b..9af14d81 100644 --- a/IOB-WIN-NEXT/packages.config +++ b/IOB-WIN-NEXT/packages.config @@ -15,30 +15,8 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -49,15 +27,6 @@ - - - - - - - - -