summaryrefslogtreecommitdiff
path: root/Sprinter
diff options
context:
space:
mode:
authorkliment <kliment.yanev@gmail.com>2011-09-28 05:52:04 -0700
committerkliment <kliment.yanev@gmail.com>2011-09-28 05:52:04 -0700
commitf8325693088967c7a7e1dfb7c4ab6308f07238bb (patch)
treea9630bb107b2a79a306992a466a56664f8d06d2c /Sprinter
parent0e91bea8f1b223703248f801733738b39f3d5fd8 (diff)
parent7d0613748f3699c1bcfafbcfb10de6e9c80dea55 (diff)
Merge pull request #97 from iXce/master
Fix issue #70 (scoping problem when acceleration is disabled)
Diffstat (limited to 'Sprinter')
-rw-r--r--Sprinter/Sprinter.pde2
1 files changed, 1 insertions, 1 deletions
diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde
index a941531..2a36875 100644
--- a/Sprinter/Sprinter.pde
+++ b/Sprinter/Sprinter.pde
@@ -1181,7 +1181,7 @@ inline void linear_move(unsigned long axis_steps_remaining[]) // make linear mov
//move until no more steps remain
while(axis_steps_remaining[0] + axis_steps_remaining[1] + axis_steps_remaining[2] + axis_steps_remaining[3] > 0) {
- #ifdef DISABLE_CHECK_DURING_ACC
+ #if defined RAMP_ACCELERATION && defined DISABLE_CHECK_DURING_ACC
if(!accelerating && !decelerating) {
//If more that HEATER_CHECK_INTERVAL ms have passed since previous heating check, adjust temp
#ifdef DISABLE_CHECK_DURING_TRAVEL