andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Enforce minimum TMC2130 / TMC2208 libs

pull/1/head
Scott Lahteine 7 years ago
parent
75b381cd28
commit
a891af2f7a
3 changed files with 76 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 130
      Marlin/src/inc/SanityCheck.h
  2. 8
      Marlin/src/module/stepper_indirection.cpp
  3. 4
      platformio.ini

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

@ -1393,36 +1393,36 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
* Make sure HAVE_TMC26X is warranted * Make sure HAVE_TMC26X is warranted
*/ */
#if ENABLED(HAVE_TMC26X) && !( \ #if ENABLED(HAVE_TMC26X) && !( \
ENABLED( X_IS_TMC26X) \ ENABLED( X_IS_TMC26X ) \
|| ENABLED(X2_IS_TMC26X) \ || ENABLED( X2_IS_TMC26X ) \
|| ENABLED( Y_IS_TMC26X) \ || ENABLED( Y_IS_TMC26X ) \
|| ENABLED(Y2_IS_TMC26X) \ || ENABLED( Y2_IS_TMC26X ) \
|| ENABLED( Z_IS_TMC26X) \ || ENABLED( Z_IS_TMC26X ) \
|| ENABLED(Z2_IS_TMC26X) \ || ENABLED( Z2_IS_TMC26X ) \
|| ENABLED(E0_IS_TMC26X) \ || ENABLED( E0_IS_TMC26X ) \
|| ENABLED(E1_IS_TMC26X) \ || ENABLED( E1_IS_TMC26X ) \
|| ENABLED(E2_IS_TMC26X) \ || ENABLED( E2_IS_TMC26X ) \
|| ENABLED(E3_IS_TMC26X) \ || ENABLED( E3_IS_TMC26X ) \
|| ENABLED(E4_IS_TMC26X) \ || ENABLED( E4_IS_TMC26X ) \
) )
#error "HAVE_TMC26X requires at least one TMC26X stepper to be set." #error "HAVE_TMC26X requires at least one TMC26X stepper to be set."
#endif #endif
/** /**
* TMC2130 Requirements * Make sure HAVE_TMC2130 is warranted
*/ */
#if ENABLED(HAVE_TMC2130) #if ENABLED(HAVE_TMC2130)
#if !( ENABLED( X_IS_TMC2130) \ #if !( ENABLED( X_IS_TMC2130 ) \
|| ENABLED(X2_IS_TMC2130) \ || ENABLED( X2_IS_TMC2130 ) \
|| ENABLED( Y_IS_TMC2130) \ || ENABLED( Y_IS_TMC2130 ) \
|| ENABLED(Y2_IS_TMC2130) \ || ENABLED( Y2_IS_TMC2130 ) \
|| ENABLED( Z_IS_TMC2130) \ || ENABLED( Z_IS_TMC2130 ) \
|| ENABLED(Z2_IS_TMC2130) \ || ENABLED( Z2_IS_TMC2130 ) \
|| ENABLED(E0_IS_TMC2130) \ || ENABLED( E0_IS_TMC2130 ) \
|| ENABLED(E1_IS_TMC2130) \ || ENABLED( E1_IS_TMC2130 ) \
|| ENABLED(E2_IS_TMC2130) \ || ENABLED( E2_IS_TMC2130 ) \
|| 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 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."
@ -1476,36 +1476,38 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
#endif #endif
/** /**
* TMC2208 Requirements * Make sure HAVE_TMC2208 is warranted
*/ */
#if ENABLED(HAVE_TMC2208) #if ENABLED(HAVE_TMC2208) && !( \
#if !( ENABLED( X_IS_TMC2208) \ ENABLED( X_IS_TMC2208 ) \
|| ENABLED(X2_IS_TMC2208) \ || ENABLED( X2_IS_TMC2208 ) \
|| ENABLED( Y_IS_TMC2208) \ || ENABLED( Y_IS_TMC2208 ) \
|| ENABLED(Y2_IS_TMC2208) \ || ENABLED( Y2_IS_TMC2208 ) \
|| ENABLED( Z_IS_TMC2208) \ || ENABLED( Z_IS_TMC2208 ) \
|| ENABLED(Z2_IS_TMC2208) \ || ENABLED( Z2_IS_TMC2208 ) \
|| ENABLED(E0_IS_TMC2208) \ || ENABLED( E0_IS_TMC2208 ) \
|| ENABLED(E1_IS_TMC2208) \ || ENABLED( E1_IS_TMC2208 ) \
|| ENABLED(E2_IS_TMC2208) \ || ENABLED( E2_IS_TMC2208 ) \
|| ENABLED(E3_IS_TMC2208) \ || ENABLED( E3_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." #endif
// Software UART and ENDSTOP_INTERRUPTS both use Pin Change interrupts (PCI)
#elif ENABLED(ENDSTOP_INTERRUPTS_FEATURE) && \ /**
!( defined( X_HARDWARE_SERIAL) \ * TMC2208 software UART and ENDSTOP_INTERRUPTS both use pin change interrupts (PCI)
|| defined(X2_HARDWARE_SERIAL) \ */
|| defined( Y_HARDWARE_SERIAL) \ #if ENABLED(HAVE_TMC2208) && ENABLED(ENDSTOP_INTERRUPTS_FEATURE) && !( \
|| defined(Y2_HARDWARE_SERIAL) \ defined(X_HARDWARE_SERIAL ) \
|| defined( Z_HARDWARE_SERIAL) \ || defined(X2_HARDWARE_SERIAL) \
|| defined(Z2_HARDWARE_SERIAL) \ || defined(Y_HARDWARE_SERIAL ) \
|| defined(E0_HARDWARE_SERIAL) \ || defined(Y2_HARDWARE_SERIAL) \
|| defined(E1_HARDWARE_SERIAL) \ || defined(Z_HARDWARE_SERIAL ) \
|| defined(E2_HARDWARE_SERIAL) \ || defined(Z2_HARDWARE_SERIAL) \
|| defined(E3_HARDWARE_SERIAL) \ || defined(E0_HARDWARE_SERIAL) \
|| defined(E4_HARDWARE_SERIAL) ) || defined(E1_HARDWARE_SERIAL) \
#error "Select *_HARDWARE_SERIAL to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE." || defined(E2_HARDWARE_SERIAL) \
#endif || defined(E3_HARDWARE_SERIAL) \
|| defined(E4_HARDWARE_SERIAL) )
#error "select hardware UART for TMC2208 to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE."
#endif #endif
#if ENABLED(HYBRID_THRESHOLD) && DISABLED(STEALTHCHOP) #if ENABLED(HYBRID_THRESHOLD) && DISABLED(STEALTHCHOP)
@ -1520,17 +1522,17 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
* Make sure HAVE_L6470DRIVER is warranted * Make sure HAVE_L6470DRIVER is warranted
*/ */
#if ENABLED(HAVE_L6470DRIVER) && !( \ #if ENABLED(HAVE_L6470DRIVER) && !( \
ENABLED( X_IS_L6470) \ ENABLED( X_IS_L6470 ) \
|| ENABLED(X2_IS_L6470) \ || ENABLED( X2_IS_L6470 ) \
|| ENABLED( Y_IS_L6470) \ || ENABLED( Y_IS_L6470 ) \
|| ENABLED(Y2_IS_L6470) \ || ENABLED( Y2_IS_L6470 ) \
|| ENABLED( Z_IS_L6470) \ || ENABLED( Z_IS_L6470 ) \
|| ENABLED(Z2_IS_L6470) \ || ENABLED( Z2_IS_L6470 ) \
|| ENABLED(E0_IS_L6470) \ || ENABLED( E0_IS_L6470 ) \
|| ENABLED(E1_IS_L6470) \ || ENABLED( E1_IS_L6470 ) \
|| ENABLED(E2_IS_L6470) \ || ENABLED( E2_IS_L6470 ) \
|| ENABLED(E3_IS_L6470) \ || ENABLED( E3_IS_L6470 ) \
|| ENABLED(E4_IS_L6470) \ || ENABLED( E4_IS_L6470 ) \
) )
#error "HAVE_L6470DRIVER requires at least one L6470 stepper to be set." #error "HAVE_L6470DRIVER requires at least one L6470 stepper to be set."
#endif #endif

8
Marlin/src/module/stepper_indirection.cpp
View File

@ -135,6 +135,10 @@
#include "planner.h" #include "planner.h"
#include "../core/enum.h" #include "../core/enum.h"
#if TMC2130STEPPER_VERSION < 0x020201
#error "Update TMC2130Stepper library to 2.2.1 or newer."
#endif
#if ENABLED(TMC_USE_SW_SPI) #if ENABLED(TMC_USE_SW_SPI)
#define _TMC2130_DEFINE(ST) TMC2130Stepper stepper##ST(ST##_ENABLE_PIN, ST##_DIR_PIN, ST##_STEP_PIN, ST##_CS_PIN, TMC_SW_MOSI, TMC_SW_MISO, TMC_SW_SCK) #define _TMC2130_DEFINE(ST) TMC2130Stepper stepper##ST(ST##_ENABLE_PIN, ST##_DIR_PIN, ST##_STEP_PIN, ST##_CS_PIN, TMC_SW_MOSI, TMC_SW_MISO, TMC_SW_SCK)
#else #else
@ -285,6 +289,10 @@
#include <TMC2208Stepper.h> #include <TMC2208Stepper.h>
#include "planner.h" #include "planner.h"
#if TMC2208STEPPER_VERSION < 0x000101
#error "Update TMC2208Stepper library to 0.1.1 or newer."
#endif
#define _TMC2208_DEFINE_HARDWARE(ST) TMC2208Stepper stepper##ST(&ST##_HARDWARE_SERIAL) #define _TMC2208_DEFINE_HARDWARE(ST) TMC2208Stepper stepper##ST(&ST##_HARDWARE_SERIAL)
#define _TMC2208_DEFINE_SOFTWARE(ST) SoftwareSerial ST##_HARDWARE_SERIAL = SoftwareSerial(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN); \ #define _TMC2208_DEFINE_SOFTWARE(ST) SoftwareSerial ST##_HARDWARE_SERIAL = SoftwareSerial(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN); \
TMC2208Stepper stepper##ST(&ST##_HARDWARE_SERIAL, ST##_SERIAL_RX_PIN > -1) TMC2208Stepper stepper##ST(&ST##_HARDWARE_SERIAL, ST##_SERIAL_RX_PIN > -1)

4
platformio.ini
View File

@ -31,7 +31,7 @@ lib_deps =
https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
LiquidCrystal_I2C@1.1.2 LiquidCrystal_I2C@1.1.2
TMC2130Stepper TMC2130Stepper
https://github.com/teemuatlut/TMC2208Stepper/archive/v0.0.4.zip https://github.com/teemuatlut/TMC2208Stepper/archive/v0.1.1.zip
Adafruit NeoPixel@1.1.3 Adafruit NeoPixel@1.1.3
https://github.com/lincomatic/LiquidTWI2/archive/30aa480.zip https://github.com/lincomatic/LiquidTWI2/archive/30aa480.zip
https://github.com/ameyer/Arduino-L6470/archive/0c5e5de.zip https://github.com/ameyer/Arduino-L6470/archive/0c5e5de.zip
@ -126,7 +126,7 @@ lib_ldf_mode = off
lib_extra_dirs = frameworks lib_extra_dirs = frameworks
lib_deps = CMSIS-LPC1768 lib_deps = CMSIS-LPC1768
https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
TMC2130Stepper@>=2.2.0 TMC2130Stepper@>=2.2.1
extra_scripts = Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py extra_scripts = Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}
monitor_baud = 250000 monitor_baud = 250000

Write Preview
Loading…
Cancel
Save