Browse Source

Treat TMC2660 like non-TMC (#11508)

Scott Lahteine 7 years ago
parent
commit
b328fb4dc9
No account linked to committer's email address
2 changed files with 6 additions and 6 deletions
  1. 1
    1
      Marlin/src/core/drivers.h
  2. 5
    5
      Marlin/src/inc/Conditionals_post.h

+ 1
- 1
Marlin/src/core/drivers.h View File

@@ -63,7 +63,7 @@
63 63
 
64 64
 // Test for supported TMC drivers that require advanced configuration
65 65
 // Does not match standalone configurations
66
-#define HAS_TRINAMIC ( HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2660) )
66
+#define HAS_TRINAMIC (HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2208))
67 67
 
68 68
 #define AXIS_IS_TMC(A) ( AXIS_DRIVER_TYPE_##A(TMC2130) || \
69 69
                          AXIS_DRIVER_TYPE_##A(TMC2208) || \

+ 5
- 5
Marlin/src/inc/Conditionals_post.h View File

@@ -456,7 +456,7 @@
456 456
     #define MINIMUM_STEPPER_DIR_DELAY 400  
457 457
   #elif HAS_DRIVER(A4988)
458 458
     #define MINIMUM_STEPPER_DIR_DELAY 200
459
-  #elif HAS_TRINAMIC || HAS_DRIVER(TMC2130_STANDALONE) || HAS_DRIVER(TMC2208_STANDALONE) || HAS_DRIVER(TMC26X_STANDALONE) || HAS_DRIVER(TMC2660_STANDALONE)
459
+  #elif HAS_TRINAMIC || HAS_DRIVER(TMC2660) || HAS_DRIVER(TMC2130_STANDALONE) || HAS_DRIVER(TMC2208_STANDALONE) || HAS_DRIVER(TMC26X_STANDALONE) || HAS_DRIVER(TMC2660_STANDALONE)
460 460
     #define MINIMUM_STEPPER_DIR_DELAY 20
461 461
   #else
462 462
     #define MINIMUM_STEPPER_DIR_DELAY 0   // Expect at least 10µS since one Stepper ISR must transpire
@@ -472,7 +472,7 @@
472 472
     #define MINIMUM_STEPPER_PULSE 2
473 473
   #elif HAS_DRIVER(A4988) || HAS_DRIVER(LV8729) || HAS_DRIVER(A5984)
474 474
     #define MINIMUM_STEPPER_PULSE 1
475
-  #elif HAS_TRINAMIC || HAS_DRIVER(TMC2130_STANDALONE) || HAS_DRIVER(TMC2208_STANDALONE) || HAS_DRIVER(TMC26X_STANDALONE) || HAS_DRIVER(TMC2660_STANDALONE)
475
+  #elif HAS_TRINAMIC || HAS_DRIVER(TMC2660) || HAS_DRIVER(TMC2130_STANDALONE) || HAS_DRIVER(TMC2208_STANDALONE) || HAS_DRIVER(TMC26X_STANDALONE) || HAS_DRIVER(TMC2660_STANDALONE)
476 476
     #define MINIMUM_STEPPER_PULSE 0
477 477
   #else
478 478
     #define MINIMUM_STEPPER_PULSE 2
@@ -488,7 +488,7 @@
488 488
     #define MAXIMUM_STEPPER_RATE 150000
489 489
   #elif HAS_DRIVER(DRV8825)
490 490
     #define MAXIMUM_STEPPER_RATE 250000
491
-  #elif HAS_TRINAMIC || HAS_DRIVER(TMC2130_STANDALONE) || HAS_DRIVER(TMC2208_STANDALONE) || HAS_DRIVER(TMC26X_STANDALONE) || HAS_DRIVER(TMC2660_STANDALONE)
491
+  #elif HAS_TRINAMIC || HAS_DRIVER(TMC2660) || HAS_DRIVER(TMC2130_STANDALONE) || HAS_DRIVER(TMC2208_STANDALONE) || HAS_DRIVER(TMC26X_STANDALONE) || HAS_DRIVER(TMC2660_STANDALONE)
492 492
     #define MAXIMUM_STEPPER_RATE 400000
493 493
   #elif HAS_DRIVER(A4988)
494 494
     #define MAXIMUM_STEPPER_RATE 500000
@@ -783,9 +783,9 @@
783 783
 
784 784
 // Trinamic Stepper Drivers
785 785
 #define HAS_STEALTHCHOP (HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2208))
786
-#define HAS_STALLGUARD  (HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2660))
786
+#define HAS_STALLGUARD  HAS_DRIVER(TMC2130)
787 787
 #define AXIS_HAS_STEALTHCHOP(ST) ( AXIS_DRIVER_TYPE(ST, TMC2130) || AXIS_DRIVER_TYPE(ST, TMC2208) )
788
-#define AXIS_HAS_STALLGUARD(ST) ( AXIS_DRIVER_TYPE(ST, TMC2130) || AXIS_DRIVER_TYPE(ST, TMC2660) )
788
+#define AXIS_HAS_STALLGUARD(ST) AXIS_DRIVER_TYPE(ST, TMC2130)
789 789
 
790 790
 #if ENABLED(SENSORLESS_HOMING)
791 791
   // Disable Z axis sensorless homing if a probe is used to home the Z axis

Loading…
Cancel
Save