zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3782 from thinkyhead/rc_home_z_before_g29

Browse source 
Require homing of Z before G29
This commit is contained in:
Scott Lahteine 2016-05-17 17:53:56 -07:00
parent 552516ddf5 a28970784c
commit d66e53c42b
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Marlin/Marlin_main.cpp
View file

@ -2063,11 +2063,18 @@ static void setup_for_endstop_move() {
#endif // AUTO_BED_LEVELING_FEATURE
#if ENABLED(Z_PROBE_SLED) || ENABLED(Z_SAFE_HOMING) || ENABLED(AUTO_BED_LEVELING_FEATURE)
static void axis_unhomed_error() {
static void axis_unhomed_error(bool xyz=false) {
if (xyz) {
LCD_MESSAGEPGM(MSG_XYZ_UNHOMED);
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM(MSG_XYZ_UNHOMED);
}
else {
LCD_MESSAGEPGM(MSG_YX_UNHOMED);
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM(MSG_YX_UNHOMED);
}
}
#endif
#if ENABLED(Z_PROBE_SLED)
@ -2090,8 +2097,8 @@ static void setup_for_endstop_move() {
}
#endif
if (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS]) {
axis_unhomed_error();
if (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS] || !axis_homed[Z_AXIS]) {
axis_unhomed_error(true);
return;
}
@ -3176,8 +3183,8 @@ inline void gcode_G28() {
#endif
// Don't allow auto-leveling without homing first
if (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS]) {
axis_unhomed_error();
if (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS] || !axis_homed[Z_AXIS]) {
axis_unhomed_error(true);
return;
}
@ -4035,7 +4042,7 @@ inline void gcode_M42() {
inline void gcode_M48() {
if (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS] || !axis_homed[Z_AXIS]) {
axis_unhomed_error();
axis_unhomed_error(true);
return;
}

3
Marlin/language_en.h
View file

@ -448,6 +448,9 @@
#ifndef MSG_YX_UNHOMED
#define MSG_YX_UNHOMED "Home X/Y before Z"
#endif
#ifndef MSG_XYZ_UNHOMED
#define MSG_XYZ_UNHOMED "Home XYZ first"
#endif
#ifndef MSG_ZPROBE_ZOFFSET
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#endif