Przeglądaj źródła

Merge pull request #7811 from thinkyhead/bf1_fix_resume_print

[1.1.x] Fix broken M600 resume_print
Scott Lahteine 7 lat temu
rodzic
commit
f365448338
2 zmienionych plików z 6 dodań i 4 usunięć
  1. 4
    2
      Marlin/Marlin_main.cpp
  2. 2
    2
      Marlin/ultralcd_impl_HD44780.h

+ 4
- 2
Marlin/Marlin_main.cpp Wyświetl plik

5674
           float a_sum = 0.0;
5674
           float a_sum = 0.0;
5675
           LOOP_XYZ(axis) a_sum += delta_tower_angle_trim[axis];
5675
           LOOP_XYZ(axis) a_sum += delta_tower_angle_trim[axis];
5676
           LOOP_XYZ(axis) delta_tower_angle_trim[axis] -= a_sum / 3.0;
5676
           LOOP_XYZ(axis) delta_tower_angle_trim[axis] -= a_sum / 3.0;
5677
-          
5677
+
5678
           // adjust delta_height and endstops by the max amount
5678
           // adjust delta_height and endstops by the max amount
5679
           const float z_temp = MAX3(endstop_adj[A_AXIS], endstop_adj[B_AXIS], endstop_adj[C_AXIS]);
5679
           const float z_temp = MAX3(endstop_adj[A_AXIS], endstop_adj[B_AXIS], endstop_adj[C_AXIS]);
5680
           home_offset[Z_AXIS] -= z_temp;
5680
           home_offset[Z_AXIS] -= z_temp;
6369
       filament_change_beep(max_beep_count, true);
6369
       filament_change_beep(max_beep_count, true);
6370
     #endif
6370
     #endif
6371
 
6371
 
6372
+    set_destination_to_current();
6373
+
6372
     if (load_length != 0) {
6374
     if (load_length != 0) {
6373
       #if ENABLED(ULTIPANEL)
6375
       #if ENABLED(ULTIPANEL)
6374
         // Show "insert filament"
6376
         // Show "insert filament"
8580
     #endif
8582
     #endif
8581
     LOOP_XYZ(i) {
8583
     LOOP_XYZ(i) {
8582
       if (parser.seen(axis_codes[i])) {
8584
       if (parser.seen(axis_codes[i])) {
8583
-        if (parser.value_linear_units() * Z_HOME_DIR <= 0)         
8585
+        if (parser.value_linear_units() * Z_HOME_DIR <= 0)
8584
           endstop_adj[i] = parser.value_linear_units();
8586
           endstop_adj[i] = parser.value_linear_units();
8585
         #if ENABLED(DEBUG_LEVELING_FEATURE)
8587
         #if ENABLED(DEBUG_LEVELING_FEATURE)
8586
           if (DEBUGGING(LEVELING)) {
8588
           if (DEBUGGING(LEVELING)) {

+ 2
- 2
Marlin/ultralcd_impl_HD44780.h Wyświetl plik

790
     lcd.setCursor(LCD_WIDTH - 8, 1);
790
     lcd.setCursor(LCD_WIDTH - 8, 1);
791
     _draw_axis_label(Z_AXIS, PSTR(MSG_Z), blink);
791
     _draw_axis_label(Z_AXIS, PSTR(MSG_Z), blink);
792
     lcd.print(ftostr52sp(FIXFLOAT(current_position[Z_AXIS])));
792
     lcd.print(ftostr52sp(FIXFLOAT(current_position[Z_AXIS])));
793
-    
793
+
794
     #if HAS_LEVELING
794
     #if HAS_LEVELING
795
       lcd.write(leveling_is_active() || blink ? '_' : ' ');
795
       lcd.write(leveling_is_active() || blink ? '_' : ' ');
796
     #endif
796
     #endif
797
-  
797
+
798
   #endif // LCD_HEIGHT > 2
798
   #endif // LCD_HEIGHT > 2
799
 
799
 
800
   //
800
   //

Ładowanie…
Anuluj
Zapisz