Merge pull request #8574 from thinkyhead/push_to_upstream
[1.1.x] Make MBL work more like PROBE_MANUALLY
This commit is contained in:
commit
44c7f86f49
@ -4260,8 +4260,10 @@ void home_all_axes() { gcode_G28(true); }
|
||||
|
||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(PROBE_MANUALLY)
|
||||
|
||||
#if ENABLED(PROBE_MANUALLY) && ENABLED(LCD_BED_LEVELING)
|
||||
#if ENABLED(LCD_BED_LEVELING)
|
||||
extern bool lcd_wait_for_move;
|
||||
#else
|
||||
constexpr bool lcd_wait_for_move = false;
|
||||
#endif
|
||||
|
||||
inline void _manual_goto_xy(const float &rx, const float &ry) {
|
||||
@ -4277,7 +4279,7 @@ void home_all_axes() { gcode_G28(true); }
|
||||
current_position[X_AXIS] = rx;
|
||||
current_position[Y_AXIS] = ry;
|
||||
|
||||
#if ENABLED(PROBE_MANUALLY) && ENABLED(LCD_BED_LEVELING)
|
||||
#if ENABLED(LCD_BED_LEVELING)
|
||||
lcd_wait_for_move = false;
|
||||
#endif
|
||||
}
|
||||
@ -4298,18 +4300,6 @@ void home_all_axes() { gcode_G28(true); }
|
||||
);
|
||||
}
|
||||
|
||||
void mesh_probing_done() {
|
||||
mbl.has_mesh = true;
|
||||
home_all_axes();
|
||||
set_bed_leveling_enabled(true);
|
||||
#if ENABLED(MESH_G28_REST_ORIGIN)
|
||||
current_position[Z_AXIS] = Z_MIN_POS;
|
||||
set_destination_from_current();
|
||||
buffer_line_to_destination(homing_feedrate(Z_AXIS));
|
||||
stepper.synchronize();
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
* G29: Mesh-based Z probe, probes a grid and produces a
|
||||
* mesh to compensate for variable bed height
|
||||
@ -4359,7 +4349,7 @@ void home_all_axes() { gcode_G28(true); }
|
||||
case MeshStart:
|
||||
mbl.reset();
|
||||
mbl_probe_index = 0;
|
||||
enqueue_and_echo_commands_P(PSTR("G28\nG29 S2"));
|
||||
enqueue_and_echo_commands_P(lcd_wait_for_move ? PSTR("G29 S2") : PSTR("G28\nG29 S2"));
|
||||
break;
|
||||
|
||||
case MeshNext:
|
||||
@ -4405,7 +4395,21 @@ void home_all_axes() { gcode_G28(true); }
|
||||
SERIAL_PROTOCOLLNPGM("Mesh probing done.");
|
||||
BUZZ(100, 659);
|
||||
BUZZ(100, 698);
|
||||
mesh_probing_done();
|
||||
mbl.has_mesh = true;
|
||||
|
||||
home_all_axes();
|
||||
set_bed_leveling_enabled(true);
|
||||
|
||||
#if ENABLED(MESH_G28_REST_ORIGIN)
|
||||
current_position[Z_AXIS] = Z_MIN_POS;
|
||||
set_destination_from_current();
|
||||
buffer_line_to_destination(homing_feedrate(Z_AXIS));
|
||||
stepper.synchronize();
|
||||
#endif
|
||||
|
||||
#if ENABLED(LCD_BED_LEVELING)
|
||||
lcd_wait_for_move = false;
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
|
||||
@ -4434,9 +4438,8 @@ void home_all_axes() { gcode_G28(true); }
|
||||
return;
|
||||
}
|
||||
|
||||
if (parser.seenval('Z')) {
|
||||
if (parser.seenval('Z'))
|
||||
mbl.z_values[px][py] = parser.value_linear_units();
|
||||
}
|
||||
else {
|
||||
SERIAL_CHAR('Z'); echo_not_entered();
|
||||
return;
|
||||
@ -4444,9 +4447,8 @@ void home_all_axes() { gcode_G28(true); }
|
||||
break;
|
||||
|
||||
case MeshSetZOffset:
|
||||
if (parser.seenval('Z')) {
|
||||
if (parser.seenval('Z'))
|
||||
mbl.z_offset = parser.value_linear_units();
|
||||
}
|
||||
else {
|
||||
SERIAL_CHAR('Z'); echo_not_entered();
|
||||
return;
|
||||
@ -4459,6 +4461,11 @@ void home_all_axes() { gcode_G28(true); }
|
||||
|
||||
} // switch(state)
|
||||
|
||||
if (state == MeshStart || state == MeshNext) {
|
||||
SERIAL_PROTOCOLPAIR("MBL G29 point ", min(mbl_probe_index, GRID_MAX_POINTS));
|
||||
SERIAL_PROTOCOLLNPAIR(" of ", int(GRID_MAX_POINTS));
|
||||
}
|
||||
|
||||
report_current_position();
|
||||
}
|
||||
|
||||
|
@ -54,7 +54,6 @@
|
||||
#include "planner.h"
|
||||
#elif ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING)
|
||||
#include "mesh_bed_leveling.h"
|
||||
extern void mesh_probing_done();
|
||||
#endif
|
||||
|
||||
#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(G26_MESH_VALIDATION)
|
||||
@ -557,7 +556,6 @@ uint16_t max_display_update_time = 0;
|
||||
static bool no_reentry = false;
|
||||
if (lcdDrawUpdate) lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, sync_message);
|
||||
if (no_reentry) return;
|
||||
|
||||
// Make this the current handler till all moves are done
|
||||
no_reentry = true;
|
||||
screenFunc_t old_screen = currentScreen;
|
||||
@ -1745,44 +1743,6 @@ void kill_screen(const char* lcd_msg) {
|
||||
#endif
|
||||
);
|
||||
|
||||
//
|
||||
// Raise Z to the "manual probe height"
|
||||
// Don't return until done.
|
||||
// ** This blocks the command queue! **
|
||||
//
|
||||
void _lcd_after_probing() {
|
||||
#if MANUAL_PROBE_HEIGHT > 0
|
||||
line_to_z(Z_MIN_POS + MANUAL_PROBE_HEIGHT);
|
||||
#endif
|
||||
// Display "Done" screen and wait for moves to complete
|
||||
#if MANUAL_PROBE_HEIGHT > 0 || ENABLED(MESH_BED_LEVELING)
|
||||
lcd_synchronize(PSTR(MSG_LEVEL_BED_DONE));
|
||||
#endif
|
||||
lcd_goto_previous_menu();
|
||||
lcd_completion_feedback();
|
||||
defer_return_to_status = false;
|
||||
//LCD_MESSAGEPGM(MSG_LEVEL_BED_DONE);
|
||||
}
|
||||
|
||||
#if ENABLED(MESH_BED_LEVELING)
|
||||
|
||||
// Utility to go to the next mesh point
|
||||
inline void _manual_probe_goto_xy(const float rx, const float ry) {
|
||||
#if MANUAL_PROBE_HEIGHT > 0
|
||||
const float prev_z = current_position[Z_AXIS];
|
||||
line_to_z(Z_MIN_POS + MANUAL_PROBE_HEIGHT);
|
||||
#endif
|
||||
current_position[X_AXIS] = rx;
|
||||
current_position[Y_AXIS] = ry;
|
||||
planner.buffer_line_kinematic(current_position, MMM_TO_MMS(XY_PROBE_SPEED), active_extruder);
|
||||
#if MANUAL_PROBE_HEIGHT > 0
|
||||
line_to_z(prev_z);
|
||||
#endif
|
||||
lcd_synchronize();
|
||||
}
|
||||
|
||||
#elif ENABLED(PROBE_MANUALLY)
|
||||
|
||||
bool lcd_wait_for_move;
|
||||
|
||||
//
|
||||
@ -1790,14 +1750,27 @@ void kill_screen(const char* lcd_msg) {
|
||||
// A flag is used so that this can release control
|
||||
// and allow the command queue to be processed.
|
||||
//
|
||||
// When G29 finishes the last move:
|
||||
// - Raise Z to the "manual probe height"
|
||||
// - Don't return until done.
|
||||
//
|
||||
// ** This blocks the command queue! **
|
||||
//
|
||||
void _lcd_level_bed_done() {
|
||||
if (!lcd_wait_for_move) _lcd_after_probing();
|
||||
if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_DONE));
|
||||
if (!lcd_wait_for_move) {
|
||||
#if MANUAL_PROBE_HEIGHT > 0 && DISABLED(MESH_BED_LEVELING)
|
||||
// Display "Done" screen and wait for moves to complete
|
||||
line_to_z(Z_MIN_POS + MANUAL_PROBE_HEIGHT);
|
||||
lcd_synchronize(PSTR(MSG_LEVEL_BED_DONE));
|
||||
#endif
|
||||
lcd_goto_previous_menu();
|
||||
lcd_completion_feedback();
|
||||
defer_return_to_status = false;
|
||||
}
|
||||
if (lcdDrawUpdate) lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, PSTR(MSG_LEVEL_BED_DONE));
|
||||
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
void _lcd_level_goto_next_point();
|
||||
|
||||
/**
|
||||
@ -1809,46 +1782,24 @@ void kill_screen(const char* lcd_msg) {
|
||||
if (lcd_clicked) {
|
||||
|
||||
//
|
||||
// Save the current Z position
|
||||
// Save the current Z position and move
|
||||
//
|
||||
|
||||
#if ENABLED(MESH_BED_LEVELING)
|
||||
|
||||
//
|
||||
// MBL records the position but doesn't move to the next one
|
||||
//
|
||||
|
||||
mbl.set_zigzag_z(manual_probe_index, current_position[Z_AXIS]);
|
||||
|
||||
#endif
|
||||
|
||||
// If done...
|
||||
if (++manual_probe_index >= total_probe_points) {
|
||||
|
||||
#if ENABLED(PROBE_MANUALLY)
|
||||
|
||||
//
|
||||
// The last G29 will record and enable but not move.
|
||||
// The last G29 records the point and enables bed leveling
|
||||
//
|
||||
lcd_wait_for_move = true;
|
||||
enqueue_and_echo_commands_P(PSTR("G29 V1"));
|
||||
lcd_goto_screen(_lcd_level_bed_done);
|
||||
|
||||
#if ENABLED(PROBE_MANUALLY)
|
||||
enqueue_and_echo_commands_P(PSTR("G29 V1"));
|
||||
#elif ENABLED(MESH_BED_LEVELING)
|
||||
|
||||
_lcd_after_probing();
|
||||
|
||||
mbl.has_mesh = true;
|
||||
mesh_probing_done();
|
||||
|
||||
enqueue_and_echo_commands_P(PSTR("G29 S2"));
|
||||
#endif
|
||||
|
||||
}
|
||||
else {
|
||||
// MESH_BED_LEVELING: Z already stored, just move
|
||||
// PROBE_MANUALLY: Send G29 to record Z, then move
|
||||
else
|
||||
_lcd_level_goto_next_point();
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
@ -1884,39 +1835,22 @@ void kill_screen(const char* lcd_msg) {
|
||||
lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_NEXT_POINT), msg);
|
||||
}
|
||||
lcdDrawUpdate = LCDVIEW_CALL_NO_REDRAW;
|
||||
#if ENABLED(PROBE_MANUALLY)
|
||||
if (!lcd_wait_for_move) lcd_goto_screen(_lcd_level_bed_get_z);
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
* Step 5: Initiate a move to the next point
|
||||
*/
|
||||
void _lcd_level_goto_next_point() {
|
||||
|
||||
// Set the menu to display ahead of blocking call
|
||||
lcd_goto_screen(_lcd_level_bed_moving);
|
||||
|
||||
#if ENABLED(MESH_BED_LEVELING)
|
||||
|
||||
int8_t px, py;
|
||||
mbl.zigzag(manual_probe_index, px, py);
|
||||
|
||||
// Controls the loop until the move is done
|
||||
_manual_probe_goto_xy(
|
||||
mbl.index_to_xpos[px],
|
||||
mbl.index_to_ypos[py]
|
||||
);
|
||||
|
||||
// After the blocking function returns, change menus
|
||||
lcd_goto_screen(_lcd_level_bed_get_z);
|
||||
|
||||
#elif ENABLED(PROBE_MANUALLY)
|
||||
|
||||
// G29 Records Z, moves, and signals when it pauses
|
||||
lcd_wait_for_move = true;
|
||||
#if ENABLED(PROBE_MANUALLY)
|
||||
enqueue_and_echo_commands_P(PSTR("G29 V1"));
|
||||
|
||||
#elif ENABLED(MESH_BED_LEVELING)
|
||||
enqueue_and_echo_commands_P(manual_probe_index ? PSTR("G29 S2") : PSTR("G29 S1"));
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -1982,10 +1916,15 @@ void kill_screen(const char* lcd_msg) {
|
||||
START_MENU();
|
||||
MENU_BACK(MSG_PREPARE);
|
||||
|
||||
#if DISABLED(MESH_BED_LEVELING)
|
||||
if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]))
|
||||
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
|
||||
else if (leveling_is_valid())
|
||||
else
|
||||
#endif
|
||||
if (leveling_is_valid()) {
|
||||
new_level_state = planner.leveling_active;
|
||||
MENU_ITEM_EDIT_CALLBACK(bool, MSG_BED_LEVELING, &new_level_state, _lcd_toggle_bed_leveling);
|
||||
}
|
||||
|
||||
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
||||
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_Z_FADE_HEIGHT, &new_z_fade_height, 0.0, 100.0, _lcd_set_z_fade_height);
|
||||
@ -2021,9 +1960,6 @@ void kill_screen(const char* lcd_msg) {
|
||||
|
||||
void _lcd_goto_bed_leveling() {
|
||||
lcd_goto_screen(lcd_bed_leveling);
|
||||
#if ENABLED(LCD_BED_LEVELING)
|
||||
new_level_state = planner.leveling_active;
|
||||
#endif
|
||||
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
||||
new_z_fade_height = planner.z_fade_height;
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user