diff --git a/IOB-WIN-FANUC/DATA/CONF/FOV106.ini b/IOB-WIN-FANUC/DATA/CONF/FOV106.ini index ed4fa69c..e0b0a305 100644 --- a/IOB-WIN-FANUC/DATA/CONF/FOV106.ini +++ b/IOB-WIN-FANUC/DATA/CONF/FOV106.ini @@ -71,6 +71,7 @@ MIN_SEND_PZC_BLOCK=0 MAX_SEND_PZC_BLOCK=100 ; Disabilito conteggio Pezzi come richiesto DISABLE_PZCOUNT=TRUE +DISABLE_SEND_WDST=TRUE [BRANCH] NAME=master diff --git a/IOB-WIN-FANUC/DATA/CONF/MAIN.ini b/IOB-WIN-FANUC/DATA/CONF/MAIN.ini index 7ea30958..5b02ed04 100644 --- a/IOB-WIN-FANUC/DATA/CONF/MAIN.ini +++ b/IOB-WIN-FANUC/DATA/CONF/MAIN.ini @@ -26,10 +26,11 @@ CLI_INST=SteamWareSim ;STARTLIST=3004 ;STARTLIST=3002 ;STARTLIST=GT575 -;STARTLIST=3029 +STARTLIST=3029 ;STARTLIST=3004,3005 ;STARTLIST=SIMUL_01 -STARTLIST=FOV107 +;STARTLIST=FOV106 +;STARTLIST=FOV107 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 5a82ef02..25e5d51b 100644 --- a/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj +++ b/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj @@ -162,6 +162,7 @@ PreserveNewest + Always @@ -177,6 +178,7 @@ Always + Always @@ -231,7 +233,9 @@ - + + Always + Always diff --git a/IOB-WIN-FANUC/Iob/Fanuc.cs b/IOB-WIN-FANUC/Iob/Fanuc.cs index 60e192a2..979c1e53 100644 --- a/IOB-WIN-FANUC/Iob/Fanuc.cs +++ b/IOB-WIN-FANUC/Iob/Fanuc.cs @@ -690,7 +690,9 @@ namespace IOB_WIN_FANUC.Iob try { // recupero nome programma MAIN - prgName = utils.purgedChar2String(FANUC_ref.getPrgNameMain()); + var is30 = FANUC_ref.Is30Series; + var rawName = FANUC_ref.getPrgNameMain(); + prgName = utils.purgedChar2String(rawName); // trimmo path del programma, ovvero "CNCMEMUSERPATH1" prgName = prgName.Replace(utils.CRS("basePrgMemPath"), ""); lgInfo("Current PROG: {0}", prgName); diff --git a/IOB-WIN-FANUC/postBuildTgt.bat b/IOB-WIN-FANUC/postBuildTgt.bat index 520cfb94..6f8f075e 100644 --- a/IOB-WIN-FANUC/postBuildTgt.bat +++ b/IOB-WIN-FANUC/postBuildTgt.bat @@ -48,8 +48,9 @@ REM ROBOCOPY %2 \\192.168.1.133\Steamware\IOB-WIN-FANUC-DEB /MIR REM ROBOCOPY %2 \\10.51.90.10\Steamware\IOB-WIN-FANUC-DEB /MIR REM ROBOCOPY %2 \\10.51.90.14\Steamware\IOB-WIN-FANUC-DEB /MIR REM ROBOCOPY %2 \\10.51.90.13\Steamware\IOB-WIN-FANUC-DEB /MIR -ROBOCOPY %2 \\10.51.90.15\Steamware\IOB-WIN-FANUC-DEB /MIR -REM ROBOCOPY %2 \\10.51.90.9\Steamware\IOB-WIN-FANUC-DEB /MIR + +REM ROBOCOPY %2 \\10.51.90.15\Steamware\IOB-WIN-FANUC-DEB /MIR +ROBOCOPY %2 \\10.51.90.9\Steamware\IOB-WIN-FANUC-DEB /MIR goto END diff --git a/IOB-WIN-FORM/Iob/Generic.Public.cs b/IOB-WIN-FORM/Iob/Generic.Public.cs index 9e603b62..d32741f7 100644 --- a/IOB-WIN-FORM/Iob/Generic.Public.cs +++ b/IOB-WIN-FORM/Iob/Generic.Public.cs @@ -1342,7 +1342,7 @@ namespace IOB_WIN_FORM.Iob else if (ciclo == gatherCycle.LF) { processCustomTaskLF(); - processOtherCounters(); + await processOtherCounters(); processProgram(); // verifico se devo gestire cambio ODL in modo automatico await ProcessAutoOdlAsync(); diff --git a/IOB-WIN-MTC/DATA/CONF/FOV062.json b/IOB-WIN-MTC/DATA/CONF/FOV062.json index c99e445c..14729269 100644 --- a/IOB-WIN-MTC/DATA/CONF/FOV062.json +++ b/IOB-WIN-MTC/DATA/CONF/FOV062.json @@ -17,6 +17,8 @@ } ], "fluxLogVeto": [ + "E_nblock1", + "E_nline1", "S_nactS1P1", "S_nloadS1P1", "S_nactUP1",