0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

IS_DELTA => ENABLED(DELTA)

Browse source
This commit is contained in:
Scott Lahteine 2018-11-03 03:48:36 -05:00
parent 19f49db96f
commit 6e3caf23b6
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/lcd/language/language_pt-br.h
View file

@ -200,7 +200,7 @@
#define MSG_VA_JERK _UxGT("jogo VA") #define MSG_VA_JERK _UxGT("jogo VA")
#define MSG_VB_JERK _UxGT("jogo VB") #define MSG_VB_JERK _UxGT("jogo VB")
#define MSG_VC_JERK _UxGT("jogo VZ") #define MSG_VC_JERK _UxGT("jogo VZ")
#elif IS_DELTA #elif ENABLED(DELTA)
#define MSG_VA_JERK _UxGT("jogo VA") #define MSG_VA_JERK _UxGT("jogo VA")
#define MSG_VB_JERK _UxGT("jogo VB") #define MSG_VB_JERK _UxGT("jogo VB")
#define MSG_VC_JERK _UxGT("jogo VC") #define MSG_VC_JERK _UxGT("jogo VC")
@ -222,7 +222,7 @@
#define MSG_ASTEPS _UxGT("Passo A/deg") #define MSG_ASTEPS _UxGT("Passo A/deg")
#define MSG_BSTEPS _UxGT("Passo B/deg") #define MSG_BSTEPS _UxGT("Passo B/deg")
#define MSG_CSTEPS _UxGT("Passo Z/mm") #define MSG_CSTEPS _UxGT("Passo Z/mm")
#elif IS_DELTA #elif ENABLED(DELTA)
#define MSG_ASTEPS _UxGT("Passo A/mm") #define MSG_ASTEPS _UxGT("Passo A/mm")
#define MSG_BSTEPS _UxGT("Passo B/mm") #define MSG_BSTEPS _UxGT("Passo B/mm")
#define MSG_CSTEPS _UxGT("Passo C/mm") #define MSG_CSTEPS _UxGT("Passo C/mm")

6
Marlin/src/module/stepper.cpp
View file

@ -2218,21 +2218,21 @@ void Stepper::report_positions() {
if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT(); 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); SERIAL_PROTOCOLPGM(MSG_COUNT_A);
#else #else
SERIAL_PROTOCOLPGM(MSG_COUNT_X); SERIAL_PROTOCOLPGM(MSG_COUNT_X);
#endif #endif
SERIAL_PROTOCOL(xpos); 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:"); SERIAL_PROTOCOLPGM(" B:");
#else #else
SERIAL_PROTOCOLPGM(" Y:"); SERIAL_PROTOCOLPGM(" Y:");
#endif #endif
SERIAL_PROTOCOL(ypos); SERIAL_PROTOCOL(ypos);
#if CORE_IS_XZ || CORE_IS_YZ || IS_DELTA #if CORE_IS_XZ || CORE_IS_YZ || ENABLED(DELTA)
SERIAL_PROTOCOLPGM(" C:"); SERIAL_PROTOCOLPGM(" C:");
#else #else
SERIAL_PROTOCOLPGM(" Z:"); SERIAL_PROTOCOLPGM(" Z:");