Browse Source

flush comment to match 1.1.x

Scott Lahteine 7 years ago
parent
commit
8d71ad37cb
2 changed files with 7 additions and 22 deletions
  1. 3
    10
      Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
  2. 4
    12
      Marlin/src/gcode/bedlevel/G26.cpp

+ 3
- 10
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp View File

767
           const float measured_z = probe_pt(rawx, rawy, stow_probe, g29_verbose_level); // TODO: Needs error handling
767
           const float measured_z = probe_pt(rawx, rawy, stow_probe, g29_verbose_level); // TODO: Needs error handling
768
           z_values[location.x_index][location.y_index] = measured_z;
768
           z_values[location.x_index][location.y_index] = measured_z;
769
         }
769
         }
770
-        MYSERIAL0.flush(); // G29 P2's take a long time to complete.   PronterFace can
771
-                           // over run the serial character buffer with M105's without
772
-                           // this fix
773
-
770
+        MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
774
       } while (location.x_index >= 0 && --max_iterations);
771
       } while (location.x_index >= 0 && --max_iterations);
775
 
772
 
776
       STOW_PROBE();
773
       STOW_PROBE();
908
           SERIAL_PROTOCOL_F(z_values[location.x_index][location.y_index], 6);
905
           SERIAL_PROTOCOL_F(z_values[location.x_index][location.y_index], 6);
909
           SERIAL_EOL();
906
           SERIAL_EOL();
910
         }
907
         }
911
-        MYSERIAL0.flush(); // G29 P2's take a long time to complete.   PronterFace can
912
-                           // over run the serial character buffer with M105's without
913
-                           // this fix
908
+        MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
914
       } while (location.x_index >= 0 && location.y_index >= 0);
909
       } while (location.x_index >= 0 && location.y_index >= 0);
915
 
910
 
916
       if (do_ubl_mesh_map) display_map(g29_map_type);  // show user where we're probing
911
       if (do_ubl_mesh_map) display_map(g29_map_type);  // show user where we're probing
1422
             do_blocking_move_to_z(h_offset + new_z); // Move the nozzle as the point is edited
1417
             do_blocking_move_to_z(h_offset + new_z); // Move the nozzle as the point is edited
1423
           #endif
1418
           #endif
1424
           idle();
1419
           idle();
1425
-          MYSERIAL0.flush(); // G29 P2's take a long time to complete.   PronterFace can
1426
-                             // over run the serial character buffer with M105's without
1427
-                             // this fix
1420
+          MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
1428
         } while (!is_lcd_clicked());
1421
         } while (!is_lcd_clicked());
1429
 
1422
 
1430
         if (!lcd_map_control) lcd_return_to_status();
1423
         if (!lcd_map_control) lcd_return_to_status();

+ 4
- 12
Marlin/src/gcode/bedlevel/G26.cpp View File

437
             SERIAL_EOL();
437
             SERIAL_EOL();
438
           }
438
           }
439
           idle();
439
           idle();
440
-          MYSERIAL0.flush(); // G26 takes a long time to complete. PronterFace may
441
-                             // overwhelm the serial buffer with M105's without this fix.
440
+          MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
442
         }
441
         }
443
     #if ENABLED(ULTRA_LCD)
442
     #if ENABLED(ULTRA_LCD)
444
       }
443
       }
461
       SERIAL_EOL();
460
       SERIAL_EOL();
462
     }
461
     }
463
     idle();
462
     idle();
464
-
465
-    MYSERIAL0.flush(); // G26 takes a long time to complete.   PronterFace can
466
-                       // over run the serial character buffer with M105's without
467
-                       // this fix
463
+    MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
468
   }
464
   }
469
 
465
 
470
   #if ENABLED(ULTRA_LCD)
466
   #if ENABLED(ULTRA_LCD)
824
         //}
820
         //}
825
 
821
 
826
         print_line_from_here_to_there(rx, ry, g26_layer_height, xe, ye, g26_layer_height);
822
         print_line_from_here_to_there(rx, ry, g26_layer_height, xe, ye, g26_layer_height);
827
-        MYSERIAL0.flush(); // G26 takes a long time to complete.   PronterFace can
828
-                           // over run the serial character buffer with M105's without
829
-                           // this fix
823
+        MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
830
       }
824
       }
831
       if (look_for_lines_to_connect())
825
       if (look_for_lines_to_connect())
832
         goto LEAVE;
826
         goto LEAVE;
833
     }
827
     }
834
-    MYSERIAL0.flush(); // G26 takes a long time to complete.   PronterFace can
835
-                       // over run the serial character buffer with M105's without
836
-                       // this fix
828
+    MYSERIAL0.flush(); // Prevent host M105 buffer overrun.
837
   } while (--g26_repeats && location.x_index >= 0 && location.y_index >= 0);
829
   } while (--g26_repeats && location.x_index >= 0 && location.y_index >= 0);
838
 
830
 
839
   LEAVE:
831
   LEAVE:

Loading…
Cancel
Save