Merge pull request #8842 from thinkyhead/bf2_no_volumetrics

[2.0.x] Add option for NO_VOLUMETRICS

.travis.yml

@@ -97,7 +97,7 @@ script:
   - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
   - opt_set NUM_SERVOS 1
   - opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT
-  - opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET
+  - opt_enable_adv NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET
   - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
   #
   # Test MESH_BED_LEVELING feature, with LCD

Marlin/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/default/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Anet/A6/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Anet/A8/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h

@@ -1365,6 +1365,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1373,6 +1379,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Cartesio/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h

@@ -1367,6 +1367,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1375,6 +1381,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Felix/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 //#define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/MakerParts/Configuration_adv.h

@@ -1336,6 +1336,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1344,6 +1350,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Malyan/M150/Configuration_adv.h

@@ -1361,6 +1361,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1369,6 +1375,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Malyan/M200/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h

@@ -1365,6 +1365,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1373,6 +1379,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h

@@ -1372,6 +1372,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1380,6 +1386,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/RigidBot/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/SCARA/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Sanguinololu/Configuration_adv.h

@@ -1353,6 +1353,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1361,6 +1367,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/TinyBoy2/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h

@@ -1375,6 +1375,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1383,6 +1389,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h

@@ -1365,6 +1365,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1373,6 +1379,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h

@@ -1366,6 +1366,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1374,6 +1380,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h

@@ -1366,6 +1366,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1374,6 +1380,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h

@@ -1366,6 +1366,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1374,6 +1380,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/delta/generic/Configuration_adv.h

@@ -1366,6 +1366,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1374,6 +1380,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h

@@ -1366,6 +1366,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1374,6 +1380,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h

@@ -1371,6 +1371,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1379,6 +1385,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h

@@ -1366,6 +1366,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1374,6 +1380,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/makibox/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h

@@ -1364,6 +1364,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1372,6 +1378,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/config/examples/wt150/Configuration_adv.h

@@ -1365,6 +1365,12 @@
  */
 #define EXTENDED_CAPABILITIES_REPORT
 
+/**
+ * Disable all Volumetric extrusion options
+ */
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
   /**
    * Volumetric extrusion default state
    * Activate to make volumetric extrusion the default method,
@@ -1373,6 +1379,7 @@
    * M200 D0 to disable, M200 Dn to set a new diameter.
    */
   //#define VOLUMETRIC_DEFAULT_ON
+#endif
 
 /**
  * Enable this option for a leaner build of Marlin that removes all

Marlin/src/gcode/config/M200-M205.cpp

@@ -24,6 +24,8 @@
 #include "../../Marlin.h"
 #include "../../module/planner.h"
 
+#if DISABLED(NO_VOLUMETRICS)
+
   /**
    * M200: Set filament diameter and set E axis units to cubic units
    *
@@ -44,6 +46,8 @@ void GcodeSuite::M200() {
     planner.calculate_volumetric_multipliers();
   }
 
+#endif // !NO_VOLUMETRICS
+
 /**
  * M201: Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000)
  *

Marlin/src/gcode/gcode.cpp

@@ -465,9 +465,9 @@ void GcodeSuite::process_parsed_command() {
         #endif
       #endif
 
-      case 200: // M200: Set filament diameter, E to cubic units
+      #if DISABLED(NO_VOLUMETRICS)
-        M200();
+        case 200: M200(); break;  // M200: Set filament diameter, E to cubic units
-        break;
+      #endif
 
       case 201: M201(); break;  // M201: Set max acceleration for print moves (units/s^2)
 

Marlin/src/gcode/host/M115.cpp

@@ -23,6 +23,14 @@
 #include "../gcode.h"
 #include "../../inc/MarlinConfig.h"
 
+#if ENABLED(EXTENDED_CAPABILITIES_REPORT)
+  static void cap_line(const char * const name, bool ena=false) {
+    SERIAL_PROTOCOLPGM("Cap:");
+    serialprintPGM(name);
+    SERIAL_PROTOCOLLN(int(ena ? 1 : 0));
+  }
+#endif
+
 /**
  * M115: Capabilities string
  */
@@ -32,86 +40,92 @@ void GcodeSuite::M115() {
   #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
 
     // SERIAL_XON_XOFF
+    cap_line(PSTR("SERIAL_XON_XOFF")
       #if ENABLED(SERIAL_XON_XOFF)
-      SERIAL_PROTOCOLLNPGM("Cap:SERIAL_XON_XOFF:1");
+        , true
-    #else
-      SERIAL_PROTOCOLLNPGM("Cap:SERIAL_XON_XOFF:0");
       #endif
+    );
 
     // EEPROM (M500, M501)
+    cap_line(PSTR("EEPROM")
       #if ENABLED(EEPROM_SETTINGS)
-      SERIAL_PROTOCOLLNPGM("Cap:EEPROM:1");
+        , true
-    #else
-      SERIAL_PROTOCOLLNPGM("Cap:EEPROM:0");
       #endif
+    );
+
+    // Volumetric Extrusion (M200)
+    cap_line(PSTR("VOLUMETRIC")
+      #if DISABLED(NO_VOLUMETRICS)
+        , true
+      #endif
+    );
 
     // AUTOREPORT_TEMP (M155)
+    cap_line(PSTR("AUTOREPORT_TEMP")
       #if ENABLED(AUTO_REPORT_TEMPERATURES)
-      SERIAL_PROTOCOLLNPGM("Cap:AUTOREPORT_TEMP:1");
+        , true
-    #else
-      SERIAL_PROTOCOLLNPGM("Cap:AUTOREPORT_TEMP:0");
       #endif
+    );
 
     // PROGRESS (M530 S L, M531 <file>, M532 X L)
-    SERIAL_PROTOCOLLNPGM("Cap:PROGRESS:0");
+    cap_line(PSTR("PROGRESS"));
 
     // Print Job timer M75, M76, M77
-    SERIAL_PROTOCOLLNPGM("Cap:PRINT_JOB:1");
+    cap_line(PSTR("PRINT_JOB"), true);
 
     // AUTOLEVEL (G29)
+    cap_line(PSTR("AUTOLEVEL")
       #if HAS_AUTOLEVEL
-      SERIAL_PROTOCOLLNPGM("Cap:AUTOLEVEL:1");
+        , true
-    #else
-      SERIAL_PROTOCOLLNPGM("Cap:AUTOLEVEL:0");
       #endif
+    );
 
     // Z_PROBE (G30)
+    cap_line(PSTR("Z_PROBE")
       #if HAS_BED_PROBE
-      SERIAL_PROTOCOLLNPGM("Cap:Z_PROBE:1");
+        , true
-    #else
-      SERIAL_PROTOCOLLNPGM("Cap:Z_PROBE:0");
       #endif
+    );
 
     // MESH_REPORT (M420 V)
+    cap_line(PSTR("LEVELING_DATA")
       #if HAS_LEVELING
-      SERIAL_PROTOCOLLNPGM("Cap:LEVELING_DATA:1");
+        , true
-    #else
-      SERIAL_PROTOCOLLNPGM("Cap:LEVELING_DATA:0");
       #endif
+    );
 
     // BUILD_PERCENT (M73)
+    cap_line(PSTR("BUILD_PERCENT")
       #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-      SERIAL_PROTOCOLLNPGM("Cap:BUILD_PERCENT:1");
+        , true
-    #else
-      SERIAL_PROTOCOLLNPGM("Cap:BUILD_PERCENT:0");
       #endif
+    );
 
     // SOFTWARE_POWER (M80, M81)
+    cap_line(PSTR("SOFTWARE_POWER")
       #if HAS_POWER_SWITCH
-      SERIAL_PROTOCOLLNPGM("Cap:SOFTWARE_POWER:1");
+        , true
-    #else
-      SERIAL_PROTOCOLLNPGM("Cap:SOFTWARE_POWER:0");
       #endif
+    );
 
     // CASE LIGHTS (M355)
+    cap_line(PSTR("TOGGLE_LIGHTS")
       #if HAS_CASE_LIGHT
-      SERIAL_PROTOCOLLNPGM("Cap:TOGGLE_LIGHTS:1");
+        , true
-      if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) {
-        SERIAL_PROTOCOLLNPGM("Cap:CASE_LIGHT_BRIGHTNESS:1");
-      }
-      else
-        SERIAL_PROTOCOLLNPGM("Cap:CASE_LIGHT_BRIGHTNESS:0");
-    #else
-      SERIAL_PROTOCOLLNPGM("Cap:TOGGLE_LIGHTS:0");
-      SERIAL_PROTOCOLLNPGM("Cap:CASE_LIGHT_BRIGHTNESS:0");
       #endif
+    );
+    cap_line(PSTR("CASE_LIGHT_BRIGHTNESS")
+      #if HAS_CASE_LIGHT
+        , USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)
+      #endif
+    );
 
     // EMERGENCY_PARSER (M108, M112, M410)
+    cap_line(PSTR("EMERGENCY_PARSER")
       #if ENABLED(EMERGENCY_PARSER)
-      SERIAL_PROTOCOLLNPGM("Cap:EMERGENCY_PARSER:1");
+        , true
-    #else
-      SERIAL_PROTOCOLLNPGM("Cap:EMERGENCY_PARSER:0");
       #endif
+    );
 
   #endif // EXTENDED_CAPABILITIES_REPORT
 }

Marlin/src/inc/SanityCheck.h

@@ -894,15 +894,19 @@ static_assert(1 >= 0
  */
 #if ENABLED(DISABLE_X) || ENABLED(DISABLE_Y) || ENABLED(DISABLE_Z)
   #if ENABLED(HOME_AFTER_DEACTIVATE) || ENABLED(Z_SAFE_HOMING)
-    #error "DISABLE_[XYZ] not compatible with HOME_AFTER_DEACTIVATE or Z_SAFE_HOMING."
+    #error "DISABLE_[XYZ] is not compatible with HOME_AFTER_DEACTIVATE or Z_SAFE_HOMING."
   #endif
 #endif // DISABLE_[XYZ]
 
 /**
  * Filament Width Sensor
  */
-#if ENABLED(FILAMENT_WIDTH_SENSOR) && !HAS_FILAMENT_WIDTH_SENSOR
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
+  #if !HAS_FILAMENT_WIDTH_SENSOR
     #error "FILAMENT_WIDTH_SENSOR requires a FILWIDTH_PIN to be defined."
+  #elif ENABLED(NO_VOLUMETRICS)
+    #error "FILAMENT_WIDTH_SENSOR requires NO_VOLUMETRICS to be disabled."
+  #endif
 #endif
 
 /**

Marlin/src/lcd/ultralcd.cpp

@@ -3636,6 +3636,8 @@ void kill_screen(const char* lcd_msg) {
       MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
     #endif
 
+    #if DISABLED(NO_VOLUMETRICS)
+
       MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLUMETRIC_ENABLED, &parser.volumetric_enabled, planner.calculate_volumetric_multipliers);
 
       if (parser.volumetric_enabled) {
@@ -3657,6 +3659,8 @@ void kill_screen(const char* lcd_msg) {
         #endif // EXTRUDERS > 1
       }
 
+    #endif // !NO_VOLUMETRICS
+
     END_MENU();
   }
 

Marlin/src/module/configuration_store.cpp

@@ -239,7 +239,9 @@ void MarlinSettings::postprocess() {
     thermalManager.updatePID();
   #endif
 
+  #if DISABLED(NO_VOLUMETRICS)
     planner.calculate_volumetric_multipliers();
+  #endif
 
   #if HAS_HOME_OFFSET || ENABLED(DUAL_X_CARRIAGE)
     // Software endstops depend on home_offset
@@ -538,6 +540,11 @@ void MarlinSettings::postprocess() {
       EEPROM_WRITE(fwretract.swap_retract_recover_feedrate_mm_s);
     #endif
 
+    //
+    // Volumetric & Filament Size
+    //
+    #if DISABLED(NO_VOLUMETRICS)
+
       EEPROM_WRITE(parser.volumetric_enabled);
 
       // Save filament sizes
@@ -546,6 +553,8 @@ void MarlinSettings::postprocess() {
         EEPROM_WRITE(dummy);
       }
 
+    #endif
+
     // Save TMC2130 or TMC2208 Configuration, and placeholder values
     uint16_t val;
     #if HAS_TRINAMIC
@@ -1028,13 +1037,17 @@ void MarlinSettings::postprocess() {
       //
       // Volumetric & Filament Size
       //
+      #if DISABLED(NO_VOLUMETRICS)
 
         EEPROM_READ(parser.volumetric_enabled);
+
         for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
           EEPROM_READ(dummy);
           if (q < COUNT(planner.filament_size)) planner.filament_size[q] = dummy;
         }
 
+      #endif
+
       //
       // TMC2130 Stepper Current
       //
@@ -1484,6 +1497,8 @@ void MarlinSettings::reset() {
     fwretract.reset();
   #endif
 
+  #if DISABLED(NO_VOLUMETRICS)
+
     parser.volumetric_enabled =
       #if ENABLED(VOLUMETRIC_DEFAULT_ON)
         true
@@ -1494,6 +1509,8 @@ void MarlinSettings::reset() {
     for (uint8_t q = 0; q < COUNT(planner.filament_size); q++)
       planner.filament_size[q] = DEFAULT_NOMINAL_FILAMENT_DIA;
 
+  #endif
+
   endstops.enable_globally(
     #if ENABLED(ENDSTOPS_ALWAYS_ON_DEFAULT)
       true
@@ -1630,6 +1647,8 @@ void MarlinSettings::reset() {
 
     SERIAL_EOL();
 
+    #if DISABLED(NO_VOLUMETRICS)
+
       /**
        * Volumetric extrusion M200
        */
@@ -1671,6 +1690,8 @@ void MarlinSettings::reset() {
         SERIAL_ECHOLNPGM("  M200 D0");
       }
 
+    #endif // !NO_VOLUMETRICS
+
     if (!forReplay) {
       CONFIG_ECHO_START;
       SERIAL_ECHOLNPGM("Steps per unit:");

Marlin/src/module/planner.cpp

@@ -105,10 +105,13 @@ float Planner::max_feedrate_mm_s[XYZE_N], // Max speeds in mm per second
 
 int16_t Planner::flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100); // Extrusion factor for each extruder
 
-float Planner::e_factor[EXTRUDERS],               // The flow percentage and volumetric multiplier combine to scale E movement
+float Planner::e_factor[EXTRUDERS];               // The flow percentage and volumetric multiplier combine to scale E movement
-      Planner::filament_size[EXTRUDERS],          // diameter of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder
+
+#if DISABLED(NO_VOLUMETRICS)
+  float Planner::filament_size[EXTRUDERS],          // diameter of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder
         Planner::volumetric_area_nominal = CIRCLE_AREA((DEFAULT_NOMINAL_FILAMENT_DIA) * 0.5), // Nominal cross-sectional area
         Planner::volumetric_multiplier[EXTRUDERS];  // Reciprocal of cross-sectional area of filament (in mm^2). Pre-calculated to reduce computation in the planner
+#endif
 
 uint32_t Planner::max_acceleration_steps_per_s2[XYZE_N],
          Planner::max_acceleration_mm_per_s2[XYZE_N]; // Use M201 to override by software
@@ -561,6 +564,8 @@ void Planner::check_axes_activity() {
   #endif
 }
 
+#if DISABLED(NO_VOLUMETRICS)
+
   /**
    * Get a volumetric multiplier from a filament diameter.
    * This is the reciprocal of the circular cross-section area.
@@ -581,6 +586,8 @@ void Planner::calculate_volumetric_multipliers() {
     }
   }
 
+#endif // !NO_VOLUMETRICS
+
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
   /**
    * Convert the ratio value given by the filament width sensor

Marlin/src/module/planner.h

@@ -159,11 +159,14 @@ class Planner {
 
     static int16_t flow_percentage[EXTRUDERS];      // Extrusion factor for each extruder
 
-    static float e_factor[EXTRUDERS],               // The flow percentage and volumetric multiplier combine to scale E movement
+    static float e_factor[EXTRUDERS];               // The flow percentage and volumetric multiplier combine to scale E movement
-                 filament_size[EXTRUDERS],          // diameter of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder
+
+    #if DISABLED(NO_VOLUMETRICS)
+      static float filament_size[EXTRUDERS],          // diameter of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder
                    volumetric_area_nominal,           // Nominal cross-sectional area
                    volumetric_multiplier[EXTRUDERS];  // Reciprocal of cross-sectional area of filament (in mm^2). Pre-calculated to reduce computation in the planner
                                                       // May be auto-adjusted by a filament width sensor
+    #endif
 
     static float max_feedrate_mm_s[XYZE_N],         // Max speeds in mm per second
                  axis_steps_per_mm[XYZE_N],
@@ -277,7 +280,11 @@ class Planner {
     static void refresh_positioning();
 
     FORCE_INLINE static void refresh_e_factor(const uint8_t e) {
-      e_factor[e] = volumetric_multiplier[e] * flow_percentage[e] * 0.01;
+      e_factor[e] = (flow_percentage[e] * 0.01
+        #if DISABLED(NO_VOLUMETRICS)
+          * volumetric_multiplier[e]
+        #endif
+      );
     }
 
     // Manage fans, paste pressure, etc.
@@ -297,6 +304,8 @@ class Planner {
       void calculate_volumetric_for_width_sensor(const int8_t encoded_ratio);
     #endif
 
+    #if DISABLED(NO_VOLUMETRICS)
+
       FORCE_INLINE static void set_filament_size(const uint8_t e, const float &v) {
         filament_size[e] = v;
         // make sure all extruders have some sane value for the filament size
@@ -304,6 +313,8 @@ class Planner {
           if (!filament_size[i]) filament_size[i] = DEFAULT_NOMINAL_FILAMENT_DIA;
       }
 
+    #endif
+
     #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
 
       /**