Merge pull request #8344 from tcm0116/2.0.x-delta_height

[2.0.x] Add delta_height variable in lieu of using home_offset
This commit is contained in:
Scott Lahteine
2017-11-09 01:21:53 -06:00
committed by GitHub
9 changed files with 78 additions and 93 deletions

View File

@ -972,6 +972,8 @@ void set_axis_is_at_home(const AxisEnum axis) {
#if ENABLED(MORGAN_SCARA)
scara_set_axis_is_at_home(axis);
#elif ENABLED(DELTA)
current_position[axis] = (axis == Z_AXIS ? delta_height : base_home_pos(axis));
#else
current_position[axis] = base_home_pos(axis);
#endif
@ -1253,8 +1255,8 @@ void homeaxis(const AxisEnum axis) {
}
}
#elif ENABLED(DELTA)
soft_endstop_min[axis] = base_min_pos(axis) + (axis == Z_AXIS ? 0 : offs);
soft_endstop_max[axis] = base_max_pos(axis) + offs;
soft_endstop_min[axis] = base_min_pos(axis) + offs;
soft_endstop_max[axis] = (axis == Z_AXIS ? delta_height : base_max_pos(axis)) + offs;
#else
soft_endstop_min[axis] = base_min_pos(axis) + offs;
soft_endstop_max[axis] = base_max_pos(axis) + offs;