Allow enabling volumetric filament on config load
This commit is contained in:
parent
0c0c840ba8
commit
0d147ead66
19 changed files with 168 additions and 2 deletions
|
@ -1085,4 +1085,14 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -388,7 +388,13 @@ int feedrate_percentage = 100, saved_feedrate_percentage,
|
||||||
flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100);
|
flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100);
|
||||||
|
|
||||||
bool axis_relative_modes[] = AXIS_RELATIVE_MODES,
|
bool axis_relative_modes[] = AXIS_RELATIVE_MODES,
|
||||||
volumetric_enabled = false;
|
volumetric_enabled =
|
||||||
|
#if ENABLED(VOLUMETRIC_DEFAULT_ON)
|
||||||
|
true
|
||||||
|
#else
|
||||||
|
false
|
||||||
|
#endif
|
||||||
|
;
|
||||||
float filament_size[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_NOMINAL_FILAMENT_DIA),
|
float filament_size[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_NOMINAL_FILAMENT_DIA),
|
||||||
volumetric_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(1.0);
|
volumetric_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(1.0);
|
||||||
|
|
||||||
|
|
|
@ -824,7 +824,13 @@ void Config_ResetDefault() {
|
||||||
retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE;
|
retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
volumetric_enabled = false;
|
volumetric_enabled =
|
||||||
|
#if ENABLED(VOLUMETRIC_DEFAULT_ON)
|
||||||
|
true
|
||||||
|
#else
|
||||||
|
false
|
||||||
|
#endif
|
||||||
|
;
|
||||||
for (uint8_t q = 0; q < COUNT(filament_size); q++)
|
for (uint8_t q = 0; q < COUNT(filament_size); q++)
|
||||||
filament_size[q] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
filament_size[q] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
||||||
|
|
||||||
|
|
|
@ -1080,4 +1080,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1085,4 +1085,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1085,4 +1085,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1068,4 +1068,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1093,4 +1093,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1080,4 +1080,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1085,4 +1085,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1085,4 +1085,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1088,4 +1088,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1085,4 +1085,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1087,4 +1087,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1087,4 +1087,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1092,4 +1092,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1087,4 +1087,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1085,4 +1085,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
|
@ -1085,4 +1085,13 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#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.
|
||||||
|
*/
|
||||||
|
//#define VOLUMETRIC_DEFAULT_ON
|
||||||
|
|
||||||
#endif // CONFIGURATION_ADV_H
|
#endif // CONFIGURATION_ADV_H
|
||||||
|
|
Reference in a new issue