From 0e55c06f7d6fc9398c7f569b6e9e2b5516ae833a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 20 May 2016 13:32:30 -0700 Subject: [PATCH] Rename CORE_AXIS_3 to NORMAL_AXIS --- Marlin/Conditionals.h | 6 +++--- Marlin/temperature.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index 4541c857cb..f569a53e15 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -317,15 +317,15 @@ #if ENABLED(COREXY) #define CORE_AXIS_1 A_AXIS // XY from A + B #define CORE_AXIS_2 B_AXIS - #define CORE_AXIS_3 Z_AXIS // normal axis + #define NORMAL_AXIS Z_AXIS #elif ENABLED(COREXZ) #define CORE_AXIS_1 A_AXIS // XZ from A + C #define CORE_AXIS_2 C_AXIS - #define CORE_AXIS_3 Y_AXIS // normal axis + #define NORMAL_AXIS Y_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 + #define NORMAL_AXIS X_AXIS #endif /** diff --git a/Marlin/temperature.h b/Marlin/temperature.h index ef47ed209b..1e9276a804 100644 --- a/Marlin/temperature.h +++ b/Marlin/temperature.h @@ -317,8 +317,8 @@ class Temperature { babystepsTodo[CORE_AXIS_1] += distance * 2; babystepsTodo[CORE_AXIS_2] -= distance * 2; break; - case CORE_AXIS_3: // Z on CoreXY, Y on CoreXZ, X on CoreYZ - babystepsTodo[CORE_AXIS_3] += distance; + case NORMAL_AXIS: // Z on CoreXY, Y on CoreXZ, X on CoreYZ + babystepsTodo[NORMAL_AXIS] += distance; break; } #elif ENABLED(COREXZ) || ENABLED(COREYZ)