From ebbe1c9ac6b02a9f94485e562af5615b2cad75e6 Mon Sep 17 00:00:00 2001 From: "andrea.villa" Date: Fri, 15 May 2026 09:24:18 +0200 Subject: [PATCH 1/2] corretto nome variabile --- Common_PF1250.mlpe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common_PF1250.mlpe b/Common_PF1250.mlpe index a95a755..6aaf1ff 100644 --- a/Common_PF1250.mlpe +++ b/Common_PF1250.mlpe @@ -1270,7 +1270,7 @@ function OnSimulMoveStart() EMT.A6 = EgtClamp( Z2, MinZ2, MaxZ2) -- dato che la testa 2 è slave, bisogna controllare eventuale extra-corsa da post if not( EMT.MOVE == 0 and EMT.FLAG == 2) and Z2 > MaxZ2 then - local sErr = EMT.MCHNAME..' ==> Out of Stroke: Z2 : '.. EgtNumToString( dZ2-MaxZ2, 2) + local sErr = EMT.MCHNAME..' ==> Out of Stroke: Z2 : '.. EgtNumToString( Z2-MaxZ2, 2) EmtSetLastError( 1220, sErr, true) EgtOutBox( sErr, 'ERROR') end From d401d8e37c9d86e1f6a3ce32a42c58105e476b38 Mon Sep 17 00:00:00 2001 From: "andrea.villa" Date: Fri, 15 May 2026 10:35:44 +0200 Subject: [PATCH 2/2] Corretta gestione scarico manuale ( errore in versione 3.1e1) --- Common_PF1250.TPA.mlpe | 11 +++++++---- Common_PF1250.mlpe | 3 --- Common_PF1250.mlse | 11 ++++++++--- UpdateLog.txt | 3 +++ Version.lua | 2 +- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Common_PF1250.TPA.mlpe b/Common_PF1250.TPA.mlpe index 4685de4..b1c2b01 100644 --- a/Common_PF1250.TPA.mlpe +++ b/Common_PF1250.TPA.mlpe @@ -2079,20 +2079,23 @@ function PrepareUnload( sCmd, nInd) local Cmd = EgtSplitString( sCmd) if Cmd[1] == '0' then - -- non interessa + if Cmd[3] == 'Manual Unloading' then + EMT.MANUAL_UNL = true + end elseif Cmd[1] == '1' then if Cmd[2] == 'Y2' then -- se non è ultima fase e non è fase successiva a scarico su carico c'è una barra sulla pinza Y1 + local dUnloadMacroCode = EgtIf( EMT.MANUAL_UNL, 85, 84) + EMT.MANUAL_UNL = nil local bBarOnY = ( EMT.PHASE < EgtGetPhaseCount() and not IsEnd2Phase( EMT.PHASE)) - local MDChar = { Y2=tonumber(Cmd[3]), V2=ParkV2, IniStatY2=1, FinStatY2=-84, BeamVise=EgtIf( bBarOnY, 1, 0), MovType=EgtIf( EMT.CHY_ON, 3, 2)} + local MDChar = { Y2=tonumber(Cmd[3]), V2=ParkV2, IniStatY2=1, FinStatY2=-dUnloadMacroCode, BeamVise=EgtIf( bBarOnY, 1, 0), MovType=EgtIf( EMT.CHY_ON, 3, 2)} table.insert( EMT.MDCHAR, MDChar) end elseif Cmd[1] == '2' then if Cmd[4] == 'Y2' then -- se non è ultima fase c'è una barra sulla pinza Y1 local bBarOnY = ( EMT.PHASE < EgtGetPhaseCount() and not IsEnd2Phase( EMT.PHASE)) - local bManualUnl = ( Cmd[4] and Cmd[4] == 'Manual Unloading') - local MDChar = { Y2=tonumber(Cmd[3]), V2=EgtIf( bManualUnl, MaxV2, ParkV2), IniStatY2=1, FinStatY2=EgtIf( bManualUnl, -85, -84), BeamVise=EgtIf( bBarOnY, 1, 0), MovType=EgtIf( EMT.CHY_ON, 3, 2)} + local MDChar = { Y2=tonumber(Cmd[5]), IniStatY1=EgtIf( bBarOnY, -1, 1), FinStatY1=EgtIf( bBarOnY, -1, 1), IniStatY2=-1, FinStatY2=1, IniStatV2=1, BeamVise=2, MovType=EgtIf( EMT.CHY_ON, 3, 2)} table.insert( EMT.MDCHAR, MDChar) end elseif Cmd[1] == '3' then diff --git a/Common_PF1250.mlpe b/Common_PF1250.mlpe index 6aaf1ff..07da963 100644 --- a/Common_PF1250.mlpe +++ b/Common_PF1250.mlpe @@ -1499,9 +1499,6 @@ function ExecAuxCmd( sCmd, bPathStart) if Cmd[2] ~= 'Z' then ExecOpenRoller( 1) ExecOpenRoller( 2) - if Cmd[4] and Cmd[4] == 'Manual Unloading' then - ExecMovePY2( false) - end local sV1, MoveV1, sV2, MoveV2 = CalcMoveV1V2ForAuxCmd( Cmd) local bOk, bOk1, bOk2, bOk3 = SimulMoveAxes( Cmd[2], tonumber( Cmd[3]), MCH_SIM_STEP.RAPID, sV1, MoveV1, MCH_SIM_STEP.RAPID, diff --git a/Common_PF1250.mlse b/Common_PF1250.mlse index 01c0c37..1b41b24 100644 --- a/Common_PF1250.mlse +++ b/Common_PF1250.mlse @@ -1406,7 +1406,9 @@ function SpecCalcUnload() table.insert( vCmd, { 2, 'T', dFinT, 'Y2', dFinY2}) EgtOutLog( ' Y2PosF=' .. EgtNumToString( dFinY2), 1) else - table.insert( vCmd, { 1, 'Y2', MaxY2, 'Manual Unloading'}) + local dFinT = min( MaxY2 - EMC.Y2DELTA, max( UnloadT - MaxUnloadLen, MinY2 - EMC.Y2DELTA)) + local dFinY2 = dFinT + EMC.Y2DELTA + table.insert( vCmd, { 2, 'T', dFinT, 'Y2', dFinY2}) end -- apro la morsa table.insert( vCmd, { 12, 0}) @@ -2533,14 +2535,17 @@ function SpecOutputCmds( vCmd, bEnd) -- commento if Cmd[1] == 0 then local sInfo = '0,'..Cmd[2] + if Cmd[3] then + sInfo = sInfo..','..Cmd[3] + end EgtSetInfo( EMC.PATHID, sKey, sInfo) -- movimento di 1 asse elseif Cmd[1] == 1 then - local sInfo = '1,'..Cmd[2]..','..EgtNumToString( Cmd[3],3)..EgtIf( Cmd[4], ','..tostring(Cmd[4]), '') + local sInfo = '1,'..Cmd[2]..','..EgtNumToString( Cmd[3],3)..EgtIf( Cmd[4], ',*', '') EgtSetInfo( EMC.PATHID, sKey, sInfo) -- movimento di 2 assi elseif Cmd[1] == 2 then - local sInfo = '2,'..Cmd[2]..','..EgtNumToString( Cmd[3],3)..','..Cmd[4]..','..EgtNumToString( Cmd[5],3)..EgtIf( Cmd[6], ','..tostring(Cmd[6]), '') + local sInfo = '2,'..Cmd[2]..','..EgtNumToString( Cmd[3],3)..','..Cmd[4]..','..EgtNumToString( Cmd[5],3)..EgtIf( Cmd[6], ',*', '') EgtSetInfo( EMC.PATHID, sKey, sInfo) -- movimento di 3 assi elseif Cmd[1] == 3 then diff --git a/UpdateLog.txt b/UpdateLog.txt index ea112c6..cd7b912 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,5 +1,8 @@ ==== Common_PF1250 Update Log ==== +Versione 3.1e2 (15/05/2026) +- (SIM-GEN) Corretta gestione scarico manuale ( errore in versione 3.1e1) + Versione 3.1e1 (12/05/2026) - (SIM-GEN) Corretta SIM (muoveva Y2 a MaxY2 senza aprire pinza) e GEN (non chiudeva rulliere e dava extracorsa e non generava P7=-85) di pezzi lunghi che necessitano lo scarico manuale. Ticket#2971 diff --git a/Version.lua b/Version.lua index a22e5a2..7f4c014 100644 --- a/Version.lua +++ b/Version.lua @@ -3,7 +3,7 @@ local InfoCommon_STD_PP = { NAME = 'Common_PF1250', -- nome script PP standard - VERSION = '3.1e1', -- versione script + VERSION = '3.1e2', -- versione script MIN_MACH_VER_PP_COMMON = '3.1b2' -- versione minima kernel }