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

Fix TMC_DEBUG undefined report_tmc_status (#11993)

Browse Source
This commit is contained in:
Scott Lahteine 2018-10-03 11:56:49 -05:00 committed by GitHub
parent c40ea1f0fd
commit 8daadd2c8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@
#if ENABLED(TMC_DEBUG) #if ENABLED(TMC_DEBUG)
#include "../module/planner.h" #include "../module/planner.h"
static bool report_tmc_status; // = false;
#endif #endif
/** /**
@ -44,7 +45,6 @@
* and so we don't repeatedly report warning before the condition is cleared. * and so we don't repeatedly report warning before the condition is cleared.
*/ */
#if ENABLED(MONITOR_DRIVER_STATUS) #if ENABLED(MONITOR_DRIVER_STATUS)
static bool report_tmc_status = false;
struct TMC_driver_data { struct TMC_driver_data {
uint32_t drv_status; uint32_t drv_status;
@ -144,19 +144,21 @@
} }
else if (st.otpw_count > 0) st.otpw_count = 0; else if (st.otpw_count > 0) st.otpw_count = 0;
if (report_tmc_status) { #if ENABLED(TMC_DEBUG)
const uint32_t pwm_scale = get_pwm_scale(st); if (report_tmc_status) {
st.printLabel(); const uint32_t pwm_scale = get_pwm_scale(st);
SERIAL_ECHOPAIR(":", pwm_scale); st.printLabel();
SERIAL_ECHOPGM(" |0b"); SERIAL_PRINT(get_status_response(st), BIN); SERIAL_ECHOPAIR(":", pwm_scale);
SERIAL_ECHOPGM("| "); SERIAL_ECHOPGM(" |0b"); SERIAL_PRINT(get_status_response(st), BIN);
if (data.is_error) SERIAL_CHAR('E'); SERIAL_ECHOPGM("| ");
else if (data.is_ot) SERIAL_CHAR('O'); if (data.is_error) SERIAL_CHAR('E');
else if (data.is_otpw) SERIAL_CHAR('W'); else if (data.is_ot) SERIAL_CHAR('O');
else if (st.otpw_count > 0) SERIAL_PRINT(st.otpw_count, DEC); else if (data.is_otpw) SERIAL_CHAR('W');
else if (st.flag_otpw) SERIAL_CHAR('F'); else if (st.otpw_count > 0) SERIAL_PRINT(st.otpw_count, DEC);
SERIAL_CHAR('\t'); else if (st.flag_otpw) SERIAL_CHAR('F');
} SERIAL_CHAR('\t');
}
#endif
} }
#define HAS_HW_COMMS(ST) AXIS_DRIVER_TYPE(ST, TMC2130) || (AXIS_DRIVER_TYPE(ST, TMC2208) && defined(ST##_HARDWARE_SERIAL)) #define HAS_HW_COMMS(ST) AXIS_DRIVER_TYPE(ST, TMC2130) || (AXIS_DRIVER_TYPE(ST, TMC2208) && defined(ST##_HARDWARE_SERIAL))
@ -205,7 +207,9 @@
monitor_tmc_driver(stepperE5); monitor_tmc_driver(stepperE5);
#endif #endif
if (report_tmc_status) SERIAL_EOL(); #if ENABLED(TMC_DEBUG)
if (report_tmc_status) SERIAL_EOL();
#endif
} }
} }