|
|
@ -565,16 +565,8 @@ void Config_ResetDefault() {
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
volumetric_enabled = false;
|
|
|
|
volumetric_enabled = false;
|
|
|
|
filament_size[0] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
|
|
|
for (int q=0; q<COUNT(filament_size); q++)
|
|
|
|
#if EXTRUDERS > 1
|
|
|
|
filament_size[q] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
|
|
|
filament_size[1] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
|
|
|
|
|
|
|
#if EXTRUDERS > 2
|
|
|
|
|
|
|
|
filament_size[2] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
|
|
|
|
|
|
|
#if EXTRUDERS > 3
|
|
|
|
|
|
|
|
filament_size[3] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
calculate_volumetric_multipliers();
|
|
|
|
calculate_volumetric_multipliers();
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
SERIAL_ECHO_START;
|
|
|
@ -826,16 +818,21 @@ void Config_PrintSettings(bool forReplay) {
|
|
|
|
|
|
|
|
|
|
|
|
#endif // FWRETRACT
|
|
|
|
#endif // FWRETRACT
|
|
|
|
|
|
|
|
|
|
|
|
if (volumetric_enabled) {
|
|
|
|
/**
|
|
|
|
|
|
|
|
* Volumetric extrusion M200
|
|
|
|
|
|
|
|
*/
|
|
|
|
if (!forReplay) {
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPGM("Filament settings:");
|
|
|
|
SERIAL_ECHOPGM("Filament settings:");
|
|
|
|
|
|
|
|
if (volumetric_enabled)
|
|
|
|
|
|
|
|
SERIAL_EOL;
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
SERIAL_ECHOLNPGM(" Disabled");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M200 D", filament_size[0]);
|
|
|
|
SERIAL_ECHOPAIR(" M200 D", filament_size[0]);
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
|
|
|
|
|
|
|
|
#if EXTRUDERS > 1
|
|
|
|
#if EXTRUDERS > 1
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M200 T1 D", filament_size[1]);
|
|
|
|
SERIAL_ECHOPAIR(" M200 T1 D", filament_size[1]);
|
|
|
@ -852,13 +849,14 @@ void Config_PrintSettings(bool forReplay) {
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
if (!volumetric_enabled) {
|
|
|
|
if (!forReplay) {
|
|
|
|
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPGM("Filament settings: Disabled");
|
|
|
|
SERIAL_ECHOLNPGM(" M200 D0");
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* Auto Bed Leveling
|
|
|
|
|
|
|
|
*/
|
|
|
|
#ifdef ENABLE_AUTO_BED_LEVELING
|
|
|
|
#ifdef ENABLE_AUTO_BED_LEVELING
|
|
|
|
#ifdef CUSTOM_M_CODES
|
|
|
|
#ifdef CUSTOM_M_CODES
|
|
|
|
if (!forReplay) {
|
|
|
|
if (!forReplay) {
|
|
|
|