Browse Source

Fix Arduino IDE compile for DUE

Fixes #16767
Scott Lahteine 5 years ago
parent
commit
081ef46e76
1 changed files with 9 additions and 10 deletions
  1. 9
    10
      Marlin/src/module/probe.h

+ 9
- 10
Marlin/src/module/probe.h View File

43
 
43
 
44
     static xyz_pos_t offset;
44
     static xyz_pos_t offset;
45
 
45
 
46
-    // Use offset_xy for read only access
47
-    // More optimal the XY offset is known to always be zero.
48
-    #if HAS_PROBE_XY_OFFSET
49
-      static const xyz_pos_t &offset_xy;
50
-    #else
51
-      static constexpr xy_pos_t offset_xy{0};
52
-    #endif
53
-
54
     static bool set_deployed(const bool deploy);
46
     static bool set_deployed(const bool deploy);
55
 
47
 
56
     #ifdef Z_AFTER_PROBING
48
     #ifdef Z_AFTER_PROBING
66
 
58
 
67
   #else
59
   #else
68
 
60
 
69
-    static constexpr xyz_pos_t offset{0};
70
-    static constexpr xy_pos_t offset_xy{0};
61
+    static constexpr xyz_pos_t offset = xyz_pos_t({ 0, 0, 0 }); // See #16767
71
 
62
 
72
     static bool set_deployed(const bool) { return false; }
63
     static bool set_deployed(const bool) { return false; }
73
 
64
 
74
   #endif
65
   #endif
75
 
66
 
67
+  // Use offset_xy for read only access
68
+  // More optimal the XY offset is known to always be zero.
69
+  #if HAS_PROBE_XY_OFFSET
70
+    static const xyz_pos_t &offset_xy;
71
+  #else
72
+    static constexpr xy_pos_t offset_xy = xy_pos_t({ 0, 0 });   // See #16767
73
+  #endif
74
+
76
   static inline bool deploy() { return set_deployed(true); }
75
   static inline bool deploy() { return set_deployed(true); }
77
   static inline bool stow() { return set_deployed(false); }
76
   static inline bool stow() { return set_deployed(false); }
78
 
77
 

Loading…
Cancel
Save