Commit 24bcaf3 1 parent 0649316 commit 24bcaf3 Copy full SHA for 24bcaf3
File tree 1 file changed +4
-0
lines changed
1 file changed +4
-0
lines changed Original file line number Diff line number Diff line change @@ -23,7 +23,11 @@ HAS_STEALTHCHOP = src_filter=+<src/gcode/feature/trinamic
23
23
SR_LCD_3W_NL = SailfishLCD =https://github.com/mikeshub/SailfishLCD/archive/master.zip
24
24
HAS_MOTOR_CURRENT_I2C = SlowSoftI2CMaster
25
25
src_filter =+<src/feature/digipot>
26
+ <<<<<<< HEAD
26
27
HAS_TMC26X = TMC26XStepper =https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
28
+ =======
29
+ HAS_TMC26X = TMC26XStepper =https://github.com/trinamic/TMC26XStepper/archive/master.zip
30
+ >>>>>>> 3ec5bbfb13 (🐛 Fix HAS_TMC26X feature path (# 23757))
27
31
src_filter =+<src/module/stepper/TMC26X.cpp>
28
32
29
33
src_filter =+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>
You can’t perform that action at this time.
0 commit comments