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

M0/M1/M117 fix: Add new CUSTOM_MSG states. 

When the printer prints from a SD card, the display of progress messages
and filename takes precedence over CUSTOM_MSG_TYPE_STATUS messages used
by M0/M1/M117. Let's introduce two new CUSTOM_MSG states, one that
overrides the SD status while waiting in M0/M1 (M0WAIT) and one that
ensures the message will be displayed in at least one screen update
(MSGUPD).
This commit is contained in:
Vojtech Pavlik 2019-06-06 14:25:06 +02:00
parent 5d8eb84965
commit 5494f23942
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/ultralcd.cpp
View File

@ -794,7 +794,10 @@ void lcdui_print_status_line(void)
{ // Otherwise check for other special events { // Otherwise check for other special events
switch (custom_message_type) switch (custom_message_type)
{ {
case CUSTOM_MSG_TYPE_MSGUPD:
custom_message_type = CUSTOM_MSG_TYPE_STATUS;
case CUSTOM_MSG_TYPE_STATUS: // Nothing special, print status message normally case CUSTOM_MSG_TYPE_STATUS: // Nothing special, print status message normally
case CUSTOM_MSG_TYPE_M0WAIT:
lcd_print(lcd_status_message); lcd_print(lcd_status_message);
break; break;
case CUSTOM_MSG_TYPE_MESHBL: // If mesh bed leveling in progress, show the status case CUSTOM_MSG_TYPE_MESHBL: // If mesh bed leveling in progress, show the status

2
Firmware/ultralcd.h
View File

@ -106,6 +106,8 @@ extern int8_t FSensorStateMenu;
#define CUSTOM_MSG_TYPE_PIDCAL 3 // PID tuning in progress #define CUSTOM_MSG_TYPE_PIDCAL 3 // PID tuning in progress
#define CUSTOM_MSG_TYPE_TEMCAL 4 // PINDA temp calibration #define CUSTOM_MSG_TYPE_TEMCAL 4 // PINDA temp calibration
#define CUSTOM_MSG_TYPE_TEMPRE 5 // Temp compensation preheat #define CUSTOM_MSG_TYPE_TEMPRE 5 // Temp compensation preheat
#define CUSTOM_MSG_TYPE_M0WAIT 6 // M0/M1 Wait command working even from SD
#define CUSTOM_MSG_TYPE_MSGUPD 7 // Short message even while printing from SD
extern unsigned int custom_message_type; extern unsigned int custom_message_type;
extern unsigned int custom_message_state; extern unsigned int custom_message_state;