zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Extend Core endstop commentary

Browse source
This commit is contained in:
Scott Lahteine 2017-03-01 10:01:50 -06:00
parent c5e08e8761
commit b6d9eb229f
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Marlin/endstops.cpp
View file

@ -273,8 +273,6 @@ void Endstops::update() {
#endif #endif
#if CORE_IS_XY || CORE_IS_XZ #if CORE_IS_XY || CORE_IS_XZ
// Head direction in -X axis for CoreXY and CoreXZ bots.
// If DeltaA == -DeltaB, the movement is only in only one axis
#if ENABLED(COREYX) || ENABLED(COREZX) #if ENABLED(COREYX) || ENABLED(COREZX)
#define CORE_X_CMP != #define CORE_X_CMP !=
#define CORE_X_NOT ! #define CORE_X_NOT !
@ -282,6 +280,10 @@ void Endstops::update() {
#define CORE_X_CMP == #define CORE_X_CMP ==
#define CORE_X_NOT #define CORE_X_NOT
#endif #endif
// Head direction in -X axis for CoreXY and CoreXZ bots.
// If steps differ, both axes are moving.
// If DeltaA == -DeltaB, the movement is only in the 2nd axis (Y or Z, handled below)
// If DeltaA == DeltaB, the movement is only in the 1st axis (X)
if (stepper.current_block->steps[CORE_AXIS_1] != stepper.current_block->steps[CORE_AXIS_2] || stepper.motor_direction(CORE_AXIS_1) CORE_X_CMP stepper.motor_direction(CORE_AXIS_2)) { if (stepper.current_block->steps[CORE_AXIS_1] != stepper.current_block->steps[CORE_AXIS_2] || stepper.motor_direction(CORE_AXIS_1) CORE_X_CMP stepper.motor_direction(CORE_AXIS_2)) {
if (CORE_X_NOT stepper.motor_direction(X_HEAD)) if (CORE_X_NOT stepper.motor_direction(X_HEAD))
#else #else
@ -324,7 +326,9 @@ void Endstops::update() {
#if CORE_IS_XY || CORE_IS_YZ #if CORE_IS_XY || CORE_IS_YZ
// Head direction in -Y axis for CoreXY / CoreYZ bots. // Head direction in -Y axis for CoreXY / CoreYZ bots.
// If DeltaA == DeltaB, the movement is in only one axis // If steps differ, both axes are moving
// If DeltaA == DeltaB, the movement is only in the 1st axis (X or Y)
// If DeltaA == -DeltaB, the movement is only in the 2nd axis (Y or Z)
if (stepper.current_block->steps[CORE_AXIS_1] != stepper.current_block->steps[CORE_AXIS_2] || stepper.motor_direction(CORE_AXIS_1) CORE_YZ_CMP stepper.motor_direction(CORE_AXIS_2)) { if (stepper.current_block->steps[CORE_AXIS_1] != stepper.current_block->steps[CORE_AXIS_2] || stepper.motor_direction(CORE_AXIS_1) CORE_YZ_CMP stepper.motor_direction(CORE_AXIS_2)) {
if (CORE_YZ_NOT stepper.motor_direction(Y_HEAD)) if (CORE_YZ_NOT stepper.motor_direction(Y_HEAD))
#else #else
@ -346,7 +350,9 @@ void Endstops::update() {
#if CORE_IS_XZ || CORE_IS_YZ #if CORE_IS_XZ || CORE_IS_YZ
// Head direction in -Z axis for CoreXZ or CoreYZ bots. // Head direction in -Z axis for CoreXZ or CoreYZ bots.
// If DeltaA == DeltaB, the movement is in only one axis // If steps differ, both axes are moving
// If DeltaA == DeltaB, the movement is only in the 1st axis (X or Y, already handled above)
// If DeltaA == -DeltaB, the movement is only in the 2nd axis (Z)
if (stepper.current_block->steps[CORE_AXIS_1] != stepper.current_block->steps[CORE_AXIS_2] || stepper.motor_direction(CORE_AXIS_1) CORE_YZ_CMP stepper.motor_direction(CORE_AXIS_2)) { if (stepper.current_block->steps[CORE_AXIS_1] != stepper.current_block->steps[CORE_AXIS_2] || stepper.motor_direction(CORE_AXIS_1) CORE_YZ_CMP stepper.motor_direction(CORE_AXIS_2)) {
if (CORE_YZ_NOT stepper.motor_direction(Z_HEAD)) if (CORE_YZ_NOT stepper.motor_direction(Z_HEAD))
#else #else