From 00fffeb388403606ac89d11e40f373b622692943 Mon Sep 17 00:00:00 2001 From: "andrea.villa" Date: Thu, 25 Sep 2025 12:45:11 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Controllo=20collisione=20tra=20utensile=20e?= =?UTF-8?q?=20TOP=20testa=20C.=20Rilasciare=20dopo=20che=20=C3=A8=20stata?= =?UTF-8?q?=20pubblicata=20nuova=20versioen=20CAM5=2027j1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Common_FAST.mlpe | 3 ++- UpdateLog.txt | 3 +++ Version.lua | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Common_FAST.mlpe b/Common_FAST.mlpe index dc91268..1ab56e9 100644 --- a/Common_FAST.mlpe +++ b/Common_FAST.mlpe @@ -115,7 +115,8 @@ function OnSimulStart() { Grp = 'V', Sub = 'COLLISION', Name = 'VOL2'}, { Grp = 'PV', Sub = 'COLLISION', Name = 'VOL'}, { Grp = 'Base', Sub = 'COLLISION', Name = 'SIDE1'}, - { Grp = 'Base', Sub = 'COLLISION', Name = 'SIDE2'}} + { Grp = 'Base', Sub = 'COLLISION', Name = 'SIDE2'}, + { Grp = 'C', Sub = 'COLLISION2', Name = 'C_TOP'}} EgtOutLog( 'MCODET Objects :', 4) local nMcdNullCnt = 0 for i = 1, #McdData do diff --git a/UpdateLog.txt b/UpdateLog.txt index ebdc39c..27bb715 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,5 +1,8 @@ ==== Common_FAST Update Log ==== +Versione 2.7-- (--/--/2025) +- (MLDE-SIM) Controllo collisione tra utensile e TOP testa C. Serve CAM5 2.7j1 + Versione 2.7i3 (23/09/2025) - (MLDE-ALL) Spostate costanti dimensioni utensili in MLDE. diff --git a/Version.lua b/Version.lua index 186e68d..e0a36b2 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.7--', -- versione script MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel } From db91129c66378f602eeb66345b81adbb3db9c228 Mon Sep 17 00:00:00 2001 From: "andrea.villa" Date: Mon, 6 Oct 2025 15:55:53 +0200 Subject: [PATCH 2/3] Aggiornato UpdateLog --- UpdateLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/UpdateLog.txt b/UpdateLog.txt index 27bb715..8f02534 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,6 +1,7 @@ ==== Common_FAST Update Log ==== Versione 2.7-- (--/--/2025) +- (SIM-GEN) Quando si scarica motosega, si raddrizza prima l'asse B e poi si muove il C. - (MLDE-SIM) Controllo collisione tra utensile e TOP testa C. Serve CAM5 2.7j1 Versione 2.7i3 (23/09/2025) From d4376dfa8e8136c66efb9a8a27cd3a82d8935a0f Mon Sep 17 00:00:00 2001 From: "andrea.villa" Date: Mon, 10 Nov 2025 16:12:58 +0100 Subject: [PATCH 3/3] Corretto set variabili info utensile prima del movimento in home in caso di pezzi alti per NUM/NUM_PLUS --- Common_FAST.NUM.mlpe | 12 +++++------ Common_FAST.NUM_PLUS.mlpe | 42 +++++++++++++++++++-------------------- UpdateLog.txt | 3 +++ Version.lua | 2 +- 4 files changed, 31 insertions(+), 28 deletions(-) diff --git a/Common_FAST.NUM.mlpe b/Common_FAST.NUM.mlpe index 04948ea..ba68031 100644 --- a/Common_FAST.NUM.mlpe +++ b/Common_FAST.NUM.mlpe @@ -635,6 +635,12 @@ function OnRapid() bGoToHome = true end + -- ricavo i dati per la lavorazione + local sEE = ' EE' .. EgtIf( bZmax, '3', '4') + local sEL = ' EL' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TLEN, ( EMT.TDIST or ChSawLen)), 3) + local sER = ' ER' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TDIAM / 2, EMT.TLEN), 3) + local sES = ' ES'..EgtNumToString( EMT.S, 0) + -- primo posizionamento local MyZHome = EgtGetAxisHomePos( 'Z') local bZmax = ( #EMT.AUXSTR > 0 or EMT.TOOL ~= EMT.PREVTOOL or EMT.L3 > -1) @@ -656,12 +662,6 @@ function OnRapid() EmtOutput( '( *** ' .. sOut .. ' *** )') end - -- ricavo i dati per la lavorazione - local sEE = ' EE' .. EgtIf( bZmax, '3', '4') - local sEL = ' EL' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TLEN, ( EMT.TDIST or ChSawLen)), 3) - local sER = ' ER' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TDIAM / 2, EMT.TLEN), 3) - local sES = ' ES'..EgtNumToString( EMT.S, 0) - -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione if not EMT.LOAD and ( EMT.HEAD == 'H3' or ( bZmax and EMT.TTOTLEN > 200)) and ( EMT.ST > BeamHeightForFixRot or ( EMT.HEAD == 'H1' and EMT.TTOTLEN > 350) or bGoToHome) and EMT.FLAG2 == 1 then diff --git a/Common_FAST.NUM_PLUS.mlpe b/Common_FAST.NUM_PLUS.mlpe index 9006802..6074687 100644 --- a/Common_FAST.NUM_PLUS.mlpe +++ b/Common_FAST.NUM_PLUS.mlpe @@ -684,27 +684,6 @@ function OnRapid() bGoToHome = true end - -- primo posizionamento - 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.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 - 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 - - if not EMT.LOAD then - local sOut = string.gsub( string.gsub( EMT.MCHNAME..'/'..EMT.TOOL, '%(', '-'), '%)', '-') - EmtOutput( '( *** ' .. sOut .. ' *** )') - end - -- ricavo i dati per la lavorazione local sEE = ' EE' .. EgtIf( bZmax, '3', '4') @@ -734,6 +713,27 @@ function OnRapid() local sES = ' ES'..EgtNumToString( EMT.S, 0) + -- primo posizionamento + 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.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 + 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 + + if not EMT.LOAD then + local sOut = string.gsub( string.gsub( EMT.MCHNAME..'/'..EMT.TOOL, '%(', '-'), '%)', '-') + EmtOutput( '( *** ' .. sOut .. ' *** )') + end + -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione if not EMT.LOAD and ( EMT.HEAD == 'H3' or ( bZmax and EMT.TTOTLEN > 200)) and ( EMT.ST > BeamHeightForFixRot or ( EMT.HEAD == 'H1' and EMT.TTOTLEN > 350) or bGoToHome) and EMT.FLAG2 == 1 then diff --git a/UpdateLog.txt b/UpdateLog.txt index bef361d..ef8bda6 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,5 +1,8 @@ ==== Common_FAST Update Log ==== +Versione 2.7k1 (10/11/2025) +- (GEN) Corretto set variabili info utensile prima del movimento in home in caso di pezzi alti per NUM/NUM_PLUS. + 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. diff --git a/Version.lua b/Version.lua index e0a36b2..34dea05 100644 --- a/Version.lua +++ b/Version.lua @@ -3,7 +3,7 @@ local InfoCommon_STD_PP = { NAME = 'Common_FAST', -- nome script PP standard - VERSION = '2.7--', -- versione script + VERSION = '2.7k1', -- versione script MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel }