Aggiunto caricamento Aggregato a T in caso di presenza secondo magazzino verticale.

Merge branch 'NewTopColl'
Allineamento a common ver. 2.7k1
2025-11-12 10:58:13 +01:00 · 2025-11-12 09:47:10 +01:00 · 2025-11-10 16:19:30 +01:00 · 2025-10-14 11:52:51 +02:00 · 2025-10-08 16:13:35 +02:00 · 2025-10-06 16:00:02 +02:00
10 changed files with 93 additions and 63 deletions
@@ -1,6 +1,7 @@
 /Tools
 /Machinings
 /SetUp
+/Beam/AISetup
 /Beam/Ts3Data.bak
 /Beam/CutData.lua
 /Beam/DrillData.lua
@@ -29,6 +29,7 @@
 18=SmallToolContour
 19=AntiSplintMillCut
 20=Prof_end
+21=SideMillAsBlade

 [Pocketing]
 1=Pocket
@@ -635,15 +635,24 @@ function OnRapid()
         bGoToHome = true
      end

+      -- ricavo i dati per la lavorazione
+      local sEE = ' EE' .. EgtIf( bZmax, '3', '4')
+      local sEL = ' EL' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TLEN, ( EMT.TDIST or ChSawLen)), 3)
+      local sER = ' ER' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TDIAM / 2, EMT.TLEN), 3)
+      local sES = ' ES'..EgtNumToString( EMT.S, 0)
+
      -- primo posizionamento
      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 not EMT.LOAD and EMT.PREVHEAD == 'H3' and (EMT.ST > BeamHeightForFixRot or bGoToHome) and EMT.FLAG2 == 1 then
+      if not EMT.LOAD and EMT.PREVHEAD == 'H3' 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
         EmtOutput( sOutPreMove)
+         sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) ..
+                                       ' B' .. EgtNumToString( 0, 3) .. ' C' .. EgtNumToString( EMT.R1pp, 3) .. sEE .. sEL .. sER .. sET .. sES
+         EmtOutput( sOutPreMove)
         EmtOutput( 'G101 ET1001')
         EmtOutput( 'G101 ET2001')
      end
@@ -653,12 +662,6 @@ function OnRapid()
         EmtOutput( '( *** ' .. sOut .. ' *** )')
      end

-      -- ricavo i dati per la lavorazione
-      local sEE = ' EE' .. EgtIf( bZmax, '3', '4')
-      local sEL = ' EL' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TLEN, ( EMT.TDIST or ChSawLen)), 3)
-      local sER = ' ER' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TDIAM / 2, EMT.TLEN), 3)
-      local sES = ' ES'..EgtNumToString( EMT.S, 0)
-
      -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione
      if not EMT.LOAD and ( EMT.HEAD == 'H3' or ( bZmax and EMT.TTOTLEN > 200)) and
         ( EMT.ST > BeamHeightForFixRot or ( EMT.HEAD == 'H1' and EMT.TTOTLEN > 350) or bGoToHome) and EMT.FLAG2 == 1 then
@@ -684,24 +684,6 @@ function OnRapid()
         bGoToHome = true
      end

-      -- primo posizionamento
-      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 not EMT.LOAD and EMT.PREVHEAD == 'H3' and ( EMT.ST > BeamHeightForFixRot or bGoToHome) 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
-         EmtOutput( sOutPreMove)
-         EmtOutput( 'G101 ET1001')
-         EmtOutput( 'G101 ET2001')
-      end
-
-      if not EMT.LOAD then
-         local sOut = string.gsub( string.gsub( EMT.MCHNAME..'/'..EMT.TOOL, '%(', '-'), '%)', '-')
-         EmtOutput( '( *** ' .. sOut .. ' *** )')
-      end
-
      -- ricavo i dati per la lavorazione
      local sEE = ' EE' .. EgtIf( bZmax, '3', '4')
      
@@ -731,6 +713,27 @@ function OnRapid()

      local sES = ' ES'..EgtNumToString( EMT.S, 0)

+      -- primo posizionamento
+      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 not EMT.LOAD and EMT.PREVHEAD == 'H3' 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
+         EmtOutput( sOutPreMove)
+         sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) ..
+                                       ' B' .. EgtNumToString( 0, 3) .. ' C' .. EgtNumToString( EMT.R1, 3) .. sEE .. sEL .. sER .. sET .. sES
+         EmtOutput( sOutPreMove)
+         EmtOutput( 'G101 ET1001')
+         EmtOutput( 'G101 ET2001')
+      end
+
+      if not EMT.LOAD then
+         local sOut = string.gsub( string.gsub( EMT.MCHNAME..'/'..EMT.TOOL, '%(', '-'), '%)', '-')
+         EmtOutput( '( *** ' .. sOut .. ' *** )')
+      end
+
      -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione
      if not EMT.LOAD and ( EMT.HEAD == 'H3' or ( bZmax and EMT.TTOTLEN > 200)) and 
         ( EMT.ST > BeamHeightForFixRot or ( EMT.HEAD == 'H1' and EMT.TTOTLEN > 350) or bGoToHome) and EMT.FLAG2 == 1 then
@@ -669,12 +669,17 @@ 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 not EMT.LOAD and EMT.PREVHEAD == 'H3' and ( EMT.ST > BeamHeightForFixRot or bGoToHome) and EMT.FLAG2 == 1 then
+      if not EMT.LOAD and EMT.PREVHEAD == 'H3' 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) ..
                                 ' P8=0' .. ' P9=0' .. ' P10=' .. EgtIf( bZmax, '3', '4')
         EmtOutput( sOutPreMove)
+         sOutPreMove = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( MyZHome, EMT.DECMACRO) ..
+                                 ' P4=' .. EgtNumToString( 0, EMT.DECMACRO) .. ' P5=' .. EgtNumToString( EMT.R1pp, EMT.DECMACRO) .. 
+                                 ' P6=' .. AdjustTcPos( false) .. ' P7=' .. EgtNumToString( EMT.S, 0) ..
+                                 ' P8=0' .. ' P9=0' .. ' P10=' .. EgtIf( bZmax, '3', '4')
+         EmtOutput( sOutPreMove)
         EmtOutput( 'M101 P1=2')
         EmtOutput( 'M101 P1=3')
      end
@@ -556,9 +556,9 @@ function OnSimulToolDeselect()
      -- movimento scarico sega a catena
      if EMT.HEAD == 'H3' then
         -- se avevo motosega, torno in zona sicura senza ruotare assi rotanti
-         if  EMT.HT > BeamHeightForFixRot then
-            SimulMoveAxis( 'X', SafeXRotAxes, MCH_SIM_STEP.RAPID)
-         end
+         SimulMoveAxis( 'X', SafeXRotAxes, MCH_SIM_STEP.RAPID)
+         -- raddrizzo asse B prima di ruotare il C
+         SimulMoveAxis( 'B', 0, MCH_SIM_STEP.COLLROT)
         local dPosA = EgtGetAxisPos( 'A')
         if abs( dPosA) < 0.1 then
            SimulMoveAxes( 'B', 0, MCH_SIM_STEP.COLLROT, 'C', EgtIf( BD.RIGHT_LOAD, -180, 0), MCH_SIM_STEP.COLLROT)
@@ -803,14 +803,14 @@ function OnSimulMoveStart()
      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.HT > BeamHeightForFixRot or ( EMT.HEAD == 'H1' and EMT.TOTLEN > 350) or bGoToHome) and EMT.FLAG2 == 1 then
+      if not EMT.LOAD and EMT.MOVE == 0 and ( EMT.HEAD == 'H3' or ( EMT.HEAD == 'H1' and EMT.TOTLEN > 350) or bGoToHome) and EMT.FLAG2 == 1 then
         -- se motosega mi muovo a X di sicurezza per ruotare, prima si raddrizza B e poi C in posizione
-         if EMT.HEAD == 'H3' and bGoToHome then
+         if EMT.HEAD == 'H3' or bGoToHome then
            SimulMoveAxis( 'X', SafeXRotAxes, MCH_SIM_STEP.RAPID)
            SimulMoveAxis( 'B', 0, MCH_SIM_STEP.COLLROT)
            SimulMoveAxis( 'C', EMT.R1, MCH_SIM_STEP.COLLROT)
            SimulMoveAxis( 'B', EMT.R2, MCH_SIM_STEP.COLLROT)
-         elseif ( EMT.HEAD == 'H3' or ( bZmax and EMT.TOTLEN > 200)) then
+         elseif ( bZmax and 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
@@ -10,8 +10,8 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)

-PP_VER = '2.7j1_DEV1'
-PP_NVER = '2.7.9.4'
+PP_VER = '2.7k2'
+PP_NVER = '2.7.11.2'
 MIN_MACH_VER = '2.7j1'
 MACH_NAME = string.match( EgtGetCurrMachineDir(), "[^\\]+$")  -- si ricava il nome della macchina dal direttorio

@@ -544,13 +544,6 @@ if SecondToolChanger then
         TDir = -X_AX(),
         ADir = -Y_AX(),
         Geo = 'BASE/T28'}
-   EmtTcPos {
-         Name = 'T101',
-         Parent = 'Base',
-         Pos = Point3d( 510.4, -113.2, -1160.8),
-         TDir = -X_AX(),
-         ADir = Z_AX(),
-         Geo = 'BASE/T101S'}
 else
   if not SpecialBH then
      EmtTcPos {
@@ -560,14 +553,6 @@ else
            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
@@ -588,19 +573,6 @@ else
                           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 {
@@ -613,6 +585,38 @@ else
   end
 end

+-- motosega in caso di magazzino 2 o SpecialBH
+if SpecialBH or SecondToolChanger then
+   local TcpSsId = EmtTcPos {
+                        Name = 'T101',
+                        Parent = 'Base',
+                        Pos = Point3d( 510.4, -113.2, -1160.8),
+                        TDir = -X_AX(),
+                        ADir = Z_AX(),
+                        Geo = 'BASE/T101S'}
+   -- spostamento in caso di magazzino 2
+   if SecondToolChanger then
+      EgtMove( TcpSsId, Vector3d( 0, 0, 140), GDB_RT.GLOB)
+   end
+end
+if 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'}
+   if SecondToolChanger then
+      EgtMove( TcpSsId, Vector3d( 0, 0, -900), GDB_RT.GLOB)
+   end
+end
+
 -- Aggiusto posizioni geometriche
 local vtMove = Vector3d( 0, ( DeltaTabY + 913.16), ( DeltaTabZ + 830.037))
 local vtMoveX = Vector3d( 0, 0, ( DeltaTabZ + 830.037))
@@ -51,6 +51,9 @@ if IsTC2Active then
                           {Pos = "Pos19",  TcPos = "T26",  Head = "H1", Group = "G3"},
                           {Pos = "Pos20",  TcPos = "T27",  Head = "H1", Group = "G3"},
                           {Pos = "Pos21",  TcPos = "T28",  Head = "H1", Group = "G3"}}
+   if EgtGetHeadId( 'H5') then
+      table.insert( PositionTableTC2, {Pos = "Pos22", TcPos = "T91", Head = "H5", Group = "G2"})
+   end
   EgtJoinTables( PositionTable, PositionTableTC2)
 else
   local SecSuppId = EgtGetTcPosId( 'T111')
@@ -1,5 +1,15 @@
           ==== Common_FAST Update Log ====

+Versione 2.7k1 (10/11/2025)
+- (GEN) Corretto set variabili info utensile prima del movimento in home in caso di pezzi alti per NUM/NUM_PLUS.
+
+Versione 2.7j2 (08/10/2025)
+- (SIM-GEN) Quando si scarica motosega, si raddrizza prima l'asse B e poi si muove il C. Ora sempre e non solo se pezzo alto.
+
+Versione 2.7j1 (06/10/2025)
+- (SIM-GEN) Quando si scarica motosega, si raddrizza prima l'asse B e poi si muove il C.
+- (MLDE-SIM) Controllo collisione tra utensile e TOP testa C. Serve CAM5 2.7j1
+
 Versione 2.7i3 (23/09/2025)
 - (MLDE-ALL) Spostate costanti dimensioni utensili in MLDE.

@@ -3,7 +3,7 @@

 local InfoCommon_STD_PP = {
   NAME = 'Common_FAST',            -- nome script PP standard
-   VERSION = '2.7i3',                 -- versione script
+   VERSION = '2.7k1',                 -- versione script
   MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }
Author	SHA1	Message	Date
andrea.villa	52e305aa48	Aggiunto caricamento Aggregato a T in caso di presenza secondo magazzino verticale.	2025-11-12 10:58:13 +01:00
andrea.villa	e3c1ab71fe	Merge branch 'NewTopColl'	2025-11-12 09:47:10 +01:00
andrea.villa	32e5f54761	Allineamento a common ver. 2.7k1	2025-11-10 16:19:30 +01:00
andrea.villa	04a7f180e8	Aggiornato .gitignore	2025-10-14 11:52:51 +02:00
andrea.villa	fc8b39d260	Allineamento con common ver. 2.7j2	2025-10-08 16:13:35 +02:00
andrea.villa	0563e0c8ca	Allineamento con common ver. 2.7j1	2025-10-06 16:00:02 +02:00