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

Updates for TMC2660 init (#14245)

Browse source
This commit is contained in:
teemuatlut 2019-06-14 07:16:10 +03:00 committed by Scott Lahteine
parent dfdbd1e75f
commit 29afd11cbf
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -565,13 +565,14 @@
chopconf.toff = chopper_timing.toff; chopconf.toff = chopper_timing.toff;
chopconf.hend = chopper_timing.hend + 3; chopconf.hend = chopper_timing.hend + 3;
chopconf.hstrt = chopper_timing.hstrt - 1; chopconf.hstrt = chopper_timing.hstrt - 1;
#if ENABLED(SQUARE_WAVE_STEPPING)
chopconf.dedge = true;
#endif
st.CHOPCONF(chopconf.sr); st.CHOPCONF(chopconf.sr);
st.sdoff(0);
st.rms_current(mA); st.rms_current(mA);
st.microsteps(microsteps); st.microsteps(microsteps);
#if ENABLED(SQUARE_WAVE_STEPPING)
st.dedge(true);
#endif
st.intpol(INTERPOLATE); st.intpol(INTERPOLATE);
st.diss2g(true); // Disable short to ground protection. Too many false readings? st.diss2g(true); // Disable short to ground protection. Too many false readings?

4
Marlin/src/module/stepper_indirection.h
View file

@ -58,8 +58,8 @@
#if HAS_TRINAMIC #if HAS_TRINAMIC
#include <TMCStepper.h> #include <TMCStepper.h>
#include "../feature/tmc_util.h" #include "../feature/tmc_util.h"
#if TMCSTEPPER_VERSION < 0x000202 #if TMCSTEPPER_VERSION < 0x000401
#error "Update TMCStepper library to 0.2.2 or newer." #error "Update TMCStepper library to 0.4.1 or newer."
#endif #endif
#define ____TMC_CLASS(MODEL, A, I, E) TMCMarlin<TMC##MODEL##Stepper, A, I, E> #define ____TMC_CLASS(MODEL, A, I, E) TMCMarlin<TMC##MODEL##Stepper, A, I, E>

6
buildroot/share/tests/megaatmega2560-tests
View file

@ -297,12 +297,12 @@ exec_test $1 $2 "Delta Config (FLSUN AC because it's complex)"
use_example_configs SCARA use_example_configs SCARA
opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \ opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \
EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER \ EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER \
MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING SQUARE_WAVE_STEPPING
opt_set X_DRIVER_TYPE TMC2130 opt_set X_DRIVER_TYPE TMC2130
opt_set Y_DRIVER_TYPE TMC2130 opt_set Y_DRIVER_TYPE TMC2130
opt_set Z_DRIVER_TYPE TMC2130 opt_set Z_DRIVER_TYPE TMC2130
opt_set E0_DRIVER_TYPE TMC2130 opt_set E0_DRIVER_TYPE TMC2660
exec_test $1 $2 "SCARA with TMC2130" exec_test $1 $2 "SCARA with TMC2130 and TMC2660"
# #
# Test mixed TMC config # Test mixed TMC config
# #