From ea0abe4368de83c8efac6e2cc571fe763f415d9c Mon Sep 17 00:00:00 2001 From: "andrea.villa" Date: Wed, 8 Oct 2025 16:12:25 +0200 Subject: [PATCH] Allineamento con common ver. 2.7j2 --- Common_FAST.NUM.mlpe | 2 +- Common_FAST.NUM_PLUS.mlpe | 2 +- Common_FAST.TPA.mlpe | 2 +- Common_FAST.mlpe | 14 ++++++-------- UpdateLog.txt | 3 +++ Version.lua | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Common_FAST.NUM.mlpe b/Common_FAST.NUM.mlpe index 861fdef..04948ea 100644 --- a/Common_FAST.NUM.mlpe +++ b/Common_FAST.NUM.mlpe @@ -639,7 +639,7 @@ function OnRapid() local MyZHome = EgtGetAxisHomePos( 'Z') local bZmax = ( #EMT.AUXSTR > 0 or EMT.TOOL ~= EMT.PREVTOOL or EMT.L3 > -1) -- se avevo motosega, torno in zona sicura senza ruotare assi rotanti - if not EMT.LOAD and EMT.PREVHEAD == 'H3' and (EMT.ST > BeamHeightForFixRot or bGoToHome) and EMT.FLAG2 == 1 then + if not EMT.LOAD and EMT.PREVHEAD == 'H3' and EMT.FLAG2 == 1 then local sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) .. ' B' .. EmtLenToString( EMT.R2pp, 3) .. ' C' .. EmtLenToString( EMT.R1pp, 3) .. ' EE' .. EgtIf( bZmax, '3', '4') .. EMT.PREVsEL .. EMT.PREVsER .. EMT.PREVsET .. EMT.PREVsES diff --git a/Common_FAST.NUM_PLUS.mlpe b/Common_FAST.NUM_PLUS.mlpe index fdec667..9006802 100644 --- a/Common_FAST.NUM_PLUS.mlpe +++ b/Common_FAST.NUM_PLUS.mlpe @@ -688,7 +688,7 @@ function OnRapid() local MyZHome = EgtGetAxisHomePos( 'Z') local bZmax = ( #EMT.AUXSTR > 0 or EMT.TOOL ~= EMT.PREVTOOL or EMT.L3 > -1) -- se avevo motosega, torno in zona sicura senza ruotare assi rotanti - if not EMT.LOAD and EMT.PREVHEAD == 'H3' and ( EMT.ST > BeamHeightForFixRot or bGoToHome) and EMT.FLAG2 == 1 then + if not EMT.LOAD and EMT.PREVHEAD == 'H3' and EMT.FLAG2 == 1 then local sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) .. ' B' .. EmtLenToString( EMT.R2pp, 3) .. ' C' .. EmtLenToString( EMT.R1pp, 3) .. ' EE' .. EgtIf( bZmax, '3', '4') .. EMT.PREVsEL .. EMT.PREVsER .. EMT.PREVsET .. EMT.PREVsES diff --git a/Common_FAST.TPA.mlpe b/Common_FAST.TPA.mlpe index 8143bc6..a6dfd81 100644 --- a/Common_FAST.TPA.mlpe +++ b/Common_FAST.TPA.mlpe @@ -669,7 +669,7 @@ function OnRapid() local MyZHome = EgtGetAxisHomePos( 'Z') local bZmax = ( #EMT.AUXSTR > 0 or EMT.TOOL ~= EMT.PREVTOOL or EMT.L3 > -1) -- se avevo motosega, torno in zona sicura senza ruotare assi rotanti - if not EMT.LOAD and EMT.PREVHEAD == 'H3' and ( EMT.ST > BeamHeightForFixRot or bGoToHome) and EMT.FLAG2 == 1 then + if not EMT.LOAD and EMT.PREVHEAD == 'H3' and EMT.FLAG2 == 1 then local sOutPreMove = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( MyZHome, EMT.DECMACRO) .. ' P4=' .. EgtNumToString( EMT.R2pp, EMT.DECMACRO) .. ' P5=' .. EgtNumToString( EMT.R1pp, EMT.DECMACRO) .. ' P6=' .. EgtNumToString( EMT.PREVTCPOS, EMT.DECMACRO) .. ' P7=' .. EgtNumToString( EMT.PREVS, 0) .. diff --git a/Common_FAST.mlpe b/Common_FAST.mlpe index a4431de..48fb288 100644 --- a/Common_FAST.mlpe +++ b/Common_FAST.mlpe @@ -555,11 +555,9 @@ function OnSimulToolDeselect() -- movimento scarico sega a catena if EMT.HEAD == 'H3' then -- se avevo motosega, torno in zona sicura senza ruotare assi rotanti - if EMT.HT > BeamHeightForFixRot then - SimulMoveAxis( 'X', SafeXRotAxes, MCH_SIM_STEP.RAPID) - -- raddrizzo asse B prima di ruotare il C - SimulMoveAxis( 'B', 0, MCH_SIM_STEP.COLLROT) - end + SimulMoveAxis( 'X', SafeXRotAxes, MCH_SIM_STEP.RAPID) + -- raddrizzo asse B prima di ruotare il C + SimulMoveAxis( 'B', 0, MCH_SIM_STEP.COLLROT) local dPosA = EgtGetAxisPos( 'A') if abs( dPosA) < 0.1 then SimulMoveAxes( 'B', 0, MCH_SIM_STEP.COLLROT, 'C', EgtIf( BD.RIGHT_LOAD, -180, 0), MCH_SIM_STEP.COLLROT) @@ -804,14 +802,14 @@ function OnSimulMoveStart() EMT.MCHFIRST = false local bZmax = ( EMT.TOOL ~= EMT.PREVTOOL or EMT.L3 > -1) -- con pezzi alti aggiorno gli assi rotanti prima di muovermi sopra il pezzo - if not EMT.LOAD and EMT.MOVE == 0 and ( EMT.HT > BeamHeightForFixRot or ( EMT.HEAD == 'H1' and EMT.TOTLEN > 350) or bGoToHome) and EMT.FLAG2 == 1 then + if not EMT.LOAD and EMT.MOVE == 0 and ( EMT.HEAD == 'H3' or ( EMT.HEAD == 'H1' and EMT.TOTLEN > 350) or bGoToHome) and EMT.FLAG2 == 1 then -- se motosega mi muovo a X di sicurezza per ruotare, prima si raddrizza B e poi C in posizione - if EMT.HEAD == 'H3' and bGoToHome then + if EMT.HEAD == 'H3' or bGoToHome then SimulMoveAxis( 'X', SafeXRotAxes, MCH_SIM_STEP.RAPID) SimulMoveAxis( 'B', 0, MCH_SIM_STEP.COLLROT) SimulMoveAxis( 'C', EMT.R1, MCH_SIM_STEP.COLLROT) SimulMoveAxis( 'B', EMT.R2, MCH_SIM_STEP.COLLROT) - elseif ( EMT.HEAD == 'H3' or ( bZmax and EMT.TOTLEN > 200)) then + elseif ( bZmax and EMT.TOTLEN > 200) then SimulMoveAxes( 'X', SafeXRotAxes, MCH_SIM_STEP.RAPID, 'C', EMT.R1, MCH_SIM_STEP.COLLROT, 'B', EMT.R2, MCH_SIM_STEP.COLLROT) end end diff --git a/UpdateLog.txt b/UpdateLog.txt index 377e419..3e8503f 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,5 +1,8 @@ ==== Common_FAST Update Log ==== +Versione 2.7j2 (08/10/2025) +- (SIM-GEN) Quando si scarica motosega, si raddrizza prima l'asse B e poi si muove il C. Ora sempre e non solo se pezzo alto. + Versione 2.7j1 (06/10/2025) - (SIM-GEN) Quando si scarica motosega, si raddrizza prima l'asse B e poi si muove il C. diff --git a/Version.lua b/Version.lua index 71d45f0..2eb354d 100644 --- a/Version.lua +++ b/Version.lua @@ -3,7 +3,7 @@ local InfoCommon_STD_PP = { NAME = 'Common_FAST', -- nome script PP standard - VERSION = '2.7j1', -- versione script + VERSION = '2.7j2', -- versione script MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel }