Browse Source

m600 fixes

Jesus 8 years ago
parent
commit
4ed976b5ff
1 changed files with 18 additions and 0 deletions
  1. 18
    0
      Marlin/ultralcd.cpp

+ 18
- 0
Marlin/ultralcd.cpp View File

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();
779
 
780
 
780
   #if ENABLED(FILAMENT_CHANGE_FEATURE)
781
   #if ENABLED(FILAMENT_CHANGE_FEATURE)
781
     void lcd_enqueue_filament_change() {
782
     void lcd_enqueue_filament_change() {
783
+      if (thermalManager.tooColdToExtrude(active_extruder)) {
784
+        lcd_save_previous_screen();
785
+        lcd_goto_screen(lcd_filament_change_toocold_menu);
786
+        return;
787
+      }
782
       lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INIT);
788
       lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INIT);
783
       enqueue_and_echo_commands_P(PSTR("M600"));
789
       enqueue_and_echo_commands_P(PSTR("M600"));
784
     }
790
     }
1336
         MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_material1_hotend0);
1342
         MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_material1_hotend0);
1337
         MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_material2_hotend0);
1343
         MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_material2_hotend0);
1338
       #endif
1344
       #endif
1345
+      //
1346
+      // Change filament
1347
+      //
1348
+      #if ENABLED(FILAMENT_CHANGE_FEATURE)
1349
+        MENU_ITEM(function, MSG_FILAMENTCHANGE, lcd_enqueue_filament_change);
1350
+      #endif
1339
     #endif
1351
     #endif
1340
 
1352
 
1341
     //
1353
     //
2378
   #endif // LCD_INFO_MENU
2390
   #endif // LCD_INFO_MENU
2379
 
2391
 
2380
   #if ENABLED(FILAMENT_CHANGE_FEATURE)
2392
   #if ENABLED(FILAMENT_CHANGE_FEATURE)
2393
+    void lcd_filament_change_toocold_menu() {
2394
+      START_MENU();
2395
+      STATIC_ITEM(MSG_HEATING_FAILED_LCD, true, true);
2396
+      MENU_BACK(MSG_FILAMENTCHANGE);
2397
+      END_MENU();
2398
+    }
2381
 
2399
 
2382
     void lcd_filament_change_resume_print() {
2400
     void lcd_filament_change_resume_print() {
2383
       filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_RESUME_PRINT;
2401
       filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_RESUME_PRINT;

Loading…
Cancel
Save