浏览代码

Merge pull request #5563 from akaJes/m600

FILAMENT_CHANGE_FEATURE allowed in idle mode
Scott Lahteine 8 年前
父节点
当前提交
644f45cbd8
共有 1 个文件被更改,包括 18 次插入0 次删除
  1. 18
    0
      Marlin/ultralcd.cpp

+ 18
- 0
Marlin/ultralcd.cpp 查看文件

145
   #endif // LCD_INFO_MENU
145
   #endif // LCD_INFO_MENU
146
 
146
 
147
   #if ENABLED(FILAMENT_CHANGE_FEATURE)
147
   #if ENABLED(FILAMENT_CHANGE_FEATURE)
148
+    void lcd_filament_change_toocold_menu();
148
     void lcd_filament_change_option_menu();
149
     void lcd_filament_change_option_menu();
149
     void lcd_filament_change_init_message();
150
     void lcd_filament_change_init_message();
150
     void lcd_filament_change_unload_message();
151
     void lcd_filament_change_unload_message();
828
 
829
 
829
   #if ENABLED(FILAMENT_CHANGE_FEATURE)
830
   #if ENABLED(FILAMENT_CHANGE_FEATURE)
830
     void lcd_enqueue_filament_change() {
831
     void lcd_enqueue_filament_change() {
832
+      if (thermalManager.tooColdToExtrude(active_extruder)) {
833
+        lcd_save_previous_screen();
834
+        lcd_goto_screen(lcd_filament_change_toocold_menu);
835
+        return;
836
+      }
831
       lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INIT);
837
       lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INIT);
832
       enqueue_and_echo_commands_P(PSTR("M600"));
838
       enqueue_and_echo_commands_P(PSTR("M600"));
833
     }
839
     }
1385
         MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_material1_hotend0);
1391
         MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_material1_hotend0);
1386
         MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_material2_hotend0);
1392
         MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_material2_hotend0);
1387
       #endif
1393
       #endif
1394
+      //
1395
+      // Change filament
1396
+      //
1397
+      #if ENABLED(FILAMENT_CHANGE_FEATURE)
1398
+        MENU_ITEM(function, MSG_FILAMENTCHANGE, lcd_enqueue_filament_change);
1399
+      #endif
1388
     #endif
1400
     #endif
1389
 
1401
 
1390
     //
1402
     //
2432
   #endif // LCD_INFO_MENU
2444
   #endif // LCD_INFO_MENU
2433
 
2445
 
2434
   #if ENABLED(FILAMENT_CHANGE_FEATURE)
2446
   #if ENABLED(FILAMENT_CHANGE_FEATURE)
2447
+    void lcd_filament_change_toocold_menu() {
2448
+      START_MENU();
2449
+      STATIC_ITEM(MSG_HEATING_FAILED_LCD, true, true);
2450
+      MENU_BACK(MSG_FILAMENTCHANGE);
2451
+      END_MENU();
2452
+    }
2435
 
2453
 
2436
     void lcd_filament_change_resume_print() {
2454
     void lcd_filament_change_resume_print() {
2437
       filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_RESUME_PRINT;
2455
       filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_RESUME_PRINT;

正在加载...
取消
保存