summaryrefslogtreecommitdiff
path: root/Sprinter
diff options
context:
space:
mode:
authorkliment <kliment.yanev@gmail.com>2011-07-07 10:36:40 +0200
committerkliment <kliment.yanev@gmail.com>2011-07-07 10:36:40 +0200
commit4b40c04551ebc4dfe64b1154864ef55ea81ca4d7 (patch)
treed3a35701007762b14aa77347a986ed8435a7b465 /Sprinter
parentc128fd74d9b314a07a0f20d978a0d11580567618 (diff)
parentf4944f6d8ef6bb51ccf632fff6d80934f7b4e5cb (diff)
Merge branch 'master' into experimental
Diffstat (limited to 'Sprinter')
-rw-r--r--Sprinter/Sprinter.h3
-rw-r--r--Sprinter/Sprinter.pde2
2 files changed, 3 insertions, 2 deletions
diff --git a/Sprinter/Sprinter.h b/Sprinter/Sprinter.h
index 10318ae..ad39c00 100644
--- a/Sprinter/Sprinter.h
+++ b/Sprinter/Sprinter.h
@@ -67,7 +67,8 @@ void ClearToSend();
void get_coordinates();
void prepare_move();
-void linear_move(unsigned long x_steps_remaining, unsigned long y_steps_remaining, unsigned long z_steps_remaining, unsigned long e_steps_remaining);
+void linear_move(unsigned long steps_remaining[]);
+void do_step_update_micros(int axis);
void do_step(int axis);
void kill(byte debug);
diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde
index a2ea948..6b94c97 100644
--- a/Sprinter/Sprinter.pde
+++ b/Sprinter/Sprinter.pde
@@ -508,7 +508,7 @@ inline void process_commands()
{
case 0: // G0 -> G1
case 1: // G1
- #ifdef DISABLE_CHECK_DURING_ACC || DISABLE_CHECK_DURING_MOVE || DISABLE_CHECK_DURING_TRAVEL
+ #if (defined DISABLE_CHECK_DURING_ACC) || (defined DISABLE_CHECK_DURING_MOVE) || (defined DISABLE_CHECK_DURING_TRAVEL)
manage_heater();
#endif
get_coordinates(); // For X Y Z E F