Merge branch 'develop' into testPerFabio

versione precedente
- decimali in generazione portati a 3

Beam/BeamData.lua

@@ -177,11 +177,11 @@ end
 BeamData.GetBlockedAxis = GetBlockedAxis
 
 ---------------------------------------------------------------------
-local function GetChainSawInitAngs( vtN, vtO, nInd)
-   if nInd == 1 then
-      return ''
+local function GetChainSawInitAngs( vtN, vtO)
+   if vtN:getY() > 0 and vtO:getX() > 0 then
+      return 'C=0'
    else
-      return EgtIf( vtN:getY() > 0, 'C=180', 'C=-180')
+      return ''
    end
 end
 BeamData.GetChainSawInitAngs = GetChainSawInitAngs

Common_FAST.TPA.mlpe

@@ -21,7 +21,7 @@ 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 = 5         -- numero di decimali dopo la virgola
+   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
@@ -1767,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(), 6) .. ' B' .. EgtNumToString( vtX:getX(), 6) .. ' C' .. EgtNumToString( vtX:getZ(), 6) ..
-                  ' I' .. EgtNumToString( - vtY:getY(), 6) .. ' J' .. EgtNumToString( vtY:getX(), 6) .. ' K' .. EgtNumToString( vtY:getZ(), 6) ..
-                  ' P' .. EgtNumToString( - vtZ:getY(), 6) .. ' Q' .. EgtNumToString( vtZ:getX(), 6) .. ' R' .. EgtNumToString( vtZ:getZ(), 6)
+                  ' 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

@@ -213,20 +213,24 @@ function OnSimulDispositionStart()
                end
             end
             -- determino la risoluzione dello Zmap
-            local dArea = b3Raw:getDimX() * b3Raw:getDimY() + b3Raw:getDimX() * b3Raw:getDimZ() + b3Raw:getDimY() * b3Raw:getDimZ()
             local dTol = 4.71
-            if dArea < CoeffVM * 0.15e6 then
-               dTol = 0.71
-            elseif dArea < CoeffVM * 0.3e6 then
-               dTol = 1.01
-            elseif dArea < CoeffVM * 0.6e6 then
-               dTol = 1.51
-            elseif dArea < CoeffVM * 1.2e6 then
-               dTol = 1.97
-            elseif dArea < CoeffVM * 2.4e6 then
-               dTol = 2.81
-            elseif dArea < CoeffVM * 4.8e6 then
-               dTol = 3.77
+            if EmtGetVMillStep then
+               dTol = EmtGetVMillStep( b3Raw:getDimX(), b3Raw:getDimY(), b3Raw:getDimZ(), 4.71)
+            else
+               local dArea = b3Raw:getDimX() * b3Raw:getDimY() + b3Raw:getDimX() * b3Raw:getDimZ() + b3Raw:getDimY() * b3Raw:getDimZ()
+               if dArea < 0.075e6 then
+                  dTol = 0.71
+               elseif dArea < 0.15e6 then
+                  dTol = 1.01
+               elseif dArea < 0.3e6 then
+                  dTol = 1.51
+               elseif dArea < 0.6e6 then
+                  dTol = 1.97
+               elseif dArea < 1.2e6 then
+                  dTol = 2.81
+               elseif dArea < 2.4e6 then
+                  dTol = 3.77
+               end
             end
             -- creo lo Zmap
             local VMillId = EgtVolZmapBox( nPartRawId, b3Raw:getMin(), b3Raw:getDimX(), b3Raw:getDimY(), b3Raw:getDimZ(), dTol, true, GDB_RT.GLOB)
@@ -462,8 +466,10 @@ function OnSimulToolSelect( dPosA)
    EMT.TOTDIAM = EgtTdbGetCurrToolParam( MCH_TP.TOTDIAM)
    -- se non è chiamato da altro script (non c'è parametro)
    if not dPosA then
-      -- se attivo Vmill
-      SetToolForVmill( EMT.TOOL, EMT.HEAD, EMT.EXIT, EMT.VMILL)
+      -- se utensile non flottante, abilito per Vmill
+      if not EMT.TFLOAT then
+         EmtSetToolForVmill( EMT.TOOL, EMT.HEAD, EMT.EXIT, EMT.VMILL)
+      end
       -- se attivo Collision Check
       EMT.SAFEDIST = COLL_SAFE_DIST
       if EMT.COLLOBJ then
@@ -523,6 +529,14 @@ function OnSimulToolSelect( dPosA)
             EgtSetAxisPos( 'B', 0)
          end
       end
+      -- se TC 1
+      if GetTCSet( EMT.TCPOS) == 1 then
+         EgtSetAxisPos( 'B', 90)
+      else
+         if EMT.HEAD ~= 'H3' then
+            EgtSetAxisPos( 'B', -90)
+         end
+      end
       -- breve pausa
       EgtPause( 100)
       EgtOutText( '')
@@ -572,7 +586,11 @@ function OnSimulToolDeselect()
          -- altrimenti posizioni standard rastrelliera
          else
             SimulMoveAxis( 'X', 0, MCH_SIM_STEP.RAPID)
-            SimulMoveAxes( 'B', 90, MCH_SIM_STEP.COLLROT, 'C', -90, MCH_SIM_STEP.COLLROT)
+            if GetTCSet( EMT.TCPOS) == 1 then
+               SimulMoveAxes( 'B', 90, MCH_SIM_STEP.COLLROT, 'C', -90, MCH_SIM_STEP.COLLROT)
+            else
+               SimulMoveAxes( 'B', -90, MCH_SIM_STEP.COLLROT, 'C', -90, MCH_SIM_STEP.COLLROT)
+            end
          end
       -- movimento scarico utensile di grosso diametro (su T111)
       else
@@ -586,18 +604,25 @@ function OnSimulToolDeselect()
       -- nascondo utensile su testa e lo visualizzo su TcPos
       EgtSetMode( EgtGetHeadId( EMT.HEAD), GDB_MD.HIDDEN)
       ShowToolInTcPos( EMT.TCPOS_1, true)
+
       -- movimento per carico utensile
       if EMT.NEXTHEAD ~= 'H3' and EMT.NEXTHEAD ~= 'H5' and EMT.NEXTHEAD ~= 'H6' then
-         SimulMoveAxes( 'B', 90, MCH_SIM_STEP.RAPROT, 'C', EgtIf( BD.RIGHT_LOAD, 90, -90), MCH_SIM_STEP.RAPROT)
+         SimulMoveAxes( 'B', EgtIf( GetTCSet( EMT.TCPOS) == 1, 90, -90), MCH_SIM_STEP.RAPROT, 'C', EgtIf( BD.RIGHT_LOAD, 90, -90), MCH_SIM_STEP.RAPROT)
       else
          SimulMoveAxes( 'B', 0, MCH_SIM_STEP.RAPROT, 'C', EgtIf( BD.RIGHT_LOAD, 90, -90), MCH_SIM_STEP.RAPROT)
       end
       -- se segue lama, carico utensile di default
       if EMT.NEXTHEAD == 'H2' then
          local sDefTool = GetDefaultToolName()
-         EgtLoadTool( 'H1', 1, sDefTool)
          EMT.TOOL_1 = sDefTool
          EMT.TCPOS_1 = GetToolTcPos( EMT.TOOL_1)
+         -- se TC 1
+         if GetTCSet( EMT.TCPOS_1) == 1 then
+            EgtSetAxisPos( 'B', 90)
+         else
+            EgtSetAxisPos( 'B', -90)
+         end
+         EgtLoadTool( 'H1', 1, sDefTool)
          -- lo nascondo sul portautensili
          ShowToolInTcPos( EMT.TCPOS_1, false)
       end
@@ -764,7 +789,6 @@ function OnSimulMoveStart()
       EgtOutText( '')
       EMT.MCHFIRST = false
       local bZmax = ( EMT.TOOL ~= EMT.PREVTOOL  or EMT.L3 > -1)
-
       -- 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
@@ -774,20 +798,59 @@ function OnSimulMoveStart()
       end
       EMT.POSTROT = nil
    end
+   -- se aggregato flottante su inizio attacco va compresso
+   if EMT.TFLOAT and not EMT.TFLOAT_CMP and EMT.MOVE == 1 and EgtGetName( EMT.MOVEID) == 'LI' then
+      -- recupero lunghezza 
+      local dOffsL = - EgtGetMachiningParam( MCH_MP.OFFSL)
+      -- imposto compressione della parte flottante
+      SetFloatPos( EMT.HEAD, dOffsL)
+      -- imposto dati utensile in posizione compressa
+      EmtSetToolForVmill( EMT.TOOL, EMT.HEAD, EMT.EXIT, EMT.VMILL, 2, -dOffsL)
+      -- dichiaro che è compresso (assegnando Id entità di movimento)
+      EMT.TFLOAT_CMP = EMT.MOVEID
+   end
 end
 
 ---------------------------------------------------------------------
 function OnSimulMoveEnd()
+   -- se termine di passata con lama
    if EMT.FLAG == 301 then 
       -- rimozione eventuali sfridi
       ExecRemoveScraps()
    end
+   -- se utensile flottante e movimento di compressione
+   if EMT.TFLOAT and EMT.MOVEID == EMT.TFLOAT_CMP then
+      -- verifico ci sia stata collisione tra ghiera flottante (portautensile e pezzo)
+      if not EMT.TFLOAT_TH_COMPR_COLL then
+         local sErr = 'CUTID='..tostring( EMT.CUTID)..'; TASKID='..tostring( EMT.TASKID)..'; Mach='..EMT.MCHNAME..'; Floating Ring not compressed on approach'
+         EmtSetLastError( 1222, sErr)
+         EgtOutLog( 'Error : ' .. sErr, 1)
+      else
+         EgtOutLog( 'Floating Ring compressed on approach (MOVEID='..EgtNumToString( EMT.MOVEID)..')', 1)
+      end
+      EMT.TFLOAT_TH_COMPR_COLL = nil
+   end
+   -- se aggregato flottante su fine uscita va rilasciato
+   if EMT.TFLOAT and EMT.TFLOAT_CMP and EMT.MOVE == 1 and EgtGetName( EMT.MOVEID) == 'LO' and EgtGetName( EgtGetNext( EMT.MOVEID) or GDB_ID.NULL) ~= 'LO' then
+      -- reset compressione della parte flottante
+      SetFloatPos( EMT.HEAD, 0)
+      -- dichiaro che è rilasciato
+      EMT.TFLOAT_CMP = nil
+   end
 end
 
 ---------------------------------------------------------------------
 function OnSimulCollision()
    -- se prima collisione della lavorazione, la segnalo
    if EMT.MCHNAME ~= EMT.LAST_MCHNAME_COLLIDE then
+      -- speciale per utensile flottante (suo holder contro il grezzo)
+      if EMT.TFLOAT and EMT.TFLOAT_CMP and EMT.SIMCOBIND == 1002 and EMT.SIMVMID == EMT.VMILL[1] then
+         if EMT.MOVEID == EMT.TFLOAT_CMP then
+            EMT.TFLOAT_TH_COMPR_COLL = true
+         end
+         return
+      end
+      -- standard
       local Class = ''
       if EMT.SIMCOBIND == 1001 then
          Class = 'T_H1'

Common_FAST.mlse

@@ -7,6 +7,12 @@ EgtEnableDebug( false)
 -- carico librerie
 local BD = require( 'BeamData')
 
+---------------------------------------------------------------------
+-- *** Generic Machinings ***
+---------------------------------------------------------------------
+pcall( require, 'EmtGenMachining')  -- si fa una require con PCALL perchè la libreria è opzionale
+
+
 ---------------------- OnSpecialMoveZup -----------------------------
 ---------------------------------------------------------------------
 function OnSpecialMoveZup()
@@ -33,9 +39,9 @@ local DeltaTol = DELTA_TOL_S
 local DELTA_SIC = 1
 local AGG_LOAD = 50
 local MIN_JOIN_VV = EgtClamp( MinJoinVV or 75, 60, 150)
-local MIN_JOIN_SS = EgtClamp( MinJoinSS or 100, 80, 200)
+local MIN_JOIN_SS = EgtClamp( MinJoinSS or 100, 80, 275)
 local MIN_JOIN_LS = EgtClamp( MinJoinLS or 290, 250, 400)
-local MIN_JOIN_SL = EgtClamp( MinJoinSL or 100, 80, 200)
+local MIN_JOIN_SL = EgtClamp( MinJoinSL or 100, 80, 400)
 local MIN_JOIN_LL = EgtClamp( MinJoinLL or 400, 300, 600)
 local MinJoin = MIN_JOIN_SS
 local MinOther = abs( MinY) + abs( MaxV) + MinJoin
@@ -367,7 +373,18 @@ function OnSpecialApplyDisposition()
    EMC.HOVM = EgtGetInfo( nCurrRawId, 'HOVM', 'd') or 0
    EMC.HCING = EgtGetInfo( nCurrRawId, 'HCING', 'd') or 0
    EMC.TCING = EgtGetInfo( nCurrRawId, 'TCING', 'd') or 0
-   
+
+   -- correggo area non pinzabile in testa o coda in base alle info sulla lavorazione
+   local sNotes = EgtGetMachiningParam( MCH_MP.USERNOTES) or ''
+   local dHCING = tonumber( EgtGetValInNotes( sNotes, 'HCING'))
+   if dHCING then
+      EMC.HCING = max( dHCING, -50)
+   end
+   local dTCING = tonumber( EgtGetValInNotes( sNotes, 'TCING'))
+   if dTCING then
+      EMC.TCING = max( dTCING, -50)
+   end
+
    -- Devo scaricare il pezzo o il grezzo rimasto
    -- Posizione trave
    local dPosT
@@ -511,6 +528,17 @@ function OnPostApplyMachining()
    local bSplitting = ( sNotes:find( 'Split') ~= nil)
    local bPreCut = ( sNotes:find( 'Precut') ~= nil)
    local bCutting = ( sNotes:find( 'Cut') ~= nil)
+
+   -- correggo area non pinzabile in testa o coda in base alle info sulla lavorazione
+   local dHCING = tonumber( EgtGetValInNotes( sNotes, 'HCING'))
+   if dHCING then
+      EMC.HCING = max( dHCING, -50)
+   end
+   local dTCING = tonumber( EgtGetValInNotes( sNotes, 'TCING'))
+   if dTCING then
+      EMC.TCING = max( dTCING, -50)
+   end
+
    local bUnload = IsEndPhase( EMC.PHASE) or IsEnd2Phase( EMC.PHASE)
    if bPreSplit or bPreCut then
       EgtSetInfo( EMC.MCHID, 'IS_PRE', '1')
@@ -634,6 +662,17 @@ function SpecApplyPath( bPreSplit, bSplitting, bPreCut, bCutting, bUnload, bPreR
    EMC.HOVM = EgtGetInfo( nCurrRawId, 'HOVM', 'd') or 0
    EMC.HCING = EgtGetInfo( nCurrRawId, 'HCING', 'd') or 0
    EMC.TCING = EgtGetInfo( nCurrRawId, 'TCING', 'd') or 0
+   
+   -- correggo area non pinzabile in testa o coda in base alle info sulla lavorazione
+   local sNotes = EgtGetMachiningParam( MCH_MP.USERNOTES)
+   local dHCING = tonumber( EgtGetValInNotes( sNotes, 'HCING'))
+   if dHCING then
+      EMC.HCING = max( dHCING, -50)
+   end
+   local dTCING = tonumber( EgtGetValInNotes( sNotes, 'TCING'))
+   if dTCING then
+      EMC.TCING = max( dTCING, -50)
+   end
 
    -- Calcolo dell'ingombro della lavorazione
    local dDistFront, dDistBack = SpecialCalcMachiningEncumbrance( EMC.MCHID, bPreCut)
@@ -1682,7 +1721,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
             if abs( dYDeltaF - dYDeltaI) > 10 * GEO.EPS_SMALL then
                table.insert( vCmd, { 11, 0})
                dYPosA = max( MyMinY, dTPosI + dYDeltaF)
-               dTPosA = -( dYPosA + dVDeltaF)
+               dTPosA = dYPosA - dYDeltaF
                dVPosA = dTPosA + dVDeltaF
                table.insert( vCmd, { 3, 'Y', dYPosA , 'T', dTPosA, 'V', dVPosA})
                table.insert( vCmd, { 11, CalcCharStatus( 'Y', dYDeltaF)})

Essetre-FASTrl.mlde

@@ -10,8 +10,8 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6l2_DEV3'
-PP_NVER = '2.6.12.2'
+PP_VER = '2.7b1_TEST'
+PP_NVER = '2.7.2.1'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-FASTrl'
 
@@ -73,10 +73,12 @@ SecondSupport = 0
 SpecialBH = false
 MaxUnloadLen = 0
 BeamHeightForFixRot = 9999                     -- per abilitare assegnare 500
-CoeffVM = 0.5
 NewTopC = true
 SafeXRotAxes = -150
 AggreBlockHaus = false
+EstimationRapidMultiplier = 1
+SecondToolChanger = false
+
 
 -- leggo e aggiorno con parametri da BeamData
 if BD then
@@ -139,11 +141,17 @@ if EgtExistsFile( sData) then
          if Machine.Offsets.MIN_JOIN_LL then MinJoinLL = Machine.Offsets.MIN_JOIN_LL end
          if Machine.Offsets.NEWTOPC then NewTopC = ( Machine.Offsets.NEWTOPC == 1) end
          if Machine.Offsets.AGGRE_BH then AggreBlockHaus = ( Machine.Offsets.AGGRE_BH == 1) end
+         if Machine.Offsets.COEFF_STIMATEMPI and Machine.Offsets.COEFF_STIMATEMPI > 0 then EstimationRapidMultiplier = Machine.Offsets.COEFF_STIMATEMPI end
+         if Machine.Offsets.SEC_TC then SecondToolChanger = ( Machine.Offsets.SEC_TC == 1) end
       end
    end
 end
 if SpecialBH then SecondSupport = 0 end
 
+-- compongo i gruppi appartenenti alla base
+local sBaseAux = {'BASE/SOLID', 'BASE/TC', 'BASE/SIGN', 'BASE/COLLISION'}
+if SecondToolChanger then table.insert( sBaseAux, 5, 'BASE/TC2') end
+
 EmtGeneral {
       File='Essetre-FASTrl.nge',
       Offset = Vector3d( 0, -1150.16, -1500.0),
@@ -157,7 +165,7 @@ EmtGeneral {
 local BaseId = EmtBase {
       Name = 'Base',
       Geo='BASE/GEO',
-      Aux={'BASE/SOLID', 'BASE/TC', 'BASE/SIGN', 'BASE/COLLISION'}}
+      Aux = sBaseAux}
 local XId = EmtAxis {
       Name = 'X',
       Parent = 'Base',
@@ -308,8 +316,8 @@ if AggreBlockHaus then
          Parent = 'B',
          HSet = 'H1',
          Type = MCH_HT.STD,
-         Pos = Point3d( -AngTrBHLen, 0, -AngTrBHOffs),
-         TDir = X_AX(),
+         Pos = Point3d( AngTrBHLen, 0, -AngTrBHOffs),
+         TDir = -X_AX(),
          ADir = Z_AX(),
          Rot1W = 0.2,
          SolCh = MCH_SCC.ADIR_NEAR,
@@ -447,22 +455,84 @@ EmtTcPos {
       TDir = X_AX(),
       ADir = Y_AX(),
       Geo = 'BASE/T10'}
-EmtTcPos {
-      Name = 'T11',
-      Parent = 'Base',
-      Pos = Point3d( -523.8, -88.0, -877.5),
-      TDir = X_AX(),
-      ADir = Y_AX(),
-      Geo = 'BASE/T11'}
-if not SpecialBH then
+
+if AggreBlockHaus then
    EmtTcPos {
-         Name = 'T101',
+         Name = 'T11',
          Parent = 'Base',
-         Pos = Point3d( 510.4, -113.2, -160.8),
-         TDir = -X_AX(),
-         ADir = Z_AX(),
-         Geo = 'BASE/T101'}
+         Pos = Point3d( -678.3, 1.963, -877.5),
+         TDir = -Y_AX(),
+         ADir = X_AX(),
+         Geo = 'BASE/T121',
+         Aux = 'BASE/T121_HS'}
 else
+   EmtTcPos {
+         Name = 'T11',
+         Parent = 'Base',
+         Pos = Point3d( -523.8, -88.0, -877.5),
+         TDir = X_AX(),
+         ADir = Y_AX(),
+         Geo = 'BASE/T11'}
+end
+
+-- ToolChanger 2
+if SecondToolChanger then
+   EmtTcPos {
+         Name = 'T21',
+         Parent = 'Base',
+         Pos = Point3d( 503.2, -88.0, 172.5),
+         TDir = -X_AX(),
+         ADir = -Y_AX(),
+         Geo = 'BASE/T21'}
+   EmtTcPos {
+         Name = 'T22',
+         Parent = 'Base',
+         Pos = Point3d( 503.2, -88.0, 67.5),
+         TDir = -X_AX(),
+         ADir = -Y_AX(),
+         Geo = 'BASE/T22'}
+   EmtTcPos {
+         Name = 'T23',
+         Parent = 'Base',
+         Pos = Point3d( 503.2, -88.0, -37.5),
+         TDir = -X_AX(),
+         ADir = -Y_AX(),
+         Geo = 'BASE/T23'}
+   EmtTcPos {
+         Name = 'T24',
+         Parent = 'Base',
+         Pos = Point3d( 503.2, -88.0, -142.5),
+         TDir = -X_AX(),
+         ADir = -Y_AX(),
+         Geo = 'BASE/T24'}
+   EmtTcPos {
+         Name = 'T25',
+         Parent = 'Base',
+         Pos = Point3d( 503.2, -88.0, -247.5),
+         TDir = -X_AX(),
+         ADir = -Y_AX(),
+         Geo = 'BASE/T25'}
+   EmtTcPos {
+         Name = 'T26',
+         Parent = 'Base',
+         Pos = Point3d( 503.2, -88.0, -352.5),
+         TDir = -X_AX(),
+         ADir = -Y_AX(),
+         Geo = 'BASE/T26'}
+   EmtTcPos {
+         Name = 'T27',
+         Parent = 'Base',
+         Pos = Point3d( 503.2, -88.0, -457.5),
+         TDir = -X_AX(),
+         ADir = -Y_AX(),
+         Geo = 'BASE/T27'}
+   EmtTcPos {
+         Name = 'T28',
+         Parent = 'Base',
+         Pos = Point3d( 503.2, -88.0, -562.5),
+         TDir = -X_AX(),
+         ADir = -Y_AX(),
+         Geo = 'BASE/T28'}
    EmtTcPos {
          Name = 'T101',
          Parent = 'Base',
@@ -470,59 +540,66 @@ else
          TDir = -X_AX(),
          ADir = Z_AX(),
          Geo = 'BASE/T101S'}
-end
-if SecondSupport == 1 then
-   -- supporto per punta
-   EmtTcPos {
-         Name = 'T111',
-         Parent = 'Base',
-         Pos = Point3d( 510.4, -113.2, -329.8),
-         TDir = Z_AX(),
-         ADir = -X_AX(),
-         Geo = 'BASE/T111'}
-elseif SecondSupport == 2 then
-   -- supporto per mortasatrice
-   local TcpSsId = EmtTcPos {
-                        Name = 'T111',
-                        Parent = 'Base',
-                        Pos = Point3d( 510.4, -113.2, -430.8),
-                        TDir = X_AX(),
-                        ADir = Z_AX(),
-                        Geo = 'BASE/T111M'}
-   EgtSetInfo( TcpSsId, 'Mortiser', true)
-elseif SecondSupport == 3 then
-   -- supporto per rinvio angolare
-   local TcpSsId = EmtTcPos {
-                        Name = 'T91',
-                        Parent = 'Base',
-                        ExitNbr = 2,
-                        Pos1 = Point3d( 710.4+150, -113.2, -329.8-170),
-                        TDir1 = -X_AX(),
-                        Pos2 = Point3d( 710.4-150, -113.2, -329.8-170),
-                        TDir2 = X_AX(),
-                        ADir = Z_AX(),
-                        Geo = 'BASE/T91',
-                        Aux = 'BASE/T91_HS'}
-end
-if SpecialBH then
-   EmtTcPos {
-         Name = 'T111',
-         Parent = 'Base',
-         Pos = Point3d( 810.4, -113.2, -329.8),
-         TDir = -Y_AX(),
-         ADir = -X_AX(),
-         Geo = 'BASE/T111S'}
-end
-
-if AggreBlockHaus then
-   EmtTcPos {
-      Name = 'T121',
-      Parent = 'Base',
-      Pos = Point3d( -678.3, 1.963, -877.5),
-      TDir = -Y_AX(),
-      ADir = X_AX(),
-      Geo = 'BASE/T121',
-      Aux = 'BASE/T121_HS'}
+else
+   if not SpecialBH then
+      EmtTcPos {
+            Name = 'T101',
+            Parent = 'Base',
+            Pos = Point3d( 510.4, -113.2, -160.8),
+            TDir = -X_AX(),
+            ADir = Z_AX(),
+            Geo = 'BASE/T101'}
+   else
+      EmtTcPos {
+            Name = 'T101',
+            Parent = 'Base',
+            Pos = Point3d( 510.4, -113.2, -1160.8),
+            TDir = -X_AX(),
+            ADir = Z_AX(),
+            Geo = 'BASE/T101S'}
+   end
+   if SecondSupport == 1 then
+      -- supporto per punta
+      EmtTcPos {
+            Name = 'T111',
+            Parent = 'Base',
+            Pos = Point3d( 510.4, -113.2, -329.8),
+            TDir = Z_AX(),
+            ADir = -X_AX(),
+            Geo = 'BASE/T111'}
+   elseif SecondSupport == 2 then
+      -- supporto per mortasatrice
+      local TcpSsId = EmtTcPos {
+                           Name = 'T111',
+                           Parent = 'Base',
+                           Pos = Point3d( 510.4, -113.2, -430.8),
+                           TDir = X_AX(),
+                           ADir = Z_AX(),
+                           Geo = 'BASE/T111M'}
+      EgtSetInfo( TcpSsId, 'Mortiser', true)
+   elseif SecondSupport == 3 then
+      -- supporto per rinvio angolare
+      local TcpSsId = EmtTcPos {
+                           Name = 'T91',
+                           Parent = 'Base',
+                           ExitNbr = 2,
+                           Pos1 = Point3d( 710.4+150, -113.2, -329.8-170),
+                           TDir1 = -X_AX(),
+                           Pos2 = Point3d( 710.4-150, -113.2, -329.8-170),
+                           TDir2 = X_AX(),
+                           ADir = Z_AX(),
+                           Geo = 'BASE/T91',
+                           Aux = 'BASE/T91_HS'}
+   end
+   if SpecialBH then
+      EmtTcPos {
+            Name = 'T111',
+            Parent = 'Base',
+            Pos = Point3d( 810.4, -113.2, -329.8),
+            TDir = -Y_AX(),
+            ADir = -X_AX(),
+            Geo = 'BASE/T111S'}
+   end
 end
 
 -- Aggiusto posizioni geometriche
@@ -613,6 +690,52 @@ function GetPVLight()
    return ( EgtGetInfo( PVLightId, 'On') == '1')
 end
 
+---------------------------------------------------------------------
+---------------------------- Cambio Utensile ------------------------
+function GetTCSet( sTcPos)
+   -- TC 1
+   if sTcPos == 'T1' or sTcPos == 'T2' or sTcPos == 'T3' or sTcPos == 'T4' or sTcPos == 'T5' or
+      sTcPos == 'T6' or sTcPos == 'T7' or sTcPos == 'T8' or sTcPos == 'T9' or sTcPos == 'T10' or sTcPos == 'T11' then
+      return 1
+   -- TC 2
+   elseif sTcPos == 'T21' or sTcPos == 'T22' or sTcPos == 'T23' or sTcPos == 'T24' or
+          sTcPos == 'T25' or sTcPos == 'T26' or sTcPos == 'T27' or sTcPos == 'T28' then
+      return 2
+   end
+end
+
+---------------------------------------------------------------------
+-- Funzione per impostare la posizione del rinvio flottante
+function SetFloatPos( sHead, dPos)
+   -- recupero Id testa
+   local nHeadId = EgtGetHeadId( sHead)
+   if not nHeadId then return false end
+   -- se ci sono entit� flottanti nel ToolHolder
+   local nRefId = EgtGetFirstNameInGroup( nHeadId, '_T1')
+   local vtTool = EgtFR( nRefId, GDB_ID.ROOT):getVersZ() 
+   local nObjId =  EgtGetFirstGroupInGroup( EgtGetFirstNameInGroup( nHeadId, 'T1'))
+   local FloatEntities = EgtGetInfoInGroup( nObjId, 'Float')
+   if FloatEntities and #FloatEntities > 0 then
+      -- il porta-utensile flottante non pu� comprimersi pi� di 10mm
+      if dPos > 10 then
+         local sErr = 'Floating Ring compressed more than 10mm'
+         EmtSetLastError( 1222, sErr)
+         EgtOutLog( 'Error : ' .. sErr, 1)
+      end
+      local dFloat = EgtGetInfo( FloatEntities[1], 'Float', 'd')
+      if abs( dPos - dFloat) > 10 * GEO.EPS_SMALL then
+         local vtMove = ( dPos - dFloat) * vtTool
+         -- sposto tutte le entit� flottanti
+         for i = 1, #FloatEntities do
+            EgtMove( FloatEntities[i], vtMove, GDB_RT.GLOB)
+            EgtSetInfo( FloatEntities[i], 'Float', dPos)
+         end
+      end
+      return true
+   end
+   return false
+end
+
 ---------------------------------------------------------------------
 -- Funzione per resettare tutte le attivazioni della macchina
 function OnResetMachine()
@@ -620,6 +743,7 @@ function OnResetMachine()
    EmtUnlinkAllFixturesFromGroups()
    SetPYLight( false)
    SetPVLight( false)
+   SetFloatPos( 'H1', 0)
    -- nascondo Vmill
    local nRawId = EgtGetFirstRawPart()
    while nRawId do

Scripts/SetUp.lua

@@ -1,4 +1,4 @@
--- Gestione attrezzaggio per Essetre-FAST - 2020/04/26
+-- Gestione attrezzaggio per Essetre-FAST - 2022/06/16
 
 -- Intestazioni
 require( 'EgtBase')
@@ -24,9 +24,7 @@ local INVALIDPOS = ""
 local POS = "Pos"
 
 -- Geom Set
-local GS = {}
-
-local bAggreBlockHaus = ( EgtGetHeadId( 'H7') ~= nil)
+local GS = {{"H1", "H7"}}
 
 -- Configurazione posizioni
 local PositionTable={{Pos = "Pos1",  TcPos = "T1",  Head = "H1", Group = "G1"},
@@ -39,23 +37,37 @@ local PositionTable={{Pos = "Pos1",  TcPos = "T1",  Head = "H1", Group = "G1"},
                      {Pos = "Pos8",  TcPos = "T8",  Head = "H1", Group = "G1"},
                      {Pos = "Pos9",  TcPos = "T9",  Head = "H1", Group = "G1"},
                      {Pos = "Pos10", TcPos = "T10", Head = "H1", Group = "G1"},
-                     {Pos = "Pos11", TcPos = "T11", Head = EgtIf( bAggreBlockHaus, "H7", "H1"), Group = "G1"},
+                     {Pos = "Pos11", TcPos = "T11", Head = "H1", Group = "G1"},
                      {Pos = "Pos12", TcPos = "T42", Head = "H2", Group = "G1"},
                      {Pos = "Pos13", TcPos = "T101", Head = "H3", Group = "G2"}}
-local SecSuppId = EgtGetTcPosId( 'T111')
-if SecSuppId then
-   local bMortiser = EgtGetInfo( SecSuppId, 'Mortiser', 'b')
-   if bMortiser then
-      table.insert( PositionTable, {Pos = "Pos14", TcPos = "T111", Head = "H3", Group = "G2"})
-   else
-      table.insert( PositionTable, {Pos = "Pos14", TcPos = "T111", Head = "H1", Group = "G2"})
+
+local IsTC2Active = ( EgtGetFirstNameInGroup( EgtGetBaseId( 'Base'), 'TC2') ~= nil)
+if IsTC2Active then
+   local PositionTableTC2={{Pos = "Pos14",  TcPos = "T21",  Head = "H1", Group = "G3"},
+                           {Pos = "Pos15",  TcPos = "T22",  Head = "H1", Group = "G3"},
+                           {Pos = "Pos16",  TcPos = "T23",  Head = "H1", Group = "G3"},
+                           {Pos = "Pos17",  TcPos = "T24",  Head = "H1", Group = "G3"},
+                           {Pos = "Pos18",  TcPos = "T25",  Head = "H1", Group = "G3"},
+                           {Pos = "Pos19",  TcPos = "T26",  Head = "H1", Group = "G3"},
+                           {Pos = "Pos20",  TcPos = "T27",  Head = "H1", Group = "G3"},
+                           {Pos = "Pos21",  TcPos = "T28",  Head = "H1", Group = "G3"}}
+   EgtJoinTables( PositionTable, PositionTableTC2)
+else
+   local SecSuppId = EgtGetTcPosId( 'T111')
+   if SecSuppId then
+      local bMortiser = EgtGetInfo( SecSuppId, 'Mortiser', 'b')
+      if bMortiser then
+         table.insert( PositionTable, {Pos = "Pos14", TcPos = "T111", Head = "H3", Group = "G2"})
+      else
+         table.insert( PositionTable, {Pos = "Pos14", TcPos = "T111", Head = "H1", Group = "G2"})
+      end
+   end
+   if EgtGetHeadId( 'H5') then
+      table.insert( PositionTable, {Pos = "Pos14", TcPos = "T91", Head = "H5", Group = "G2"})
    end
 end
-if EgtGetHeadId( 'H5') then
-   table.insert( PositionTable, {Pos = "Pos14", TcPos = "T91", Head = "H5", Group = "G2"})
-end
 
-local UsePositionHead = true
+local UsePositionHead = false
 
 local function IsInGeomSet( ToolHead, PosHead)
    for GsIndex = 1, #GS do

UpdateLog.txt

@@ -1,7 +1,11 @@
            ==== Common_FAST Update Log ====
 
-Versione 2.6-- (--/--/2024)
+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
+- (SIM-GEN) Aumentati limiti massimi di pinzaggio minimo
 
 Versione 2.6l1 (02/12/2024)
 - (SIM) Corretto movimento VMILL durante scarico pezzo piccolo a caduta

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.6--',                 -- versione script
+   VERSION = '2.7--',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }