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

- Se parametro HOODPS non prersente, non si comanda cuffia
- Cambio versione per rilascio post a cliente

MachNotes.ini

@@ -3,8 +3,10 @@
 ; Type : b=boolean, d=double, l=lenght, s=string
 
 [Drilling]
+0=d,HOODPOS,0
 
 [Sawing]
+0=d,HOODPOS,0
 
 [Milling]
 0=d,MaxElev,0
@@ -12,6 +14,7 @@
 2=d,SideElev,0
 3=d,TrimExt,0
 4=sr,VtFaceUse,0,0,0
+5=d,HOODPOS,0
 
 [Pocketing]
 0=d,MaxElev,0
@@ -19,6 +22,7 @@
 2=d,OpenMinSave,0
 3=d,OpenOutRaw,0
 4=d,MaxOptSize,0
+5=d,HOODPOS,0
 
 [Mortising]
 0=d,MaxElev,0

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
 
 ---------------------------------------------------------------------
@@ -160,9 +160,11 @@ function OnMachiningStart()
    -- inizio lavorazione
    EmtOutput( '( === '.. EMT.MCHNAME .. '  -  ' .. EMT.TOOL .. ' ===')
    -- impostazione cuffia ( 0-alta, 1-bassa, 2-medio-bassa, 3-medio-alta)
-   local nHoodPos = EgtGetValInNotes( EMT.MCHUSERNOTES, 'HOODPOS', d) or 0
-   EmtOutput( '( --- Hood position' )
-   EmtOutput( 'M61 K' .. tostring( nHoodPos) .. ' D0')
+   local nHoodPos = EgtGetValInNotes( EMT.MCHUSERNOTES, 'HOODPOS', d)
+   if nHoodPos then
+      EmtOutput( '( --- Hood position' )
+      EmtOutput( 'M61 K' .. tostring( nHoodPos) .. ' D0')
+   end
 
 end
 
@@ -621,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
@@ -629,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.ini

@@ -1,6 +1,9 @@
 ; Commento per evitare BOM con UTF-8
 [General]
 Material=Beam
+Supervisor=0
+SaveCncPath=C:\Mw265ISO
+SaveExt=prg
 
 [Tools]
 Drillbit=1

Masterwood-Project265.mlde

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

Scripts/SetUp.lua

@@ -57,7 +57,8 @@ local PositionTable={{Pos = "Pos1", TcPos = "T1", Head = "H11", Group = "G1"},
                      {Pos = "Pos15", TcPos = "T15", Head = "H11", Group = "G1"},
                      {Pos = "Pos16", TcPos = "T16", Head = "H11", Group = "G1"},
                      {Pos = "Pos17", TcPos = "T17", Head = "H11", Group = "G2"},
-                     {Pos = "Pos18", TcPos = "T81", Head = "H21", Group = "G3"}}
+                     {Pos = "Pos18", TcPos = "T18", Head = "H11", Group = "G2"},
+                     {Pos = "Pos19", TcPos = "T81", Head = "H21", Group = "G3"}}
 
 local UsePositionHead = false