zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4286 from thinkyhead/rc_debug_clean

Browse source 
Prefix and suffix in debug output
This commit is contained in:
Scott Lahteine 2016-07-12 20:49:15 -07:00 committed by GitHub
parent e5c7af5ddc 1e14df876d
commit 4f77adddbe
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Marlin/Marlin_main.cpp
View file

@ -573,22 +573,23 @@ void serial_echopair_P(const char* s_P, unsigned long v) { serialprintPGM(s_P);
static void report_current_position(); static void report_current_position();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
void print_xyz(const char* suffix, const float x, const float y, const float z) { void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z) {
serialprintPGM(prefix);
SERIAL_ECHOPAIR("(", x); SERIAL_ECHOPAIR("(", x);
SERIAL_ECHOPAIR(", ", y); SERIAL_ECHOPAIR(", ", y);
SERIAL_ECHOPAIR(", ", z); SERIAL_ECHOPAIR(", ", z);
SERIAL_ECHOLNPGM(") "); SERIAL_ECHOPGM(")");
SERIAL_ECHO(suffix); serialprintPGM(suffix);
} }
void print_xyz(const char* suffix, const float xyz[]) { void print_xyz(const char* prefix,const char* suffix, const float xyz[]) {
print_xyz(suffix, xyz[X_AXIS], xyz[Y_AXIS], xyz[Z_AXIS]); print_xyz(prefix, suffix, xyz[X_AXIS], xyz[Y_AXIS], xyz[Z_AXIS]);
} }
#if ENABLED(AUTO_BED_LEVELING_FEATURE) #if ENABLED(AUTO_BED_LEVELING_FEATURE)
void print_xyz(const char* suffix, const vector_3 &xyz) { void print_xyz(const char* prefix,const char* suffix, const vector_3 &xyz) {
print_xyz(suffix, xyz.x, xyz.y, xyz.z); print_xyz(prefix, suffix, xyz.x, xyz.y, xyz.z);
} }
#endif #endif
#define DEBUG_POS(PREFIX,VAR) do{ SERIAL_ECHOPGM(PREFIX); print_xyz(" > " STRINGIFY(VAR), VAR); }while(0) #define DEBUG_POS(SUFFIX,VAR) do{ print_xyz(PSTR(STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); }while(0)
#endif #endif
#if ENABLED(DELTA) || ENABLED(SCARA) #if ENABLED(DELTA) || ENABLED(SCARA)
@ -1540,6 +1541,7 @@ static void set_axis_is_at_home(AxisEnum axis) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("> home_offset[axis]==", home_offset[axis]); SERIAL_ECHOPAIR("> home_offset[axis]==", home_offset[axis]);
SERIAL_EOL;
DEBUG_POS("", current_position); DEBUG_POS("", current_position);
} }
#endif #endif
@ -1653,7 +1655,7 @@ static void clean_up_after_endstop_or_probe_move() {
float old_feedrate = feedrate; float old_feedrate = feedrate;
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) print_xyz("do_blocking_move_to", x, y, z); if (DEBUGGING(LEVELING)) print_xyz(PSTR("do_blocking_move_to"), "", x, y, z);
#endif #endif
#if ENABLED(DELTA) #if ENABLED(DELTA)
@ -4327,7 +4329,7 @@ inline void gcode_M104() {
#if ENABLED(PRINTJOB_TIMER_AUTOSTART) #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
/** /**
* Stop the timer at the end of print, starting is managed by * Stop the timer at the end of print, starting is managed by
* 'heat and wait' M109. * 'heat and wait' M109.
* We use half EXTRUDE_MINTEMP here to allow nozzles to be put into hot * We use half EXTRUDE_MINTEMP here to allow nozzles to be put into hot
* stand by mode, for instance in a dual extruder setup, without affecting * stand by mode, for instance in a dual extruder setup, without affecting
@ -4639,7 +4641,7 @@ inline void gcode_M109() {
#if ENABLED(PRINTJOB_TIMER_AUTOSTART) #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
if (code_value_temp_abs() > BED_MINTEMP) { if (code_value_temp_abs() > BED_MINTEMP) {
/** /**
* We start the timer when 'heating and waiting' command arrives, LCD * We start the timer when 'heating and waiting' command arrives, LCD
* functions never wait. Cooling down managed by extruders. * functions never wait. Cooling down managed by extruders.
* *
* We do not check if the timer is already running because this check will * We do not check if the timer is already running because this check will