From 7f87aaae8d7b34a5205a812da1c41d4e2bbd505e Mon Sep 17 00:00:00 2001
From: "luca.mazzoleni" <luca.mazzoleni@egalware.com>
Date: Fri, 29 Sep 2023 14:30:53 +0200
Subject: [PATCH] - in mlde e BeamData corretta la lettura di MINRAW e DEFTCPOS
 da Ts3Data

---
 Beam/BeamData.lua | 4 ++--
 Essetre-PFrl.mlde | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Beam/BeamData.lua b/Beam/BeamData.lua
index 38fea4a..80ac885 100644
--- a/Beam/BeamData.lua
+++ b/Beam/BeamData.lua
@@ -96,8 +96,8 @@ if EgtExistsFile( sData) then
          if Machine.Offsets.DOUBLE_HEAD_DOVETAIL then BeamData.DOUBLE_HEAD_DOVETAIL = ( Machine.Offsets.DOUBLE_HEAD_DOVETAIL == 1) end
          if Machine.Offsets.DOUBLE_HEAD_MORTISE then BeamData.DOUBLE_HEAD_MORTISE = ( Machine.Offsets.DOUBLE_HEAD_MORTISE == 1) end
          if Machine.Offsets.DOUBLE_HEAD_DRILLING then BeamData.DOUBLE_HEAD_DRILLING = ( Machine.Offsets.DOUBLE_HEAD_DRILLING == 1) end
-         BeamData.MINRAW_S = Machine.Offsets.MINRAW_S or BeamData.MINRAW_S
-         BeamData.MINRAW_L = Machine.Offsets.MINRAW_L or BeamData.MINRAW_L
+         BeamData.MINRAW_S = max( BeamData.MINRAW_S, Machine.Offsets.MINRAW_S or BeamData.MINRAW_S)
+         BeamData.MINRAW_L = max( BeamData.MINRAW_L, Machine.Offsets.MINRAW_L or BeamData.MINRAW_L)
          BeamData.CUT_EXTRA = Machine.Offsets.CUT_EXTRA or BeamData.CUT_EXTRA
          BeamData.CUT_EXTRA_MIN = Machine.Offsets.CUT_EXTRA_MIN or BeamData.CUT_EXTRA_MIN
          BeamData.DIM_STRIP_SMALL = Machine.Offsets.DIM_STRIP_SMALL or BeamData.DIM_STRIP_SMALL
diff --git a/Essetre-PFrl.mlde b/Essetre-PFrl.mlde
index 4ae6302..7c26d3f 100644
--- a/Essetre-PFrl.mlde
+++ b/Essetre-PFrl.mlde
@@ -45,6 +45,7 @@
 -- 2023/06/26 ver 2.5f3 Tolte da teste per lame forzature risalite in Z. In generaz. CN aggiunto M05 su ultima lavorazione prima di SpecUnloading o Fall.
 -- 2023/07/31 ver 2.5g1 Aggiunta apertura V1 allo scarico finale di barra con uso di entrambe Y1 e Y2 (#1399).
 -- 2023/08/07 ver 2.5h1 In split prima di rotazione migliorato controllo spazio dietro per scambio carrelli. Ripristinata forzatura risalita in Z per lame se DeltaAng > 210 e HzPezzo > 610.
+-- 2023/09/29 ver 2.5i1 In BeamData e mlde aggiunta la lettura di alcuni parametri da Ts3Data.
 
 -- Intestazioni
 require( 'EmtGenerator')
@@ -238,8 +239,8 @@ if EgtExistsFile( sData) then
          if Machine.Offsets.SAWOFFSZ then SawOffsZ = Machine.Offsets.SAWOFFSZ end
          if Machine.Offsets.SAW2OFFSX then Saw2OffsX = Machine.Offsets.SAW2OFFSX end
          if Machine.Offsets.SAW2OFFSZ then Saw2OffsZ = Machine.Offsets.SAW2OFFSZ end
-         if Machine.Offsets.DEFTCPOS1 then DefTcPos1 = Machine.Offsets.DEFTCPOS1 end
-         if Machine.Offsets.DEFTCPOS2 then DefTcPos2 = Machine.Offsets.DEFTCPOS2 end
+         if Machine.Offsets.DEFTCPOS1 then DefTcPos1 = ( 'T' .. Machine.Offsets.DEFTCPOS1) end
+         if Machine.Offsets.DEFTCPOS2 then DefTcPos2 = ( 'T' .. Machine.Offsets.DEFTCPOS2) end
          -- aggiustamenti
          MinY1 = MinV1 + MinDeltaYV
          MaxY1 = MaxMchY1