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

🌐 Level Corners => Bed Tramming

Browse Source
This commit is contained in:
Scott Lahteine
2021-07-25 02:12:48 -05:00
committed by Scott Lahteine
parent d7f3228ec6
commit 157c60c93b
24 changed files with 65 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/lcd/menu/menu_bed_corners.cpp
View File

@ -179,7 +179,7 @@ static void _lcd_level_bed_corners_get_next_position() {
// Display # of good points found vs total needed
if (PAGE_CONTAINS(y - (MENU_FONT_HEIGHT), y)) {
SETCURSOR(TERN(TFT_COLOR_UI, 2, 0), cy);
lcd_put_u8str_P(GET_TEXT(MSG_LEVEL_CORNERS_GOOD_POINTS));
lcd_put_u8str_P(GET_TEXT(MSG_BED_TRAMMING_GOOD_POINTS));
IF_ENABLED(TFT_COLOR_UI, lcd_moveto(12, cy));
lcd_put_u8str(GOOD_POINTS_TO_STR(good_points));
lcd_put_wchar('/');
@ -192,7 +192,7 @@ static void _lcd_level_bed_corners_get_next_position() {
// Display the Last Z value
if (PAGE_CONTAINS(y - (MENU_FONT_HEIGHT), y)) {
SETCURSOR(TERN(TFT_COLOR_UI, 2, 0), cy);
lcd_put_u8str_P(GET_TEXT(MSG_LEVEL_CORNERS_LAST_Z));
lcd_put_u8str_P(GET_TEXT(MSG_BED_TRAMMING_LAST_Z));
IF_ENABLED(TFT_COLOR_UI, lcd_moveto(12, 2));
lcd_put_u8str(LAST_Z_TO_STR(last_z));
}
@ -204,7 +204,7 @@ static void _lcd_level_bed_corners_get_next_position() {
GET_TEXT(MSG_BUTTON_DONE), GET_TEXT(MSG_BUTTON_SKIP)
, []{ corner_probing_done = true; wait_for_probe = false; }
, []{ wait_for_probe = false; }
, GET_TEXT(MSG_LEVEL_CORNERS_RAISE)
, GET_TEXT(MSG_BED_TRAMMING_RAISE)
, (const char*)nullptr, NUL_STR
);
}
@ -214,7 +214,7 @@ static void _lcd_level_bed_corners_get_next_position() {
MenuItem_confirm::confirm_screen(
[]{ queue.inject_P(TERN(HAS_LEVELING, PSTR("G29N"), G28_STR)); ui.return_to_status(); }
, []{ ui.goto_previous_screen_no_defer(); }
, GET_TEXT(MSG_LEVEL_CORNERS_IN_RANGE)
, GET_TEXT(MSG_BED_TRAMMING_IN_RANGE)
, (const char*)nullptr, PSTR("?")
);
}

2
Marlin/src/lcd/menu/menu_bed_leveling.cpp
View File

@ -293,7 +293,7 @@ void menu_bed_leveling() {
#endif
#if ENABLED(LEVEL_BED_CORNERS)
SUBMENU(MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
SUBMENU(MSG_BED_TRAMMING, _lcd_level_bed_corners);
#endif
#if ENABLED(EEPROM_SETTINGS)

2
Marlin/src/lcd/menu/menu_motion.cpp
View File

@ -419,7 +419,7 @@ void menu_motion() {
#endif
#if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)
SUBMENU(MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
SUBMENU(MSG_BED_TRAMMING, _lcd_level_bed_corners);
#endif
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)

2
Marlin/src/lcd/menu/menu_tramming.cpp
View File

@ -61,7 +61,7 @@ static void _menu_single_probe(const uint8_t point) {
tram_index = point;
DEBUG_ECHOLNPAIR("Screen: single probe screen Arg:", point);
START_MENU();
STATIC_ITEM(MSG_LEVEL_CORNERS, SS_LEFT);
STATIC_ITEM(MSG_BED_TRAMMING, SS_LEFT);
STATIC_ITEM(MSG_LAST_VALUE_SP, SS_LEFT, ftostr42_52(z_measured[0] - z_measured[point])); // Print diff
ACTION_ITEM(MSG_UBL_BC_INSERT2, []{ if (probe_single_point()) ui.refresh(); });
ACTION_ITEM(MSG_BUTTON_DONE, []{ ui.goto_previous_screen(); }); // Back