sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SanityCheck.h parity with 2.0.x

Browse Source
This commit is contained in:
Scott Lahteine
2018-02-04 18:50:38 -06:00
parent e9d374dd54
commit 89a9aa931f
1 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Marlin/SanityCheck.h
View File

@@ -914,7 +914,7 @@ static_assert(1 >= 0
*/ */
#if ENABLED(DISABLE_X) || ENABLED(DISABLE_Y) || ENABLED(DISABLE_Z) #if ENABLED(DISABLE_X) || ENABLED(DISABLE_Y) || ENABLED(DISABLE_Z)
#if ENABLED(HOME_AFTER_DEACTIVATE) || ENABLED(Z_SAFE_HOMING) #if ENABLED(HOME_AFTER_DEACTIVATE) || ENABLED(Z_SAFE_HOMING)
#error "DISABLE_[XYZ] not compatible with HOME_AFTER_DEACTIVATE or Z_SAFE_HOMING." #error "DISABLE_[XYZ] is not compatible with HOME_AFTER_DEACTIVATE or Z_SAFE_HOMING."
#endif #endif
#endif // DISABLE_[XYZ] #endif // DISABLE_[XYZ]
@@ -1427,8 +1427,8 @@ static_assert(1 >= 0
/** /**
* Make sure HAVE_TMCDRIVER is warranted * Make sure HAVE_TMCDRIVER is warranted
*/ */
#if ENABLED(HAVE_TMCDRIVER) #if ENABLED(HAVE_TMCDRIVER) && !( \
#if !( ENABLED( X_IS_TMC ) \ ENABLED( X_IS_TMC ) \
|| ENABLED( X2_IS_TMC ) \ || ENABLED( X2_IS_TMC ) \
|| ENABLED( Y_IS_TMC ) \ || ENABLED( Y_IS_TMC ) \
|| ENABLED( Y2_IS_TMC ) \ || ENABLED( Y2_IS_TMC ) \
@@ -1439,8 +1439,28 @@ static_assert(1 >= 0
|| ENABLED( E2_IS_TMC ) \ || ENABLED( E2_IS_TMC ) \
|| ENABLED( E3_IS_TMC ) \ || ENABLED( E3_IS_TMC ) \
|| ENABLED( E4_IS_TMC ) \ || ENABLED( E4_IS_TMC ) \
) )
#error "HAVE_TMCDRIVER requires at least one TMC stepper to be set." #error "HAVE_TMCDRIVER requires at least one TMC stepper to be set."
#endif
/**
* Make sure HAVE_TMC2130 is warranted
*/
#if ENABLED(HAVE_TMC2130)
#if !( ENABLED( X_IS_TMC2130 ) \
|| ENABLED( X2_IS_TMC2130 ) \
|| ENABLED( Y_IS_TMC2130 ) \
|| ENABLED( Y2_IS_TMC2130 ) \
|| ENABLED( Z_IS_TMC2130 ) \
|| ENABLED( Z2_IS_TMC2130 ) \
|| ENABLED( E0_IS_TMC2130 ) \
|| ENABLED( E1_IS_TMC2130 ) \
|| ENABLED( E2_IS_TMC2130 ) \
|| ENABLED( E3_IS_TMC2130 ) \
|| ENABLED( E4_IS_TMC2130 ) )
#error "HAVE_TMC2130 requires at least one TMC2130 stepper to be set."
#elif ENABLED(HYBRID_THRESHOLD) && DISABLED(STEALTHCHOP)
#error "Enable STEALTHCHOP to use HYBRID_THRESHOLD."
#endif #endif
#if ENABLED(X_IS_TMC2130) && !PIN_EXISTS(X_CS) #if ENABLED(X_IS_TMC2130) && !PIN_EXISTS(X_CS)
@@ -1467,26 +1487,10 @@ static_assert(1 >= 0
#error "E4_CS_PIN is required for E4_IS_TMC2130. Define E4_CS_PIN in Configuration_adv.h." #error "E4_CS_PIN is required for E4_IS_TMC2130. Define E4_CS_PIN in Configuration_adv.h."
#endif #endif
#endif
/**
* Make sure HAVE_TMC2130 is warranted
*/
#if ENABLED(HAVE_TMC2130) && !( \
ENABLED( X_IS_TMC2130 ) \
|| ENABLED( X2_IS_TMC2130 ) \
|| ENABLED( Y_IS_TMC2130 ) \
|| ENABLED( Y2_IS_TMC2130 ) \
|| ENABLED( Z_IS_TMC2130 ) \
|| ENABLED( Z2_IS_TMC2130 ) \
|| ENABLED( E0_IS_TMC2130 ) \
|| ENABLED( E1_IS_TMC2130 ) \
|| ENABLED( E2_IS_TMC2130 ) \
|| ENABLED( E3_IS_TMC2130 ) \
|| ENABLED( E4_IS_TMC2130 ) )
#error "HAVE_TMC2130 requires at least one TMC2130 stepper to be set."
#elif ENABLED(SENSORLESS_HOMING) #elif ENABLED(SENSORLESS_HOMING)
#error "SENSORLESS_HOMING requires TMC2130 stepper drivers." #error "SENSORLESS_HOMING requires TMC2130 stepper drivers."
#endif #endif
/** /**