SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #8169 from thinkyhead/bf2_kinematic_soft_endstops

Browse source 
[2.0.x] Kinematic clamp_to_software_endstops
This commit is contained in:
Scott Lahteine 2017-10-30 15:49:10 -05:00 committed by GitHub
commit 1f38761da2
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Marlin/src/module/motion.cpp
View file

@ -454,29 +454,42 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
// Software Endstops are based on the configured limits. // Software Endstops are based on the configured limits.
bool soft_endstops_enabled = true; bool soft_endstops_enabled = true;
#if IS_KINEMATIC
float soft_endstop_radius, soft_endstop_radius_2;
#endif
/** /**
* Constrain the given coordinates to the software endstops. * Constrain the given coordinates to the software endstops.
* *
* NOTE: This will only apply to Z on DELTA and SCARA. XY is * For DELTA/SCARA the XY constraint is based on the smallest
* constrained to a circle on these kinematic systems. * radius within the set software endstops.
*/ */
void clamp_to_software_endstops(float target[XYZ]) { void clamp_to_software_endstops(float target[XYZ]) {
if (!soft_endstops_enabled) return; if (!soft_endstops_enabled) return;
#if ENABLED(MIN_SOFTWARE_ENDSTOP_X) #if IS_KINEMATIC
NOLESS(target[X_AXIS], soft_endstop_min[X_AXIS]); const float dist_2 = HYPOT2(target[X_AXIS], target[Y_AXIS]);
#endif if (dist_2 > soft_endstop_radius_2) {
#if ENABLED(MIN_SOFTWARE_ENDSTOP_Y) const float ratio = soft_endstop_radius / SQRT(dist_2); // 200 / 300 = 0.66
NOLESS(target[Y_AXIS], soft_endstop_min[Y_AXIS]); target[X_AXIS] *= ratio;
target[Y_AXIS] *= ratio;
}
#else
#if ENABLED(MIN_SOFTWARE_ENDSTOP_X)
NOLESS(target[X_AXIS], soft_endstop_min[X_AXIS]);
#endif
#if ENABLED(MIN_SOFTWARE_ENDSTOP_Y)
NOLESS(target[Y_AXIS], soft_endstop_min[Y_AXIS]);
#endif
#if ENABLED(MAX_SOFTWARE_ENDSTOP_X)
NOMORE(target[X_AXIS], soft_endstop_max[X_AXIS]);
#endif
#if ENABLED(MAX_SOFTWARE_ENDSTOP_Y)
NOMORE(target[Y_AXIS], soft_endstop_max[Y_AXIS]);
#endif
#endif #endif
#if ENABLED(MIN_SOFTWARE_ENDSTOP_Z) #if ENABLED(MIN_SOFTWARE_ENDSTOP_Z)
NOLESS(target[Z_AXIS], soft_endstop_min[Z_AXIS]); NOLESS(target[Z_AXIS], soft_endstop_min[Z_AXIS]);
#endif #endif
#if ENABLED(MAX_SOFTWARE_ENDSTOP_X)
NOMORE(target[X_AXIS], soft_endstop_max[X_AXIS]);
#endif
#if ENABLED(MAX_SOFTWARE_ENDSTOP_Y)
NOMORE(target[Y_AXIS], soft_endstop_max[Y_AXIS]);
#endif
#if ENABLED(MAX_SOFTWARE_ENDSTOP_Z) #if ENABLED(MAX_SOFTWARE_ENDSTOP_Z)
NOMORE(target[Z_AXIS], soft_endstop_max[Z_AXIS]); NOMORE(target[Z_AXIS], soft_endstop_max[Z_AXIS]);
#endif #endif
@ -1259,8 +1272,17 @@ void homeaxis(const AxisEnum axis) {
#endif #endif
#if ENABLED(DELTA) #if ENABLED(DELTA)
if (axis == Z_AXIS) switch(axis) {
delta_clip_start_height = soft_endstop_max[axis] - delta_safe_distance_from_top(); case X_AXIS:
case Y_AXIS:
// Get a minimum radius for clamping
soft_endstop_radius = MIN3(FABS(max(soft_endstop_min[X_AXIS], soft_endstop_min[Y_AXIS])), soft_endstop_max[X_AXIS], soft_endstop_max[Y_AXIS]);
soft_endstop_radius_2 = sq(soft_endstop_radius);
break;
case Z_AXIS:
delta_clip_start_height = soft_endstop_max[axis] - delta_safe_distance_from_top();
default: break;
}
#endif #endif
} }