bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Various fixes for MarlinUI and ExtUI (#12439)

Browse Source
This commit is contained in:
Marcio Teixeira
2018-11-17 21:21:44 -07:00
committed by Scott Lahteine
parent d3605cfc26
commit c1e17037e5
24 changed files with 226 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@ -917,7 +917,7 @@
}
inline void set_message_with_feedback(PGM_P const msg_P) {
ui.setstatusPGM(msg_P);
ui.set_status_P(msg_P);
ui.quick_feedback();
}

9
Marlin/src/feature/pause.cpp
View File

@ -399,14 +399,19 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u
}
/**
* For Paused Print:
* - Show "Press button (or M108) to resume"
*
* For Filament Change:
* - Show "Insert filament and press button to continue"
*
* - Wait for a click before returning
* - Heaters can time out, reheated before accepting a click
* - Heaters can time out and must reheat before continuing
*
* Used by M125 and M600
*/
#if HAS_LCD_MENU && ENABLED(EMERGENCY_PARSER)
#if (HAS_LCD_MENU || ENABLED(EXTENSIBLE_UI)) && ENABLED(EMERGENCY_PARSER)
#define _PMSG(L) L
#elif ENABLED(EMERGENCY_PARSER)
#define _PMSG(L) L##_M108