瀏覽代碼

Clear up ordering in G30

Scott Lahteine 9 年之前
父節點
當前提交
04e88d008e
共有 1 個檔案被更改,包括 5 行新增3 行删除
  1. 5
    3
      Marlin/Marlin_main.cpp

+ 5
- 3
Marlin/Marlin_main.cpp 查看文件

3839
    * G30: Do a single Z probe at the current XY
3839
    * G30: Do a single Z probe at the current XY
3840
    */
3840
    */
3841
   inline void gcode_G30() {
3841
   inline void gcode_G30() {
3842
+
3843
+    setup_for_endstop_move();
3844
+
3842
     deploy_z_probe();
3845
     deploy_z_probe();
3843
 
3846
 
3844
     stepper.synchronize();
3847
     stepper.synchronize();
3845
     // TODO: clear the leveling matrix or the planner will be set incorrectly
3848
     // TODO: clear the leveling matrix or the planner will be set incorrectly
3846
-    setup_for_endstop_move(); // Too late. Must be done before deploying.
3847
 
3849
 
3848
     run_z_probe();
3850
     run_z_probe();
3849
 
3851
 
3855
     SERIAL_PROTOCOL(current_position[Z_AXIS] + 0.0001);
3857
     SERIAL_PROTOCOL(current_position[Z_AXIS] + 0.0001);
3856
     SERIAL_EOL;
3858
     SERIAL_EOL;
3857
 
3859
 
3858
-    clean_up_after_endstop_move(); // Too early. must be done after the stowing.
3859
-
3860
     stow_z_probe();
3860
     stow_z_probe();
3861
 
3861
 
3862
+    clean_up_after_endstop_move();
3863
+
3862
     report_current_position();
3864
     report_current_position();
3863
   }
3865
   }
3864
 
3866
 

Loading…
取消
儲存