CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10203 from Bob-the-Kuhn/sanity-check-fix

Browse Source 
[2.0.x] Fix TMC sanity checks that always fail
This commit is contained in:
Bob-the-Kuhn 2018-03-24 14:06:34 -05:00 committed by GitHub
commit 75b381cd28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1424,8 +1424,6 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
|| ENABLED(E3_IS_TMC2130) \ || ENABLED(E3_IS_TMC2130) \
|| ENABLED(E4_IS_TMC2130) ) || ENABLED(E4_IS_TMC2130) )
#error "HAVE_TMC2130 requires at least one TMC2130 stepper to be set." #error "HAVE_TMC2130 requires at least one TMC2130 stepper to be set."
#elif TMC2130STEPPER_VERSION < 0x020201
#error "Update TMC2130Stepper library to 2.2.1 or newer."
#elif ENABLED(HYBRID_THRESHOLD) && DISABLED(STEALTHCHOP) #elif ENABLED(HYBRID_THRESHOLD) && DISABLED(STEALTHCHOP)
#error "Enable STEALTHCHOP to use HYBRID_THRESHOLD." #error "Enable STEALTHCHOP to use HYBRID_THRESHOLD."
#endif #endif
@ -1493,7 +1491,8 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
|| ENABLED(E3_IS_TMC2208) \ || ENABLED(E3_IS_TMC2208) \
|| ENABLED(E4_IS_TMC2208 ) ) || ENABLED(E4_IS_TMC2208 ) )
#error "HAVE_TMC2208 requires at least one TMC2208 stepper to be set." #error "HAVE_TMC2208 requires at least one TMC2208 stepper to be set."
#elif ENABLED(ENDSTOP_INTERRUPTS_FEATURE) && \ // Software UART and ENDSTOP_INTERRUPTS both use Pin Change interrupts (PCI) // Software UART and ENDSTOP_INTERRUPTS both use Pin Change interrupts (PCI)
#elif ENABLED(ENDSTOP_INTERRUPTS_FEATURE) && \
!( defined( X_HARDWARE_SERIAL) \ !( defined( X_HARDWARE_SERIAL) \
|| defined(X2_HARDWARE_SERIAL) \ || defined(X2_HARDWARE_SERIAL) \
|| defined( Y_HARDWARE_SERIAL) \ || defined( Y_HARDWARE_SERIAL) \
@ -1506,8 +1505,6 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
|| defined(E3_HARDWARE_SERIAL) \ || defined(E3_HARDWARE_SERIAL) \
|| defined(E4_HARDWARE_SERIAL) ) || defined(E4_HARDWARE_SERIAL) )
#error "Select *_HARDWARE_SERIAL to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE." #error "Select *_HARDWARE_SERIAL to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE."
#elif TMC2208STEPPER_VERSION < 0x000101
#error "Update TMC2130Stepper library to 0.1.1 or newer."
#endif #endif
#endif #endif