Browse Source

Include Z Fade in log_machine_info

Scott Lahteine 7 years ago
parent
commit
696f8eb4c6
1 changed files with 28 additions and 7 deletions
  1. 28
    7
      Marlin/src/core/utility.cpp

+ 28
- 7
Marlin/src/core/utility.cpp View File

@@ -335,6 +335,10 @@ void safe_delay(millis_t ms) {
335 335
       #endif
336 336
       if (planner.leveling_active) {
337 337
         SERIAL_ECHOLNPGM(" (enabled)");
338
+        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
339
+          if (planner.z_fade_height)
340
+            SERIAL_ECHOLNPAIR("Z Fade: ", planner.z_fade_height);
341
+        #endif
338 342
         #if ABL_PLANAR
339 343
           const float diff[XYZ] = {
340 344
             stepper.get_axis_position_mm(X_AXIS) - current_position[X_AXIS],
@@ -350,10 +354,21 @@ void safe_delay(millis_t ms) {
350 354
           SERIAL_ECHOPGM(" Z");
351 355
           if (diff[Z_AXIS] > 0) SERIAL_CHAR('+');
352 356
           SERIAL_ECHO(diff[Z_AXIS]);
353
-        #elif ENABLED(AUTO_BED_LEVELING_UBL)
354
-          SERIAL_ECHOPAIR("UBL Adjustment Z", stepper.get_axis_position_mm(Z_AXIS) - current_position[Z_AXIS]);
355
-        #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
356
-          SERIAL_ECHOPAIR("ABL Adjustment Z", bilinear_z_offset(current_position));
357
+        #else
358
+          #if ENABLED(AUTO_BED_LEVELING_UBL)
359
+            SERIAL_ECHOPGM("UBL Adjustment Z");
360
+            const float rz = ubl.get_z_correction(current_position[X_AXIS], current_position[Y_AXIS]);
361
+          #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
362
+            SERIAL_ECHOPGM("ABL Adjustment Z");
363
+            const float rz = bilinear_z_offset(current_position);
364
+          #endif
365
+          SERIAL_ECHO(ftostr43sign(rz, '+'));
366
+          #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
367
+            if (planner.z_fade_height) {
368
+              SERIAL_ECHOPAIR(" (", ftostr43sign(rz * planner.fade_scaling_factor_for_z(current_position[Z_AXIS]), '+'));
369
+              SERIAL_CHAR(')');
370
+            }
371
+          #endif
357 372
         #endif
358 373
       }
359 374
       else
@@ -365,10 +380,16 @@ void safe_delay(millis_t ms) {
365 380
 
366 381
       SERIAL_ECHOPGM("Mesh Bed Leveling");
367 382
       if (planner.leveling_active) {
368
-        float rz = current_position[Z_AXIS];
369
-        planner.apply_leveling(current_position[X_AXIS], current_position[Y_AXIS], rz);
370 383
         SERIAL_ECHOLNPGM(" (enabled)");
371
-        SERIAL_ECHOPAIR("MBL Adjustment Z", rz);
384
+        SERIAL_ECHOPAIR("MBL Adjustment Z", ftostr43sign(mbl.get_z(current_position[X_AXIS], current_position[Y_AXIS], 1.0), '+'));
385
+        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
386
+          if (planner.z_fade_height) {
387
+            SERIAL_ECHOPAIR(" (", ftostr43sign(
388
+              mbl.get_z(current_position[X_AXIS], current_position[Y_AXIS], planner.fade_scaling_factor_for_z(current_position[Z_AXIS])), '+'
389
+            ));
390
+            SERIAL_CHAR(')');
391
+          }
392
+        #endif
372 393
       }
373 394
       else
374 395
         SERIAL_ECHOPGM(" (disabled)");

Loading…
Cancel
Save