|
@@ -1061,7 +1061,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
1061
|
1061
|
/**
|
1062
|
1062
|
* Require some kind of probe for bed leveling and probe testing
|
1063
|
1063
|
*/
|
1064
|
|
- #if OLDSCHOOL_ABL && !PROBE_SELECTED
|
|
1064
|
+ #if HAS_ABL_NOT_UBL && !PROBE_SELECTED
|
1065
|
1065
|
#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."
|
1066
|
1066
|
#endif
|
1067
|
1067
|
|
|
@@ -1115,7 +1115,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
1115
|
1115
|
#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'."
|
1116
|
1116
|
#endif
|
1117
|
1117
|
|
1118
|
|
-#elif OLDSCHOOL_ABL
|
|
1118
|
+#elif HAS_ABL_NOT_UBL
|
1119
|
1119
|
|
1120
|
1120
|
/**
|
1121
|
1121
|
* Auto Bed Leveling
|
|
@@ -1140,7 +1140,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
1140
|
1140
|
static_assert(FRONT_PROBE_BED_POSITION >= MIN_PROBE_Y, "FRONT_PROBE_BED_POSITION is outside the probe region.");
|
1141
|
1141
|
static_assert(BACK_PROBE_BED_POSITION <= MAX_PROBE_Y, "BACK_PROBE_BED_POSITION is outside the probe region.");
|
1142
|
1142
|
|
1143
|
|
- #endif // AUTO_BED_LEVELING_3POINT
|
|
1143
|
+ #endif
|
1144
|
1144
|
|
1145
|
1145
|
#elif ENABLED(MESH_BED_LEVELING)
|
1146
|
1146
|
|
|
@@ -1171,8 +1171,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
1171
|
1171
|
#error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL and a Graphical LCD."
|
1172
|
1172
|
#endif
|
1173
|
1173
|
|
1174
|
|
-#if ENABLED(G29_RETRY_AND_RECOVER) && HAS_LEVELING && !OLDSCHOOL_ABL
|
1175
|
|
- #error "G29_RETRY_AND_RECOVER currently only supports ABL"
|
|
1174
|
+#if ENABLED(G29_RETRY_AND_RECOVER)
|
|
1175
|
+ #if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
1176
|
+ #error "G29_RETRY_AND_RECOVER is not compatible with UBL."
|
|
1177
|
+ #elif ENABLED(MESH_BED_LEVELING)
|
|
1178
|
+ #error "G29_RETRY_AND_RECOVER is not compatible with MESH_BED_LEVELING."
|
|
1179
|
+ #endif
|
1176
|
1180
|
#endif
|
1177
|
1181
|
|
1178
|
1182
|
/**
|
|
@@ -1181,7 +1185,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
1181
|
1185
|
#if ENABLED(LCD_BED_LEVELING)
|
1182
|
1186
|
#if !HAS_LCD_MENU
|
1183
|
1187
|
#error "LCD_BED_LEVELING requires a programmable LCD controller."
|
1184
|
|
- #elif !(ENABLED(MESH_BED_LEVELING) || OLDSCHOOL_ABL)
|
|
1188
|
+ #elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
|
1185
|
1189
|
#error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
|
1186
|
1190
|
#endif
|
1187
|
1191
|
#endif
|