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

Merge pull request #6362 from tcm0116/babystepping 

Only queue babysteps if axis is in a known position
pull/1/head
Scott Lahteine 7 years ago
committed by GitHub
parent
bddd75aa5c 72a7fac461
commit
bf2548be4a
1 changed files with 25 additions and 23 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. 48
      Marlin/temperature.h

48
Marlin/temperature.h
View File

@ -431,31 +431,33 @@ class Temperature {
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
static void babystep_axis(const AxisEnum axis, const int distance) { static void babystep_axis(const AxisEnum axis, const int distance) {
#if IS_CORE if (axis_known_position[axis]) {
#if ENABLED(BABYSTEP_XY) #if IS_CORE
switch (axis) { #if ENABLED(BABYSTEP_XY)
case CORE_AXIS_1: // X on CoreXY and CoreXZ, Y on CoreYZ switch (axis) {
babystepsTodo[CORE_AXIS_1] += distance * 2; case CORE_AXIS_1: // X on CoreXY and CoreXZ, Y on CoreYZ
babystepsTodo[CORE_AXIS_2] += distance * 2; babystepsTodo[CORE_AXIS_1] += distance * 2;
break; babystepsTodo[CORE_AXIS_2] += distance * 2;
case CORE_AXIS_2: // Y on CoreXY, Z on CoreXZ and CoreYZ break;
babystepsTodo[CORE_AXIS_1] += CORESIGN(distance * 2); case CORE_AXIS_2: // Y on CoreXY, Z on CoreXZ and CoreYZ
babystepsTodo[CORE_AXIS_2] -= CORESIGN(distance * 2); babystepsTodo[CORE_AXIS_1] += CORESIGN(distance * 2);
break; babystepsTodo[CORE_AXIS_2] -= CORESIGN(distance * 2);
case NORMAL_AXIS: // Z on CoreXY, Y on CoreXZ, X on CoreYZ break;
babystepsTodo[NORMAL_AXIS] += distance; case NORMAL_AXIS: // Z on CoreXY, Y on CoreXZ, X on CoreYZ
break; babystepsTodo[NORMAL_AXIS] += distance;
} break;
#elif CORE_IS_XZ || CORE_IS_YZ }
// Only Z stepping needs to be handled here #elif CORE_IS_XZ || CORE_IS_YZ
babystepsTodo[CORE_AXIS_1] += CORESIGN(distance * 2); // Only Z stepping needs to be handled here
babystepsTodo[CORE_AXIS_2] -= CORESIGN(distance * 2); babystepsTodo[CORE_AXIS_1] += CORESIGN(distance * 2);
babystepsTodo[CORE_AXIS_2] -= CORESIGN(distance * 2);
#else
babystepsTodo[Z_AXIS] += distance;
#endif
#else #else
babystepsTodo[Z_AXIS] += distance; babystepsTodo[axis] += distance;
#endif #endif
#else }
babystepsTodo[axis] += distance;
#endif
} }
#endif // BABYSTEPPING #endif // BABYSTEPPING

Write Preview
Loading…
Cancel
Save