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
081ef46e
Commit
081ef46e
authored
5 years ago
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Fix Arduino IDE compile for DUE
Fixes #16767
parent
15b6ad41
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/src/module/probe.h
+9
-10
9 additions, 10 deletions
Marlin/src/module/probe.h
with
9 additions
and
10 deletions
Marlin/src/module/probe.h
+
9
−
10
View file @
081ef46e
...
...
@@ -43,14 +43,6 @@ public:
static
xyz_pos_t
offset
;
// Use offset_xy for read only access
// More optimal the XY offset is known to always be zero.
#if HAS_PROBE_XY_OFFSET
static
const
xyz_pos_t
&
offset_xy
;
#else
static
constexpr
xy_pos_t
offset_xy
{
0
};
#endif
static
bool
set_deployed
(
const
bool
deploy
);
#ifdef Z_AFTER_PROBING
...
...
@@ -66,13 +58,20 @@ public:
#else
static
constexpr
xyz_pos_t
offset
{
0
};
static
constexpr
xy_pos_t
offset_xy
{
0
};
static
constexpr
xyz_pos_t
offset
=
xyz_pos_t
({
0
,
0
,
0
});
// See #16767
static
bool
set_deployed
(
const
bool
)
{
return
false
;
}
#endif
// Use offset_xy for read only access
// More optimal the XY offset is known to always be zero.
#if HAS_PROBE_XY_OFFSET
static
const
xyz_pos_t
&
offset_xy
;
#else
static
constexpr
xy_pos_t
offset_xy
=
xy_pos_t
({
0
,
0
});
// See #16767
#endif
static
inline
bool
deploy
()
{
return
set_deployed
(
true
);
}
static
inline
bool
stow
()
{
return
set_deployed
(
false
);
}
...
...
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