diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index bcccc01a7..8bd186043 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1634,7 +1634,7 @@ static void lcd_menu_fails_stats_print() static void lcd_menu_fails_stats() { START_MENU(); - MENU_ITEM(back, MSG_MAIN, lcd_main_menu); + MENU_ITEM(back, MSG_MAIN, 0); MENU_ITEM(submenu, PSTR("Last print"), lcd_menu_fails_stats_print); MENU_ITEM(submenu, PSTR("Total"), lcd_menu_fails_stats_total); END_MENU(); @@ -1753,7 +1753,7 @@ static void lcd_preheat_menu() { START_MENU(); - MENU_ITEM(back, MSG_MAIN, lcd_main_menu); + MENU_ITEM(back, MSG_MAIN, 0); if (farm_mode) { MENU_ITEM(function, PSTR("farm - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FARM_PREHEAT_HPB_TEMP)), lcd_preheat_farm); @@ -1795,40 +1795,40 @@ static void lcd_support_menu() START_MENU(); - MENU_ITEM(back, MSG_MAIN, lcd_main_menu); + MENU_ITEM(back, MSG_MAIN, 0); - MENU_ITEM(back, PSTR("Firmware:"), lcd_main_menu); - MENU_ITEM(back, PSTR(" " FW_VERSION_FULL), lcd_main_menu); + MENU_ITEM(back, PSTR("Firmware:"), 0); + MENU_ITEM(back, PSTR(" " FW_VERSION_FULL), 0); #if (FW_DEV_VERSION != FW_VERSION_GOLD) && (FW_DEV_VERSION != FW_VERSION_RC) - MENU_ITEM(back, PSTR(" repo " FW_REPOSITORY), lcd_main_menu); + MENU_ITEM(back, PSTR(" repo " FW_REPOSITORY), 0); #endif // Ideally this block would be optimized out by the compiler. /* const uint8_t fw_string_len = strlen_P(FW_VERSION_STR_P()); if (fw_string_len < 6) { - MENU_ITEM(back, PSTR(MSG_FW_VERSION " - " FW_version), lcd_main_menu); + MENU_ITEM(back, PSTR(MSG_FW_VERSION " - " FW_version), 0); } else { - MENU_ITEM(back, PSTR("FW - " FW_version), lcd_main_menu); + MENU_ITEM(back, PSTR("FW - " FW_version), 0); }*/ - MENU_ITEM(back, MSG_PRUSA3D, lcd_main_menu); - MENU_ITEM(back, MSG_PRUSA3D_FORUM, lcd_main_menu); - MENU_ITEM(back, MSG_PRUSA3D_HOWTO, lcd_main_menu); - MENU_ITEM(back, PSTR("------------"), lcd_main_menu); - MENU_ITEM(back, PSTR(FILAMENT_SIZE), lcd_main_menu); - MENU_ITEM(back, PSTR(ELECTRONICS),lcd_main_menu); - MENU_ITEM(back, PSTR(NOZZLE_TYPE),lcd_main_menu); - MENU_ITEM(back, PSTR("------------"), lcd_main_menu); - MENU_ITEM(back, MSG_DATE, lcd_main_menu); - MENU_ITEM(back, PSTR(__DATE__), lcd_main_menu); + MENU_ITEM(back, MSG_PRUSA3D, 0); + MENU_ITEM(back, MSG_PRUSA3D_FORUM, 0); + MENU_ITEM(back, MSG_PRUSA3D_HOWTO, 0); + MENU_ITEM(back, PSTR("------------"), 0); + MENU_ITEM(back, PSTR(FILAMENT_SIZE), 0); + MENU_ITEM(back, PSTR(ELECTRONICS),0); + MENU_ITEM(back, PSTR(NOZZLE_TYPE),0); + MENU_ITEM(back, PSTR("------------"), 0); + MENU_ITEM(back, MSG_DATE, 0); + MENU_ITEM(back, PSTR(__DATE__), 0); // Show the FlashAir IP address, if the card is available. if (menuData.supportMenu.is_flash_air) { - MENU_ITEM(back, PSTR("------------"), lcd_main_menu); - MENU_ITEM(back, PSTR("FlashAir IP Addr:"), lcd_main_menu); - MENU_ITEM(back_RAM, menuData.supportMenu.ip_str, lcd_main_menu); + MENU_ITEM(back, PSTR("------------"), 0); + MENU_ITEM(back, PSTR("FlashAir IP Addr:"), 0); + MENU_ITEM(back_RAM, menuData.supportMenu.ip_str, 0); } #ifndef MK1BP - MENU_ITEM(back, PSTR("------------"), lcd_main_menu); + MENU_ITEM(back, PSTR("------------"), 0); if (!IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) MENU_ITEM(function, MSG_XYZ_DETAILS, lcd_service_mode_show_result); MENU_ITEM(submenu, MSG_INFO_EXTRUDER, lcd_menu_extruder_info); @@ -2494,7 +2494,7 @@ static void lcd_adjust_bed() eeprom_update_int8((unsigned char*)EEPROM_BED_CORRECTION_REAR, menuData.adjustBed.rear = menuData.adjustBed.rear2); START_MENU(); - MENU_ITEM(back, MSG_SETTINGS, lcd_calibration_menu); + MENU_ITEM(back, MSG_SETTINGS, 0); MENU_ITEM_EDIT(int3, MSG_BED_CORRECTION_LEFT, &menuData.adjustBed.left2, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX); MENU_ITEM_EDIT(int3, MSG_BED_CORRECTION_RIGHT, &menuData.adjustBed.right2, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX); MENU_ITEM_EDIT(int3, MSG_BED_CORRECTION_FRONT, &menuData.adjustBed.front2, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX); @@ -3409,7 +3409,7 @@ void lcd_pick_babystep(){ void lcd_move_menu_axis() { START_MENU(); - MENU_ITEM(back, MSG_SETTINGS, lcd_settings_menu); + MENU_ITEM(back, MSG_SETTINGS, 0); MENU_ITEM(submenu, MSG_MOVE_X, lcd_move_x); MENU_ITEM(submenu, MSG_MOVE_Y, lcd_move_y); MENU_ITEM(submenu, MSG_MOVE_Z, lcd_move_z); @@ -3604,9 +3604,9 @@ static void lcd_language_menu() { START_MENU(); if (langsel == LANGSEL_OFF) { - MENU_ITEM(back, MSG_SETTINGS, lcd_settings_menu); + MENU_ITEM(back, MSG_SETTINGS, 0); } else if (langsel == LANGSEL_ACTIVE) { - MENU_ITEM(back, MSG_WATCH, lcd_status_screen); + MENU_ITEM(back, MSG_WATCH, 0); } for (int i=0;i