ソースを参照

Merge pull request #8410 from thinkyhead/bf2_fix_printrboard_pins

[2.0] Move test extrusion options under G26
Scott Lahteine 7年前
コミット
d8199b5db9
コミッターのメールアドレスに関連付けられたアカウントが存在しません
78個のファイルの変更1593行の追加1985行の削除
  1. 10
    46
      Marlin/Configuration.h
  2. 34
    0
      Marlin/Configuration_adv.h
  3. 10
    46
      Marlin/src/config/default/Configuration.h
  4. 34
    0
      Marlin/src/config/default/Configuration_adv.h
  5. 10
    46
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  6. 34
    0
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
  7. 10
    46
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  8. 10
    46
      Marlin/src/config/examples/Anet/A6/Configuration.h
  9. 34
    0
      Marlin/src/config/examples/Anet/A6/Configuration_adv.h
  10. 10
    46
      Marlin/src/config/examples/Anet/A8/Configuration.h
  11. 34
    0
      Marlin/src/config/examples/Anet/A8/Configuration_adv.h
  12. 10
    46
      Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
  13. 34
    0
      Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
  14. 10
    46
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  15. 34
    0
      Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
  16. 10
    46
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  17. 34
    0
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
  18. 10
    46
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  19. 34
    0
      Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
  20. 10
    46
      Marlin/src/config/examples/Cartesio/Configuration.h
  21. 34
    0
      Marlin/src/config/examples/Cartesio/Configuration_adv.h
  22. 10
    49
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  23. 37
    0
      Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
  24. 10
    46
      Marlin/src/config/examples/Felix/Configuration.h
  25. 34
    0
      Marlin/src/config/examples/Felix/Configuration_adv.h
  26. 10
    46
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  27. 10
    46
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  28. 34
    0
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
  29. 10
    46
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  30. 10
    46
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  31. 10
    46
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  32. 34
    0
      Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
  33. 10
    46
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  34. 34
    0
      Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
  35. 10
    46
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  36. 10
    46
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  37. 34
    0
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
  38. 10
    46
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  39. 34
    0
      Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
  40. 10
    46
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  41. 10
    46
      Marlin/src/config/examples/RigidBot/Configuration.h
  42. 34
    0
      Marlin/src/config/examples/RigidBot/Configuration_adv.h
  43. 10
    46
      Marlin/src/config/examples/SCARA/Configuration.h
  44. 34
    0
      Marlin/src/config/examples/SCARA/Configuration_adv.h
  45. 10
    46
      Marlin/src/config/examples/STM32F10/Configuration.h
  46. 10
    46
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  47. 34
    0
      Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
  48. 10
    46
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  49. 34
    0
      Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
  50. 10
    46
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  51. 34
    0
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
  52. 10
    46
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  53. 34
    0
      Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
  54. 10
    46
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  55. 34
    0
      Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
  56. 10
    46
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  57. 10
    46
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  58. 10
    46
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  59. 34
    0
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
  60. 10
    46
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  61. 34
    0
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
  62. 10
    46
      Marlin/src/config/examples/delta/generic/Configuration.h
  63. 34
    0
      Marlin/src/config/examples/delta/generic/Configuration_adv.h
  64. 10
    46
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  65. 34
    0
      Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
  66. 10
    46
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  67. 34
    0
      Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h
  68. 10
    46
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  69. 34
    0
      Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
  70. 10
    46
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  71. 34
    0
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
  72. 10
    46
      Marlin/src/config/examples/makibox/Configuration.h
  73. 34
    0
      Marlin/src/config/examples/makibox/Configuration_adv.h
  74. 10
    46
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  75. 34
    0
      Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
  76. 10
    46
      Marlin/src/config/examples/wt150/Configuration.h
  77. 34
    0
      Marlin/src/config/examples/wt150/Configuration_adv.h
  78. 4
    4
      Marlin/src/feature/bedlevel/ubl/G26_Mesh_Validation_Tool.cpp

+ 10
- 46
Marlin/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -950,6 +953,13 @@
950 953
   #define UBL_PROBE_PT_3_Y 20
951 954
 
952 955
   //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
956
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
957
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
958
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
959
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
960
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
961
+  #endif
962
+
953 963
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
954 964
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
955 965
 
@@ -1690,50 +1700,4 @@
1690 1700
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1691 1701
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692 1702
 
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
-/**
1706
- * Filament Width Sensor
1707
- *
1708
- * Measures the filament width in real-time and adjusts
1709
- * flow rate to compensate for any irregularities.
1710
- *
1711
- * Also allows the measured filament diameter to set the
1712
- * extrusion rate, so the slicer only has to specify the
1713
- * volume.
1714
- *
1715
- * Only a single extruder is supported at this time.
1716
- *
1717
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1718
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1719
- * 301 RAMBO       : Analog input 3
1720
- *
1721
- * Note: May require analog pins to be defined for other boards.
1722
- */
1723
-//#define FILAMENT_WIDTH_SENSOR
1724
-
1725
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1726
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1727
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1728
-
1729
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1730
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1731
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1732
-
1733
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1734
-
1735
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1736
-  //#define FILAMENT_LCD_DISPLAY
1737
-#endif
1738
-
1739 1703
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/Configuration_adv.h ファイルの表示

@@ -1257,6 +1257,40 @@
1257 1257
 #endif
1258 1258
 
1259 1259
 /**
1260
+ * Filament Width Sensor
1261
+ *
1262
+ * Measures the filament width in real-time and adjusts
1263
+ * flow rate to compensate for any irregularities.
1264
+ *
1265
+ * Also allows the measured filament diameter to set the
1266
+ * extrusion rate, so the slicer only has to specify the
1267
+ * volume.
1268
+ *
1269
+ * Only a single extruder is supported at this time.
1270
+ *
1271
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1272
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1273
+ * 301 RAMBO       : Analog input 3
1274
+ *
1275
+ * Note: May require analog pins to be defined for other boards.
1276
+ */
1277
+//#define FILAMENT_WIDTH_SENSOR
1278
+
1279
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1280
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1281
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1282
+
1283
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1284
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1285
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1286
+
1287
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1288
+
1289
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1290
+  //#define FILAMENT_LCD_DISPLAY
1291
+#endif
1292
+
1293
+/**
1260 1294
  * CNC Coordinate Systems
1261 1295
  *
1262 1296
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/default/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -950,6 +953,13 @@
950 953
   #define UBL_PROBE_PT_3_Y 20
951 954
 
952 955
   //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
956
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
957
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
958
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
959
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
960
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
961
+  #endif
962
+
953 963
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
954 964
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
955 965
 
@@ -1690,50 +1700,4 @@
1690 1700
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1691 1701
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692 1702
 
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
-/**
1706
- * Filament Width Sensor
1707
- *
1708
- * Measures the filament width in real-time and adjusts
1709
- * flow rate to compensate for any irregularities.
1710
- *
1711
- * Also allows the measured filament diameter to set the
1712
- * extrusion rate, so the slicer only has to specify the
1713
- * volume.
1714
- *
1715
- * Only a single extruder is supported at this time.
1716
- *
1717
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1718
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1719
- * 301 RAMBO       : Analog input 3
1720
- *
1721
- * Note: May require analog pins to be defined for other boards.
1722
- */
1723
-//#define FILAMENT_WIDTH_SENSOR
1724
-
1725
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1726
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1727
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1728
-
1729
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1730
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1731
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1732
-
1733
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1734
-
1735
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1736
-  //#define FILAMENT_LCD_DISPLAY
1737
-#endif
1738
-
1739 1703
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/default/Configuration_adv.h ファイルの表示

@@ -1257,6 +1257,40 @@
1257 1257
 #endif
1258 1258
 
1259 1259
 /**
1260
+ * Filament Width Sensor
1261
+ *
1262
+ * Measures the filament width in real-time and adjusts
1263
+ * flow rate to compensate for any irregularities.
1264
+ *
1265
+ * Also allows the measured filament diameter to set the
1266
+ * extrusion rate, so the slicer only has to specify the
1267
+ * volume.
1268
+ *
1269
+ * Only a single extruder is supported at this time.
1270
+ *
1271
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1272
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1273
+ * 301 RAMBO       : Analog input 3
1274
+ *
1275
+ * Note: May require analog pins to be defined for other boards.
1276
+ */
1277
+//#define FILAMENT_WIDTH_SENSOR
1278
+
1279
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1280
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1281
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1282
+
1283
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1284
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1285
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1286
+
1287
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1288
+
1289
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1290
+  //#define FILAMENT_LCD_DISPLAY
1291
+#endif
1292
+
1293
+/**
1260 1294
  * CNC Coordinate Systems
1261 1295
  *
1262 1296
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -970,6 +973,13 @@
970 973
   #define UBL_PROBE_PT_3_Y 20
971 974
 
972 975
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
976
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
977
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
978
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
979
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
980
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
981
+  #endif
982
+
973 983
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
974 984
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
975 985
 
@@ -1710,50 +1720,4 @@
1710 1720
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1711 1721
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1712 1722
 
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
-/**
1726
- * Filament Width Sensor
1727
- *
1728
- * Measures the filament width in real-time and adjusts
1729
- * flow rate to compensate for any irregularities.
1730
- *
1731
- * Also allows the measured filament diameter to set the
1732
- * extrusion rate, so the slicer only has to specify the
1733
- * volume.
1734
- *
1735
- * Only a single extruder is supported at this time.
1736
- *
1737
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1738
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1739
- * 301 RAMBO       : Analog input 3
1740
- *
1741
- * Note: May require analog pins to be defined for other boards.
1742
- */
1743
-//#define FILAMENT_WIDTH_SENSOR
1744
-
1745
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1746
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1747
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1748
-
1749
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1750
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1751
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1752
-
1753
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1754
-
1755
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1756
-  //#define FILAMENT_LCD_DISPLAY
1757
-#endif
1758
-
1759 1723
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -950,6 +953,13 @@
950 953
   #define UBL_PROBE_PT_3_Y 20
951 954
 
952 955
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
956
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
957
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
958
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
959
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
960
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
961
+  #endif
962
+
953 963
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
954 964
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
955 965
 
@@ -1690,50 +1700,4 @@
1690 1700
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1691 1701
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692 1702
 
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
-/**
1706
- * Filament Width Sensor
1707
- *
1708
- * Measures the filament width in real-time and adjusts
1709
- * flow rate to compensate for any irregularities.
1710
- *
1711
- * Also allows the measured filament diameter to set the
1712
- * extrusion rate, so the slicer only has to specify the
1713
- * volume.
1714
- *
1715
- * Only a single extruder is supported at this time.
1716
- *
1717
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1718
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1719
- * 301 RAMBO       : Analog input 3
1720
- *
1721
- * Note: May require analog pins to be defined for other boards.
1722
- */
1723
-//#define FILAMENT_WIDTH_SENSOR
1724
-
1725
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1726
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1727
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1728
-
1729
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1730
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1731
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1732
-
1733
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1734
-
1735
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1736
-  //#define FILAMENT_LCD_DISPLAY
1737
-#endif
1738
-
1739 1703
 #endif // CONFIGURATION_H

+ 10
- 46
Marlin/src/config/examples/Anet/A6/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -1093,6 +1096,13 @@
1093 1096
   #define UBL_PROBE_PT_3_Y 20
1094 1097
 
1095 1098
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
1099
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
1100
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
1101
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
1102
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
1103
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
1104
+  #endif
1105
+
1096 1106
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
1097 1107
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
1098 1108
 
@@ -1849,50 +1859,4 @@
1849 1859
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1850 1860
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1851 1861
 
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
-/**
1865
- * Filament Width Sensor
1866
- *
1867
- * Measures the filament width in real-time and adjusts
1868
- * flow rate to compensate for any irregularities.
1869
- *
1870
- * Also allows the measured filament diameter to set the
1871
- * extrusion rate, so the slicer only has to specify the
1872
- * volume.
1873
- *
1874
- * Only a single extruder is supported at this time.
1875
- *
1876
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1877
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1878
- * 301 RAMBO       : Analog input 3
1879
- *
1880
- * Note: May require analog pins to be defined for other boards.
1881
- */
1882
-//#define FILAMENT_WIDTH_SENSOR
1883
-
1884
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1885
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1886
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1887
-
1888
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1889
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1890
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1891
-
1892
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1893
-
1894
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1895
-  //#define FILAMENT_LCD_DISPLAY
1896
-#endif
1897
-
1898 1862
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/Anet/A6/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/Anet/A8/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -956,6 +959,13 @@
956 959
   #define UBL_PROBE_PT_3_Y 20
957 960
 
958 961
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
962
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
963
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
964
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
965
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
966
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
967
+  #endif
968
+
959 969
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
960 970
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
961 971
 
@@ -1698,50 +1708,4 @@
1698 1708
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1699 1709
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1700 1710
 
1701
-/**
1702
- * Default extrusion settings
1703
- *
1704
- * These settings control basic extrusion from within the Marlin firmware.
1705
- *
1706
- */
1707
-#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.
1708
-#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1709
-#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1710
-#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.
1711
-#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.
1712
-
1713
-/**
1714
- * Filament Width Sensor
1715
- *
1716
- * Measures the filament width in real-time and adjusts
1717
- * flow rate to compensate for any irregularities.
1718
- *
1719
- * Also allows the measured filament diameter to set the
1720
- * extrusion rate, so the slicer only has to specify the
1721
- * volume.
1722
- *
1723
- * Only a single extruder is supported at this time.
1724
- *
1725
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1726
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1727
- * 301 RAMBO       : Analog input 3
1728
- *
1729
- * Note: May require analog pins to be defined for other boards.
1730
- */
1731
-//#define FILAMENT_WIDTH_SENSOR
1732
-
1733
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1734
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1735
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1736
-
1737
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1738
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1739
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1740
-
1741
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1742
-
1743
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1744
-  //#define FILAMENT_LCD_DISPLAY
1745
-#endif
1746
-
1747 1711
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/Anet/A8/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 2
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -950,6 +953,13 @@
950 953
   #define UBL_PROBE_PT_3_Y 20
951 954
 
952 955
   //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
956
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
957
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
958
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
959
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
960
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
961
+  #endif
962
+
953 963
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
954 964
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
955 965
 
@@ -1685,50 +1695,4 @@
1685 1695
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1686 1696
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1687 1697
 
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
-
1700
-/**
1701
- * Filament Width Sensor
1702
- *
1703
- * Measures the filament width in real-time and adjusts
1704
- * flow rate to compensate for any irregularities.
1705
- *
1706
- * Also allows the measured filament diameter to set the
1707
- * extrusion rate, so the slicer only has to specify the
1708
- * volume.
1709
- *
1710
- * Only a single extruder is supported at this time.
1711
- *
1712
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1713
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1714
- * 301 RAMBO       : Analog input 3
1715
- *
1716
- * Note: May require analog pins to be defined for other boards.
1717
- */
1718
-//#define FILAMENT_WIDTH_SENSOR
1719
-
1720
-#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)
1722
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1723
-
1724
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1725
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1726
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1727
-
1728
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1729
-
1730
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1731
-  //#define FILAMENT_LCD_DISPLAY
1732
-#endif
1733
-
1734 1698
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h ファイルの表示

@@ -1258,6 +1258,40 @@
1258 1258
 #endif
1259 1259
 
1260 1260
 /**
1261
+ * Filament Width Sensor
1262
+ *
1263
+ * Measures the filament width in real-time and adjusts
1264
+ * flow rate to compensate for any irregularities.
1265
+ *
1266
+ * Also allows the measured filament diameter to set the
1267
+ * extrusion rate, so the slicer only has to specify the
1268
+ * volume.
1269
+ *
1270
+ * Only a single extruder is supported at this time.
1271
+ *
1272
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1273
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1274
+ * 301 RAMBO       : Analog input 3
1275
+ *
1276
+ * Note: May require analog pins to be defined for other boards.
1277
+ */
1278
+//#define FILAMENT_WIDTH_SENSOR
1279
+
1280
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1281
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1282
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1283
+
1284
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1285
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1286
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1287
+
1288
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1289
+
1290
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1291
+  //#define FILAMENT_LCD_DISPLAY
1292
+#endif
1293
+
1294
+/**
1261 1295
  * CNC Coordinate Systems
1262 1296
  *
1263 1297
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/BQ/Hephestos/Configuration.h ファイルの表示

@@ -139,6 +139,9 @@
139 139
 // :[1, 2, 3, 4, 5]
140 140
 #define EXTRUDERS 1
141 141
 
142
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
143
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
144
+
142 145
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
143 146
 //#define SINGLENOZZLE
144 147
 
@@ -941,6 +944,13 @@
941 944
   #define UBL_PROBE_PT_3_Y 20
942 945
 
943 946
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
947
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
948
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
949
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
950
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
951
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
952
+  #endif
953
+
944 954
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
945 955
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
946 956
 
@@ -1681,50 +1691,4 @@
1681 1691
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1682 1692
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1683 1693
 
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
-/**
1697
- * Filament Width Sensor
1698
- *
1699
- * Measures the filament width in real-time and adjusts
1700
- * flow rate to compensate for any irregularities.
1701
- *
1702
- * Also allows the measured filament diameter to set the
1703
- * extrusion rate, so the slicer only has to specify the
1704
- * volume.
1705
- *
1706
- * Only a single extruder is supported at this time.
1707
- *
1708
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1709
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1710
- * 301 RAMBO       : Analog input 3
1711
- *
1712
- * Note: May require analog pins to be defined for other boards.
1713
- */
1714
-//#define FILAMENT_WIDTH_SENSOR
1715
-
1716
-#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)
1718
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1719
-
1720
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1721
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1722
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1723
-
1724
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1725
-
1726
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1727
-  //#define FILAMENT_LCD_DISPLAY
1728
-#endif
1729
-
1730 1694
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h ファイルの表示

@@ -135,6 +135,9 @@
135 135
 // :[1, 2, 3, 4, 5]
136 136
 #define EXTRUDERS 1
137 137
 
138
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
139
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
140
+
138 141
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
139 142
 //#define SINGLENOZZLE
140 143
 
@@ -951,6 +954,13 @@
951 954
   #define UBL_PROBE_PT_3_Y 20
952 955
 
953 956
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
957
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
958
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
959
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
960
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
961
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
962
+  #endif
963
+
954 964
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
955 965
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
956 966
 
@@ -1691,50 +1701,4 @@
1691 1701
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1692 1702
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1693 1703
 
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
-/**
1707
- * Filament Width Sensor
1708
- *
1709
- * Measures the filament width in real-time and adjusts
1710
- * flow rate to compensate for any irregularities.
1711
- *
1712
- * Also allows the measured filament diameter to set the
1713
- * extrusion rate, so the slicer only has to specify the
1714
- * volume.
1715
- *
1716
- * Only a single extruder is supported at this time.
1717
- *
1718
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1719
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1720
- * 301 RAMBO       : Analog input 3
1721
- *
1722
- * Note: May require analog pins to be defined for other boards.
1723
- */
1724
-//#define FILAMENT_WIDTH_SENSOR
1725
-
1726
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1727
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1728
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1729
-
1730
-  #define MEASURED_UPPER_LIMIT         2.00 // (mm) Upper limit used to validate sensor reading
1731
-  #define MEASURED_LOWER_LIMIT         1.60 // (mm) Lower limit used to validate sensor reading
1732
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1733
-
1734
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1735
-
1736
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1737
-  //#define FILAMENT_LCD_DISPLAY
1738
-#endif
1739
-
1740 1704
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h ファイルの表示

@@ -1253,6 +1253,40 @@
1253 1253
 #endif
1254 1254
 
1255 1255
 /**
1256
+ * Filament Width Sensor
1257
+ *
1258
+ * Measures the filament width in real-time and adjusts
1259
+ * flow rate to compensate for any irregularities.
1260
+ *
1261
+ * Also allows the measured filament diameter to set the
1262
+ * extrusion rate, so the slicer only has to specify the
1263
+ * volume.
1264
+ *
1265
+ * Only a single extruder is supported at this time.
1266
+ *
1267
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1268
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1269
+ * 301 RAMBO       : Analog input 3
1270
+ *
1271
+ * Note: May require analog pins to be defined for other boards.
1272
+ */
1273
+//#define FILAMENT_WIDTH_SENSOR
1274
+
1275
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1276
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1277
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1278
+
1279
+  #define MEASURED_UPPER_LIMIT         2.00 // (mm) Upper limit used to validate sensor reading
1280
+  #define MEASURED_LOWER_LIMIT         1.60 // (mm) Lower limit used to validate sensor reading
1281
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1282
+
1283
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1284
+
1285
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1286
+  //#define FILAMENT_LCD_DISPLAY
1287
+#endif
1288
+
1289
+/**
1256 1290
  * CNC Coordinate Systems
1257 1291
  *
1258 1292
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/BQ/WITBOX/Configuration.h ファイルの表示

@@ -139,6 +139,9 @@
139 139
 // :[1, 2, 3, 4, 5]
140 140
 #define EXTRUDERS 1
141 141
 
142
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
143
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
144
+
142 145
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
143 146
 //#define SINGLENOZZLE
144 147
 
@@ -941,6 +944,13 @@
941 944
   #define UBL_PROBE_PT_3_Y 20
942 945
 
943 946
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
947
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
948
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
949
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
950
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
951
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
952
+  #endif
953
+
944 954
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
945 955
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
946 956
 
@@ -1681,50 +1691,4 @@
1681 1691
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1682 1692
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1683 1693
 
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
-/**
1697
- * Filament Width Sensor
1698
- *
1699
- * Measures the filament width in real-time and adjusts
1700
- * flow rate to compensate for any irregularities.
1701
- *
1702
- * Also allows the measured filament diameter to set the
1703
- * extrusion rate, so the slicer only has to specify the
1704
- * volume.
1705
- *
1706
- * Only a single extruder is supported at this time.
1707
- *
1708
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1709
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1710
- * 301 RAMBO       : Analog input 3
1711
- *
1712
- * Note: May require analog pins to be defined for other boards.
1713
- */
1714
-//#define FILAMENT_WIDTH_SENSOR
1715
-
1716
-#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)
1718
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1719
-
1720
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1721
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1722
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1723
-
1724
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1725
-
1726
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1727
-  //#define FILAMENT_LCD_DISPLAY
1728
-#endif
1729
-
1730 1694
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/Cartesio/Configuration.h ファイルの表示

@@ -137,6 +137,9 @@
137 137
 // :[1, 2, 3, 4, 5]
138 138
 #define EXTRUDERS 3
139 139
 
140
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
141
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
142
+
140 143
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
141 144
 //#define SINGLENOZZLE
142 145
 
@@ -949,6 +952,13 @@
949 952
   #define UBL_PROBE_PT_3_Y 20
950 953
 
951 954
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
955
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
956
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
957
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
958
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
959
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
960
+  #endif
961
+
952 962
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
953 963
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
954 964
 
@@ -1689,50 +1699,4 @@
1689 1699
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1690 1700
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1691 1701
 
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
-/**
1705
- * Filament Width Sensor
1706
- *
1707
- * Measures the filament width in real-time and adjusts
1708
- * flow rate to compensate for any irregularities.
1709
- *
1710
- * Also allows the measured filament diameter to set the
1711
- * extrusion rate, so the slicer only has to specify the
1712
- * volume.
1713
- *
1714
- * Only a single extruder is supported at this time.
1715
- *
1716
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1717
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1718
- * 301 RAMBO       : Analog input 3
1719
- *
1720
- * Note: May require analog pins to be defined for other boards.
1721
- */
1722
-//#define FILAMENT_WIDTH_SENSOR
1723
-
1724
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1725
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1726
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1727
-
1728
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1729
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1730
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1731
-
1732
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1733
-
1734
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1735
-  //#define FILAMENT_LCD_DISPLAY
1736
-#endif
1737
-
1738 1702
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/Cartesio/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 49
Marlin/src/config/examples/Creality/CR-10/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -960,6 +963,13 @@
960 963
   #define UBL_PROBE_PT_3_Y 20
961 964
 
962 965
   //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
966
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
967
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
968
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
969
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
970
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
971
+  #endif
972
+
963 973
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
964 974
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
965 975
 
@@ -1700,53 +1710,4 @@
1700 1710
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1701 1711
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1702 1712
 
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
-/**
1716
- * Filament Width Sensor
1717
- *
1718
- * Measures the filament width in real-time and adjusts
1719
- * flow rate to compensate for any irregularities.
1720
- *
1721
- * Also allows the measured filament diameter to set the
1722
- * extrusion rate, so the slicer only has to specify the
1723
- * volume.
1724
- *
1725
- * Only a single extruder is supported at this time.
1726
- *
1727
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1728
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1729
- * 301 RAMBO       : Analog input 3
1730
- *
1731
- * Note: May require analog pins to be defined for other boards.
1732
- */
1733
-//#define FILAMENT_WIDTH_SENSOR
1734
-
1735
-#define DEFAULT_STDDEV_FILAMENT_DIA 0.05    // Typical estimate for cheap filament
1736
-//#define DEFAULT_STDDEV_FILAMENT_DIA 0.02  // Typical advertised for higher quality filament
1737
-
1738
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1739
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1740
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1741
-
1742
-  #define MEASURED_UPPER_LIMIT        (DEFAULT_NOMINAL_FILAMENT_DIA+4*DEFAULT_STDDEV_FILAMENT_DIA) // (mm) Upper limit used to validate sensor reading
1743
-  #define MEASURED_LOWER_LIMIT        (DEFAULT_NOMINAL_FILAMENT_DIA-4*DEFAULT_STDDEV_FILAMENT_DIA) // (mm) Lower limit used to validate sensor reading
1744
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1745
-
1746
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1747
-
1748
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1749
-  //#define FILAMENT_LCD_DISPLAY
1750
-#endif
1751
-
1752 1713
 #endif // CONFIGURATION_H

+ 37
- 0
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,43 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#define DEFAULT_STDDEV_FILAMENT_DIA 0.05    // Typical estimate for cheap filament
1279
+//#define DEFAULT_STDDEV_FILAMENT_DIA 0.02  // Typical advertised for higher quality filament
1280
+
1281
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1282
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1283
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1284
+
1285
+  #define MEASURED_UPPER_LIMIT        (DEFAULT_NOMINAL_FILAMENT_DIA+4*DEFAULT_STDDEV_FILAMENT_DIA) // (mm) Upper limit used to validate sensor reading
1286
+  #define MEASURED_LOWER_LIMIT        (DEFAULT_NOMINAL_FILAMENT_DIA-4*DEFAULT_STDDEV_FILAMENT_DIA) // (mm) Lower limit used to validate sensor reading
1287
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1288
+
1289
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1290
+
1291
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1292
+  //#define FILAMENT_LCD_DISPLAY
1293
+#endif
1294
+
1295
+/**
1259 1296
  * CNC Coordinate Systems
1260 1297
  *
1261 1298
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/Felix/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -932,6 +935,13 @@
932 935
   #define UBL_PROBE_PT_3_Y 20
933 936
 
934 937
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
938
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
939
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
940
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
941
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
942
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
943
+  #endif
944
+
935 945
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
936 946
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
937 947
 
@@ -1672,50 +1682,4 @@
1672 1682
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1673 1683
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1674 1684
 
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
-/**
1688
- * Filament Width Sensor
1689
- *
1690
- * Measures the filament width in real-time and adjusts
1691
- * flow rate to compensate for any irregularities.
1692
- *
1693
- * Also allows the measured filament diameter to set the
1694
- * extrusion rate, so the slicer only has to specify the
1695
- * volume.
1696
- *
1697
- * Only a single extruder is supported at this time.
1698
- *
1699
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1700
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1701
- * 301 RAMBO       : Analog input 3
1702
- *
1703
- * Note: May require analog pins to be defined for other boards.
1704
- */
1705
-//#define FILAMENT_WIDTH_SENSOR
1706
-
1707
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1708
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1709
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1710
-
1711
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1712
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1713
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1714
-
1715
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1716
-
1717
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1718
-  //#define FILAMENT_LCD_DISPLAY
1719
-#endif
1720
-
1721 1685
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/Felix/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/Felix/DUAL/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 2
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -932,6 +935,13 @@
932 935
   #define UBL_PROBE_PT_3_Y 20
933 936
 
934 937
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
938
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
939
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
940
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
941
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
942
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
943
+  #endif
944
+
935 945
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
936 946
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
937 947
 
@@ -1672,50 +1682,4 @@
1672 1682
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1673 1683
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1674 1684
 
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
-/**
1688
- * Filament Width Sensor
1689
- *
1690
- * Measures the filament width in real-time and adjusts
1691
- * flow rate to compensate for any irregularities.
1692
- *
1693
- * Also allows the measured filament diameter to set the
1694
- * extrusion rate, so the slicer only has to specify the
1695
- * volume.
1696
- *
1697
- * Only a single extruder is supported at this time.
1698
- *
1699
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1700
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1701
- * 301 RAMBO       : Analog input 3
1702
- *
1703
- * Note: May require analog pins to be defined for other boards.
1704
- */
1705
-//#define FILAMENT_WIDTH_SENSOR
1706
-
1707
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1708
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1709
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1710
-
1711
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1712
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1713
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1714
-
1715
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1716
-
1717
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1718
-  //#define FILAMENT_LCD_DISPLAY
1719
-#endif
1720
-
1721 1685
 #endif // CONFIGURATION_H

+ 10
- 46
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h ファイルの表示

@@ -137,6 +137,9 @@
137 137
 // :[1, 2, 3, 4, 5]
138 138
 #define EXTRUDERS 1
139 139
 
140
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
141
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
142
+
140 143
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
141 144
 //#define SINGLENOZZLE
142 145
 
@@ -947,6 +950,13 @@
947 950
   #define UBL_PROBE_PT_3_Y 25
948 951
 
949 952
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
953
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
954
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
955
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
956
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
957
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
958
+  #endif
959
+
950 960
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
951 961
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
952 962
 
@@ -1687,50 +1697,4 @@
1687 1697
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1688 1698
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1689 1699
 
1690
-/**
1691
- * Default extrusion settings
1692
- *
1693
- * These settings control basic extrusion from within the Marlin firmware.
1694
- *
1695
- */
1696
-#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.
1697
-#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1698
-#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1699
-#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.
1700
-#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.
1701
-
1702
-/**
1703
- * Filament Width Sensor
1704
- *
1705
- * Measures the filament width in real-time and adjusts
1706
- * flow rate to compensate for any irregularities.
1707
- *
1708
- * Also allows the measured filament diameter to set the
1709
- * extrusion rate, so the slicer only has to specify the
1710
- * volume.
1711
- *
1712
- * Only a single extruder is supported at this time.
1713
- *
1714
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1715
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1716
- * 301 RAMBO       : Analog input 3
1717
- *
1718
- * Note: May require analog pins to be defined for other boards.
1719
- */
1720
-//#define FILAMENT_WIDTH_SENSOR
1721
-
1722
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1723
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1724
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1725
-
1726
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1727
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1728
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1729
-
1730
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1731
-
1732
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1733
-  //#define FILAMENT_LCD_DISPLAY
1734
-#endif
1735
-
1736 1700
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h ファイルの表示

@@ -1257,6 +1257,40 @@
1257 1257
 #endif
1258 1258
 
1259 1259
 /**
1260
+ * Filament Width Sensor
1261
+ *
1262
+ * Measures the filament width in real-time and adjusts
1263
+ * flow rate to compensate for any irregularities.
1264
+ *
1265
+ * Also allows the measured filament diameter to set the
1266
+ * extrusion rate, so the slicer only has to specify the
1267
+ * volume.
1268
+ *
1269
+ * Only a single extruder is supported at this time.
1270
+ *
1271
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1272
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1273
+ * 301 RAMBO       : Analog input 3
1274
+ *
1275
+ * Note: May require analog pins to be defined for other boards.
1276
+ */
1277
+//#define FILAMENT_WIDTH_SENSOR
1278
+
1279
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1280
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1281
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1282
+
1283
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1284
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1285
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1286
+
1287
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1288
+
1289
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1290
+  //#define FILAMENT_LCD_DISPLAY
1291
+#endif
1292
+
1293
+/**
1260 1294
  * CNC Coordinate Systems
1261 1295
  *
1262 1296
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -965,6 +968,13 @@
965 968
   #define UBL_PROBE_PT_3_Y 20
966 969
 
967 970
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
971
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
972
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
973
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
974
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
975
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
976
+  #endif
977
+
968 978
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
969 979
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
970 980
 
@@ -1706,52 +1716,6 @@
1706 1716
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1707 1717
 
1708 1718
 /**
1709
- * Default extrusion settings
1710
- *
1711
- * These settings control basic extrusion from within the Marlin firmware.
1712
- *
1713
- */
1714
-#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.
1715
-#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1716
-#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1717
-#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.
1718
-#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.
1719
-
1720
-/**
1721
- * Filament Width Sensor
1722
- *
1723
- * Measures the filament width in real-time and adjusts
1724
- * flow rate to compensate for any irregularities.
1725
- *
1726
- * Also allows the measured filament diameter to set the
1727
- * extrusion rate, so the slicer only has to specify the
1728
- * volume.
1729
- *
1730
- * Only a single extruder is supported at this time.
1731
- *
1732
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1733
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1734
- * 301 RAMBO       : Analog input 3
1735
- *
1736
- * Note: May require analog pins to be defined for other boards.
1737
- */
1738
-//#define FILAMENT_WIDTH_SENSOR
1739
-
1740
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1741
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1742
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1743
-
1744
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1745
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1746
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1747
-
1748
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1749
-
1750
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1751
-  //#define FILAMENT_LCD_DISPLAY
1752
-#endif
1753
-
1754
-/**
1755 1719
  * Customize common displays for GT2560
1756 1720
  */
1757 1721
 #if ENABLED(ULTIMAKERCONTROLLER) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) || ENABLED(MKS_MINI_12864)

+ 10
- 46
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -950,6 +953,13 @@
950 953
   #define UBL_PROBE_PT_3_Y 20
951 954
 
952 955
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
956
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
957
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
958
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
959
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
960
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
961
+  #endif
962
+
953 963
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
954 964
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
955 965
 
@@ -1690,50 +1700,4 @@
1690 1700
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1691 1701
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692 1702
 
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
-/**
1706
- * Filament Width Sensor
1707
- *
1708
- * Measures the filament width in real-time and adjusts
1709
- * flow rate to compensate for any irregularities.
1710
- *
1711
- * Also allows the measured filament diameter to set the
1712
- * extrusion rate, so the slicer only has to specify the
1713
- * volume.
1714
- *
1715
- * Only a single extruder is supported at this time.
1716
- *
1717
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1718
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1719
- * 301 RAMBO       : Analog input 3
1720
- *
1721
- * Note: May require analog pins to be defined for other boards.
1722
- */
1723
-//#define FILAMENT_WIDTH_SENSOR
1724
-
1725
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1726
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1727
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1728
-
1729
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1730
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1731
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1732
-
1733
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1734
-
1735
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1736
-  //#define FILAMENT_LCD_DISPLAY
1737
-#endif
1738
-
1739 1703
 #endif // CONFIGURATION_H

+ 10
- 46
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -954,6 +957,13 @@
954 957
   #define UBL_PROBE_PT_3_Y 20
955 958
 
956 959
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
960
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
961
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
962
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
963
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
964
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
965
+  #endif
966
+
957 967
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
958 968
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
959 969
 
@@ -1694,50 +1704,4 @@
1694 1704
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1695 1705
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1696 1706
 
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
-/**
1710
- * Filament Width Sensor
1711
- *
1712
- * Measures the filament width in real-time and adjusts
1713
- * flow rate to compensate for any irregularities.
1714
- *
1715
- * Also allows the measured filament diameter to set the
1716
- * extrusion rate, so the slicer only has to specify the
1717
- * volume.
1718
- *
1719
- * Only a single extruder is supported at this time.
1720
- *
1721
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1722
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1723
- * 301 RAMBO       : Analog input 3
1724
- *
1725
- * Note: May require analog pins to be defined for other boards.
1726
- */
1727
-//#define FILAMENT_WIDTH_SENSOR
1728
-
1729
-#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)
1731
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1732
-
1733
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1734
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1735
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1736
-
1737
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1738
-
1739
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1740
-  //#define FILAMENT_LCD_DISPLAY
1741
-#endif
1742
-
1743 1707
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/Malyan/M150/Configuration.h ファイルの表示

@@ -141,6 +141,9 @@
141 141
 // :[1, 2, 3, 4, 5]
142 142
 #define EXTRUDERS 1
143 143
 
144
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
145
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
146
+
144 147
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
145 148
 //#define SINGLENOZZLE
146 149
 
@@ -978,6 +981,13 @@
978 981
   #define UBL_PROBE_PT_3_Y 20
979 982
 
980 983
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
984
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
985
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
986
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
987
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
988
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
989
+  #endif
990
+
981 991
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
982 992
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
983 993
 
@@ -1718,50 +1728,4 @@
1718 1728
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1719 1729
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1720 1730
 
1721
-/**
1722
- * Default extrusion settings
1723
- *
1724
- * These settings control basic extrusion from within the Marlin firmware.
1725
- *
1726
- */
1727
-#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.
1728
-#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1729
-#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1730
-#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.
1731
-#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.
1732
-
1733
-/**
1734
- * Filament Width Sensor
1735
- *
1736
- * Measures the filament width in real-time and adjusts
1737
- * flow rate to compensate for any irregularities.
1738
- *
1739
- * Also allows the measured filament diameter to set the
1740
- * extrusion rate, so the slicer only has to specify the
1741
- * volume.
1742
- *
1743
- * Only a single extruder is supported at this time.
1744
- *
1745
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1746
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1747
- * 301 RAMBO       : Analog input 3
1748
- *
1749
- * Note: May require analog pins to be defined for other boards.
1750
- */
1751
-//#define FILAMENT_WIDTH_SENSOR
1752
-
1753
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1754
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1755
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1756
-
1757
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1758
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1759
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1760
-
1761
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1762
-
1763
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1764
-  //#define FILAMENT_LCD_DISPLAY
1765
-#endif
1766
-
1767 1731
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h ファイルの表示

@@ -1250,6 +1250,40 @@
1250 1250
 #endif
1251 1251
 
1252 1252
 /**
1253
+ * Filament Width Sensor
1254
+ *
1255
+ * Measures the filament width in real-time and adjusts
1256
+ * flow rate to compensate for any irregularities.
1257
+ *
1258
+ * Also allows the measured filament diameter to set the
1259
+ * extrusion rate, so the slicer only has to specify the
1260
+ * volume.
1261
+ *
1262
+ * Only a single extruder is supported at this time.
1263
+ *
1264
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1265
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1266
+ * 301 RAMBO       : Analog input 3
1267
+ *
1268
+ * Note: May require analog pins to be defined for other boards.
1269
+ */
1270
+//#define FILAMENT_WIDTH_SENSOR
1271
+
1272
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1273
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1274
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1275
+
1276
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1277
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1278
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1279
+
1280
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1281
+
1282
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1283
+  //#define FILAMENT_LCD_DISPLAY
1284
+#endif
1285
+
1286
+/**
1253 1287
  * CNC Coordinate Systems
1254 1288
  *
1255 1289
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -954,6 +957,13 @@
954 957
   #define UBL_PROBE_PT_3_Y 20
955 958
 
956 959
   //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
960
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
961
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
962
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
963
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
964
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
965
+  #endif
966
+
957 967
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
958 968
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
959 969
 
@@ -1694,50 +1704,4 @@
1694 1704
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1695 1705
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1696 1706
 
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
-/**
1710
- * Filament Width Sensor
1711
- *
1712
- * Measures the filament width in real-time and adjusts
1713
- * flow rate to compensate for any irregularities.
1714
- *
1715
- * Also allows the measured filament diameter to set the
1716
- * extrusion rate, so the slicer only has to specify the
1717
- * volume.
1718
- *
1719
- * Only a single extruder is supported at this time.
1720
- *
1721
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1722
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1723
- * 301 RAMBO       : Analog input 3
1724
- *
1725
- * Note: May require analog pins to be defined for other boards.
1726
- */
1727
-//#define FILAMENT_WIDTH_SENSOR
1728
-
1729
-#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)
1731
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1732
-
1733
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1734
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1735
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1736
-
1737
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1738
-
1739
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1740
-  //#define FILAMENT_LCD_DISPLAY
1741
-#endif
1742
-
1743 1707
 #endif // CONFIGURATION_H

+ 10
- 46
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -954,6 +957,13 @@
954 957
   #define UBL_PROBE_PT_3_Y 20
955 958
 
956 959
   //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
960
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
961
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
962
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
963
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
964
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
965
+  #endif
966
+
957 967
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
958 968
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
959 969
 
@@ -1694,50 +1704,4 @@
1694 1704
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1695 1705
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1696 1706
 
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
-/**
1710
- * Filament Width Sensor
1711
- *
1712
- * Measures the filament width in real-time and adjusts
1713
- * flow rate to compensate for any irregularities.
1714
- *
1715
- * Also allows the measured filament diameter to set the
1716
- * extrusion rate, so the slicer only has to specify the
1717
- * volume.
1718
- *
1719
- * Only a single extruder is supported at this time.
1720
- *
1721
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1722
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1723
- * 301 RAMBO       : Analog input 3
1724
- *
1725
- * Note: May require analog pins to be defined for other boards.
1726
- */
1727
-//#define FILAMENT_WIDTH_SENSOR
1728
-
1729
-#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)
1731
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1732
-
1733
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1734
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1735
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1736
-
1737
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1738
-
1739
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1740
-  //#define FILAMENT_LCD_DISPLAY
1741
-#endif
1742
-
1743 1707
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h ファイルの表示

@@ -1260,6 +1260,40 @@
1260 1260
 #endif
1261 1261
 
1262 1262
 /**
1263
+ * Filament Width Sensor
1264
+ *
1265
+ * Measures the filament width in real-time and adjusts
1266
+ * flow rate to compensate for any irregularities.
1267
+ *
1268
+ * Also allows the measured filament diameter to set the
1269
+ * extrusion rate, so the slicer only has to specify the
1270
+ * volume.
1271
+ *
1272
+ * Only a single extruder is supported at this time.
1273
+ *
1274
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1275
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1276
+ * 301 RAMBO       : Analog input 3
1277
+ *
1278
+ * Note: May require analog pins to be defined for other boards.
1279
+ */
1280
+//#define FILAMENT_WIDTH_SENSOR
1281
+
1282
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1283
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1284
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1285
+
1286
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1287
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1288
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1289
+
1290
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1291
+
1292
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1293
+  //#define FILAMENT_LCD_DISPLAY
1294
+#endif
1295
+
1296
+/**
1263 1297
  * CNC Coordinate Systems
1264 1298
  *
1265 1299
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/Mks/Sbase/Configuration.h ファイルの表示

@@ -137,6 +137,9 @@
137 137
 // :[1, 2, 3, 4, 5]
138 138
 #define EXTRUDERS 1
139 139
 
140
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
141
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
142
+
140 143
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
141 144
 //#define SINGLENOZZLE
142 145
 
@@ -951,6 +954,13 @@
951 954
   #define UBL_PROBE_PT_3_Y 20
952 955
 
953 956
   //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
957
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
958
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
959
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
960
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
961
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
962
+  #endif
963
+
954 964
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
955 965
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
956 966
 
@@ -1665,50 +1675,4 @@
1665 1675
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1666 1676
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1667 1677
 
1668
-/**
1669
- * Default extrusion settings
1670
- *
1671
- * These settings control basic extrusion from within the Marlin firmware.
1672
- *
1673
- */
1674
-#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.
1675
-#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1676
-#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1677
-#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.
1678
-#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.
1679
-
1680
-/**
1681
- * Filament Width Sensor
1682
- *
1683
- * Measures the filament width in real-time and adjusts
1684
- * flow rate to compensate for any irregularities.
1685
- *
1686
- * Also allows the measured filament diameter to set the
1687
- * extrusion rate, so the slicer only has to specify the
1688
- * volume.
1689
- *
1690
- * Only a single extruder is supported at this time.
1691
- *
1692
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1693
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1694
- * 301 RAMBO       : Analog input 3
1695
- *
1696
- * Note: May require analog pins to be defined for other boards.
1697
- */
1698
-//#define FILAMENT_WIDTH_SENSOR
1699
-
1700
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1701
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1702
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1703
-
1704
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1705
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1706
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1707
-
1708
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1709
-
1710
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1711
-  //#define FILAMENT_LCD_DISPLAY
1712
-#endif
1713
-
1714 1678
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h ファイルの表示

@@ -1278,6 +1278,40 @@
1278 1278
 #endif
1279 1279
 
1280 1280
 /**
1281
+ * Filament Width Sensor
1282
+ *
1283
+ * Measures the filament width in real-time and adjusts
1284
+ * flow rate to compensate for any irregularities.
1285
+ *
1286
+ * Also allows the measured filament diameter to set the
1287
+ * extrusion rate, so the slicer only has to specify the
1288
+ * volume.
1289
+ *
1290
+ * Only a single extruder is supported at this time.
1291
+ *
1292
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1293
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1294
+ * 301 RAMBO       : Analog input 3
1295
+ *
1296
+ * Note: May require analog pins to be defined for other boards.
1297
+ */
1298
+//#define FILAMENT_WIDTH_SENSOR
1299
+
1300
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1301
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1302
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1303
+
1304
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1305
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1306
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1307
+
1308
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1309
+
1310
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1311
+  //#define FILAMENT_LCD_DISPLAY
1312
+#endif
1313
+
1314
+/**
1281 1315
  * CNC Coordinate Systems
1282 1316
  *
1283 1317
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -950,6 +953,13 @@
950 953
   #define UBL_PROBE_PT_3_Y 20
951 954
 
952 955
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
956
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
957
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
958
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
959
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
960
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
961
+  #endif
962
+
953 963
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
954 964
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
955 965
 
@@ -1690,50 +1700,4 @@
1690 1700
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1691 1701
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692 1702
 
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
-/**
1706
- * Filament Width Sensor
1707
- *
1708
- * Measures the filament width in real-time and adjusts
1709
- * flow rate to compensate for any irregularities.
1710
- *
1711
- * Also allows the measured filament diameter to set the
1712
- * extrusion rate, so the slicer only has to specify the
1713
- * volume.
1714
- *
1715
- * Only a single extruder is supported at this time.
1716
- *
1717
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1718
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1719
- * 301 RAMBO       : Analog input 3
1720
- *
1721
- * Note: May require analog pins to be defined for other boards.
1722
- */
1723
-//#define FILAMENT_WIDTH_SENSOR
1724
-
1725
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1726
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1727
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1728
-
1729
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1730
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1731
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1732
-
1733
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1734
-
1735
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1736
-  //#define FILAMENT_LCD_DISPLAY
1737
-#endif
1738
-
1739 1703
 #endif // CONFIGURATION_H

+ 10
- 46
Marlin/src/config/examples/RigidBot/Configuration.h ファイルの表示

@@ -139,6 +139,9 @@
139 139
 // :[1, 2, 3, 4, 5]
140 140
 #define EXTRUDERS 1  // Single extruder. Set to 2 for dual extruders
141 141
 
142
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
143
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
144
+
142 145
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
143 146
 //#define SINGLENOZZLE
144 147
 
@@ -948,6 +951,13 @@
948 951
   #define UBL_PROBE_PT_3_Y 20
949 952
 
950 953
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
954
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
955
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
956
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
957
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
958
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
959
+  #endif
960
+
951 961
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
952 962
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
953 963
 
@@ -1690,50 +1700,4 @@
1690 1700
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1691 1701
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692 1702
 
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
-/**
1706
- * Filament Width Sensor
1707
- *
1708
- * Measures the filament width in real-time and adjusts
1709
- * flow rate to compensate for any irregularities.
1710
- *
1711
- * Also allows the measured filament diameter to set the
1712
- * extrusion rate, so the slicer only has to specify the
1713
- * volume.
1714
- *
1715
- * Only a single extruder is supported at this time.
1716
- *
1717
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1718
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1719
- * 301 RAMBO       : Analog input 3
1720
- *
1721
- * Note: May require analog pins to be defined for other boards.
1722
- */
1723
-//#define FILAMENT_WIDTH_SENSOR
1724
-
1725
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1726
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1727
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1728
-
1729
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1730
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1731
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1732
-
1733
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1734
-
1735
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1736
-  //#define FILAMENT_LCD_DISPLAY
1737
-#endif
1738
-
1739 1703
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/RigidBot/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/SCARA/Configuration.h ファイルの表示

@@ -166,6 +166,9 @@
166 166
 // :[1, 2, 3, 4, 5]
167 167
 #define EXTRUDERS 1
168 168
 
169
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
170
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
171
+
169 172
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
170 173
 //#define SINGLENOZZLE
171 174
 
@@ -962,6 +965,13 @@
962 965
   #define UBL_PROBE_PT_3_Y 20
963 966
 
964 967
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
968
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
969
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
970
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
971
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
972
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
973
+  #endif
974
+
965 975
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
966 976
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
967 977
 
@@ -1702,50 +1712,4 @@
1702 1712
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1703 1713
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1704 1714
 
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
-/**
1718
- * Filament Width Sensor
1719
- *
1720
- * Measures the filament width in real-time and adjusts
1721
- * flow rate to compensate for any irregularities.
1722
- *
1723
- * Also allows the measured filament diameter to set the
1724
- * extrusion rate, so the slicer only has to specify the
1725
- * volume.
1726
- *
1727
- * Only a single extruder is supported at this time.
1728
- *
1729
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1730
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1731
- * 301 RAMBO       : Analog input 3
1732
- *
1733
- * Note: May require analog pins to be defined for other boards.
1734
- */
1735
-//#define FILAMENT_WIDTH_SENSOR
1736
-
1737
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1738
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1739
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1740
-
1741
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1742
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1743
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1744
-
1745
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1746
-
1747
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1748
-  //#define FILAMENT_LCD_DISPLAY
1749
-#endif
1750
-
1751 1715
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/SCARA/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/STM32F10/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -953,6 +956,13 @@
953 956
   #define UBL_PROBE_PT_3_Y 20
954 957
 
955 958
   //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
959
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
960
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
961
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
962
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
963
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
964
+  #endif
965
+
956 966
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
957 967
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
958 968
 
@@ -1693,50 +1703,4 @@
1693 1703
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1694 1704
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1695 1705
 
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
-/**
1709
- * Filament Width Sensor
1710
- *
1711
- * Measures the filament width in real-time and adjusts
1712
- * flow rate to compensate for any irregularities.
1713
- *
1714
- * Also allows the measured filament diameter to set the
1715
- * extrusion rate, so the slicer only has to specify the
1716
- * volume.
1717
- *
1718
- * Only a single extruder is supported at this time.
1719
- *
1720
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1721
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1722
- * 301 RAMBO       : Analog input 3
1723
- *
1724
- * Note: May require analog pins to be defined for other boards.
1725
- */
1726
-//#define FILAMENT_WIDTH_SENSOR
1727
-
1728
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1729
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1730
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1731
-
1732
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1733
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1734
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1735
-
1736
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1737
-
1738
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1739
-  //#define FILAMENT_LCD_DISPLAY
1740
-#endif
1741
-
1742 1706
 #endif // CONFIGURATION_H

+ 10
- 46
Marlin/src/config/examples/Sanguinololu/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -981,6 +984,13 @@
981 984
   #define UBL_PROBE_PT_3_Y 20
982 985
 
983 986
   //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
987
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
988
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
989
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
990
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
991
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
992
+  #endif
993
+
984 994
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
985 995
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
986 996
 
@@ -1721,50 +1731,4 @@
1721 1731
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1722 1732
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1723 1733
 
1724
-/**
1725
- * Default extrusion settings
1726
- *
1727
- * These settings control basic extrusion from within the Marlin firmware.
1728
- *
1729
- */
1730
-#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.
1731
-#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1732
-#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1733
-#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.
1734
-#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.
1735
-
1736
-/**
1737
- * Filament Width Sensor
1738
- *
1739
- * Measures the filament width in real-time and adjusts
1740
- * flow rate to compensate for any irregularities.
1741
- *
1742
- * Also allows the measured filament diameter to set the
1743
- * extrusion rate, so the slicer only has to specify the
1744
- * volume.
1745
- *
1746
- * Only a single extruder is supported at this time.
1747
- *
1748
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1749
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1750
- * 301 RAMBO       : Analog input 3
1751
- *
1752
- * Note: May require analog pins to be defined for other boards.
1753
- */
1754
-//#define FILAMENT_WIDTH_SENSOR
1755
-
1756
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1757
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1758
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1759
-
1760
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1761
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1762
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1763
-
1764
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1765
-
1766
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1767
-  //#define FILAMENT_LCD_DISPLAY
1768
-#endif
1769
-
1770 1734
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h ファイルの表示

@@ -1245,6 +1245,40 @@
1245 1245
 #endif
1246 1246
 
1247 1247
 /**
1248
+ * Filament Width Sensor
1249
+ *
1250
+ * Measures the filament width in real-time and adjusts
1251
+ * flow rate to compensate for any irregularities.
1252
+ *
1253
+ * Also allows the measured filament diameter to set the
1254
+ * extrusion rate, so the slicer only has to specify the
1255
+ * volume.
1256
+ *
1257
+ * Only a single extruder is supported at this time.
1258
+ *
1259
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1260
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1261
+ * 301 RAMBO       : Analog input 3
1262
+ *
1263
+ * Note: May require analog pins to be defined for other boards.
1264
+ */
1265
+//#define FILAMENT_WIDTH_SENSOR
1266
+
1267
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1268
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1269
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1270
+
1271
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1272
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1273
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1274
+
1275
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1276
+
1277
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1278
+  //#define FILAMENT_LCD_DISPLAY
1279
+#endif
1280
+
1281
+/**
1248 1282
  * CNC Coordinate Systems
1249 1283
  *
1250 1284
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/TinyBoy2/Configuration.h ファイルの表示

@@ -158,6 +158,9 @@
158 158
 // :[1, 2, 3, 4, 5]
159 159
 #define EXTRUDERS 1
160 160
 
161
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
162
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
163
+
161 164
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
162 165
 //#define SINGLENOZZLE
163 166
 
@@ -1006,6 +1009,13 @@
1006 1009
   #define UBL_PROBE_PT_3_Y 20
1007 1010
 
1008 1011
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
1012
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
1013
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
1014
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
1015
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
1016
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
1017
+  #endif
1018
+
1009 1019
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
1010 1020
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
1011 1021
 
@@ -1746,50 +1756,4 @@
1746 1756
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1747 1757
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1748 1758
 
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
-/**
1762
- * Filament Width Sensor
1763
- *
1764
- * Measures the filament width in real-time and adjusts
1765
- * flow rate to compensate for any irregularities.
1766
- *
1767
- * Also allows the measured filament diameter to set the
1768
- * extrusion rate, so the slicer only has to specify the
1769
- * volume.
1770
- *
1771
- * Only a single extruder is supported at this time.
1772
- *
1773
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1774
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1775
- * 301 RAMBO       : Analog input 3
1776
- *
1777
- * Note: May require analog pins to be defined for other boards.
1778
- */
1779
-//#define FILAMENT_WIDTH_SENSOR
1780
-
1781
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1782
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1783
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1784
-
1785
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1786
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1787
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1788
-
1789
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1790
-
1791
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1792
-  //#define FILAMENT_LCD_DISPLAY
1793
-#endif
1794
-
1795 1759
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -950,6 +953,13 @@
950 953
   #define UBL_PROBE_PT_3_Y 20
951 954
 
952 955
   //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
956
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
957
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
958
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
959
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
960
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
961
+  #endif
962
+
953 963
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
954 964
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
955 965
 
@@ -1691,50 +1701,4 @@
1691 1701
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1692 1702
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1693 1703
 
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
-/**
1707
- * Filament Width Sensor
1708
- *
1709
- * Measures the filament width in real-time and adjusts
1710
- * flow rate to compensate for any irregularities.
1711
- *
1712
- * Also allows the measured filament diameter to set the
1713
- * extrusion rate, so the slicer only has to specify the
1714
- * volume.
1715
- *
1716
- * Only a single extruder is supported at this time.
1717
- *
1718
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1719
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1720
- * 301 RAMBO       : Analog input 3
1721
- *
1722
- * Note: May require analog pins to be defined for other boards.
1723
- */
1724
-//#define FILAMENT_WIDTH_SENSOR
1725
-
1726
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1727
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1728
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1729
-
1730
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1731
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1732
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1733
-
1734
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1735
-
1736
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1737
-  //#define FILAMENT_LCD_DISPLAY
1738
-#endif
1739
-
1740 1704
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h ファイルの表示

@@ -1257,6 +1257,40 @@
1257 1257
 #endif
1258 1258
 
1259 1259
 /**
1260
+ * Filament Width Sensor
1261
+ *
1262
+ * Measures the filament width in real-time and adjusts
1263
+ * flow rate to compensate for any irregularities.
1264
+ *
1265
+ * Also allows the measured filament diameter to set the
1266
+ * extrusion rate, so the slicer only has to specify the
1267
+ * volume.
1268
+ *
1269
+ * Only a single extruder is supported at this time.
1270
+ *
1271
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1272
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1273
+ * 301 RAMBO       : Analog input 3
1274
+ *
1275
+ * Note: May require analog pins to be defined for other boards.
1276
+ */
1277
+//#define FILAMENT_WIDTH_SENSOR
1278
+
1279
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1280
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1281
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1282
+
1283
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1284
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1285
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1286
+
1287
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1288
+
1289
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1290
+  //#define FILAMENT_LCD_DISPLAY
1291
+#endif
1292
+
1293
+/**
1260 1294
  * CNC Coordinate Systems
1261 1295
  *
1262 1296
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/Velleman/K8200/Configuration.h ファイルの表示

@@ -156,6 +156,9 @@
156 156
 // :[1, 2, 3, 4, 5]
157 157
 #define EXTRUDERS 1
158 158
 
159
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
160
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
161
+
159 162
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
160 163
 //#define SINGLENOZZLE
161 164
 
@@ -980,6 +983,13 @@
980 983
   #define UBL_PROBE_PT_3_Y 20
981 984
 
982 985
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
986
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
987
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
988
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
989
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
990
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
991
+  #endif
992
+
983 993
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
984 994
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
985 995
 
@@ -1725,50 +1735,4 @@
1725 1735
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1726 1736
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1727 1737
 
1728
-/**
1729
- * Default extrusion settings
1730
- *
1731
- * These settings control basic extrusion from within the Marlin firmware.
1732
- *
1733
- */
1734
-#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.
1735
-#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1736
-#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1737
-#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.
1738
-#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.
1739
-
1740
-/**
1741
- * Filament Width Sensor
1742
- *
1743
- * Measures the filament width in real-time and adjusts
1744
- * flow rate to compensate for any irregularities.
1745
- *
1746
- * Also allows the measured filament diameter to set the
1747
- * extrusion rate, so the slicer only has to specify the
1748
- * volume.
1749
- *
1750
- * Only a single extruder is supported at this time.
1751
- *
1752
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1753
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1754
- * 301 RAMBO       : Analog input 3
1755
- *
1756
- * Note: May require analog pins to be defined for other boards.
1757
- */
1758
-//#define FILAMENT_WIDTH_SENSOR
1759
-
1760
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1761
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1762
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1763
-
1764
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1765
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1766
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1767
-
1768
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1769
-
1770
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1771
-  //#define FILAMENT_LCD_DISPLAY
1772
-#endif
1773
-
1774 1738
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h ファイルの表示

@@ -1264,6 +1264,40 @@
1264 1264
 #endif
1265 1265
 
1266 1266
 /**
1267
+ * Filament Width Sensor
1268
+ *
1269
+ * Measures the filament width in real-time and adjusts
1270
+ * flow rate to compensate for any irregularities.
1271
+ *
1272
+ * Also allows the measured filament diameter to set the
1273
+ * extrusion rate, so the slicer only has to specify the
1274
+ * volume.
1275
+ *
1276
+ * Only a single extruder is supported at this time.
1277
+ *
1278
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1279
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1280
+ * 301 RAMBO       : Analog input 3
1281
+ *
1282
+ * Note: May require analog pins to be defined for other boards.
1283
+ */
1284
+//#define FILAMENT_WIDTH_SENSOR
1285
+
1286
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1287
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1288
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1289
+
1290
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1291
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1292
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1293
+
1294
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1295
+
1296
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1297
+  //#define FILAMENT_LCD_DISPLAY
1298
+#endif
1299
+
1300
+/**
1267 1301
  * CNC Coordinate Systems
1268 1302
  *
1269 1303
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/Velleman/K8400/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -950,6 +953,13 @@
950 953
   #define UBL_PROBE_PT_3_Y 20
951 954
 
952 955
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
956
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
957
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
958
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
959
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
960
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
961
+  #endif
962
+
953 963
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
954 964
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
955 965
 
@@ -1690,50 +1700,4 @@
1690 1700
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1691 1701
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692 1702
 
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
-/**
1706
- * Filament Width Sensor
1707
- *
1708
- * Measures the filament width in real-time and adjusts
1709
- * flow rate to compensate for any irregularities.
1710
- *
1711
- * Also allows the measured filament diameter to set the
1712
- * extrusion rate, so the slicer only has to specify the
1713
- * volume.
1714
- *
1715
- * Only a single extruder is supported at this time.
1716
- *
1717
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1718
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1719
- * 301 RAMBO       : Analog input 3
1720
- *
1721
- * Note: May require analog pins to be defined for other boards.
1722
- */
1723
-//#define FILAMENT_WIDTH_SENSOR
1724
-
1725
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1726
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1727
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1728
-
1729
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1730
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1731
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1732
-
1733
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1734
-
1735
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1736
-  //#define FILAMENT_LCD_DISPLAY
1737
-#endif
1738
-
1739 1703
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h ファイルの表示

@@ -1257,6 +1257,40 @@
1257 1257
 #endif
1258 1258
 
1259 1259
 /**
1260
+ * Filament Width Sensor
1261
+ *
1262
+ * Measures the filament width in real-time and adjusts
1263
+ * flow rate to compensate for any irregularities.
1264
+ *
1265
+ * Also allows the measured filament diameter to set the
1266
+ * extrusion rate, so the slicer only has to specify the
1267
+ * volume.
1268
+ *
1269
+ * Only a single extruder is supported at this time.
1270
+ *
1271
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1272
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1273
+ * 301 RAMBO       : Analog input 3
1274
+ *
1275
+ * Note: May require analog pins to be defined for other boards.
1276
+ */
1277
+//#define FILAMENT_WIDTH_SENSOR
1278
+
1279
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1280
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1281
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1282
+
1283
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1284
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1285
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1286
+
1287
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1288
+
1289
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1290
+  //#define FILAMENT_LCD_DISPLAY
1291
+#endif
1292
+
1293
+/**
1260 1294
  * CNC Coordinate Systems
1261 1295
  *
1262 1296
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 2
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -950,6 +953,13 @@
950 953
   #define UBL_PROBE_PT_3_Y 20
951 954
 
952 955
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
956
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
957
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
958
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
959
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
960
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
961
+  #endif
962
+
953 963
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
954 964
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
955 965
 
@@ -1690,50 +1700,4 @@
1690 1700
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1691 1701
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692 1702
 
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
-/**
1706
- * Filament Width Sensor
1707
- *
1708
- * Measures the filament width in real-time and adjusts
1709
- * flow rate to compensate for any irregularities.
1710
- *
1711
- * Also allows the measured filament diameter to set the
1712
- * extrusion rate, so the slicer only has to specify the
1713
- * volume.
1714
- *
1715
- * Only a single extruder is supported at this time.
1716
- *
1717
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1718
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1719
- * 301 RAMBO       : Analog input 3
1720
- *
1721
- * Note: May require analog pins to be defined for other boards.
1722
- */
1723
-//#define FILAMENT_WIDTH_SENSOR
1724
-
1725
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1726
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1727
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1728
-
1729
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1730
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1731
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1732
-
1733
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1734
-
1735
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1736
-  //#define FILAMENT_LCD_DISPLAY
1737
-#endif
1738
-
1739 1703
 #endif // CONFIGURATION_H

+ 10
- 46
Marlin/src/config/examples/adafruit/ST7565/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -950,6 +953,13 @@
950 953
   #define UBL_PROBE_PT_3_Y 20
951 954
 
952 955
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
956
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
957
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
958
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
959
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
960
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
961
+  #endif
962
+
953 963
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
954 964
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
955 965
 
@@ -1690,50 +1700,4 @@
1690 1700
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1691 1701
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1692 1702
 
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
-/**
1706
- * Filament Width Sensor
1707
- *
1708
- * Measures the filament width in real-time and adjusts
1709
- * flow rate to compensate for any irregularities.
1710
- *
1711
- * Also allows the measured filament diameter to set the
1712
- * extrusion rate, so the slicer only has to specify the
1713
- * volume.
1714
- *
1715
- * Only a single extruder is supported at this time.
1716
- *
1717
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1718
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1719
- * 301 RAMBO       : Analog input 3
1720
- *
1721
- * Note: May require analog pins to be defined for other boards.
1722
- */
1723
-//#define FILAMENT_WIDTH_SENSOR
1724
-
1725
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1726
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1727
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1728
-
1729
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1730
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1731
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1732
-
1733
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1734
-
1735
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1736
-  //#define FILAMENT_LCD_DISPLAY
1737
-#endif
1738
-
1739 1703
 #endif // CONFIGURATION_H

+ 10
- 46
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -1084,6 +1087,13 @@
1084 1087
   #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
1085 1088
 
1086 1089
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
1090
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
1091
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
1092
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
1093
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
1094
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
1095
+  #endif
1096
+
1087 1097
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
1088 1098
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
1089 1099
 
@@ -1824,50 +1834,4 @@
1824 1834
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1825 1835
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1826 1836
 
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
-/**
1840
- * Filament Width Sensor
1841
- *
1842
- * Measures the filament width in real-time and adjusts
1843
- * flow rate to compensate for any irregularities.
1844
- *
1845
- * Also allows the measured filament diameter to set the
1846
- * extrusion rate, so the slicer only has to specify the
1847
- * volume.
1848
- *
1849
- * Only a single extruder is supported at this time.
1850
- *
1851
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1852
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1853
- * 301 RAMBO       : Analog input 3
1854
- *
1855
- * Note: May require analog pins to be defined for other boards.
1856
- */
1857
-//#define FILAMENT_WIDTH_SENSOR
1858
-
1859
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1860
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1861
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1862
-
1863
-  #define MEASURED_UPPER_LIMIT         1.95 // (mm) Upper limit used to validate sensor reading
1864
-  #define MEASURED_LOWER_LIMIT         1.20 // (mm) Lower limit used to validate sensor reading
1865
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1866
-
1867
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1868
-
1869
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1870
-  //#define FILAMENT_LCD_DISPLAY
1871
-#endif
1872
-
1873 1837
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h ファイルの表示

@@ -1258,6 +1258,40 @@
1258 1258
 #endif
1259 1259
 
1260 1260
 /**
1261
+ * Filament Width Sensor
1262
+ *
1263
+ * Measures the filament width in real-time and adjusts
1264
+ * flow rate to compensate for any irregularities.
1265
+ *
1266
+ * Also allows the measured filament diameter to set the
1267
+ * extrusion rate, so the slicer only has to specify the
1268
+ * volume.
1269
+ *
1270
+ * Only a single extruder is supported at this time.
1271
+ *
1272
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1273
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1274
+ * 301 RAMBO       : Analog input 3
1275
+ *
1276
+ * Note: May require analog pins to be defined for other boards.
1277
+ */
1278
+//#define FILAMENT_WIDTH_SENSOR
1279
+
1280
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1281
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1282
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1283
+
1284
+  #define MEASURED_UPPER_LIMIT         1.95 // (mm) Upper limit used to validate sensor reading
1285
+  #define MEASURED_LOWER_LIMIT         1.20 // (mm) Lower limit used to validate sensor reading
1286
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1287
+
1288
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1289
+
1290
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1291
+  //#define FILAMENT_LCD_DISPLAY
1292
+#endif
1293
+
1294
+/**
1261 1295
  * CNC Coordinate Systems
1262 1296
  *
1263 1297
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -1078,6 +1081,13 @@
1078 1081
   #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
1079 1082
 
1080 1083
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
1084
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
1085
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
1086
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
1087
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
1088
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
1089
+  #endif
1090
+
1081 1091
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
1082 1092
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
1083 1093
 
@@ -1817,50 +1827,4 @@
1817 1827
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1818 1828
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1819 1829
 
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
-/**
1833
- * Filament Width Sensor
1834
- *
1835
- * Measures the filament width in real-time and adjusts
1836
- * flow rate to compensate for any irregularities.
1837
- *
1838
- * Also allows the measured filament diameter to set the
1839
- * extrusion rate, so the slicer only has to specify the
1840
- * volume.
1841
- *
1842
- * Only a single extruder is supported at this time.
1843
- *
1844
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1845
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1846
- * 301 RAMBO       : Analog input 3
1847
- *
1848
- * Note: May require analog pins to be defined for other boards.
1849
- */
1850
-//#define FILAMENT_WIDTH_SENSOR
1851
-
1852
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1853
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1854
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1855
-
1856
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1857
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1858
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1859
-
1860
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1861
-
1862
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1863
-  //#define FILAMENT_LCD_DISPLAY
1864
-#endif
1865
-
1866 1830
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h ファイルの表示

@@ -1258,6 +1258,40 @@
1258 1258
 #endif
1259 1259
 
1260 1260
 /**
1261
+ * Filament Width Sensor
1262
+ *
1263
+ * Measures the filament width in real-time and adjusts
1264
+ * flow rate to compensate for any irregularities.
1265
+ *
1266
+ * Also allows the measured filament diameter to set the
1267
+ * extrusion rate, so the slicer only has to specify the
1268
+ * volume.
1269
+ *
1270
+ * Only a single extruder is supported at this time.
1271
+ *
1272
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1273
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1274
+ * 301 RAMBO       : Analog input 3
1275
+ *
1276
+ * Note: May require analog pins to be defined for other boards.
1277
+ */
1278
+//#define FILAMENT_WIDTH_SENSOR
1279
+
1280
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1281
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1282
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1283
+
1284
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1285
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1286
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1287
+
1288
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1289
+
1290
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1291
+  //#define FILAMENT_LCD_DISPLAY
1292
+#endif
1293
+
1294
+/**
1261 1295
  * CNC Coordinate Systems
1262 1296
  *
1263 1297
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/delta/generic/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -1073,6 +1076,13 @@
1073 1076
   #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
1074 1077
 
1075 1078
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
1079
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
1080
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
1081
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
1082
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
1083
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
1084
+  #endif
1085
+
1076 1086
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
1077 1087
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
1078 1088
 
@@ -1812,50 +1822,4 @@
1812 1822
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1813 1823
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1814 1824
 
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
-/**
1828
- * Filament Width Sensor
1829
- *
1830
- * Measures the filament width in real-time and adjusts
1831
- * flow rate to compensate for any irregularities.
1832
- *
1833
- * Also allows the measured filament diameter to set the
1834
- * extrusion rate, so the slicer only has to specify the
1835
- * volume.
1836
- *
1837
- * Only a single extruder is supported at this time.
1838
- *
1839
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1840
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1841
- * 301 RAMBO       : Analog input 3
1842
- *
1843
- * Note: May require analog pins to be defined for other boards.
1844
- */
1845
-//#define FILAMENT_WIDTH_SENSOR
1846
-
1847
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1848
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1849
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1850
-
1851
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1852
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1853
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1854
-
1855
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1856
-
1857
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1858
-  //#define FILAMENT_LCD_DISPLAY
1859
-#endif
1860
-
1861 1825
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/delta/generic/Configuration_adv.h ファイルの表示

@@ -1258,6 +1258,40 @@
1258 1258
 #endif
1259 1259
 
1260 1260
 /**
1261
+ * Filament Width Sensor
1262
+ *
1263
+ * Measures the filament width in real-time and adjusts
1264
+ * flow rate to compensate for any irregularities.
1265
+ *
1266
+ * Also allows the measured filament diameter to set the
1267
+ * extrusion rate, so the slicer only has to specify the
1268
+ * volume.
1269
+ *
1270
+ * Only a single extruder is supported at this time.
1271
+ *
1272
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1273
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1274
+ * 301 RAMBO       : Analog input 3
1275
+ *
1276
+ * Note: May require analog pins to be defined for other boards.
1277
+ */
1278
+//#define FILAMENT_WIDTH_SENSOR
1279
+
1280
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1281
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1282
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1283
+
1284
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1285
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1286
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1287
+
1288
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1289
+
1290
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1291
+  //#define FILAMENT_LCD_DISPLAY
1292
+#endif
1293
+
1294
+/**
1261 1295
  * CNC Coordinate Systems
1262 1296
  *
1263 1297
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/delta/kossel_mini/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -1076,6 +1079,13 @@
1076 1079
   #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
1077 1080
 
1078 1081
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
1082
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
1083
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
1084
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
1085
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
1086
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
1087
+  #endif
1088
+
1079 1089
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
1080 1090
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
1081 1091
 
@@ -1815,50 +1825,4 @@
1815 1825
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1816 1826
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1817 1827
 
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
-/**
1831
- * Filament Width Sensor
1832
- *
1833
- * Measures the filament width in real-time and adjusts
1834
- * flow rate to compensate for any irregularities.
1835
- *
1836
- * Also allows the measured filament diameter to set the
1837
- * extrusion rate, so the slicer only has to specify the
1838
- * volume.
1839
- *
1840
- * Only a single extruder is supported at this time.
1841
- *
1842
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1843
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1844
- * 301 RAMBO       : Analog input 3
1845
- *
1846
- * Note: May require analog pins to be defined for other boards.
1847
- */
1848
-//#define FILAMENT_WIDTH_SENSOR
1849
-
1850
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1851
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1852
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1853
-
1854
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1855
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1856
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1857
-
1858
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1859
-
1860
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1861
-  //#define FILAMENT_LCD_DISPLAY
1862
-#endif
1863
-
1864 1828
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h ファイルの表示

@@ -1258,6 +1258,40 @@
1258 1258
 #endif
1259 1259
 
1260 1260
 /**
1261
+ * Filament Width Sensor
1262
+ *
1263
+ * Measures the filament width in real-time and adjusts
1264
+ * flow rate to compensate for any irregularities.
1265
+ *
1266
+ * Also allows the measured filament diameter to set the
1267
+ * extrusion rate, so the slicer only has to specify the
1268
+ * volume.
1269
+ *
1270
+ * Only a single extruder is supported at this time.
1271
+ *
1272
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1273
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1274
+ * 301 RAMBO       : Analog input 3
1275
+ *
1276
+ * Note: May require analog pins to be defined for other boards.
1277
+ */
1278
+//#define FILAMENT_WIDTH_SENSOR
1279
+
1280
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1281
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1282
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1283
+
1284
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1285
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1286
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1287
+
1288
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1289
+
1290
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1291
+  //#define FILAMENT_LCD_DISPLAY
1292
+#endif
1293
+
1294
+/**
1261 1295
  * CNC Coordinate Systems
1262 1296
  *
1263 1297
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/delta/kossel_pro/Configuration.h ファイルの表示

@@ -140,6 +140,9 @@
140 140
 // :[1, 2, 3, 4, 5]
141 141
 #define EXTRUDERS 1
142 142
 
143
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
144
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
145
+
143 146
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
144 147
 //#define SINGLENOZZLE
145 148
 
@@ -1076,6 +1079,13 @@
1076 1079
   #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
1077 1080
 
1078 1081
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
1082
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
1083
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
1084
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
1085
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
1086
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
1087
+  #endif
1088
+
1079 1089
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
1080 1090
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
1081 1091
 
@@ -1815,50 +1825,4 @@
1815 1825
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1816 1826
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1817 1827
 
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
-/**
1831
- * Filament Width Sensor
1832
- *
1833
- * Measures the filament width in real-time and adjusts
1834
- * flow rate to compensate for any irregularities.
1835
- *
1836
- * Also allows the measured filament diameter to set the
1837
- * extrusion rate, so the slicer only has to specify the
1838
- * volume.
1839
- *
1840
- * Only a single extruder is supported at this time.
1841
- *
1842
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1843
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1844
- * 301 RAMBO       : Analog input 3
1845
- *
1846
- * Note: May require analog pins to be defined for other boards.
1847
- */
1848
-//#define FILAMENT_WIDTH_SENSOR
1849
-
1850
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1851
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1852
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1853
-
1854
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1855
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1856
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1857
-
1858
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1859
-
1860
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1861
-  //#define FILAMENT_LCD_DISPLAY
1862
-#endif
1863
-
1864 1828
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h ファイルの表示

@@ -1263,6 +1263,40 @@
1263 1263
 #endif
1264 1264
 
1265 1265
 /**
1266
+ * Filament Width Sensor
1267
+ *
1268
+ * Measures the filament width in real-time and adjusts
1269
+ * flow rate to compensate for any irregularities.
1270
+ *
1271
+ * Also allows the measured filament diameter to set the
1272
+ * extrusion rate, so the slicer only has to specify the
1273
+ * volume.
1274
+ *
1275
+ * Only a single extruder is supported at this time.
1276
+ *
1277
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1278
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1279
+ * 301 RAMBO       : Analog input 3
1280
+ *
1281
+ * Note: May require analog pins to be defined for other boards.
1282
+ */
1283
+//#define FILAMENT_WIDTH_SENSOR
1284
+
1285
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1286
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1287
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1288
+
1289
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1290
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1291
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1292
+
1293
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1294
+
1295
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1296
+  //#define FILAMENT_LCD_DISPLAY
1297
+#endif
1298
+
1299
+/**
1266 1300
  * CNC Coordinate Systems
1267 1301
  *
1268 1302
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/delta/kossel_xl/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -1085,6 +1088,13 @@
1085 1088
   #define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
1086 1089
 
1087 1090
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
1091
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
1092
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
1093
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
1094
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
1095
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
1096
+  #endif
1097
+
1088 1098
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
1089 1099
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
1090 1100
 
@@ -1824,50 +1834,4 @@
1824 1834
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1825 1835
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1826 1836
 
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
-/**
1840
- * Filament Width Sensor
1841
- *
1842
- * Measures the filament width in real-time and adjusts
1843
- * flow rate to compensate for any irregularities.
1844
- *
1845
- * Also allows the measured filament diameter to set the
1846
- * extrusion rate, so the slicer only has to specify the
1847
- * volume.
1848
- *
1849
- * Only a single extruder is supported at this time.
1850
- *
1851
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1852
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1853
- * 301 RAMBO       : Analog input 3
1854
- *
1855
- * Note: May require analog pins to be defined for other boards.
1856
- */
1857
-//#define FILAMENT_WIDTH_SENSOR
1858
-
1859
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1860
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1861
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1862
-
1863
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1864
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1865
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1866
-
1867
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1868
-
1869
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1870
-  //#define FILAMENT_LCD_DISPLAY
1871
-#endif
1872
-
1873 1837
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h ファイルの表示

@@ -1258,6 +1258,40 @@
1258 1258
 #endif
1259 1259
 
1260 1260
 /**
1261
+ * Filament Width Sensor
1262
+ *
1263
+ * Measures the filament width in real-time and adjusts
1264
+ * flow rate to compensate for any irregularities.
1265
+ *
1266
+ * Also allows the measured filament diameter to set the
1267
+ * extrusion rate, so the slicer only has to specify the
1268
+ * volume.
1269
+ *
1270
+ * Only a single extruder is supported at this time.
1271
+ *
1272
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1273
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1274
+ * 301 RAMBO       : Analog input 3
1275
+ *
1276
+ * Note: May require analog pins to be defined for other boards.
1277
+ */
1278
+//#define FILAMENT_WIDTH_SENSOR
1279
+
1280
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1281
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1282
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1283
+
1284
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1285
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1286
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1287
+
1288
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1289
+
1290
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1291
+  //#define FILAMENT_LCD_DISPLAY
1292
+#endif
1293
+
1294
+/**
1261 1295
  * CNC Coordinate Systems
1262 1296
  *
1263 1297
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h ファイルの表示

@@ -141,6 +141,9 @@
141 141
 // :[1, 2, 3, 4, 5]
142 142
 #define EXTRUDERS 1
143 143
 
144
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
145
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
146
+
144 147
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
145 148
 //#define SINGLENOZZLE
146 149
 
@@ -964,6 +967,13 @@
964 967
   #define UBL_PROBE_PT_3_Y 211
965 968
 
966 969
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
970
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
971
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
972
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
973
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
974
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
975
+  #endif
976
+
967 977
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
968 978
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
969 979
 
@@ -1704,50 +1714,4 @@
1704 1714
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1705 1715
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1706 1716
 
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           .5    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1715
-#define DEFAULT_LAYER_HEIGHT          .35   // (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
-/**
1720
- * Filament Width Sensor
1721
- *
1722
- * Measures the filament width in real-time and adjusts
1723
- * flow rate to compensate for any irregularities.
1724
- *
1725
- * Also allows the measured filament diameter to set the
1726
- * extrusion rate, so the slicer only has to specify the
1727
- * volume.
1728
- *
1729
- * Only a single extruder is supported at this time.
1730
- *
1731
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1732
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1733
- * 301 RAMBO       : Analog input 3
1734
- *
1735
- * Note: May require analog pins to be defined for other boards.
1736
- */
1737
-//#define FILAMENT_WIDTH_SENSOR
1738
-
1739
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1740
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1741
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1742
-
1743
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1744
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1745
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1746
-
1747
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1748
-
1749
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1750
-  //#define FILAMENT_LCD_DISPLAY
1751
-#endif
1752
-
1753 1717
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/makibox/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -953,6 +956,13 @@
953 956
   #define UBL_PROBE_PT_3_Y 20
954 957
 
955 958
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
959
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
960
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
961
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
962
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
963
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
964
+  #endif
965
+
956 966
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
957 967
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
958 968
 
@@ -1693,50 +1703,4 @@
1693 1703
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1694 1704
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1695 1705
 
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
-
1708
-/**
1709
- * Filament Width Sensor
1710
- *
1711
- * Measures the filament width in real-time and adjusts
1712
- * flow rate to compensate for any irregularities.
1713
- *
1714
- * Also allows the measured filament diameter to set the
1715
- * extrusion rate, so the slicer only has to specify the
1716
- * volume.
1717
- *
1718
- * Only a single extruder is supported at this time.
1719
- *
1720
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1721
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1722
- * 301 RAMBO       : Analog input 3
1723
- *
1724
- * Note: May require analog pins to be defined for other boards.
1725
- */
1726
-//#define FILAMENT_WIDTH_SENSOR
1727
-
1728
-#if ENABLED(FILAMENT_WIDTH_SENSOR)
1729
-  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1730
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1731
-
1732
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1733
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1734
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1735
-
1736
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1737
-
1738
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1739
-  //#define FILAMENT_LCD_DISPLAY
1740
-#endif
1741
-
1742 1706
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/makibox/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/tvrrug/Round2/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -945,6 +948,13 @@
945 948
   #define UBL_PROBE_PT_3_Y 20
946 949
 
947 950
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
951
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
952
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
953
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
954
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
955
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
956
+  #endif
957
+
948 958
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
949 959
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
950 960
 
@@ -1685,50 +1695,4 @@
1685 1695
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1686 1696
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1687 1697
 
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
-
1700
-/**
1701
- * Filament Width Sensor
1702
- *
1703
- * Measures the filament width in real-time and adjusts
1704
- * flow rate to compensate for any irregularities.
1705
- *
1706
- * Also allows the measured filament diameter to set the
1707
- * extrusion rate, so the slicer only has to specify the
1708
- * volume.
1709
- *
1710
- * Only a single extruder is supported at this time.
1711
- *
1712
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1713
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1714
- * 301 RAMBO       : Analog input 3
1715
- *
1716
- * Note: May require analog pins to be defined for other boards.
1717
- */
1718
-//#define FILAMENT_WIDTH_SENSOR
1719
-
1720
-#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)
1722
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1723
-
1724
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1725
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1726
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1727
-
1728
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1729
-
1730
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1731
-  //#define FILAMENT_LCD_DISPLAY
1732
-#endif
1733
-
1734 1698
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h ファイルの表示

@@ -1256,6 +1256,40 @@
1256 1256
 #endif
1257 1257
 
1258 1258
 /**
1259
+ * Filament Width Sensor
1260
+ *
1261
+ * Measures the filament width in real-time and adjusts
1262
+ * flow rate to compensate for any irregularities.
1263
+ *
1264
+ * Also allows the measured filament diameter to set the
1265
+ * extrusion rate, so the slicer only has to specify the
1266
+ * volume.
1267
+ *
1268
+ * Only a single extruder is supported at this time.
1269
+ *
1270
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1271
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1272
+ * 301 RAMBO       : Analog input 3
1273
+ *
1274
+ * Note: May require analog pins to be defined for other boards.
1275
+ */
1276
+//#define FILAMENT_WIDTH_SENSOR
1277
+
1278
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1279
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1280
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1281
+
1282
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1283
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1284
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1285
+
1286
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1287
+
1288
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1289
+  //#define FILAMENT_LCD_DISPLAY
1290
+#endif
1291
+
1292
+/**
1259 1293
  * CNC Coordinate Systems
1260 1294
  *
1261 1295
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 10
- 46
Marlin/src/config/examples/wt150/Configuration.h ファイルの表示

@@ -136,6 +136,9 @@
136 136
 // :[1, 2, 3, 4, 5]
137 137
 #define EXTRUDERS 1
138 138
 
139
+// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
140
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
141
+
139 142
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
140 143
 //#define SINGLENOZZLE
141 144
 
@@ -955,6 +958,13 @@
955 958
   #define UBL_PROBE_PT_3_Y 20
956 959
 
957 960
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
961
+  #if ENABLED(UBL_G26_MESH_VALIDATION)
962
+    #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
963
+    #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
964
+    #define MESH_TEST_HOTEND_TEMP  205.0  // (c)  Default nozzle temperature for the G26 Mesh Validation Tool.
965
+    #define MESH_TEST_BED_TEMP      60.0  // (c)  Default bed temperature for the G26 Mesh Validation Tool.
966
+  #endif
967
+
958 968
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
959 969
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
960 970
 
@@ -1695,50 +1705,4 @@
1695 1705
 // With this option servos are powered only during movement, then turned off to prevent jitter.
1696 1706
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1697 1707
 
1698
-/**
1699
- * Default extrusion settings
1700
- *
1701
- * These settings control basic extrusion from within the Marlin firmware.
1702
- *
1703
- */
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
-#define DEFAULT_NOZZLE_SIZE           .4    // (mm) Diameter of primary nozzle.  Used by G26 Mesh Validation Pattern tool.
1706
-#define DEFAULT_LAYER_HEIGHT          .2    // (mm) Default layer height that will produce usable results by the printer.  Used by G26 Mesh Validation Pattern tool.
1707
-#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.
1708
-#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.
1709
-
1710
-/**
1711
- * Filament Width Sensor
1712
- *
1713
- * Measures the filament width in real-time and adjusts
1714
- * flow rate to compensate for any irregularities.
1715
- *
1716
- * Also allows the measured filament diameter to set the
1717
- * extrusion rate, so the slicer only has to specify the
1718
- * volume.
1719
- *
1720
- * Only a single extruder is supported at this time.
1721
- *
1722
- *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1723
- *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1724
- * 301 RAMBO       : Analog input 3
1725
- *
1726
- * Note: May require analog pins to be defined for other boards.
1727
- */
1728
-//#define FILAMENT_WIDTH_SENSOR
1729
-
1730
-#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)
1732
-  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1733
-
1734
-  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1735
-  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1736
-  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1737
-
1738
-  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1739
-
1740
-  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1741
-  //#define FILAMENT_LCD_DISPLAY
1742
-#endif
1743
-
1744 1708
 #endif // CONFIGURATION_H

+ 34
- 0
Marlin/src/config/examples/wt150/Configuration_adv.h ファイルの表示

@@ -1257,6 +1257,40 @@
1257 1257
 #endif
1258 1258
 
1259 1259
 /**
1260
+ * Filament Width Sensor
1261
+ *
1262
+ * Measures the filament width in real-time and adjusts
1263
+ * flow rate to compensate for any irregularities.
1264
+ *
1265
+ * Also allows the measured filament diameter to set the
1266
+ * extrusion rate, so the slicer only has to specify the
1267
+ * volume.
1268
+ *
1269
+ * Only a single extruder is supported at this time.
1270
+ *
1271
+ *  34 RAMPS_14    : Analog input 5 on the AUX2 connector
1272
+ *  81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
1273
+ * 301 RAMBO       : Analog input 3
1274
+ *
1275
+ * Note: May require analog pins to be defined for other boards.
1276
+ */
1277
+//#define FILAMENT_WIDTH_SENSOR
1278
+
1279
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
1280
+  #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor. :[0,1,2,3,4]
1281
+  #define MEASUREMENT_DELAY_CM        14    // (cm) The distance from the filament sensor to the melting chamber
1282
+
1283
+  #define MEASURED_UPPER_LIMIT         3.30 // (mm) Upper limit used to validate sensor reading
1284
+  #define MEASURED_LOWER_LIMIT         1.90 // (mm) Lower limit used to validate sensor reading
1285
+  #define MAX_MEASUREMENT_DELAY       20    // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
1286
+
1287
+  #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
1288
+
1289
+  // Display filament width on the LCD status line. Status messages will expire after 5 seconds.
1290
+  //#define FILAMENT_LCD_DISPLAY
1291
+#endif
1292
+
1293
+/**
1260 1294
  * CNC Coordinate Systems
1261 1295
  *
1262 1296
  * Enables G53 and G54-G59.3 commands to select coordinate systems

+ 4
- 4
Marlin/src/feature/bedlevel/ubl/G26_Mesh_Validation_Tool.cpp ファイルの表示

@@ -618,12 +618,12 @@ bool unified_bed_leveling::parse_G26_parameters() {
618 618
 
619 619
   g26_extrusion_multiplier  = EXTRUSION_MULTIPLIER;
620 620
   g26_retraction_multiplier = RETRACTION_MULTIPLIER;
621
-  g26_nozzle                = DEFAULT_NOZZLE_SIZE;
621
+  g26_nozzle                = MESH_TEST_NOZZLE_SIZE;
622 622
   g26_filament_diameter     = DEFAULT_NOMINAL_FILAMENT_DIA;
623
-  g26_layer_height          = DEFAULT_LAYER_HEIGHT;
623
+  g26_layer_height          = MESH_TEST_LAYER_HEIGHT;
624 624
   g26_prime_length          = PRIME_LENGTH;
625
-  g26_bed_temp              = DEFAULT_BED_TEMP;
626
-  g26_hotend_temp           = DEFAULT_HOTEND_TEMP;
625
+  g26_bed_temp              = MESH_TEST_BED_TEMP;
626
+  g26_hotend_temp           = MESH_TEST_HOTEND_TEMP;
627 627
   g26_prime_flag            = 0;
628 628
 
629 629
   g26_ooze_amount           = parser.linearval('O', OOZE_AMOUNT);

読み込み中…
キャンセル
保存