bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #3616 from thinkyhead/rc_fixup_some_movement

Browse Source 
General cleanup around high level move functions
This commit is contained in:
Scott Lahteine 2016-04-25 20:23:38 -07:00
commit ec82e1e05d
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Marlin/Marlin_main.cpp
View File

@ -2343,7 +2343,6 @@ static void homeaxis(AxisEnum axis) {
#else #else
sync_plan_position(); sync_plan_position();
#endif #endif
//prepare_move();
} }
feedrate = retract_recover_feedrate * 60; feedrate = retract_recover_feedrate * 60;
@ -7328,12 +7327,8 @@ void mesh_plan_buffer_line(float x, float y, float z, const float e, float feed_
adjust_delta(target); adjust_delta(target);
#endif #endif
//SERIAL_ECHOPGM("target[X_AXIS]="); SERIAL_ECHOLN(target[X_AXIS]); //DEBUG_POS("prepare_move_delta", target);
//SERIAL_ECHOPGM("target[Y_AXIS]="); SERIAL_ECHOLN(target[Y_AXIS]); //DEBUG_POS("prepare_move_delta", delta);
//SERIAL_ECHOPGM("target[Z_AXIS]="); SERIAL_ECHOLN(target[Z_AXIS]);
//SERIAL_ECHOPGM("delta[X_AXIS]="); SERIAL_ECHOLN(delta[X_AXIS]);
//SERIAL_ECHOPGM("delta[Y_AXIS]="); SERIAL_ECHOLN(delta[Y_AXIS]);
//SERIAL_ECHOPGM("delta[Z_AXIS]="); SERIAL_ECHOLN(delta[Z_AXIS]);
plan_buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], target[E_AXIS], feedrate / 60 * feedrate_multiplier / 100.0, active_extruder); plan_buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], target[E_AXIS], feedrate / 60 * feedrate_multiplier / 100.0, active_extruder);
} }
@ -7423,13 +7418,10 @@ void prepare_move() {
if (!prepare_move_scara(destination)) return; if (!prepare_move_scara(destination)) return;
#elif ENABLED(DELTA) #elif ENABLED(DELTA)
if (!prepare_move_delta(destination)) return; if (!prepare_move_delta(destination)) return;
#endif #else
#if ENABLED(DUAL_X_CARRIAGE)
#if ENABLED(DUAL_X_CARRIAGE) if (!prepare_move_dual_x_carriage()) return;
if (!prepare_move_dual_x_carriage()) return; #endif
#endif
#if DISABLED(DELTA) && DISABLED(SCARA)
if (!prepare_move_cartesian()) return; if (!prepare_move_cartesian()) return;
#endif #endif