MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More concise tmc_util output, fix a ternary type

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-14 04:10:24 -05:00
parent bba2a3b906
commit 07b1ac06a9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/tmc_util.cpp
View File

@ -227,11 +227,11 @@ void _tmc_say_axis(const TMC_AxisEnum axis) {
void _tmc_say_current(const TMC_AxisEnum axis, const uint16_t curr) { void _tmc_say_current(const TMC_AxisEnum axis, const uint16_t curr) {
_tmc_say_axis(axis); _tmc_say_axis(axis);
SERIAL_ECHOLNPAIR(" axis driver current: ", curr); SERIAL_ECHOLNPAIR(" driver current: ", curr);
} }
void _tmc_say_otpw(const TMC_AxisEnum axis, const bool otpw) { void _tmc_say_otpw(const TMC_AxisEnum axis, const bool otpw) {
_tmc_say_axis(axis); _tmc_say_axis(axis);
SERIAL_ECHOPGM(" axis temperature prewarn triggered: "); SERIAL_ECHOPGM(" temperature prewarn triggered: ");
serialprintPGM(otpw ? PSTR("true") : PSTR("false")); serialprintPGM(otpw ? PSTR("true") : PSTR("false"));
SERIAL_EOL(); SERIAL_EOL();
} }
@ -241,11 +241,11 @@ void _tmc_say_otpw_cleared(const TMC_AxisEnum axis) {
} }
void _tmc_say_pwmthrs(const TMC_AxisEnum axis, const uint32_t thrs) { void _tmc_say_pwmthrs(const TMC_AxisEnum axis, const uint32_t thrs) {
_tmc_say_axis(axis); _tmc_say_axis(axis);
SERIAL_ECHOLNPAIR(" stealthChop max speed set to ", thrs); SERIAL_ECHOLNPAIR(" stealthChop max speed: ", thrs);
} }
void _tmc_say_sgt(const TMC_AxisEnum axis, const int8_t sgt) { void _tmc_say_sgt(const TMC_AxisEnum axis, const int8_t sgt) {
_tmc_say_axis(axis); _tmc_say_axis(axis);
SERIAL_ECHOPGM(" driver homing sensitivity set to "); SERIAL_ECHOPGM(" homing sensitivity: ");
SERIAL_PRINTLN(sgt, DEC); SERIAL_PRINTLN(sgt, DEC);
} }
@ -383,7 +383,7 @@ void _tmc_say_sgt(const TMC_AxisEnum axis, const int8_t sgt) {
break; break;
case TMC_TPWMTHRS_MMS: { case TMC_TPWMTHRS_MMS: {
uint32_t tpwmthrs_val = st.TPWMTHRS(); uint32_t tpwmthrs_val = st.TPWMTHRS();
tpwmthrs_val ? SERIAL_ECHO(12650000UL * st.microsteps() / (256 * tpwmthrs_val * spmm)) : SERIAL_CHAR('-'); tpwmthrs_val ? SERIAL_ECHO(12650000UL * st.microsteps() / (256 * tpwmthrs_val * spmm)) : (void)SERIAL_CHAR('-');
} }
break; break;
case TMC_OTPW: serialprintPGM(st.otpw() ? PSTR("true") : PSTR("false")); break; case TMC_OTPW: serialprintPGM(st.otpw() ? PSTR("true") : PSTR("false")); break;