Merge branch 'master' of github.com:kliment/Sprinter into experimental

This commit is contained in:
Kliment Yanev 2011-10-01 20:02:26 +02:00
commit 6fe19a4452

View file

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