diff --git a/Common-PF1250.mlpe b/Common-PF1250.mlpe index 1ccfdbb..3b4f5a5 100644 --- a/Common-PF1250.mlpe +++ b/Common-PF1250.mlpe @@ -514,26 +514,6 @@ function OnSimulToolSelect( dPosA) local nInd = EgtIf( nSetHead ~= 2, 1001, 1011) AddToolToCollisionObj( EMT.TOOL, EMT.HEAD, EMT.EXIT, nInd, true) AddToolHolderToCollisionObj( EMT.TOOL, EMT.HEAD, EMT.EXIT, nInd + 1) - - if nSetHead ~= 1 and ( EMT.PREVTOOL_H1 and EMT.PREVHEAD_H1) then - local nPrevExit_H1 = 1 - local nInd_H1 = 1001 - AddToolToCollisionObj( EMT.PREVTOOL_H1, EMT.PREVHEAD_H1, nPrevExit_H1, nInd_H1, false) - AddToolHolderToCollisionObj( EMT.PREVTOOL_H1, EMT.PREVHEAD_H1, nPrevExit_H1, nInd_H1 + 1) - end - if nSetHead ~= 2 and ( EMT.PREVTOOL_H2 and EMT.PREVHEAD_H2) then - local nPrevExit_H2 = 1 - local nInd_H2 = 1011 - AddToolToCollisionObj( EMT.PREVTOOL_H2, EMT.PREVHEAD_H2, nPrevExit_H2, nInd_H2, false) - AddToolHolderToCollisionObj( EMT.PREVTOOL_H2, EMT.PREVHEAD_H2, nPrevExit_H2, nInd_H2 + 1) - end - if nSetHead ~= 3 and EgtGetHeadId( 'H31') then - local nPrevExit_H3 = 1 - local nInd_H3 = 1001 - AddToolToCollisionObj( nil, 'H31', nPrevExit_H3, 1001) - AddToolHolderToCollisionObj( nil, 'H31', nPrevExit_H3, 1002) - end - for i, Coll in ipairs( EMT.COLLOBJ or {}) do EmtAddCollisionObjEx( i, Coll.Fr, Coll.Ty, Coll.Mv, Coll.P1, Coll.P2, Coll.P3) end @@ -746,6 +726,27 @@ function OnSimulMachiningStart() EmtSetLastError( 1211, 'Missing or not active double tool of '..sOldTool) end EgtTdbSetCurrTool( sOldTool) + else + -- recupero il gruppo + local nSetHead = GetHeadSet( EMT.HEAD) + if nSetHead ~= 1 and ( EMT.PREVTOOL_H1 and EMT.PREVHEAD_H1) then + local nPrevExit_H1 = 1 + local nInd_H1 = 1001 + AddToolToCollisionObj( EMT.PREVTOOL_H1, EMT.PREVHEAD_H1, nPrevExit_H1, nInd_H1, true) + AddToolHolderToCollisionObj( EMT.PREVTOOL_H1, EMT.PREVHEAD_H1, nPrevExit_H1, nInd_H1 + 1) + end + if nSetHead ~= 2 and ( EMT.PREVTOOL_H2 and EMT.PREVHEAD_H2) then + local nPrevExit_H2 = 1 + local nInd_H2 = 1011 + AddToolToCollisionObj( EMT.PREVTOOL_H2, EMT.PREVHEAD_H2, nPrevExit_H2, nInd_H2, true) + AddToolHolderToCollisionObj( EMT.PREVTOOL_H2, EMT.PREVHEAD_H2, nPrevExit_H2, nInd_H2 + 1) + end + if nSetHead ~= 3 and EgtGetHeadId( 'H31') then + local nPrevExit_H3 = 1 + local nInd_H3 = 1001 + AddToolToCollisionObj( nil, 'H31', nPrevExit_H3, 1001) + AddToolHolderToCollisionObj( nil, 'H31', nPrevExit_H3, 1002) + end end -- se precedente in doppio ma ora solo testa 1 e non in sicurezza if EMT.DOU_TO_ZMAX then diff --git a/Common-PF1250.mlse b/Common-PF1250.mlse index 64970fd..28f7204 100644 --- a/Common-PF1250.mlse +++ b/Common-PF1250.mlse @@ -574,7 +574,11 @@ function OnPostApplyMachining() -- Verifico flag di separazione e fase di scarico local sNotes = EgtGetMachiningParam( MCH_MP.USERNOTES) - local bPreSplit = ( false and sNotes:find( 'Presplit', 1, true) ~= nil) + + -- bPreSplit sempre a falso per obbligare a pinzare il pezzo con 1 morsa anche se iniziato il taglio che dividerà grezzo e finito (in genere per sezioni grandi con 2 tagli di lama) + -- Tra un taglio e l'altro infatti c'e' inversione del braccio e quindi un'apertura delle rulliere. Se pinzano entrambe le pinze, potrebbero esserci problemi di collisone rulli-morse + local bPreSplit = false --( sNotes:find( 'Presplit', 1, true) ~= nil) + local bSplitting = ( sNotes:find( 'Split', 1, true) ~= nil) local bPreCut = ( sNotes:find( 'Precut', 1, true) ~= nil) local bCutting = ( sNotes:find( 'Cut', 1, true) ~= nil) diff --git a/Essetre-PF1250.mlde b/Essetre-PF1250.mlde index 59f85c0..2af08da 100644 --- a/Essetre-PF1250.mlde +++ b/Essetre-PF1250.mlde @@ -70,12 +70,13 @@ -- 2024/07/08 ver 2.6g1 Allineamento con common ver. 2.6g1 -- 2024/07/12 ver 2.6g2 Allineamento con common ver. 2.6g2 -- 2024/07/22 ver 2.6g3 Allineamento con common ver. 2.6g3 +-- 2024/07/23 ver 2.6g4 Allineamento con common ver. 2.6g4 -- Intestazioni require( 'EmtGenerator') EgtEnableDebug( false) -PP_VER = '2.6g3' +PP_VER = '2.6g4' MIN_MACH_VER = '2.5k1' MACH_NAME = 'Essetre-PF1250' diff --git a/MachNotes.ini b/MachNotes.ini new file mode 100644 index 0000000..5f58449 --- /dev/null +++ b/MachNotes.ini @@ -0,0 +1,50 @@ +; Commento per evitare BOM con UTF-8 +;Index = Type, Description, Default Value +; Type : b=boolean, d=double, l=lenght, s=string + +[Drilling] + +[Sawing] + +[Milling] +0=d,MaxElev,0 +1=d,OutRaw,0 +2=d,SideElev,0 +3=d,TrimExt,0 +4=sr,VtFaceUse,0,0,0 + +[Pocketing] +0=d,MaxElev,0 +1=b,Open,0 +2=d,OpenMinSave,0 +3=d,OpenOutRaw,0 +4=d,MaxOptSize,0 + +[Mortising] +0=d,MaxElev,0 + +[Chiseling] + +[SawRoughing] + +[SawFinishing] + +[GenMachining] +0=l,LinTol,0.1 +1=l,MaxLen,2 +2=s,Type,ZigZag +3=d,SideAng,90 +4=l,Step,10 +5=l,OffsProj,0 +6=l,LiTang,0 +7=l,LiOrth,0 +8=l,LiElev,0 +9=l,LoTang,0 +10=l,LoOrth,0 +11=l,LoElev,0 +12=b,DirFromGuide,1 + +[SurfRoughing] + +[SurfFinishing] +0=b,SkipMaxDown,1 diff --git a/ToolNotes.ini b/ToolNotes.ini new file mode 100644 index 0000000..0d2c1ef --- /dev/null +++ b/ToolNotes.ini @@ -0,0 +1,41 @@ +; Commento per evitare BOM con UTF-8 +; Index, Type, Description, Value +; Index = 0,1,..,n +; Type : d=double, l=lenght, s=string, b=boolean, dr=double recalc, sr= string recalc, lr=lenght recalc, br=boolean recalc, th=toolholder +; Description : STEP, SIDESTEP, ... + +[DRILL_STD] +0=th,TH, +1=d,STEP +2=s,DOUBLE + +[SAW_STD] +0=th,TH, +1=d,STEP +2=d,SIDESTEP +3=b,LONGCUT + +[SAW_FLAT] +0=th,TH, +1=d,STEP +2=d,SIDESTEP +3=b,LONGCUT + +[MILL_STD] +0=th,TH, +1=d,STEP +2=d,SIDESTEP +3=d,SIDEDEPTH +4=s,DOUBLE + +[MILL_NOTIP] +0=th,TH, +1=d,STEP +2=d,SIDESTEP +3=d,SIDEDEPTH +4=s,DOUBLE + +[MORTISE_STD] +0=b,MORTISE +1=d,STEP +2=d,SIDESTEP diff --git a/UpdateLog.txt b/UpdateLog.txt index 0843ce2..7c6d37f 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,5 +1,8 @@ ==== Common_PF1250 Update Log ==== +Versione 2.6g4 (23/07/2024) +- (SIM) Corretta ultima modifica per controllo collisioni testa non utilizzata. Trovava collisioni in lavorazioni in doppio. + Versione 2.6g3 (22/07/2024) - (SIM) Si aggiunge al controllo collisioni anche Tool e ToolHolder della testa non utilizzata. Ticket#1937 - (SIM-GEN) In caso di grezzo piuttosto piccolo, concesso pinzaggio fino al massimo possibile, oltre al calcolo con coefficienti. Ticket#1942 diff --git a/Version.lua b/Version.lua index 8eb6635..9c60142 100644 --- a/Version.lua +++ b/Version.lua @@ -3,7 +3,7 @@ local InfoCommon_STD_PP = { NAME = 'Common_PF1250', -- nome script PP standard - VERSION = '2.6g3', -- versione script + VERSION = '2.6g4', -- versione script MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel }