melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Squish down deprecated tests in sanity check

Browse Source
This commit is contained in:
Scott Lahteine 2015-08-03 12:32:15 -07:00 committed by Richard Wackerbarth
parent edeb58288e
commit 6af75f4b5d
1 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Marlin/SanityCheck.h
View File

@ -338,51 +338,29 @@
/** /**
* Warnings for old configurations * Warnings for old configurations
*/ */
#ifdef X_HOME_RETRACT_MM
#error [XYZ]_HOME_RETRACT_MM settings have been renamed [XYZ]_HOME_BUMP_MM.
#endif
#if WATCH_TEMP_PERIOD > 500 #if WATCH_TEMP_PERIOD > 500
#error WATCH_TEMP_PERIOD now uses seconds instead of milliseconds. #error WATCH_TEMP_PERIOD now uses seconds instead of milliseconds.
#endif #elif DISABLED(THERMAL_PROTECTION_HOTENDS) && (defined(WATCH_TEMP_PERIOD) || defined(THERMAL_PROTECTION_PERIOD))
#error Thermal Runaway Protection for hotends is now enabled with THERMAL_PROTECTION_HOTENDS.
#if DISABLED(THERMAL_PROTECTION_HOTENDS) && (defined(WATCH_TEMP_PERIOD) || defined(THERMAL_PROTECTION_PERIOD)) #elif DISABLED(THERMAL_PROTECTION_BED) && defined(THERMAL_PROTECTION_BED_PERIOD)
#error Thermal Runaway Protection for hotends must now be enabled with THERMAL_PROTECTION_HOTENDS. #error Thermal Runaway Protection for the bed is now enabled with THERMAL_PROTECTION_BED.
#endif #elif ENABLED(COREXZ) && ENABLED(Z_LATE_ENABLE)
#if DISABLED(THERMAL_PROTECTION_BED) && defined(THERMAL_PROTECTION_BED_PERIOD)
#error Thermal Runaway Protection for the bed must now be enabled with THERMAL_PROTECTION_BED.
#endif
#ifdef PROBE_SERVO_DEACTIVATION_DELAY
#error PROBE_SERVO_DEACTIVATION_DELAY has been replaced with DEACTIVATE_SERVOS_AFTER_MOVE and SERVO_DEACTIVATION_DELAY.
#endif
#if defined(COREXZ) && defined(Z_LATE_ENABLE)
#error "Z_LATE_ENABLE can't be used with COREXZ." #error "Z_LATE_ENABLE can't be used with COREXZ."
#endif #elif defined(X_HOME_RETRACT_MM)
#error [XYZ]_HOME_RETRACT_MM settings have been renamed [XYZ]_HOME_BUMP_MM.
#ifdef BEEPER #elif defined(PROBE_SERVO_DEACTIVATION_DELAY)
#error BEEPER has been replaced with BEEPER_PIN. Please update your pins definitions. #error PROBE_SERVO_DEACTIVATION_DELAY has been replaced with DEACTIVATE_SERVOS_AFTER_MOVE and SERVO_DEACTIVATION_DELAY.
#endif #elif defined(BEEPER)
#error BEEPER is now BEEPER_PIN. Please update your pins definitions.
#ifdef SDCARDDETECT #elif defined(SDCARDDETECT)
#error SDCARDDETECT is now SD_DETECT_PIN. Please update your pins definitions. #error SDCARDDETECT is now SD_DETECT_PIN. Please update your pins definitions.
#endif #elif defined(SDCARDDETECTINVERTED)
#ifdef SDCARDDETECTINVERTED
#error SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration. #error SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration.
#endif #elif defined(BTENABLED)
#error BTENABLED is now BLUETOOTH. Please update your configuration.
#ifdef BTENABLED #elif defined(CUSTOM_MENDEL_NAME)
#error BTENABLED has been replaced with BLUETOOTH. Please update your configuration. #error CUSTOM_MENDEL_NAME is now CUSTOM_MACHINE_NAME. Please update your configuration.
#endif #elif defined(HAS_AUTOMATIC_VERSIONING)
#ifdef CUSTOM_MENDEL_NAME
#error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead
#endif
#ifdef HAS_AUTOMATIC_VERSIONING
#error HAS_AUTOMATIC_VERSIONING deprecated - use USE_AUTOMATIC_VERSIONING instead #error HAS_AUTOMATIC_VERSIONING deprecated - use USE_AUTOMATIC_VERSIONING instead
#endif #endif