Browse Source

Fix Z_DUAL_ENDSTOPS with MIN homing

Scott Lahteine 9 years ago
parent
commit
5fca110e0d
1 changed files with 50 additions and 19 deletions
  1. 50
    19
      Marlin/Conditionals_post.h

+ 50
- 19
Marlin/Conditionals_post.h View File

@@ -363,31 +363,62 @@
363 363
     #define _YMAX_ 201
364 364
     #define _ZMAX_ 301
365 365
     #if Z2_USE_ENDSTOP == _XMAX_
366
-      #define Z2_MAX_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
367
-      #define Z2_MAX_PIN X_MAX_PIN
368
-      #undef USE_XMAX_PLUG
366
+      #define USE_XMAX_PLUG
369 367
     #elif Z2_USE_ENDSTOP == _YMAX_
370
-      #define Z2_MAX_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
371
-      #define Z2_MAX_PIN Y_MAX_PIN
372
-      #undef USE_YMAX_PLUG
368
+      #define USE_YMAX_PLUG
373 369
     #elif Z2_USE_ENDSTOP == _ZMAX_
374
-      #define Z2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
375
-      #define Z2_MAX_PIN Z_MAX_PIN
376
-      #undef USE_ZMAX_PLUG
370
+      #define USE_ZMAX_PLUG
377 371
     #elif Z2_USE_ENDSTOP == _XMIN_
378
-      #define Z2_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
379
-      #define Z2_MAX_PIN X_MIN_PIN
380
-      #undef USE_XMIN_PLUG
372
+      #define USE_XMIN_PLUG
381 373
     #elif Z2_USE_ENDSTOP == _YMIN_
382
-      #define Z2_MAX_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
383
-      #define Z2_MAX_PIN Y_MIN_PIN
384
-      #undef USE_YMIN_PLUG
374
+      #define USE_YMIN_PLUG
385 375
     #elif Z2_USE_ENDSTOP == _ZMIN_
386
-      #define Z2_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
387
-      #define Z2_MAX_PIN Z_MIN_PIN
388
-      #undef USE_ZMIN_PLUG
376
+      #define USE_ZMIN_PLUG
377
+    #endif
378
+    #if Z_HOME_DIR > 0
379
+      #if Z2_USE_ENDSTOP == _XMAX_
380
+        #define Z2_MAX_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
381
+        #define Z2_MAX_PIN X_MAX_PIN
382
+      #elif Z2_USE_ENDSTOP == _YMAX_
383
+        #define Z2_MAX_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
384
+        #define Z2_MAX_PIN Y_MAX_PIN
385
+      #elif Z2_USE_ENDSTOP == _ZMAX_
386
+        #define Z2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
387
+        #define Z2_MAX_PIN Z_MAX_PIN
388
+      #elif Z2_USE_ENDSTOP == _XMIN_
389
+        #define Z2_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
390
+        #define Z2_MAX_PIN X_MIN_PIN
391
+      #elif Z2_USE_ENDSTOP == _YMIN_
392
+        #define Z2_MAX_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
393
+        #define Z2_MAX_PIN Y_MIN_PIN
394
+      #elif Z2_USE_ENDSTOP == _ZMIN_
395
+        #define Z2_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
396
+        #define Z2_MAX_PIN Z_MIN_PIN
397
+      #else
398
+        #define Z2_MAX_ENDSTOP_INVERTING false
399
+      #endif
389 400
     #else
390
-      #define Z2_MAX_ENDSTOP_INVERTING false
401
+      #if Z2_USE_ENDSTOP == _XMAX_
402
+        #define Z2_MIN_ENDSTOP_INVERTING X_MAX_ENDSTOP_INVERTING
403
+        #define Z2_MIN_PIN X_MAX_PIN
404
+      #elif Z2_USE_ENDSTOP == _YMAX_
405
+        #define Z2_MIN_ENDSTOP_INVERTING Y_MAX_ENDSTOP_INVERTING
406
+        #define Z2_MIN_PIN Y_MAX_PIN
407
+      #elif Z2_USE_ENDSTOP == _ZMAX_
408
+        #define Z2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
409
+        #define Z2_MIN_PIN Z_MAX_PIN
410
+      #elif Z2_USE_ENDSTOP == _XMIN_
411
+        #define Z2_MIN_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
412
+        #define Z2_MIN_PIN X_MIN_PIN
413
+      #elif Z2_USE_ENDSTOP == _YMIN_
414
+        #define Z2_MIN_ENDSTOP_INVERTING Y_MIN_ENDSTOP_INVERTING
415
+        #define Z2_MIN_PIN Y_MIN_PIN
416
+      #elif Z2_USE_ENDSTOP == _ZMIN_
417
+        #define Z2_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
418
+        #define Z2_MIN_PIN Z_MIN_PIN
419
+      #else
420
+        #define Z2_MIN_ENDSTOP_INVERTING false
421
+      #endif
391 422
     #endif
392 423
   #endif
393 424
 

Loading…
Cancel
Save