melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show M211 output with workspace offset

Browse Source
This commit is contained in:
Scott Lahteine 2017-11-25 20:45:43 -06:00
parent d06e29846d
commit 22b897e77d
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/src/gcode/calibrate/G28.cpp
View File

@ -316,13 +316,12 @@ void GcodeSuite::G28(const bool always_home_all) {
// Restore the active tool after homing // Restore the active tool after homing
#if HOTENDS > 1 #if HOTENDS > 1
tool_change(old_tool_index, 0, #if ENABLED(PARKING_EXTRUDER)
#if ENABLED(PARKING_EXTRUDER) #define NO_FETCH false // fetch the previous toolhead
false // fetch the previous toolhead #else
#else #define NO_FETCH true
true #endif
#endif tool_change(old_tool_index, 0, NO_FETCH);
);
#endif #endif
lcd_refresh(); lcd_refresh();

12
Marlin/src/gcode/control/M211.cpp
View File

@ -39,11 +39,11 @@ void GcodeSuite::M211() {
SERIAL_ECHOPGM(MSG_OFF); SERIAL_ECHOPGM(MSG_OFF);
#endif #endif
SERIAL_ECHOPGM(MSG_SOFT_MIN); SERIAL_ECHOPGM(MSG_SOFT_MIN);
SERIAL_ECHOPAIR( MSG_X, soft_endstop_min[X_AXIS]); SERIAL_ECHOPAIR( MSG_X, LOGICAL_X_POSITION(soft_endstop_min[X_AXIS]));
SERIAL_ECHOPAIR(" " MSG_Y, soft_endstop_min[Y_AXIS]); SERIAL_ECHOPAIR(" " MSG_Y, LOGICAL_Y_POSITION(soft_endstop_min[Y_AXIS]));
SERIAL_ECHOPAIR(" " MSG_Z, soft_endstop_min[Z_AXIS]); SERIAL_ECHOPAIR(" " MSG_Z, LOGICAL_Z_POSITION(soft_endstop_min[Z_AXIS]));
SERIAL_ECHOPGM(MSG_SOFT_MAX); SERIAL_ECHOPGM(MSG_SOFT_MAX);
SERIAL_ECHOPAIR( MSG_X, soft_endstop_max[X_AXIS]); SERIAL_ECHOPAIR( MSG_X, LOGICAL_X_POSITION(soft_endstop_max[X_AXIS]));
SERIAL_ECHOPAIR(" " MSG_Y, soft_endstop_max[Y_AXIS]); SERIAL_ECHOPAIR(" " MSG_Y, LOGICAL_Y_POSITION(soft_endstop_max[Y_AXIS]));
SERIAL_ECHOLNPAIR(" " MSG_Z, soft_endstop_max[Z_AXIS]); SERIAL_ECHOLNPAIR(" " MSG_Z, LOGICAL_Z_POSITION(soft_endstop_max[Z_AXIS]));
} }