bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix TMC-related compile issues. (#12971)

Browse Source 
- `STEALTHOP_[XYZE]` configuration options now set the default state.
This commit is contained in:
teemuatlut 2019-01-21 07:54:57 +02:00 committed by Scott Lahteine
parent bb30927549
commit e5801b75f8
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/feature/tmc_util.cpp
View File

@ -838,18 +838,14 @@
bool stealthchop_was_enabled = st.en_pwm_mode(); bool stealthchop_was_enabled = st.en_pwm_mode();
st.TCOOLTHRS(0xFFFFF); st.TCOOLTHRS(0xFFFFF);
#if STEALTHCHOP_ENABLED st.en_pwm_mode(false);
st.en_pwm_mode(false);
#endif
st.diag1_stall(true); st.diag1_stall(true);
return stealthchop_was_enabled; return stealthchop_was_enabled;
} }
void tmc_disable_stallguard(TMC2130Stepper &st, const bool restore_stealth) { void tmc_disable_stallguard(TMC2130Stepper &st, const bool restore_stealth) {
st.TCOOLTHRS(0); st.TCOOLTHRS(0);
#if STEALTHCHOP_ENABLED st.en_pwm_mode(restore_stealth);
st.en_pwm_mode(restore_stealth);
#endif
st.diag1_stall(false); st.diag1_stall(false);
} }
bool tmc_enable_stallguard(TMC2660Stepper) { bool tmc_enable_stallguard(TMC2660Stepper) {

9
Marlin/src/feature/tmc_util.h
View File

@ -82,7 +82,7 @@ class TMCStorage {
} }
struct { struct {
#if STEALTHCHOP_ENABLED #if HAS_STEALTHCHOP
bool stealthChop_enabled = false; bool stealthChop_enabled = false;
#endif #endif
#if ENABLED(HYBRID_THRESHOLD) #if ENABLED(HYBRID_THRESHOLD)
@ -113,7 +113,7 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
TMC::rms_current(mA, mult); TMC::rms_current(mA, mult);
} }
#if STEALTHCHOP_ENABLED #if HAS_STEALTHCHOP
inline void refresh_stepping_mode() { this->en_pwm_mode(this->stored.stealthChop_enabled); } inline void refresh_stepping_mode() { this->en_pwm_mode(this->stored.stealthChop_enabled); }
inline bool get_stealthChop_status() { return this->en_pwm_mode(); } inline bool get_stealthChop_status() { return this->en_pwm_mode(); }
#endif #endif
@ -158,7 +158,7 @@ class TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID> : public TMC2208Stepper,
TMC2208Stepper::rms_current(mA, mult); TMC2208Stepper::rms_current(mA, mult);
} }
#if STEALTHCHOP_ENABLED #if HAS_STEALTHCHOP
inline void refresh_stepping_mode() { en_spreadCycle(!this->stored.stealthChop_enabled); } inline void refresh_stepping_mode() { en_spreadCycle(!this->stored.stealthChop_enabled); }
inline bool get_stealthChop_status() { return !this->en_spreadCycle(); } inline bool get_stealthChop_status() { return !this->en_spreadCycle(); }
#endif #endif
@ -169,9 +169,6 @@ class TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID> : public TMC2208Stepper,
#if ENABLED(HYBRID_THRESHOLD) #if ENABLED(HYBRID_THRESHOLD)
this->stored.hybrid_thrs = _tmc_thrs(this->microsteps(), this->TPWMTHRS(), planner.settings.axis_steps_per_mm[spmm_id]); this->stored.hybrid_thrs = _tmc_thrs(this->microsteps(), this->TPWMTHRS(), planner.settings.axis_steps_per_mm[spmm_id]);
#endif #endif
#if STEALTHCHOP_ENABLED
this->stored.stealthChop_enabled = !this->en_spreadCycle();
#endif
} }
inline void refresh_stepper_current() { rms_current(this->val_mA); } inline void refresh_stepper_current() { rms_current(this->val_mA); }

4
Marlin/src/lcd/menu/menu_tmc.cpp
View File

@ -241,7 +241,7 @@ void menu_tmc_current() {
#endif #endif
#if STEALTHCHOP_ENABLED #if HAS_STEALTHCHOP
#define TMC_EDIT_STEP_MODE(ST) MENU_ITEM_EDIT_CALLBACK(bool, MSG_##ST, &stepper##ST.stored.stealthChop_enabled, refresh_stepping_mode_##ST) #define TMC_EDIT_STEP_MODE(ST) MENU_ITEM_EDIT_CALLBACK(bool, MSG_##ST, &stepper##ST.stored.stealthChop_enabled, refresh_stepping_mode_##ST)
@ -343,7 +343,7 @@ void menu_tmc() {
#if ENABLED(SENSORLESS_HOMING) #if ENABLED(SENSORLESS_HOMING)
MENU_ITEM(submenu, MSG_TMC_HOMING_THRS, menu_tmc_homing_thrs); MENU_ITEM(submenu, MSG_TMC_HOMING_THRS, menu_tmc_homing_thrs);
#endif #endif
#if STEALTHCHOP_ENABLED #if HAS_STEALTHCHOP
MENU_ITEM(submenu, MSG_TMC_STEPPING_MODE, menu_tmc_step_mode); MENU_ITEM(submenu, MSG_TMC_STEPPING_MODE, menu_tmc_step_mode);
#endif #endif
END_MENU(); END_MENU();