Ver código fonte

Move pullups after Z_DUAL_ENDSTOPS block

Scott Lahteine 8 anos atrás
pai
commit
462e189edd
1 arquivos alterados com 27 adições e 27 exclusões
  1. 27
    27
      Marlin/Conditionals_post.h

+ 27
- 27
Marlin/Conditionals_post.h Ver arquivo

@@ -35,33 +35,6 @@
35 35
   #endif
36 36
 
37 37
   /**
38
-   * Set ENDSTOPPULLUPS for unused endstop switches
39
-   */
40
-  #if ENABLED(ENDSTOPPULLUPS)
41
-    #if ENABLED(USE_XMAX_PLUG)
42
-      #define ENDSTOPPULLUP_XMAX
43
-    #endif
44
-    #if ENABLED(USE_YMAX_PLUG)
45
-      #define ENDSTOPPULLUP_YMAX
46
-    #endif
47
-    #if ENABLED(USE_ZMAX_PLUG)
48
-      #define ENDSTOPPULLUP_ZMAX
49
-    #endif
50
-    #if ENABLED(USE_XMIN_PLUG)
51
-      #define ENDSTOPPULLUP_XMIN
52
-    #endif
53
-    #if ENABLED(USE_YMIN_PLUG)
54
-      #define ENDSTOPPULLUP_YMIN
55
-    #endif
56
-    #if ENABLED(USE_ZMIN_PLUG)
57
-      #define ENDSTOPPULLUP_ZMIN
58
-    #endif
59
-    #if DISABLED(DISABLE_Z_MIN_PROBE_ENDSTOP)
60
-      #define ENDSTOPPULLUP_ZMIN_PROBE
61
-    #endif
62
-  #endif
63
-
64
-  /**
65 38
    * Axis lengths
66 39
    */
67 40
   #define X_MAX_LENGTH (X_MAX_POS - (X_MIN_POS))
@@ -423,6 +396,33 @@
423 396
   #endif
424 397
 
425 398
   /**
399
+   * Set ENDSTOPPULLUPS for active endstop switches
400
+   */
401
+  #if ENABLED(ENDSTOPPULLUPS)
402
+    #if ENABLED(USE_XMAX_PLUG)
403
+      #define ENDSTOPPULLUP_XMAX
404
+    #endif
405
+    #if ENABLED(USE_YMAX_PLUG)
406
+      #define ENDSTOPPULLUP_YMAX
407
+    #endif
408
+    #if ENABLED(USE_ZMAX_PLUG)
409
+      #define ENDSTOPPULLUP_ZMAX
410
+    #endif
411
+    #if ENABLED(USE_XMIN_PLUG)
412
+      #define ENDSTOPPULLUP_XMIN
413
+    #endif
414
+    #if ENABLED(USE_YMIN_PLUG)
415
+      #define ENDSTOPPULLUP_YMIN
416
+    #endif
417
+    #if ENABLED(USE_ZMIN_PLUG)
418
+      #define ENDSTOPPULLUP_ZMIN
419
+    #endif
420
+    #if DISABLED(DISABLE_Z_MIN_PROBE_ENDSTOP)
421
+      #define ENDSTOPPULLUP_ZMIN_PROBE
422
+    #endif
423
+  #endif
424
+
425
+  /**
426 426
    * Shorthand for pin tests, used wherever needed
427 427
    */
428 428
   #define HAS_TEMP_0 (PIN_EXISTS(TEMP_0) && TEMP_SENSOR_0 != 0 && TEMP_SENSOR_0 > -2)

Carregando…
Cancelar
Salvar