瀏覽代碼

Always do st_synchronize() before G28

Scott Lahteine 10 年之前
父節點
當前提交
fa951f8a0b
共有 1 個文件被更改,包括 4 次插入8 次删除
  1. 4
    8
      Marlin/Marlin_main.cpp

+ 4
- 8
Marlin/Marlin_main.cpp 查看文件

@@ -1845,6 +1845,9 @@ inline void gcode_G4() {
1845 1845
  */
1846 1846
 inline void gcode_G28() {
1847 1847
 
1848
+  // Wait for planner moves to finish!
1849
+  st_synchronize();
1850
+
1848 1851
   // For auto bed leveling, clear the level matrix
1849 1852
   #ifdef ENABLE_AUTO_BED_LEVELING
1850 1853
     plan_bed_level_matrix.set_to_identity();
@@ -1859,12 +1862,7 @@ inline void gcode_G28() {
1859 1862
     mbl.active = 0;
1860 1863
   #endif
1861 1864
 
1862
-  saved_feedrate = feedrate;
1863
-  saved_feedrate_multiplier = feedrate_multiplier;
1864
-  feedrate_multiplier = 100;
1865
-  refresh_cmd_timeout();
1866
-
1867
-  enable_endstops(true);
1865
+  setup_for_endstop_move();
1868 1866
 
1869 1867
   set_destination_to_current();
1870 1868
 
@@ -3150,8 +3148,6 @@ inline void gcode_M42() {
3150 3148
 
3151 3149
     clean_up_after_endstop_move();
3152 3150
 
3153
-    // enable_endstops(true);
3154
-
3155 3151
     if (verbose_level > 0) {
3156 3152
       SERIAL_PROTOCOLPGM("Mean: ");
3157 3153
       SERIAL_PROTOCOL_F(mean, 6);

Loading…
取消
儲存