diff options
| author | kliment <kliment.yanev@gmail.com> | 2011-07-07 10:34:24 +0200 |
|---|---|---|
| committer | kliment <kliment.yanev@gmail.com> | 2011-07-07 10:34:24 +0200 |
| commit | f4944f6d8ef6bb51ccf632fff6d80934f7b4e5cb (patch) | |
| tree | 2bc1c3246b9c9605bfcd49229dd102b9f0b66a07 /Sprinter | |
| parent | 88b8df4a860802e398c5b82b2e640257db40e7a8 (diff) | |
Fix broken #ifdef
Fix declarations in .h file
Diffstat (limited to 'Sprinter')
| -rw-r--r-- | Sprinter/Sprinter.h | 3 | ||||
| -rw-r--r-- | Sprinter/Sprinter.pde | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Sprinter/Sprinter.h b/Sprinter/Sprinter.h index 4e3c7ea..31d4b69 100644 --- a/Sprinter/Sprinter.h +++ b/Sprinter/Sprinter.h @@ -18,7 +18,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 disable_x(); void disable_y(); void disable_z(); diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde index f00ff11..ea854cb 100644 --- a/Sprinter/Sprinter.pde +++ b/Sprinter/Sprinter.pde @@ -450,7 +450,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 |