CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

COREYZ Conditionals, SanityCheck for only a single kinematic

Browse Source
This commit is contained in:
Scott Lahteine 2016-05-20 13:28:00 -07:00
parent 95fee8ca81
commit 6c7f4909b1
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Conditionals.h
View File

@ -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
View File

@ -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
*/ */