Browse Source

COREYZ Conditionals, SanityCheck for only a single kinematic

pull/1/head
Scott Lahteine 9 years ago
parent
commit
6c7f4909b1
  1. 10
      Marlin/Conditionals.h
  2. 10
      Marlin/SanityCheck.h

10
Marlin/Conditionals.h

@ -315,11 +315,17 @@
* CoreXY and CoreXZ * CoreXY and CoreXZ
*/ */
#if ENABLED(COREXY) #if ENABLED(COREXY)
#define CORE_AXIS_1 A_AXIS // XY from A + B
#define CORE_AXIS_2 B_AXIS #define CORE_AXIS_2 B_AXIS
#define CORE_AXIS_3 Z_AXIS #define CORE_AXIS_3 Z_AXIS // normal axis
#elif ENABLED(COREXZ) #elif ENABLED(COREXZ)
#define CORE_AXIS_1 A_AXIS // XZ from A + C
#define CORE_AXIS_2 C_AXIS #define CORE_AXIS_2 C_AXIS
#define CORE_AXIS_3 Y_AXIS #define CORE_AXIS_3 Y_AXIS // normal axis
#elif ENABLED(COREYZ)
#define CORE_AXIS_1 B_AXIS // YZ from B + C
#define CORE_AXIS_2 C_AXIS
#define CORE_AXIS_3 X_AXIS // normal axis
#endif #endif
/** /**

10
Marlin/SanityCheck.h

@ -387,6 +387,16 @@
#endif #endif
/**
* Don't set more than one kinematic type
*/
#if (ENABLED(DELTA) && (ENABLED(SCARA) || ENABLED(COREXY) || ENABLED(COREXZ) || ENABLED(COREYZ))) \
|| (ENABLED(SCARA) && (ENABLED(COREXY) || ENABLED(COREXZ) || ENABLED(COREYZ))) \
|| (ENABLED(COREXY) && (ENABLED(COREXZ) || ENABLED(COREYZ))) \
|| (ENABLED(COREXZ) && ENABLED(COREYZ))
#error "Please enable only one of DELTA, SCARA, COREXY, COREXZ, or COREYZ."
#endif
/** /**
* Allen Key Z probe requires Auto Bed Leveling grid and Delta * Allen Key Z probe requires Auto Bed Leveling grid and Delta
*/ */

Loading…
Cancel
Save