diff --git a/Common-FAST.NUM_PLUS.mlpe b/Common-FAST.NUM_PLUS.mlpe index f659b8f..d3bd0e7 100644 --- a/Common-FAST.NUM_PLUS.mlpe +++ b/Common-FAST.NUM_PLUS.mlpe @@ -843,7 +843,7 @@ function OnRapid() sOut = 'G112 EA'..sA..' EB'..sB..EmtGetAxis('L1')..' EY'..sY..' EV'..sV..' EF'..GetFmaxClamp() EmtOutput( sOut) -- se taglio di coda senza residuo da scaricare, emetto M175 per accelerare il carico della barra successiva - if EMT.MCHUSERNOTES and EMT.MCHUSERNOTES:find( 'Cut') then + if EMT.MCHUSERNOTES and EMT.MCHUSERNOTES:find( 'Cut') and ( IsEndPhase( EMT.PHASE+1) or IsEnd2Phase( EMT.PHASE+1)) then EmtOutput( '(M175)') end if not bHeadFirst then diff --git a/Common-FAST.TPA.mlpe b/Common-FAST.TPA.mlpe index 9bfa848..f147571 100644 --- a/Common-FAST.TPA.mlpe +++ b/Common-FAST.TPA.mlpe @@ -774,7 +774,7 @@ function OnRapid() sB = '2' end -- se taglio di coda senza residuo da scaricare, emetto M175 per accelerare il carico della barra successiva - if EMT.MCHUSERNOTES and EMT.MCHUSERNOTES:find( 'Cut') then + if EMT.MCHUSERNOTES and EMT.MCHUSERNOTES:find( 'Cut') and ( IsEndPhase( EMT.PHASE+1) or IsEnd2Phase( EMT.PHASE+1)) then EmtOutput( 'M175') end if bHeadFirst then diff --git a/Common-FAST.mlpe b/Common-FAST.mlpe index 9bd2b28..e72db4e 100644 --- a/Common-FAST.mlpe +++ b/Common-FAST.mlpe @@ -1524,6 +1524,12 @@ function IsStartOrRestPhase( nPhase) return ( sVal == 'START' or sVal == 'REST') end +--------------------------------------------------------------------- +function IsEndPhase( nPhase) + local sVal = GetPhaseType( nPhase) + return ( sVal == 'END') +end + --------------------------------------------------------------------- function IsMidPhase( nPhase) local sVal = GetPhaseType( nPhase) diff --git a/UpdateLog.txt b/UpdateLog.txt index 9441f2f..3815ec5 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,5 +1,8 @@ ==== Common_FAST Update Log ==== +Versione 2.6-- (--/--/----) +- (GEN) Corretto chiamata macro precarico in caso di taglio finale, ma con ribaltaemnto successivo. Ora si chiama solo se la fase successiva รจ una "END". Ticket#1881 + Versione 2.6e3 (06/05/2024) - (MLDE-SIM-GEN) Gestione facoltativa parametri MIN_JOIN_xx settabili in Ts3. Ticket#1794 diff --git a/Version.lua b/Version.lua index 4d22e12..9dfe637 100644 --- a/Version.lua +++ b/Version.lua @@ -3,7 +3,7 @@ local InfoCommon_STD_PP = { NAME = 'Common-FAST', -- nome script PP standard - VERSION = '2.6e3', -- versione script + VERSION = '2.6--', -- versione script MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel }