bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Update some ABL/UBL conditionals

Browse Source
This commit is contained in:
Scott Lahteine
2019-02-24 20:29:03 -06:00
parent 833c2e54a1
commit 808b076000
8 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/src/inc/SanityCheck.h
View File

@ -1061,7 +1061,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
/**
* Require some kind of probe for bed leveling and probe testing
*/
#if OLDSCHOOL_ABL && !PROBE_SELECTED
#if HAS_ABL_NOT_UBL && !PROBE_SELECTED
#error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
#endif
@ -1115,7 +1115,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "AUTO_BED_LEVELING_UBL used to enable RESTORE_LEVELING_AFTER_G28. To keep this behavior enable RESTORE_LEVELING_AFTER_G28. Otherwise define it as 'false'."
#endif
#elif OLDSCHOOL_ABL
#elif HAS_ABL_NOT_UBL
/**
* Auto Bed Leveling
@ -1140,7 +1140,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
static_assert(FRONT_PROBE_BED_POSITION >= MIN_PROBE_Y, "FRONT_PROBE_BED_POSITION is outside the probe region.");
static_assert(BACK_PROBE_BED_POSITION <= MAX_PROBE_Y, "BACK_PROBE_BED_POSITION is outside the probe region.");
#endif // AUTO_BED_LEVELING_3POINT
#endif
#elif ENABLED(MESH_BED_LEVELING)
@ -1171,8 +1171,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL and a Graphical LCD."
#endif
#if ENABLED(G29_RETRY_AND_RECOVER) && HAS_LEVELING && !OLDSCHOOL_ABL
#error "G29_RETRY_AND_RECOVER currently only supports ABL"
#if ENABLED(G29_RETRY_AND_RECOVER)
#if ENABLED(AUTO_BED_LEVELING_UBL)
#error "G29_RETRY_AND_RECOVER is not compatible with UBL."
#elif ENABLED(MESH_BED_LEVELING)
#error "G29_RETRY_AND_RECOVER is not compatible with MESH_BED_LEVELING."
#endif
#endif
/**
@ -1181,7 +1185,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#if ENABLED(LCD_BED_LEVELING)
#if !HAS_LCD_MENU
#error "LCD_BED_LEVELING requires a programmable LCD controller."
#elif !(ENABLED(MESH_BED_LEVELING) || OLDSCHOOL_ABL)
#elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
#error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
#endif
#endif