Browse Source

Update Marlin for newest TMC libraries

- TMC2130Stepper v2.2.0
- TMC2208Stepper v0.0.4
Scott Lahteine 7 years ago
parent
commit
1e946d681d
3 changed files with 9 additions and 9 deletions
  1. 3
    3
      Marlin/src/feature/tmc_util.cpp
  2. 4
    4
      Marlin/src/module/stepper_indirection.cpp
  3. 2
    2
      platformio.ini

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

392
       case TMC_OTPW_TRIGGERED: serialprintPGM(st.getOTPW() ? PSTR("true") : PSTR("false")); break;
392
       case TMC_OTPW_TRIGGERED: serialprintPGM(st.getOTPW() ? PSTR("true") : PSTR("false")); break;
393
       case TMC_TOFF: SERIAL_PRINT(st.toff(), DEC); break;
393
       case TMC_TOFF: SERIAL_PRINT(st.toff(), DEC); break;
394
       case TMC_TBL: SERIAL_PRINT(st.blank_time(), DEC); break;
394
       case TMC_TBL: SERIAL_PRINT(st.blank_time(), DEC); break;
395
-      case TMC_HEND: SERIAL_PRINT(st.hysterisis_end(), DEC); break;
396
-      case TMC_HSTRT: SERIAL_PRINT(st.hysterisis_start(), DEC); break;
395
+      case TMC_HEND: SERIAL_PRINT(st.hysteresis_end(), DEC); break;
396
+      case TMC_HSTRT: SERIAL_PRINT(st.hysteresis_start(), DEC); break;
397
       default: tmc_status(st, i); break;
397
       default: tmc_status(st, i); break;
398
     }
398
     }
399
   }
399
   }
545
                "been triggered",     TMC_OTPW_TRIGGERED);
545
                "been triggered",     TMC_OTPW_TRIGGERED);
546
     TMC_REPORT("off time\t",         TMC_TOFF);
546
     TMC_REPORT("off time\t",         TMC_TOFF);
547
     TMC_REPORT("blank time",         TMC_TBL);
547
     TMC_REPORT("blank time",         TMC_TBL);
548
-    TMC_REPORT("hysterisis\n-end\t", TMC_HEND);
548
+    TMC_REPORT("hysteresis\n-end\t", TMC_HEND);
549
     TMC_REPORT("-start\t",           TMC_HSTRT);
549
     TMC_REPORT("-start\t",           TMC_HSTRT);
550
     TMC_REPORT("Stallguard thrs",    TMC_SGT);
550
     TMC_REPORT("Stallguard thrs",    TMC_SGT);
551
 
551
 

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

188
     st.off_time(5); // Only enables the driver if used with stealthChop
188
     st.off_time(5); // Only enables the driver if used with stealthChop
189
     st.interpolate(INTERPOLATE);
189
     st.interpolate(INTERPOLATE);
190
     st.power_down_delay(128); // ~2s until driver lowers to hold current
190
     st.power_down_delay(128); // ~2s until driver lowers to hold current
191
-    st.hysterisis_start(3);
192
-    st.hysterisis_end(2);
191
+    st.hysteresis_start(3);
192
+    st.hysteresis_end(2);
193
     st.diag1_active_high(1); // For sensorless homing
193
     st.diag1_active_high(1); // For sensorless homing
194
     #if ENABLED(STEALTHCHOP)
194
     #if ENABLED(STEALTHCHOP)
195
       st.stealth_freq(1); // f_pwm = 2/683 f_clk
195
       st.stealth_freq(1); // f_pwm = 2/683 f_clk
406
     st.toff(5);
406
     st.toff(5);
407
     st.intpol(INTERPOLATE);
407
     st.intpol(INTERPOLATE);
408
     st.TPOWERDOWN(128); // ~2s until driver lowers to hold current
408
     st.TPOWERDOWN(128); // ~2s until driver lowers to hold current
409
-    st.hysterisis_start(3);
410
-    st.hysterisis_end(2);
409
+    st.hysteresis_start(3);
410
+    st.hysteresis_end(2);
411
     #if ENABLED(STEALTHCHOP)
411
     #if ENABLED(STEALTHCHOP)
412
       st.pwm_lim(12);
412
       st.pwm_lim(12);
413
       st.pwm_reg(8);
413
       st.pwm_reg(8);

+ 2
- 2
platformio.ini View File

31
   https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
31
   https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
32
   LiquidCrystal_I2C@1.1.2
32
   LiquidCrystal_I2C@1.1.2
33
   TMC2130Stepper
33
   TMC2130Stepper
34
-  https://github.com/teemuatlut/TMC2208Stepper/archive/v0.0.3.zip
34
+  https://github.com/teemuatlut/TMC2208Stepper/archive/v0.0.4.zip
35
   Adafruit NeoPixel@1.1.3
35
   Adafruit NeoPixel@1.1.3
36
   https://github.com/lincomatic/LiquidTWI2/archive/30aa480.zip
36
   https://github.com/lincomatic/LiquidTWI2/archive/30aa480.zip
37
   https://github.com/ameyer/Arduino-L6470/archive/3cd0993.zip
37
   https://github.com/ameyer/Arduino-L6470/archive/3cd0993.zip
110
 lib_extra_dirs  = frameworks
110
 lib_extra_dirs  = frameworks
111
 lib_deps        = CMSIS-LPC1768
111
 lib_deps        = CMSIS-LPC1768
112
   https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
112
   https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
113
-  TMC2130Stepper@>=2.1.1
113
+  TMC2130Stepper@>=2.2.0
114
 extra_scripts   = Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
114
 extra_scripts   = Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
115
 src_filter      = ${common.default_src_filter}
115
 src_filter      = ${common.default_src_filter}
116
 
116
 

Loading…
Cancel
Save