瀏覽代碼

Use 0 as the bed position (not Z_MIN_POS)

Scott Lahteine 7 年之前
父節點
當前提交
df2f24617b

+ 1
- 1
Marlin/src/gcode/bedlevel/abl/G29.cpp 查看文件

473
         enable_soft_endstops = soft_endstops_enabled;
473
         enable_soft_endstops = soft_endstops_enabled;
474
       #endif
474
       #endif
475
       // Move close to the bed before the first point
475
       // Move close to the bed before the first point
476
-      do_blocking_move_to_z(Z_MIN_POS);
476
+      do_blocking_move_to_z(0);
477
     }
477
     }
478
     else {
478
     else {
479
 
479
 

+ 3
- 3
Marlin/src/gcode/bedlevel/mbl/G29.cpp 查看文件

105
           enable_soft_endstops = soft_endstops_enabled;
105
           enable_soft_endstops = soft_endstops_enabled;
106
         #endif
106
         #endif
107
         // Move close to the bed before the first point
107
         // Move close to the bed before the first point
108
-        do_blocking_move_to_z(Z_MIN_POS);
108
+        do_blocking_move_to_z(0);
109
       }
109
       }
110
       else {
110
       else {
111
         // For G29 S2 after adjusting Z.
111
         // For G29 S2 after adjusting Z.
127
       }
127
       }
128
       else {
128
       else {
129
         // One last "return to the bed" (as originally coded) at completion
129
         // One last "return to the bed" (as originally coded) at completion
130
-        current_position[Z_AXIS] = Z_MIN_POS + MANUAL_PROBE_HEIGHT;
130
+        current_position[Z_AXIS] = MANUAL_PROBE_HEIGHT;
131
         line_to_current_position();
131
         line_to_current_position();
132
         stepper.synchronize();
132
         stepper.synchronize();
133
 
133
 
141
         set_bed_leveling_enabled(true);
141
         set_bed_leveling_enabled(true);
142
 
142
 
143
         #if ENABLED(MESH_G28_REST_ORIGIN)
143
         #if ENABLED(MESH_G28_REST_ORIGIN)
144
-          current_position[Z_AXIS] = Z_MIN_POS;
144
+          current_position[Z_AXIS] = 0;
145
           set_destination_from_current();
145
           set_destination_from_current();
146
           buffer_line_to_destination(homing_feedrate(Z_AXIS));
146
           buffer_line_to_destination(homing_feedrate(Z_AXIS));
147
           stepper.synchronize();
147
           stepper.synchronize();

+ 2
- 2
Marlin/src/gcode/feature/pause/M701_M702.cpp 查看文件

85
 
85
 
86
   // Restore Z axis
86
   // Restore Z axis
87
   if (park_point.z > 0)
87
   if (park_point.z > 0)
88
-    do_blocking_move_to_z(max(current_position[Z_AXIS] - park_point.z, Z_MIN_POS), NOZZLE_PARK_Z_FEEDRATE);
88
+    do_blocking_move_to_z(max(current_position[Z_AXIS] - park_point.z, 0), NOZZLE_PARK_Z_FEEDRATE);
89
 
89
 
90
   #if EXTRUDERS > 1
90
   #if EXTRUDERS > 1
91
     // Restore toolhead if it was changed
91
     // Restore toolhead if it was changed
158
 
158
 
159
   // Restore Z axis
159
   // Restore Z axis
160
   if (park_point.z > 0)
160
   if (park_point.z > 0)
161
-    do_blocking_move_to_z(max(current_position[Z_AXIS] - park_point.z, Z_MIN_POS), NOZZLE_PARK_Z_FEEDRATE);
161
+    do_blocking_move_to_z(max(current_position[Z_AXIS] - park_point.z, 0), NOZZLE_PARK_Z_FEEDRATE);
162
 
162
 
163
   #if EXTRUDERS > 1
163
   #if EXTRUDERS > 1
164
     // Restore toolhead if it was changed
164
     // Restore toolhead if it was changed

+ 1
- 1
Marlin/src/lcd/ultralcd.cpp 查看文件

1820
       if (!lcd_wait_for_move) {
1820
       if (!lcd_wait_for_move) {
1821
         #if MANUAL_PROBE_HEIGHT > 0 && DISABLED(MESH_BED_LEVELING)
1821
         #if MANUAL_PROBE_HEIGHT > 0 && DISABLED(MESH_BED_LEVELING)
1822
           // Display "Done" screen and wait for moves to complete
1822
           // Display "Done" screen and wait for moves to complete
1823
-          line_to_z(Z_MIN_POS + MANUAL_PROBE_HEIGHT);
1823
+          line_to_z(MANUAL_PROBE_HEIGHT);
1824
           lcd_synchronize(PSTR(MSG_LEVEL_BED_DONE));
1824
           lcd_synchronize(PSTR(MSG_LEVEL_BED_DONE));
1825
         #endif
1825
         #endif
1826
         lcd_goto_previous_menu_no_defer();
1826
         lcd_goto_previous_menu_no_defer();

Loading…
取消
儲存