SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4234 from thinkyhead/rc_better_position_logging

Browse source 
Move XYZ in print_xyz and DEBUG_POS to the front
This commit is contained in:
Scott Lahteine 2016-07-07 12:31:15 -07:00 committed by GitHub
commit ad968f2325
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Marlin/Marlin_main.cpp
View file

@ -573,19 +573,19 @@ 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* prefix, const float x, const float y, const float z) { void print_xyz(const char* suffix, const float x, const float y, const float z) {
SERIAL_ECHO(prefix); SERIAL_ECHOPAIR("(", x);
SERIAL_ECHOPAIR(": (", x);
SERIAL_ECHOPAIR(", ", y); SERIAL_ECHOPAIR(", ", y);
SERIAL_ECHOPAIR(", ", z); SERIAL_ECHOPAIR(", ", z);
SERIAL_ECHOLNPGM(")"); SERIAL_ECHOLNPGM(") ");
SERIAL_ECHO(suffix);
} }
void print_xyz(const char* prefix, const float xyz[]) { void print_xyz(const char* suffix, const float xyz[]) {
print_xyz(prefix, xyz[X_AXIS], xyz[Y_AXIS], xyz[Z_AXIS]); print_xyz(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* prefix, const vector_3 &xyz) { void print_xyz(const char* suffix, const vector_3 &xyz) {
print_xyz(prefix, xyz.x, xyz.y, xyz.z); print_xyz(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(PREFIX,VAR) do{ SERIAL_ECHOPGM(PREFIX); print_xyz(" > " STRINGIFY(VAR), VAR); }while(0)