From 2a44fc86354d6f8c78d8093d09bedfd073daca0a Mon Sep 17 00:00:00 2001
From: "andrea.villa" <andrea.villa@egalware.com>
Date: Mon, 6 May 2024 16:43:11 +0200
Subject: [PATCH] - Allineamento con common ver. 2.6e3 - Aggiunte variabili
 MinJoin(xx) per gestione MIN_JOIN_(xx)

---
 Common-FAST.mlse  | 10 +++++-----
 Essetre-FAST.mlde |  9 ++++++++-
 UpdateLog.txt     |  3 +++
 Version.lua       |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Common-FAST.mlse b/Common-FAST.mlse
index cf356a4..d001976 100644
--- a/Common-FAST.mlse
+++ b/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
 
diff --git a/Essetre-FAST.mlde b/Essetre-FAST.mlde
index e19782d..b395ee7 100644
--- a/Essetre-FAST.mlde
+++ b/Essetre-FAST.mlde
@@ -52,11 +52,13 @@
 -- 2024/04/30 AV ver 2.6e1 Allineamento con common ver. 2.6e1
 --                         Aggiunta variabile WoodDensity per gestione WOOD_DENSITY
 -- 2024/05/06 AV ver 2.6e2 Allineamento con common ver. 2.6e2
+-- 2024/05/06 AV ver 2.6e3 Allineamento con common ver. 2.6e3
+--                         Aggiunte variabili MinJoin(xx) per gestione MIN_JOIN_(xx) 
 
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6e2'
+PP_VER = '2.6e3'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-FAST'
 
@@ -178,6 +180,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
diff --git a/UpdateLog.txt b/UpdateLog.txt
index b81f1cb..9441f2f 100644
--- a/UpdateLog.txt
+++ b/UpdateLog.txt
@@ -1,5 +1,8 @@
            ==== Common_FAST Update Log ====
 
+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
 
diff --git a/Version.lua b/Version.lua
index c82baf4..4d22e12 100644
--- a/Version.lua
+++ b/Version.lua
@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common-FAST',            -- nome script PP standard
-   VERSION = '2.6e2',                 -- versione script
+   VERSION = '2.6e3',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }