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

dda.c: make update_position() work with an empty queue.

This commit is contained in:
Markus Hitter 2011-10-07 21:11:55 +02:00
parent 7a458486ed
commit 2f8a257a0d
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dda.c
View File

@ -682,32 +682,37 @@ void dda_step(DDA *dda) {
void update_current_position() { void update_current_position() {
DDA *dda = &movebuffer[mb_tail]; DDA *dda = &movebuffer[mb_tail];
if (dda->live == 0) if (queue_empty()) {
return; current_position.X = startpoint.X;
current_position.Y = startpoint.Y;
if (dda->x_direction) current_position.Z = startpoint.Z;
current_position.X = dda->endpoint.X - move_state.x_steps; current_position.E = startpoint.E;
else }
current_position.X = dda->endpoint.X + move_state.x_steps; else if (dda->live) {
if (dda->x_direction)
if (dda->y_direction) current_position.X = dda->endpoint.X - move_state.x_steps;
current_position.Y = dda->endpoint.Y - move_state.y_steps;
else
current_position.Y = dda->endpoint.Y + move_state.y_steps;
if (dda->z_direction)
current_position.Z = dda->endpoint.Z - move_state.z_steps;
else
current_position.Z = dda->endpoint.Z + move_state.z_steps;
#ifndef E_ABSOLUTE
current_position.E = move_state.e_steps;
#else
if (dda->e_direction)
current_position.E = dda->endpoint.E - move_state.e_steps;
else else
current_position.E = dda->endpoint.E + move_state.e_steps; current_position.X = dda->endpoint.X + move_state.x_steps;
#endif
// current_position.F is updated in dda_start() if (dda->y_direction)
current_position.Y = dda->endpoint.Y - move_state.y_steps;
else
current_position.Y = dda->endpoint.Y + move_state.y_steps;
if (dda->z_direction)
current_position.Z = dda->endpoint.Z - move_state.z_steps;
else
current_position.Z = dda->endpoint.Z + move_state.z_steps;
#ifndef E_ABSOLUTE
current_position.E = move_state.e_steps;
#else
if (dda->e_direction)
current_position.E = dda->endpoint.E - move_state.e_steps;
else
current_position.E = dda->endpoint.E + move_state.e_steps;
#endif
// current_position.F is updated in dda_start()
}
} }