Bladeren bron

Show M211 output with workspace offset

Scott Lahteine 7 jaren geleden
bovenliggende
commit
22b897e77d
2 gewijzigde bestanden met toevoegingen van 12 en 13 verwijderingen
  1. 6
    7
      Marlin/src/gcode/calibrate/G28.cpp
  2. 6
    6
      Marlin/src/gcode/control/M211.cpp

+ 6
- 7
Marlin/src/gcode/calibrate/G28.cpp Bestand weergeven

@@ -316,13 +316,12 @@ void GcodeSuite::G28(const bool always_home_all) {
316 316
 
317 317
   // Restore the active tool after homing
318 318
   #if HOTENDS > 1
319
-    tool_change(old_tool_index, 0,
320
-      #if ENABLED(PARKING_EXTRUDER)
321
-        false // fetch the previous toolhead
322
-      #else
323
-        true
324
-      #endif
325
-    );
319
+    #if ENABLED(PARKING_EXTRUDER)
320
+      #define NO_FETCH false // fetch the previous toolhead
321
+    #else
322
+      #define NO_FETCH true
323
+    #endif
324
+    tool_change(old_tool_index, 0, NO_FETCH);
326 325
   #endif
327 326
 
328 327
   lcd_refresh();

+ 6
- 6
Marlin/src/gcode/control/M211.cpp Bestand weergeven

@@ -39,11 +39,11 @@ void GcodeSuite::M211() {
39 39
     SERIAL_ECHOPGM(MSG_OFF);
40 40
   #endif
41 41
   SERIAL_ECHOPGM(MSG_SOFT_MIN);
42
-  SERIAL_ECHOPAIR(    MSG_X, soft_endstop_min[X_AXIS]);
43
-  SERIAL_ECHOPAIR(" " MSG_Y, soft_endstop_min[Y_AXIS]);
44
-  SERIAL_ECHOPAIR(" " MSG_Z, soft_endstop_min[Z_AXIS]);
42
+  SERIAL_ECHOPAIR(    MSG_X, LOGICAL_X_POSITION(soft_endstop_min[X_AXIS]));
43
+  SERIAL_ECHOPAIR(" " MSG_Y, LOGICAL_Y_POSITION(soft_endstop_min[Y_AXIS]));
44
+  SERIAL_ECHOPAIR(" " MSG_Z, LOGICAL_Z_POSITION(soft_endstop_min[Z_AXIS]));
45 45
   SERIAL_ECHOPGM(MSG_SOFT_MAX);
46
-  SERIAL_ECHOPAIR(    MSG_X, soft_endstop_max[X_AXIS]);
47
-  SERIAL_ECHOPAIR(" " MSG_Y, soft_endstop_max[Y_AXIS]);
48
-  SERIAL_ECHOLNPAIR(" " MSG_Z, soft_endstop_max[Z_AXIS]);
46
+  SERIAL_ECHOPAIR(    MSG_X, LOGICAL_X_POSITION(soft_endstop_max[X_AXIS]));
47
+  SERIAL_ECHOPAIR(" " MSG_Y, LOGICAL_Y_POSITION(soft_endstop_max[Y_AXIS]));
48
+  SERIAL_ECHOLNPAIR(" " MSG_Z, LOGICAL_Z_POSITION(soft_endstop_max[Z_AXIS]));
49 49
 }

Laden…
Annuleren
Opslaan