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

MSG_WATCH => MSG_INFO_SCREEN

Browse Source
This commit is contained in:
Scott Lahteine
2020-01-03 19:46:05 -06:00
parent 00e27503ce
commit aa4db785f2
33 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/menu/menu.h
View File

@ -358,7 +358,7 @@ class MenuItem_bool : public MenuEditItemBase {
* MenuItem_<type>::action(arg3...)
*
* Examples:
* BACK_ITEM(MSG_WATCH)
* BACK_ITEM(MSG_INFO_SCREEN)
* MenuItem_back::action(plabel, ...)
* MenuItem_back::draw(sel, row, plabel, ...)
*

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

@ -81,7 +81,7 @@ extern const char M21_STR[];
void menu_main() {
START_MENU();
BACK_ITEM(MSG_WATCH);
BACK_ITEM(MSG_INFO_SCREEN);
const bool busy = printingIsActive()
#if ENABLED(SDSUPPORT)

12
Marlin/src/lcd/menu/menu_ubl.cpp
View File

@ -159,7 +159,7 @@ void _menu_ubl_height_adjust() {
START_MENU();
BACK_ITEM(MSG_EDIT_MESH);
EDIT_ITEM(int3, MSG_UBL_MESH_HEIGHT_AMOUNT, &ubl_height_amount, -9, 9, _lcd_ubl_adjust_height_cmd);
ACTION_ITEM(MSG_WATCH, ui.return_to_status);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
}
@ -178,7 +178,7 @@ void _lcd_ubl_edit_mesh() {
GCODES_ITEM(MSG_UBL_FINE_TUNE_ALL, PSTR("G29 P4 R999 T"));
GCODES_ITEM(MSG_UBL_FINE_TUNE_CLOSEST, PSTR("G29 P4 T"));
SUBMENU(MSG_UBL_MESH_HEIGHT_ADJUST, _menu_ubl_height_adjust);
ACTION_ITEM(MSG_WATCH, ui.return_to_status);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
}
@ -219,7 +219,7 @@ void _lcd_ubl_validate_mesh() {
GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M2, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
#endif
ACTION_ITEM(MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh);
ACTION_ITEM(MSG_WATCH, ui.return_to_status);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
}
@ -255,7 +255,7 @@ void _lcd_ubl_mesh_leveling() {
BACK_ITEM(MSG_UBL_TOOLS);
GCODES_ITEM(MSG_UBL_3POINT_MESH_LEVELING, PSTR("G29 J0"));
SUBMENU(MSG_UBL_GRID_MESH_LEVELING, _lcd_ubl_grid_level);
ACTION_ITEM(MSG_WATCH, ui.return_to_status);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
}
@ -284,7 +284,7 @@ void _menu_ubl_fillin() {
EDIT_ITEM(int3, MSG_UBL_FILLIN_AMOUNT, &ubl_fillin_amount, 0, 9, _lcd_ubl_fillin_amount_cmd);
GCODES_ITEM(MSG_UBL_SMART_FILLIN, PSTR("G29 P3 T0"));
GCODES_ITEM(MSG_UBL_MANUAL_FILLIN, PSTR("G29 P2 B T0"));
ACTION_ITEM(MSG_WATCH, ui.return_to_status);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
}
@ -347,7 +347,7 @@ void _lcd_ubl_build_mesh() {
GCODES_ITEM(MSG_UBL_CONTINUE_MESH, PSTR("G29 P1 C"));
ACTION_ITEM(MSG_UBL_INVALIDATE_ALL, _lcd_ubl_invalidate);
GCODES_ITEM(MSG_UBL_INVALIDATE_CLOSEST, PSTR("G29 I"));
ACTION_ITEM(MSG_WATCH, ui.return_to_status);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
}