Browse Source

Add HAS_TMC220x

Scott Lahteine 4 years ago
parent
commit
1a349c7522

+ 1
- 1
Marlin/src/Marlin.cpp View File

@@ -860,7 +860,7 @@ void setup() {
860 860
 
861 861
   setup_killpin();
862 862
 
863
-  #if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
863
+  #if HAS_TMC220x
864 864
     tmc_serial_begin();
865 865
   #endif
866 866
 

+ 2
- 0
Marlin/src/core/drivers.h View File

@@ -84,6 +84,8 @@
84 84
                        || HAS_DRIVER(TMC5130) \
85 85
                        || HAS_DRIVER(TMC5160) )
86 86
 
87
+#define HAS_TMC220x (HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209))
88
+
87 89
 #define AXIS_IS_TMC(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) \
88 90
                            || AXIS_DRIVER_TYPE(A,TMC2160) \
89 91
                            || AXIS_DRIVER_TYPE(A,TMC2208) \

+ 7
- 7
Marlin/src/feature/tmc_util.cpp View File

@@ -69,7 +69,7 @@
69 69
          #endif
70 70
       ;
71 71
     #if ENABLED(TMC_DEBUG)
72
-      #if HAS_TMCX1X0 || HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
72
+      #if HAS_TMCX1X0 || HAS_TMC220x
73 73
         uint8_t cs_actual;
74 74
       #endif
75 75
       #if HAS_STALLGUARD
@@ -139,7 +139,7 @@
139 139
 
140 140
   #endif // HAS_TMCX1X0
141 141
 
142
-  #if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
142
+  #if HAS_TMC220x
143 143
 
144 144
     #if ENABLED(TMC_DEBUG)
145 145
       static uint32_t get_pwm_scale(TMC2208Stepper &st) { return st.pwm_scale_sum(); }
@@ -239,7 +239,7 @@
239 239
     st.printLabel();
240 240
     SERIAL_CHAR(':'); SERIAL_PRINT(pwm_scale, DEC);
241 241
     #if ENABLED(TMC_DEBUG)
242
-      #if HAS_TMCX1X0 || HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
242
+      #if HAS_TMCX1X0 || HAS_TMC220x
243 243
         SERIAL_CHAR('/'); SERIAL_PRINT(data.cs_actual, DEC);
244 244
       #endif
245 245
       #if HAS_STALLGUARD
@@ -516,7 +516,7 @@
516 516
     }
517 517
   #endif
518 518
 
519
-  #if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
519
+  #if HAS_TMC220x
520 520
     static void _tmc_status(TMC2208Stepper &st, const TMC_debug_enum i) {
521 521
       switch (i) {
522 522
         case TMC_PWM_SCALE: SERIAL_PRINT(st.pwm_scale_sum(), DEC); break;
@@ -789,7 +789,7 @@
789 789
     #endif
790 790
     TMC_REPORT("CS actual\t",        TMC_CS_ACTUAL);
791 791
     TMC_REPORT("PWM scale",          TMC_PWM_SCALE);
792
-    #if HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2224) || HAS_DRIVER(TMC2660) || HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
792
+    #if HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2224) || HAS_DRIVER(TMC2660) || HAS_TMC220x
793 793
       TMC_REPORT("vsense\t",         TMC_VSENSE);
794 794
     #endif
795 795
     TMC_REPORT("stealthChop",        TMC_STEALTHCHOP);
@@ -821,7 +821,7 @@
821 821
     DRV_REPORT("s2ga\t",             TMC_S2GA);
822 822
     DRV_REPORT("otpw\t",             TMC_DRV_OTPW);
823 823
     DRV_REPORT("ot\t",               TMC_OT);
824
-    #if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
824
+    #if HAS_TMC220x
825 825
       DRV_REPORT("157C\t",           TMC_T157);
826 826
       DRV_REPORT("150C\t",           TMC_T150);
827 827
       DRV_REPORT("143C\t",           TMC_T143);
@@ -845,7 +845,7 @@
845 845
       }
846 846
     }
847 847
   #endif
848
-  #if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
848
+  #if HAS_TMC220x
849 849
     static void tmc_get_ic_registers(TMC2208Stepper, const TMC_get_registers_enum) { SERIAL_CHAR('\t'); }
850 850
   #endif
851 851
 

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

@@ -909,7 +909,7 @@
909 909
   #define HAS_TMCX1X0       (HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160))
910 910
   #define TMC_HAS_SPI       (HAS_TMCX1X0 || HAS_DRIVER(TMC2660))
911 911
   #define HAS_STALLGUARD    (HAS_TMCX1X0 || HAS_DRIVER(TMC2209) || HAS_DRIVER(TMC2660))
912
-  #define HAS_STEALTHCHOP   (HAS_TMCX1X0 || HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209))
912
+  #define HAS_STEALTHCHOP   (HAS_TMCX1X0 || HAS_TMC220x)
913 913
 
914 914
   #define STEALTHCHOP_ENABLED ANY(STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_E)
915 915
   #define USE_SENSORLESS EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)

+ 2
- 2
Marlin/src/inc/SanityCheck.h View File

@@ -2015,7 +2015,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
2015 2015
 /**
2016 2016
  * TMC2208/2209 software UART and ENDSTOP_INTERRUPTS both use pin change interrupts (PCI)
2017 2017
  */
2018
-#if (HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)) && ENABLED(ENDSTOP_INTERRUPTS_FEATURE) && !( \
2018
+#if HAS_TMC220x && ENABLED(ENDSTOP_INTERRUPTS_FEATURE) && !( \
2019 2019
        defined(X_HARDWARE_SERIAL ) \
2020 2020
     || defined(X2_HARDWARE_SERIAL) \
2021 2021
     || defined(Y_HARDWARE_SERIAL ) \
@@ -2035,7 +2035,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
2035 2035
 /**
2036 2036
  * TMC2208/2209 software UART is only supported on AVR, LPC, STM32F1 and STM32F4
2037 2037
  */
2038
-#if (HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)) && !defined(__AVR__) && !defined(TARGET_LPC1768) && !defined(TARGET_STM32F1) && !defined(TARGET_STM32F4) && !( \
2038
+#if HAS_TMC220x && !defined(__AVR__) && !defined(TARGET_LPC1768) && !defined(TARGET_STM32F1) && !defined(TARGET_STM32F4) && !( \
2039 2039
        defined(X_HARDWARE_SERIAL ) \
2040 2040
     || defined(X2_HARDWARE_SERIAL) \
2041 2041
     || defined(Y_HARDWARE_SERIAL ) \

+ 1
- 1
Marlin/src/module/stepper_indirection.cpp View File

@@ -309,7 +309,7 @@
309 309
 //
310 310
 // TMC2208/2209 Driver objects and inits
311 311
 //
312
-#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
312
+#if HAS_TMC220x
313 313
   #if AXIS_HAS_UART(X)
314 314
     #ifdef X_HARDWARE_SERIAL
315 315
       TMC_UART_DEFINE(HW, X, X);

+ 1
- 1
Marlin/src/module/stepper_indirection.h View File

@@ -69,7 +69,7 @@
69 69
 
70 70
   static constexpr chopper_timing_t chopper_timing = CHOPPER_TIMING;
71 71
 
72
-  #if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
72
+  #if HAS_TMC220x
73 73
     void tmc_serial_begin();
74 74
   #endif
75 75
 #endif

+ 1
- 1
Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h View File

@@ -109,7 +109,7 @@
109 109
   #define TMC_SW_SCK       PC10
110 110
 #endif
111 111
 
112
-#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
112
+#if HAS_TMC220x
113 113
   /**
114 114
    * TMC2208 stepper drivers
115 115
    *

+ 1
- 1
Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h View File

@@ -114,7 +114,7 @@
114 114
   #endif
115 115
 #endif
116 116
 
117
-#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
117
+#if HAS_TMC220x
118 118
     /**
119 119
    * TMC2208/TMC2209 stepper drivers
120 120
    *

+ 1
- 1
Marlin/src/pins/pins_FYSETC_F6_13.h View File

@@ -117,7 +117,7 @@
117 117
 // the jumper next to the limit switch socket when using sensorless homing.
118 118
 //
119 119
 
120
-#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
120
+#if HAS_TMC220x
121 121
   // Software serial
122 122
   // At the moment, F6 rx pins are not pc interrupt pins
123 123
   #define X_SERIAL_RX_PIN  -1   // 71

+ 1
- 1
Marlin/src/pins/pins_MKS_SBASE.h View File

@@ -303,7 +303,7 @@
303 303
  #endif
304 304
 #endif
305 305
 
306
-#if MB(MKS_SBASE) && (HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209))
306
+#if MB(MKS_SBASE) && HAS_TMC220x
307 307
   // The shortage of pins becomes apparent.
308 308
   // Worst case you may have to give up the LCD
309 309
   // RX pins need to be interrupt capable

+ 1
- 1
Marlin/src/pins/pins_MKS_SGEN.h View File

@@ -43,7 +43,7 @@
43 43
 //#define BTN_EN1        P1_23   // EXP2.5
44 44
 //#define BTN_EN2        P1_22   // EXP2.3
45 45
 
46
-#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
46
+#if HAS_TMC220x
47 47
   // The shortage of pins becomes apparent.
48 48
   // In the worst case you may have to give up the LCD.
49 49
   // RX pins must be interrupt-capable.

+ 1
- 1
Marlin/src/pins/pins_MKS_SGEN_L.h View File

@@ -108,7 +108,7 @@
108 108
   #endif
109 109
 #endif
110 110
 
111
-#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
111
+#if HAS_TMC220x
112 112
   /**
113 113
    * TMC2208 stepper drivers
114 114
    *

+ 1
- 1
Marlin/src/pins/pins_RAMPS.h View File

@@ -296,7 +296,7 @@
296 296
   #endif
297 297
 #endif
298 298
 
299
-#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
299
+#if HAS_TMC220x
300 300
   /**
301 301
    * TMC2208/TMC2209 stepper drivers
302 302
    *

+ 1
- 1
Marlin/src/pins/pins_RAMPS_FD_V1.h View File

@@ -205,7 +205,7 @@
205 205
 
206 206
 #endif // HAS_SPI_LCD
207 207
 
208
-#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
208
+#if HAS_TMC220x
209 209
   /**
210 210
    * TMC2208/TMC2209 stepper drivers
211 211
    *

+ 1
- 1
Marlin/src/pins/pins_RAMPS_LINUX.h View File

@@ -269,7 +269,7 @@
269 269
   #endif
270 270
 #endif
271 271
 
272
-#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
272
+#if HAS_TMC220x
273 273
   /**
274 274
    * TMC2208/TMC2209 stepper drivers
275 275
    *

+ 1
- 1
Marlin/src/pins/pins_RAMPS_RE_ARM.h View File

@@ -113,7 +113,7 @@
113 113
   #endif
114 114
 #endif
115 115
 
116
-#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
116
+#if HAS_TMC220x
117 117
   /**
118 118
    * TMC2208/TMC2209 stepper drivers
119 119
    *

Loading…
Cancel
Save