bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

M120/M121 also set endstops non-homing state

Browse Source
This commit is contained in:
Scott Lahteine
2016-03-24 03:18:45 -07:00
parent 02f466e633
commit af32a7d5d6
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Marlin/Marlin_main.cpp
View File

@ -1475,14 +1475,12 @@ static void setup_for_endstop_move() {
inline void raise_z_after_probing() { do_blocking_move_to_z(current_position[Z_AXIS] + Z_RAISE_AFTER_PROBING); }
static void clean_up_after_endstop_move() {
#if ENABLED(ENDSTOPS_ONLY_FOR_HOMING)
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) {
SERIAL_ECHOLNPGM("clean_up_after_endstop_move > ENDSTOPS_ONLY_FOR_HOMING > enable_endstops(false)");
}
#endif
enable_endstops(false);
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) {
SERIAL_ECHOLNPGM("clean_up_after_endstop_move > ENDSTOPS_ONLY_FOR_HOMING > endstops_not_homing()");
}
#endif
endstops_not_homing();
feedrate = saved_feedrate;
feedrate_multiplier = saved_feedrate_multiplier;
refresh_cmd_timeout();
@ -4585,14 +4583,14 @@ inline void gcode_M119() {
}
/**
* M120: Enable endstops
* M120: Enable endstops and set non-homing endstop state to "enabled"
*/
inline void gcode_M120() { enable_endstops(true); }
inline void gcode_M120() { enable_endstops_globally(true); }
/**
* M121: Disable endstops
* M121: Disable endstops and set non-homing endstop state to "disabled"
*/
inline void gcode_M121() { enable_endstops(false); }
inline void gcode_M121() { enable_endstops_globally(false); }
#if ENABLED(BLINKM)