Skip to content

Commit 7aaba66

Browse files
committed
🩹 Fix some kinematic conditions
1 parent 5f0b9d4 commit 7aaba66

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

Marlin/src/gcode/gcode.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
350350
case 0: case 1: // G0: Fast Move, G1: Linear Move
351351
G0_G1(TERN_(HAS_FAST_MOVES, parser.codenum == 0)); break;
352352

353-
#if ENABLED(ARC_SUPPORT) && DISABLED(SCARA)
353+
#if ENABLED(ARC_SUPPORT)
354354
case 2: case 3: G2_G3(parser.codenum == 2); break; // G2: CW ARC, G3: CCW ARC
355355
#endif
356356

Marlin/src/gcode/motion/G2_G3.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@
2727
#include "../gcode.h"
2828
#include "../../module/motion.h"
2929
#include "../../module/planner.h"
30-
#include "../../module/temperature.h"
31-
32-
#if ENABLED(DELTA)
33-
#include "../../module/delta.h"
34-
#elif ENABLED(SCARA)
35-
#include "../../module/scara.h"
36-
#endif
3730

3831
#if N_ARC_CORRECTION < 1
3932
#undef N_ARC_CORRECTION

Marlin/src/inc/SanityCheck.h

+3-6
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
477477
* Babystepping
478478
*/
479479
#if ENABLED(BABYSTEPPING)
480-
#if ENABLED(SCARA)
480+
#if IS_SCARA
481481
#error "BABYSTEPPING is not implemented for SCARA yet."
482482
#elif ENABLED(BABYSTEP_XY) && ANY(MARKFORGED_XY, MARKFORGED_YX)
483483
#error "BABYSTEPPING only implemented for Z axis on MarkForged."
@@ -1777,9 +1777,6 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i
17771777
*/
17781778
#if HAS_Z_AXIS
17791779
static_assert(Z_CLEARANCE_FOR_HOMING <= Z_MAX_POS, "Z_CLEARANCE_FOR_HOMING must be less than or equal to Z_MAX_POS.");
1780-
#if ALL(Z_HOME_TO_MAX, HOME_Z_FIRST) && NONE(DELTA, TPARA)
1781-
static_assert(Z_CLEARANCE_FOR_HOMING == 0, "Z_CLEARANCE_FOR_HOMING must be 0.");
1782-
#endif
17831780
#endif
17841781

17851782
// Check Safe Bed Leveling settings
@@ -4321,9 +4318,9 @@ static_assert(_PLUS_TEST(3), "DEFAULT_MAX_ACCELERATION values must be positive."
43214318
static_assert(SHAPING_FREQ_X == SHAPING_FREQ_Y && SHAPING_FREQ_Y == SHAPING_FREQ_Z, "SHAPING_FREQ_X, SHAPING_FREQ_Y and SHAPING_FREQ_Z must be the same for DELTA.");
43224319
static_assert(SHAPING_ZETA_X == SHAPING_ZETA_Y && SHAPING_ZETA_Y == SHAPING_ZETA_Z, "SHAPING_ZETA_X, SHAPING_ZETA_Y and SHAPING_ZETA_Z must be the same for DELTA.");
43234320
#endif
4324-
#elif ENABLED(SCARA)
4321+
#elif IS_SCARA
43254322
#error "Input Shaping is not compatible with SCARA kinematics."
4326-
#elif ENABLED(TPARA)
4323+
#elif ENABLED(AXEL_TPARA)
43274324
#error "Input Shaping is not compatible with TPARA kinematics."
43284325
#elif ENABLED(POLAR)
43294326
#error "Input Shaping is not compatible with POLAR kinematics."

0 commit comments

Comments
 (0)