From 21a363642985caa0f69dc5db139d5c1fbb61322d Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 29 Jul 2019 14:54:50 +0000
Subject: [PATCH] EgtMachKernel 2.1g5 : - in fresature, con utensili NO_TIP
 feed mai di testa.

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 Milling.cpp      |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index ae40cd22044877893a1ac5862a1dde71885ac286..623731e6d044a6f66f181cccfa0a8c4cb895e992 100644
GIT binary patch
delta 97
zcmewt{V#gMFE&Qg&A-`fnHfzdKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUO4BcK2P

delta 97
zcmewt{V#gMFE&P#&A-`fnHfzcKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUI`BbWdH

diff --git a/Milling.cpp b/Milling.cpp
index 997340f..b761868 100644
--- a/Milling.cpp
+++ b/Milling.cpp
@@ -2215,7 +2215,7 @@ Milling::AddZigZagMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
                }
               // altrimenti, affondo in feed opportuna
                else {
-                  SetFeed( bOutStart ? GetStartFeed() : GetTipFeed()) ;
+                  SetFeed( ( bOutStart  ||  m_TParams.m_nType == TT_MILL_NOTIP) ? GetStartFeed() : GetTipFeed()) ;
                   if ( AddLinearMove( ptP1) == GDB_ID_NULL)
                      return false ;
                }
@@ -2894,7 +2894,7 @@ Milling::AddSawZigZagMilling( const ICurveComposite* pCompo, const Vector3d& vtT
             }
            // altrimenti, affondo in feed opportuna
             else {
-               SetFeed( bOutStart ? GetStartFeed() : GetTipFeed()) ;
+               SetFeed( ( bOutStart  ||  m_TParams.m_nType == TT_MILL_NOTIP) ? GetStartFeed() : GetTipFeed()) ;
                if ( AddLinearMove( ptP1) == GDB_ID_NULL)
                   return false ;
             }
@@ -3030,7 +3030,7 @@ Milling::AddApproach( const Point3d& ptP, const Vector3d& vtTool, double dSafeZ,
       }
      // affondo al punto iniziale
       SetFlag( 0) ;
-      SetFeed( bOutStart ? GetStartFeed() : GetTipFeed()) ;
+      SetFeed( ( bOutStart ||  m_TParams.m_nType == TT_MILL_NOTIP) ? GetStartFeed() : GetTipFeed()) ;
       if ( AddLinearMove( ptP) == GDB_ID_NULL)
          return false ;
    }
@@ -3042,7 +3042,7 @@ Milling::AddApproach( const Point3d& ptP, const Vector3d& vtTool, double dSafeZ,
          return false ;
      // affondo al punto iniziale
       SetFlag( 0) ;
-      SetFeed( bOutStart ? GetStartFeed() : GetTipFeed()) ;
+      SetFeed( ( bOutStart  ||  m_TParams.m_nType == TT_MILL_NOTIP) ? GetStartFeed() : GetTipFeed()) ;
       if ( AddLinearMove( ptP) == GDB_ID_NULL)
          return false ;
    }