|
@@ -286,7 +286,7 @@ bool target_direction;
|
286
|
286
|
|
287
|
287
|
#ifdef ENABLE_AUTO_BED_LEVELING
|
288
|
288
|
int xy_travel_speed = XY_TRAVEL_SPEED;
|
289
|
|
- float zprobe_zoffset = -Z_PROBE_OFFSET_FROM_EXTRUDER;
|
|
289
|
+ float zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER;
|
290
|
290
|
#endif
|
291
|
291
|
|
292
|
292
|
#if defined(Z_DUAL_ENDSTOPS) && !defined(DELTA)
|
|
@@ -1060,7 +1060,7 @@ static void axis_is_at_home(AxisEnum axis) {
|
1060
|
1060
|
max_pos[axis] = base_max_pos(axis) + home_offset[axis];
|
1061
|
1061
|
|
1062
|
1062
|
#if defined(ENABLE_AUTO_BED_LEVELING) && Z_HOME_DIR < 0
|
1063
|
|
- if (axis == Z_AXIS) current_position[Z_AXIS] += zprobe_zoffset;
|
|
1063
|
+ if (axis == Z_AXIS) current_position[Z_AXIS] -= zprobe_zoffset;
|
1064
|
1064
|
#endif
|
1065
|
1065
|
}
|
1066
|
1066
|
}
|
|
@@ -4648,7 +4648,7 @@ inline void gcode_M400() { st_synchronize(); }
|
4648
|
4648
|
#ifdef SERVO_ENDSTOPS
|
4649
|
4649
|
void raise_z_for_servo() {
|
4650
|
4650
|
float zpos = current_position[Z_AXIS], z_dest = Z_RAISE_BEFORE_HOMING;
|
4651
|
|
- z_dest += axis_known_position[Z_AXIS] ? -zprobe_zoffset : zpos;
|
|
4651
|
+ z_dest += axis_known_position[Z_AXIS] ? zprobe_zoffset : zpos;
|
4652
|
4652
|
if (zpos < z_dest)
|
4653
|
4653
|
do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z_dest); // also updates current_position
|
4654
|
4654
|
}
|
|
@@ -4869,7 +4869,7 @@ inline void gcode_M503() {
|
4869
|
4869
|
if (code_seen('Z')) {
|
4870
|
4870
|
value = code_value();
|
4871
|
4871
|
if (Z_PROBE_OFFSET_RANGE_MIN <= value && value <= Z_PROBE_OFFSET_RANGE_MAX) {
|
4872
|
|
- zprobe_zoffset = -value;
|
|
4872
|
+ zprobe_zoffset = value;
|
4873
|
4873
|
SERIAL_ECHO_START;
|
4874
|
4874
|
SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " " MSG_OK);
|
4875
|
4875
|
SERIAL_EOL;
|
|
@@ -4886,8 +4886,8 @@ inline void gcode_M503() {
|
4886
|
4886
|
}
|
4887
|
4887
|
else {
|
4888
|
4888
|
SERIAL_ECHO_START;
|
4889
|
|
- SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " : ");
|
4890
|
|
- SERIAL_ECHO(-zprobe_zoffset);
|
|
4889
|
+ SERIAL_ECHOPGM(MSG_ZPROBE_ZOFFSET " : ");
|
|
4890
|
+ SERIAL_ECHO(zprobe_zoffset);
|
4891
|
4891
|
SERIAL_EOL;
|
4892
|
4892
|
}
|
4893
|
4893
|
}
|