Browse Source

Move PROBE_SELECTED to an earlier point

Scott Lahteine 9 years ago
parent
commit
1968983f35
2 changed files with 3 additions and 3 deletions
  1. 3
    1
      Marlin/Conditionals_LCD.h
  2. 0
    2
      Marlin/Conditionals_post.h

+ 3
- 1
Marlin/Conditionals_LCD.h View File

22
 
22
 
23
 /**
23
 /**
24
  * Conditionals_LCD.h
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
 #ifndef CONDITIONALS_LCD_H // Get the LCD defines which are needed first
28
 #ifndef CONDITIONALS_LCD_H // Get the LCD defines which are needed first
316
     #define TOOL_E_INDEX current_block->active_extruder
316
     #define TOOL_E_INDEX current_block->active_extruder
317
   #endif
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
 #endif //CONDITIONALS_LCD_H
321
 #endif //CONDITIONALS_LCD_H

+ 0
- 2
Marlin/Conditionals_post.h View File

586
     #endif
586
     #endif
587
   #endif
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
   #define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)))
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
   #define HAS_BED_PROBE (PROBE_SELECTED && PROBE_PIN_CONFIGURED)
591
   #define HAS_BED_PROBE (PROBE_SELECTED && PROBE_PIN_CONFIGURED)

Loading…
Cancel
Save