Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

For nozzle wipe, brush on single axis, option to auto home on that axis only. #23422

Merged
merged 7 commits into from
Mar 13, 2022
Merged

For nozzle wipe, brush on single axis, option to auto home on that axis only. #23422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
93522d9
Nozzle wipe - allow auto home on one axis only.
mwinters-stuff Jan 1, 2022
6d9b11b
Disable NOZZLE_CLEAN_HOME_ONLY by default
mwinters-stuff Jan 1, 2022
d923e81
Update G12.cpp
thinkyhead Jan 7, 2022
1510f6b
Merge 'bugfix-2.0.x' into pr/23422
thinkyhead Feb 8, 2022
ecbc4a7
Merge 'bugfix-2.0.x' into pr/23422
thinkyhead Feb 8, 2022
308f391
only require some axes to home
thinkyhead Mar 13, 2022
e68d1f5
Merge 'bugfix-2.0.x' into pr/23422
thinkyhead Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Marlin/src/gcode/feature/clean/G12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
*/
void GcodeSuite::G12() {
// Don't allow nozzle cleaning without homing first
if (homing_needed_error()) return;
if (homing_needed_error(linear_bits & ~TERN0(NOZZLE_CLEAN_NO_Z, Z_AXIS) & ~TERN0(NOZZLE_CLEAN_NO_Y, Y_AXIS)))
return;

#ifdef WIPE_SEQUENCE_COMMANDS
if (!parser.seen_any()) {
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/motion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ void set_axis_is_at_home(const AxisEnum axis);
constexpr linear_axis_bits_t axis_homed = linear_bits, axis_trusted = linear_bits; // Zero-endstop machines are always homed and trusted
inline void homeaxis(const AxisEnum axis) {}
inline void set_axis_never_homed(const AxisEnum) {}
inline linear_axis_bits_t axes_should_home(linear_axis_bits_t=linear_bits) { return false; }
inline linear_axis_bits_t axes_should_home(linear_axis_bits_t=linear_bits) { return 0; }
inline bool homing_needed_error(linear_axis_bits_t=linear_bits) { return false; }
inline void set_axis_unhomed(const AxisEnum axis) {}
inline void set_axis_untrusted(const AxisEnum axis) {}
Expand Down