CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistent Probe XY offset type

Browse Source
This commit is contained in:
Scott Lahteine 2020-11-24 17:38:13 -06:00
parent 03cdfafc2a
commit 109c08e9e5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/calibrate/G76_M192_M871.cpp
View File

@ -144,7 +144,7 @@ void GcodeSuite::G76() {
const xyz_pos_t parkpos = temp_comp.park_point, const xyz_pos_t parkpos = temp_comp.park_point,
probe_pos_xyz = xyz_pos_t(temp_comp.measure_point) + xyz_pos_t({ 0.0f, 0.0f, PTC_PROBE_HEATING_OFFSET }), probe_pos_xyz = xyz_pos_t(temp_comp.measure_point) + xyz_pos_t({ 0.0f, 0.0f, PTC_PROBE_HEATING_OFFSET }),
noz_pos_xyz = probe_pos_xyz - xy_pos_t(probe.offset_xy); // Nozzle position based on probe position noz_pos_xyz = probe_pos_xyz - probe.offset_xy; // Nozzle position based on probe position
if (do_bed_cal || do_probe_cal) { if (do_bed_cal || do_probe_cal) {
// Ensure park position is reachable // Ensure park position is reachable

2
Marlin/src/module/probe.cpp
View File

@ -89,7 +89,7 @@ Probe probe;
xyz_pos_t Probe::offset; // Initialized by settings.load() xyz_pos_t Probe::offset; // Initialized by settings.load()
#if HAS_PROBE_XY_OFFSET #if HAS_PROBE_XY_OFFSET
const xyz_pos_t &Probe::offset_xy = Probe::offset; const xy_pos_t &Probe::offset_xy = xy_pos_t(Probe::offset);
#endif #endif
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)

6
Marlin/src/module/probe.h
View File

@ -112,9 +112,9 @@ public:
FORCE_INLINE static bool good_bounds(const xy_pos_t &lf, const xy_pos_t &rb) { FORCE_INLINE static bool good_bounds(const xy_pos_t &lf, const xy_pos_t &rb) {
return ( return (
#if IS_KINEMATIC #if IS_KINEMATIC
can_reach(lf.x, 0) && can_reach(rb.x, 0) && can_reach(0, lf.y) && can_reach(0, rb.y) can_reach(lf.x, 0) && can_reach(rb.x, 0) && can_reach(0, lf.y) && can_reach(0, rb.y)
#else #else
can_reach(lf) && can_reach(rb) can_reach(lf) && can_reach(rb)
#endif #endif
); );
} }
@ -122,7 +122,7 @@ public:
// Use offset_xy for read only access // Use offset_xy for read only access
// More optimal the XY offset is known to always be zero. // More optimal the XY offset is known to always be zero.
#if HAS_PROBE_XY_OFFSET #if HAS_PROBE_XY_OFFSET
static const xyz_pos_t &offset_xy; static const xy_pos_t &offset_xy;
#else #else
static constexpr xy_pos_t offset_xy = xy_pos_t({ 0, 0 }); // See #16767 static constexpr xy_pos_t offset_xy = xy_pos_t({ 0, 0 }); // See #16767
#endif #endif