From 0b06642c5801ff4169b251ae8ac44b06d0c22659 Mon Sep 17 00:00:00 2001
From: "andrea.villa" <andrea.villa@egalware.com>
Date: Thu, 24 Apr 2025 12:55:30 +0200
Subject: [PATCH] - Allineamento con common 2.7d2 - Aggiunto parametro
 LinkAxesMoveOrder

---
 Common_PF1250.mlpe          | 30 ++++++++++++++----------
 Essetre-PF1500MAXrl-3T.mlde |  5 ++--
 MachNotes.ini               | 46 ++++++++++++++++++++++---------------
 UpdateLog.txt               |  3 +++
 Version.lua                 |  2 +-
 5 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/Common_PF1250.mlpe b/Common_PF1250.mlpe
index 7bebadd..8438671 100644
--- a/Common_PF1250.mlpe
+++ b/Common_PF1250.mlpe
@@ -224,18 +224,24 @@ function OnSimulDispositionStart()
                end
             end
             -- determino la risoluzione dello Zmap
-            local dArea = b3Raw:getDimX() * b3Raw:getDimY() + b3Raw:getDimX() * b3Raw:getDimZ() + b3Raw:getDimY() * b3Raw:getDimZ()
-            local dTol = 4.51
-            if dArea < CoeffVM * 0.5e6 then
-               dTol = 1.01
-            elseif dArea < CoeffVM * 1.2e6 then
-               dTol = 1.51
-            elseif dArea < CoeffVM * 2.5e6 then
-               dTol = 1.97
-            elseif dArea < CoeffVM * 5.0e6 then
-               dTol = 2.81
-            elseif dArea < CoeffVM * 10.0e6 then
-               dTol = 3.77
+            local dTol = 4.71
+            if EmtGetVMillStep then
+               dTol = EmtGetVMillStep( b3Raw:getDimX(), b3Raw:getDimY(), b3Raw:getDimZ(), 4.71)
+            else
+               local dArea = b3Raw:getDimX() * b3Raw:getDimY() + b3Raw:getDimX() * b3Raw:getDimZ() + b3Raw:getDimY() * b3Raw:getDimZ()
+               if dArea < 0.075e6 then
+                  dTol = 0.71
+               elseif dArea < 0.15e6 then
+                  dTol = 1.01
+               elseif dArea < 0.3e6 then
+                  dTol = 1.51
+               elseif dArea < 0.6e6 then
+                  dTol = 1.97
+               elseif dArea < 1.2e6 then
+                  dTol = 2.81
+               elseif dArea < 2.4e6 then
+                  dTol = 3.77
+               end
             end
             -- creo lo Zmap
             local VMillId = EgtVolZmapBox( nPartRawId, b3Raw:getMin(), b3Raw:getDimX(), b3Raw:getDimY(), b3Raw:getDimZ(), dTol, true, GDB_RT.GLOB)
diff --git a/Essetre-PF1500MAXrl-3T.mlde b/Essetre-PF1500MAXrl-3T.mlde
index c075855..8ec3a78 100644
--- a/Essetre-PF1500MAXrl-3T.mlde
+++ b/Essetre-PF1500MAXrl-3T.mlde
@@ -5,9 +5,9 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.7d1'
+PP_VER = '2.7d2'
 PP_NVER = '2.7.4.1'
-MIN_MACH_VER = '2.5k1'
+MIN_MACH_VER = '2.7d2'
 MACH_NAME = 'Essetre-PF1500MAXrl-3T'
 
 -- Carico i dati globali
@@ -324,6 +324,7 @@ EmtGeneral {
       ExitMaxAdjust = 300,
       ExitMaxRotAdj = 0.5,
       AngDeltaMinForHome = 80,
+      LinkAxesMoveOrder = MCH_LKAMO.HEAD_BEFORE_IF_SAME_ANG,
       Special = 'Common_PF1250.mlse',
       Processor = 'Common_PF1250.mlpe'}
 -- in base alla corsa macchina, si carica la rulliera di carico/scarico appropriata
diff --git a/MachNotes.ini b/MachNotes.ini
index 5f58449..8b2d740 100644
--- a/MachNotes.ini
+++ b/MachNotes.ini
@@ -7,18 +7,19 @@
 [Sawing]
 
 [Milling]
-0=d,MaxElev,0
+0=l,MaxElev,0
 1=d,OutRaw,0
-2=d,SideElev,0
+2=l,SideElev,0
 3=d,TrimExt,0
-4=sr,VtFaceUse,0,0,0
+4=s,VtFaceUse,0,0,0
+5=s,EdgesFaceUse,0
 
 [Pocketing]
-0=d,MaxElev,0
+0=l,MaxElev,0
 1=b,Open,0
-2=d,OpenMinSave,0
+2=d,OpenMinSafe,0
 3=d,OpenOutRaw,0
-4=d,MaxOptSize,0
+4=l,MaxOptSize,0
 
 [Mortising]
 0=d,MaxElev,0
@@ -30,21 +31,28 @@
 [SawFinishing]
 
 [GenMachining]
-0=l,LinTol,0.1
-1=l,MaxLen,2
-2=s,Type,ZigZag
-3=d,SideAng,90
-4=l,Step,10
-5=l,OffsProj,0
-6=l,LiTang,0
-7=l,LiOrth,0
-8=l,LiElev,0
-9=l,LoTang,0
-10=l,LoOrth,0
-11=l,LoElev,0
-12=b,DirFromGuide,1
 
 [SurfRoughing]
+0=l,MaxElev,1000
+1=b,PlaneZ,0
 
 [SurfFinishing]
 0=b,SkipMaxDown,1
+
+[5AxMilling]
+0=l,LinTol,0.01
+1=l,MaxLen,10
+2=s,Type,ZigZag
+3=d,SideAng,90
+4=l,Step,10
+5=d,AngIni,-90
+6=d,AngFin,90
+7=l,LiTang,0
+8=l,LiOrth,0
+9=l,LiElev,0
+10=l,LoTang,0
+11=l,LoOrth,0
+12=l,LoElev,0
+13=b,DirFromGuide,0
+14=b,SurfAvoid,0
+
diff --git a/UpdateLog.txt b/UpdateLog.txt
index 24659be..365d691 100644
--- a/UpdateLog.txt
+++ b/UpdateLog.txt
@@ -1,5 +1,8 @@
            ==== Common_PF1250 Update Log ====
 
+Versione 2.7d2 (24/04/2025)
+- (SIM) Modifica qualità VMILL. Da ora si può impostare da impostazioni CAM5
+
 Versione 2.7d1 (01/04/2025)
 - (GEN) Aggiunta commenti HEADER e FOOTER per comunicazione con linea o altre macchine, da parte di Essetre.
 
diff --git a/Version.lua b/Version.lua
index 53bd3e4..266d2e4 100644
--- a/Version.lua
+++ b/Version.lua
@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_PF1250',            -- nome script PP standard
-   VERSION = '2.7d1',                 -- versione script
+   VERSION = '2.7d2',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }