Move test extrusion options under G26
This commit is contained in:
		| @@ -156,6 +156,9 @@ | ||||
| // :[1, 2, 3, 4, 5] | ||||
| #define EXTRUDERS 1 | ||||
|  | ||||
| // Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc. | ||||
| #define DEFAULT_NOMINAL_FILAMENT_DIA 3.0 | ||||
|  | ||||
| // For Cyclops or any "multi-extruder" that shares a single nozzle. | ||||
| //#define SINGLENOZZLE | ||||
|  | ||||
| @@ -980,6 +983,13 @@ | ||||
|   #define UBL_PROBE_PT_3_Y 20 | ||||
|  | ||||
|   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation | ||||
|   #if ENABLED(UBL_G26_MESH_VALIDATION) | ||||
|     #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle. | ||||
|     #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool. | ||||
|     #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool. | ||||
|     #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool. | ||||
|   #endif | ||||
|  | ||||
|   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle | ||||
|   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500 | ||||
|  | ||||
| @@ -1725,18 +1735,6 @@ | ||||
| // 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 | ||||
|  * | ||||
| @@ -1758,7 +1756,7 @@ | ||||
| //#define FILAMENT_WIDTH_SENSOR | ||||
|  | ||||
| #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 FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4] | ||||
|   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber | ||||
|  | ||||
|   #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading | ||||
|   | ||||
| @@ -136,6 +136,9 @@ | ||||
| // :[1, 2, 3, 4, 5] | ||||
| #define EXTRUDERS 1 | ||||
|  | ||||
| // Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc. | ||||
| #define DEFAULT_NOMINAL_FILAMENT_DIA 3.0 | ||||
|  | ||||
| // For Cyclops or any "multi-extruder" that shares a single nozzle. | ||||
| //#define SINGLENOZZLE | ||||
|  | ||||
| @@ -950,6 +953,13 @@ | ||||
|   #define UBL_PROBE_PT_3_Y 20 | ||||
|  | ||||
|   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation | ||||
|   #if ENABLED(UBL_G26_MESH_VALIDATION) | ||||
|     #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle. | ||||
|     #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool. | ||||
|     #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool. | ||||
|     #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool. | ||||
|   #endif | ||||
|  | ||||
|   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle | ||||
|   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500 | ||||
|  | ||||
| @@ -1690,18 +1700,6 @@ | ||||
| // 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 | ||||
|  * | ||||
| @@ -1723,7 +1721,7 @@ | ||||
| //#define FILAMENT_WIDTH_SENSOR | ||||
|  | ||||
| #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 FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4] | ||||
|   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber | ||||
|  | ||||
|   #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading | ||||
|   | ||||
| @@ -136,6 +136,9 @@ | ||||
| // :[1, 2, 3, 4, 5] | ||||
| #define EXTRUDERS 2 | ||||
|  | ||||
| // Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc. | ||||
| #define DEFAULT_NOMINAL_FILAMENT_DIA 3.0 | ||||
|  | ||||
| // For Cyclops or any "multi-extruder" that shares a single nozzle. | ||||
| //#define SINGLENOZZLE | ||||
|  | ||||
| @@ -950,6 +953,13 @@ | ||||
|   #define UBL_PROBE_PT_3_Y 20 | ||||
|  | ||||
|   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation | ||||
|   #if ENABLED(UBL_G26_MESH_VALIDATION) | ||||
|     #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle. | ||||
|     #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool. | ||||
|     #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool. | ||||
|     #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool. | ||||
|   #endif | ||||
|  | ||||
|   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle | ||||
|   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500 | ||||
|  | ||||
| @@ -1690,18 +1700,6 @@ | ||||
| // 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 | ||||
|  * | ||||
| @@ -1723,7 +1721,7 @@ | ||||
| //#define FILAMENT_WIDTH_SENSOR | ||||
|  | ||||
| #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 FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4] | ||||
|   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber | ||||
|  | ||||
|   #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading | ||||
|   | ||||
		Reference in New Issue
	
	Block a user