0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

More debug message cleanup

Browse source
This commit is contained in:
Scott Lahteine 2016-06-27 19:33:37 -07:00
parent dc2c0e5e24
commit 2e96276bf4
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Marlin/Marlin_main.cpp
View file

@ -1442,8 +1442,8 @@ static void set_home_offset(AxisEnum axis, float v) {
static void set_axis_is_at_home(AxisEnum axis) { 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("set_axis_is_at_home(", axis); SERIAL_ECHOPAIR(">>> set_axis_is_at_home(", axis);
SERIAL_ECHOLNPGM(") >>>"); SERIAL_ECHOLNPGM(")");
} }
#endif #endif
@ -1993,7 +1993,7 @@ static void clean_up_after_endstop_or_probe_move() {
long start_steps = stepper.position(Z_AXIS); long start_steps = stepper.position(Z_AXIS);
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("run_z_probe (DELTA) 1"); if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe (DELTA) 1", current_position);
#endif #endif
// move down slowly until you find the bed // move down slowly until you find the bed
@ -2015,8 +2015,6 @@ static void clean_up_after_endstop_or_probe_move() {
if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe (DELTA) 2", current_position); if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe (DELTA) 2", current_position);
#endif #endif
SYNC_PLAN_POSITION_KINEMATIC();
#else // !DELTA #else // !DELTA
#if ENABLED(AUTO_BED_LEVELING_FEATURE) #if ENABLED(AUTO_BED_LEVELING_FEATURE)
@ -2054,14 +2052,14 @@ static void clean_up_after_endstop_or_probe_move() {
// Get the current stepper position after bumping an endstop // Get the current stepper position after bumping an endstop
current_position[Z_AXIS] = stepper.get_axis_position_mm(Z_AXIS); current_position[Z_AXIS] = stepper.get_axis_position_mm(Z_AXIS);
SYNC_PLAN_POSITION_KINEMATIC();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe", current_position); if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe", current_position);
#endif #endif
#endif // !DELTA #endif // !DELTA
SYNC_PLAN_POSITION_KINEMATIC();
feedrate = old_feedrate; feedrate = old_feedrate;
return current_position[Z_AXIS]; return current_position[Z_AXIS];
@ -2083,9 +2081,10 @@ static void clean_up_after_endstop_or_probe_move() {
static float probe_pt(float x, float y, bool stow = true, int verbose_level = 1) { static float probe_pt(float x, float y, bool stow = true, int verbose_level = 1) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("probe_pt >>>"); SERIAL_ECHOPAIR(">>> probe_pt(", x);
SERIAL_ECHOPAIR("> stow:", stow); SERIAL_ECHOPAIR(", ", y);
SERIAL_EOL; SERIAL_ECHOPAIR(", ", stow ? "stow" : "no stow");
SERIAL_ECHOLNPGM(")");
DEBUG_POS("", current_position); DEBUG_POS("", current_position);
} }
#endif #endif
@ -2741,7 +2740,7 @@ inline void gcode_G4() {
inline void gcode_G28() { inline void gcode_G28() {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("gcode_G28 >>>"); if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM(">>> gcode_G28");
#endif #endif
// Wait for planner moves to finish! // Wait for planner moves to finish!
@ -3360,7 +3359,7 @@ inline void gcode_G28() {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("gcode_G29 >>>"); SERIAL_ECHOLNPGM(">>> gcode_G29");
DEBUG_POS("", current_position); DEBUG_POS("", current_position);
} }
#endif #endif

4
Marlin/configuration_store.cpp
View file

@ -344,7 +344,9 @@ void Config_RetrieveSettings() {
char stored_ver[4]; char stored_ver[4];
char ver[4] = EEPROM_VERSION; char ver[4] = EEPROM_VERSION;
EEPROM_READ_VAR(i, stored_ver); //read stored version EEPROM_READ_VAR(i, stored_ver); //read stored version
// SERIAL_ECHO("Version: [" << ver << "] Stored version: [" << stored_ver << "]\n"); // SERIAL_ECHOPAIR("Version: [", ver);
// SERIAL_ECHOPAIR("] Stored version: [", stored_ver);
// SERIAL_ECHOLNPGM("]");
if (strncmp(ver, stored_ver, 3) != 0) { if (strncmp(ver, stored_ver, 3) != 0) {
Config_ResetDefault(); Config_ResetDefault();