浏览代码

Add MANUAL_PROBE_START_Z for manual probing

Scott Lahteine 6 年前
父节点
当前提交
2106fa26b1
共有 3 个文件被更改,包括 10 次插入1 次删除
  1. 1
    0
      Marlin/Configuration.h
  2. 1
    0
      Marlin/src/config/default/Configuration.h
  3. 8
    1
      Marlin/src/feature/bedlevel/bedlevel.cpp

+ 1
- 0
Marlin/Configuration.h 查看文件

@@ -699,6 +699,7 @@
699 699
  * or (with LCD_BED_LEVELING) the LCD controller.
700 700
  */
701 701
 //#define PROBE_MANUALLY
702
+//#define MANUAL_PROBE_START_Z 0.2
702 703
 
703 704
 /**
704 705
  * A Fix-Mounted Probe either doesn't deploy or needs manual deployment.

+ 1
- 0
Marlin/src/config/default/Configuration.h 查看文件

@@ -699,6 +699,7 @@
699 699
  * or (with LCD_BED_LEVELING) the LCD controller.
700 700
  */
701 701
 //#define PROBE_MANUALLY
702
+//#define MANUAL_PROBE_START_Z 0.2
702 703
 
703 704
 /**
704 705
  * A Fix-Mounted Probe either doesn't deploy or needs manual deployment.

+ 8
- 1
Marlin/src/feature/bedlevel/bedlevel.cpp 查看文件

@@ -266,7 +266,14 @@ void reset_bed_level() {
266 266
 
267 267
   void _manual_goto_xy(const float &rx, const float &ry) {
268 268
 
269
-    #if MANUAL_PROBE_HEIGHT > 0
269
+    #ifdef MANUAL_PROBE_START_Z
270
+      #if MANUAL_PROBE_HEIGHT > 0
271
+        do_blocking_move_to(rx, ry, MANUAL_PROBE_HEIGHT);
272
+        do_blocking_move_to_z(MAX(0,MANUAL_PROBE_START_Z);
273
+      #else
274
+        do_blocking_move_to(rx, ry, MAX(0,MANUAL_PROBE_START_Z);
275
+      #endif
276
+    #elif MANUAL_PROBE_HEIGHT > 0
270 277
       const float prev_z = current_position[Z_AXIS];
271 278
       do_blocking_move_to(rx, ry, MANUAL_PROBE_HEIGHT);
272 279
       do_blocking_move_to_z(prev_z);

正在加载...
取消
保存