pingu_98/Sprinter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into experimental

Browse source
This commit is contained in:
kliment 2011-07-07 10:36:40 +02:00
commit 4b40c04551
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Sprinter/Sprinter.h
View file

@ -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);

2
Sprinter/Sprinter.pde
View file

@ -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