MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #4285 from thinkyhead/rc_manual_move_fast_fine

Browse Source 
No delay for the smallest LCD moves
This commit is contained in:
Scott Lahteine 2016-07-12 20:16:38 -07:00 committed by GitHub
commit 2224032568
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View File

@ -1707,12 +1707,6 @@ static void clean_up_after_endstop_or_probe_move() {
/** /**
* Raise Z to a minimum height to make room for a probe to move * Raise Z to a minimum height to make room for a probe to move
*
* zprobe_zoffset: Negative of the Z height where the probe engages
* z_raise: The probing raise distance
*
* The zprobe_zoffset is negative for a switch below the nozzle, so
* multiply by Z_HOME_DIR (-1) to move enough away from the bed.
*/ */
inline void do_probe_raise(float z_raise) { inline void do_probe_raise(float z_raise) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
@ -1723,7 +1717,7 @@ static void clean_up_after_endstop_or_probe_move() {
#endif #endif
float z_dest = home_offset[Z_AXIS] + z_raise; float z_dest = home_offset[Z_AXIS] + z_raise;
if ((Z_HOME_DIR) < 0 && zprobe_zoffset < 0) if (zprobe_zoffset < 0)
z_dest -= zprobe_zoffset; z_dest -= zprobe_zoffset;
if (z_dest > current_position[Z_AXIS]) if (z_dest > current_position[Z_AXIS])

8
Marlin/ultralcd.cpp
View File

@ -1293,12 +1293,14 @@ void kill_screen(const char* lcd_msg) {
#endif // DELTA_CALIBRATION_MENU #endif // DELTA_CALIBRATION_MENU
float move_menu_scale;
/** /**
* If the most recent manual move hasn't been fed to the planner yet, * If the most recent manual move hasn't been fed to the planner yet,
* and the planner can accept one, send immediately * and the planner can accept one, send immediately
*/ */
inline void manage_manual_move() { inline void manage_manual_move() {
if (manual_move_axis != (int8_t)NO_AXIS && millis() >= manual_move_start_time && !planner.is_full()) { if (manual_move_axis != (int8_t)NO_AXIS && ELAPSED(millis(), manual_move_start_time) && !planner.is_full()) {
#if ENABLED(DELTA) #if ENABLED(DELTA)
calculate_delta(current_position); calculate_delta(current_position);
planner.buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], current_position[E_AXIS], manual_feedrate[manual_move_axis]/60, manual_move_e_index); planner.buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], current_position[E_AXIS], manual_feedrate[manual_move_axis]/60, manual_move_e_index);
@ -1321,7 +1323,7 @@ void kill_screen(const char* lcd_msg) {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
if (axis == E_AXIS) manual_move_e_index = eindex >= 0 ? eindex : active_extruder; if (axis == E_AXIS) manual_move_e_index = eindex >= 0 ? eindex : active_extruder;
#endif #endif
manual_move_start_time = millis() + 500UL; // 1/2 second delay manual_move_start_time = millis() + (move_menu_scale < 0.99 ? 0UL : 250UL); // delay for bigger moves
manual_move_axis = (int8_t)axis; manual_move_axis = (int8_t)axis;
} }
@ -1331,8 +1333,6 @@ void kill_screen(const char* lcd_msg) {
* *
*/ */
float move_menu_scale;
static void _lcd_move_xyz(const char* name, AxisEnum axis, float min, float max) { static void _lcd_move_xyz(const char* name, AxisEnum axis, float min, float max) {
if (LCD_CLICKED) { lcd_goto_previous_menu(true); return; } if (LCD_CLICKED) { lcd_goto_previous_menu(true); return; }
ENCODER_DIRECTION_NORMAL(); ENCODER_DIRECTION_NORMAL();