andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #4354 from thinkyhead/rc_jbrazio_rework_g12 

NOZZLE_CLEAN_FEATURE with no dependency on HAS_BED_PROBE
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
f1f1bac0e1 0149fc189a
commit
bb225dedc6
27 changed files with 148 additions and 152 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      .travis.yml
  2. 10
      Marlin/Configuration.h
  3. 10
      Marlin/Marlin.h
  4. 34
      Marlin/Marlin_main.cpp
  5. 7
      Marlin/SanityCheck.h
  6. 10
      Marlin/example_configurations/Cartesio/Configuration.h
  7. 10
      Marlin/example_configurations/Felix/Configuration.h
  8. 10
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  9. 10
      Marlin/example_configurations/Hephestos/Configuration.h
  10. 10
      Marlin/example_configurations/Hephestos_2/Configuration.h
  11. 10
      Marlin/example_configurations/K8200/Configuration.h
  12. 10
      Marlin/example_configurations/K8400/Configuration.h
  13. 10
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  14. 10
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  15. 10
      Marlin/example_configurations/RigidBot/Configuration.h
  16. 10
      Marlin/example_configurations/SCARA/Configuration.h
  17. 10
      Marlin/example_configurations/TAZ4/Configuration.h
  18. 10
      Marlin/example_configurations/WITBOX/Configuration.h
  19. 10
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  20. 10
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  21. 10
      Marlin/example_configurations/delta/generic/Configuration.h
  22. 10
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  23. 10
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  24. 10
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  25. 10
      Marlin/example_configurations/makibox/Configuration.h
  26. 10
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  27. 24
      Marlin/nozzle.h

5
.travis.yml
View File

@ -1,6 +1,9 @@
---
language: c
#
notifications:
email: false
#
before_install:
#
# Fetch the tag information for the current branch
@ -237,7 +240,7 @@ script:
# Test NOZZLE_CLEAN_FEATURE
#
- restore_configs
- opt_enable AUTO_BED_LEVELING_FEATURE NOZZLE_CLEAN_FEATURE FIX_MOUNTED_PROBE
- opt_enable NOZZLE_CLEAN_FEATURE
- build_marlin
#
#

10
Marlin/Configuration.h
View File

@ -894,12 +894,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/Marlin.h
View File

@ -404,4 +404,14 @@ void calculate_volumetric_multipliers();
#endif
#endif
/**
* Blocking movement and shorthand functions
*/
static void do_blocking_move_to(float x, float y, float z, float fr_mm_m=0.0);
static void do_blocking_move_to_axis_pos(AxisEnum axis, float where, float fr_mm_m=0.0);
static void do_blocking_move_to_x(float x, float fr_mm_m=0.0);
static void do_blocking_move_to_y(float y);
static void do_blocking_move_to_z(float z, float fr_mm_m=0.0);
static void do_blocking_move_to_xy(float x, float y, float fr_mm_m=0.0);
#endif //MARLIN_H

34
Marlin/Marlin_main.cpp
View File

@ -59,6 +59,7 @@
#include "language.h"
#include "pins_arduino.h"
#include "math.h"
#include "nozzle.h"
#if ENABLED(USE_WATCHDOG)
#include "watchdog.h"
@ -1660,7 +1661,7 @@ inline void set_destination_to_current() { memcpy(destination, current_position,
* Plan a move to (X, Y, Z) and set the current_position
* The final current_position may not be the one that was requested
*/
static void do_blocking_move_to(float x, float y, float z, float fr_mm_m = 0.0) {
void do_blocking_move_to(float x, float y, float z, float fr_mm_m /*=0.0*/) {
float old_feedrate_mm_m = feedrate_mm_m;
#if ENABLED(DEBUG_LEVELING_FEATURE)
@ -1708,21 +1709,14 @@ static void do_blocking_move_to(float x, float y, float z, float fr_mm_m = 0.0)
feedrate_mm_m = old_feedrate_mm_m;
}
inline void do_blocking_move_to_x(float x, float fr_mm_m = 0.0) {
do_blocking_move_to(x, current_position[Y_AXIS], current_position[Z_AXIS], fr_mm_m);
}
inline void do_blocking_move_to_y(float y) {
do_blocking_move_to(current_position[X_AXIS], y, current_position[Z_AXIS]);
}
inline void do_blocking_move_to_xy(float x, float y, float fr_mm_m = 0.0) {
do_blocking_move_to(x, y, current_position[Z_AXIS], fr_mm_m);
}
inline void do_blocking_move_to_z(float z, float fr_mm_m = 0.0) {
do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z, fr_mm_m);
void do_blocking_move_to_axis_pos(AxisEnum axis, float where, float fr_mm_m/*=0.0*/) {
current_position[axis] = where;
do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], fr_mm_m);
}
void do_blocking_move_to_x(float x, float fr_mm_m/*=0.0*/) { do_blocking_move_to_axis_pos(X_AXIS, x, fr_mm_m); }
void do_blocking_move_to_y(float y) { do_blocking_move_to_axis_pos(Y_AXIS, y); }
void do_blocking_move_to_z(float z, float fr_mm_m/*=0.0*/) { do_blocking_move_to_axis_pos(Z_AXIS, z, fr_mm_m); }
void do_blocking_move_to_xy(float x, float y, float fr_mm_m/*=0.0*/) { do_blocking_move_to(x, y, current_position[Z_AXIS], fr_mm_m); }
//
// Prepare to do endstop or probe moves
@ -2784,9 +2778,7 @@ inline void gcode_G4() {
#endif //FWRETRACT
#if ENABLED(NOZZLE_CLEAN_FEATURE) && HAS_BED_PROBE
#include "nozzle.h"
#if ENABLED(NOZZLE_CLEAN_FEATURE)
/**
* G12: Clean the nozzle
*/
@ -2819,8 +2811,6 @@ inline void gcode_G4() {
#endif
#if ENABLED(NOZZLE_PARK_FEATURE)
#include "nozzle.h"
/**
* G27: Park the nozzle
*/
@ -3301,7 +3291,7 @@ inline void gcode_G28() {
}
// For each G29 S2...
if (probe_point == 0) {
// For the intial G29 S2 make Z a positive value (e.g., 4.0)
// For the initial G29 S2 make Z a positive value (e.g., 4.0)
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
#if Z_HOME_DIR > 0
+ Z_MAX_POS
@ -7084,7 +7074,7 @@ void process_next_command() {
break;
#endif // FWRETRACT
#if ENABLED(NOZZLE_CLEAN_FEATURE) && HAS_BED_PROBE
#if ENABLED(NOZZLE_CLEAN_FEATURE)
case 12:
gcode_G12(); // G12: Nozzle Clean
break;

7
Marlin/SanityCheck.h
View File

@ -684,11 +684,4 @@
#error "ENDSTOPS_ONLY_FOR_HOMING is deprecated. Use (disable) ENDSTOPS_ALWAYS_ON_DEFAULT instead."
#endif
/**
* Nozzle cleaning
*/
#if ENABLED(NOZZLE_CLEAN_FEATURE) && !HAS_BED_PROBE
#error Due to internal dependencies you must have a bed probe for NOZZLE_CLEAN_FEATURE to work
#endif
#endif //SANITYCHECK_H

10
Marlin/example_configurations/Cartesio/Configuration.h
View File

@ -894,12 +894,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/Felix/Configuration.h
View File

@ -877,12 +877,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/Felix/DUAL/Configuration.h
View File

@ -875,12 +875,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/Hephestos/Configuration.h
View File

@ -886,12 +886,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/Hephestos_2/Configuration.h
View File

@ -888,12 +888,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/K8200/Configuration.h
View File

@ -911,12 +911,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/K8400/Configuration.h
View File

@ -894,12 +894,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/K8400/Dual-head/Configuration.h
View File

@ -894,12 +894,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View File

@ -894,12 +894,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/RigidBot/Configuration.h
View File

@ -892,12 +892,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -902,12 +902,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/TAZ4/Configuration.h
View File

@ -915,12 +915,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/WITBOX/Configuration.h
View File

@ -886,12 +886,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View File

@ -894,12 +894,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/delta/biv2.5/Configuration.h
View File

@ -989,12 +989,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -983,12 +983,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -986,12 +986,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -986,12 +986,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

@ -988,12 +988,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/makibox/Configuration.h
View File

@ -897,12 +897,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

10
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -888,12 +888,12 @@
// Number of pattern repetitions
#define NOZZLE_CLEAN_STROKES 12
// { X, Y, Z}
#define NOZZLE_CLEAN_START_PT { 30, 30, (Z_MIN_POS + 5)}
#define NOZZLE_CLEAN_END_PT {100, 60, (Z_MIN_POS + 5)}
// Specify positions as { X, Y, Z }
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
#define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Moves the nozzle to the parked position
#define NOZZLE_CLEAN_PARK
// Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
#endif
//

24
Marlin/nozzle.h
View File

@ -48,7 +48,7 @@ class Nozzle {
) __attribute__((optimize ("Os"))) {
#if ENABLED(NOZZLE_CLEAN_FEATURE)
#if ENABLED(NOZZLE_CLEAN_PARK)
#if ENABLED(NOZZLE_CLEAN_GOBACK)
// Store the current coords
point_t const initial = {
current_position[X_AXIS],
@ -56,7 +56,7 @@ class Nozzle {
current_position[Z_AXIS],
current_position[E_AXIS]
};
#endif // NOZZLE_CLEAN_PARK
#endif // NOZZLE_CLEAN_GOBACK
// Move to the starting point
do_blocking_move_to_xy(start.x, start.y);
@ -68,11 +68,11 @@ class Nozzle {
do_blocking_move_to_xy(start.x, start.y);
}
#if ENABLED(NOZZLE_CLEAN_PARK)
#if ENABLED(NOZZLE_CLEAN_GOBACK)
// Move the nozzle to the initial point
do_blocking_move_to_z(initial.z);
do_blocking_move_to_xy(initial.x, initial.y);
#endif // NOZZLE_CLEAN_PARK
#endif // NOZZLE_CLEAN_GOBACK
#endif // NOZZLE_CLEAN_FEATURE
}
@ -99,7 +99,7 @@ class Nozzle {
// Don't allow impossible triangles
if (A <= 0.0f || P <= 0.0f ) return;
#if ENABLED(NOZZLE_CLEAN_PARK)
#if ENABLED(NOZZLE_CLEAN_GOBACK)
// Store the current coords
point_t const initial = {
current_position[X_AXIS],
@ -107,7 +107,7 @@ class Nozzle {
current_position[Z_AXIS],
current_position[E_AXIS]
};
#endif // NOZZLE_CLEAN_PARK
#endif // NOZZLE_CLEAN_GOBACK
for (uint8_t j = 0; j < strokes; j++) {
for (uint8_t i = 0; i < (objects << 1); i++) {
@ -126,11 +126,11 @@ class Nozzle {
}
}
#if ENABLED(NOZZLE_CLEAN_PARK)
#if ENABLED(NOZZLE_CLEAN_GOBACK)
// Move the nozzle to the initial point
do_blocking_move_to_z(initial.z);
do_blocking_move_to_xy(initial.x, initial.y);
#endif // NOZZLE_CLEAN_PARK
#endif // NOZZLE_CLEAN_GOBACK
#endif // NOZZLE_CLEAN_FEATURE
}
@ -152,14 +152,14 @@ class Nozzle {
switch (pattern) {
case 1:
Nozzle::zigzag(
NOZZLE_CLEAN_START_PT,
NOZZLE_CLEAN_END_PT, strokes, objects);
NOZZLE_CLEAN_START_POINT,
NOZZLE_CLEAN_END_POINT, strokes, objects);
break;
default:
Nozzle::stroke(
NOZZLE_CLEAN_START_PT,
NOZZLE_CLEAN_END_PT, strokes);
NOZZLE_CLEAN_START_POINT,
NOZZLE_CLEAN_END_POINT, strokes);
}
#endif // NOZZLE_CLEAN_FEATURE
}

Write Preview
Loading…
Cancel
Save