소스 검색

Simplified probe_pt (in G30)

Scott Lahteine 9 년 전
부모
커밋
15a6b49f37
1개의 변경된 파일3개의 추가작업 그리고 11개의 파일을 삭제
  1. 3
    11
      Marlin/Marlin_main.cpp

+ 3
- 11
Marlin/Marlin_main.cpp 파일 보기

2079
     return current_position[Z_AXIS];
2079
     return current_position[Z_AXIS];
2080
   }
2080
   }
2081
 
2081
 
2082
-#endif // HAS_BED_PROBE
2083
-
2084
-#if HAS_PROBING_PROCEDURE
2085
-
2086
   inline void do_blocking_move_to_xy(float x, float y) {
2082
   inline void do_blocking_move_to_xy(float x, float y) {
2087
     do_blocking_move_to(x, y, current_position[Z_AXIS]);
2083
     do_blocking_move_to(x, y, current_position[Z_AXIS]);
2088
   }
2084
   }
3774
 
3770
 
3775
     setup_for_endstop_or_probe_move();
3771
     setup_for_endstop_or_probe_move();
3776
 
3772
 
3777
-    deploy_z_probe();
3778
-
3779
-    stepper.synchronize();
3780
-
3781
     // TODO: clear the leveling matrix or the planner will be set incorrectly
3773
     // TODO: clear the leveling matrix or the planner will be set incorrectly
3782
-    float measured_z = run_z_probe(); // clears the ABL non-delta matrix only
3774
+    float measured_z = probe_pt(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER,
3775
+                                current_position[Y_AXIS] + Y_PROBE_OFFSET_FROM_EXTRUDER,
3776
+                                true, 1);
3783
 
3777
 
3784
     SERIAL_PROTOCOLPGM("Bed X: ");
3778
     SERIAL_PROTOCOLPGM("Bed X: ");
3785
     SERIAL_PROTOCOL(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER + 0.0001);
3779
     SERIAL_PROTOCOL(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER + 0.0001);
3789
     SERIAL_PROTOCOL(measured_z + 0.0001);
3783
     SERIAL_PROTOCOL(measured_z + 0.0001);
3790
     SERIAL_EOL;
3784
     SERIAL_EOL;
3791
 
3785
 
3792
-    stow_z_probe();
3793
-
3794
     clean_up_after_endstop_or_probe_move();
3786
     clean_up_after_endstop_or_probe_move();
3795
 
3787
 
3796
     report_current_position();
3788
     report_current_position();

Loading…
취소
저장