Преглед на файлове

Require TMCStepper 0.6.2

Scott Lahteine преди 4 години
родител
ревизия
72fae2faa5
променени са 3 файла, в които са добавени 20 реда и са изтрити 20 реда
  1. 4
    4
      Marlin/src/module/stepper/trinamic.cpp
  2. 15
    15
      buildroot/share/tests/megaatmega2560-tests
  3. 1
    1
      platformio.ini

+ 4
- 4
Marlin/src/module/stepper/trinamic.cpp Целия файл

@@ -44,13 +44,13 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
44 44
 //   AI = Axis Enum Index
45 45
 // SWHW = SW/SH UART selection
46 46
 #if ENABLED(TMC_USE_SW_SPI)
47
-  #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_CS_PIN, ST##_RSENSE, TMC_SW_MOSI, TMC_SW_MISO, TMC_SW_SCK, ST##_CHAIN_POS)
47
+  #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_CS_PIN, float(ST##_RSENSE), TMC_SW_MOSI, TMC_SW_MISO, TMC_SW_SCK, ST##_CHAIN_POS)
48 48
 #else
49
-  #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_CS_PIN, ST##_RSENSE, ST##_CHAIN_POS)
49
+  #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_CS_PIN, float(ST##_RSENSE), ST##_CHAIN_POS)
50 50
 #endif
51 51
 
52
-#define TMC_UART_HW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(&ST##_HARDWARE_SERIAL, ST##_RSENSE, ST##_SLAVE_ADDRESS)
53
-#define TMC_UART_SW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN, ST##_RSENSE, ST##_SLAVE_ADDRESS, ST##_SERIAL_RX_PIN > -1)
52
+#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)
53
+#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)
54 54
 
55 55
 #define _TMC_SPI_DEFINE(IC, ST, AI) __TMC_SPI_DEFINE(IC, ST, TMC_##ST##_LABEL, AI)
56 56
 #define TMC_SPI_DEFINE(ST, AI) _TMC_SPI_DEFINE(ST##_DRIVER_TYPE, ST, AI##_AXIS)

+ 15
- 15
buildroot/share/tests/megaatmega2560-tests Целия файл

@@ -340,21 +340,6 @@ exec_test $1 $2 "RAMPS 1.3 | DELTA | FLSUN AC Config"
340 340
 #exec_test $1 $2 "Stuff"
341 341
 
342 342
 #
343
-# SCARA with Mixed TMC
344
-#
345
-use_example_configs SCARA/Morgan
346
-opt_set LCD_LANGUAGE es
347
-opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \
348
-           MKS_12864OLED EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL Z_SAFE_HOMING \
349
-           STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING SQUARE_WAVE_STEPPING
350
-opt_set X_MAX_ENDSTOP_INVERTING false
351
-opt_set X_DRIVER_TYPE TMC2209
352
-opt_set Y_DRIVER_TYPE TMC2130
353
-opt_set Z_DRIVER_TYPE TMC2130_STANDALONE
354
-opt_set E0_DRIVER_TYPE TMC2660
355
-exec_test $1 $2 "RAMPS | SCARA | Mixed TMC | EEPROM"
356
-
357
-#
358 343
 # Test mixed TMC config
359 344
 #
360 345
 restore_configs
@@ -372,6 +357,21 @@ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER \
372 357
 exec_test $1 $2 "RAMPS | Mixed TMC | Sensorless | RRDFGSC | Games"
373 358
 
374 359
 #
360
+# SCARA with Mixed TMC
361
+#
362
+use_example_configs SCARA/Morgan
363
+opt_set LCD_LANGUAGE es
364
+opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \
365
+           MKS_12864OLED EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL Z_SAFE_HOMING \
366
+           STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING SQUARE_WAVE_STEPPING
367
+opt_set X_MAX_ENDSTOP_INVERTING false
368
+opt_set X_DRIVER_TYPE TMC2209
369
+opt_set Y_DRIVER_TYPE TMC2130
370
+opt_set Z_DRIVER_TYPE TMC2130_STANDALONE
371
+opt_set E0_DRIVER_TYPE TMC2660
372
+exec_test $1 $2 "RAMPS | SCARA | Mixed TMC | EEPROM"
373
+
374
+#
375 375
 # tvrrug Config need to check board type for sanguino atmega644p
376 376
 #
377 377
 #use_example_configs tvrrug/Round2

+ 1
- 1
platformio.ini Целия файл

@@ -26,7 +26,7 @@ extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
26 26
 build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants
27 27
 lib_deps =
28 28
   LiquidCrystal
29
-  TMCStepper@>=0.6.1,<1.0.0
29
+  TMCStepper@>=0.6.2,<1.0.0
30 30
   Adafruit NeoPixel
31 31
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
32 32
   Adafruit_MAX31865=https://github.com/adafruit/Adafruit_MAX31865/archive/master.zip

Loading…
Отказ
Запис