From 933f76fda3a2e8ecd9b3e8493b2885f4356b0430 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 19 Dec 2017 19:44:11 -0600
Subject: [PATCH] Option to disable all volumetric extrusion
---
Marlin/Configuration_adv.h | 19 +++-
Marlin/src/gcode/config/M200-M205.cpp | 36 +++---
Marlin/src/gcode/gcode.cpp | 6 +-
Marlin/src/inc/SanityCheck.h | 10 +-
Marlin/src/lcd/ultralcd.cpp | 42 +++----
Marlin/src/module/configuration_store.cpp | 133 +++++++++++++---------
Marlin/src/module/planner.cpp | 49 ++++----
Marlin/src/module/planner.h | 35 ++++--
8 files changed, 194 insertions(+), 136 deletions(-)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 5cc22a7bbe..983b8b6e75 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1365,13 +1365,20 @@
#define EXTENDED_CAPABILITIES_REPORT
/**
- * Volumetric extrusion default state
- * Activate to make volumetric extrusion the default method,
- * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
- *
- * M200 D0 to disable, M200 Dn to set a new diameter.
+ * Disable all Volumetric extrusion options
*/
-//#define VOLUMETRIC_DEFAULT_ON
+//#define NO_VOLUMETRICS
+
+#if DISABLED(NO_VOLUMETRICS)
+ /**
+ * Volumetric extrusion default state
+ * Activate to make volumetric extrusion the default method,
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
+ *
+ * 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
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 3afadf2f3f..01e26f2fa1 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -24,25 +24,29 @@
#include "../../Marlin.h"
#include "../../module/planner.h"
-/**
- * M200: Set filament diameter and set E axis units to cubic units
- *
- * T<extruder> - Optional extruder number. Current extruder if omitted.
- * D<linear> - Diameter of the filament. Use "D0" to switch back to linear units on the E axis.
- */
-void GcodeSuite::M200() {
+#if DISABLED(NO_VOLUMETRICS)
- if (get_target_extruder_from_command()) return;
+ /**
+ * M200: Set filament diameter and set E axis units to cubic units
+ *
+ * T<extruder> - Optional extruder number. Current extruder if omitted.
+ * D<linear> - Diameter of the filament. Use "D0" to switch back to linear units on the E axis.
+ */
+ void GcodeSuite::M200() {
- if (parser.seen('D')) {
- // setting any extruder filament size disables volumetric on the assumption that
- // slicers either generate in extruder values as cubic mm or as as filament feeds
- // for all extruders
- if ( (parser.volumetric_enabled = (parser.value_linear_units() != 0.0)) )
- planner.set_filament_size(target_extruder, parser.value_linear_units());
+ if (get_target_extruder_from_command()) return;
+
+ if (parser.seen('D')) {
+ // setting any extruder filament size disables volumetric on the assumption that
+ // slicers either generate in extruder values as cubic mm or as as filament feeds
+ // for all extruders
+ if ( (parser.volumetric_enabled = (parser.value_linear_units() != 0.0)) )
+ planner.set_filament_size(target_extruder, parser.value_linear_units());
+ }
+ planner.calculate_volumetric_multipliers();
}
- planner.calculate_volumetric_multipliers();
-}
+
+#endif // !NO_VOLUMETRICS
/**
* M201: Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000)
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index bec1c192d0..35305df7b1 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/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
- M200();
- break;
+ #if DISABLED(NO_VOLUMETRICS)
+ case 200: M200(); break; // M200: Set filament diameter, E to cubic units
+ #endif
case 201: M201(); break; // M201: Set max acceleration for print moves (units/s^2)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 0f215f1a0b..7948b3f98a 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/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
- #error "FILAMENT_WIDTH_SENSOR requires a FILWIDTH_PIN to be defined."
+#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
/**
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 3362e677ed..e8ab943ede 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -3636,26 +3636,30 @@ void kill_screen(const char* lcd_msg) {
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
#endif
- MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLUMETRIC_ENABLED, &parser.volumetric_enabled, planner.calculate_volumetric_multipliers);
+ #if DISABLED(NO_VOLUMETRICS)
- if (parser.volumetric_enabled) {
- #if EXTRUDERS == 1
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM, &planner.filament_size[0], 1.5, 3.25, planner.calculate_volumetric_multipliers);
- #else // EXTRUDERS > 1
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM, &planner.filament_size[active_extruder], 1.5, 3.25, planner.calculate_volumetric_multipliers);
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E1, &planner.filament_size[0], 1.5, 3.25, planner.calculate_volumetric_multipliers);
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E2, &planner.filament_size[1], 1.5, 3.25, planner.calculate_volumetric_multipliers);
- #if EXTRUDERS > 2
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E3, &planner.filament_size[2], 1.5, 3.25, planner.calculate_volumetric_multipliers);
- #if EXTRUDERS > 3
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E4, &planner.filament_size[3], 1.5, 3.25, planner.calculate_volumetric_multipliers);
- #if EXTRUDERS > 4
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E5, &planner.filament_size[4], 1.5, 3.25, planner.calculate_volumetric_multipliers);
- #endif // EXTRUDERS > 4
- #endif // EXTRUDERS > 3
- #endif // EXTRUDERS > 2
- #endif // EXTRUDERS > 1
- }
+ MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLUMETRIC_ENABLED, &parser.volumetric_enabled, planner.calculate_volumetric_multipliers);
+
+ if (parser.volumetric_enabled) {
+ #if EXTRUDERS == 1
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM, &planner.filament_size[0], 1.5, 3.25, planner.calculate_volumetric_multipliers);
+ #else // EXTRUDERS > 1
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM, &planner.filament_size[active_extruder], 1.5, 3.25, planner.calculate_volumetric_multipliers);
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E1, &planner.filament_size[0], 1.5, 3.25, planner.calculate_volumetric_multipliers);
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E2, &planner.filament_size[1], 1.5, 3.25, planner.calculate_volumetric_multipliers);
+ #if EXTRUDERS > 2
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E3, &planner.filament_size[2], 1.5, 3.25, planner.calculate_volumetric_multipliers);
+ #if EXTRUDERS > 3
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E4, &planner.filament_size[3], 1.5, 3.25, planner.calculate_volumetric_multipliers);
+ #if EXTRUDERS > 4
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E5, &planner.filament_size[4], 1.5, 3.25, planner.calculate_volumetric_multipliers);
+ #endif // EXTRUDERS > 4
+ #endif // EXTRUDERS > 3
+ #endif // EXTRUDERS > 2
+ #endif // EXTRUDERS > 1
+ }
+
+ #endif // !NO_VOLUMETRICS
END_MENU();
}
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 38c56602df..d6252eb2c3 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -239,7 +239,9 @@ void MarlinSettings::postprocess() {
thermalManager.updatePID();
#endif
- planner.calculate_volumetric_multipliers();
+ #if DISABLED(NO_VOLUMETRICS)
+ planner.calculate_volumetric_multipliers();
+ #endif
#if HAS_HOME_OFFSET || ENABLED(DUAL_X_CARRIAGE)
// Software endstops depend on home_offset
@@ -538,13 +540,20 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(fwretract.swap_retract_recover_feedrate_mm_s);
#endif
- EEPROM_WRITE(parser.volumetric_enabled);
+ //
+ // Volumetric & Filament Size
+ //
+ #if DISABLED(NO_VOLUMETRICS)
- // Save filament sizes
- for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
- if (q < COUNT(planner.filament_size)) dummy = planner.filament_size[q];
- EEPROM_WRITE(dummy);
- }
+ EEPROM_WRITE(parser.volumetric_enabled);
+
+ // Save filament sizes
+ for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
+ if (q < COUNT(planner.filament_size)) dummy = planner.filament_size[q];
+ EEPROM_WRITE(dummy);
+ }
+
+ #endif
// Save TMC2130 or TMC2208 Configuration, and placeholder values
uint16_t val;
@@ -1028,12 +1037,16 @@ 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;
- }
+ 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,15 +1497,19 @@ void MarlinSettings::reset() {
fwretract.reset();
#endif
- parser.volumetric_enabled =
- #if ENABLED(VOLUMETRIC_DEFAULT_ON)
- true
- #else
- false
- #endif
- ;
- for (uint8_t q = 0; q < COUNT(planner.filament_size); q++)
- planner.filament_size[q] = DEFAULT_NOMINAL_FILAMENT_DIA;
+ #if DISABLED(NO_VOLUMETRICS)
+
+ parser.volumetric_enabled =
+ #if ENABLED(VOLUMETRIC_DEFAULT_ON)
+ true
+ #else
+ false
+ #endif
+ ;
+ 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)
@@ -1630,46 +1647,50 @@ void MarlinSettings::reset() {
SERIAL_EOL();
- /**
- * Volumetric extrusion M200
- */
- if (!forReplay) {
- CONFIG_ECHO_START;
- SERIAL_ECHOPGM("Filament settings:");
- if (parser.volumetric_enabled)
- SERIAL_EOL();
- else
- SERIAL_ECHOLNPGM(" Disabled");
- }
+ #if DISABLED(NO_VOLUMETRICS)
- CONFIG_ECHO_START;
- SERIAL_ECHOPAIR(" M200 D", LINEAR_UNIT(planner.filament_size[0]));
- SERIAL_EOL();
- #if EXTRUDERS > 1
- CONFIG_ECHO_START;
- SERIAL_ECHOPAIR(" M200 T1 D", LINEAR_UNIT(planner.filament_size[1]));
- SERIAL_EOL();
- #if EXTRUDERS > 2
+ /**
+ * Volumetric extrusion M200
+ */
+ if (!forReplay) {
CONFIG_ECHO_START;
- SERIAL_ECHOPAIR(" M200 T2 D", LINEAR_UNIT(planner.filament_size[2]));
- SERIAL_EOL();
- #if EXTRUDERS > 3
- CONFIG_ECHO_START;
- SERIAL_ECHOPAIR(" M200 T3 D", LINEAR_UNIT(planner.filament_size[3]));
+ SERIAL_ECHOPGM("Filament settings:");
+ if (parser.volumetric_enabled)
SERIAL_EOL();
- #if EXTRUDERS > 4
- CONFIG_ECHO_START;
- SERIAL_ECHOPAIR(" M200 T4 D", LINEAR_UNIT(planner.filament_size[4]));
- SERIAL_EOL();
- #endif // EXTRUDERS > 4
- #endif // EXTRUDERS > 3
- #endif // EXTRUDERS > 2
- #endif // EXTRUDERS > 1
+ else
+ SERIAL_ECHOLNPGM(" Disabled");
+ }
- if (!parser.volumetric_enabled) {
CONFIG_ECHO_START;
- SERIAL_ECHOLNPGM(" M200 D0");
- }
+ SERIAL_ECHOPAIR(" M200 D", LINEAR_UNIT(planner.filament_size[0]));
+ SERIAL_EOL();
+ #if EXTRUDERS > 1
+ CONFIG_ECHO_START;
+ SERIAL_ECHOPAIR(" M200 T1 D", LINEAR_UNIT(planner.filament_size[1]));
+ SERIAL_EOL();
+ #if EXTRUDERS > 2
+ CONFIG_ECHO_START;
+ SERIAL_ECHOPAIR(" M200 T2 D", LINEAR_UNIT(planner.filament_size[2]));
+ SERIAL_EOL();
+ #if EXTRUDERS > 3
+ CONFIG_ECHO_START;
+ SERIAL_ECHOPAIR(" M200 T3 D", LINEAR_UNIT(planner.filament_size[3]));
+ SERIAL_EOL();
+ #if EXTRUDERS > 4
+ CONFIG_ECHO_START;
+ SERIAL_ECHOPAIR(" M200 T4 D", LINEAR_UNIT(planner.filament_size[4]));
+ SERIAL_EOL();
+ #endif // EXTRUDERS > 4
+ #endif // EXTRUDERS > 3
+ #endif // EXTRUDERS > 2
+ #endif // EXTRUDERS > 1
+
+ if (!parser.volumetric_enabled) {
+ CONFIG_ECHO_START;
+ SERIAL_ECHOLNPGM(" M200 D0");
+ }
+
+ #endif // !NO_VOLUMETRICS
if (!forReplay) {
CONFIG_ECHO_START;
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 80c2ec1f77..1155d1d58c 100644
--- a/Marlin/src/module/planner.cpp
+++ b/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
- 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
+float Planner::e_factor[EXTRUDERS]; // The flow percentage and volumetric multiplier combine to scale E movement
+
+#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,25 +564,29 @@ void Planner::check_axes_activity() {
#endif
}
-/**
- * Get a volumetric multiplier from a filament diameter.
- * This is the reciprocal of the circular cross-section area.
- * Return 1.0 with volumetric off or a diameter of 0.0.
- */
-inline float calculate_volumetric_multiplier(const float &diameter) {
- return (parser.volumetric_enabled && diameter) ? 1.0 / CIRCLE_AREA(diameter * 0.5) : 1.0;
-}
+#if DISABLED(NO_VOLUMETRICS)
-/**
- * Convert the filament sizes into volumetric multipliers.
- * The multiplier converts a given E value into a length.
- */
-void Planner::calculate_volumetric_multipliers() {
- for (uint8_t i = 0; i < COUNT(filament_size); i++) {
- volumetric_multiplier[i] = calculate_volumetric_multiplier(filament_size[i]);
- refresh_e_factor(i);
+ /**
+ * Get a volumetric multiplier from a filament diameter.
+ * This is the reciprocal of the circular cross-section area.
+ * Return 1.0 with volumetric off or a diameter of 0.0.
+ */
+ inline float calculate_volumetric_multiplier(const float &diameter) {
+ return (parser.volumetric_enabled && diameter) ? 1.0 / CIRCLE_AREA(diameter * 0.5) : 1.0;
}
-}
+
+ /**
+ * Convert the filament sizes into volumetric multipliers.
+ * The multiplier converts a given E value into a length.
+ */
+ void Planner::calculate_volumetric_multipliers() {
+ for (uint8_t i = 0; i < COUNT(filament_size); i++) {
+ volumetric_multiplier[i] = calculate_volumetric_multiplier(filament_size[i]);
+ refresh_e_factor(i);
+ }
+ }
+
+#endif // !NO_VOLUMETRICS
#if ENABLED(FILAMENT_WIDTH_SENSOR)
/**
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 842ff2d213..444073eef0 100644
--- a/Marlin/src/module/planner.h
+++ b/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
- 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
+ static float e_factor[EXTRUDERS]; // The flow percentage and volumetric multiplier combine to scale E movement
+
+ #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,12 +304,16 @@ class Planner {
void calculate_volumetric_for_width_sensor(const int8_t encoded_ratio);
#endif
- 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
- for (uint8_t i = 0; i < COUNT(filament_size); i++)
- if (!filament_size[i]) filament_size[i] = DEFAULT_NOMINAL_FILAMENT_DIA;
- }
+ #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
+ for (uint8_t i = 0; i < COUNT(filament_size); i++)
+ if (!filament_size[i]) filament_size[i] = DEFAULT_NOMINAL_FILAMENT_DIA;
+ }
+
+ #endif
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)