From 5c751bd5ce9b82ca86a31b6149bf835d8dd978af Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 21 Jan 2025 17:22:57 +0100 Subject: [PATCH] Update FANUC con test Jetco 3027 OK --- IOB-WIN-FANUC/DATA/CONF/MAIN.ini | 2 +- IOB-WIN-FANUC/IOB-WIN-FANUC.csproj | 3 ++ IOB-WIN-FANUC/postBuildTgt.bat | 86 +++++++++++++++--------------- IOB-WIN-FORM/IOB-WIN-FORM.csproj | 16 ------ IOB-WIN-FORM/MainForm.cs | 4 +- IOB-WIN-FORM/packages.config | 1 - 6 files changed, 50 insertions(+), 62 deletions(-) diff --git a/IOB-WIN-FANUC/DATA/CONF/MAIN.ini b/IOB-WIN-FANUC/DATA/CONF/MAIN.ini index 6da09d7a..d315369b 100644 --- a/IOB-WIN-FANUC/DATA/CONF/MAIN.ini +++ b/IOB-WIN-FANUC/DATA/CONF/MAIN.ini @@ -19,7 +19,7 @@ CLI_INST=SteamWareSim ;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04 ;STARTLIST=SIMUL_01 ;STARTLIST=3025,3027,3028 -STARTLIST=3028 +STARTLIST=3027 MAXCNC=10 \ No newline at end of file diff --git a/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj b/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj index 0a215cfd..b8ebd632 100644 --- a/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj +++ b/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj @@ -62,6 +62,9 @@ ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\StackExchange.Redis.2.8.24\lib\net461\StackExchange.Redis.dll diff --git a/IOB-WIN-FANUC/postBuildTgt.bat b/IOB-WIN-FANUC/postBuildTgt.bat index 46c62e6b..6e7cde05 100644 --- a/IOB-WIN-FANUC/postBuildTgt.bat +++ b/IOB-WIN-FANUC/postBuildTgt.bat @@ -1,49 +1,49 @@ @echo off echo Inizio processing After Build: configurazione %1 , directory %2 -RD /S /Q %2"\lib\ar" -RD /S /Q %2"\lib\cs" -RD /S /Q %2"\lib\da" -RD /S /Q %2"\lib\de" -RD /S /Q %2"\lib\es" -RD /S /Q %2"\lib\fr" -RD /S /Q %2"\lib\it" -RD /S /Q %2"\lib\ja-JP" -RD /S /Q %2"\lib\ko" -RD /S /Q %2"\lib\lv" -RD /S /Q %2"\lib\nl" -RD /S /Q %2"\lib\pl" -RD /S /Q %2"\lib\pt" -RD /S /Q %2"\lib\pt-BR" -RD /S /Q %2"\lib\ru" -RD /S /Q %2"\lib\sk" -RD /S /Q %2"\lib\sv" -RD /S /Q %2"\lib\th" -RD /S /Q %2"\lib\tr" -RD /S /Q %2"\lib\zh" -RD /S /Q %2"\lib\zh-TW" - -MOVE /Y %2"ar" %2"lib\" -MOVE /Y %2"cs" %2"lib\" -MOVE /Y %2"da" %2"lib\" -MOVE /Y %2"de" %2"lib\" -MOVE /Y %2"es" %2"lib\" -MOVE /Y %2"fr" %2"lib\" -MOVE /Y %2"it" %2"lib\" -MOVE /Y %2"ja-JP" %2"lib\" -MOVE /Y %2"ko" %2"lib\" -MOVE /Y %2"lv" %2"lib\" -MOVE /Y %2"nl" %2"lib\" -MOVE /Y %2"pl" %2"lib\" -MOVE /Y %2"pt" %2"lib\" -MOVE /Y %2"pt-BR" %2"lib\" -MOVE /Y %2"ru" %2"lib\" -MOVE /Y %2"sk" %2"lib\" -MOVE /Y %2"sv" %2"lib\" -MOVE /Y %2"th" %2"lib\" -MOVE /Y %2"tr" %2"lib\" -MOVE /Y %2"zh" %2"lib\" -MOVE /Y %2"zh-TW" %2"lib\" +REM RD /S /Q %2"\lib\ar" +REM RD /S /Q %2"\lib\cs" +REM RD /S /Q %2"\lib\da" +REM RD /S /Q %2"\lib\de" +REM RD /S /Q %2"\lib\es" +REM RD /S /Q %2"\lib\fr" +REM RD /S /Q %2"\lib\it" +REM RD /S /Q %2"\lib\ja-JP" +REM RD /S /Q %2"\lib\ko" +REM RD /S /Q %2"\lib\lv" +REM RD /S /Q %2"\lib\nl" +REM RD /S /Q %2"\lib\pl" +REM RD /S /Q %2"\lib\pt" +REM RD /S /Q %2"\lib\pt-BR" +REM RD /S /Q %2"\lib\ru" +REM RD /S /Q %2"\lib\sk" +REM RD /S /Q %2"\lib\sv" +REM RD /S /Q %2"\lib\th" +REM RD /S /Q %2"\lib\tr" +REM RD /S /Q %2"\lib\zh" +REM RD /S /Q %2"\lib\zh-TW" +REM +REM MOVE /Y %2"ar" %2"lib\" +REM MOVE /Y %2"cs" %2"lib\" +REM MOVE /Y %2"da" %2"lib\" +REM MOVE /Y %2"de" %2"lib\" +REM MOVE /Y %2"es" %2"lib\" +REM MOVE /Y %2"fr" %2"lib\" +REM MOVE /Y %2"it" %2"lib\" +REM MOVE /Y %2"ja-JP" %2"lib\" +REM MOVE /Y %2"ko" %2"lib\" +REM MOVE /Y %2"lv" %2"lib\" +REM MOVE /Y %2"nl" %2"lib\" +REM MOVE /Y %2"pl" %2"lib\" +REM MOVE /Y %2"pt" %2"lib\" +REM MOVE /Y %2"pt-BR" %2"lib\" +REM MOVE /Y %2"ru" %2"lib\" +REM MOVE /Y %2"sk" %2"lib\" +REM MOVE /Y %2"sv" %2"lib\" +REM MOVE /Y %2"th" %2"lib\" +REM MOVE /Y %2"tr" %2"lib\" +REM MOVE /Y %2"zh" %2"lib\" +REM MOVE /Y %2"zh-TW" %2"lib\" if %1 == "Release" goto ReleaseExec diff --git a/IOB-WIN-FORM/IOB-WIN-FORM.csproj b/IOB-WIN-FORM/IOB-WIN-FORM.csproj index af08bd9a..d6a75213 100644 --- a/IOB-WIN-FORM/IOB-WIN-FORM.csproj +++ b/IOB-WIN-FORM/IOB-WIN-FORM.csproj @@ -38,15 +38,6 @@ ..\packages\MathNet.Numerics.5.0.0\lib\net461\MathNet.Numerics.dll - - ..\packages\Microsoft.Web.WebView2.1.0.2903.40\lib\net462\Microsoft.Web.WebView2.Core.dll - - - ..\packages\Microsoft.Web.WebView2.1.0.2903.40\lib\net462\Microsoft.Web.WebView2.WinForms.dll - - - ..\packages\Microsoft.Web.WebView2.1.0.2903.40\lib\net462\Microsoft.Web.WebView2.Wpf.dll - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -123,11 +114,4 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/IOB-WIN-FORM/MainForm.cs b/IOB-WIN-FORM/MainForm.cs index 0b85ba4f..e5d67158 100644 --- a/IOB-WIN-FORM/MainForm.cs +++ b/IOB-WIN-FORM/MainForm.cs @@ -706,6 +706,7 @@ namespace IOB_WIN_FORM this.LayoutMdi(MdiLayout.TileHorizontal); } +#if false private void AutoUpdater_ApplicationExitEvent() { displayTaskAndLog("Chiusura Adapters"); @@ -717,7 +718,8 @@ namespace IOB_WIN_FORM Thread.Sleep(1000); // ESCO! Application.Exit(); - } + } +#endif /// /// Effettua verifiche varie comunicazione verso PLC e verso server diff --git a/IOB-WIN-FORM/packages.config b/IOB-WIN-FORM/packages.config index c4533a5a..528cac80 100644 --- a/IOB-WIN-FORM/packages.config +++ b/IOB-WIN-FORM/packages.config @@ -2,7 +2,6 @@ -