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

Merge pull request #4123 from gudnimg/improve-mmu-status 

Minor UI fixes for MMU status line during toolchange
This commit is contained in:
Alex Voinea 2023-04-14 10:46:29 +02:00 committed by GitHub
parent c15ea67379 f34c1ffeac
commit 8241be273b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Firmware/mmu2_reporting.cpp
View File

@ -20,7 +20,9 @@ void BeginReport(CommandInProgress /*cip*/, uint16_t ec) {
void EndReport(CommandInProgress /*cip*/, uint16_t /*ec*/) { void EndReport(CommandInProgress /*cip*/, uint16_t /*ec*/) {
// clear the status msg line - let the printed filename get visible again // clear the status msg line - let the printed filename get visible again
lcd_setstatuspgm(MSG_WELCOME); // should be seen only when the printer is not printing a file if (!printJobOngoing()) {
lcd_setstatuspgm(MSG_WELCOME);
}
custom_message_type = CustomMsg::Status; custom_message_type = CustomMsg::Status;
} }
@ -270,11 +272,6 @@ void ReportProgressHook(CommandInProgress cip, uint16_t ec) {
if (cip != CommandInProgress::NoCommand) { if (cip != CommandInProgress::NoCommand) {
custom_message_type = CustomMsg::MMUProgress; custom_message_type = CustomMsg::MMUProgress;
lcd_setstatuspgm( _T(ProgressCodeToText(ec)) ); lcd_setstatuspgm( _T(ProgressCodeToText(ec)) );
} else {
// If there is no command in progress we can display other
// useful information such as the name of the SD file
// being printed
custom_message_type = CustomMsg::Status;
} }
} }