zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update Marlin for newest TMC libraries

Browse source 
- TMC2130Stepper v2.2.0
- TMC2208Stepper v0.0.4
This commit is contained in:
Scott Lahteine 2018-03-15 21:03:12 -05:00
parent 63fc4a8521
commit 1e946d681d
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/feature/tmc_util.cpp
View file

@ -392,8 +392,8 @@ void _tmc_say_sgt(const TMC_AxisEnum axis, const int8_t sgt) {
case TMC_OTPW_TRIGGERED: serialprintPGM(st.getOTPW() ? PSTR("true") : PSTR("false")); break; case TMC_OTPW_TRIGGERED: serialprintPGM(st.getOTPW() ? PSTR("true") : PSTR("false")); break;
case TMC_TOFF: SERIAL_PRINT(st.toff(), DEC); break; case TMC_TOFF: SERIAL_PRINT(st.toff(), DEC); break;
case TMC_TBL: SERIAL_PRINT(st.blank_time(), DEC); break; case TMC_TBL: SERIAL_PRINT(st.blank_time(), DEC); break;
case TMC_HEND: SERIAL_PRINT(st.hysterisis_end(), DEC); break; case TMC_HEND: SERIAL_PRINT(st.hysteresis_end(), DEC); break;
case TMC_HSTRT: SERIAL_PRINT(st.hysterisis_start(), DEC); break; case TMC_HSTRT: SERIAL_PRINT(st.hysteresis_start(), DEC); break;
default: tmc_status(st, i); break; default: tmc_status(st, i); break;
} }
} }
@ -545,7 +545,7 @@ void _tmc_say_sgt(const TMC_AxisEnum axis, const int8_t sgt) {
"been triggered", TMC_OTPW_TRIGGERED); "been triggered", TMC_OTPW_TRIGGERED);
TMC_REPORT("off time\t", TMC_TOFF); TMC_REPORT("off time\t", TMC_TOFF);
TMC_REPORT("blank time", TMC_TBL); TMC_REPORT("blank time", TMC_TBL);
TMC_REPORT("hysterisis\n-end\t", TMC_HEND); TMC_REPORT("hysteresis\n-end\t", TMC_HEND);
TMC_REPORT("-start\t", TMC_HSTRT); TMC_REPORT("-start\t", TMC_HSTRT);
TMC_REPORT("Stallguard thrs", TMC_SGT); TMC_REPORT("Stallguard thrs", TMC_SGT);

8
Marlin/src/module/stepper_indirection.cpp
View file

@ -188,8 +188,8 @@
st.off_time(5); // Only enables the driver if used with stealthChop st.off_time(5); // Only enables the driver if used with stealthChop
st.interpolate(INTERPOLATE); st.interpolate(INTERPOLATE);
st.power_down_delay(128); // ~2s until driver lowers to hold current st.power_down_delay(128); // ~2s until driver lowers to hold current
st.hysterisis_start(3); st.hysteresis_start(3);
st.hysterisis_end(2); st.hysteresis_end(2);
st.diag1_active_high(1); // For sensorless homing st.diag1_active_high(1); // For sensorless homing
#if ENABLED(STEALTHCHOP) #if ENABLED(STEALTHCHOP)
st.stealth_freq(1); // f_pwm = 2/683 f_clk st.stealth_freq(1); // f_pwm = 2/683 f_clk
@ -406,8 +406,8 @@
st.toff(5); st.toff(5);
st.intpol(INTERPOLATE); st.intpol(INTERPOLATE);
st.TPOWERDOWN(128); // ~2s until driver lowers to hold current st.TPOWERDOWN(128); // ~2s until driver lowers to hold current
st.hysterisis_start(3); st.hysteresis_start(3);
st.hysterisis_end(2); st.hysteresis_end(2);
#if ENABLED(STEALTHCHOP) #if ENABLED(STEALTHCHOP)
st.pwm_lim(12); st.pwm_lim(12);
st.pwm_reg(8); st.pwm_reg(8);

4
platformio.ini
View file

@ -31,7 +31,7 @@ lib_deps =
https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
LiquidCrystal_I2C@1.1.2 LiquidCrystal_I2C@1.1.2
TMC2130Stepper TMC2130Stepper
https://github.com/teemuatlut/TMC2208Stepper/archive/v0.0.3.zip https://github.com/teemuatlut/TMC2208Stepper/archive/v0.0.4.zip
Adafruit NeoPixel@1.1.3 Adafruit NeoPixel@1.1.3
https://github.com/lincomatic/LiquidTWI2/archive/30aa480.zip https://github.com/lincomatic/LiquidTWI2/archive/30aa480.zip
https://github.com/ameyer/Arduino-L6470/archive/3cd0993.zip https://github.com/ameyer/Arduino-L6470/archive/3cd0993.zip
@ -110,7 +110,7 @@ lib_ldf_mode = off
lib_extra_dirs = frameworks lib_extra_dirs = frameworks
lib_deps = CMSIS-LPC1768 lib_deps = CMSIS-LPC1768
https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
TMC2130Stepper@>=2.1.1 TMC2130Stepper@>=2.2.0
extra_scripts = Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py extra_scripts = Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}