From 6ba7cb482944853e8834b59112de8d6e16ee99d2 Mon Sep 17 00:00:00 2001
From: "andrea.villa" <andrea.villa@egalware.com>
Date: Tue, 12 Mar 2024 13:14:41 +0100
Subject: [PATCH] - 'EgtVolZmapSetShowEdges' per settare flag visualizzazione
 spigoli - Corretto problema di movimento pinze assieme a discesa asse Z

---
 Common-FAST.NUM.mlpe      |  1 +
 Common-FAST.NUM_PLUS.mlpe |  1 +
 Common-FAST.TPA.mlpe      |  1 +
 Common-FAST.mlpe          | 14 +++++++++-----
 UpdateLog.txt             |  4 ++++
 Version.lua               |  2 +-
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Common-FAST.NUM.mlpe b/Common-FAST.NUM.mlpe
index 49a5530..351943d 100644
--- a/Common-FAST.NUM.mlpe
+++ b/Common-FAST.NUM.mlpe
@@ -615,6 +615,7 @@ function OnRapid()
          if not EMT.ZMAX and #EMT.AUXSTR > 0 then
             EmitZmax()
             EMT.ZMAX = true
+            bHeadFirst = false
          end
       end
 
diff --git a/Common-FAST.NUM_PLUS.mlpe b/Common-FAST.NUM_PLUS.mlpe
index 2e7f091..85e999d 100644
--- a/Common-FAST.NUM_PLUS.mlpe
+++ b/Common-FAST.NUM_PLUS.mlpe
@@ -644,6 +644,7 @@ function OnRapid()
             EmitZmax( EMT.TOOL ~= EMT.PREVTOOL)
             EMT.ZMAX = true
             EMT.PREVTOOL = EMT.TOOL
+            bHeadFirst = false
          end
       end
 
diff --git a/Common-FAST.TPA.mlpe b/Common-FAST.TPA.mlpe
index 5e47ac4..1d0224a 100644
--- a/Common-FAST.TPA.mlpe
+++ b/Common-FAST.TPA.mlpe
@@ -636,6 +636,7 @@ function OnRapid()
       if not ( EMT.LOAD or EMT.RELOAD) then
          if not EMT.ZMAX and #EMT.AUXSTR > 0 then
             EmitZmax()
+            bHeadFirst = false
          end
       end
       -- primo posizionamento
diff --git a/Common-FAST.mlpe b/Common-FAST.mlpe
index 344a063..d9dca37 100644
--- a/Common-FAST.mlpe
+++ b/Common-FAST.mlpe
@@ -1,4 +1,4 @@
--- Processore macchina Essetre-FAST by EgalWare s.r.l.   2024/02/23
+-- Processore macchina Essetre-FAST by EgalWare s.r.l.   2024/03/09
 
 -- Intestazioni
 require( 'EmtGenerator')
@@ -923,10 +923,14 @@ function ExecUnloading()
       EgtMove( nLayId, vtMove, GDB_RT.GLOB)
       EgtSetLevel( vMillId, GDB_LV.USER)
       -- aggiungo gli spigoli
-      local nFirstId, nCount = EgtVolZmapGetEdges( vMillId, nLayId)
-      if nFirstId then
-         for nId = nFirstId, nFirstId + nCount - 1 do
-            EgtSetColor( nId, Color3d( 96, 96, 96))
+      if EgtVolZmapSetShowEdges then
+         EgtVolZmapSetShowEdges( vMillId, true)
+      else
+         local nFirstId, nCount = EgtVolZmapGetEdges( vMillId, nLayId)
+         if nFirstId then
+            for nId = nFirstId, nFirstId + nCount - 1 do
+               EgtSetColor( nId, Color3d( 96, 96, 96))
+            end
          end
       end
       -- rilascio Vmill
diff --git a/UpdateLog.txt b/UpdateLog.txt
index a617967..be79e14 100644
--- a/UpdateLog.txt
+++ b/UpdateLog.txt
@@ -1,5 +1,9 @@
            ==== Common_FAST Update Log ====
 
+Versione 2.6c7 (12/03/2024)
+- (SIM) A fine simulazione non si creano gli spigoli ma si setta solo flag per visualizzazione tramite "EgtVolZmapSetShowEdges"
+- (GEN) Corretto problema di movimento pinze assieme a discesa asse Z (Ticket #1710)
+
 Versione 2.6c6 (04/03/2024)
 - (MLDE-GEN) Aggiunta variabile 'MACH_NAME' in MLDE con nome macchina
 
diff --git a/Version.lua b/Version.lua
index 35b831c..bdcaa65 100644
--- a/Version.lua
+++ b/Version.lua
@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common-FAST',            -- nome script PP standard
-   VERSION = '2.6c6',                 -- versione script
+   VERSION = '2.6c7',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }