From 1843a68fdcdc15e793bd34ee9ede0c28ca414e0e Mon Sep 17 00:00:00 2001 From: Jim Morris Date: Sun, 26 Jun 2016 20:38:54 -0700 Subject: [PATCH] comment out laser for now --- src/main.cpp | 2 +- src/modules/robot/Robot.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 028bd3bf..41b98f9c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -158,7 +158,7 @@ void init() { delete tp; #endif #ifndef NO_TOOLS_LASER - kernel->add_module( new Laser() ); +// kernel->add_module( new Laser() ); #endif #ifndef NO_TOOLS_SPINDLE kernel->add_module( new(AHB0) Spindle() ); diff --git a/src/modules/robot/Robot.cpp b/src/modules/robot/Robot.cpp index 2318465c..1f932017 100644 --- a/src/modules/robot/Robot.cpp +++ b/src/modules/robot/Robot.cpp @@ -987,8 +987,8 @@ bool Robot::append_milestone(const float target[], float rate_mm_s, bool disable } } if(auxilliary_move) { - if(sos < 0.00001F) return false; distance= sqrtf(sos); // distance in mm of the e move + if(distance < 0.00001F) return false; } #endif -- 2.20.1