Browse Source

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.
Roxy-3D 6 years ago
parent
commit
ed62c621d7
No account linked to committer's email address
46 changed files with 564 additions and 110 deletions
  1. 12
    2
      Marlin/Configuration.h
  2. 23
    0
      Marlin/Configuration_adv.h
  3. 12
    2
      Marlin/src/config/default/Configuration.h
  4. 12
    2
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  5. 12
    2
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  6. 12
    2
      Marlin/src/config/examples/Anet/A6/Configuration.h
  7. 12
    2
      Marlin/src/config/examples/Anet/A8/Configuration.h
  8. 12
    2
      Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
  9. 12
    2
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  10. 12
    2
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  11. 12
    2
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  12. 12
    2
      Marlin/src/config/examples/Cartesio/Configuration.h
  13. 12
    1
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  14. 12
    2
      Marlin/src/config/examples/Felix/Configuration.h
  15. 12
    2
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  16. 12
    2
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  17. 12
    2
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  18. 12
    2
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  19. 12
    2
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  20. 12
    2
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  21. 12
    2
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  22. 12
    2
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  23. 12
    2
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  24. 12
    2
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  25. 12
    2
      Marlin/src/config/examples/RigidBot/Configuration.h
  26. 12
    2
      Marlin/src/config/examples/SCARA/Configuration.h
  27. 12
    2
      Marlin/src/config/examples/STM32F10/Configuration.h
  28. 12
    2
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  29. 12
    2
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  30. 12
    2
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  31. 12
    2
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  32. 12
    2
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  33. 12
    2
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  34. 12
    2
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  35. 12
    2
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  36. 12
    2
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  37. 12
    2
      Marlin/src/config/examples/delta/generic/Configuration.h
  38. 12
    2
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  39. 12
    2
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  40. 12
    2
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  41. 12
    2
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  42. 12
    2
      Marlin/src/config/examples/makibox/Configuration.h
  43. 12
    2
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  44. 12
    2
      Marlin/src/config/examples/wt150/Configuration.h
  45. 5
    10
      Marlin/src/feature/bedlevel/ubl/G26_Mesh_Validation_Tool.cpp
  46. 20
    15
      Marlin/src/module/motion.cpp

+ 12
- 2
Marlin/Configuration.h View File

1685
 // If the servo can't reach the requested position, increase it.
1685
 // If the servo can't reach the requested position, increase it.
1686
 #define SERVO_DELAY { 300 }
1686
 #define SERVO_DELAY { 300 }
1687
 
1687
 
1688
+/**
1689
+ * Default extrusion settings
1690
+ *
1691
+ * These settings control basic extrusion from within the Marlin firmware.
1692
+ * 
1693
+ */
1694
+#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.
1695
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1696
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1697
+#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.
1698
+#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.
1699
+
1688
 // Servo deactivation
1700
 // Servo deactivation
1689
 //
1701
 //
1690
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1702
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1710
  */
1722
  */
1711
 //#define FILAMENT_WIDTH_SENSOR
1723
 //#define FILAMENT_WIDTH_SENSOR
1712
 
1724
 
1713
-#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.
1714
-
1715
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1725
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1716
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1726
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1717
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1727
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 23
- 0
Marlin/Configuration_adv.h View File

256
 
256
 
257
 //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
257
 //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
258
 
258
 
259
+// Dual X Steppers
260
+// Uncomment this option to drive two X axis motors.
261
+// The next unused E driver will be assigned to the second X stepper.
262
+//#define X_DUAL_STEPPER_DRIVERS
263
+#if ENABLED(X_DUAL_STEPPER_DRIVERS)
264
+  // Set true if the two X motors need to rotate in opposite directions
265
+  #define INVERT_X2_VS_X_DIR true
266
+#endif
267
+
268
+// Dual Y Steppers
269
+// Uncomment this option to drive two Y axis motors.
270
+// The next unused E driver will be assigned to the second Y stepper.
271
+//#define Y_DUAL_STEPPER_DRIVERS
272
+#if ENABLED(Y_DUAL_STEPPER_DRIVERS)
273
+  // Set true if the two Y motors need to rotate in opposite directions
274
+  #define INVERT_Y2_VS_Y_DIR true
275
+#endif
276
+
277
+// A single Z stepper driver is usually used to drive 2 stepper motors.
278
+// Uncomment this option to use a separate stepper driver for each Z axis motor.
279
+// The next unused E driver will be assigned to the second Z stepper.
280
+//#define Z_DUAL_STEPPER_DRIVERS
281
+
259
 /**
282
 /**
260
  * Dual Steppers / Dual Endstops
283
  * Dual Steppers / Dual Endstops
261
  *
284
  *

+ 12
- 2
Marlin/src/config/default/Configuration.h View File

1685
 // If the servo can't reach the requested position, increase it.
1685
 // If the servo can't reach the requested position, increase it.
1686
 #define SERVO_DELAY { 300 }
1686
 #define SERVO_DELAY { 300 }
1687
 
1687
 
1688
+/**
1689
+ * Default extrusion settings
1690
+ *
1691
+ * These settings control basic extrusion from within the Marlin firmware.
1692
+ * 
1693
+ */
1694
+#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.
1695
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1696
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1697
+#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.
1698
+#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.
1699
+
1688
 // Servo deactivation
1700
 // Servo deactivation
1689
 //
1701
 //
1690
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1702
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1710
  */
1722
  */
1711
 //#define FILAMENT_WIDTH_SENSOR
1723
 //#define FILAMENT_WIDTH_SENSOR
1712
 
1724
 
1713
-#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.
1714
-
1715
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1725
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1716
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1726
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1717
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1727
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h View File

1711
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1711
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1712
 
1712
 
1713
 /**
1713
 /**
1714
+ * Default extrusion settings
1715
+ *
1716
+ * These settings control basic extrusion from within the Marlin firmware.
1717
+ * 
1718
+ */
1719
+#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.
1720
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1721
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1722
+#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.
1723
+#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.
1724
+
1725
+/**
1714
  * Filament Width Sensor
1726
  * Filament Width Sensor
1715
  *
1727
  *
1716
  * Measures the filament width in real-time and adjusts
1728
  * Measures the filament width in real-time and adjusts
1730
  */
1742
  */
1731
 //#define FILAMENT_WIDTH_SENSOR
1743
 //#define FILAMENT_WIDTH_SENSOR
1732
 
1744
 
1733
-#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.
1734
-
1735
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1745
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1736
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1746
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1737
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1747
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h View File

1691
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1691
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692
 
1692
 
1693
 /**
1693
 /**
1694
+ * Default extrusion settings
1695
+ *
1696
+ * These settings control basic extrusion from within the Marlin firmware.
1697
+ * 
1698
+ */
1699
+#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.
1700
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1701
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1702
+#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.
1703
+#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.
1704
+
1705
+/**
1694
  * Filament Width Sensor
1706
  * Filament Width Sensor
1695
  *
1707
  *
1696
  * Measures the filament width in real-time and adjusts
1708
  * Measures the filament width in real-time and adjusts
1710
  */
1722
  */
1711
 //#define FILAMENT_WIDTH_SENSOR
1723
 //#define FILAMENT_WIDTH_SENSOR
1712
 
1724
 
1713
-#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.
1714
-
1715
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1725
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1716
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1726
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1717
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1727
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Anet/A6/Configuration.h View File

1850
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1850
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1851
 
1851
 
1852
 /**
1852
 /**
1853
+ * Default extrusion settings
1854
+ *
1855
+ * These settings control basic extrusion from within the Marlin firmware.
1856
+ * 
1857
+ */
1858
+#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.
1859
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1860
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1861
+#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.
1862
+#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.
1863
+
1864
+/**
1853
  * Filament Width Sensor
1865
  * Filament Width Sensor
1854
  *
1866
  *
1855
  * Measures the filament width in real-time and adjusts
1867
  * Measures the filament width in real-time and adjusts
1869
  */
1881
  */
1870
 //#define FILAMENT_WIDTH_SENSOR
1882
 //#define FILAMENT_WIDTH_SENSOR
1871
 
1883
 
1872
-#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.
1873
-
1874
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1884
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1875
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1885
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1876
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1886
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Anet/A8/Configuration.h View File

1693
 // If the servo can't reach the requested position, increase it.
1693
 // If the servo can't reach the requested position, increase it.
1694
 #define SERVO_DELAY { 300 }
1694
 #define SERVO_DELAY { 300 }
1695
 
1695
 
1696
+/**
1697
+ * Default extrusion settings
1698
+ *
1699
+ * These settings control basic extrusion from within the Marlin firmware.
1700
+ * 
1701
+ */
1702
+#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.
1703
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1704
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1705
+#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.
1706
+#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.
1707
+
1696
 // Servo deactivation
1708
 // Servo deactivation
1697
 //
1709
 //
1698
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1710
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1718
  */
1730
  */
1719
 //#define FILAMENT_WIDTH_SENSOR
1731
 //#define FILAMENT_WIDTH_SENSOR
1720
 
1732
 
1721
-#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.
1722
-
1723
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1733
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1724
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1734
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1725
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1735
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h View File

1680
 // If the servo can't reach the requested position, increase it.
1680
 // If the servo can't reach the requested position, increase it.
1681
 #define SERVO_DELAY { 300 }
1681
 #define SERVO_DELAY { 300 }
1682
 
1682
 
1683
+/**
1684
+ * Default extrusion settings
1685
+ *
1686
+ * These settings control basic extrusion from within the Marlin firmware.
1687
+ * 
1688
+ */
1689
+#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.
1690
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1691
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1692
+#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.
1693
+#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.
1694
+
1683
 // Servo deactivation
1695
 // Servo deactivation
1684
 //
1696
 //
1685
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1697
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1705
  */
1717
  */
1706
 //#define FILAMENT_WIDTH_SENSOR
1718
 //#define FILAMENT_WIDTH_SENSOR
1707
 
1719
 
1708
-#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.
1709
-
1710
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1720
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1711
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1721
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1712
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1722
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/BQ/Hephestos/Configuration.h View File

1682
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1682
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1683
 
1683
 
1684
 /**
1684
 /**
1685
+ * Default extrusion settings
1686
+ *
1687
+ * These settings control basic extrusion from within the Marlin firmware.
1688
+ * 
1689
+ */
1690
+#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.
1691
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1692
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1693
+#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.
1694
+#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.
1695
+
1696
+/**
1685
  * Filament Width Sensor
1697
  * Filament Width Sensor
1686
  *
1698
  *
1687
  * Measures the filament width in real-time and adjusts
1699
  * Measures the filament width in real-time and adjusts
1701
  */
1713
  */
1702
 //#define FILAMENT_WIDTH_SENSOR
1714
 //#define FILAMENT_WIDTH_SENSOR
1703
 
1715
 
1704
-#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.
1705
-
1706
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1716
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1707
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1717
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1708
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1718
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h View File

1692
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1693
 
1693
 
1694
 /**
1694
 /**
1695
+ * Default extrusion settings
1696
+ *
1697
+ * These settings control basic extrusion from within the Marlin firmware.
1698
+ * 
1699
+ */
1700
+#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.
1701
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1702
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1703
+#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.
1704
+#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.
1705
+
1706
+/**
1695
  * Filament Width Sensor
1707
  * Filament Width Sensor
1696
  *
1708
  *
1697
  * Measures the filament width in real-time and adjusts
1709
  * Measures the filament width in real-time and adjusts
1711
  */
1723
  */
1712
 //#define FILAMENT_WIDTH_SENSOR
1724
 //#define FILAMENT_WIDTH_SENSOR
1713
 
1725
 
1714
-#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.
1715
-
1716
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1726
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1717
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1727
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1718
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1728
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/BQ/WITBOX/Configuration.h View File

1682
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1682
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1683
 
1683
 
1684
 /**
1684
 /**
1685
+ * Default extrusion settings
1686
+ *
1687
+ * These settings control basic extrusion from within the Marlin firmware.
1688
+ * 
1689
+ */
1690
+#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.
1691
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1692
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1693
+#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.
1694
+#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.
1695
+
1696
+/**
1685
  * Filament Width Sensor
1697
  * Filament Width Sensor
1686
  *
1698
  *
1687
  * Measures the filament width in real-time and adjusts
1699
  * Measures the filament width in real-time and adjusts
1701
  */
1713
  */
1702
 //#define FILAMENT_WIDTH_SENSOR
1714
 //#define FILAMENT_WIDTH_SENSOR
1703
 
1715
 
1704
-#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.
1705
-
1706
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1716
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1707
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1717
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1708
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1718
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Cartesio/Configuration.h View File

1690
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1690
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1691
 
1691
 
1692
 /**
1692
 /**
1693
+ * Default extrusion settings
1694
+ *
1695
+ * These settings control basic extrusion from within the Marlin firmware.
1696
+ * 
1697
+ */
1698
+#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.
1699
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1700
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1701
+#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.
1702
+#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.
1703
+
1704
+/**
1693
  * Filament Width Sensor
1705
  * Filament Width Sensor
1694
  *
1706
  *
1695
  * Measures the filament width in real-time and adjusts
1707
  * Measures the filament width in real-time and adjusts
1709
  */
1721
  */
1710
 //#define FILAMENT_WIDTH_SENSOR
1722
 //#define FILAMENT_WIDTH_SENSOR
1711
 
1723
 
1712
-#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.
1713
-
1714
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1724
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1715
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1725
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1716
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1726
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 1
Marlin/src/config/examples/Creality/CR-10/Configuration.h View File

1701
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1701
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1702
 
1702
 
1703
 /**
1703
 /**
1704
+ * Default extrusion settings
1705
+ *
1706
+ * These settings control basic extrusion from within the Marlin firmware.
1707
+ * 
1708
+ */
1709
+#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.
1710
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1711
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1712
+#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.
1713
+#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.
1714
+
1715
+/**
1704
  * Filament Width Sensor
1716
  * Filament Width Sensor
1705
  *
1717
  *
1706
  * Measures the filament width in real-time and adjusts
1718
  * Measures the filament width in real-time and adjusts
1720
  */
1732
  */
1721
 //#define FILAMENT_WIDTH_SENSOR
1733
 //#define FILAMENT_WIDTH_SENSOR
1722
 
1734
 
1723
-#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.
1724
 #define DEFAULT_STDDEV_FILAMENT_DIA 0.05    // Typical estimate for cheap filament
1735
 #define DEFAULT_STDDEV_FILAMENT_DIA 0.05    // Typical estimate for cheap filament
1725
 //#define DEFAULT_STDDEV_FILAMENT_DIA 0.02  // Typical advertised for higher quality filament
1736
 //#define DEFAULT_STDDEV_FILAMENT_DIA 0.02  // Typical advertised for higher quality filament
1726
 
1737
 

+ 12
- 2
Marlin/src/config/examples/Felix/Configuration.h View File

1667
 // If the servo can't reach the requested position, increase it.
1667
 // If the servo can't reach the requested position, increase it.
1668
 #define SERVO_DELAY { 300 }
1668
 #define SERVO_DELAY { 300 }
1669
 
1669
 
1670
+/**
1671
+ * Default extrusion settings
1672
+ *
1673
+ * These settings control basic extrusion from within the Marlin firmware.
1674
+ * 
1675
+ */
1676
+#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.
1677
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1678
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1679
+#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.
1680
+#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.
1681
+
1670
 // Servo deactivation
1682
 // Servo deactivation
1671
 //
1683
 //
1672
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1684
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1692
  */
1704
  */
1693
 //#define FILAMENT_WIDTH_SENSOR
1705
 //#define FILAMENT_WIDTH_SENSOR
1694
 
1706
 
1695
-#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.
1696
-
1697
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1707
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1698
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1708
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1699
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1709
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Felix/DUAL/Configuration.h View File

1673
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1673
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1674
 
1674
 
1675
 /**
1675
 /**
1676
+ * Default extrusion settings
1677
+ *
1678
+ * These settings control basic extrusion from within the Marlin firmware.
1679
+ * 
1680
+ */
1681
+#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.
1682
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1683
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1684
+#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.
1685
+#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.
1686
+
1687
+/**
1676
  * Filament Width Sensor
1688
  * Filament Width Sensor
1677
  *
1689
  *
1678
  * Measures the filament width in real-time and adjusts
1690
  * Measures the filament width in real-time and adjusts
1692
  */
1704
  */
1693
 //#define FILAMENT_WIDTH_SENSOR
1705
 //#define FILAMENT_WIDTH_SENSOR
1694
 
1706
 
1695
-#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.
1696
-
1697
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1707
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1698
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1708
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1699
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1709
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h View File

1682
 // If the servo can't reach the requested position, increase it.
1682
 // If the servo can't reach the requested position, increase it.
1683
 #define SERVO_DELAY { 500 }
1683
 #define SERVO_DELAY { 500 }
1684
 
1684
 
1685
+/**
1686
+ * Default extrusion settings
1687
+ *
1688
+ * These settings control basic extrusion from within the Marlin firmware.
1689
+ * 
1690
+ */
1691
+#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.
1692
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1693
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1694
+#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.
1695
+#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.
1696
+
1685
 // Servo deactivation
1697
 // Servo deactivation
1686
 //
1698
 //
1687
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1699
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1707
  */
1719
  */
1708
 //#define FILAMENT_WIDTH_SENSOR
1720
 //#define FILAMENT_WIDTH_SENSOR
1709
 
1721
 
1710
-#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.
1711
-
1712
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1722
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1713
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1723
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1714
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1724
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h View File

1700
 // If the servo can't reach the requested position, increase it.
1700
 // If the servo can't reach the requested position, increase it.
1701
 #define SERVO_DELAY { 300 }
1701
 #define SERVO_DELAY { 300 }
1702
 
1702
 
1703
+/**
1704
+ * Default extrusion settings
1705
+ *
1706
+ * These settings control basic extrusion from within the Marlin firmware.
1707
+ * 
1708
+ */
1709
+#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.
1710
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1711
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1712
+#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.
1713
+#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.
1714
+
1703
 // Servo deactivation
1715
 // Servo deactivation
1704
 //
1716
 //
1705
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1717
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1725
  */
1737
  */
1726
 //#define FILAMENT_WIDTH_SENSOR
1738
 //#define FILAMENT_WIDTH_SENSOR
1727
 
1739
 
1728
-#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.
1729
-
1730
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1740
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1731
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1741
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1732
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1742
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h View File

1691
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1691
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692
 
1692
 
1693
 /**
1693
 /**
1694
+ * Default extrusion settings
1695
+ *
1696
+ * These settings control basic extrusion from within the Marlin firmware.
1697
+ * 
1698
+ */
1699
+#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.
1700
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1701
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1702
+#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.
1703
+#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.
1704
+
1705
+/**
1694
  * Filament Width Sensor
1706
  * Filament Width Sensor
1695
  *
1707
  *
1696
  * Measures the filament width in real-time and adjusts
1708
  * Measures the filament width in real-time and adjusts
1710
  */
1722
  */
1711
 //#define FILAMENT_WIDTH_SENSOR
1723
 //#define FILAMENT_WIDTH_SENSOR
1712
 
1724
 
1713
-#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.
1714
-
1715
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1725
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1716
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1726
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1717
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1727
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h View File

1689
 // If the servo can't reach the requested position, increase it.
1689
 // If the servo can't reach the requested position, increase it.
1690
 #define SERVO_DELAY { 300 }
1690
 #define SERVO_DELAY { 300 }
1691
 
1691
 
1692
+/**
1693
+ * Default extrusion settings
1694
+ *
1695
+ * These settings control basic extrusion from within the Marlin firmware.
1696
+ * 
1697
+ */
1698
+#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.
1699
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1700
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1701
+#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.
1702
+#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.
1703
+
1692
 // Servo deactivation
1704
 // Servo deactivation
1693
 //
1705
 //
1694
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1706
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1714
  */
1726
  */
1715
 //#define FILAMENT_WIDTH_SENSOR
1727
 //#define FILAMENT_WIDTH_SENSOR
1716
 
1728
 
1717
-#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.
1718
-
1719
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1729
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1720
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1730
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1721
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1731
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Malyan/M150/Configuration.h View File

1713
 // If the servo can't reach the requested position, increase it.
1713
 // If the servo can't reach the requested position, increase it.
1714
 #define SERVO_DELAY { 300 }
1714
 #define SERVO_DELAY { 300 }
1715
 
1715
 
1716
+/**
1717
+ * Default extrusion settings
1718
+ *
1719
+ * These settings control basic extrusion from within the Marlin firmware.
1720
+ * 
1721
+ */
1722
+#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.
1723
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1724
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1725
+#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.
1726
+#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.
1727
+
1716
 // Servo deactivation
1728
 // Servo deactivation
1717
 //
1729
 //
1718
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1730
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1738
  */
1750
  */
1739
 //#define FILAMENT_WIDTH_SENSOR
1751
 //#define FILAMENT_WIDTH_SENSOR
1740
 
1752
 
1741
-#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.
1742
-
1743
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1753
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1744
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1754
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1745
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1755
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h View File

1695
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1695
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1696
 
1696
 
1697
 /**
1697
 /**
1698
+ * Default extrusion settings
1699
+ *
1700
+ * These settings control basic extrusion from within the Marlin firmware.
1701
+ * 
1702
+ */
1703
+#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.
1704
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1705
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1706
+#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.
1707
+#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.
1708
+
1709
+/**
1698
  * Filament Width Sensor
1710
  * Filament Width Sensor
1699
  *
1711
  *
1700
  * Measures the filament width in real-time and adjusts
1712
  * Measures the filament width in real-time and adjusts
1714
  */
1726
  */
1715
 //#define FILAMENT_WIDTH_SENSOR
1727
 //#define FILAMENT_WIDTH_SENSOR
1716
 
1728
 
1717
-#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.
1718
-
1719
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1729
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1720
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1730
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1721
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1731
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h View File

1695
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1695
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1696
 
1696
 
1697
 /**
1697
 /**
1698
+ * Default extrusion settings
1699
+ *
1700
+ * These settings control basic extrusion from within the Marlin firmware.
1701
+ * 
1702
+ */
1703
+#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.
1704
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1705
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1706
+#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.
1707
+#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.
1708
+
1709
+/**
1698
  * Filament Width Sensor
1710
  * Filament Width Sensor
1699
  *
1711
  *
1700
  * Measures the filament width in real-time and adjusts
1712
  * Measures the filament width in real-time and adjusts
1714
  */
1726
  */
1715
 //#define FILAMENT_WIDTH_SENSOR
1727
 //#define FILAMENT_WIDTH_SENSOR
1716
 
1728
 
1717
-#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.
1718
-
1719
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1729
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1720
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1730
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1721
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1731
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Mks/Sbase/Configuration.h View File

1660
 // If the servo can't reach the requested position, increase it.
1660
 // If the servo can't reach the requested position, increase it.
1661
 #define SERVO_DELAY { 300 }
1661
 #define SERVO_DELAY { 300 }
1662
 
1662
 
1663
+/**
1664
+ * Default extrusion settings
1665
+ *
1666
+ * These settings control basic extrusion from within the Marlin firmware.
1667
+ * 
1668
+ */
1669
+#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.
1670
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1671
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1672
+#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.
1673
+#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.
1674
+
1663
 // Servo deactivation
1675
 // Servo deactivation
1664
 //
1676
 //
1665
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1677
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1685
  */
1697
  */
1686
 //#define FILAMENT_WIDTH_SENSOR
1698
 //#define FILAMENT_WIDTH_SENSOR
1687
 
1699
 
1688
-#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.
1689
-
1690
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1700
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1691
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1701
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1692
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1702
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h View File

1691
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1691
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692
 
1692
 
1693
 /**
1693
 /**
1694
+ * Default extrusion settings
1695
+ *
1696
+ * These settings control basic extrusion from within the Marlin firmware.
1697
+ * 
1698
+ */
1699
+#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.
1700
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1701
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1702
+#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.
1703
+#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.
1704
+
1705
+/**
1694
  * Filament Width Sensor
1706
  * Filament Width Sensor
1695
  *
1707
  *
1696
  * Measures the filament width in real-time and adjusts
1708
  * Measures the filament width in real-time and adjusts
1710
  */
1722
  */
1711
 //#define FILAMENT_WIDTH_SENSOR
1723
 //#define FILAMENT_WIDTH_SENSOR
1712
 
1724
 
1713
-#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.
1714
-
1715
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1725
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1716
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1726
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1717
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1727
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/RigidBot/Configuration.h View File

1691
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1691
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692
 
1692
 
1693
 /**
1693
 /**
1694
+ * Default extrusion settings
1695
+ *
1696
+ * These settings control basic extrusion from within the Marlin firmware.
1697
+ * 
1698
+ */
1699
+#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.
1700
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1701
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1702
+#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.
1703
+#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.
1704
+
1705
+/**
1694
  * Filament Width Sensor
1706
  * Filament Width Sensor
1695
  *
1707
  *
1696
  * Measures the filament width in real-time and adjusts
1708
  * Measures the filament width in real-time and adjusts
1710
  */
1722
  */
1711
 //#define FILAMENT_WIDTH_SENSOR
1723
 //#define FILAMENT_WIDTH_SENSOR
1712
 
1724
 
1713
-#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.
1714
-
1715
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1725
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1716
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1726
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1717
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1727
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/SCARA/Configuration.h View File

1703
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1703
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1704
 
1704
 
1705
 /**
1705
 /**
1706
+ * Default extrusion settings
1707
+ *
1708
+ * These settings control basic extrusion from within the Marlin firmware.
1709
+ * 
1710
+ */
1711
+#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.
1712
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1713
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1714
+#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.
1715
+#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.
1716
+
1717
+/**
1706
  * Filament Width Sensor
1718
  * Filament Width Sensor
1707
  *
1719
  *
1708
  * Measures the filament width in real-time and adjusts
1720
  * Measures the filament width in real-time and adjusts
1722
  */
1734
  */
1723
 //#define FILAMENT_WIDTH_SENSOR
1735
 //#define FILAMENT_WIDTH_SENSOR
1724
 
1736
 
1725
-#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.
1726
-
1727
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1737
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1728
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1738
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1729
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1739
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/STM32F10/Configuration.h View File

1694
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1694
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1695
 
1695
 
1696
 /**
1696
 /**
1697
+ * Default extrusion settings
1698
+ *
1699
+ * These settings control basic extrusion from within the Marlin firmware.
1700
+ * 
1701
+ */
1702
+#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.
1703
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1704
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1705
+#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.
1706
+#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.
1707
+
1708
+/**
1697
  * Filament Width Sensor
1709
  * Filament Width Sensor
1698
  *
1710
  *
1699
  * Measures the filament width in real-time and adjusts
1711
  * Measures the filament width in real-time and adjusts
1713
  */
1725
  */
1714
 //#define FILAMENT_WIDTH_SENSOR
1726
 //#define FILAMENT_WIDTH_SENSOR
1715
 
1727
 
1716
-#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.
1717
-
1718
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1728
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1719
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1729
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1720
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1730
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Sanguinololu/Configuration.h View File

1716
 // If the servo can't reach the requested position, increase it.
1716
 // If the servo can't reach the requested position, increase it.
1717
 #define SERVO_DELAY { 300 }
1717
 #define SERVO_DELAY { 300 }
1718
 
1718
 
1719
+/**
1720
+ * Default extrusion settings
1721
+ *
1722
+ * These settings control basic extrusion from within the Marlin firmware.
1723
+ * 
1724
+ */
1725
+#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.
1726
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1727
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1728
+#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.
1729
+#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.
1730
+
1719
 // Servo deactivation
1731
 // Servo deactivation
1720
 //
1732
 //
1721
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1733
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1741
  */
1753
  */
1742
 //#define FILAMENT_WIDTH_SENSOR
1754
 //#define FILAMENT_WIDTH_SENSOR
1743
 
1755
 
1744
-#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.
1745
-
1746
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1756
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1747
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1757
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1748
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1758
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/TinyBoy2/Configuration.h View File

1747
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1747
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1748
 
1748
 
1749
 /**
1749
 /**
1750
+ * Default extrusion settings
1751
+ *
1752
+ * These settings control basic extrusion from within the Marlin firmware.
1753
+ * 
1754
+ */
1755
+#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.
1756
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1757
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1758
+#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.
1759
+#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.
1760
+
1761
+/**
1750
  * Filament Width Sensor
1762
  * Filament Width Sensor
1751
  *
1763
  *
1752
  * Measures the filament width in real-time and adjusts
1764
  * Measures the filament width in real-time and adjusts
1766
  */
1778
  */
1767
 //#define FILAMENT_WIDTH_SENSOR
1779
 //#define FILAMENT_WIDTH_SENSOR
1768
 
1780
 
1769
-#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.
1770
-
1771
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1781
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1772
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1782
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1773
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1783
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h View File

1686
 // If the servo can't reach the requested position, increase it.
1686
 // If the servo can't reach the requested position, increase it.
1687
 #define SERVO_DELAY { 300 }
1687
 #define SERVO_DELAY { 300 }
1688
 
1688
 
1689
+/**
1690
+ * Default extrusion settings
1691
+ *
1692
+ * These settings control basic extrusion from within the Marlin firmware.
1693
+ * 
1694
+ */
1695
+#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.
1696
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1697
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1698
+#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.
1699
+#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.
1700
+
1689
 // Servo deactivation
1701
 // Servo deactivation
1690
 //
1702
 //
1691
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1703
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1711
  */
1723
  */
1712
 //#define FILAMENT_WIDTH_SENSOR
1724
 //#define FILAMENT_WIDTH_SENSOR
1713
 
1725
 
1714
-#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.
1715
-
1716
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1726
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1717
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1727
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1718
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1728
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Velleman/K8200/Configuration.h View File

1720
 // If the servo can't reach the requested position, increase it.
1720
 // If the servo can't reach the requested position, increase it.
1721
 #define SERVO_DELAY { 300 }
1721
 #define SERVO_DELAY { 300 }
1722
 
1722
 
1723
+/**
1724
+ * Default extrusion settings
1725
+ *
1726
+ * These settings control basic extrusion from within the Marlin firmware.
1727
+ * 
1728
+ */
1729
+#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.
1730
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1731
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1732
+#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.
1733
+#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.
1734
+
1723
 // Servo deactivation
1735
 // Servo deactivation
1724
 //
1736
 //
1725
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1737
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1745
  */
1757
  */
1746
 //#define FILAMENT_WIDTH_SENSOR
1758
 //#define FILAMENT_WIDTH_SENSOR
1747
 
1759
 
1748
-#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.
1749
-
1750
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1760
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1751
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1761
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1752
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1762
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Velleman/K8400/Configuration.h View File

1691
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1691
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692
 
1692
 
1693
 /**
1693
 /**
1694
+ * Default extrusion settings
1695
+ *
1696
+ * These settings control basic extrusion from within the Marlin firmware.
1697
+ * 
1698
+ */
1699
+#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.
1700
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1701
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1702
+#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.
1703
+#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.
1704
+
1705
+/**
1694
  * Filament Width Sensor
1706
  * Filament Width Sensor
1695
  *
1707
  *
1696
  * Measures the filament width in real-time and adjusts
1708
  * Measures the filament width in real-time and adjusts
1710
  */
1722
  */
1711
 //#define FILAMENT_WIDTH_SENSOR
1723
 //#define FILAMENT_WIDTH_SENSOR
1712
 
1724
 
1713
-#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.
1714
-
1715
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1725
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1716
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1726
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1717
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1727
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h View File

1685
 // If the servo can't reach the requested position, increase it.
1685
 // If the servo can't reach the requested position, increase it.
1686
 #define SERVO_DELAY { 300 }
1686
 #define SERVO_DELAY { 300 }
1687
 
1687
 
1688
+/**
1689
+ * Default extrusion settings
1690
+ *
1691
+ * These settings control basic extrusion from within the Marlin firmware.
1692
+ * 
1693
+ */
1694
+#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.
1695
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1696
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1697
+#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.
1698
+#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.
1699
+
1688
 // Servo deactivation
1700
 // Servo deactivation
1689
 //
1701
 //
1690
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1702
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1710
  */
1722
  */
1711
 //#define FILAMENT_WIDTH_SENSOR
1723
 //#define FILAMENT_WIDTH_SENSOR
1712
 
1724
 
1713
-#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.
1714
-
1715
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1725
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1716
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1726
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1717
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1727
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/adafruit/ST7565/Configuration.h View File

1691
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1691
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692
 
1692
 
1693
 /**
1693
 /**
1694
+ * Default extrusion settings
1695
+ *
1696
+ * These settings control basic extrusion from within the Marlin firmware.
1697
+ * 
1698
+ */
1699
+#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.
1700
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1701
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1702
+#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.
1703
+#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.
1704
+
1705
+/**
1694
  * Filament Width Sensor
1706
  * Filament Width Sensor
1695
  *
1707
  *
1696
  * Measures the filament width in real-time and adjusts
1708
  * Measures the filament width in real-time and adjusts
1710
  */
1722
  */
1711
 //#define FILAMENT_WIDTH_SENSOR
1723
 //#define FILAMENT_WIDTH_SENSOR
1712
 
1724
 
1713
-#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.
1714
-
1715
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1725
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1716
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1726
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1717
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1727
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h View File

1825
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1825
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1826
 
1826
 
1827
 /**
1827
 /**
1828
+ * Default extrusion settings
1829
+ *
1830
+ * These settings control basic extrusion from within the Marlin firmware.
1831
+ * 
1832
+ */
1833
+#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.
1834
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1835
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1836
+#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.
1837
+#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.
1838
+
1839
+/**
1828
  * Filament Width Sensor
1840
  * Filament Width Sensor
1829
  *
1841
  *
1830
  * Measures the filament width in real-time and adjusts
1842
  * Measures the filament width in real-time and adjusts
1844
  */
1856
  */
1845
 //#define FILAMENT_WIDTH_SENSOR
1857
 //#define FILAMENT_WIDTH_SENSOR
1846
 
1858
 
1847
-#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.
1848
-
1849
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1859
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1850
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1860
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1851
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1861
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h View File

1818
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1818
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1819
 
1819
 
1820
 /**
1820
 /**
1821
+ * Default extrusion settings
1822
+ *
1823
+ * These settings control basic extrusion from within the Marlin firmware.
1824
+ * 
1825
+ */
1826
+#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.
1827
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1828
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1829
+#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.
1830
+#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.
1831
+
1832
+/**
1821
  * Filament Width Sensor
1833
  * Filament Width Sensor
1822
  *
1834
  *
1823
  * Measures the filament width in real-time and adjusts
1835
  * Measures the filament width in real-time and adjusts
1837
  */
1849
  */
1838
 //#define FILAMENT_WIDTH_SENSOR
1850
 //#define FILAMENT_WIDTH_SENSOR
1839
 
1851
 
1840
-#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.
1841
-
1842
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1852
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1843
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1853
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1844
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1854
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/delta/generic/Configuration.h View File

1813
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1813
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1814
 
1814
 
1815
 /**
1815
 /**
1816
+ * Default extrusion settings
1817
+ *
1818
+ * These settings control basic extrusion from within the Marlin firmware.
1819
+ * 
1820
+ */
1821
+#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.
1822
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1823
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1824
+#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.
1825
+#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.
1826
+
1827
+/**
1816
  * Filament Width Sensor
1828
  * Filament Width Sensor
1817
  *
1829
  *
1818
  * Measures the filament width in real-time and adjusts
1830
  * Measures the filament width in real-time and adjusts
1832
  */
1844
  */
1833
 //#define FILAMENT_WIDTH_SENSOR
1845
 //#define FILAMENT_WIDTH_SENSOR
1834
 
1846
 
1835
-#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.
1836
-
1837
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1847
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1838
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1848
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1839
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1849
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/delta/kossel_mini/Configuration.h View File

1816
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1816
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1817
 
1817
 
1818
 /**
1818
 /**
1819
+ * Default extrusion settings
1820
+ *
1821
+ * These settings control basic extrusion from within the Marlin firmware.
1822
+ * 
1823
+ */
1824
+#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.
1825
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1826
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1827
+#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.
1828
+#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.
1829
+
1830
+/**
1819
  * Filament Width Sensor
1831
  * Filament Width Sensor
1820
  *
1832
  *
1821
  * Measures the filament width in real-time and adjusts
1833
  * Measures the filament width in real-time and adjusts
1835
  */
1847
  */
1836
 //#define FILAMENT_WIDTH_SENSOR
1848
 //#define FILAMENT_WIDTH_SENSOR
1837
 
1849
 
1838
-#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.
1839
-
1840
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1850
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1841
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1851
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1842
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1852
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/delta/kossel_pro/Configuration.h View File

1810
 // If the servo can't reach the requested position, increase it.
1810
 // If the servo can't reach the requested position, increase it.
1811
 #define SERVO_DELAY { 300 }
1811
 #define SERVO_DELAY { 300 }
1812
 
1812
 
1813
+/**
1814
+ * Default extrusion settings
1815
+ *
1816
+ * These settings control basic extrusion from within the Marlin firmware.
1817
+ * 
1818
+ */
1819
+#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.
1820
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1821
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1822
+#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.
1823
+#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.
1824
+
1813
 // Servo deactivation
1825
 // Servo deactivation
1814
 //
1826
 //
1815
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1827
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1835
  */
1847
  */
1836
 //#define FILAMENT_WIDTH_SENSOR
1848
 //#define FILAMENT_WIDTH_SENSOR
1837
 
1849
 
1838
-#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.
1839
-
1840
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1850
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1841
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1851
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1842
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1852
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/delta/kossel_xl/Configuration.h View File

1825
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1825
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1826
 
1826
 
1827
 /**
1827
 /**
1828
+ * Default extrusion settings
1829
+ *
1830
+ * These settings control basic extrusion from within the Marlin firmware.
1831
+ * 
1832
+ */
1833
+#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.
1834
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1835
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1836
+#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.
1837
+#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.
1838
+
1839
+/**
1828
  * Filament Width Sensor
1840
  * Filament Width Sensor
1829
  *
1841
  *
1830
  * Measures the filament width in real-time and adjusts
1842
  * Measures the filament width in real-time and adjusts
1844
  */
1856
  */
1845
 //#define FILAMENT_WIDTH_SENSOR
1857
 //#define FILAMENT_WIDTH_SENSOR
1846
 
1858
 
1847
-#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.
1848
-
1849
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1859
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1850
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1860
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1851
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1861
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h View File

1705
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1705
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1706
 
1706
 
1707
 /**
1707
 /**
1708
+ * Default extrusion settings
1709
+ *
1710
+ * These settings control basic extrusion from within the Marlin firmware.
1711
+ * 
1712
+ */
1713
+#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.
1714
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1715
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1716
+#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.
1717
+#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.
1718
+
1719
+/**
1708
  * Filament Width Sensor
1720
  * Filament Width Sensor
1709
  *
1721
  *
1710
  * Measures the filament width in real-time and adjusts
1722
  * Measures the filament width in real-time and adjusts
1724
  */
1736
  */
1725
 //#define FILAMENT_WIDTH_SENSOR
1737
 //#define FILAMENT_WIDTH_SENSOR
1726
 
1738
 
1727
-#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.
1728
-
1729
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1739
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1730
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1740
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1731
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1741
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/makibox/Configuration.h View File

1688
 // If the servo can't reach the requested position, increase it.
1688
 // If the servo can't reach the requested position, increase it.
1689
 #define SERVO_DELAY { 300 }
1689
 #define SERVO_DELAY { 300 }
1690
 
1690
 
1691
+/**
1692
+ * Default extrusion settings
1693
+ *
1694
+ * These settings control basic extrusion from within the Marlin firmware.
1695
+ * 
1696
+ */
1697
+#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.
1698
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1699
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1700
+#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.
1701
+#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.
1702
+
1691
 // Servo deactivation
1703
 // Servo deactivation
1692
 //
1704
 //
1693
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1705
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1713
  */
1725
  */
1714
 //#define FILAMENT_WIDTH_SENSOR
1726
 //#define FILAMENT_WIDTH_SENSOR
1715
 
1727
 
1716
-#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.
1717
-
1718
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1728
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1719
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1729
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1720
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1730
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/tvrrug/Round2/Configuration.h View File

1680
 // If the servo can't reach the requested position, increase it.
1680
 // If the servo can't reach the requested position, increase it.
1681
 #define SERVO_DELAY { 300 }
1681
 #define SERVO_DELAY { 300 }
1682
 
1682
 
1683
+/**
1684
+ * Default extrusion settings
1685
+ *
1686
+ * These settings control basic extrusion from within the Marlin firmware.
1687
+ * 
1688
+ */
1689
+#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.
1690
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1691
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1692
+#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.
1693
+#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.
1694
+
1683
 // Servo deactivation
1695
 // Servo deactivation
1684
 //
1696
 //
1685
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1697
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1705
  */
1717
  */
1706
 //#define FILAMENT_WIDTH_SENSOR
1718
 //#define FILAMENT_WIDTH_SENSOR
1707
 
1719
 
1708
-#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.
1709
-
1710
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1720
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1711
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1721
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1712
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1722
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 12
- 2
Marlin/src/config/examples/wt150/Configuration.h View File

1690
 // If the servo can't reach the requested position, increase it.
1690
 // If the servo can't reach the requested position, increase it.
1691
 #define SERVO_DELAY { 300 }
1691
 #define SERVO_DELAY { 300 }
1692
 
1692
 
1693
+/**
1694
+ * Default extrusion settings
1695
+ *
1696
+ * These settings control basic extrusion from within the Marlin firmware.
1697
+ * 
1698
+ */
1699
+#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.
1700
+#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1701
+#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1702
+#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.
1703
+#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.
1704
+
1693
 // Servo deactivation
1705
 // Servo deactivation
1694
 //
1706
 //
1695
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1707
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1715
  */
1727
  */
1716
 //#define FILAMENT_WIDTH_SENSOR
1728
 //#define FILAMENT_WIDTH_SENSOR
1717
 
1729
 
1718
-#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.
1719
-
1720
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1730
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1721
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1731
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1722
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1732
   #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber

+ 5
- 10
Marlin/src/feature/bedlevel/ubl/G26_Mesh_Validation_Tool.cpp View File

41
 
41
 
42
 #define EXTRUSION_MULTIPLIER 1.0
42
 #define EXTRUSION_MULTIPLIER 1.0
43
 #define RETRACTION_MULTIPLIER 1.0
43
 #define RETRACTION_MULTIPLIER 1.0
44
-#define NOZZLE 0.4
45
-#define FILAMENT 1.75
46
-#define LAYER_HEIGHT 0.2
47
 #define PRIME_LENGTH 10.0
44
 #define PRIME_LENGTH 10.0
48
-#define BED_TEMP 60.0
49
-#define HOTEND_TEMP 205.0
50
 #define OOZE_AMOUNT 0.3
45
 #define OOZE_AMOUNT 0.3
51
 
46
 
52
 #define SIZE_OF_INTERSECTION_CIRCLES 5
47
 #define SIZE_OF_INTERSECTION_CIRCLES 5
623
 
618
 
624
   g26_extrusion_multiplier  = EXTRUSION_MULTIPLIER;
619
   g26_extrusion_multiplier  = EXTRUSION_MULTIPLIER;
625
   g26_retraction_multiplier = RETRACTION_MULTIPLIER;
620
   g26_retraction_multiplier = RETRACTION_MULTIPLIER;
626
-  g26_nozzle                = NOZZLE;
627
-  g26_filament_diameter     = FILAMENT;
628
-  g26_layer_height          = LAYER_HEIGHT;
621
+  g26_nozzle                = DEFAULT_NOZZLE_SIZE;
622
+  g26_filament_diameter     = DEFAULT_NOMINAL_FILAMENT_DIA;
623
+  g26_layer_height          = DEFAULT_LAYER_HEIGHT;
629
   g26_prime_length          = PRIME_LENGTH;
624
   g26_prime_length          = PRIME_LENGTH;
630
-  g26_bed_temp              = BED_TEMP;
631
-  g26_hotend_temp           = HOTEND_TEMP;
625
+  g26_bed_temp              = DEFAULT_BED_TEMP;
626
+  g26_hotend_temp           = DEFAULT_HOTEND_TEMP;
632
   g26_prime_flag            = 0;
627
   g26_prime_flag            = 0;
633
 
628
 
634
   g26_ooze_amount           = parser.linearval('O', OOZE_AMOUNT);
629
   g26_ooze_amount           = parser.linearval('O', OOZE_AMOUNT);

+ 20
- 15
Marlin/src/module/motion.cpp View File

638
    *
638
    *
639
    * Returns true if current_position[] was set to destination[]
639
    * Returns true if current_position[] was set to destination[]
640
    */
640
    */
641
+
641
   inline bool prepare_move_to_destination_cartesian() {
642
   inline bool prepare_move_to_destination_cartesian() {
642
-    if (current_position[X_AXIS] != destination[X_AXIS] || current_position[Y_AXIS] != destination[Y_AXIS]) {
643
-      const float fr_scaled = MMS_SCALED(feedrate_mm_s);
643
+    const float fr_scaled = MMS_SCALED(feedrate_mm_s);
644
       #if HAS_MESH
644
       #if HAS_MESH
645
-        if (planner.leveling_active) {
646
-          #if ENABLED(AUTO_BED_LEVELING_UBL)
647
-            ubl.line_to_destination_cartesian(fr_scaled, active_extruder);
648
-          #elif ENABLED(MESH_BED_LEVELING)
649
-            mesh_line_to_destination(fr_scaled);
650
-          #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
651
-            bilinear_line_to_destination(fr_scaled);
652
-          #endif
653
-          return true;
645
+        if (!planner.leveling_active) {
646
+          line_to_destination(fr_scaled);
647
+          return false;
654
         }
648
         }
649
+        #if ENABLED(AUTO_BED_LEVELING_UBL)
650
+          ubl.line_to_destination_cartesian(fr_scaled, active_extruder);  // UBL's motion routine needs to know about all moves,
651
+          return true;                                                    // even purely Z-Axis moves
652
+        #else
653
+          if (current_position[X_AXIS] != destination[X_AXIS] || current_position[Y_AXIS] != destination[Y_AXIS]) {
654
+            #if ENABLED(MESH_BED_LEVELING)
655
+              mesh_line_to_destination(fr_scaled);
656
+            #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
657
+              bilinear_line_to_destination(fr_scaled);
658
+            #endif
659
+            return true;
660
+          }
661
+          else
662
+            line_to_destination();
663
+        #endif
655
       #endif // HAS_MESH
664
       #endif // HAS_MESH
656
-      line_to_destination(fr_scaled);
657
-    }
658
-    else
659
-      line_to_destination();
660
 
665
 
661
     return false;
666
     return false;
662
   }
667
   }

Loading…
Cancel
Save