- Allineamento con common ver. 2.6i2

- Aggiunte variabili MinJoin(xx) per gestione MIN_JOIN_(xx)

.gitlab-ci.yml

@@ -86,7 +86,7 @@ variables:
      echo "-----------------------"
      echo "   Compilazione file *.lua 32/64bit"
      echo "-----------------------"
-     $FileList = Get-ChildItem("Common-*")
+     $FileList = Get-ChildItem("Common_*")
      ForEach ($File in $FileList) {
        $FileName = Split-Path $File -leaf
        lua54 -o $env:SRC_PATH\bin\$env:MACH_NAME\$FileName -s $FileName

Beam/BeamData.lua

@@ -165,6 +165,41 @@ local function GetChainSawInitAngs( vtN, vtO)
    end
 end
 BeamData.GetChainSawInitAngs = GetChainSawInitAngs
+---------------------------------------------------------------------
+local function GetSetupInfo( sHead)
+   local SetupInfo = {}
+
+   -- dati comuni
+   SetupInfo.bIsCSymmetric = false
+   SetupInfo.dCAxisEncumbrance = 180
+   SetupInfo.bToolOnAggregate = false
+
+   -- testa 5 assi da sopra
+   if sHead == 'H1' then
+      SetupInfo.bIsTopHead = true
+      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
+      SetupInfo.dMaxNegativeAngle = sin( -45)
+   -- lama su testa 5 assi da sopra
+   elseif sHead == 'H2' then
+      SetupInfo.bIsTopHead = true
+      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
+      SetupInfo.dMaxNegativeAngle = sin( -45)
+   -- motosega
+   elseif sHead == 'H3' then
+      SetupInfo.bIsTopHead = true
+      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
+      SetupInfo.dMaxNegativeAngle = 0
+   -- rinvio angolare 90° (considerato come fosse una testa da sotto)
+   elseif sHead == 'H5' then
+      SetupInfo.bToolOnAggregate = true
+      SetupInfo.bIsBottomHead = true
+      SetupInfo.bIsTopHead = not SetupInfo.bIsBottomHead
+      SetupInfo.dMaxPositiveAngle = 0
+   end
+
+   return SetupInfo
+end
+BeamData.GetSetupInfo = GetSetupInfo
 
 ---------------------------------------------------------------------
 return BeamData

Beam/NestingData.ini

@@ -0,0 +1,3 @@
+[BEAM]
+StartOffset=0
+Offset=0

Common_FAST.NUM.mlpe

@@ -627,7 +627,7 @@ function OnRapid()
       local MyZHome = EgtGetAxisHomePos( 'Z')
       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
+      if ( EMT.PREVHEAD == 'H3' or EMT.TTOTLEN > 200) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          local sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) ..
                                        ' B' .. EmtLenToString( EMT.R2pp, 3) .. ' C' .. EmtLenToString( EMT.R1pp, 3) .. 
                                        ' EE' .. EgtIf( bZmax, '3', '4') .. EMT.PREVsEL .. EMT.PREVsER .. EMT.PREVsET .. EMT.PREVsES
@@ -649,7 +649,7 @@ function OnRapid()
       local sES = ' ES'..EgtNumToString( EMT.S, 0)
 
       -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione
-      if EMT.HEAD == 'H3' and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
+      if ( EMT.HEAD == 'H3' or EMT.TTOTLEN > 200) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          local sEEPreMove = ' EE' .. EgtIf( bZmax, '3', '4')
          local sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) ..
                                        EmtGetAxis( 'R2') .. EmtGetAxis( 'R1') .. sEE .. sEL .. sER .. sET .. sES
@@ -930,8 +930,12 @@ function OnArc()
    local sFeed = EmtGetFeed()
    -- tipo arco
    local sArc = 'G' .. EgtNumToString(EMT.MOVE,0)
-   -- emetto arco
-   EmtOutput( sArc..sAxes..sRad..sFeed)
+   -- se arco molto grande, approssimo con una retta
+   if EMT.RR > 99999 then
+      EmtOutput( "G1"..sAxes..sFeed)
+   else
+      EmtOutput( sArc..sAxes..sRad..sFeed)
+   end
 
    -- aggiorno valori come precedenti
    EmtUpdatePrev()

Common_FAST.NUM_PLUS.mlpe

@@ -668,7 +668,7 @@ function OnRapid()
       local MyZHome = EgtGetAxisHomePos( 'Z')
       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
+      if ( EMT.PREVHEAD == 'H3' or EMT.TTOTLEN > 200) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          local sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) ..
                                        ' B' .. EmtLenToString( EMT.R2pp, 3) .. ' C' .. EmtLenToString( EMT.R1pp, 3) .. 
                                        ' EE' .. EgtIf( bZmax, '3', '4') .. EMT.PREVsEL .. EMT.PREVsER .. EMT.PREVsET .. EMT.PREVsES
@@ -713,7 +713,7 @@ function OnRapid()
       local sES = ' ES'..EgtNumToString( EMT.S, 0)
 
       -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione
-      if EMT.HEAD == 'H3' and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
+      if ( EMT.HEAD == 'H3' or EMT.TTOTLEN > 200) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          local sEEPreMove = ' EE' .. EgtIf( bZmax, '3', '4')
          local sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) ..
                                        EmtGetAxis( 'R2') .. EmtGetAxis( 'R1') .. sEE .. sEL .. sER .. sET .. sES
@@ -843,7 +843,7 @@ function OnRapid()
          sOut = 'G112 EA'..sA..' EB'..sB..EmtGetAxis('L1')..' EY'..sY..' EV'..sV..' EF'..GetFmaxClamp()
          EmtOutput( sOut)
          -- se taglio di coda senza residuo da scaricare, emetto M175 per accelerare il carico della barra successiva
-         if EMT.MCHUSERNOTES and EMT.MCHUSERNOTES:find( 'Cut') then
+         if EMT.MCHUSERNOTES and EMT.MCHUSERNOTES:find( 'Cut') and ( IsEndPhase( EMT.PHASE+1) or IsEnd2Phase( EMT.PHASE+1)) then
             EmtOutput( '(M175)')
          end
          if not bHeadFirst then
@@ -1009,8 +1009,12 @@ function OnArc()
    local sFeed = EmtGetFeed()
    -- tipo arco
    local sArc = 'G' .. EgtNumToString(EMT.MOVE,0)
-   -- emetto arco
-   EmtOutput( sArc..sAxes..sRad..sFeed)
+   -- se arco molto grande, approssimo con una retta
+   if EMT.RR > 99999 then
+      EmtOutput( "G1"..sAxes..sFeed)
+   else
+      EmtOutput( sArc..sAxes..sRad..sFeed)
+   end
 
    -- aggiorno valori come precedenti
    EmtUpdatePrev()

Common_FAST.TPA.mlpe

@@ -647,7 +647,7 @@ function OnRapid()
       local MyZHome = EgtGetAxisHomePos( 'Z')
       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
+      if ( EMT.PREVHEAD == 'H3' or EMT.TTOTLEN > 200) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          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) ..
@@ -663,7 +663,7 @@ function OnRapid()
       end
 
       -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione
-      if EMT.HEAD == 'H3' and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
+      if ( EMT.HEAD == 'H3' or EMT.TTOTLEN > 200) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          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) ..
@@ -774,7 +774,7 @@ function OnRapid()
             sB = '2'
          end
          -- se taglio di coda senza residuo da scaricare, emetto M175 per accelerare il carico della barra successiva
-         if EMT.MCHUSERNOTES and EMT.MCHUSERNOTES:find( 'Cut') then
+         if EMT.MCHUSERNOTES and EMT.MCHUSERNOTES:find( 'Cut') and ( IsEndPhase( EMT.PHASE+1) or IsEnd2Phase( EMT.PHASE+1)) then
             EmtOutput( 'M175')
          end
          if bHeadFirst then

Common_FAST.mlpe

@@ -15,11 +15,11 @@ BIG_TOOL_DIAM = 300
 ---------------------------------------------------------------------
 local sBaseDir = EgtGetCurrMachineDir()
 if NumericalControl == 'NUM' then
-   dofile( sBaseDir .. '\\Common-FAST.NUM.mlpe')
+   dofile( sBaseDir .. '\\Common_FAST.NUM.mlpe')
 elseif NumericalControl == 'TPA' then
-   dofile( sBaseDir .. '\\Common-FAST.TPA.mlpe')
+   dofile( sBaseDir .. '\\Common_FAST.TPA.mlpe')
 elseif NumericalControl == 'NUM_PLUS' then
-   dofile( sBaseDir .. '\\Common-FAST.NUM_PLUS.mlpe')
+   dofile( sBaseDir .. '\\Common_FAST.NUM_PLUS.mlpe')
 else
    EmtSetLastError( 1201, 'Numerical Control error : unkwnown type')
 end
@@ -752,7 +752,7 @@ function OnSimulMoveStart()
       -- con pezzi alti aggiorno gli assi rotanti prima di muovermi sopra il pezzo
       if not EMT.LOAD and EMT.MOVE == 0 and EMT.HB > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          -- se motosega mi muovo a X di sicurezza per ruotare
-         if EMT.HEAD == 'H3'then
+         if EMT.HEAD == 'H3' or EMT.TOTLEN > 200 then
             SimulMoveAxes( 'X', SafeXRotAxes, MCH_SIM_STEP.RAPID, 'C', EMT.R1, MCH_SIM_STEP.COLLROT, 'B', EMT.R2, MCH_SIM_STEP.COLLROT)
          end
       end
@@ -1524,6 +1524,12 @@ function IsStartOrRestPhase( nPhase)
    return ( sVal == 'START' or sVal == 'REST')
 end
 
+---------------------------------------------------------------------
+function IsEndPhase( nPhase)
+   local sVal = GetPhaseType( nPhase)
+   return ( sVal == 'END')
+end
+
 ---------------------------------------------------------------------
 function IsMidPhase( nPhase)
    local sVal = GetPhaseType( nPhase)

Common_FAST.mlse

@@ -32,11 +32,11 @@ local DELTA_TOL_FIXED = 50
 local DeltaTol = DELTA_TOL_S
 local DELTA_SIC = 1
 local AGG_LOAD = 50
-local MIN_JOIN_VV = 75
-local MIN_JOIN_SS = 100
-local MIN_JOIN_LS = 290
-local MIN_JOIN_SL = 100
-local MIN_JOIN_LL = 400
+local MIN_JOIN_VV = EgtClamp( MinJoinVV or 75, 60, 150)
+local MIN_JOIN_SS = EgtClamp( MinJoinSS or 100, 80, 200)
+local MIN_JOIN_LS = EgtClamp( MinJoinLS or 290, 250, 400)
+local MIN_JOIN_SL = EgtClamp( MinJoinSL or 100, 80, 200)
+local MIN_JOIN_LL = EgtClamp( MinJoinLL or 400, 300, 600)
 local MinJoin = MIN_JOIN_SS
 local MinOther = abs( MinY) + abs( MaxV) + MinJoin
 
@@ -908,7 +908,7 @@ function SpecCalcEncumbrance( vtTool, vtArm, ptMin, ptMax, bSaw, bChain, dTLen,
       elseif abs( vtTool:getZ()) < 0.93 then
          if vtTool:getX() > 0 and abs( vtTool:getY()) < 0.2 and ptMax:getZ() > EMC.ZMIN + BD.VICE_MINH then
             dHeadBack = 180
-         elseif vtTool:getX() > -0.05 then
+         elseif vtTool:getX() > -0.06 then
             dHeadBack = 50 + 0.5 * dTDiam * sqrt( 1 - vtTool:getX() * vtTool:getX())
          elseif vtTool:getX() > -0.3 then
             dHeadBack = 250
@@ -917,7 +917,7 @@ function SpecCalcEncumbrance( vtTool, vtArm, ptMin, ptMax, bSaw, bChain, dTLen,
          elseif vtTool:getX() > -0.8667 then
             dHeadBack = 450
          else
-            dHeadBack = 650
+            dHeadBack = 660
          end
       else
          dHeadBack = 50 + 0.5 * dTDiam * sqrt( 1 - vtTool:getX() * vtTool:getX())
@@ -999,7 +999,7 @@ function SpecCalcEncumbrance( vtTool, vtArm, ptMin, ptMax, bSaw, bChain, dTLen,
       elseif abs( vtTool:getZ()) < 0.93 then
          if vtTool:getX() < 0 and abs( vtTool:getY()) < 0.2 and ptMax:getZ() > EMC.ZMIN + BD.VICE_MINH then
             dHeadFront = 180
-         elseif vtTool:getX() < 0.05 then
+         elseif vtTool:getX() < 0.06 then
             dHeadFront = 50 + 0.5 * dTDiam * sqrt( 1 - vtTool:getX() * vtTool:getX())
          elseif vtTool:getX() < 0.3 then
             dHeadFront = 250
@@ -1008,7 +1008,7 @@ function SpecCalcEncumbrance( vtTool, vtArm, ptMin, ptMax, bSaw, bChain, dTLen,
          elseif vtTool:getX() < 0.8667 then
             dHeadFront = 450
          else
-            dHeadFront = 650
+            dHeadFront = 660
          end
       else
          dHeadFront = 50 + 0.5 * dTDiam * sqrt( 1 - vtTool:getX() * vtTool:getX())

Essetre-FASTrl.mlde

@@ -24,11 +24,19 @@
 -- 2024/03/28 ver 2.6d2 Allineamento con common ver. 2.6d2
 -- 2024/04/30 ver 2.6e1 Allineamento con common ver. 2.6e1
 --                      Aggiunta variabile WoodDensity per gestione WOOD_DENSITY
+-- 2024/05/06 ver 2.6e2 Allineamento con common ver. 2.6e2
+-- 2024/05/06 ver 2.6e3 Allineamento con common ver. 2.6e3
+--                      Aggiunte variabili MinJoin(xx) per gestione MIN_JOIN_(xx) 
+-- 2024/06/03 ver 2.6f1 Aggiunta funzione GetSetupInfo a BeamData per nuovo automatismo
+-- 2024/07/03 ver 2.6g1 Allineamento con common ver. 2.6g1
+-- 2024/09/02 ver 2.6i1 Allineamento con common ver. 2.6i1, Rimossi file "Common-"
+-- 2024/09/02 ver 2.6i2 Corretto file YML per compilare file "Common_"
+-- 2024/09/16 ver 2.6i3 Allineamento con common ver. 2.6i2
 
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6e1'
+PP_VER = '2.6i3'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-FASTrl'
 
@@ -144,6 +152,11 @@ if EgtExistsFile( sData) then
          if Machine.Offsets.NOULOAD then MaxUnloadLen = Machine.Offsets.NOULOAD end
          if Machine.Offsets.DEFTCPOS then DefTcPos = ( 'T' .. Machine.Offsets.DEFTCPOS) end
          if Machine.Offsets.WOOD_DENSITY then WoodDensity = Machine.Offsets.WOOD_DENSITY end
+         if Machine.Offsets.MIN_JOIN_VV then MinJoinVV = Machine.Offsets.MIN_JOIN_VV end
+         if Machine.Offsets.MIN_JOIN_SS then MinJoinSS = Machine.Offsets.MIN_JOIN_SS end
+         if Machine.Offsets.MIN_JOIN_LS then MinJoinLS = Machine.Offsets.MIN_JOIN_LS end
+         if Machine.Offsets.MIN_JOIN_SL then MinJoinSL = Machine.Offsets.MIN_JOIN_SL end
+         if Machine.Offsets.MIN_JOIN_LL then MinJoinLL = Machine.Offsets.MIN_JOIN_LL end
       end
    end
 end
@@ -157,8 +170,8 @@ EmtGeneral {
       ExitMaxAdjust = 30,
       ExitMaxRotAdj = 0.5,
       AngDeltaMinForHome = 165,
-      Special = 'Common-FAST.mlse',
-      Processor = 'Common-FAST.mlpe'}
+      Special = 'Common_FAST.mlse',
+      Processor = 'Common_FAST.mlpe'}
 local BaseId = EmtBase {
       Name = 'Base',
       Geo='BASE/GEO',

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

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

UpdateLog.txt

@@ -1,5 +1,22 @@
            ==== Common_FAST Update Log ====
 
+Versione 2.6i2 (16/09/2024)
+- (SIM-GEN) Se utensili più lunghi di 200mm, si ruota in home e poi si approccia il pezzo.  Ticket#2038
+- (SIM-GEN) Aumentata distanza ingombro da 650mm a 660mm. In casi di utensile abbastanza lungo poteva andare in colisione. Ticket#2041
+
+Versione 2.6i1 (02/09/2024)
+- (MLDE-SIM-GEN) Rinominato file da "Common-" a "Common_" per uniformità con i file common delle altre macchine. Serve modifica a MLDE macchina.
+
+Versione 2.6g1 (03/07/2024)
+- (GEN) Corretto chiamata macro precarico in caso di taglio finale, ma con ribaltamento successivo. Ora si chiama solo se la fase successiva è una "END". Ticket#1881
+- (GEN) Per controllo NUM, se arco maggiore di 99999mm, si approssima con una retta. Ticket#1888
+
+Versione 2.6e3 (06/05/2024)
+- (MLDE-SIM-GEN) Gestione facoltativa parametri MIN_JOIN_xx settabili in Ts3. Ticket#1794
+
+Versione 2.6e2 (06/05/2024)
+- (SIM-GEN) Modificata tolleranza calcolo ingombri lavorazioni per posizionamento pinze. Ticket#1790
+
 Versione 2.6e1 (30/04/2024)
 - (MLDE-GEN) Gestione facoltativa parametro WOOD_DENSITY settabile in Ts3. In MLDE, mettere il valore di WOOD_DENSITY nella nostra variabile 'WoodDensity'.
 

Version.lua

@@ -2,8 +2,8 @@
 -- 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.6e1',                 -- versione script
+   NAME = 'Common_FAST',            -- nome script PP standard
+   VERSION = '2.6i2',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }