Преглед на файлове

Account for Z_DUAL_ENDSTOPS in sanity checking of endstops

Scott Lahteine преди 9 години
родител
ревизия
a617d12f70
променени са 1 файла, в които са добавени 9 реда и са изтрити 7 реда
  1. 9
    7
      Marlin/SanityCheck.h

+ 9
- 7
Marlin/SanityCheck.h Целия файл

@@ -422,12 +422,14 @@
422 422
 /**
423 423
  * Endstops
424 424
  */
425
-#if DISABLED(HAS_ENDSTOP_X_MIN) && DISABLED(HAS_ENDSTOP_X_MAX)
426
- #error You must enable HAS_ENDSTOP_X_MIN or HAS_ENDSTOP_X_MAX
427
-#elif DISABLED(HAS_ENDSTOP_Y_MIN) && DISABLED(HAS_ENDSTOP_Y_MAX)
428
- #error You must enable HAS_ENDSTOP_Y_MIN or HAS_ENDSTOP_Y_MAX
429
-#elif DISABLED(HAS_ENDSTOP_Z_MIN) && DISABLED(HAS_ENDSTOP_Z_MAX)
430
- #error You must enable HAS_ENDSTOP_Z_MIN or HAS_ENDSTOP_Z_MAX
425
+#if DISABLED(USE_XMIN_PLUG) && DISABLED(USE_XMAX_PLUG) && !(ENABLED(Z_DUAL_ENDSTOPS) && Z2_USE_ENDSTOP >= _XMAX_ && Z2_USE_ENDSTOP <= _XMIN_)
426
+ #error You must enable USE_XMIN_PLUG or USE_XMAX_PLUG
427
+#elif DISABLED(USE_YMIN_PLUG) && DISABLED(USE_YMAX_PLUG) && !(ENABLED(Z_DUAL_ENDSTOPS) && Z2_USE_ENDSTOP >= _YMAX_ && Z2_USE_ENDSTOP <= _YMIN_)
428
+ #error You must enable USE_YMIN_PLUG or USE_YMAX_PLUG
429
+#elif DISABLED(USE_ZMIN_PLUG) && DISABLED(USE_ZMAX_PLUG) && !(ENABLED(Z_DUAL_ENDSTOPS) && Z2_USE_ENDSTOP >= _ZMAX_ && Z2_USE_ENDSTOP <= _ZMIN_)
430
+ #error You must enable USE_ZMIN_PLUG or USE_ZMAX_PLUG
431
+#elif ENABLED(Z_DUAL_ENDSTOPS) && !Z2_USE_ENDSTOP
432
+ #error You must set Z2_USE_ENDSTOP with Z_DUAL_ENDSTOPS
431 433
 #endif
432 434
 
433 435
 /**
@@ -468,7 +470,7 @@
468 470
 #elif defined(FILAMENT_SENSOR)
469 471
   #error FILAMENT_SENSOR is deprecated. Use FILAMENT_WIDTH_SENSOR instead.
470 472
 #elif defined(DISABLE_MAX_ENDSTOPS) || defined(DISABLE_MIN_ENDSTOPS)
471
-  #error DISABLE_MAX_ENDSTOPS and DISABLE_MIN_ENDSTOPS deprecated - set USE_*_ENDSTOP flags instead
473
+  #error DISABLE_MAX_ENDSTOPS and DISABLE_MIN_ENDSTOPS deprecated. Use individual USE_*_PLUG options instead.
472 474
 #elif ENABLED(Z_DUAL_ENDSTOPS) && !defined(Z2_USE_ENDSTOP)
473 475
   #error Z_DUAL_ENDSTOPS settings are simplified. Just set Z2_USE_ENDSTOP to the endstop you want to repurpose for Z2
474 476
 #endif

Loading…
Отказ
Запис