andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Shorten a method name

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
parent
6601ca7a22
commit
b1b2ecba6c
4 changed files with 44 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      Marlin/src/feature/tmc_util.h
  2. 2
      Marlin/src/gcode/feature/trinamic/M569.cpp
  3. 10
      Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.cpp
  4. 64
      Marlin/src/module/settings.cpp

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

@ -104,8 +104,8 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
#if HAS_STEALTHCHOP #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() { return this->en_pwm_mode(); }
inline bool get_stored_stealthChop_status() { return this->stored.stealthChop_enabled; } inline bool get_stored_stealthChop() { return this->stored.stealthChop_enabled; }
#endif #endif
#if ENABLED(HYBRID_THRESHOLD) #if ENABLED(HYBRID_THRESHOLD)
@ -171,8 +171,8 @@ class TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
#if HAS_STEALTHCHOP #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() { return !this->en_spreadCycle(); }
inline bool get_stored_stealthChop_status() { return this->stored.stealthChop_enabled; } inline bool get_stored_stealthChop() { return this->stored.stealthChop_enabled; }
#endif #endif
#if ENABLED(HYBRID_THRESHOLD) #if ENABLED(HYBRID_THRESHOLD)
@ -217,8 +217,8 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
#if HAS_STEALTHCHOP #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() { return !this->en_spreadCycle(); }
inline bool get_stored_stealthChop_status() { return this->stored.stealthChop_enabled; } inline bool get_stored_stealthChop() { return this->stored.stealthChop_enabled; }
#endif #endif
#if ENABLED(HYBRID_THRESHOLD) #if ENABLED(HYBRID_THRESHOLD)

2
Marlin/src/gcode/feature/trinamic/M569.cpp
View File

@ -32,7 +32,7 @@ template<typename TMC>
void tmc_say_stealth_status(TMC &st) { void tmc_say_stealth_status(TMC &st) {
st.printLabel(); st.printLabel();
SERIAL_ECHOPGM(" driver mode:\t"); SERIAL_ECHOPGM(" driver mode:\t");
serialprintPGM(st.get_stealthChop_status() ? PSTR("stealthChop") : PSTR("spreadCycle")); serialprintPGM(st.get_stealthChop() ? PSTR("stealthChop") : PSTR("spreadCycle"));
SERIAL_EOL(); SERIAL_EOL();
} }
template<typename TMC> template<typename TMC>

10
Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.cpp
View File

@ -232,19 +232,19 @@ void lv_draw_tmc_step_mode_settings(void) {
bool stealth_X = false, stealth_Y = false, stealth_Z = false, stealth_E0 = false, stealth_E1 = false; bool stealth_X = false, stealth_Y = false, stealth_Z = false, stealth_E0 = false, stealth_E1 = false;
#if AXIS_HAS_STEALTHCHOP(X) #if AXIS_HAS_STEALTHCHOP(X)
stealth_X = stepperX.get_stealthChop_status(); stealth_X = stepperX.get_stealthChop();
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Y) #if AXIS_HAS_STEALTHCHOP(Y)
stealth_Y = stepperY.get_stealthChop_status(); stealth_Y = stepperY.get_stealthChop();
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Z) #if AXIS_HAS_STEALTHCHOP(Z)
stealth_Z = stepperZ.get_stealthChop_status(); stealth_Z = stepperZ.get_stealthChop();
#endif #endif
#if AXIS_HAS_STEALTHCHOP(E0) #if AXIS_HAS_STEALTHCHOP(E0)
stealth_E0 = stepperE0.get_stealthChop_status(); stealth_E0 = stepperE0.get_stealthChop();
#endif #endif
#if AXIS_HAS_STEALTHCHOP(E1) #if AXIS_HAS_STEALTHCHOP(E1)
stealth_E1 = stepperE1.get_stealthChop_status(); stealth_E1 = stepperE1.get_stealthChop();
#endif #endif
if (uiCfg.para_ui_page != 1) { if (uiCfg.para_ui_page != 1) {

64
Marlin/src/module/settings.cpp
View File

@ -1214,60 +1214,60 @@ void MarlinSettings::postprocess() {
#if HAS_STEALTHCHOP #if HAS_STEALTHCHOP
#if AXIS_HAS_STEALTHCHOP(X) #if AXIS_HAS_STEALTHCHOP(X)
tmc_stealth_enabled.X = stepperX.get_stored_stealthChop_status(); tmc_stealth_enabled.X = stepperX.get_stored_stealthChop();
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Y) #if AXIS_HAS_STEALTHCHOP(Y)
tmc_stealth_enabled.Y = stepperY.get_stored_stealthChop_status(); tmc_stealth_enabled.Y = stepperY.get_stored_stealthChop();
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Z) #if AXIS_HAS_STEALTHCHOP(Z)
tmc_stealth_enabled.Z = stepperZ.get_stored_stealthChop_status(); tmc_stealth_enabled.Z = stepperZ.get_stored_stealthChop();
#endif #endif
#if AXIS_HAS_STEALTHCHOP(X2) #if AXIS_HAS_STEALTHCHOP(X2)
tmc_stealth_enabled.X2 = stepperX2.get_stored_stealthChop_status(); tmc_stealth_enabled.X2 = stepperX2.get_stored_stealthChop();
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Y2) #if AXIS_HAS_STEALTHCHOP(Y2)
tmc_stealth_enabled.Y2 = stepperY2.get_stored_stealthChop_status(); tmc_stealth_enabled.Y2 = stepperY2.get_stored_stealthChop();
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Z2) #if AXIS_HAS_STEALTHCHOP(Z2)
tmc_stealth_enabled.Z2 = stepperZ2.get_stored_stealthChop_status(); tmc_stealth_enabled.Z2 = stepperZ2.get_stored_stealthChop();
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Z3) #if AXIS_HAS_STEALTHCHOP(Z3)
tmc_stealth_enabled.Z3 = stepperZ3.get_stored_stealthChop_status(); tmc_stealth_enabled.Z3 = stepperZ3.get_stored_stealthChop();
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Z4) #if AXIS_HAS_STEALTHCHOP(Z4)
tmc_stealth_enabled.Z4 = stepperZ4.get_stored_stealthChop_status(); tmc_stealth_enabled.Z4 = stepperZ4.get_stored_stealthChop();
#endif #endif
#if MAX_EXTRUDERS #if MAX_EXTRUDERS
#if AXIS_HAS_STEALTHCHOP(E0) #if AXIS_HAS_STEALTHCHOP(E0)
tmc_stealth_enabled.E0 = stepperE0.get_stored_stealthChop_status(); tmc_stealth_enabled.E0 = stepperE0.get_stored_stealthChop();
#endif #endif
#if MAX_EXTRUDERS > 1 #if MAX_EXTRUDERS > 1
#if AXIS_HAS_STEALTHCHOP(E1) #if AXIS_HAS_STEALTHCHOP(E1)
tmc_stealth_enabled.E1 = stepperE1.get_stored_stealthChop_status(); tmc_stealth_enabled.E1 = stepperE1.get_stored_stealthChop();
#endif #endif
#if MAX_EXTRUDERS > 2 #if MAX_EXTRUDERS > 2
#if AXIS_HAS_STEALTHCHOP(E2) #if AXIS_HAS_STEALTHCHOP(E2)
tmc_stealth_enabled.E2 = stepperE2.get_stored_stealthChop_status(); tmc_stealth_enabled.E2 = stepperE2.get_stored_stealthChop();
#endif #endif
#if MAX_EXTRUDERS > 3 #if MAX_EXTRUDERS > 3
#if AXIS_HAS_STEALTHCHOP(E3) #if AXIS_HAS_STEALTHCHOP(E3)
tmc_stealth_enabled.E3 = stepperE3.get_stored_stealthChop_status(); tmc_stealth_enabled.E3 = stepperE3.get_stored_stealthChop();
#endif #endif
#if MAX_EXTRUDERS > 4 #if MAX_EXTRUDERS > 4
#if AXIS_HAS_STEALTHCHOP(E4) #if AXIS_HAS_STEALTHCHOP(E4)
tmc_stealth_enabled.E4 = stepperE4.get_stored_stealthChop_status(); tmc_stealth_enabled.E4 = stepperE4.get_stored_stealthChop();
#endif #endif
#if MAX_EXTRUDERS > 5 #if MAX_EXTRUDERS > 5
#if AXIS_HAS_STEALTHCHOP(E5) #if AXIS_HAS_STEALTHCHOP(E5)
tmc_stealth_enabled.E5 = stepperE5.get_stored_stealthChop_status(); tmc_stealth_enabled.E5 = stepperE5.get_stored_stealthChop();
#endif #endif
#if MAX_EXTRUDERS > 6 #if MAX_EXTRUDERS > 6
#if AXIS_HAS_STEALTHCHOP(E6) #if AXIS_HAS_STEALTHCHOP(E6)
tmc_stealth_enabled.E6 = stepperE6.get_stored_stealthChop_status(); tmc_stealth_enabled.E6 = stepperE6.get_stored_stealthChop();
#endif #endif
#if MAX_EXTRUDERS > 7 #if MAX_EXTRUDERS > 7
#if AXIS_HAS_STEALTHCHOP(E7) #if AXIS_HAS_STEALTHCHOP(E7)
tmc_stealth_enabled.E7 = stepperE7.get_stored_stealthChop_status(); tmc_stealth_enabled.E7 = stepperE7.get_stored_stealthChop();
#endif #endif
#endif // MAX_EXTRUDERS > 7 #endif // MAX_EXTRUDERS > 7
#endif // MAX_EXTRUDERS > 6 #endif // MAX_EXTRUDERS > 6
@ -3671,17 +3671,17 @@ void MarlinSettings::reset() {
#if HAS_STEALTHCHOP #if HAS_STEALTHCHOP
CONFIG_ECHO_HEADING("Driver stepping mode:"); CONFIG_ECHO_HEADING("Driver stepping mode:");
#if AXIS_HAS_STEALTHCHOP(X) #if AXIS_HAS_STEALTHCHOP(X)
const bool chop_x = stepperX.get_stored_stealthChop_status(); const bool chop_x = stepperX.get_stored_stealthChop();
#else #else
constexpr bool chop_x = false; constexpr bool chop_x = false;
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Y) #if AXIS_HAS_STEALTHCHOP(Y)
const bool chop_y = stepperY.get_stored_stealthChop_status(); const bool chop_y = stepperY.get_stored_stealthChop();
#else #else
constexpr bool chop_y = false; constexpr bool chop_y = false;
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Z) #if AXIS_HAS_STEALTHCHOP(Z)
const bool chop_z = stepperZ.get_stored_stealthChop_status(); const bool chop_z = stepperZ.get_stored_stealthChop();
#else #else
constexpr bool chop_z = false; constexpr bool chop_z = false;
#endif #endif
@ -3695,17 +3695,17 @@ void MarlinSettings::reset() {
} }
#if AXIS_HAS_STEALTHCHOP(X2) #if AXIS_HAS_STEALTHCHOP(X2)
const bool chop_x2 = stepperX2.get_stored_stealthChop_status(); const bool chop_x2 = stepperX2.get_stored_stealthChop();
#else #else
constexpr bool chop_x2 = false; constexpr bool chop_x2 = false;
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Y2) #if AXIS_HAS_STEALTHCHOP(Y2)
const bool chop_y2 = stepperY2.get_stored_stealthChop_status(); const bool chop_y2 = stepperY2.get_stored_stealthChop();
#else #else
constexpr bool chop_y2 = false; constexpr bool chop_y2 = false;
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Z2) #if AXIS_HAS_STEALTHCHOP(Z2)
const bool chop_z2 = stepperZ2.get_stored_stealthChop_status(); const bool chop_z2 = stepperZ2.get_stored_stealthChop();
#else #else
constexpr bool chop_z2 = false; constexpr bool chop_z2 = false;
#endif #endif
@ -3719,36 +3719,36 @@ void MarlinSettings::reset() {
} }
#if AXIS_HAS_STEALTHCHOP(Z3) #if AXIS_HAS_STEALTHCHOP(Z3)
if (stepperZ3.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("I2 Z"), true); } if (stepperZ3.get_stored_stealthChop()) { say_M569(forReplay, PSTR("I2 Z"), true); }
#endif #endif
#if AXIS_HAS_STEALTHCHOP(Z4) #if AXIS_HAS_STEALTHCHOP(Z4)
if (stepperZ4.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("I3 Z"), true); } if (stepperZ4.get_stored_stealthChop()) { say_M569(forReplay, PSTR("I3 Z"), true); }
#endif #endif
#if AXIS_HAS_STEALTHCHOP(E0) #if AXIS_HAS_STEALTHCHOP(E0)
if (stepperE0.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T0 E"), true); } if (stepperE0.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T0 E"), true); }
#endif #endif
#if AXIS_HAS_STEALTHCHOP(E1) #if AXIS_HAS_STEALTHCHOP(E1)
if (stepperE1.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T1 E"), true); } if (stepperE1.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T1 E"), true); }
#endif #endif
#if AXIS_HAS_STEALTHCHOP(E2) #if AXIS_HAS_STEALTHCHOP(E2)
if (stepperE2.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T2 E"), true); } if (stepperE2.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T2 E"), true); }
#endif #endif
#if AXIS_HAS_STEALTHCHOP(E3) #if AXIS_HAS_STEALTHCHOP(E3)
if (stepperE3.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T3 E"), true); } if (stepperE3.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T3 E"), true); }
#endif #endif
#if AXIS_HAS_STEALTHCHOP(E4) #if AXIS_HAS_STEALTHCHOP(E4)
if (stepperE4.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T4 E"), true); } if (stepperE4.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T4 E"), true); }
#endif #endif
#if AXIS_HAS_STEALTHCHOP(E5) #if AXIS_HAS_STEALTHCHOP(E5)
if (stepperE5.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T5 E"), true); } if (stepperE5.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T5 E"), true); }
#endif #endif
#if AXIS_HAS_STEALTHCHOP(E6) #if AXIS_HAS_STEALTHCHOP(E6)
if (stepperE6.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T6 E"), true); } if (stepperE6.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T6 E"), true); }
#endif #endif
#if AXIS_HAS_STEALTHCHOP(E7) #if AXIS_HAS_STEALTHCHOP(E7)
if (stepperE7.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T7 E"), true); } if (stepperE7.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T7 E"), true); }
#endif #endif
#endif // HAS_STEALTHCHOP #endif // HAS_STEALTHCHOP

Write Preview
Loading…
Cancel
Save