From fbd5f170de4238f871c144570905b35e4083056b Mon Sep 17 00:00:00 2001 From: "andrea.villa" Date: Mon, 6 Oct 2025 15:53:55 +0200 Subject: [PATCH] Quando si scarica motosega, si raddrizza prima l'asse B e poi si muove il C --- Common_FAST.NUM.mlpe | 3 +++ Common_FAST.NUM_PLUS.mlpe | 3 +++ Common_FAST.TPA.mlpe | 5 +++++ Common_FAST.mlpe | 2 ++ UpdateLog.txt | 3 +++ Version.lua | 2 +- 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Common_FAST.NUM.mlpe b/Common_FAST.NUM.mlpe index 126d684..861fdef 100644 --- a/Common_FAST.NUM.mlpe +++ b/Common_FAST.NUM.mlpe @@ -644,6 +644,9 @@ function OnRapid() ' B' .. EmtLenToString( EMT.R2pp, 3) .. ' C' .. EmtLenToString( EMT.R1pp, 3) .. ' EE' .. EgtIf( bZmax, '3', '4') .. EMT.PREVsEL .. EMT.PREVsER .. EMT.PREVsET .. EMT.PREVsES EmtOutput( sOutPreMove) + sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) .. + ' B' .. EgtNumToString( 0, 3) .. ' C' .. EgtNumToString( EMT.R1pp, 3) .. sEE .. sEL .. sER .. sET .. sES + EmtOutput( sOutPreMove) EmtOutput( 'G101 ET1001') EmtOutput( 'G101 ET2001') end diff --git a/Common_FAST.NUM_PLUS.mlpe b/Common_FAST.NUM_PLUS.mlpe index eb6600a..fdec667 100644 --- a/Common_FAST.NUM_PLUS.mlpe +++ b/Common_FAST.NUM_PLUS.mlpe @@ -693,6 +693,9 @@ function OnRapid() ' B' .. EmtLenToString( EMT.R2pp, 3) .. ' C' .. EmtLenToString( EMT.R1pp, 3) .. ' EE' .. EgtIf( bZmax, '3', '4') .. EMT.PREVsEL .. EMT.PREVsER .. EMT.PREVsET .. EMT.PREVsES EmtOutput( sOutPreMove) + sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) .. + ' B' .. EgtNumToString( 0, 3) .. ' C' .. EgtNumToString( EMT.R1, 3) .. sEE .. sEL .. sER .. sET .. sES + EmtOutput( sOutPreMove) EmtOutput( 'G101 ET1001') EmtOutput( 'G101 ET2001') end diff --git a/Common_FAST.TPA.mlpe b/Common_FAST.TPA.mlpe index 00a4a35..8143bc6 100644 --- a/Common_FAST.TPA.mlpe +++ b/Common_FAST.TPA.mlpe @@ -675,6 +675,11 @@ function OnRapid() ' P6=' .. EgtNumToString( EMT.PREVTCPOS, EMT.DECMACRO) .. ' P7=' .. EgtNumToString( EMT.PREVS, 0) .. ' P8=0' .. ' P9=0' .. ' P10=' .. EgtIf( bZmax, '3', '4') EmtOutput( sOutPreMove) + sOutPreMove = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( MyZHome, EMT.DECMACRO) .. + ' P4=' .. EgtNumToString( 0, EMT.DECMACRO) .. ' P5=' .. EgtNumToString( EMT.R1pp, EMT.DECMACRO) .. + ' P6=' .. AdjustTcPos( false) .. ' P7=' .. EgtNumToString( EMT.S, 0) .. + ' P8=0' .. ' P9=0' .. ' P10=' .. EgtIf( bZmax, '3', '4') + EmtOutput( sOutPreMove) EmtOutput( 'M101 P1=2') EmtOutput( 'M101 P1=3') end diff --git a/Common_FAST.mlpe b/Common_FAST.mlpe index dc91268..a4431de 100644 --- a/Common_FAST.mlpe +++ b/Common_FAST.mlpe @@ -557,6 +557,8 @@ function OnSimulToolDeselect() -- 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 local dPosA = EgtGetAxisPos( 'A') if abs( dPosA) < 0.1 then diff --git a/UpdateLog.txt b/UpdateLog.txt index ebdc39c..377e419 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,5 +1,8 @@ ==== Common_FAST Update Log ==== +Versione 2.7j1 (06/10/2025) +- (SIM-GEN) Quando si scarica motosega, si raddrizza prima l'asse B e poi si muove il C. + Versione 2.7i3 (23/09/2025) - (MLDE-ALL) Spostate costanti dimensioni utensili in MLDE. diff --git a/Version.lua b/Version.lua index 186e68d..71d45f0 100644 --- a/Version.lua +++ b/Version.lua @@ -3,7 +3,7 @@ local InfoCommon_STD_PP = { NAME = 'Common_FAST', -- nome script PP standard - VERSION = '2.7i3', -- versione script + VERSION = '2.7j1', -- versione script MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel }