🩹 Fix manual move titles (#24518)

This commit is contained in:
Scott Lahteine
2022-07-18 19:52:47 -05:00
committed by GitHub
parent 48e4863cb6
commit ed2071aabd
29 changed files with 35 additions and 10 deletions

View File

@@ -191,7 +191,7 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
else {
#if ENABLED(MOVE_Z_WHEN_IDLE)
ui.manual_move.menu_scale = MOVE_Z_IDLE_MULTIPLICATOR;
screen = lcd_move_z;
screen = []{ lcd_move_axis(Z_AXIS); };
#endif
}
}

View File

@@ -214,8 +214,6 @@ void menu_move();
//////// Menu Item Helper Functions ////////
////////////////////////////////////////////
void lcd_move_axis(const AxisEnum);
void lcd_move_z();
void _lcd_draw_homing();
#define HAS_LINE_TO_Z ANY(DELTA, PROBE_MANUALLY, MESH_BED_LEVELING, LCD_BED_TRAMMING)

View File

@@ -52,7 +52,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
ui.wait_for_move = false;
ui.synchronize();
ui.manual_move.menu_scale = _MAX(PROBE_MANUALLY_STEP, MIN_STEPS_PER_SEGMENT / planner.settings.axis_steps_per_mm[0]); // Use first axis as for delta XYZ should always match
ui.goto_screen(lcd_move_z);
ui.goto_screen([]{ lcd_move_axis(Z_AXIS); });
}
}

View File

@@ -31,8 +31,6 @@
#include "../../module/planner.h"
#endif
void lcd_move_z();
////////////////////////////////////////////
///////////// Base Menu Items //////////////
////////////////////////////////////////////

View File

@@ -74,6 +74,7 @@ void lcd_move_axis(const AxisEnum axis) {
}
ui.encoderPosition = 0;
if (ui.should_draw()) {
MenuEditItemBase::itemIndex = axis;
const float pos = ui.manual_move.axis_value(axis);
if (parser.using_inch_units()) {
const float imp_pos = LINEAR_UNIT(pos);
@@ -84,9 +85,6 @@ void lcd_move_axis(const AxisEnum axis) {
}
}
// Move Z easy accessor
void lcd_move_z() { lcd_move_axis(Z_AXIS); }
#if E_MANUAL
static void lcd_move_e(TERN_(MULTI_E_MANUAL, const int8_t eindex=active_extruder)) {
@@ -118,7 +116,7 @@ void lcd_move_z() { lcd_move_axis(Z_AXIS); }
void _goto_manual_move_z(const_float_t scale) {
ui.manual_move.menu_scale = scale;
ui.goto_screen(lcd_move_z);
ui.goto_screen([]{ lcd_move_axis(Z_AXIS); });
}
#endif