Browse Source

Fix the redeclaration of _ENDSTOP_HIT

João Brázio 8 years ago
parent
commit
bcf1e027bb
No account linked to committer's email address
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      Marlin/stepper.cpp

+ 3
- 3
Marlin/stepper.cpp View File

@@ -298,13 +298,13 @@ void checkHitEndstops() {
298 298
       #define _SET_STOP_CHAR(A,C) ;
299 299
     #endif
300 300
 
301
-    #define _ENDSTOP_HIT(A,C) do{ \
301
+    #define _ENDSTOP_HIT_ECHO(A,C) do{ \
302 302
       SERIAL_ECHOPAIR(" " STRINGIFY(A) ":", endstops_trigsteps[A ##_AXIS] / axis_steps_per_unit[A ##_AXIS]); \
303 303
       _SET_STOP_CHAR(A,C); }while(0)
304 304
 
305 305
     #define _ENDSTOP_HIT_TEST(A,C) \
306 306
       if (TEST(endstop_hit_bits, A ##_MIN) || TEST(endstop_hit_bits, A ##_MAX)) \
307
-        _ENDSTOP_HIT(A,C)
307
+        _ENDSTOP_HIT_ECHO(A,C)
308 308
 
309 309
     SERIAL_ECHO_START;
310 310
     SERIAL_ECHOPGM(MSG_ENDSTOPS_HIT);
@@ -314,7 +314,7 @@ void checkHitEndstops() {
314 314
 
315 315
     #if ENABLED(Z_MIN_PROBE_ENDSTOP)
316 316
       #define P_AXIS Z_AXIS
317
-      if (TEST(endstop_hit_bits, Z_MIN_PROBE)) _ENDSTOP_HIT(P, 'P');
317
+      if (TEST(endstop_hit_bits, Z_MIN_PROBE)) _ENDSTOP_HIT_ECHO(P, 'P');
318 318
     #endif
319 319
     SERIAL_EOL;
320 320
 

Loading…
Cancel
Save