Browse Source

More debug message cleanup

Scott Lahteine 8 years ago
parent
commit
2e96276bf4
2 changed files with 14 additions and 13 deletions
  1. 11
    12
      Marlin/Marlin_main.cpp
  2. 3
    1
      Marlin/configuration_store.cpp

+ 11
- 12
Marlin/Marlin_main.cpp View File

1442
 static void set_axis_is_at_home(AxisEnum axis) {
1442
 static void set_axis_is_at_home(AxisEnum axis) {
1443
   #if ENABLED(DEBUG_LEVELING_FEATURE)
1443
   #if ENABLED(DEBUG_LEVELING_FEATURE)
1444
     if (DEBUGGING(LEVELING)) {
1444
     if (DEBUGGING(LEVELING)) {
1445
-      SERIAL_ECHOPAIR("set_axis_is_at_home(", axis);
1446
-      SERIAL_ECHOLNPGM(") >>>");
1445
+      SERIAL_ECHOPAIR(">>> set_axis_is_at_home(", axis);
1446
+      SERIAL_ECHOLNPGM(")");
1447
     }
1447
     }
1448
   #endif
1448
   #endif
1449
 
1449
 
1993
       long start_steps = stepper.position(Z_AXIS);
1993
       long start_steps = stepper.position(Z_AXIS);
1994
 
1994
 
1995
       #if ENABLED(DEBUG_LEVELING_FEATURE)
1995
       #if ENABLED(DEBUG_LEVELING_FEATURE)
1996
-        if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("run_z_probe (DELTA) 1");
1996
+        if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe (DELTA) 1", current_position);
1997
       #endif
1997
       #endif
1998
 
1998
 
1999
       // move down slowly until you find the bed
1999
       // move down slowly until you find the bed
2015
         if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe (DELTA) 2", current_position);
2015
         if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe (DELTA) 2", current_position);
2016
       #endif
2016
       #endif
2017
 
2017
 
2018
-      SYNC_PLAN_POSITION_KINEMATIC();
2019
-
2020
     #else // !DELTA
2018
     #else // !DELTA
2021
 
2019
 
2022
       #if ENABLED(AUTO_BED_LEVELING_FEATURE)
2020
       #if ENABLED(AUTO_BED_LEVELING_FEATURE)
2054
       // Get the current stepper position after bumping an endstop
2052
       // Get the current stepper position after bumping an endstop
2055
       current_position[Z_AXIS] = stepper.get_axis_position_mm(Z_AXIS);
2053
       current_position[Z_AXIS] = stepper.get_axis_position_mm(Z_AXIS);
2056
 
2054
 
2057
-      SYNC_PLAN_POSITION_KINEMATIC();
2058
-
2059
       #if ENABLED(DEBUG_LEVELING_FEATURE)
2055
       #if ENABLED(DEBUG_LEVELING_FEATURE)
2060
         if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe", current_position);
2056
         if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe", current_position);
2061
       #endif
2057
       #endif
2062
 
2058
 
2063
     #endif // !DELTA
2059
     #endif // !DELTA
2064
 
2060
 
2061
+    SYNC_PLAN_POSITION_KINEMATIC();
2062
+
2065
     feedrate = old_feedrate;
2063
     feedrate = old_feedrate;
2066
 
2064
 
2067
     return current_position[Z_AXIS];
2065
     return current_position[Z_AXIS];
2083
   static float probe_pt(float x, float y, bool stow = true, int verbose_level = 1) {
2081
   static float probe_pt(float x, float y, bool stow = true, int verbose_level = 1) {
2084
     #if ENABLED(DEBUG_LEVELING_FEATURE)
2082
     #if ENABLED(DEBUG_LEVELING_FEATURE)
2085
       if (DEBUGGING(LEVELING)) {
2083
       if (DEBUGGING(LEVELING)) {
2086
-        SERIAL_ECHOLNPGM("probe_pt >>>");
2087
-        SERIAL_ECHOPAIR("> stow:", stow);
2088
-        SERIAL_EOL;
2084
+        SERIAL_ECHOPAIR(">>> probe_pt(", x);
2085
+        SERIAL_ECHOPAIR(", ", y);
2086
+        SERIAL_ECHOPAIR(", ", stow ? "stow" : "no stow");
2087
+        SERIAL_ECHOLNPGM(")");
2089
         DEBUG_POS("", current_position);
2088
         DEBUG_POS("", current_position);
2090
       }
2089
       }
2091
     #endif
2090
     #endif
2741
 inline void gcode_G28() {
2740
 inline void gcode_G28() {
2742
 
2741
 
2743
   #if ENABLED(DEBUG_LEVELING_FEATURE)
2742
   #if ENABLED(DEBUG_LEVELING_FEATURE)
2744
-    if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("gcode_G28 >>>");
2743
+    if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM(">>> gcode_G28");
2745
   #endif
2744
   #endif
2746
 
2745
 
2747
   // Wait for planner moves to finish!
2746
   // Wait for planner moves to finish!
3360
 
3359
 
3361
     #if ENABLED(DEBUG_LEVELING_FEATURE)
3360
     #if ENABLED(DEBUG_LEVELING_FEATURE)
3362
       if (DEBUGGING(LEVELING)) {
3361
       if (DEBUGGING(LEVELING)) {
3363
-        SERIAL_ECHOLNPGM("gcode_G29 >>>");
3362
+        SERIAL_ECHOLNPGM(">>> gcode_G29");
3364
         DEBUG_POS("", current_position);
3363
         DEBUG_POS("", current_position);
3365
       }
3364
       }
3366
     #endif
3365
     #endif

+ 3
- 1
Marlin/configuration_store.cpp View File

344
   char stored_ver[4];
344
   char stored_ver[4];
345
   char ver[4] = EEPROM_VERSION;
345
   char ver[4] = EEPROM_VERSION;
346
   EEPROM_READ_VAR(i, stored_ver); //read stored version
346
   EEPROM_READ_VAR(i, stored_ver); //read stored version
347
-  //  SERIAL_ECHO("Version: [" << ver << "] Stored version: [" << stored_ver << "]\n");
347
+  //  SERIAL_ECHOPAIR("Version: [", ver);
348
+  //  SERIAL_ECHOPAIR("] Stored version: [", stored_ver);
349
+  //  SERIAL_ECHOLNPGM("]");
348
 
350
 
349
   if (strncmp(ver, stored_ver, 3) != 0) {
351
   if (strncmp(ver, stored_ver, 3) != 0) {
350
     Config_ResetDefault();
352
     Config_ResetDefault();

Loading…
Cancel
Save