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

Fix issue where MMU status messages were not padded 

Also combined common cases to reduce code size
This commit is contained in:
Guðni Már Gilbert 2022-10-09 10:37:33 +00:00
parent 2067cddc46
commit 1c6345a85b
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Firmware/ultralcd.cpp
View File

@ -621,6 +621,8 @@ void lcdui_print_status_line(void) {
case CustomMsg::M117: // M117 Set the status line message on the LCD case CustomMsg::M117: // M117 Set the status line message on the LCD
case CustomMsg::Status: // Nothing special, print status message normally case CustomMsg::Status: // Nothing special, print status message normally
case CustomMsg::M0Wait: // M0/M1 Wait command working even from SD case CustomMsg::M0Wait: // M0/M1 Wait command working even from SD
case CustomMsg::FilamentLoading: // If loading filament, print status
case CustomMsg::MMUProgress: // MMU Progress Codes
lcd_print_pad(lcd_status_message, LCD_WIDTH); lcd_print_pad(lcd_status_message, LCD_WIDTH);
break; break;
case CustomMsg::MeshBedLeveling: // If mesh bed leveling in progress, show the status case CustomMsg::MeshBedLeveling: // If mesh bed leveling in progress, show the status
@ -643,9 +645,6 @@ void lcdui_print_status_line(void) {
} }
} }
break; break;
case CustomMsg::FilamentLoading: // If loading filament, print status
lcd_print_pad(lcd_status_message, LCD_WIDTH);
break;
case CustomMsg::PidCal: // PID tuning in progress case CustomMsg::PidCal: // PID tuning in progress
lcd_print_pad(lcd_status_message, LCD_WIDTH); lcd_print_pad(lcd_status_message, LCD_WIDTH);
if (pid_cycle <= pid_number_of_cycles && custom_message_state > 0) { if (pid_cycle <= pid_number_of_cycles && custom_message_state > 0) {
@ -670,10 +669,6 @@ void lcdui_print_status_line(void) {
case CustomMsg::Resuming: // Resuming case CustomMsg::Resuming: // Resuming
lcd_puts_at_P(0, 3, _T(MSG_RESUMING_PRINT)); lcd_puts_at_P(0, 3, _T(MSG_RESUMING_PRINT));
break; break;
case CustomMsg::MMUProgress:
// set up at mmu2_reporting.cpp, just do nothing here
lcd_print(lcd_status_message);
break;
} }
} }
} }