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

Move PROBE_SELECTED to an earlier point

Scott Lahteine преди 8 години
родител
ревизия
1968983f35
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 3
    1
      Marlin/Conditionals_LCD.h
  2. 0
    2
      Marlin/Conditionals_post.h

+ 3
- 1
Marlin/Conditionals_LCD.h Целия файл

@@ -22,7 +22,7 @@
22 22
 
23 23
 /**
24 24
  * Conditionals_LCD.h
25
- * LCD Defines that depend on configuration but are not editable.
25
+ * Conditionals that need to be set before Configuration_adv.h or pins.h
26 26
  */
27 27
 
28 28
 #ifndef CONDITIONALS_LCD_H // Get the LCD defines which are needed first
@@ -316,4 +316,6 @@
316 316
     #define TOOL_E_INDEX current_block->active_extruder
317 317
   #endif
318 318
 
319
+  #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))
320
+
319 321
 #endif //CONDITIONALS_LCD_H

+ 0
- 2
Marlin/Conditionals_post.h Целия файл

@@ -586,8 +586,6 @@
586 586
     #endif
587 587
   #endif
588 588
 
589
-  #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))
590
-
591 589
   #define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)))
592 590
 
593 591
   #define HAS_BED_PROBE (PROBE_SELECTED && PROBE_PIN_CONFIGURED)

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