|
@@ -48,6 +48,7 @@
|
48
|
48
|
#if !defined(CONFIGURATION_ADV_H_VERSION) || HEXIFY(CONFIGURATION_ADV_H_VERSION) < HEXIFY(REQUIRED_CONFIGURATION_ADV_H_VERSION)
|
49
|
49
|
#error "You are using an old Configuration_adv.h file, update it before building Marlin."
|
50
|
50
|
#endif
|
|
51
|
+#undef HEXIFY
|
51
|
52
|
|
52
|
53
|
/**
|
53
|
54
|
* Warnings for old configurations
|
|
@@ -372,6 +373,10 @@
|
372
|
373
|
#elif MB(FORMBOT_TREX2)
|
373
|
374
|
#error "FORMBOT_TREX2 has been renamed BOARD_FORMBOT_TREX2PLUS. Please update your configuration."
|
374
|
375
|
#endif
|
|
376
|
+#undef BOARD_MKS_13
|
|
377
|
+#undef BOARD_TRIGORILLA
|
|
378
|
+#undef BOARD_RURAMPS4D
|
|
379
|
+#undef BOARD_FORMBOT_TREX2
|
375
|
380
|
|
376
|
381
|
/**
|
377
|
382
|
* Marlin release, version and default string
|
|
@@ -1741,6 +1746,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
1741
|
1746
|
#error "NEOPIXEL_LED requires NEOPIXEL_PIN and NEOPIXEL_PIXELS."
|
1742
|
1747
|
#endif
|
1743
|
1748
|
#endif
|
|
1749
|
+#undef _RGB_TEST
|
1744
|
1750
|
|
1745
|
1751
|
/**
|
1746
|
1752
|
* Auto Fan check for PWM pins
|
|
@@ -1963,16 +1969,18 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
1963
|
1969
|
#error "SENSORLESS_HOMING requires Z_MAX_ENDSTOP_INVERTING and ENDSTOPPULLUP_ZMAX when homing to Z_MAX."
|
1964
|
1970
|
#elif ENDSTOP_NOISE_THRESHOLD
|
1965
|
1971
|
#error "SENSORLESS_HOMING is incompatible with ENDSTOP_NOISE_THRESHOLD."
|
|
1972
|
+ #elif !(X_SENSORLESS || Y_SENSORLESS || Z_SENSORLESS)
|
|
1973
|
+ #error "SENSORLESS_HOMING requires a TMC stepper driver with StallGuard on X, Y, or Z axes."
|
1966
|
1974
|
#endif
|
1967
|
1975
|
#endif
|
1968
|
1976
|
|
1969
|
|
-// Sensorless homing/probing requirements
|
1970
|
|
-#if ENABLED(SENSORLESS_HOMING) && !(X_SENSORLESS || Y_SENSORLESS || Z_SENSORLESS)
|
1971
|
|
- #error "SENSORLESS_HOMING requires a TMC stepper driver with StallGuard on X, Y, or Z axes."
|
1972
|
|
-#elif BOTH(SENSORLESS_PROBING, DELTA) && !(X_SENSORLESS && Y_SENSORLESS && Z_SENSORLESS)
|
1973
|
|
- #error "SENSORLESS_PROBING for DELTA requires TMC stepper drivers with StallGuard on X, Y, and Z axes."
|
1974
|
|
-#elif ENABLED(SENSORLESS_PROBING) && !Z_SENSORLESS
|
1975
|
|
- #error "SENSORLESS_PROBING requires a TMC stepper driver with StallGuard on Z."
|
|
1977
|
+// Sensorless probing requirements
|
|
1978
|
+#if ENABLED(SENSORLESS_PROBING)
|
|
1979
|
+ #if ENABLED(DELTA) && !(X_SENSORLESS && Y_SENSORLESS && Z_SENSORLESS)
|
|
1980
|
+ #error "SENSORLESS_PROBING for DELTA requires TMC stepper drivers with StallGuard on X, Y, and Z axes."
|
|
1981
|
+ #elif !Z_SENSORLESS
|
|
1982
|
+ #error "SENSORLESS_PROBING requires a TMC stepper driver with StallGuard on Z."
|
|
1983
|
+ #endif
|
1976
|
1984
|
#endif
|
1977
|
1985
|
|
1978
|
1986
|
// Sensorless homing is required for both combined steppers in an H-bot
|