Skip to content

Commit

Permalink
TMCStepper 0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@thinkyhead
thinkyhead committed Jun 22, 2020
1 parent d236b3d commit 31167c1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Marlin/src/feature/tmc_util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) :
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) :
TMC2208Stepper(RX, TX, RS, has_rx)
TMCMarlin(const uint16_t RX, const uint16_t TX, const float RS, const uint8_t) :
TMC2208Stepper(RX, TX, RS)
{}

uint16_t rms_current() { return TMC2208Stepper::rms_current(); }
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/stepper/trinamic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
#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)
#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(ST, AI) _TMC_SPI_DEFINE(ST##_DRIVER_TYPE, ST, AI##_AXIS)
Expand Down
4 changes: 2 additions & 2 deletions platformio.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
lib_deps =
LiquidCrystal
TMCStepper@>=0.6.2
TMCStepper@>=0.7.0
Adafruit MAX31865 library@>=1.1,<1.2
Adafruit NeoPixel
U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
Expand Down Expand Up @@ -810,7 +810,7 @@ lib_ignore = Adafruit NeoPixel, SailfishLCD, SlowSoftI2CMaster, SoftwareS
[env:rumba32]
platform = ${common_stm32.platform}
extends = common_stm32
build_flags = ${common_stm32.build_flags}
build_flags = ${common_stm32.build_flags}
-Os
"-DUSB_PRODUCT=\"RUMBA32\""
-DHAL_PCD_MODULE_ENABLED
Expand Down

2 comments on commit 31167c1

@Evg33
Copy link
Contributor

@Evg33 Evg33 commented on 31167c1 Jun 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SKR 1.4T (LPC1769) + TMC2209 uart

Marlin/src/module/stepper/trinamic.cpp:57:163: error: no matching function for call to 'TMCMarlin<TMC2209Stepper, 'X', '0', X_AXIS>::TMCMarlin(int, int, float, int)'
   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)
      |                                                                                                                                                                   ^
Marlin/src/module/stepper/trinamic.cpp:62:44: note: in expansion of macro 'TMC_UART_SW_DEFINE'
   62 | #define _TMC_UART_DEFINE(SWHW, IC, ST, AI) TMC_UART_##SWHW##_DEFINE(IC, ST, TMC_##ST##_LABEL, AI)
      |                                            ^~~~~~~~~
Marlin/src/module/stepper/trinamic.cpp:63:39: note: in expansion of macro '_TMC_UART_DEFINE'
   63 | #define TMC_UART_DEFINE(SWHW, ST, AI) _TMC_UART_DEFINE(SWHW, ST##_DRIVER_TYPE, ST, AI##_AXIS)
      |                                       ^~~~~~~~~~~~~~~~
Marlin/src/module/stepper/trinamic.cpp:213:7: note: in expansion of macro 'TMC_UART_DEFINE'
  213 |       TMC_UART_DEFINE(SW, X, X);
      |       ^~~~~~~~~~~~~~~
In file included from Marlin/src/module/stepper/trinamic.h:35,
                 from Marlin/src/module/stepper/trinamic.cpp:32:
Marlin/src/module/stepper/../../feature/tmc_util.h:200:5: note: candidate: 'TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID>::TMCMarlin(uint16_t, uint16_t, float, uint8_t, bool) [with char AXIS_LETTER = 'X'; char DRIVER_ID = '0'; AxisEnum AXIS_ID = X_AXIS; uint16_t = short unsigned int; uint8_t = unsigned char]'
  200 |     TMCMarlin(const uint16_t RX, const uint16_t TX, const float RS, const uint8_t addr, const bool) :
      |     ^~~~~~~~~
Marlin/src/module/stepper/../../feature/tmc_util.h:200:5: note:   candidate expects 5 arguments, 4 provided
Marlin/src/module/stepper/../../feature/tmc_util.h:197:5: note: candidate: 'TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID>::TMCMarlin(Stream*, float, uint8_t) [with char AXIS_LETTER = 'X'; char DRIVER_ID = '0'; AxisEnum AXIS_ID = X_AXIS; uint8_t = unsigned char]'
  197 |     TMCMarlin(Stream * SerialPort, const float RS, const uint8_t addr) :
      |     ^~~~~~~~~
Marlin/src/module/stepper/../../feature/tmc_util.h:197:5: note:   candidate expects 3 arguments, 4 provided
Marlin/src/module/stepper/../../feature/tmc_util.h:195:7: note: candidate: 'constexpr TMCMarlin<TMC2209Stepper, 'X', '0', X_AXIS>::TMCMarlin(const TMCMarlin<TMC2209Stepper, 'X', '0', X_AXIS>&)'
  195 | class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC2209Stepper, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Marlin/src/module/stepper/../../feature/tmc_util.h:195:7: note:   candidate expects 1 argument, 4 provided
Marlin/src/module/stepper/../../feature/tmc_util.h:195:7: note: candidate: 'constexpr TMCMarlin<TMC2209Stepper, 'X', '0', X_AXIS>::TMCMarlin(TMCMarlin<TMC2209Stepper, 'X', '0', X_AXIS>&&)'
Marlin/src/module/stepper/../../feature/tmc_util.h:195:7: note:   candidate expects 1 argument, 4 provided

@Evg33
Copy link
Contributor

@Evg33 Evg33 commented on 31167c1 Jun 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#18388

Please sign in to comment.