Skip to content

Commit c6e3a03

Browse files
ellenspLCh-77
authored andcommitted
🐛 Fix HAS_TMC26X feature path (MarlinFirmware#23757)
# Conflicts: # ini/features.ini
1 parent 84ac997 commit c6e3a03

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

ini/features.ini

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@ HAS_STEALTHCHOP = src_filter=+<src/gcode/feature/trinamic
2323
SR_LCD_3W_NL = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
2424
HAS_MOTOR_CURRENT_I2C = SlowSoftI2CMaster
2525
src_filter=+<src/feature/digipot>
26+
<<<<<<< HEAD
27+
HAS_TMC26X = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
28+
=======
2629
HAS_TMC26X = TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
27-
src_filter=+<src/module/TMC26X.cpp>
30+
>>>>>>> 3ec5bbfb13 (🐛 Fix HAS_TMC26X feature path (#23757))
31+
src_filter=+<src/module/stepper/TMC26X.cpp>
2832
HAS_L64XX = [email protected]
2933
src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>
3034
LIB_INTERNAL_MAX31865 = src_filter=+<src/libs/MAX31865.cpp>

0 commit comments

Comments
 (0)