From 6ec26b5ad1dab70348aab820a2b3fae75870e409 Mon Sep 17 00:00:00 2001 From: "andrea.villa" Date: Tue, 22 Oct 2024 11:16:47 +0200 Subject: [PATCH] =?UTF-8?q?Miglioria=202.6j6.=20Oltre=20al=20passo=20pelle?= =?UTF-8?q?grino=20si=20ribadisce=20anche=20quando=20=C3=A8=20scambio=20di?= =?UTF-8?q?retto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Common_FAST.mlse | 2 ++ UpdateLog.txt | 3 +++ Version.lua | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Common_FAST.mlse b/Common_FAST.mlse index 547ea6c..7214f5e 100644 --- a/Common_FAST.mlse +++ b/Common_FAST.mlse @@ -1578,6 +1578,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF if ( dYDeltaI - dVDeltaF) + 10 * GEO.EPS_SMALL >= MyMinY - MaxV and abs( dVDeltaF - dVDeltaI) > 10 * GEO.EPS_SMALL and not EMC.PILGRIMSTEP and ( dVDeltaF - dVDeltaI > MinV - dVPosI + MyMinY - dYPosI) then table.insert( vCmd, { 0, 'Direct-V-Y'}) + table.insert( vCmd, { 12, 1}) -- se l'altra morsa non era in presa, vado a pinzare il pezzo if not EMC.YDELTA then dYPosA = MyMinY @@ -1683,6 +1684,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF elseif ( dYDeltaF - dVDeltaI) + 10 * GEO.EPS_SMALL >= MyMinY - MaxV and abs( dYDeltaF - dYDeltaI) > 10 * GEO.EPS_SMALL and not EMC.PILGRIMSTEP and ( dYDeltaF - dYDeltaI < MaxY - dYPosI + MaxV - dVPosI) then table.insert( vCmd, { 0, 'Direct-Y-V'}) + table.insert( vCmd, { 11, 1}) -- se l'altra morsa non era in presa, vado a pinzare il pezzo if not EMC.VDELTA then dVPosA = MaxV diff --git a/UpdateLog.txt b/UpdateLog.txt index 08d893d..60cc1bd 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,5 +1,8 @@ ==== Common_FAST Update Log ==== +Versione 2.6j9 (22/10/2024) +- (SIM-GEN) Miglioria 2.6j6. Oltre al passo pellegrino si ribadisce anche quando รจ scambio diretto + Versione 2.6j8 (21/10/2024) - (SIM-GEN) Corretto problema tolleranza aggiunto con versione 2.6j7 diff --git a/Version.lua b/Version.lua index 76d48e3..588c701 100644 --- a/Version.lua +++ b/Version.lua @@ -3,7 +3,7 @@ local InfoCommon_STD_PP = { NAME = 'Common_FAST', -- nome script PP standard - VERSION = '2.6j8', -- versione script + VERSION = '2.6j9', -- versione script MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel }