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

Merge pull request #9262 from tcm0116/1.1.x-delta_softstops

Browse Source 
[1.1.x] Allow DELTA to compile with soft endstops disabled
This commit is contained in:
Scott Lahteine 2018-01-20 14:16:14 -06:00 committed by GitHub
commit 369f1a64d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/Marlin_main.cpp
View File

@ -1343,12 +1343,14 @@ bool get_target_extruder_from_command(const uint16_t code) {
#if ENABLED(DELTA) #if ENABLED(DELTA)
switch(axis) { switch(axis) {
case X_AXIS: #if HAS_SOFTWARE_ENDSTOPS
case Y_AXIS: case X_AXIS:
// Get a minimum radius for clamping case Y_AXIS:
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]); // Get a minimum radius for clamping
soft_endstop_radius_2 = sq(soft_endstop_radius); 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]);
break; soft_endstop_radius_2 = sq(soft_endstop_radius);
break;
#endif
case Z_AXIS: case Z_AXIS:
delta_clip_start_height = soft_endstop_max[axis] - delta_safe_distance_from_top(); delta_clip_start_height = soft_endstop_max[axis] - delta_safe_distance_from_top();
default: break; default: break;