🐛 Fix HAS_TMC26X feature path (MarlinFirmware#23757)

# Conflicts: # ini/features.ini
LCh-77 · Jul 19, 2022 · c6e3a03 · c6e3a03
1 parent 84ac997
commit c6e3a03
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ini/features.ini b/ini/features.ini
@@ -23,8 +23,12 @@ HAS_STEALTHCHOP                        = src_filter=+<src/gcode/feature/trinamic
 SR_LCD_3W_NL                           = SailfishLCD=/~https://github.com/mikeshub/SailfishLCD/archive/master.zip
 HAS_MOTOR_CURRENT_I2C                  = SlowSoftI2CMaster
                                          src_filter=+<src/feature/digipot>
+<<<<<<< HEAD
+HAS_TMC26X                             = TMC26XStepper=/~https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+=======
 HAS_TMC26X                             = TMC26XStepper=/~https://github.com/trinamic/TMC26XStepper/archive/master.zip
-                                         src_filter=+<src/module/TMC26X.cpp>
+>>>>>>> 3ec5bbfb13 (🐛 Fix HAS_TMC26X feature path (#23757))
+                                         src_filter=+<src/module/stepper/TMC26X.cpp>
 HAS_L64XX                              = Arduino-L6470@0.8.0
                                          src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>
 LIB_INTERNAL_MAX31865                  = src_filter=+<src/libs/MAX31865.cpp>