summaryrefslogtreecommitdiff
path: root/Sprinter
diff options
context:
space:
mode:
authorKliment Yanev <kliment.yanev@gmail.com>2011-10-01 20:02:26 +0200
committerKliment Yanev <kliment.yanev@gmail.com>2011-10-01 20:02:26 +0200
commit6fe19a44520771988120d4f96045ccac2a17e273 (patch)
tree12756c99d4153d571a2f4b8a14cdbb0216edb787 /Sprinter
parent28a37563de7717b16569beb1dafc51811b9d510c (diff)
parentf8325693088967c7a7e1dfb7c4ab6308f07238bb (diff)
Merge branch 'master' of github.com:kliment/Sprinter into experimental
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 7e9b3ba..52910ec 100644
--- a/Sprinter/Sprinter.pde
+++ b/Sprinter/Sprinter.pde
@@ -1246,7 +1246,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