andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Clean up probe accessors

pull/1/head
Scott Lahteine 5 years ago
parent
4a5dee6356
commit
47c19aa2b3
1 changed files with 25 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      Marlin/src/module/probe.h

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

@ -62,54 +62,60 @@
#if HAS_BED_PROBE || ENABLED(PROBE_MANUALLY) #if HAS_BED_PROBE || ENABLED(PROBE_MANUALLY)
#if IS_KINEMATIC #if IS_KINEMATIC
constexpr float printable_radius = constexpr float printable_radius = (
#if ENABLED(DELTA) #if ENABLED(DELTA)
DELTA_PRINTABLE_RADIUS; DELTA_PRINTABLE_RADIUS
#elif IS_SCARA #elif IS_SCARA
SCARA_PRINTABLE_RADIUS; SCARA_PRINTABLE_RADIUS
#endif #endif
);
inline float probe_radius() { inline float probe_radius() {
return printable_radius - return printable_radius - (
#if HAS_BED_PROBE #if HAS_BED_PROBE
_MAX(MIN_PROBE_EDGE, HYPOT(probe_offset.x, probe_offset.y)); _MAX(MIN_PROBE_EDGE, HYPOT(probe_offset.x, probe_offset.y))
#else #else
MIN_PROBE_EDGE; MIN_PROBE_EDGE
#endif #endif
);
} }
#endif #endif
inline float probe_min_x() { inline float probe_min_x() {
return return (
#if IS_KINEMATIC #if IS_KINEMATIC
(X_CENTER) - probe_radius(); (X_CENTER) - probe_radius()
#else #else
_MAX((X_MIN_BED) + (MIN_PROBE_EDGE_LEFT), (X_MIN_POS) + probe_offset.x); _MAX((X_MIN_BED) + (MIN_PROBE_EDGE_LEFT), (X_MIN_POS) + probe_offset.x)
#endif #endif
);
} }
inline float probe_max_x() { inline float probe_max_x() {
return return (
#if IS_KINEMATIC #if IS_KINEMATIC
(X_CENTER) + probe_radius(); (X_CENTER) + probe_radius()
#else #else
_MIN((X_MAX_BED) - (MIN_PROBE_EDGE_RIGHT), (X_MAX_POS) + probe_offset.x); _MIN((X_MAX_BED) - (MIN_PROBE_EDGE_RIGHT), (X_MAX_POS) + probe_offset.x)
#endif #endif
);
} }
inline float probe_min_y() { inline float probe_min_y() {
return return (
#if IS_KINEMATIC #if IS_KINEMATIC
(Y_CENTER) - probe_radius(); (Y_CENTER) - probe_radius()
#else #else
_MAX((Y_MIN_BED) + (MIN_PROBE_EDGE_FRONT), (Y_MIN_POS) + probe_offset.y); _MAX((Y_MIN_BED) + (MIN_PROBE_EDGE_FRONT), (Y_MIN_POS) + probe_offset.y)
#endif #endif
);
} }
inline float probe_max_y() { inline float probe_max_y() {
return return (
#if IS_KINEMATIC #if IS_KINEMATIC
(Y_CENTER) + probe_radius(); (Y_CENTER) + probe_radius()
#else #else
_MIN((Y_MAX_BED) - (MIN_PROBE_EDGE_BACK), (Y_MAX_POS) + probe_offset.y); _MIN((Y_MAX_BED) - (MIN_PROBE_EDGE_BACK), (Y_MAX_POS) + probe_offset.y)
#endif #endif
);
} }
#if NEEDS_THREE_PROBE_POINTS #if NEEDS_THREE_PROBE_POINTS

Write Preview
Loading…
Cancel
Save