CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle disabled HYBRID_THRESHOLD in EEPROM (#10275)

Browse Source
This commit is contained in:
Scott Lahteine 2018-04-01 16:58:37 -05:00 committed by GitHub
parent 9ec2c03c5b
commit 02f0f95d40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
Marlin/src/module/configuration_store.cpp
View File

@ -732,7 +732,7 @@ void MarlinSettings::postprocess() {
_FIELD_TEST(tmc_hybrid_threshold); _FIELD_TEST(tmc_hybrid_threshold);
uint32_t tmc_hybrid_threshold[TMC_AXES] = { uint32_t tmc_hybrid_threshold[TMC_AXES] = {
#if HAS_TRINAMIC #if ENABLED(HYBRID_THRESHOLD)
#if X_IS_TRINAMIC #if X_IS_TRINAMIC
TMC_GET_PWMTHRS(X, X), TMC_GET_PWMTHRS(X, X),
#else #else
@ -1325,7 +1325,7 @@ void MarlinSettings::postprocess() {
for (uint8_t q=TMC_AXES; q--;) EEPROM_READ(val); for (uint8_t q=TMC_AXES; q--;) EEPROM_READ(val);
#endif #endif
#if HAS_TRINAMIC #if ENABLED(HYBRID_THRESHOLD)
#define TMC_SET_PWMTHRS(P,Q) tmc_set_pwmthrs(stepper##Q, TMC_##Q, tmc_hybrid_threshold[TMC_##Q], planner.axis_steps_per_mm[P##_AXIS]) #define TMC_SET_PWMTHRS(P,Q) tmc_set_pwmthrs(stepper##Q, TMC_##Q, tmc_hybrid_threshold[TMC_##Q], planner.axis_steps_per_mm[P##_AXIS])
uint32_t tmc_hybrid_threshold[TMC_AXES]; uint32_t tmc_hybrid_threshold[TMC_AXES];
EEPROM_READ(tmc_hybrid_threshold); EEPROM_READ(tmc_hybrid_threshold);
@ -1894,7 +1894,9 @@ void MarlinSettings::reset(PORTARG_SOLO) {
#if HAS_TRINAMIC #if HAS_TRINAMIC
void say_M906(PORTARG_SOLO) { SERIAL_ECHOPGM_P(port, " M906 "); } void say_M906(PORTARG_SOLO) { SERIAL_ECHOPGM_P(port, " M906 "); }
void say_M913(PORTARG_SOLO) { SERIAL_ECHOPGM_P(port, " M913 "); } #if ENABLED(HYBRID_THRESHOLD)
void say_M913(PORTARG_SOLO) { SERIAL_ECHOPGM_P(port, " M913 "); }
#endif
#if ENABLED(SENSORLESS_HOMING) #if ENABLED(SENSORLESS_HOMING)
void say_M914(PORTARG_SOLO) { SERIAL_ECHOPGM_P(port, " M914 "); } void say_M914(PORTARG_SOLO) { SERIAL_ECHOPGM_P(port, " M914 "); }
#endif #endif
@ -2430,56 +2432,58 @@ void MarlinSettings::reset(PORTARG_SOLO) {
/** /**
* TMC2130 / TMC2208 / TRAMS Hybrid Threshold * TMC2130 / TMC2208 / TRAMS Hybrid Threshold
*/ */
if (!forReplay) { #if ENABLED(HYBRID_THRESHOLD)
if (!forReplay) {
CONFIG_ECHO_START;
SERIAL_ECHOLNPGM_P(port, "Hybrid Threshold:");
}
CONFIG_ECHO_START; CONFIG_ECHO_START;
SERIAL_ECHOLNPGM_P(port, "Hybrid Threshold:"); #if X_IS_TRINAMIC
} say_M913(PORTVAR_SOLO);
CONFIG_ECHO_START; SERIAL_ECHOLNPAIR_P(port, "X", TMC_GET_PWMTHRS(X, X));
#if X_IS_TRINAMIC #endif
say_M913(PORTVAR_SOLO); #if X2_IS_TRINAMIC
SERIAL_ECHOLNPAIR_P(port, "X", TMC_GET_PWMTHRS(X, X)); say_M913(PORTVAR_SOLO);
#endif SERIAL_ECHOLNPAIR_P(port, "I1 X", TMC_GET_PWMTHRS(X, X2));
#if X2_IS_TRINAMIC #endif
say_M913(PORTVAR_SOLO); #if Y_IS_TRINAMIC
SERIAL_ECHOLNPAIR_P(port, "I1 X", TMC_GET_PWMTHRS(X, X2)); say_M913(PORTVAR_SOLO);
#endif SERIAL_ECHOLNPAIR_P(port, "Y", TMC_GET_PWMTHRS(Y, Y));
#if Y_IS_TRINAMIC #endif
say_M913(PORTVAR_SOLO); #if Y2_IS_TRINAMIC
SERIAL_ECHOLNPAIR_P(port, "Y", TMC_GET_PWMTHRS(Y, Y)); say_M913(PORTVAR_SOLO);
#endif SERIAL_ECHOLNPAIR_P(port, "I1 Y", TMC_GET_PWMTHRS(Y, Y2));
#if Y2_IS_TRINAMIC #endif
say_M913(PORTVAR_SOLO); #if Z_IS_TRINAMIC
SERIAL_ECHOLNPAIR_P(port, "I1 Y", TMC_GET_PWMTHRS(Y, Y2)); say_M913(PORTVAR_SOLO);
#endif SERIAL_ECHOLNPAIR_P(port, "Z", TMC_GET_PWMTHRS(Z, Z));
#if Z_IS_TRINAMIC #endif
say_M913(PORTVAR_SOLO); #if Z2_IS_TRINAMIC
SERIAL_ECHOLNPAIR_P(port, "Z", TMC_GET_PWMTHRS(Z, Z)); say_M913(PORTVAR_SOLO);
#endif SERIAL_ECHOLNPAIR_P(port, "I1 Z", TMC_GET_PWMTHRS(Z, Z2));
#if Z2_IS_TRINAMIC #endif
say_M913(PORTVAR_SOLO); #if E0_IS_TRINAMIC
SERIAL_ECHOLNPAIR_P(port, "I1 Z", TMC_GET_PWMTHRS(Z, Z2)); say_M913(PORTVAR_SOLO);
#endif SERIAL_ECHOLNPAIR_P(port, "T0 E", TMC_GET_PWMTHRS(E, E0));
#if E0_IS_TRINAMIC #endif
say_M913(PORTVAR_SOLO); #if E_STEPPERS > 1 && E1_IS_TRINAMIC
SERIAL_ECHOLNPAIR_P(port, "T0 E", TMC_GET_PWMTHRS(E, E0)); say_M913(PORTVAR_SOLO);
#endif SERIAL_ECHOLNPAIR_P(port, "T1 E", TMC_GET_PWMTHRS(E, E1));
#if E_STEPPERS > 1 && E1_IS_TRINAMIC #endif
say_M913(PORTVAR_SOLO); #if E_STEPPERS > 2 && E2_IS_TRINAMIC
SERIAL_ECHOLNPAIR_P(port, "T1 E", TMC_GET_PWMTHRS(E, E1)); say_M913(PORTVAR_SOLO);
#endif SERIAL_ECHOLNPAIR_P(port, "T2 E", TMC_GET_PWMTHRS(E, E2));
#if E_STEPPERS > 2 && E2_IS_TRINAMIC #endif
say_M913(PORTVAR_SOLO); #if E_STEPPERS > 3 && E3_IS_TRINAMIC
SERIAL_ECHOLNPAIR_P(port, "T2 E", TMC_GET_PWMTHRS(E, E2)); say_M913(PORTVAR_SOLO);
#endif SERIAL_ECHOLNPAIR_P(port, "T3 E", TMC_GET_PWMTHRS(E, E3));
#if E_STEPPERS > 3 && E3_IS_TRINAMIC #endif
say_M913(PORTVAR_SOLO); #if E_STEPPERS > 4 && E4_IS_TRINAMIC
SERIAL_ECHOLNPAIR_P(port, "T3 E", TMC_GET_PWMTHRS(E, E3)); say_M913(PORTVAR_SOLO);
#endif SERIAL_ECHOLNPAIR_P(port, "T4 E", TMC_GET_PWMTHRS(E, E4));
#if E_STEPPERS > 4 && E4_IS_TRINAMIC #endif
say_M913(PORTVAR_SOLO); SERIAL_EOL_P(port);
SERIAL_ECHOLNPAIR_P(port, "T4 E", TMC_GET_PWMTHRS(E, E4)); #endif // HYBRID_THRESHOLD
#endif
SERIAL_EOL_P(port);
/** /**
* TMC2130 Sensorless homing thresholds * TMC2130 Sensorless homing thresholds