From 7698c5617a4d64298aec6a80595e4efe4039dfd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Piku=C5=82a?= Date: Sat, 25 Feb 2017 22:54:16 +0100 Subject: [PATCH] Added circle nozzle cleaning parameters to example configurations --- .../Cartesio/Configuration.h | 15 +++++++++++++-- .../example_configurations/Felix/Configuration.h | 15 +++++++++++++-- .../Felix/DUAL/Configuration.h | 15 +++++++++++++-- .../Hephestos/Configuration.h | 15 +++++++++++++-- .../Hephestos_2/Configuration.h | 15 +++++++++++++-- .../example_configurations/K8200/Configuration.h | 15 +++++++++++++-- .../example_configurations/K8400/Configuration.h | 15 +++++++++++++-- .../K8400/Dual-head/Configuration.h | 15 +++++++++++++-- .../RepRapWorld/Megatronics/Configuration.h | 15 +++++++++++++-- .../RigidBot/Configuration.h | 15 +++++++++++++-- .../example_configurations/SCARA/Configuration.h | 15 +++++++++++++-- .../example_configurations/TAZ4/Configuration.h | 15 +++++++++++++-- .../example_configurations/WITBOX/Configuration.h | 15 +++++++++++++-- .../adafruit/ST7565/Configuration.h | 15 +++++++++++++-- .../delta/generic/Configuration.h | 15 +++++++++++++-- .../delta/kossel_mini/Configuration.h | 15 +++++++++++++-- .../delta/kossel_pro/Configuration.h | 15 +++++++++++++-- .../delta/kossel_xl/Configuration.h | 15 +++++++++++++-- .../makibox/Configuration.h | 15 +++++++++++++-- .../tvrrug/Round2/Configuration.h | 15 +++++++++++++-- 20 files changed, 260 insertions(+), 40 deletions(-) diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index f9dbc6cbbb..eeec79db95 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1000,6 +1000,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1010,7 +1014,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1018,6 +1022,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 3c5d6a9660..2e2f3ecf2e 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -983,6 +983,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -993,7 +997,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1001,6 +1005,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index 847ffa95ac..9bf834d679 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -983,6 +983,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -993,7 +997,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1001,6 +1005,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 0e0580bf13..6dad4643b3 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -992,6 +992,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1002,7 +1006,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1010,6 +1014,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 6a3f548c43..2c3e399fff 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -994,6 +994,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1004,7 +1008,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1012,6 +1016,13 @@ #define NOZZLE_CLEAN_START_POINT { X_MIN_POS + 10, Y_MAX_POS - 9, (Z_MIN_POS + 0.5)} #define NOZZLE_CLEAN_END_POINT { X_MIN_POS + 90, Y_MAX_POS - 0, (Z_MIN_POS + 0.5)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position //#define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 06443e3cb8..df8e92ad6c 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -112,7 +112,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1029,6 +1029,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1039,7 +1043,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1047,6 +1051,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index c169e00984..dbc06c08c1 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1000,6 +1000,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1010,7 +1014,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1018,6 +1022,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index aa11b88169..fc4f6b7aef 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1000,6 +1000,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1010,7 +1014,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1018,6 +1022,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index bf23af2aef..5088a96c54 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1000,6 +1000,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1010,7 +1014,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1018,6 +1022,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 617fe392b6..1242383b65 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -999,6 +999,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1009,7 +1013,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1017,6 +1021,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index fb8c3330c0..7811a2c3aa 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -128,7 +128,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1015,6 +1015,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1025,7 +1029,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1033,6 +1037,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 36a0e8ebd5..23a734b1c1 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1021,6 +1021,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1031,7 +1035,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1039,6 +1043,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index bdacef218e..4632893655 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -992,6 +992,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1002,7 +1006,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1010,6 +1014,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 6827cfc810..6d3625871b 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1000,6 +1000,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1010,7 +1014,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1018,6 +1022,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 97108ebf64..98b17324c3 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1087,6 +1087,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1097,7 +1101,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1105,6 +1109,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 39a8dcfb9a..bce910de7e 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1090,6 +1090,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1100,7 +1104,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1108,6 +1112,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 2bf9aa34a7..437b9bcfe2 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -100,7 +100,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1089,6 +1089,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1099,7 +1103,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1107,6 +1111,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 6fd3a1aae5..c8a28c42dd 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -89,7 +89,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1093,6 +1093,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1103,7 +1107,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1111,6 +1115,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 9503c11221..bc95a78c49 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -1003,6 +1003,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1013,7 +1017,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1021,6 +1025,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index f2607066c7..e5c43a8328 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -96,7 +96,7 @@ // // Marlin now allow you to have a vendor boot image to be displayed on machine // start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your -// custom boot image and them the default Marlin boot image is shown. +// custom boot image and then the default Marlin boot image is shown. // // We suggest for you to take advantage of this new feature and keep the Marlin // boot image unmodified. For an example have a look at the bq Hephestos 2 @@ -996,6 +996,10 @@ // |________|_________|_________| // T1 T2 T3 // +// P2: This starts a circular pattern with circle with middle in +// NOZZLE_CLEAN_CIRCLE_MIDDLE radius of R and stroke count of S. +// Before starting the circle nozzle goes to NOZZLE_CLEAN_START_POINT. +// // Caveats: End point Z should use the same value as Start point Z. // // Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments @@ -1006,7 +1010,7 @@ #if ENABLED(NOZZLE_CLEAN_FEATURE) // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 - + // Default number of triangles #define NOZZLE_CLEAN_TRIANGLES 3 @@ -1014,6 +1018,13 @@ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + // Moves the nozzle to the initial position #define NOZZLE_CLEAN_GOBACK #endif