From 6e3caf23b6773a16a11c83b03c8a9463733534e4 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 3 Nov 2018 03:48:36 -0500 Subject: [PATCH] IS_DELTA => ENABLED(DELTA) --- Marlin/src/lcd/language/language_pt-br.h | 4 ++-- Marlin/src/module/stepper.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/src/lcd/language/language_pt-br.h b/Marlin/src/lcd/language/language_pt-br.h index 28b62a2888..f6ce554987 100644 --- a/Marlin/src/lcd/language/language_pt-br.h +++ b/Marlin/src/lcd/language/language_pt-br.h @@ -200,7 +200,7 @@ #define MSG_VA_JERK _UxGT("jogo VA") #define MSG_VB_JERK _UxGT("jogo VB") #define MSG_VC_JERK _UxGT("jogo VZ") -#elif IS_DELTA +#elif ENABLED(DELTA) #define MSG_VA_JERK _UxGT("jogo VA") #define MSG_VB_JERK _UxGT("jogo VB") #define MSG_VC_JERK _UxGT("jogo VC") @@ -222,7 +222,7 @@ #define MSG_ASTEPS _UxGT("Passo A/deg") #define MSG_BSTEPS _UxGT("Passo B/deg") #define MSG_CSTEPS _UxGT("Passo Z/mm") -#elif IS_DELTA +#elif ENABLED(DELTA) #define MSG_ASTEPS _UxGT("Passo A/mm") #define MSG_BSTEPS _UxGT("Passo B/mm") #define MSG_CSTEPS _UxGT("Passo C/mm") diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp index 065aba8270..6a1beec94c 100644 --- a/Marlin/src/module/stepper.cpp +++ b/Marlin/src/module/stepper.cpp @@ -2218,21 +2218,21 @@ void Stepper::report_positions() { if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT(); - #if CORE_IS_XY || CORE_IS_XZ || IS_DELTA || IS_SCARA + #if CORE_IS_XY || CORE_IS_XZ || ENABLED(DELTA) || IS_SCARA SERIAL_PROTOCOLPGM(MSG_COUNT_A); #else SERIAL_PROTOCOLPGM(MSG_COUNT_X); #endif SERIAL_PROTOCOL(xpos); - #if CORE_IS_XY || CORE_IS_YZ || IS_DELTA || IS_SCARA + #if CORE_IS_XY || CORE_IS_YZ || ENABLED(DELTA) || IS_SCARA SERIAL_PROTOCOLPGM(" B:"); #else SERIAL_PROTOCOLPGM(" Y:"); #endif SERIAL_PROTOCOL(ypos); - #if CORE_IS_XZ || CORE_IS_YZ || IS_DELTA + #if CORE_IS_XZ || CORE_IS_YZ || ENABLED(DELTA) SERIAL_PROTOCOLPGM(" C:"); #else SERIAL_PROTOCOLPGM(" Z:");