Bladeren bron

Prevent illegal leveling combinations

Addressing issue #6901
Scott Lahteine 8 jaren geleden
bovenliggende
commit
c74d4dede6
2 gewijzigde bestanden met toevoegingen van 13 en 4 verwijderingen
  1. 5
    0
      Marlin/Conditionals_post.h
  2. 8
    4
      Marlin/SanityCheck.h

+ 5
- 0
Marlin/Conditionals_post.h Bestand weergeven

847
   // Add commands that need sub-codes to this list
847
   // Add commands that need sub-codes to this list
848
   #define USE_GCODE_SUBCODES ENABLED(G38_PROBE_TARGET)
848
   #define USE_GCODE_SUBCODES ENABLED(G38_PROBE_TARGET)
849
 
849
 
850
+  // MESH_BED_LEVELING overrides PROBE_MANUALLY
851
+  #if ENABLED(MESH_BED_LEVELING)
852
+    #undef PROBE_MANUALLY
853
+  #endif
854
+
850
 #endif // CONDITIONALS_POST_H
855
 #endif // CONDITIONALS_POST_H

+ 8
- 4
Marlin/SanityCheck.h Bestand weergeven

319
  * Advanced Pause
319
  * Advanced Pause
320
  */
320
  */
321
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
321
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
322
-  #if DISABLED(ULTIPANEL)
322
+  #if DISABLED(NEWPANEL)
323
     #error "ADVANCED_PAUSE_FEATURE currently requires an LCD controller."
323
     #error "ADVANCED_PAUSE_FEATURE currently requires an LCD controller."
324
   #elif ENABLED(EXTRUDER_RUNOUT_PREVENT)
324
   #elif ENABLED(EXTRUDER_RUNOUT_PREVENT)
325
     #error "EXTRUDER_RUNOUT_PREVENT is incompatible with ADVANCED_PAUSE_FEATURE."
325
     #error "EXTRUDER_RUNOUT_PREVENT is incompatible with ADVANCED_PAUSE_FEATURE."
326
-  #elif ENABLED(PARK_HEAD_ON_PAUSE) && DISABLED(SDSUPPORT) && DISABLED(ULTIPANEL) && DISABLED(EMERGENCY_PARSER)
326
+  #elif ENABLED(PARK_HEAD_ON_PAUSE) && DISABLED(SDSUPPORT) && DISABLED(NEWPANEL) && DISABLED(EMERGENCY_PARSER)
327
     #error "PARK_HEAD_ON_PAUSE requires SDSUPPORT, EMERGENCY_PARSER, or an LCD controller."
327
     #error "PARK_HEAD_ON_PAUSE requires SDSUPPORT, EMERGENCY_PARSER, or an LCD controller."
328
   #endif
328
   #endif
329
 #endif
329
 #endif
598
 /**
598
 /**
599
  * LCD_BED_LEVELING requirements
599
  * LCD_BED_LEVELING requirements
600
  */
600
  */
601
-#if ENABLED(LCD_BED_LEVELING) && DISABLED(MESH_BED_LEVELING) && !(HAS_ABL && ENABLED(PROBE_MANUALLY))
602
-  #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or PROBE_MANUALLY."
601
+#if ENABLED(LCD_BED_LEVELING)
602
+  #if DISABLED(ULTIPANEL)
603
+    #error "LCD_BED_LEVELING requires an LCD controller."
604
+  #elif DISABLED(MESH_BED_LEVELING) && !(HAS_ABL && ENABLED(PROBE_MANUALLY))
605
+    #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or PROBE_MANUALLY."
606
+  #endif
603
 #endif
607
 #endif
604
 
608
 
605
 /**
609
 /**

Laden…
Annuleren
Opslaan