zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

TMCStepper 0.7.0

Browse source
This commit is contained in:
Scott Lahteine 2020-06-21 22:10:29 -05:00
parent d236b3dcf5
commit 31167c158b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/feature/tmc_util.h
View file

@ -152,8 +152,8 @@ class TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
TMCMarlin(Stream * SerialPort, const float RS, uint8_t addr, const uint16_t mul_pin1, const uint16_t mul_pin2) : TMCMarlin(Stream * SerialPort, const float RS, uint8_t addr, const uint16_t mul_pin1, const uint16_t mul_pin2) :
TMC2208Stepper(SerialPort, RS, addr, mul_pin1, mul_pin2) TMC2208Stepper(SerialPort, RS, addr, mul_pin1, mul_pin2)
{} {}
TMCMarlin(const uint16_t RX, const uint16_t TX, const float RS, const uint8_t, const bool has_rx=true) : TMCMarlin(const uint16_t RX, const uint16_t TX, const float RS, const uint8_t) :
TMC2208Stepper(RX, TX, RS, has_rx) TMC2208Stepper(RX, TX, RS)
{} {}
uint16_t rms_current() { return TMC2208Stepper::rms_current(); } uint16_t rms_current() { return TMC2208Stepper::rms_current(); }

2
Marlin/src/module/stepper/trinamic.cpp
View file

@ -54,7 +54,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
#else #else
#define TMC_UART_HW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(&ST##_HARDWARE_SERIAL, float(ST##_RSENSE), ST##_SLAVE_ADDRESS) #define TMC_UART_HW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(&ST##_HARDWARE_SERIAL, float(ST##_RSENSE), ST##_SLAVE_ADDRESS)
#endif #endif
#define TMC_UART_SW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN, float(ST##_RSENSE), ST##_SLAVE_ADDRESS, ST##_SERIAL_RX_PIN > -1) #define TMC_UART_SW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN, float(ST##_RSENSE), ST##_SLAVE_ADDRESS)
#define _TMC_SPI_DEFINE(IC, ST, AI) __TMC_SPI_DEFINE(IC, ST, TMC_##ST##_LABEL, AI) #define _TMC_SPI_DEFINE(IC, ST, AI) __TMC_SPI_DEFINE(IC, ST, TMC_##ST##_LABEL, AI)
#define TMC_SPI_DEFINE(ST, AI) _TMC_SPI_DEFINE(ST##_DRIVER_TYPE, ST, AI##_AXIS) #define TMC_SPI_DEFINE(ST, AI) _TMC_SPI_DEFINE(ST##_DRIVER_TYPE, ST, AI##_AXIS)

4
platformio.ini
View file

@ -29,7 +29,7 @@ extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants
lib_deps = lib_deps =
LiquidCrystal LiquidCrystal
TMCStepper@>=0.6.2 TMCStepper@>=0.7.0
Adafruit MAX31865 library@>=1.1,<1.2 Adafruit MAX31865 library@>=1.1,<1.2
Adafruit NeoPixel Adafruit NeoPixel
U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
@ -810,7 +810,7 @@ lib_ignore = Adafruit NeoPixel, SailfishLCD, SlowSoftI2CMaster, SoftwareS
[env:rumba32] [env:rumba32]
platform = ${common_stm32.platform} platform = ${common_stm32.platform}
extends = common_stm32 extends = common_stm32
build_flags = ${common_stm32.build_flags} build_flags = ${common_stm32.build_flags}
-Os -Os
"-DUSB_PRODUCT=\"RUMBA32\"" "-DUSB_PRODUCT=\"RUMBA32\""
-DHAL_PCD_MODULE_ENABLED -DHAL_PCD_MODULE_ENABLED