Compare commits

...

5 Commits

Author SHA1 Message Date
Scott Lahteine
c41f3f8582 Version 2.0.4.1 Release 2020-02-22 07:02:55 -06:00
Scott Lahteine
8670df08a2 CoreXY Babystepping hotfix 2020-02-22 07:02:55 -06:00
Scott Lahteine
730690ea03 Hotfix for Babystepping 2020-02-22 02:55:26 -06:00
Scott Lahteine
3543873da7 Use moves_free in ok_to_send 2020-02-22 02:55:26 -06:00
thinkyhead
c505626c42 [cron] Bump distribution date (2020-02-22) 2020-02-22 02:55:26 -06:00
5 changed files with 15 additions and 15 deletions

View File

@@ -28,7 +28,7 @@
/**
* Marlin release version identifier
*/
//#define SHORT_BUILD_VERSION "2.0.4"
//#define SHORT_BUILD_VERSION "2.0.4.1"
/**
* Verbose version identifier which should contain a reference to the location

View File

@@ -73,7 +73,7 @@ public:
// apply accumulated babysteps to the axes.
//
static inline void task() {
LOOP_L_N(axis, BS_TODO_AXIS(Z_AXIS)) step_axis((AxisEnum)axis);
LOOP_LE_N(axis, BS_TODO_AXIS(Z_AXIS)) step_axis((AxisEnum)axis);
}
private:

View File

@@ -253,7 +253,7 @@ void GCodeQueue::ok_to_send() {
while (NUMERIC_SIGNED(*p))
SERIAL_ECHO(*p++);
}
SERIAL_ECHOPAIR_P(SP_P_STR, int(BLOCK_BUFFER_SIZE - planner.movesplanned() - 1));
SERIAL_ECHOPAIR_P(SP_P_STR, int(planner.moves_free()));
SERIAL_ECHOPAIR(" B", int(BUFSIZE - length));
#endif
SERIAL_EOL();

View File

@@ -25,7 +25,7 @@
* Release version. Leave the Marlin version or apply a custom scheme.
*/
#ifndef SHORT_BUILD_VERSION
#define SHORT_BUILD_VERSION "2.0.4"
#define SHORT_BUILD_VERSION "2.0.4.1"
#endif
/**
@@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2020-02-21"
#define STRING_DISTRIBUTION_DATE "2020-02-22"
#endif
/**

View File

@@ -2526,12 +2526,12 @@ void Stepper::report_positions() {
#elif IS_CORE
#define BABYSTEP_CORE(A, B, INV, DIR) do{ \
#define BABYSTEP_CORE(A, B, INV, DIR, ALT) do{ \
const xy_byte_t old_dir = { _READ_DIR(A), _READ_DIR(B) }; \
_ENABLE_AXIS(A); _ENABLE_AXIS(B); \
DIR_WAIT_BEFORE(); \
_APPLY_DIR(A, _INVERT_DIR(A)^DIR^INV); \
_APPLY_DIR(B, _INVERT_DIR(B)^DIR^INV^(CORESIGN(1)<0)); \
_APPLY_DIR(B, _INVERT_DIR(B)^DIR^INV^ALT); \
DIR_WAIT_AFTER(); \
_SAVE_START(); \
_APPLY_STEP(A, !_INVERT_STEP_PIN(A), true); \
@@ -2560,21 +2560,21 @@ void Stepper::report_positions() {
case X_AXIS:
#if CORE_IS_XY
BABYSTEP_CORE(X, Y, false, direction);
BABYSTEP_CORE(X, Y, 0, direction, 0);
#elif CORE_IS_XZ
BABYSTEP_CORE(X, Z, false, direction);
BABYSTEP_CORE(X, Z, 0, direction, 0);
#else
BABYSTEP_AXIS(X, false, direction);
BABYSTEP_AXIS(X, 0, direction);
#endif
break;
case Y_AXIS:
#if CORE_IS_XY
BABYSTEP_CORE(X, Y, false, direction);
BABYSTEP_CORE(X, Y, 0, direction, (CORESIGN(1)<0));
#elif CORE_IS_YZ
BABYSTEP_CORE(Y, Z, false, direction);
BABYSTEP_CORE(Y, Z, 0, direction, (CORESIGN(1)<0));
#else
BABYSTEP_AXIS(Y, false, direction);
BABYSTEP_AXIS(Y, 0, direction);
#endif
break;
@@ -2583,9 +2583,9 @@ void Stepper::report_positions() {
case Z_AXIS: {
#if CORE_IS_XZ
BABYSTEP_CORE(X, Z, BABYSTEP_INVERT_Z, direction);
BABYSTEP_CORE(X, Z, BABYSTEP_INVERT_Z, direction, (CORESIGN(1)<0));
#elif CORE_IS_YZ
BABYSTEP_CORE(Y, Z, BABYSTEP_INVERT_Z, direction);
BABYSTEP_CORE(Y, Z, BABYSTEP_INVERT_Z, direction, (CORESIGN(1)<0));
#elif DISABLED(DELTA)
BABYSTEP_AXIS(Z, BABYSTEP_INVERT_Z, direction);