MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix Arduino IDE compile for DUE

Browse Source 
Fixes #16767
This commit is contained in:
Scott Lahteine 2020-02-04 08:23:42 -06:00
parent 15b6ad41bc
commit 081ef46e76
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,14 +43,6 @@ public:
static xyz_pos_t offset; 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); static bool set_deployed(const bool deploy);
#ifdef Z_AFTER_PROBING #ifdef Z_AFTER_PROBING
@ -66,13 +58,20 @@ public:
#else #else
static constexpr xyz_pos_t offset{0}; static constexpr xyz_pos_t offset = xyz_pos_t({ 0, 0, 0 }); // See #16767
static constexpr xy_pos_t offset_xy{0};
static bool set_deployed(const bool) { return false; } static bool set_deployed(const bool) { return false; }
#endif #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 deploy() { return set_deployed(true); }
static inline bool stow() { return set_deployed(false); } static inline bool stow() { return set_deployed(false); }