Skip to content

Add nozzle wipe sequence commands #18736

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

Merged
thinkyhead merged 9 commits into from
Jul 22, 2020
Merged

Add nozzle wipe sequence commands #18736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8ed3c37
Add nozzle wipe sequence commands
InsanityAutomation Jul 21, 2020
d7440d1
Specify previous Adafruit SPIFlash
thinkyhead Jul 22, 2020
7eae907
Update G12.cpp
thinkyhead Jul 22, 2020
ffd196b
Update Configuration.h
thinkyhead Jul 22, 2020
9a759ed
Explicit SdFat
thinkyhead Jul 22, 2020
4c5f92d
Merge branch 'Add-Wipe-Script-Option' of https://github.com/InsanityA…
thinkyhead Jul 22, 2020
472fc1a
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/18736
thinkyhead Jul 22, 2020
2aa6a47
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/18736
thinkyhead Jul 22, 2020
d392321
Update Configuration.h
thinkyhead Jul 22, 2020
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
4 changes: 4 additions & 0 deletions Marlin/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,6 +1595,10 @@

// Enable for a purge/clean station that's always at the gantry height (thus no Z move)
//#define NOZZLE_CLEAN_NO_Z

// Explicit wipe G-code script applies to a G12 with no arguments.
//#define WIPE_SEQUENCE_COMMANDS "G1 X-17 Y25 Z10 F4000\nG1 Z1\nM114\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 Z15\nM400\nG0 X-10.0 Y-9.0"

#endif

/**
Expand Down
7 changes: 7 additions & 0 deletions Marlin/src/gcode/feature/clean/G12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ void GcodeSuite::G12() {
// Don't allow nozzle cleaning without homing first
if (axis_unhomed_error()) return;

#ifdef WIPE_SEQUENCE_COMMANDS
if (!parser.seen_any()) {
gcode.process_subcommands_now_P(PSTR(WIPE_SEQUENCE_COMMANDS));
return;
}
#endif

const uint8_t pattern = parser.ushortval('P', 0),
strokes = parser.ushortval('S', NOZZLE_CLEAN_STROKES),
objects = parser.ushortval('T', NOZZLE_CLEAN_TRIANGLES);
Expand Down