summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkliment <kliment.yanev@gmail.com>2011-05-14 23:58:49 +0200
committerkliment <kliment.yanev@gmail.com>2011-05-14 23:58:49 +0200
commit86f43686c88fa0f5bf6bbb38982ce1a7ea1ad967 (patch)
treeafaee28621eae32c18f1ca1307d3c5c00ac8da4d
parent053512ab6ad3dbe4708c9f031f6f40d8df1859ee (diff)
Make either x steps or y steps remaining shortcut the loop
-rw-r--r--Tonokip_Firmware/Tonokip_Firmware.pde3
1 files changed, 1 insertions, 2 deletions
diff --git a/Tonokip_Firmware/Tonokip_Firmware.pde b/Tonokip_Firmware/Tonokip_Firmware.pde
index 8ae65da..4fa24a9 100644
--- a/Tonokip_Firmware/Tonokip_Firmware.pde
+++ b/Tonokip_Firmware/Tonokip_Firmware.pde
@@ -1186,8 +1186,7 @@ void linear_move(unsigned long x_steps_remaining, unsigned long y_steps_remainin
}
}
#ifdef RAMP_ACCELERATION
- if(x_steps_remaining>0 &&
- y_steps_remaining>0 &&
+ if((x_steps_remaining>0 || y_steps_remaining>0) &&
steps_to_take > 0 &&
(steps_remaining == plateau_steps || (steps_done >= steps_to_take / 2 && accelerating && !decelerating))) continue;
#endif