Browse Source

Add HAS_TMC220x

Scott Lahteine 6 years ago
parent
commit
1a349c7522

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

860
 
860
 
861
   setup_killpin();
861
   setup_killpin();
862
 
862
 
863
-  #if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
863
+  #if HAS_TMC220x
864
     tmc_serial_begin();
864
     tmc_serial_begin();
865
   #endif
865
   #endif
866
 
866
 

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

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

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

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

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

909
   #define HAS_TMCX1X0       (HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160))
909
   #define HAS_TMCX1X0       (HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160))
910
   #define TMC_HAS_SPI       (HAS_TMCX1X0 || HAS_DRIVER(TMC2660))
910
   #define TMC_HAS_SPI       (HAS_TMCX1X0 || HAS_DRIVER(TMC2660))
911
   #define HAS_STALLGUARD    (HAS_TMCX1X0 || HAS_DRIVER(TMC2209) || HAS_DRIVER(TMC2660))
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
   #define STEALTHCHOP_ENABLED ANY(STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_E)
914
   #define STEALTHCHOP_ENABLED ANY(STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_E)
915
   #define USE_SENSORLESS EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
915
   #define USE_SENSORLESS EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)

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

2015
 /**
2015
 /**
2016
  * TMC2208/2209 software UART and ENDSTOP_INTERRUPTS both use pin change interrupts (PCI)
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
        defined(X_HARDWARE_SERIAL ) \
2019
        defined(X_HARDWARE_SERIAL ) \
2020
     || defined(X2_HARDWARE_SERIAL) \
2020
     || defined(X2_HARDWARE_SERIAL) \
2021
     || defined(Y_HARDWARE_SERIAL ) \
2021
     || defined(Y_HARDWARE_SERIAL ) \
2035
 /**
2035
 /**
2036
  * TMC2208/2209 software UART is only supported on AVR, LPC, STM32F1 and STM32F4
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
        defined(X_HARDWARE_SERIAL ) \
2039
        defined(X_HARDWARE_SERIAL ) \
2040
     || defined(X2_HARDWARE_SERIAL) \
2040
     || defined(X2_HARDWARE_SERIAL) \
2041
     || defined(Y_HARDWARE_SERIAL ) \
2041
     || defined(Y_HARDWARE_SERIAL ) \

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

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

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

69
 
69
 
70
   static constexpr chopper_timing_t chopper_timing = CHOPPER_TIMING;
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
     void tmc_serial_begin();
73
     void tmc_serial_begin();
74
   #endif
74
   #endif
75
 #endif
75
 #endif

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

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

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

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

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

117
 // the jumper next to the limit switch socket when using sensorless homing.
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
   // Software serial
121
   // Software serial
122
   // At the moment, F6 rx pins are not pc interrupt pins
122
   // At the moment, F6 rx pins are not pc interrupt pins
123
   #define X_SERIAL_RX_PIN  -1   // 71
123
   #define X_SERIAL_RX_PIN  -1   // 71

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save