Merge branch 'main' of https://gitlab.steamware.net/egalware-machines/masterwood/masterwood-project265

Masterwood-Project265.TECNOS.mlpe

@@ -24,9 +24,9 @@ end
 ---------------------------------------------------------------------
 function OnEnd()
    -- Chiusura file altri processi (qui si passa sempre, anche in caso di errore)
-   local sNewPath = EgtChangePathExtension( EMT.FILE, '.prg')
-   EgtEraseFile( sNewPath)
-   EgtRenameFile( EMT.FILE, sNewPath)
+   -- local sNewPath = EgtChangePathExtension( EMT.FILE, '.prg')
+   -- EgtEraseFile( sNewPath)
+   -- EgtRenameFile( EMT.FILE, sNewPath)
 end
 
 ---------------------------------------------------------------------
@@ -623,7 +623,15 @@ function MyAdjustLinearAxes()
       EMT.L3 = -EMT.L3
    -- altrimenti foratore
    else
-      local Len = EMT.TLEN
+      -- recupero dimensioni utensile principale. E' tutto calcolato su quello.
+      local sCurrTool = EgtTdbGetCurrToolParam( MCH_TP.NAME)
+      local nMainExit = EMT.DRACEX[1]
+      local sMainTool = EgtGetToolsInCurrSetupPos( 'T81')[nMainExit]
+      EgtTdbSetCurrTool( sMainTool)
+      
+      local Len = EgtTdbGetCurrToolParam( MCH_TP.LEN)
+      EgtTdbSetCurrTool( sCurrTool)
+      
       local vtE = Vector3d( EMT.TDIR) * Len
 
       -- si compensa utensile
@@ -631,10 +639,9 @@ function MyAdjustLinearAxes()
       EMT.L2 = EMT.L2 - vtE:getY()
       EMT.L3 = EMT.L3 - vtE:getZ()
 
-      local nExit = EMT.DRACEX[1]
-      EMT.L1 = EMT.L1 + MDRILL[nExit].Pos[1]
-      EMT.L2 = EMT.L2 + MDRILL[nExit].Pos[2] - EMT.RAWPOS[2] - EMT.HP
-      EMT.L3 = EMT.L3 + MDRILL[nExit].Pos[3] - EMT.RAWPOS[3] - EMT.TP
+      EMT.L1 = EMT.L1 + MDRILL[nMainExit].Pos[1]
+      EMT.L2 = EMT.L2 + MDRILL[nMainExit].Pos[2] - EMT.RAWPOS[2] - EMT.HP
+      EMT.L3 = EMT.L3 + MDRILL[nMainExit].Pos[3] - EMT.RAWPOS[3] - EMT.TP
       EmtAdjustLinearAxes()
 
       -- Y e Z sono invertiti

Masterwood-Project265.mlde

@@ -4,8 +4,8 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.7f1'
-PP_NVER = '2.7.6.1'
+PP_VER = '2.7f2'
+PP_NVER = '2.7.6.2'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'MW_Project265'