Merge branch 'develop' into testPerFabio

versione precedente
- decimali in generazione portati a 3

Beam/BeamData.lua

@@ -107,7 +107,6 @@ if EgtExistsFile( sData) then
          BeamData.ADVANCE_TAIL_OFFS = Machine.Offsets.ADVANCE_TAIL_OFFS or BeamData.ADVANCE_TAIL_OFFS
          BeamData.LEN_VERY_SHORT_PART = Machine.Offsets.LEN_VERY_SHORT_PART or BeamData.LEN_VERY_SHORT_PART
          BeamData.LEN_SHORT_PART = Machine.Offsets.LEN_SHORT_PART or BeamData.LEN_SHORT_PART
-         BeamData.MAX_DIM_HTCUT_HBEAM = Machine.Offsets.MAX_DIM_HTCUT_HBEAM or BeamData.MAX_DIM_HTCUT_HBEAM
          if Machine.Offsets.PRECUT_HEAD_DISABLE then BeamData.PRECUT_HEAD = ( Machine.Offsets.PRECUT_HEAD_DISABLE == 0) end
          if Machine.Offsets.PRECUT_TAIL_DISABLE then BeamData.PRECUT_TAIL = ( Machine.Offsets.PRECUT_TAIL_DISABLE == 0) end
          if Machine.Offsets.MIN_HEIGHT_ADDED_CUTS then BeamData.MIN_HEIGHT_ADDED_CUTS = min( Machine.Offsets.MIN_HEIGHT_ADDED_CUTS, BeamData.MIN_HEIGHT_ADDED_CUTS) end
@@ -178,7 +177,7 @@ end
 BeamData.GetBlockedAxis = GetBlockedAxis
 
 ---------------------------------------------------------------------
-local function GetChainSawInitAngs( vtN, vtO, nInd)
+local function GetChainSawInitAngs( vtN, vtO)
    if vtN:getY() > 0 and vtO:getX() > 0 then
       return 'C=0'
    else

Common_FAST.NUM.mlpe

@@ -6,7 +6,7 @@ local INFO_STD_PP = require( 'Version')
 local BD = require( 'BeamData')
 
 -- Variabili di modulo
-local CSP_INFO =     INFO_STD_PP.NAME..'_'..NumericalControl..'  ver.'..INFO_STD_PP.VERSION..' by EgalWare s.r.l.'
+local CSP_INFO =     INFO_STD_PP.NAME..'  ver.'..INFO_STD_PP.VERSION..' by EgalWare s.r.l.'
 local MACHINE_INFO = MACH_NAME..'  ver.'..PP_VER
 local TEST_USE = false
 
@@ -53,7 +53,6 @@ function OnProgramStart()
    end
    EmtOutput( sPrefixCommentLine..'('.. CSP_INFO..')')
    EmtOutput( sPrefixCommentLine..'('.. MACHINE_INFO..')\n')
-   EmtOutput( '(HEADER)')
    -- Se modalità test, aggiungo linee per muovere tappeto e alzare la testa (in automatico viene fatto dal main residente)
    if TEST_USE then
       EmtOutput( 'M28')
@@ -105,7 +104,6 @@ function OnProgramEnd()
    EMT.FALL = nil
    EMT.RELOAD = nil
    EMT.RELOAD2 = nil
-   EmtOutput( '(FOOTER)')
    -- Se modalità test, termino il programma
    if TEST_USE then
       EmtOutput( 'M02')
@@ -1540,7 +1538,7 @@ function MyAdjustLinearAxes()
       elseif EMT.HEAD ~= 'H3' then
          local Len = EMT.TLEN + EgtIf( EMT.HEAD == 'H1', MillOffs, abs( SawOffs))
          local LenRef = MillOffs
-         vtE = Vector3d( EMT.TDIR) * Len - Z_AX() * LenRef
+         vtE = Vector3d( EMT.EXTR) * Len - Z_AX() * LenRef
       else
          local LenAux = ( EMT.TDIST or ChSawLen) + MillOffs
          local LenRef = MillOffs

Common_FAST.NUM_PLUS.mlpe

@@ -6,7 +6,7 @@ local INFO_STD_PP = require( 'Version')
 local BD = require( 'BeamData')
 
 -- Variabili di modulo
-local CSP_INFO =     INFO_STD_PP.NAME..'_'..NumericalControl..'  ver.'..INFO_STD_PP.VERSION..' by EgalWare s.r.l.'
+local CSP_INFO =     INFO_STD_PP.NAME..'  ver.'..INFO_STD_PP.VERSION..' by EgalWare s.r.l.'
 local MACHINE_INFO = MACH_NAME..'  ver.'..PP_VER
 local TEST_USE = false
 
@@ -53,7 +53,6 @@ function OnProgramStart()
    end
    EmtOutput( sPrefixCommentLine..'('.. CSP_INFO..')')
    EmtOutput( sPrefixCommentLine..'('.. MACHINE_INFO..')\n')
-   EmtOutput( '(HEADER)')
    -- Se modalità test, aggiungo linee per muovere tappeto e alzare la testa (in automatico viene fatto dal main residente)
    if TEST_USE then
       EmtOutput( 'M28')
@@ -109,7 +108,6 @@ function OnProgramEnd()
    EMT.FALL = nil
    EMT.RELOAD = nil
    EMT.RELOAD2 = nil
-   EmtOutput( '(FOOTER)')
    -- Se modalità test, termino il programma
    if TEST_USE then
       EmtOutput( 'M02')
@@ -495,7 +493,7 @@ function OnMachiningEnd()
    end
    for i = 1, #EMT.AUXSTR do
       local sOut = EMT.AUXSTR[i]
-      if EMT.AUXTYPE == 'S' and sOut:find( 'G101 ') then
+      if EMT.AUXTYPE == 'S' then
          sOut = sOut .. ' EH1'
       elseif EMT.AUXTYPE == 'U' and not EMT.CHY_ON and not sOut:find( 'ET') then
          sOut = sOut .. ' ET2'
@@ -1642,7 +1640,7 @@ function MyAdjustLinearAxes()
       if EMT.HEAD == 'H1' or EMT.HEAD == 'H2' then
          local Len = EMT.TLEN + EgtIf( EMT.HEAD == 'H1', MillOffs, abs( SawOffs))
          local LenRef = MillOffs
-         vtE = Vector3d( EMT.TDIR) * Len - Z_AX() * LenRef
+         vtE = Vector3d( EMT.EXTR) * Len - Z_AX() * LenRef
       elseif EMT.HEAD == 'H3' then
          local LenAux = ( EMT.TDIST or ChSawLen) + MillOffs
          local LenRef = MillOffs

Common_FAST.TPA.mlpe

@@ -6,7 +6,7 @@ local INFO_STD_PP = require( 'Version')
 local BD = require( 'BeamData')
 
 -- Variabili di modulo
-local CSP_INFO =     INFO_STD_PP.NAME..'_'..NumericalControl..'  ver.'..INFO_STD_PP.VERSION..' by EgalWare s.r.l.'
+local CSP_INFO =     INFO_STD_PP.NAME..'  ver.'..INFO_STD_PP.VERSION..' by EgalWare s.r.l.'
 local MACHINE_INFO = MACH_NAME..'  ver.'..PP_VER
 local TEST_USE = false
 
@@ -21,16 +21,13 @@ function OnStart()
    EMT.USETO1 = false     -- abilitazione uso origine tavola
    EMT.MODAL = true       -- abilitazione emissione modale
    EMT.INCHES = false     -- unità di misura mm/inches
-   EMT.DECNUM = 4         -- numero di decimali dopo la virgola
-   EMT.DECVERS = 6        -- numero di decimali dopo la virgola per versori
-   EMT.DECRAD = 4         -- numero di decimali dopo la virgola per raggio
-   EMT.DECMACRO = 3       -- numero di decimali dopo la virgola per macro
+   EMT.DECNUM = 3         -- numero di decimali dopo la virgola
    EMT.NUM = false        -- abilitazione numerazione linee
-   --EMT.Nt = 'N'         -- token per la numerazione di linea
-   --EMT.LINENBR = 0      -- numero di linea
-   --EMT.LINEINC = 1      -- incremento numerazione linee
-   --EMT.Ft = 'F'         -- token per feed
-   --EMT.St = 'S'         -- token per speed
+   --EMT.Nt = 'N'           -- token per la numerazione di linea
+   --EMT.LINENBR = 0        -- numero di linea
+   --EMT.LINEINC = 1        -- incremento numerazione linee
+   --EMT.Ft = 'F'           -- token per feed
+   --EMT.St = 'S'           -- token per speed
    EMT.FMAXPINZE = 154000 -- feed massima pinze
 end
 
@@ -54,7 +51,6 @@ function OnProgramStart()
    end
    ParkLine( sPrefixCommentLine..'('.. CSP_INFO..')')
    ParkLine( sPrefixCommentLine..'('.. MACHINE_INFO..')')
-   ParkLine( '(HEADER)')
 
    -- Se modalità test, aggiungo linee per muovere tappeto e alzare la testa (in automatico viene fatto dal main residente)
    if TEST_USE then
@@ -112,7 +108,6 @@ function OnProgramEnd()
    EMT.FALL = nil
    EMT.RELOAD = nil
    EMT.RELOAD2 = nil
-   EmtOutput( '(FOOTER)')
    -- Termino il programma
    EmtOutput( 'M02')
 end
@@ -121,8 +116,8 @@ end
 function OnToolData()
    -- emissione dati utensili
    if EMT.HEAD == 'H1' then
-      local sOut = 'M992 P1=' .. EMT.TCPOS:gsub( 'T', '') .. ' P2=' .. EmtLenToString( EMT.TLEN, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( EMT.TDIAM, EMT.DECMACRO) ..
-                   ' P4=' .. EmtLenToString( EMT.SMAX, EMT.DECMACRO) .. ' P5=' .. EmtLenToString( EMT.TTOTLEN, EMT.DECMACRO)
+      local sOut = 'M992 P1=' .. EMT.TCPOS:gsub( 'T', '') .. ' P2=' .. EmtLenToString( EMT.TLEN, 3) .. ' P3=' .. EmtLenToString( EMT.TDIAM, 3) ..
+                   ' P4=' .. EmtLenToString( EMT.SMAX, 3) .. ' P5=' .. EmtLenToString( EMT.TTOTLEN, 3)
       ParkLine( sOut)
       -- cerco posizione di attrezzaggio del primo utensile di lavorazione
       if EMT.TOOL == EMT.TOOL_1  and  EMT.TLEN_1 < LONG_TOOL_MINLEN then
@@ -130,14 +125,14 @@ function OnToolData()
       end
    -- emissione dati lama
    elseif EMT.HEAD == 'H2' then
-      local sOut = 'M992 P1=' .. EMT.TCPOS:gsub( 'T', '') .. ' P2=' .. EmtLenToString( EMT.TLEN, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( EMT.TDIAM, EMT.DECMACRO) ..
-                   ' P4=' .. EmtLenToString( EMT.SMAX, EMT.DECMACRO) .. ' P5=' .. EmtLenToString( EMT.TTOTLEN, EMT.DECMACRO)
+      local sOut = 'M992 P1=' .. EMT.TCPOS:gsub( 'T', '') .. ' P2=' .. EmtLenToString( EMT.TLEN, 3) .. ' P3=' .. EmtLenToString( EMT.TDIAM, 3) ..
+                   ' P4=' .. EmtLenToString( EMT.SMAX, 3) .. ' P5=' .. EmtLenToString( EMT.TTOTLEN, 3)
       ParkLine( sOut)
    -- emissione dati sega a catena
    elseif EMT.HEAD == 'H3' then
       if EMT.TDIST and abs( EMT.TDIST) < 0.1 then EMT.TDIST = nil end
-      local sData = ' P2=' .. EmtLenToString( ( EMT.TDIST or ChSawLen), EMT.DECMACRO) .. ' P3=' .. EmtLenToString( EMT.TLEN, EMT.DECMACRO) ..
-                    ' P4=' .. EmtLenToString( EMT.SMAX, EMT.DECMACRO) .. ' P5=' .. EmtLenToString( ( EMT.TDIST or ChSawLen), EMT.DECMACRO)
+      local sData = ' P2=' .. EmtLenToString( ( EMT.TDIST or ChSawLen), 3) .. ' P3=' .. EmtLenToString( EMT.TLEN, 3) ..
+                    ' P4=' .. EmtLenToString( EMT.SMAX, 3) .. ' P5=' .. EmtLenToString( ( EMT.TDIST or ChSawLen), 3)
       if EMT.TCPOS == 'T101' then
          ParkLine( 'M992 P1=101' .. sData)
          ParkLine( 'M992 P1=102' .. sData)
@@ -153,13 +148,13 @@ function OnToolData()
    elseif EMT.HEAD == 'H5' or EMT.HEAD == 'H6' then
       local nPos = EgtIf( EMT.HEAD == 'H5', 91, 93)
       if EMT.EXIT == 2 then nPos = nPos + 1 end
-      local sOut = 'M992 P1=' .. EgtNumToString( nPos, 0) .. ' P2=' .. EmtLenToString( EMT.TLEN, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( EMT.TDIAM, EMT.DECMACRO) ..
-                   ' P4=' .. EmtLenToString( EMT.SMAX, EMT.DECMACRO) .. ' P5=' .. EmtLenToString( EMT.TTOTLEN, EMT.DECMACRO)
+      local sOut = 'M992 P1=' .. EgtNumToString( nPos, 0) .. ' P2=' .. EmtLenToString( EMT.TLEN, 3) .. ' P3=' .. EmtLenToString( EMT.TDIAM, 3) ..
+                   ' P4=' .. EmtLenToString( EMT.SMAX, 3) .. ' P5=' .. EmtLenToString( EMT.TTOTLEN, 3)
       ParkLine( sOut)
    -- emissione dati sega a catena
    elseif EMT.HEAD == 'H7' then
-      local sOut = 'M992 P1=' .. EMT.TCPOS:gsub( 'T', '') .. ' P2=' .. EmtLenToString( EMT.TLEN, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( EMT.TDIAM, EMT.DECMACRO) ..
-                   ' P4=' .. EmtLenToString( EMT.SMAX, EMT.DECMACRO) .. ' P5=' .. EmtLenToString( EMT.TTOTLEN, EMT.DECMACRO)
+      local sOut = 'M992 P1=' .. EMT.TCPOS:gsub( 'T', '') .. ' P2=' .. EmtLenToString( EMT.TLEN, 3) .. ' P3=' .. EmtLenToString( EMT.TDIAM, 3) ..
+                   ' P4=' .. EmtLenToString( EMT.SMAX, 3) .. ' P5=' .. EmtLenToString( EMT.TTOTLEN, 3)
       ParkLine( sOut)
 -- altro non previsto
    else
@@ -229,8 +224,8 @@ function OnDispositionEnd()
 
       if IdTrave >= 0 then
          local sPrt = '( *** Part '.. EgtNumToString( IdTrave, 0) ..' ***)'
-         local sOut = '( SN=' .. IdTrave .. ' LBarra=' .. EmtLenToString( LBarra, EMT.DECMACRO) .. ' L='..EmtLenToString( LTrave, EMT.DECMACRO) ..
-                      ' H=' .. EmtLenToString( HTrave, EMT.DECMACRO) .. ' S=' .. EmtLenToString( STrave, EMT.DECMACRO) .. ' )'
+         local sOut = '( SN=' .. IdTrave .. ' LBarra=' .. EmtLenToString( LBarra, 3) .. ' L='..EmtLenToString( LTrave, 3) ..
+                      ' H=' .. EmtLenToString( HTrave, 3) .. ' S=' .. EmtLenToString( STrave, 3) .. ' )'
          EMT.PRODID = EgtGetInfo( BtlInfoId, 'PRODID', 'i') or 0
          EMT.PATTID = EgtGetInfo( BtlInfoId, 'PATTID', 'i') or 0
          EMT.CUTID = EgtGetInfo( EMT.IDT, 'CUTID', 'i') or 0
@@ -661,9 +656,9 @@ function OnRapid()
       local bZmax = ( #EMT.AUXSTR > 0  or  EMT.TOOL ~= EMT.PREVTOOL  or EMT.L3 > -1)
       -- se avevo motosega, torno in zona sicura senza ruotare assi rotanti
       if EMT.PREVHEAD == 'H3' and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
-         local sOutPreMove = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( MyZHome, EMT.DECMACRO) ..
-                                 ' P4=' .. EgtNumToString( EMT.R2pp, EMT.DECMACRO) .. ' P5=' .. EgtNumToString( EMT.R1pp, EMT.DECMACRO) .. 
-                                 ' P6=' .. EgtNumToString( EMT.PREVTCPOS, EMT.DECMACRO) .. ' P7=' .. EgtNumToString( EMT.PREVS, 0) ..
+         local sOutPreMove = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, 3) .. ' P3=' .. EmtLenToString( MyZHome, 3) ..
+                                 ' P4=' .. EgtNumToString( EMT.R2pp, 3) .. ' P5=' .. EgtNumToString( EMT.R1pp, 3) .. 
+                                 ' P6=' .. EgtNumToString( EMT.PREVTCPOS, 3) .. ' P7=' .. EgtNumToString( EMT.PREVS, 0) ..
                                  ' P8=0' .. ' P9=0' .. ' P10=' .. EgtIf( bZmax, '3', '4')
          EmtOutput( sOutPreMove)
          EmtOutput( 'M101 P1=2')
@@ -677,8 +672,8 @@ function OnRapid()
 
       -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione
       if ( EMT.HEAD == 'H3' or ( bZmax and EMT.TTOTLEN > 200)) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
-         local sOutPreMove = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( MyZHome, EMT.DECMACRO) ..
-                                 ' P4=' .. EgtNumToString( EMT.R2, EMT.DECMACRO) .. ' P5=' .. EgtNumToString( EMT.R1, EMT.DECMACRO) .. 
+         local sOutPreMove = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, 3) .. ' P3=' .. EmtLenToString( MyZHome, 3) ..
+                                 ' P4=' .. EgtNumToString( EMT.R2, 3) .. ' P5=' .. EgtNumToString( EMT.R1, 3) .. 
                                  ' P6=' .. AdjustTcPos( false) .. ' P7=' .. EgtNumToString( EMT.S, 0) ..
                                  ' P8=0' .. ' P9=0' .. ' P10=' .. EgtIf( bZmax, '3', '4')
          EmtOutput( sOutPreMove)
@@ -692,8 +687,8 @@ function OnRapid()
       if EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          MyZPos = MyZHome
       end
-      local sOut = 'M101 P1=1' .. ' P2=' .. EmtLenToString( EMT.L2, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( MyZPos, EMT.DECMACRO) ..
-                       ' P4=' .. EgtNumToString( EMT.R2, EMT.DECMACRO) .. ' P5=' .. EgtNumToString( EMT.R1, EMT.DECMACRO) .. 
+      local sOut = 'M101 P1=1' .. ' P2=' .. EmtLenToString( EMT.L2, 3) .. ' P3=' .. EmtLenToString( MyZPos, 3) ..
+                       ' P4=' .. EgtNumToString( EMT.R2, 3) .. ' P5=' .. EgtNumToString( EMT.R1, 3) .. 
                        ' P6=' .. AdjustTcPos( false) .. ' P7=' .. EgtNumToString( EMT.S, 0) ..
                        ' P8=0' .. ' P9=0' .. ' P10=' .. EgtIf( bZmax, '3', '4')
       if EMT.LOAD then
@@ -743,7 +738,7 @@ function OnRapid()
             sV = EmtLenToString( ParkV)
             sB = '2'
          end
-         sOut = 'M112 P1='..EmtLenToString( EMT.L1, EMT.DECMACRO)..' P3='..sA..' P4='..sB..' P5=0 P6='..sY..' P7='..sV..' P9='..GetFmaxClamp()
+         sOut = 'M112 P1='..EmtLenToString( EMT.L1, 3)..' P3='..sA..' P4='..sB..' P5=0 P6='..sY..' P7='..sV..' P9='..GetFmaxClamp()
          ParkLine( sOut)
          EMT.LOAD = false
          -- emissione prime linee speciali e linee parcheggiate
@@ -794,7 +789,7 @@ function OnRapid()
             sOut = 'M101 P1=3'
             EmtOutput( sOut)
          end
-         sOut = 'M112 P1=' .. EmtLenToString( EMT.L1, EMT.DECMACRO) ..' P3='..sA..' P4='..sB..' P6='..sY..' P7='..sV..' P9=' .. GetFmaxClamp()
+         sOut = 'M112 P1=' .. EmtLenToString( EMT.L1, 3) ..' P3='..sA..' P4='..sB..' P6='..sY..' P7='..sV..' P9=' .. GetFmaxClamp()
          EmtOutput( sOut)
          if not bHeadFirst then
             sOut = 'M101 P1=2'
@@ -866,15 +861,15 @@ function OnRapid()
       if EMT.ST > BeamHeightForFixRot  and  EMT.HEAD == 'H1' and  EMT.TOOL ~= EMT.NEXTTOOL  and  EMT.NEXTHEAD ~= 'H2' then
          local dBAxis = 90
          local dCAxis = EgtIf( BD.RIGHT_LOAD, 90, -90)
-         local sOut = 'M101 P1=1' .. ' P2=' .. EmtLenToString( EMT.L2, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( EMT.L3, EMT.DECMACRO) ..
-                      ' P4=' .. EgtNumToString( dBAxis, EMT.DECMACRO) .. ' P5=' .. EgtNumToString( dCAxis, EMT.DECMACRO) .. 
+         local sOut = 'M101 P1=1' .. ' P2=' .. EmtLenToString( EMT.L2, 3) .. ' P3=' .. EmtLenToString( EMT.L3, 3) ..
+                      ' P4=' .. EgtNumToString( dBAxis, 3) .. ' P5=' .. EgtNumToString( dCAxis, 3) .. 
                       ' P6=' .. AdjustTcPos( false) .. ' P7=' .. EgtNumToString( EMT.S, 0) ..
                       ' P8=0' .. ' P9=0' .. ' P10=3'
          EmtOutput( sOut)
          EmtOutput( 'M101 P1=2')
          EmtOutput( 'M101 P1=3')
-         sOut = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( EMT.L3, EMT.DECMACRO) ..
-                      ' P4=' .. EgtNumToString( dBAxis, EMT.DECMACRO) .. ' P5=' .. EgtNumToString( dCAxis, EMT.DECMACRO) .. 
+         sOut = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, 3) .. ' P3=' .. EmtLenToString( EMT.L3, 3) ..
+                      ' P4=' .. EgtNumToString( dBAxis, 3) .. ' P5=' .. EgtNumToString( dCAxis, 3) .. 
                       ' P6=' .. AdjustTcPos( false) .. ' P7=' .. EgtNumToString( EMT.S, 0) ..
                       ' P8=0' .. ' P9=0' .. ' P10=3'
          EmtOutput( sOut)
@@ -891,8 +886,8 @@ function OnRapid()
       MyAdjustLinearAxes()
       EmtAdjustRotaryAxes()
       EmtResetPrev()
-      local sOut = 'M101 P1=1' .. ' P2=' .. EmtLenToString( EMT.L2, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( EMT.L3, EMT.DECMACRO) ..
-                   ' P4=' .. EgtNumToString( EMT.R2, EMT.DECMACRO) .. ' P5=' .. EgtNumToString( EMT.R1, EMT.DECMACRO) .. 
+      local sOut = 'M101 P1=1' .. ' P2=' .. EmtLenToString( EMT.L2, 3) .. ' P3=' .. EmtLenToString( EMT.L3, 3) ..
+                   ' P4=' .. EgtNumToString( EMT.R2, 3) .. ' P5=' .. EgtNumToString( EMT.R1, 3) .. 
                    ' P6=' .. AdjustTcPos( false) .. ' P7=' .. EgtNumToString( EMT.S, 0) ..
                    ' P8=0' .. ' P9=0' .. ' P10=3'
       EmtOutput( sOut)
@@ -1012,7 +1007,7 @@ function OnArc()
    --local sCen = ' ' .. EMT.C1t .. EmtLenToString(EMT.C1,3) ..
    --             ' ' .. EMT.C2t .. EmtLenToString(EMT.C2,3)
    -- raggio
-   local sRad = ' ' .. EMT.RRt .. EmtLenToString( EMT.RR, EMT.DECRAD)
+   local sRad = ' ' .. EMT.RRt .. EmtLenToString( EMT.RR, EMT.DECNUM)
    -- aggiungo feed
    local sFeed = EmtGetFeed()
    -- tipo arco
@@ -1644,7 +1639,7 @@ function MyAdjustLinearAxes()
       if EMT.HEAD == 'H1' or EMT.HEAD == 'H2' then
          local Len = EMT.TLEN + EgtIf( EMT.HEAD == 'H1', MillOffs, abs( SawOffs))
          local LenRef = MillOffs
-         vtE = Vector3d( EMT.TDIR) * Len - Z_AX() * LenRef
+         vtE = Vector3d( EMT.EXTR) * Len - Z_AX() * LenRef
       elseif EMT.HEAD == 'H3' then
          local LenAux = ( EMT.TDIST or ChSawLen) + MillOffs
          local LenRef = MillOffs
@@ -1655,13 +1650,13 @@ function MyAdjustLinearAxes()
          local LenAux = MillOffs + AngTr1Offs
          local LenRef = MillOffs
          local vtAux = EgtGetCalcAuxDirFromAngles( EMT.R1, EMT.R2)
-         vtE = Vector3d( EMT.TDIR) * Len + vtAux * LenAux - Z_AX() * LenRef
+         vtE = Vector3d( EMT.EXTR) * Len + vtAux * LenAux - Z_AX() * LenRef
       elseif  EMT.HEAD == 'H7' then
          local Len = EMT.TLEN + AngTrBHLen
          local LenAux = MillOffs + AngTrBHOffs
          local LenRef = MillOffs
          local vtAux = EgtGetCalcAuxDirFromAngles( EMT.R1, EMT.R2)
-         vtE = Vector3d( EMT.TDIR) * Len + vtAux * LenAux - Z_AX() * LenRef
+         vtE = Vector3d( EMT.EXTR) * Len + vtAux * LenAux - Z_AX() * LenRef
       else
          EmtSetLastError( 1211, 'Head not allowed ' .. EMT.HEAD)
       end
@@ -1772,9 +1767,9 @@ function CalcInterpPlane()
    local vtY = EMT.IPLGLFR:getVersY()
    local vtZ = EMT.IPLGLFR:getVersZ()
    EMT.IPLGLSTR = ' X0 Y' .. EmtLenToString( xS, EMT.DECNUM) .. ' Z0' ..
-                  ' A' .. EgtNumToString( - vtX:getY(), EMT.DECVERS) .. ' B' .. EgtNumToString( vtX:getX(), EMT.DECVERS) .. ' C' .. EgtNumToString( vtX:getZ(), EMT.DECVERS) ..
-                  ' I' .. EgtNumToString( - vtY:getY(), EMT.DECVERS) .. ' J' .. EgtNumToString( vtY:getX(), EMT.DECVERS) .. ' K' .. EgtNumToString( vtY:getZ(), EMT.DECVERS) ..
-                  ' P' .. EgtNumToString( - vtZ:getY(), EMT.DECVERS) .. ' Q' .. EgtNumToString( vtZ:getX(), EMT.DECVERS) .. ' R' .. EgtNumToString( vtZ:getZ(), EMT.DECVERS)
+                  ' A' .. EgtNumToString( - vtX:getY(), EMT.DECNUM) .. ' B' .. EgtNumToString( vtX:getX(), EMT.DECNUM) .. ' C' .. EgtNumToString( vtX:getZ(), EMT.DECNUM) ..
+                  ' I' .. EgtNumToString( - vtY:getY(), EMT.DECNUM) .. ' J' .. EgtNumToString( vtY:getX(), EMT.DECNUM) .. ' K' .. EgtNumToString( vtY:getZ(), EMT.DECNUM) ..
+                  ' P' .. EgtNumToString( - vtZ:getY(), EMT.DECNUM) .. ' Q' .. EgtNumToString( vtZ:getX(), EMT.DECNUM) .. ' R' .. EgtNumToString( vtZ:getZ(), EMT.DECNUM)
    EMT.IPLGL = true
 end
 

Common_FAST.mlpe

@@ -1192,19 +1192,18 @@ end
 ---------------------------------------------------------------------
 --   *** ESTIMATION T&L ***
 ---------------------------------------------------------------------
-local ESTIMATION_RAPID_COEFF = EstimationRapidMultiplier or 1
-local RAPID_X_FEED =  75000 / ESTIMATION_RAPID_COEFF    -- mm/min
-local RAPID_Y_FEED = 100000 / ESTIMATION_RAPID_COEFF    -- mm/min
-local RAPID_Z_FEED =  50000 / ESTIMATION_RAPID_COEFF    -- mm/min
-local RAPID_C_FEED =  15000 / ESTIMATION_RAPID_COEFF    -- deg/min
-local RAPID_B_FEED =  15000 / ESTIMATION_RAPID_COEFF    -- deg/min
-local RAPID_MIN_T = 0.1 * ESTIMATION_RAPID_COEFF       -- s
-local LOAD_T = 2  * ESTIMATION_RAPID_COEFF              -- s
-local CHAR_ONE_MOVE_T = 1  * ESTIMATION_RAPID_COEFF     -- s
-local ROTATION_T = 40  * ESTIMATION_RAPID_COEFF         -- s
-local SPLIT_T = 6  * ESTIMATION_RAPID_COEFF             -- s
-local UNLOAD_T = 4  * ESTIMATION_RAPID_COEFF            -- s
-local FALL_T = 2  * ESTIMATION_RAPID_COEFF              -- s
+local RAPID_X_FEED =  75000    -- mm/min
+local RAPID_Y_FEED = 100000    -- mm/min
+local RAPID_Z_FEED =  50000    -- mm/min
+local RAPID_C_FEED =  15000    -- deg/min
+local RAPID_B_FEED =  15000    -- deg/min
+local RAPID_MIN_T = 0.1        -- s
+local LOAD_T = 2               -- s
+local CHAR_ONE_MOVE_T = 1      -- s
+local ROTATION_T = 40          -- s
+local SPLIT_T = 6              -- s
+local UNLOAD_T = 4             -- s
+local FALL_T = 2               -- s
 
 ---------------------------------------------------------------------
 function OnEstimStart()

Essetre-FASTrl.ini

@@ -34,15 +34,8 @@ Milling=1
 Pocketing=1
 Mortising=1
 Chiseling=0
-GenMachining=0
-SurfRoughing=1
-SurfFinishing=1
-5AxMilling=1
-
-[5AxMilling]
-5AxScript1=5AxProject
-5AxScript2=5AxPocketProject
-5AxScript3=5AxCylProject
+SawRoughing=0
+SawFinishing=0
 
 [Machining]
 InitScript=InitMach.lua

Essetre-FASTrl.mlde

@@ -10,8 +10,8 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.7c2'
-PP_NVER = '2.7.3.2'
+PP_VER = '2.7b1_TEST'
+PP_NVER = '2.7.2.1'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-FASTrl'
 

MachNotes.ini

@@ -25,6 +25,9 @@
 
 [Chiseling]
 
+[SawRoughing]
+
+[SawFinishing]
 
 [GenMachining]
 0=l,LinTol,0.1
@@ -42,26 +45,6 @@
 12=b,DirFromGuide,1
 
 [SurfRoughing]
-0=l,MaxElev,1000
-1=b,PlaneZ,0
 
 [SurfFinishing]
 0=b,SkipMaxDown,1
-
-[5AxMilling]
-0=l,LinTol,0.01
-1=l,MaxLen,10
-2=s,Type,ZigZag
-3=d,SideAng,90
-4=l,Step,10
-5=d,AngIni,-90
-6=d,AngFin,90
-7=l,LiTang,0
-8=l,LiOrth,0
-9=l,LiElev,0
-10=l,LoTang,0
-11=l,LoOrth,0
-12=l,LoElev,0
-13=b,DirFromGuide,0
-14=b,SurfAvoid,0
-

UpdateLog.txt

@@ -1,23 +1,7 @@
            ==== Common_FAST Update Log ====
 
-Versione 2.7c1 (26/03/2024)
-- (GEN) All'inizio del codice ISO si scrive nel commento anche il controllo numerico utilizzato per la generazione.
-- (GEN) Aggiunta commenti HEADER e FOOTER per comunicazione con linea o altre macchine, da parte di Essetre.
-- (GEN) In MyAdjustLinearAxes si utilizza TDIR per calcolarsi gli offset per compatibilità con lavorazioni a 5 assi.
-
-Versione 2.7b1 (20/02/2024)
-- (SIM-GEN) Aggiunta possibilità di settare HCING/TCING nelle note di ogni singola lavorazione per gestire parte non pinzabile del pezzo. Funziona solo con nuovo pinzaggio.
-- (SIM-GEN) Piccola correzione calcolo posizione carrelli con nuova strategia di pinzaggio.
-- (SIM-GEN) Caricamento libreria EmtGenMachining. Si fa una require con PCALL perchè la libreria è opzionale e non è detto che ci sia. In installazione CAM5 dalla 2.7a1
-- (GEN) Per controllo TPA, modifica al numero di decimali.
-- (SIM) Aggiunta gestione per ToolHolder flottante
-
-Versione 2.7a3 (08/01/2024)
-- (GEN) Dopo separazione, in NUM_PLUS, si srive EH1 solo se macro G101, perchè altrimenti non è prevista. Ticket#2239
-
-Versione 2.7a2 (08/01/2024)
-- (MLDE-SIM) Aggiunta gestione FACOLTATIVA 'EstimationRapidMultiplier' in MLDE per regolare il tempo stimato. Se non presente in MLDE, default 1.
-- (SIM) Aggiunta gestione qualità VMILL da impostazioni macchina
+Versione 2.7-- (--/--/2025)
+- (SIM) Piccola correzione in selezione motosega, l'asse B è già in posizione corretta.
 
 Versione 2.7a1 (07/01/2024)
 - (MLDE-SIM-GEN) Nuovo aggregato 90° (H7) per fresa tipo BlockHaus. Ticket#2142

Version.lua

@@ -1,9 +1,9 @@
--- Version.lua by EgalWare s.r.l. 2024/03/28
+-- Version.lua by EgalWare s.r.l. 2024/12/23
 -- Gestione della versione dei file comuni post-processori macchine FAST e FASTrl di Essetre
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_FAST',            -- nome script PP standard
-   VERSION = '2.7c1',                 -- versione script
+   VERSION = '2.7--',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }