Skip to content
Snippets Groups Projects
Commit 661c3cfc authored by Scott Lahteine's avatar Scott Lahteine
Browse files

Fix mesh bounds for MBL

parent 25c4c2f2
Branches
Tags
No related merge requests found
...@@ -1448,10 +1448,10 @@ ...@@ -1448,10 +1448,10 @@
#ifndef MIN_PROBE_EDGE #ifndef MIN_PROBE_EDGE
#define MIN_PROBE_EDGE 0 #define MIN_PROBE_EDGE 0
#endif #endif
#ifndef NOZZLE_TO_PROBE_OFFSET #ifndef NOZZLE_TO_PROBE_OFFSET
#define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 } #define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 }
#endif #endif
constexpr float nozzle_to_probe_offset[XYZ] = NOZZLE_TO_PROBE_OFFSET;
#if ENABLED(DELTA) #if ENABLED(DELTA)
/** /**
...@@ -1514,7 +1514,7 @@ constexpr float nozzle_to_probe_offset[XYZ] = NOZZLE_TO_PROBE_OFFSET; ...@@ -1514,7 +1514,7 @@ constexpr float nozzle_to_probe_offset[XYZ] = NOZZLE_TO_PROBE_OFFSET;
#define _MESH_MAX_Y (Y_MAX_BED - (MESH_INSET)) #define _MESH_MAX_Y (Y_MAX_BED - (MESH_INSET))
#else #else
// Boundaries for Cartesian probing based on set limits // Boundaries for Cartesian probing based on set limits
#if ENABLED(AUTO_BED_LEVELING_UBL) #if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
#define _MESH_MIN_X (_MAX(X_MIN_BED + MESH_INSET, X_MIN_POS)) // UBL is careful not to probe off the bed. It does not #define _MESH_MIN_X (_MAX(X_MIN_BED + MESH_INSET, X_MIN_POS)) // UBL is careful not to probe off the bed. It does not
#define _MESH_MIN_Y (_MAX(Y_MIN_BED + MESH_INSET, Y_MIN_POS)) // need NOZZLE_TO_PROBE_OFFSET in the mesh dimensions #define _MESH_MIN_Y (_MAX(Y_MIN_BED + MESH_INSET, Y_MIN_POS)) // need NOZZLE_TO_PROBE_OFFSET in the mesh dimensions
#define _MESH_MAX_X (_MIN(X_MAX_BED - (MESH_INSET), X_MAX_POS)) #define _MESH_MAX_X (_MIN(X_MAX_BED - (MESH_INSET), X_MAX_POS))
......
...@@ -29,7 +29,10 @@ ...@@ -29,7 +29,10 @@
#if HAS_BED_PROBE #if HAS_BED_PROBE
constexpr float nozzle_to_probe_offset[XYZ] = NOZZLE_TO_PROBE_OFFSET;
extern float probe_offset[XYZ]; extern float probe_offset[XYZ];
bool set_probe_deployed(const bool deploy); bool set_probe_deployed(const bool deploy);
#ifdef Z_AFTER_PROBING #ifdef Z_AFTER_PROBING
void move_z_after_probing(); void move_z_after_probing();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment