3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Patches for core motion tests

Browse source
This commit is contained in:
Scott Lahteine 2018-05-24 00:02:59 -05:00
parent 912fff0923
commit 766bcc6a70
4 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Marlin/stepper.cpp
View file

@ -1552,7 +1552,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
#endif
#define X_MOVE_TEST ( S_(1) != S_(2) || (S_(1) > 0 && D_(1) X_CMP D_(2)) )
#else
#define X_MOVE_TEST !!current_block->steps[X_AXIS]
#define X_MOVE_TEST !!current_block->steps[A_AXIS]
#endif
#if CORE_IS_XY || CORE_IS_YZ
@ -1570,7 +1570,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
#endif
#define Y_MOVE_TEST ( S_(1) != S_(2) || (S_(1) > 0 && D_(1) Y_CMP D_(2)) )
#else
#define Y_MOVE_TEST !!current_block->steps[Y_AXIS]
#define Y_MOVE_TEST !!current_block->steps[B_AXIS]
#endif
#if CORE_IS_XZ || CORE_IS_YZ
@ -1588,16 +1588,16 @@ uint32_t Stepper::stepper_block_phase_isr() {
#endif
#define Z_MOVE_TEST ( S_(1) != S_(2) || (S_(1) > 0 && D_(1) Z_CMP D_(2)) )
#else
#define Z_MOVE_TEST !!current_block->steps[Z_AXIS]
#define Z_MOVE_TEST !!current_block->steps[C_AXIS]
#endif
SET_BIT(axis_did_move, X_AXIS, X_MOVE_TEST);
SET_BIT(axis_did_move, Y_AXIS, Y_MOVE_TEST);
SET_BIT(axis_did_move, Z_AXIS, Z_MOVE_TEST);
SET_BIT(axis_did_move, E_AXIS, !!current_block->steps[E_AXIS]);
SET_BIT(axis_did_move, X_HEAD, !!current_block->steps[X_HEAD]);
SET_BIT(axis_did_move, Y_HEAD, !!current_block->steps[Y_HEAD]);
SET_BIT(axis_did_move, Z_HEAD, !!current_block->steps[Z_HEAD]);
SET_BIT_TO(axis_did_move, A_AXIS, X_MOVE_TEST);
SET_BIT_TO(axis_did_move, B_AXIS, Y_MOVE_TEST);
SET_BIT_TO(axis_did_move, C_AXIS, Z_MOVE_TEST);
//SET_BIT_TO(axis_did_move, E_AXIS, !!current_block->steps[E_AXIS]);
//SET_BIT_TO(axis_did_move, X_HEAD, !!current_block->steps[A_AXIS]);
//SET_BIT_TO(axis_did_move, Y_HEAD, !!current_block->steps[B_AXIS]);
//SET_BIT_TO(axis_did_move, Z_HEAD, !!current_block->steps[C_AXIS]);
// Initialize the trapezoid generator from the current block.
#if ENABLED(LIN_ADVANCE)