Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
661c3cfc
Commit
661c3cfc
authored
5 years ago
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Fix mesh bounds for MBL
parent
25c4c2f2
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/src/inc/Conditionals_post.h
+2
-2
2 additions, 2 deletions
Marlin/src/inc/Conditionals_post.h
Marlin/src/module/probe.h
+3
-0
3 additions, 0 deletions
Marlin/src/module/probe.h
with
5 additions
and
2 deletions
Marlin/src/inc/Conditionals_post.h
+
2
−
2
View file @
661c3cfc
...
@@ -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 E
NABLED(
AUTO_BED_LEVELING_UBL)
#if E
ITHER(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))
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/module/probe.h
+
3
−
0
View file @
661c3cfc
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment