From ed62c621d78bdcfcf8ace903ac4130d07834dca1 Mon Sep 17 00:00:00 2001
From: Roxy-3D <Roxy-3D@users.noreply.github.com>
Date: Tue, 7 Nov 2017 17:13:53 -0600
Subject: [PATCH] Fix G26 Circle Drawing. Add Default Extrusion Settings
(#8313)
- Fix G26 Circle Drawing.
- Add default extrusion settings so machine can print lines on print bed
- Yet to be done: Get LCD Menu's to use these settings.
---
Marlin/Configuration.h | 14 ++++++--
Marlin/Configuration_adv.h | 23 ++++++++++++
Marlin/src/config/default/Configuration.h | 14 ++++++--
.../AlephObjects/TAZ4/Configuration.h | 14 ++++++--
.../AliExpress/CL-260/Configuration.h | 14 ++++++--
.../config/examples/Anet/A6/Configuration.h | 14 ++++++--
.../config/examples/Anet/A8/Configuration.h | 14 ++++++--
.../examples/Azteeg/X5GT/Configuration.h | 14 ++++++--
.../examples/BQ/Hephestos/Configuration.h | 14 ++++++--
.../examples/BQ/Hephestos_2/Configuration.h | 14 ++++++--
.../config/examples/BQ/WITBOX/Configuration.h | 14 ++++++--
.../config/examples/Cartesio/Configuration.h | 14 ++++++--
.../examples/Creality/CR-10/Configuration.h | 13 ++++++-
.../src/config/examples/Felix/Configuration.h | 14 ++++++--
.../examples/Felix/DUAL/Configuration.h | 14 ++++++--
.../FolgerTech/i3-2020/Configuration.h | 14 ++++++--
.../examples/Geeetech/GT2560/Configuration.h | 14 ++++++--
.../Geeetech/I3_Pro_X-GT2560/Configuration.h | 14 ++++++--
.../examples/Infitary/i3-M508/Configuration.h | 14 ++++++--
.../examples/Malyan/M150/Configuration.h | 14 ++++++--
.../Micromake/C1/basic/Configuration.h | 14 ++++++--
.../Micromake/C1/enhanced/Configuration.h | 14 ++++++--
.../config/examples/Mks/Sbase/Configuration.h | 14 ++++++--
.../RepRapWorld/Megatronics/Configuration.h | 14 ++++++--
.../config/examples/RigidBot/Configuration.h | 14 ++++++--
.../src/config/examples/SCARA/Configuration.h | 14 ++++++--
.../config/examples/STM32F10/Configuration.h | 14 ++++++--
.../examples/Sanguinololu/Configuration.h | 14 ++++++--
.../config/examples/TinyBoy2/Configuration.h | 14 ++++++--
.../UltiMachine/Archim2/Configuration.h | 14 ++++++--
.../examples/Velleman/K8200/Configuration.h | 14 ++++++--
.../examples/Velleman/K8400/Configuration.h | 14 ++++++--
.../Velleman/K8400/Dual-head/Configuration.h | 14 ++++++--
.../examples/adafruit/ST7565/Configuration.h | 14 ++++++--
.../FLSUN/auto_calibrate/Configuration.h | 14 ++++++--
.../delta/FLSUN/kossel_mini/Configuration.h | 14 ++++++--
.../examples/delta/generic/Configuration.h | 14 ++++++--
.../delta/kossel_mini/Configuration.h | 14 ++++++--
.../examples/delta/kossel_pro/Configuration.h | 14 ++++++--
.../examples/delta/kossel_xl/Configuration.h | 14 ++++++--
.../examples/gCreate/gMax1.5+/Configuration.h | 14 ++++++--
.../config/examples/makibox/Configuration.h | 14 ++++++--
.../examples/tvrrug/Round2/Configuration.h | 14 ++++++--
.../src/config/examples/wt150/Configuration.h | 14 ++++++--
.../bedlevel/ubl/G26_Mesh_Validation_Tool.cpp | 15 +++-----
Marlin/src/module/motion.cpp | 35 +++++++++++--------
46 files changed, 564 insertions(+), 110 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 00752dfc08..8d4efc8d83 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1685,6 +1685,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1710,8 +1722,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 3de19977a1..3bf0da9fa5 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -256,6 +256,29 @@
//#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
+// Dual X Steppers
+// Uncomment this option to drive two X axis motors.
+// The next unused E driver will be assigned to the second X stepper.
+//#define X_DUAL_STEPPER_DRIVERS
+#if ENABLED(X_DUAL_STEPPER_DRIVERS)
+ // Set true if the two X motors need to rotate in opposite directions
+ #define INVERT_X2_VS_X_DIR true
+#endif
+
+// Dual Y Steppers
+// Uncomment this option to drive two Y axis motors.
+// The next unused E driver will be assigned to the second Y stepper.
+//#define Y_DUAL_STEPPER_DRIVERS
+#if ENABLED(Y_DUAL_STEPPER_DRIVERS)
+ // Set true if the two Y motors need to rotate in opposite directions
+ #define INVERT_Y2_VS_Y_DIR true
+#endif
+
+// A single Z stepper driver is usually used to drive 2 stepper motors.
+// Uncomment this option to use a separate stepper driver for each Z axis motor.
+// The next unused E driver will be assigned to the second Z stepper.
+//#define Z_DUAL_STEPPER_DRIVERS
+
/**
* Dual Steppers / Dual Endstops
*
diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h
index 00752dfc08..8d4efc8d83 100644
--- a/Marlin/src/config/default/Configuration.h
+++ b/Marlin/src/config/default/Configuration.h
@@ -1685,6 +1685,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1710,8 +1722,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
index 86d28fe25c..040465e430 100644
--- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
+++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
@@ -1710,6 +1710,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1730,8 +1742,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
index 8cf57dd9c3..bc78b32bba 100644
--- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
+++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
@@ -1690,6 +1690,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1710,8 +1722,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h
index ab543e74d9..e862a62a9f 100644
--- a/Marlin/src/config/examples/Anet/A6/Configuration.h
+++ b/Marlin/src/config/examples/Anet/A6/Configuration.h
@@ -1849,6 +1849,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1869,8 +1881,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h
index ee4718b0da..00d3bb28ea 100644
--- a/Marlin/src/config/examples/Anet/A8/Configuration.h
+++ b/Marlin/src/config/examples/Anet/A8/Configuration.h
@@ -1693,6 +1693,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1718,8 +1730,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
index 5acdd0d5a8..3fe5a2dedb 100644
--- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
+++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
@@ -1680,6 +1680,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1705,8 +1717,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
index 446408268f..24ef7c8fc4 100644
--- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
+++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
@@ -1681,6 +1681,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1701,8 +1713,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
index 65d2c8120a..ad3485ae4a 100644
--- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
+++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
@@ -1691,6 +1691,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1711,8 +1723,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
index 1e15aa6527..520bb648b8 100644
--- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
+++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
@@ -1681,6 +1681,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1701,8 +1713,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h
index 3b9d0a770d..f289e4487b 100644
--- a/Marlin/src/config/examples/Cartesio/Configuration.h
+++ b/Marlin/src/config/examples/Cartesio/Configuration.h
@@ -1689,6 +1689,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1709,8 +1721,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h
index aed32abd80..f61710b6e1 100755
--- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h
@@ -1700,6 +1700,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1720,7 +1732,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_STDDEV_FILAMENT_DIA 0.05 // Typical estimate for cheap filament
//#define DEFAULT_STDDEV_FILAMENT_DIA 0.02 // Typical advertised for higher quality filament
diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h
index c8cfe149a2..9800da6289 100644
--- a/Marlin/src/config/examples/Felix/Configuration.h
+++ b/Marlin/src/config/examples/Felix/Configuration.h
@@ -1667,6 +1667,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1692,8 +1704,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h
index d1e567c1ee..81a79c00f6 100644
--- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h
+++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h
@@ -1672,6 +1672,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1692,8 +1704,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
index 1e5a141aae..30f15ea4a4 100644
--- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
+++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
@@ -1682,6 +1682,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 500 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1707,8 +1719,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
index a3e6b8264b..94e41907ac 100644
--- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
@@ -1700,6 +1700,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1725,8 +1737,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
index c8aa5433a2..ba8977f29b 100644
--- a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
@@ -1690,6 +1690,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1710,8 +1722,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
index 45bc0bef0e..343da34e4a 100644
--- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
+++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
@@ -1689,6 +1689,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1714,8 +1726,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h
index b902a53a98..4132fbe1bd 100644
--- a/Marlin/src/config/examples/Malyan/M150/Configuration.h
+++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h
@@ -1713,6 +1713,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1738,8 +1750,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
index 96c4a54cd9..6470b1dd66 100644
--- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
+++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
@@ -1694,6 +1694,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1714,8 +1726,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
index 3cf607cc5f..5bf36b3cf9 100644
--- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
+++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
@@ -1694,6 +1694,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1714,8 +1726,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h
index 9db54f87fb..ad72f356f2 100644
--- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h
+++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h
@@ -1660,6 +1660,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1685,8 +1697,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
index bdc1165af6..b3deca5346 100644
--- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
@@ -1690,6 +1690,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1710,8 +1722,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h
index b7b11e868e..8241867c83 100644
--- a/Marlin/src/config/examples/RigidBot/Configuration.h
+++ b/Marlin/src/config/examples/RigidBot/Configuration.h
@@ -1690,6 +1690,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1710,8 +1722,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h
index 7dc7184bd7..ac2b4c7181 100644
--- a/Marlin/src/config/examples/SCARA/Configuration.h
+++ b/Marlin/src/config/examples/SCARA/Configuration.h
@@ -1702,6 +1702,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1722,8 +1734,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h
index 77c13ee1c0..b057993627 100644
--- a/Marlin/src/config/examples/STM32F10/Configuration.h
+++ b/Marlin/src/config/examples/STM32F10/Configuration.h
@@ -1693,6 +1693,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1713,8 +1725,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h
index 7ad714dc7e..3b98ed2d4f 100644
--- a/Marlin/src/config/examples/Sanguinololu/Configuration.h
+++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h
@@ -1716,6 +1716,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1741,8 +1753,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h
index bab1e87cf6..324f8de9c5 100644
--- a/Marlin/src/config/examples/TinyBoy2/Configuration.h
+++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h
@@ -1746,6 +1746,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1766,8 +1778,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
index eff8cdc3f6..5c3fca92a6 100644
--- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
+++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
@@ -1686,6 +1686,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1711,8 +1723,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h
index adbe93df61..7b7c287cee 100644
--- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h
+++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h
@@ -1720,6 +1720,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1745,8 +1757,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h
index 64cb3886f9..5bbc60d3ae 100644
--- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h
+++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h
@@ -1690,6 +1690,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1710,8 +1722,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
index cc2671f05e..ccf0065d8d 100644
--- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
+++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
@@ -1685,6 +1685,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1710,8 +1722,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
index ffd2362b2f..5fdb5a53a4 100644
--- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
+++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
@@ -1690,6 +1690,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1710,8 +1722,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
index 1ed43f1e7a..34a39960f2 100644
--- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
@@ -1824,6 +1824,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1844,8 +1856,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
index a2b1e98a2b..ddc7df7f85 100644
--- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
@@ -1817,6 +1817,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1837,8 +1849,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h
index 1306c8e0b0..79e902e251 100644
--- a/Marlin/src/config/examples/delta/generic/Configuration.h
+++ b/Marlin/src/config/examples/delta/generic/Configuration.h
@@ -1812,6 +1812,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1832,8 +1844,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
index 997856f25a..c45355c5f3 100644
--- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
@@ -1815,6 +1815,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1835,8 +1847,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
index 3d6e898598..fffa3603be 100644
--- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
@@ -1810,6 +1810,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1835,8 +1847,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
index 24210f4f34..bc21ba6967 100644
--- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
@@ -1824,6 +1824,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1844,8 +1856,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
index 86ea981e87..590452f431 100644
--- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
+++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
@@ -1704,6 +1704,18 @@
// With this option servos are powered only during movement, then turned off to prevent jitter.
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
/**
* Filament Width Sensor
*
@@ -1724,8 +1736,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h
index d9e82686b9..f7672f7010 100644
--- a/Marlin/src/config/examples/makibox/Configuration.h
+++ b/Marlin/src/config/examples/makibox/Configuration.h
@@ -1688,6 +1688,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1713,8 +1725,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
index 90fe2138f7..77887450c1 100644
--- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
+++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
@@ -1680,6 +1680,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1705,8 +1717,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h
index a8bcf05b05..867902abbc 100644
--- a/Marlin/src/config/examples/wt150/Configuration.h
+++ b/Marlin/src/config/examples/wt150/Configuration.h
@@ -1690,6 +1690,18 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
+/**
+ * Default extrusion settings
+ *
+ * These settings control basic extrusion from within the Marlin firmware.
+ *
+ */
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
+#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_LAYER_HEIGHT .2 // (mm) Default layer height that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_HOTEND_TEMP 205.0 // (c) Default nozzle temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+#define DEFAULT_BED_TEMP 60.0 // (c) Default bed temperature that will produce usable results by the printer. Used by G26 Mesh Validation Pattern tool.
+
// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
@@ -1715,8 +1727,6 @@
*/
//#define FILAMENT_WIDTH_SENSOR
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
-
#if ENABLED(FILAMENT_WIDTH_SENSOR)
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
diff --git a/Marlin/src/feature/bedlevel/ubl/G26_Mesh_Validation_Tool.cpp b/Marlin/src/feature/bedlevel/ubl/G26_Mesh_Validation_Tool.cpp
index 5e90dd9c88..74fe668222 100644
--- a/Marlin/src/feature/bedlevel/ubl/G26_Mesh_Validation_Tool.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/G26_Mesh_Validation_Tool.cpp
@@ -41,12 +41,7 @@
#define EXTRUSION_MULTIPLIER 1.0
#define RETRACTION_MULTIPLIER 1.0
-#define NOZZLE 0.4
-#define FILAMENT 1.75
-#define LAYER_HEIGHT 0.2
#define PRIME_LENGTH 10.0
-#define BED_TEMP 60.0
-#define HOTEND_TEMP 205.0
#define OOZE_AMOUNT 0.3
#define SIZE_OF_INTERSECTION_CIRCLES 5
@@ -623,12 +618,12 @@ bool unified_bed_leveling::parse_G26_parameters() {
g26_extrusion_multiplier = EXTRUSION_MULTIPLIER;
g26_retraction_multiplier = RETRACTION_MULTIPLIER;
- g26_nozzle = NOZZLE;
- g26_filament_diameter = FILAMENT;
- g26_layer_height = LAYER_HEIGHT;
+ g26_nozzle = DEFAULT_NOZZLE_SIZE;
+ g26_filament_diameter = DEFAULT_NOMINAL_FILAMENT_DIA;
+ g26_layer_height = DEFAULT_LAYER_HEIGHT;
g26_prime_length = PRIME_LENGTH;
- g26_bed_temp = BED_TEMP;
- g26_hotend_temp = HOTEND_TEMP;
+ g26_bed_temp = DEFAULT_BED_TEMP;
+ g26_hotend_temp = DEFAULT_HOTEND_TEMP;
g26_prime_flag = 0;
g26_ooze_amount = parser.linearval('O', OOZE_AMOUNT);
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 03aecfe7b2..2d2e9a3b52 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -638,25 +638,30 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
*
* Returns true if current_position[] was set to destination[]
*/
+
inline bool prepare_move_to_destination_cartesian() {
- if (current_position[X_AXIS] != destination[X_AXIS] || current_position[Y_AXIS] != destination[Y_AXIS]) {
- const float fr_scaled = MMS_SCALED(feedrate_mm_s);
+ const float fr_scaled = MMS_SCALED(feedrate_mm_s);
#if HAS_MESH
- if (planner.leveling_active) {
- #if ENABLED(AUTO_BED_LEVELING_UBL)
- ubl.line_to_destination_cartesian(fr_scaled, active_extruder);
- #elif ENABLED(MESH_BED_LEVELING)
- mesh_line_to_destination(fr_scaled);
- #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
- bilinear_line_to_destination(fr_scaled);
- #endif
- return true;
+ if (!planner.leveling_active) {
+ line_to_destination(fr_scaled);
+ return false;
}
+ #if ENABLED(AUTO_BED_LEVELING_UBL)
+ ubl.line_to_destination_cartesian(fr_scaled, active_extruder); // UBL's motion routine needs to know about all moves,
+ return true; // even purely Z-Axis moves
+ #else
+ if (current_position[X_AXIS] != destination[X_AXIS] || current_position[Y_AXIS] != destination[Y_AXIS]) {
+ #if ENABLED(MESH_BED_LEVELING)
+ mesh_line_to_destination(fr_scaled);
+ #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
+ bilinear_line_to_destination(fr_scaled);
+ #endif
+ return true;
+ }
+ else
+ line_to_destination();
+ #endif
#endif // HAS_MESH
- line_to_destination(fr_scaled);
- }
- else
- line_to_destination();
return false;
}