Merge remote-tracking branch 'origin/develop'

- Allineamento con common ver. 2.7a1

Common_FAST.mlse

@@ -33,9 +33,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

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.7a1'
+PP_NVER = '2.7.1.1'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-FASTrl'
 
@@ -308,8 +308,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,13 +447,27 @@ 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 AggreBlockHaus then
+   EmtTcPos {
+         Name = 'T11',
+         Parent = 'Base',
+         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
+
+
 if not SpecialBH then
    EmtTcPos {
          Name = 'T101',
@@ -514,17 +528,6 @@ if SpecialBH then
          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'}
-end
-
 -- Aggiusto posizioni geometriche
 local vtMove = Vector3d( 0, ( DeltaTabY + 913.16), ( DeltaTabZ + 830.037))
 local vtMoveX = Vector3d( 0, 0, ( DeltaTabZ + 830.037))

UpdateLog.txt

@@ -1,7 +1,8 @@
            ==== Common_FAST Update Log ====
 
-Versione 2.6-- (--/--/2024)
+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

@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_FAST',            -- nome script PP standard
-   VERSION = '2.6--',                 -- versione script
+   VERSION = '2.7a1',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }