From 72776f647b167bfa3bc663642e0048db1f114a75 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 19 Mar 2018 17:59:50 -0500 Subject: [PATCH] Move _AXIS macro to macros.h --- Marlin/Marlin.h | 5 ----- Marlin/macros.h | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index bf9d00010..c8e79288a 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -164,11 +164,6 @@ extern const char axis_codes[XYZE]; G38_endstop_hit; // flag from the interrupt handler to indicate if the endstop went active #endif -/** - * The axis order in all axis related arrays is X, Y, Z, E - */ -#define _AXIS(AXIS) AXIS ##_AXIS - void enable_all_steppers(); void disable_e_stepper(const uint8_t e); void disable_e_steppers(); diff --git a/Marlin/macros.h b/Marlin/macros.h index 450236c69..75f32e852 100644 --- a/Marlin/macros.h +++ b/Marlin/macros.h @@ -29,6 +29,9 @@ #define ABC 3 #define XYZ 3 +// For use in macros that take a single axis letter +#define _AXIS(AXIS) AXIS ##_AXIS + #define _XMIN_ 100 #define _YMIN_ 200 #define _ZMIN_ 300