From 52e305aa4875b24cab4ce46ffc3ca22b63a213d5 Mon Sep 17 00:00:00 2001
From: "andrea.villa" <andrea.villa@egalware.com>
Date: Wed, 12 Nov 2025 10:58:13 +0100
Subject: [PATCH] Aggiunto caricamento Aggregato a T in caso di presenza
 secondo magazzino verticale.

---
 Essetre-FASTrl.mlde | 62 ++++++++++++++++++++++++---------------------
 Scripts/SetUp.lua   |  3 +++
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/Essetre-FASTrl.mlde b/Essetre-FASTrl.mlde
index f1a57a4..9642d4e 100644
--- a/Essetre-FASTrl.mlde
+++ b/Essetre-FASTrl.mlde
@@ -8,7 +8,7 @@
 -------------------------------------
 
 require( 'EmtGenerator')
-EgtEnableDebug( true)
+EgtEnableDebug( false)
 
 PP_VER = '2.7k2'
 PP_NVER = '2.7.11.2'
@@ -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))
diff --git a/Scripts/SetUp.lua b/Scripts/SetUp.lua
index 4a61cef..feb9184 100644
--- a/Scripts/SetUp.lua
+++ b/Scripts/SetUp.lua
@@ -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')