Browse Source

TMCStepper 0.7.0

Scott Lahteine 5 years ago
parent
commit
31167c158b
3 changed files with 5 additions and 5 deletions
  1. 2
    2
      Marlin/src/feature/tmc_util.h
  2. 1
    1
      Marlin/src/module/stepper/trinamic.cpp
  3. 2
    2
      platformio.ini

+ 2
- 2
Marlin/src/feature/tmc_util.h View File

152
     TMCMarlin(Stream * SerialPort, const float RS, uint8_t addr, const uint16_t mul_pin1, const uint16_t mul_pin2) :
152
     TMCMarlin(Stream * SerialPort, const float RS, uint8_t addr, const uint16_t mul_pin1, const uint16_t mul_pin2) :
153
       TMC2208Stepper(SerialPort, RS, addr, mul_pin1, mul_pin2)
153
       TMC2208Stepper(SerialPort, RS, addr, mul_pin1, mul_pin2)
154
      {}
154
      {}
155
-    TMCMarlin(const uint16_t RX, const uint16_t TX, const float RS, const uint8_t, const bool has_rx=true) :
156
-      TMC2208Stepper(RX, TX, RS, has_rx)
155
+    TMCMarlin(const uint16_t RX, const uint16_t TX, const float RS, const uint8_t) :
156
+      TMC2208Stepper(RX, TX, RS)
157
       {}
157
       {}
158
 
158
 
159
     uint16_t rms_current() { return TMC2208Stepper::rms_current(); }
159
     uint16_t rms_current() { return TMC2208Stepper::rms_current(); }

+ 1
- 1
Marlin/src/module/stepper/trinamic.cpp View File

54
 #else
54
 #else
55
   #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)
55
   #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)
56
 #endif
56
 #endif
57
-#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)
57
+#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)
58
 
58
 
59
 #define _TMC_SPI_DEFINE(IC, ST, AI) __TMC_SPI_DEFINE(IC, ST, TMC_##ST##_LABEL, AI)
59
 #define _TMC_SPI_DEFINE(IC, ST, AI) __TMC_SPI_DEFINE(IC, ST, TMC_##ST##_LABEL, AI)
60
 #define TMC_SPI_DEFINE(ST, AI) _TMC_SPI_DEFINE(ST##_DRIVER_TYPE, ST, AI##_AXIS)
60
 #define TMC_SPI_DEFINE(ST, AI) _TMC_SPI_DEFINE(ST##_DRIVER_TYPE, ST, AI##_AXIS)

+ 2
- 2
platformio.ini View File

29
 build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants
29
 build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants
30
 lib_deps =
30
 lib_deps =
31
   LiquidCrystal
31
   LiquidCrystal
32
-  TMCStepper@>=0.6.2
32
+  TMCStepper@>=0.7.0
33
   Adafruit MAX31865 library@>=1.1,<1.2
33
   Adafruit MAX31865 library@>=1.1,<1.2
34
   Adafruit NeoPixel
34
   Adafruit NeoPixel
35
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
35
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
810
 [env:rumba32]
810
 [env:rumba32]
811
 platform      = ${common_stm32.platform}
811
 platform      = ${common_stm32.platform}
812
 extends       = common_stm32
812
 extends       = common_stm32
813
-build_flags   = ${common_stm32.build_flags} 
813
+build_flags   = ${common_stm32.build_flags}
814
   -Os
814
   -Os
815
   "-DUSB_PRODUCT=\"RUMBA32\""
815
   "-DUSB_PRODUCT=\"RUMBA32\""
816
   -DHAL_PCD_MODULE_ENABLED
816
   -DHAL_PCD_MODULE_ENABLED

Loading…
Cancel
Save