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

dda.c: Fix a number of minor things, detected by Phord. 

These were mistakes introduced with the last commit.
Thanks, Phord!
This commit is contained in:
Markus Hitter 2012-03-05 19:42:08 +01:00
parent 5f9ae5b087
commit e5cc5ab066
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dda.c
View File

@ -228,15 +228,15 @@ void dda_create(DDA *dda, TARGET *target) {
if (target->all_relative) { if (target->all_relative) {
x_delta_um = labs(target->X); x_delta_um = labs(target->X);
um_to_steps_x(dda->x_delta, x_delta_um); um_to_steps_x(dda->x_delta, x_delta_um);
dda->x_direction = (target->X < 0)?1:0; dda->x_direction = (target->X >= 0)?1:0;
y_delta_um = labs(target->Y); y_delta_um = labs(target->Y);
um_to_steps_y(dda->y_delta, y_delta_um); um_to_steps_y(dda->y_delta, y_delta_um);
dda->y_direction = (target->Y < 0)?1:0; dda->y_direction = (target->Y >= 0)?1:0;
z_delta_um = labs(target->Z); z_delta_um = labs(target->Z);
um_to_steps_z(dda->z_delta, z_delta_um); um_to_steps_z(dda->z_delta, z_delta_um);
dda->z_direction = (target->Z < 0)?1:0; dda->z_direction = (target->Z >= 0)?1:0;
} }
else { else {
x_delta_um = (uint32_t)labs(target->X - startpoint.X); x_delta_um = (uint32_t)labs(target->X - startpoint.X);
@ -262,7 +262,7 @@ void dda_create(DDA *dda, TARGET *target) {
if (target->all_relative || target->e_relative) { if (target->all_relative || target->e_relative) {
e_delta_um = labs(target->E); e_delta_um = labs(target->E);
um_to_steps_e(dda->e_delta, e_delta_um); um_to_steps_e(dda->e_delta, e_delta_um);
dda->e_direction = (target->E < 0)?1:0; dda->e_direction = (target->E >= 0)?1:0;
} }
else { else {
e_delta_um = (uint32_t)labs(target->E - startpoint.E); e_delta_um = (uint32_t)labs(target->E - startpoint.E);

10
gcode_process.c
View File

@ -73,7 +73,7 @@ void process_gcode_command() {
#ifdef X_MAX #ifdef X_MAX
if (next_target.target.all_relative) { if (next_target.target.all_relative) {
if (next_target.target.X += startpoint.X > X_MAX * 1000.) if (next_target.target.X += startpoint.X > X_MAX * 1000.)
next_target.target.X = X_MIN * 1000. - startpoint.X; next_target.target.X = X_MAX * 1000. - startpoint.X;
} }
else { else {
if (next_target.target.X > X_MAX * 1000.) if (next_target.target.X > X_MAX * 1000.)
@ -93,7 +93,7 @@ void process_gcode_command() {
#ifdef Y_MAX #ifdef Y_MAX
if (next_target.target.all_relative) { if (next_target.target.all_relative) {
if (next_target.target.Y += startpoint.Y > Y_MAX * 1000.) if (next_target.target.Y += startpoint.Y > Y_MAX * 1000.)
next_target.target.Y = Y_MIN * 1000. - startpoint.Y; next_target.target.Y = Y_MAX * 1000. - startpoint.Y;
} }
else { else {
if (next_target.target.Y > Y_MAX * 1000.) if (next_target.target.Y > Y_MAX * 1000.)
@ -113,7 +113,7 @@ void process_gcode_command() {
#ifdef Z_MAX #ifdef Z_MAX
if (next_target.target.all_relative) { if (next_target.target.all_relative) {
if (next_target.target.Z += startpoint.Z > Z_MAX * 1000.) if (next_target.target.Z += startpoint.Z > Z_MAX * 1000.)
next_target.target.Z = Z_MIN * 1000. - startpoint.Z; next_target.target.Z = Z_MAX * 1000. - startpoint.Z;
} }
else { else {
if (next_target.target.Z > Z_MAX * 1000.) if (next_target.target.Z > Z_MAX * 1000.)
@ -424,8 +424,8 @@ void process_gcode_command() {
case 82: case 82:
//? --- M82 - Set E codes absolute --- //? --- M82 - Set E codes absolute ---
//? //?
//? This is the default. M82/M82 is not documented in the //? This is the default. M82/M83 is not documented in the
//? RepRap wiki, behaviours was taken from Strinter as of March 2012. //? RepRap wiki, behaviours was taken from Sprinter as of March 2012.
// No wait_queue() needed. // No wait_queue() needed.
next_target.target.e_relative = 0; next_target.target.e_relative = 0;