josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dda.c: fix ACCELERATION_RAMPING #ifdefs.

This commit is contained in:
Markus Hitter 2013-03-29 17:01:32 +01:00
parent fe985a18d3
commit 5df8eeaacf
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dda.c
View File

@ -672,8 +672,11 @@ void dda_step(DDA *dda) {
// If there are no steps left or an endstop stop happened, we have finished. // If there are no steps left or an endstop stop happened, we have finished.
if ((move_state.x_steps == 0 && move_state.y_steps == 0 && if ((move_state.x_steps == 0 && move_state.y_steps == 0 &&
move_state.z_steps == 0 && move_state.e_steps == 0) || move_state.z_steps == 0 && move_state.e_steps == 0)
(dda->endstop_check && move_state.n == -3)) { #ifdef ACCELERATION_RAMPING
|| (dda->endstop_check && move_state.n == -3)
#endif
) {
dda->live = 0; dda->live = 0;
#ifdef LOOKAHEAD #ifdef LOOKAHEAD
// If look-ahead was using this move, it could have missed our activation: // If look-ahead was using this move, it could have missed our activation:
@ -808,12 +811,16 @@ void dda_clock() {
// If an endstop is definitely triggered, stop the movement. // If an endstop is definitely triggered, stop the movement.
if (endstop_stop) { if (endstop_stop) {
#ifdef ACCELERATION_RAMPING
// For always smooth operations, don't halt apruptly, // For always smooth operations, don't halt apruptly,
// but start deceleration here. // but start deceleration here.
ATOMIC_START ATOMIC_START
dda->rampdown_steps = move_state.step_no; dda->rampdown_steps = move_state.step_no;
dda->rampup_steps = 0; // in case we're still accelerating dda->rampup_steps = 0; // in case we're still accelerating
ATOMIC_END ATOMIC_END
#else
dda->live = 0;
#endif
endstops_off(); endstops_off();
} }