Browse Source

M600: "is color clear?" menu synchronization

PavelSindler 6 years ago
parent
commit
aaf65051f9
2 changed files with 7 additions and 3 deletions
  1. 3 1
      Firmware/Marlin_main.cpp
  2. 4 2
      Firmware/ultralcd.cpp

+ 3 - 1
Firmware/Marlin_main.cpp

@@ -8926,7 +8926,9 @@ void M600_check_state()
 
 				// Filament loaded properly but color is not clear
 				case 3:
-					load_filament_final_feed();
+					st_synchronize();
+					current_position[E_AXIS]+= FILAMENTCHANGE_FINALFEED;
+					plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 200/60, active_extruder);
 					lcd_loading_color();
 					break;
                  

+ 4 - 2
Firmware/ultralcd.cpp

@@ -2268,6 +2268,7 @@ void lcd_change_success() {
 
 
 void lcd_loading_color() {
+	//we are extruding 25mm with feedrate 200mm/min -> 7.5 seconds for whole action, 0.375 s for one character
 
   lcd_clear();
 
@@ -2282,10 +2283,11 @@ void lcd_loading_color() {
 
     lcd_set_cursor(i, 3);
     lcd_print(".");
-    for (int j = 0; j < 10 ; j++) {
+	//0.375 s delay:
+    for (int j = 0; j < 5 ; j++) {
       manage_heater();
       manage_inactivity(true);
-      delay(85);
+      delay(75);
 
     }