MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #6736 from thinkyhead/bf_axis_unhomed

Browse Source 
More constraint on axis_unhomed_error
This commit is contained in:
Scott Lahteine 2017-05-14 17:20:04 -05:00 committed by GitHub
commit b17bcd56da
4 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/G26_Mesh_Validation_Tool.cpp
View File

@ -201,7 +201,7 @@
// Don't allow Mesh Validation without homing first, // Don't allow Mesh Validation without homing first,
// or if the parameter parsing did not go OK, abort // or if the parameter parsing did not go OK, abort
if (axis_unhomed_error(true, true, true) || parse_G26_parameters()) return; if (axis_unhomed_error() || parse_G26_parameters()) return;
if (current_position[Z_AXIS] < Z_CLEARANCE_BETWEEN_PROBES) { if (current_position[Z_AXIS] < Z_CLEARANCE_BETWEEN_PROBES) {
do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES); do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);

2
Marlin/Marlin.h
View File

@ -426,7 +426,7 @@ void do_blocking_move_to_z(const float &z, const float &fr_mm_s=0.0);
void do_blocking_move_to_xy(const float &x, const float &y, const float &fr_mm_s=0.0); void do_blocking_move_to_xy(const float &x, const float &y, const float &fr_mm_s=0.0);
#if ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE) #if ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE)
bool axis_unhomed_error(const bool x, const bool y, const bool z); bool axis_unhomed_error(const bool x=true, const bool y=true, const bool z=true);
#endif #endif
/** /**

34
Marlin/Marlin_main.cpp
View File

@ -1851,10 +1851,10 @@ static void clean_up_after_endstop_or_probe_move() {
#if HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE) || ENABLED(DELTA_AUTO_CALIBRATION) #if HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE) || ENABLED(DELTA_AUTO_CALIBRATION)
bool axis_unhomed_error(const bool x, const bool y, const bool z) { bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool z/*=true*/) {
const bool xx = x && !axis_homed[X_AXIS], const bool xx = x && !axis_known_position[X_AXIS],
yy = y && !axis_homed[Y_AXIS], yy = y && !axis_known_position[Y_AXIS],
zz = z && !axis_homed[Z_AXIS]; zz = z && !axis_known_position[Z_AXIS];
if (xx || yy || zz) { if (xx || yy || zz) {
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHOPGM(MSG_HOME " "); SERIAL_ECHOPGM(MSG_HOME " ");
@ -2169,15 +2169,13 @@ static void clean_up_after_endstop_or_probe_move() {
return true; return true;
} }
} }
#elif ENABLED(Z_PROBE_SLED) #elif ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY)
if (axis_unhomed_error(true, false, false)) { #if ENABLED(Z_PROBE_SLED)
SERIAL_ERROR_START; #define _AUE_ARGS true, false, false
SERIAL_ERRORLNPGM(MSG_STOP_UNHOMED); #else
stop(); #define _AUE_ARGS
return true; #endif
} if (axis_unhomed_error(_AUE_ARGS)) {
#elif ENABLED(Z_PROBE_ALLEN_KEY)
if (axis_unhomed_error(true, true, true )) {
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_STOP_UNHOMED); SERIAL_ERRORLNPGM(MSG_STOP_UNHOMED);
stop(); stop();
@ -3414,7 +3412,7 @@ inline void gcode_G4() {
*/ */
inline void gcode_G12() { inline void gcode_G12() {
// Don't allow nozzle cleaning without homing first // Don't allow nozzle cleaning without homing first
if (axis_unhomed_error(true, true, true)) return; if (axis_unhomed_error()) return;
const uint8_t pattern = code_seen('P') ? code_value_ushort() : 0, const uint8_t pattern = code_seen('P') ? code_value_ushort() : 0,
strokes = code_seen('S') ? code_value_ushort() : NOZZLE_CLEAN_STROKES, strokes = code_seen('S') ? code_value_ushort() : NOZZLE_CLEAN_STROKES,
@ -3443,7 +3441,7 @@ inline void gcode_G4() {
*/ */
inline void gcode_G27() { inline void gcode_G27() {
// Don't allow nozzle parking without homing first // Don't allow nozzle parking without homing first
if (axis_unhomed_error(true, true, true)) return; if (axis_unhomed_error()) return;
Nozzle::park(code_seen('P') ? code_value_ushort() : 0); Nozzle::park(code_seen('P') ? code_value_ushort() : 0);
} }
#endif // NOZZLE_PARK_FEATURE #endif // NOZZLE_PARK_FEATURE
@ -4222,7 +4220,7 @@ void home_all_axes() { gcode_G28(); }
#endif #endif
// Don't allow auto-leveling without homing first // Don't allow auto-leveling without homing first
if (axis_unhomed_error(true, true, true)) return; if (axis_unhomed_error()) return;
// Define local vars 'static' for manual probing, 'auto' otherwise // Define local vars 'static' for manual probing, 'auto' otherwise
#if ENABLED(PROBE_MANUALLY) #if ENABLED(PROBE_MANUALLY)
@ -6174,7 +6172,7 @@ inline void gcode_M42() {
*/ */
inline void gcode_M48() { inline void gcode_M48() {
if (axis_unhomed_error(true, true, true)) return; if (axis_unhomed_error()) return;
const int8_t verbose_level = code_seen('V') ? code_value_byte() : 1; const int8_t verbose_level = code_seen('V') ? code_value_byte() : 1;
if (!WITHIN(verbose_level, 0, 4)) { if (!WITHIN(verbose_level, 0, 4)) {
@ -9427,7 +9425,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
feedrate_mm_s = fr_mm_s > 0.0 ? fr_mm_s : XY_PROBE_FEEDRATE_MM_S; feedrate_mm_s = fr_mm_s > 0.0 ? fr_mm_s : XY_PROBE_FEEDRATE_MM_S;
if (tmp_extruder != active_extruder) { if (tmp_extruder != active_extruder) {
if (!no_move && axis_unhomed_error(true, true, true)) { if (!no_move && axis_unhomed_error()) {
SERIAL_ECHOLNPGM("No move on toolchange"); SERIAL_ECHOLNPGM("No move on toolchange");
no_move = true; no_move = true;
} }

2
Marlin/ubl_G29.cpp
View File

@ -329,7 +329,7 @@
} }
// Don't allow auto-leveling without homing first // Don't allow auto-leveling without homing first
if (!code_seen('N') && axis_unhomed_error(true, true, true)) // Warning! Use of 'N' flouts established standards. if (!(code_seen('N') && code_value_bool()) && axis_unhomed_error()) // Warning! Use of 'N' flouts established standards.
home_all_axes(); home_all_axes();
if (g29_parameter_parsing()) return; // abort if parsing the simple parameters causes a problem, if (g29_parameter_parsing()) return; // abort if parsing the simple parameters causes a problem,