|
|
@ -672,13 +672,19 @@ void MarlinSettings::postprocess() {
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
EEPROM_WRITE(lcd_contrast);
|
|
|
|
EEPROM_WRITE(lcd_contrast);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const bool autoretract_enabled =
|
|
|
|
|
|
|
|
#if DISABLED(FWRETRACT_AUTORETRACT)
|
|
|
|
|
|
|
|
false
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
fwretract.autoretract_enabled
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
;
|
|
|
|
|
|
|
|
EEPROM_WRITE(autoretract_enabled);
|
|
|
|
|
|
|
|
|
|
|
|
#if DISABLED(FWRETRACT)
|
|
|
|
#if DISABLED(FWRETRACT)
|
|
|
|
const bool autoretract_enabled = false;
|
|
|
|
|
|
|
|
const float autoretract_defaults[] = { 3, 45, 0, 0, 0, 13, 0, 8 };
|
|
|
|
const float autoretract_defaults[] = { 3, 45, 0, 0, 0, 13, 0, 8 };
|
|
|
|
EEPROM_WRITE(autoretract_enabled);
|
|
|
|
|
|
|
|
EEPROM_WRITE(autoretract_defaults);
|
|
|
|
EEPROM_WRITE(autoretract_defaults);
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
EEPROM_WRITE(fwretract.autoretract_enabled);
|
|
|
|
|
|
|
|
EEPROM_WRITE(fwretract.retract_length);
|
|
|
|
EEPROM_WRITE(fwretract.retract_length);
|
|
|
|
EEPROM_WRITE(fwretract.retract_feedrate_mm_s);
|
|
|
|
EEPROM_WRITE(fwretract.retract_feedrate_mm_s);
|
|
|
|
EEPROM_WRITE(fwretract.retract_zlift);
|
|
|
|
EEPROM_WRITE(fwretract.retract_zlift);
|
|
|
@ -1070,7 +1076,7 @@ void MarlinSettings::postprocess() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
float dummy = 0;
|
|
|
|
float dummy = 0;
|
|
|
|
#if DISABLED(AUTO_BED_LEVELING_UBL) || DISABLED(FWRETRACT) || ENABLED(NO_VOLUMETRICS)
|
|
|
|
#if DISABLED(AUTO_BED_LEVELING_UBL) || DISABLED(FWRETRACT) || DISABLED(FWRETRACT_AUTORETRACT) || ENABLED(NO_VOLUMETRICS)
|
|
|
|
bool dummyb;
|
|
|
|
bool dummyb;
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
@ -1374,7 +1380,11 @@ void MarlinSettings::postprocess() {
|
|
|
|
//
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(FWRETRACT)
|
|
|
|
#if ENABLED(FWRETRACT)
|
|
|
|
|
|
|
|
#if DISABLED(FWRETRACT_AUTORETRACT)
|
|
|
|
|
|
|
|
EEPROM_READ(dummyb);
|
|
|
|
|
|
|
|
#else
|
|
|
|
EEPROM_READ(fwretract.autoretract_enabled);
|
|
|
|
EEPROM_READ(fwretract.autoretract_enabled);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
EEPROM_READ(fwretract.retract_length);
|
|
|
|
EEPROM_READ(fwretract.retract_length);
|
|
|
|
EEPROM_READ(fwretract.retract_feedrate_mm_s);
|
|
|
|
EEPROM_READ(fwretract.retract_feedrate_mm_s);
|
|
|
|
EEPROM_READ(fwretract.retract_zlift);
|
|
|
|
EEPROM_READ(fwretract.retract_zlift);
|
|
|
@ -2620,6 +2630,8 @@ void MarlinSettings::reset(PORTARG_SOLO) {
|
|
|
|
SERIAL_ECHOPAIR_P(port, " W", LINEAR_UNIT(fwretract.swap_retract_recover_length));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " W", LINEAR_UNIT(fwretract.swap_retract_recover_length));
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " F", MMS_TO_MMM(LINEAR_UNIT(fwretract.retract_recover_feedrate_mm_s)));
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " F", MMS_TO_MMM(LINEAR_UNIT(fwretract.retract_recover_feedrate_mm_s)));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(FWRETRACT_AUTORETRACT)
|
|
|
|
|
|
|
|
|
|
|
|
if (!forReplay) {
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPGM_P(port, "Auto-Retract: S=0 to disable, 1 to interpret E-only moves as retract/recover");
|
|
|
|
SERIAL_ECHOLNPGM_P(port, "Auto-Retract: S=0 to disable, 1 to interpret E-only moves as retract/recover");
|
|
|
@ -2627,6 +2639,8 @@ void MarlinSettings::reset(PORTARG_SOLO) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " M209 S", fwretract.autoretract_enabled ? 1 : 0);
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " M209 S", fwretract.autoretract_enabled ? 1 : 0);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif // FWRETRACT_AUTORETRACT
|
|
|
|
|
|
|
|
|
|
|
|
#endif // FWRETRACT
|
|
|
|
#endif // FWRETRACT
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|