Browse Source

Updates for TMC2660 init (#14245)

teemuatlut 5 years ago
parent
commit
29afd11cbf

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

565
     chopconf.toff = chopper_timing.toff;
565
     chopconf.toff = chopper_timing.toff;
566
     chopconf.hend = chopper_timing.hend + 3;
566
     chopconf.hend = chopper_timing.hend + 3;
567
     chopconf.hstrt = chopper_timing.hstrt - 1;
567
     chopconf.hstrt = chopper_timing.hstrt - 1;
568
-    #if ENABLED(SQUARE_WAVE_STEPPING)
569
-      chopconf.dedge = true;
570
-    #endif
571
     st.CHOPCONF(chopconf.sr);
568
     st.CHOPCONF(chopconf.sr);
572
 
569
 
570
+    st.sdoff(0);
573
     st.rms_current(mA);
571
     st.rms_current(mA);
574
     st.microsteps(microsteps);
572
     st.microsteps(microsteps);
573
+    #if ENABLED(SQUARE_WAVE_STEPPING)
574
+      st.dedge(true);
575
+    #endif
575
     st.intpol(INTERPOLATE);
576
     st.intpol(INTERPOLATE);
576
     st.diss2g(true); // Disable short to ground protection. Too many false readings?
577
     st.diss2g(true); // Disable short to ground protection. Too many false readings?
577
 
578
 

+ 2
- 2
Marlin/src/module/stepper_indirection.h View File

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

+ 3
- 3
buildroot/share/tests/megaatmega2560-tests View File

297
 use_example_configs SCARA
297
 use_example_configs SCARA
298
 opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \
298
 opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \
299
            EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER \
299
            EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER \
300
-           MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING
300
+           MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING SQUARE_WAVE_STEPPING
301
 opt_set X_DRIVER_TYPE TMC2130
301
 opt_set X_DRIVER_TYPE TMC2130
302
 opt_set Y_DRIVER_TYPE TMC2130
302
 opt_set Y_DRIVER_TYPE TMC2130
303
 opt_set Z_DRIVER_TYPE TMC2130
303
 opt_set Z_DRIVER_TYPE TMC2130
304
-opt_set E0_DRIVER_TYPE TMC2130
305
-exec_test $1 $2 "SCARA with TMC2130"
304
+opt_set E0_DRIVER_TYPE TMC2660
305
+exec_test $1 $2 "SCARA with TMC2130 and TMC2660"
306
 #
306
 #
307
 # Test mixed TMC config
307
 # Test mixed TMC config
308
 #
308
 #

Loading…
Cancel
Save