sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🧑‍💻 Dump BOTH and EITHER macros (#25908)

Browse Source
This commit is contained in:
Scott Lahteine
2023-06-02 14:26:02 -05:00
committed by GitHub
parent 32be4065ef
commit 2691167afe
305 changed files with 946 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Marlin/src/module/stepper.cpp
View File

@@ -148,7 +148,7 @@ Stepper stepper; // Singleton
// public:
#if EITHER(HAS_EXTRA_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
#if ANY(HAS_EXTRA_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
bool Stepper::separate_multi_axis = false;
#endif
@@ -182,7 +182,7 @@ bool Stepper::abort_current_block;
bool Stepper::locked_Y_motor = false, Stepper::locked_Y2_motor = false;
#endif
#if EITHER(Z_MULTI_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
#if ANY(Z_MULTI_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
bool Stepper::locked_Z_motor = false, Stepper::locked_Z2_motor = false
#if NUM_Z_STEPPERS >= 3
, Stepper::locked_Z3_motor = false
@@ -218,7 +218,7 @@ uint32_t Stepper::advance_divisor = 0,
Stepper::decelerate_after, // The count at which to start decelerating
Stepper::step_event_count; // The total event count for the current block
#if EITHER(HAS_MULTI_EXTRUDER, MIXING_EXTRUDER)
#if ANY(HAS_MULTI_EXTRUDER, MIXING_EXTRUDER)
uint8_t Stepper::stepper_extruder;
#else
constexpr uint8_t Stepper::stepper_extruder;
@@ -1967,7 +1967,7 @@ void Stepper::pulse_phase_isr() {
PULSE_PREP(W);
#endif
#if EITHER(HAS_E0_STEP, MIXING_EXTRUDER)
#if ANY(HAS_E0_STEP, MIXING_EXTRUDER)
PULSE_PREP(E);
#if ENABLED(LIN_ADVANCE)
@@ -2558,7 +2558,7 @@ hal_timer_t Stepper::block_phase_isr() {
* 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 EITHER(COREXY, COREXZ)
#if ANY(COREXY, COREXZ)
#define X_CMP(A,B) ((A)==(B))
#else
#define X_CMP(A,B) ((A)!=(B))
@@ -2578,7 +2578,7 @@ hal_timer_t Stepper::block_phase_isr() {
* 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 EITHER(COREYX, COREYZ)
#if ANY(COREYX, COREYZ)
#define Y_CMP(A,B) ((A)==(B))
#else
#define Y_CMP(A,B) ((A)!=(B))
@@ -2598,7 +2598,7 @@ hal_timer_t Stepper::block_phase_isr() {
* 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 EITHER(COREZX, COREZY)
#if ANY(COREZX, COREZY)
#define Z_CMP(A,B) ((A)==(B))
#else
#define Z_CMP(A,B) ((A)!=(B))
@@ -2856,7 +2856,7 @@ void Stepper::init() {
TERN_(HAS_X2_DIR, X2_DIR_INIT());
#if HAS_Y_DIR
Y_DIR_INIT();
#if BOTH(HAS_Y2_STEPPER, HAS_Y2_DIR)
#if ALL(HAS_Y2_STEPPER, HAS_Y2_DIR)
Y2_DIR_INIT();
#endif
#endif
@@ -2908,7 +2908,7 @@ void Stepper::init() {
#endif
X_ENABLE_INIT();
if (X_ENABLE_INIT_STATE) X_ENABLE_WRITE(X_ENABLE_INIT_STATE);
#if BOTH(HAS_X2_STEPPER, HAS_X2_ENABLE)
#if ALL(HAS_X2_STEPPER, HAS_X2_ENABLE)
X2_ENABLE_INIT();
if (X_ENABLE_INIT_STATE) X2_ENABLE_WRITE(X_ENABLE_INIT_STATE);
#endif
@@ -2919,7 +2919,7 @@ void Stepper::init() {
#endif
Y_ENABLE_INIT();
if (Y_ENABLE_INIT_STATE) Y_ENABLE_WRITE(Y_ENABLE_INIT_STATE);
#if BOTH(HAS_Y2_STEPPER, HAS_Y2_ENABLE)
#if ALL(HAS_Y2_STEPPER, HAS_Y2_ENABLE)
Y2_ENABLE_INIT();
if (Y_ENABLE_INIT_STATE) Y2_ENABLE_WRITE(Y_ENABLE_INIT_STATE);
#endif