MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #5563 from akaJes/m600

Browse Source 
FILAMENT_CHANGE_FEATURE allowed in idle mode
This commit is contained in:
Scott Lahteine 2016-12-20 01:06:10 -08:00 committed by GitHub
commit 644f45cbd8
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/ultralcd.cpp
View File

@ -145,6 +145,7 @@ uint16_t max_display_update_time = 0;
#endif // LCD_INFO_MENU #endif // LCD_INFO_MENU
#if ENABLED(FILAMENT_CHANGE_FEATURE) #if ENABLED(FILAMENT_CHANGE_FEATURE)
void lcd_filament_change_toocold_menu();
void lcd_filament_change_option_menu(); void lcd_filament_change_option_menu();
void lcd_filament_change_init_message(); void lcd_filament_change_init_message();
void lcd_filament_change_unload_message(); void lcd_filament_change_unload_message();
@ -828,6 +829,11 @@ void kill_screen(const char* lcd_msg) {
#if ENABLED(FILAMENT_CHANGE_FEATURE) #if ENABLED(FILAMENT_CHANGE_FEATURE)
void lcd_enqueue_filament_change() { void lcd_enqueue_filament_change() {
if (thermalManager.tooColdToExtrude(active_extruder)) {
lcd_save_previous_screen();
lcd_goto_screen(lcd_filament_change_toocold_menu);
return;
}
lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INIT); lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INIT);
enqueue_and_echo_commands_P(PSTR("M600")); enqueue_and_echo_commands_P(PSTR("M600"));
} }
@ -1385,6 +1391,12 @@ KeepDrawing:
MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_material1_hotend0); MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_material1_hotend0);
MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_material2_hotend0); MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_material2_hotend0);
#endif #endif
//
// Change filament
//
#if ENABLED(FILAMENT_CHANGE_FEATURE)
MENU_ITEM(function, MSG_FILAMENTCHANGE, lcd_enqueue_filament_change);
#endif
#endif #endif
// //
@ -2432,6 +2444,12 @@ KeepDrawing:
#endif // LCD_INFO_MENU #endif // LCD_INFO_MENU
#if ENABLED(FILAMENT_CHANGE_FEATURE) #if ENABLED(FILAMENT_CHANGE_FEATURE)
void lcd_filament_change_toocold_menu() {
START_MENU();
STATIC_ITEM(MSG_HEATING_FAILED_LCD, true, true);
MENU_BACK(MSG_FILAMENTCHANGE);
END_MENU();
}
void lcd_filament_change_resume_print() { void lcd_filament_change_resume_print() {
filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_RESUME_PRINT; filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_RESUME_PRINT;