Browse Source

IS_DELTA => ENABLED(DELTA)

Scott Lahteine 6 years ago
parent
commit
6e3caf23b6
2 changed files with 5 additions and 5 deletions
  1. 2
    2
      Marlin/src/lcd/language/language_pt-br.h
  2. 3
    3
      Marlin/src/module/stepper.cpp

+ 2
- 2
Marlin/src/lcd/language/language_pt-br.h View File

200
   #define MSG_VA_JERK                       _UxGT("jogo VA")
200
   #define MSG_VA_JERK                       _UxGT("jogo VA")
201
   #define MSG_VB_JERK                       _UxGT("jogo VB")
201
   #define MSG_VB_JERK                       _UxGT("jogo VB")
202
   #define MSG_VC_JERK                       _UxGT("jogo VZ")
202
   #define MSG_VC_JERK                       _UxGT("jogo VZ")
203
-#elif IS_DELTA
203
+#elif ENABLED(DELTA)
204
   #define MSG_VA_JERK                       _UxGT("jogo VA")
204
   #define MSG_VA_JERK                       _UxGT("jogo VA")
205
   #define MSG_VB_JERK                       _UxGT("jogo VB")
205
   #define MSG_VB_JERK                       _UxGT("jogo VB")
206
   #define MSG_VC_JERK                       _UxGT("jogo VC")
206
   #define MSG_VC_JERK                       _UxGT("jogo VC")
222
   #define MSG_ASTEPS                        _UxGT("Passo A/deg")
222
   #define MSG_ASTEPS                        _UxGT("Passo A/deg")
223
   #define MSG_BSTEPS                        _UxGT("Passo B/deg")
223
   #define MSG_BSTEPS                        _UxGT("Passo B/deg")
224
   #define MSG_CSTEPS                        _UxGT("Passo Z/mm")
224
   #define MSG_CSTEPS                        _UxGT("Passo Z/mm")
225
-#elif IS_DELTA
225
+#elif ENABLED(DELTA)
226
   #define MSG_ASTEPS                        _UxGT("Passo A/mm")
226
   #define MSG_ASTEPS                        _UxGT("Passo A/mm")
227
   #define MSG_BSTEPS                        _UxGT("Passo B/mm")
227
   #define MSG_BSTEPS                        _UxGT("Passo B/mm")
228
   #define MSG_CSTEPS                        _UxGT("Passo C/mm")
228
   #define MSG_CSTEPS                        _UxGT("Passo C/mm")

+ 3
- 3
Marlin/src/module/stepper.cpp View File

2218
 
2218
 
2219
   if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
2219
   if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT();
2220
 
2220
 
2221
-  #if CORE_IS_XY || CORE_IS_XZ || IS_DELTA || IS_SCARA
2221
+  #if CORE_IS_XY || CORE_IS_XZ || ENABLED(DELTA) || IS_SCARA
2222
     SERIAL_PROTOCOLPGM(MSG_COUNT_A);
2222
     SERIAL_PROTOCOLPGM(MSG_COUNT_A);
2223
   #else
2223
   #else
2224
     SERIAL_PROTOCOLPGM(MSG_COUNT_X);
2224
     SERIAL_PROTOCOLPGM(MSG_COUNT_X);
2225
   #endif
2225
   #endif
2226
   SERIAL_PROTOCOL(xpos);
2226
   SERIAL_PROTOCOL(xpos);
2227
 
2227
 
2228
-  #if CORE_IS_XY || CORE_IS_YZ || IS_DELTA || IS_SCARA
2228
+  #if CORE_IS_XY || CORE_IS_YZ || ENABLED(DELTA) || IS_SCARA
2229
     SERIAL_PROTOCOLPGM(" B:");
2229
     SERIAL_PROTOCOLPGM(" B:");
2230
   #else
2230
   #else
2231
     SERIAL_PROTOCOLPGM(" Y:");
2231
     SERIAL_PROTOCOLPGM(" Y:");
2232
   #endif
2232
   #endif
2233
   SERIAL_PROTOCOL(ypos);
2233
   SERIAL_PROTOCOL(ypos);
2234
 
2234
 
2235
-  #if CORE_IS_XZ || CORE_IS_YZ || IS_DELTA
2235
+  #if CORE_IS_XZ || CORE_IS_YZ || ENABLED(DELTA)
2236
     SERIAL_PROTOCOLPGM(" C:");
2236
     SERIAL_PROTOCOLPGM(" C:");
2237
   #else
2237
   #else
2238
     SERIAL_PROTOCOLPGM(" Z:");
2238
     SERIAL_PROTOCOLPGM(" Z:");

Loading…
Cancel
Save