josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix a few ambiguous overloaded calls" 

This reverts commit b7c42e83cf.
This commit is contained in:
3d-gussner 2023-04-04 16:12:41 +02:00
parent 46852e9941
commit 4cf46893fc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -3464,7 +3464,7 @@ static void mmu_M600_unload_filament() {
lcd_clear();
lcd_puts_at_P(0, 1, _T(MSG_UNLOADING_FILAMENT));
lcd_print(' ');
lcd_print(uint8_t(MMU2::mmu2.get_current_tool() + 1));
lcd_print(MMU2::mmu2.get_current_tool() + 1);
// unload just current filament for multimaterial printers (used also in M702)
MMU2::mmu2.unload();

2
Firmware/mmu2_reporting.cpp
View File

@ -320,7 +320,7 @@ static void FullScreenMsg(const char *pgmS, uint8_t slot){
lcd_clear();
lcd_puts_at_P(0, 1, pgmS);
lcd_print(' ');
lcd_print(uint8_t(slot + 1));
lcd_print(slot + 1);
}
void FullScreenMsgCut(uint8_t slot){

4
Firmware/ultralcd.cpp
View File

@ -583,7 +583,7 @@ void lcdui_print_status_line(void) {
lcd_space(LCD_WIDTH);
lcd_puts_at_P(0, 3, _T(MSG_CALIBRATE_Z_AUTO));
lcd_puts_P(PSTR(" : "));
lcd_print(uint8_t(custom_message_state - 10));
lcd_print(custom_message_state - 10);
} else {
if (custom_message_state == 3) {
lcd_setstatuspgm(MSG_WELCOME);
@ -4796,7 +4796,7 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite
for (uint_least8_t i = 0; i < ordinary_items; i++)
{
lcd_set_cursor(2 + item_len, i+1);
lcd_print(uint8_t(first + i + 1));
lcd_print(first + i + 1);
}
if (last_item&&last_visible) lcd_puts_at_P(1, 3, last_item);