diff --git a/.travis.yml b/.travis.yml
index 370b4ea26d1e387fecc65452abb156cd51684534..cbd29896b9075b6cced7b8e7ac94f92bdf50f000 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,7 +76,8 @@ script:
- build_marlin
#
# Test 2 extruders (one MAX6675) and heated bed on basic RAMPS 1.4
- # plus a "Fix Mounted" Probe with Safe Homing and some arc options
+ # Test a "Fix Mounted" Probe with Safe Homing, some arc options,
+ # linear bed leveling, M48, leveling debug, and firmware retraction.
#
- opt_set MOTHERBOARD BOARD_RAMPS_14_EEB
- opt_set EXTRUDERS 2
@@ -84,12 +85,10 @@ script:
- opt_set TEMP_SENSOR_1 1
- opt_set TEMP_SENSOR_BED 1
- opt_enable PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING ARC_P_CIRCLES CNC_WORKSPACE_PLANES
+ - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS
- opt_enable BLINKM PCA9632 RGB_LED NEOPIXEL_RGBW_LED
- - build_marlin
- #
- # ...with AUTO_BED_LEVELING_LINEAR, Z_MIN_PROBE_REPEATABILITY_TEST, and DEBUG_LEVELING_FEATURE
- #
- opt_enable AUTO_BED_LEVELING_LINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE
+ - opt_enable_adv FWRETRACT
- opt_set ABL_GRID_POINTS_X 16
- opt_set ABL_GRID_POINTS_Y 16
- build_marlin
diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h
index c8dacd335eea1e45916e05fcc0f122df4e64c5b8..998863d1263ef3589083ca64ebea7d9e3e17ce6b 100644
--- a/Marlin/Conditionals_post.h
+++ b/Marlin/Conditionals_post.h
@@ -189,6 +189,13 @@
#define DEFAULT_KEEPALIVE_INTERVAL 2
#endif
+ /**
+ * Provide a MAX_AUTORETRACT for older configs
+ */
+ #if ENABLED(FWRETRACT) && !defined(MAX_AUTORETRACT)
+ #define MAX_AUTORETRACT 99
+ #endif
+
/**
* MAX_STEP_FREQUENCY differs for TOSHIBA
*/
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 18276639c6eb0c75c76ffb806ec143984a0bf540..3a8a8cc8ca47463716c06c579199afd1ea8d8856 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -764,7 +764,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -774,7 +774,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index 543fbcc5ee3274c06409850a4f67eacb77e3ec4c..1e65d1b4eb146358cc8b7947f82cd6290405b5dd 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -383,10 +383,15 @@ extern float soft_endstop_min[XYZ], soft_endstop_max[XYZ];
#endif
#if ENABLED(FWRETRACT)
- extern bool autoretract_enabled;
- extern bool retracted[EXTRUDERS]; // extruder[n].retracted
- extern float retract_length, retract_length_swap, retract_feedrate_mm_s, retract_zlift;
- extern float retract_recover_length, retract_recover_length_swap, retract_recover_feedrate_mm_s;
+ extern bool autoretract_enabled; // M209 S - Autoretract switch
+ extern float retract_length, // M207 S - G10 Retract length
+ retract_feedrate_mm_s, // M207 F - G10 Retract feedrate
+ retract_zlift, // M207 Z - G10 Retract hop size
+ retract_recover_length, // M208 S - G11 Recover length
+ retract_recover_feedrate_mm_s, // M208 F - G11 Recover feedrate
+ swap_retract_length, // M207 W - G10 Swap Retract length
+ swap_retract_recover_length, // M208 W - G11 Swap Recover length
+ swap_retract_recover_feedrate_mm_s; // M208 R - G11 Swap Recover feedrate
#endif
// Print job timer
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 82cea9819e073451519fad8a071f3385661ce870..9cdb75cf5a83bbc3e20f9f5a2d3c57912891ccf7 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -557,20 +557,22 @@ static uint8_t target_extruder;
baricuda_e_to_p_pressure = 0;
#endif
-#if ENABLED(FWRETRACT)
-
- bool autoretract_enabled = false;
- bool retracted[EXTRUDERS] = { false };
- bool retracted_swap[EXTRUDERS] = { false };
-
- float retract_length = RETRACT_LENGTH;
- float retract_length_swap = RETRACT_LENGTH_SWAP;
- float retract_feedrate_mm_s = RETRACT_FEEDRATE;
- float retract_zlift = RETRACT_ZLIFT;
- float retract_recover_length = RETRACT_RECOVER_LENGTH;
- float retract_recover_length_swap = RETRACT_RECOVER_LENGTH_SWAP;
- float retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE;
-
+#if ENABLED(FWRETRACT) // Initialized by settings.load()...
+ bool autoretract_enabled, // M209 S - Autoretract switch
+ retracted[EXTRUDERS] = { false }; // Which extruders are currently retracted
+ float retract_length, // M207 S - G10 Retract length
+ retract_feedrate_mm_s, // M207 F - G10 Retract feedrate
+ retract_zlift, // M207 Z - G10 Retract hop size
+ retract_recover_length, // M208 S - G11 Recover length
+ retract_recover_feedrate_mm_s, // M208 F - G11 Recover feedrate
+ swap_retract_length, // M207 W - G10 Swap Retract length
+ swap_retract_recover_length, // M208 W - G11 Swap Recover length
+ swap_retract_recover_feedrate_mm_s; // M208 R - G11 Swap Recover feedrate
+ #if EXTRUDERS > 1
+ bool retracted_swap[EXTRUDERS] = { false }; // Which extruders are swap-retracted
+ #else
+ constexpr bool retracted_swap[1] = { false };
+ #endif
#endif // FWRETRACT
#if HAS_POWER_SWITCH
@@ -3100,55 +3102,126 @@ static void homeaxis(const AxisEnum axis) {
#if ENABLED(FWRETRACT)
- void retract(const bool retracting, const bool swapping = false) {
+ /**
+ * Retract or recover according to firmware settings
+ *
+ * This function handles retract/recover moves for G10 and G11,
+ * plus auto-retract moves sent from G0/G1 when E-only moves are done.
+ *
+ * To simplify the logic, doubled retract/recover moves are ignored.
+ *
+ * Note: Z lift is done transparently to the planner. Aborting
+ * a print between G10 and G11 may corrupt the Z position.
+ *
+ * Note: Auto-retract will apply the set Z hop in addition to any Z hop
+ * included in the G-code. Use M207 Z0 to to prevent double hop.
+ */
+ void retract(const bool retracting
+ #if EXTRUDERS > 1
+ , bool swapping = false
+ #endif
+ ) {
- static float hop_height;
+ static float hop_height, // Remember where the Z height started
+ hop_amount = 0.0; // Total amount lifted, for use in recover
- if (retracting == retracted[active_extruder]) return;
+ // Simply never allow two retracts or recovers in a row
+ if (retracted[active_extruder] == retracting) return;
+
+ #if EXTRUDERS < 2
+ bool swapping = false;
+ #endif
+ if (!retracting) swapping = retracted_swap[active_extruder];
+
+ /* // debugging
+ SERIAL_ECHOLNPAIR("retracting ", retracting);
+ SERIAL_ECHOLNPAIR("swapping ", swapping);
+ SERIAL_ECHOLNPAIR("active extruder ", active_extruder);
+ for (uint8_t i = 0; i < EXTRUDERS; ++i) {
+ SERIAL_ECHOPAIR("retracted[", i);
+ SERIAL_ECHOLNPAIR("] ", retracted[i]);
+ SERIAL_ECHOPAIR("retracted_swap[", i);
+ SERIAL_ECHOLNPAIR("] ", retracted_swap[i]);
+ }
+ SERIAL_ECHOLNPAIR("current_position[z] ", current_position[Z_AXIS]);
+ SERIAL_ECHOLNPAIR("hop_amount ", hop_amount);
+ //*/
+
+ const bool has_zhop = retract_zlift > 0.01; // Is there a hop set?
const float old_feedrate_mm_s = feedrate_mm_s;
+ const int16_t old_flow = flow_percentage[active_extruder];
+ // Don't apply flow multiplication to retract/recover
+ flow_percentage[active_extruder] = 100;
+
+ // The current position will be the destination for E and Z moves
set_destination_to_current();
if (retracting) {
+ // Remember the Z height since G-code may include its own Z-hop
+ // For best results turn off Z hop if G-code already includes it
+ hop_height = destination[Z_AXIS];
+ // Retract by moving from a faux E position back to the current E position
feedrate_mm_s = retract_feedrate_mm_s;
- current_position[E_AXIS] += (swapping ? retract_length_swap : retract_length) / volumetric_multiplier[active_extruder];
+ current_position[E_AXIS] += (swapping ? swap_retract_length : retract_length) / volumetric_multiplier[active_extruder];
sync_plan_position_e();
prepare_move_to_destination();
- if (retract_zlift > 0.01) {
- hop_height = current_position[Z_AXIS];
- // Pretend current position is lower
- current_position[Z_AXIS] -= retract_zlift;
- SYNC_PLAN_POSITION_KINEMATIC();
- // Raise up to the old current_position
- prepare_move_to_destination();
+ // Is a Z hop set, and has the hop not yet been done?
+ if (has_zhop) {
+ hop_amount += retract_zlift; // Carriage is raised for retraction hop
+ current_position[Z_AXIS] -= retract_zlift; // Pretend current pos is lower. Next move raises Z.
+ SYNC_PLAN_POSITION_KINEMATIC(); // Set the planner to the new position
+ prepare_move_to_destination(); // Raise up to the old current pos
}
}
else {
-
- // If the height hasn't been lowered, undo the Z hop
- if (retract_zlift > 0.01 && hop_height <= current_position[Z_AXIS]) {
- // Pretend current position is higher. Z will lower on the next move
- current_position[Z_AXIS] += retract_zlift;
- SYNC_PLAN_POSITION_KINEMATIC();
- // Lower Z
- prepare_move_to_destination();
+ // If a hop was done and Z hasn't changed, undo the Z hop
+ if (hop_amount && NEAR(hop_height, destination[Z_AXIS])) {
+ current_position[Z_AXIS] += hop_amount; // Pretend current pos is higher. Next move lowers Z.
+ SYNC_PLAN_POSITION_KINEMATIC(); // Set the planner to the new position
+ prepare_move_to_destination(); // Lower to the old current pos
+ hop_amount = 0.0;
}
- feedrate_mm_s = retract_recover_feedrate_mm_s;
- const float move_e = swapping ? retract_length_swap + retract_recover_length_swap : retract_length + retract_recover_length;
+ // A retract multiplier has been added here to get faster swap recovery
+ feedrate_mm_s = swapping ? swap_retract_recover_feedrate_mm_s : retract_recover_feedrate_mm_s;
+
+ const float move_e = swapping ? swap_retract_length + swap_retract_recover_length : retract_length + retract_recover_length;
current_position[E_AXIS] -= move_e / volumetric_multiplier[active_extruder];
sync_plan_position_e();
- // Recover E
- prepare_move_to_destination();
+ prepare_move_to_destination(); // Recover E
}
+ // Restore flow and feedrate
+ flow_percentage[active_extruder] = old_flow;
feedrate_mm_s = old_feedrate_mm_s;
+
+ // The active extruder is now retracted or recovered
retracted[active_extruder] = retracting;
+ // If swap retract/recover then update the retracted_swap flag too
+ #if EXTRUDERS > 1
+ if (swapping) retracted_swap[active_extruder] = retracting;
+ #endif
+
+ /* // debugging
+ SERIAL_ECHOLNPAIR("retracting ", retracting);
+ SERIAL_ECHOLNPAIR("swapping ", swapping);
+ SERIAL_ECHOLNPAIR("active_extruder ", active_extruder);
+ for (uint8_t i = 0; i < EXTRUDERS; ++i) {
+ SERIAL_ECHOPAIR("retracted[", i);
+ SERIAL_ECHOLNPAIR("] ", retracted[i]);
+ SERIAL_ECHOPAIR("retracted_swap[", i);
+ SERIAL_ECHOLNPAIR("] ", retracted_swap[i]);
+ }
+ SERIAL_ECHOLNPAIR("current_position[z] ", current_position[Z_AXIS]);
+ SERIAL_ECHOLNPAIR("hop_amount ", hop_amount);
+ //*/
+
} // retract()
#endif // FWRETRACT
@@ -3277,18 +3350,18 @@ inline void gcode_G0_G1(
gcode_get_destination(); // For X Y Z E F
#if ENABLED(FWRETRACT)
-
- if (autoretract_enabled && !(parser.seen('X') || parser.seen('Y') || parser.seen('Z')) && parser.seen('E')) {
- const float echange = destination[E_AXIS] - current_position[E_AXIS];
- // Is this move an attempt to retract or recover?
- if ((echange < -(MIN_RETRACT) && !retracted[active_extruder]) || (echange > MIN_RETRACT && retracted[active_extruder])) {
- current_position[E_AXIS] = destination[E_AXIS]; // hide the slicer-generated retract/recover from calculations
- sync_plan_position_e(); // AND from the planner
- retract(!retracted[active_extruder]);
- return;
+ if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
+ // When M209 Autoretract is enabled, convert E-only moves to firmware retract/recover moves
+ if (autoretract_enabled && parser.seen('E') && !(parser.seen('X') || parser.seen('Y') || parser.seen('Z'))) {
+ const float echange = destination[E_AXIS] - current_position[E_AXIS];
+ // Is this a retract or recover move?
+ if (WITHIN(FABS(echange), MIN_AUTORETRACT, MAX_AUTORETRACT) && retracted[active_extruder] == (echange > 0.0)) {
+ current_position[E_AXIS] = destination[E_AXIS]; // Hide a G1-based retract/recover from calculations
+ sync_plan_position_e(); // AND from the planner
+ return retract(echange < 0.0); // Firmware-based retract/recover (double-retract ignored)
+ }
}
}
-
#endif // FWRETRACT
#if IS_SCARA
@@ -8486,7 +8559,7 @@ inline void gcode_M205() {
* M207: Set firmware retraction values
*
* S[+units] retract_length
- * W[+units] retract_length_swap (multi-extruder)
+ * W[+units] swap_retract_length (multi-extruder)
* F[units/min] retract_feedrate_mm_s
* Z[units] retract_zlift
*/
@@ -8494,24 +8567,22 @@ inline void gcode_M205() {
if (parser.seen('S')) retract_length = parser.value_axis_units(E_AXIS);
if (parser.seen('F')) retract_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
if (parser.seen('Z')) retract_zlift = parser.value_linear_units();
- #if EXTRUDERS > 1
- if (parser.seen('W')) retract_length_swap = parser.value_axis_units(E_AXIS);
- #endif
+ if (parser.seen('W')) swap_retract_length = parser.value_axis_units(E_AXIS);
}
/**
* M208: Set firmware un-retraction values
*
* S[+units] retract_recover_length (in addition to M207 S*)
- * W[+units] retract_recover_length_swap (multi-extruder)
+ * W[+units] swap_retract_recover_length (multi-extruder)
* F[units/min] retract_recover_feedrate_mm_s
+ * R[units/min] swap_retract_recover_feedrate_mm_s
*/
inline void gcode_M208() {
if (parser.seen('S')) retract_recover_length = parser.value_axis_units(E_AXIS);
if (parser.seen('F')) retract_recover_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
- #if EXTRUDERS > 1
- if (parser.seen('W')) retract_recover_length_swap = parser.value_axis_units(E_AXIS);
- #endif
+ if (parser.seen('R')) swap_retract_recover_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
+ if (parser.seen('W')) swap_retract_recover_length = parser.value_axis_units(E_AXIS);
}
/**
@@ -8520,9 +8591,11 @@ inline void gcode_M205() {
* moves will be classified as retraction.
*/
inline void gcode_M209() {
- if (parser.seen('S')) {
- autoretract_enabled = parser.value_bool();
- for (int i = 0; i < EXTRUDERS; i++) retracted[i] = false;
+ if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
+ if (parser.seen('S')) {
+ autoretract_enabled = parser.value_bool();
+ for (uint8_t i = 0; i < EXTRUDERS; i++) retracted[i] = false;
+ }
}
}
@@ -10987,7 +11060,7 @@ void process_next_command() {
gcode_M208();
break;
case 209: // M209: Turn Automatic Retract Detection on/off
- gcode_M209();
+ if (MIN_AUTORETRACT <= MAX_AUTORETRACT) gcode_M209();
break;
#endif // FWRETRACT
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index 448be0f04c69ddf1b571ff0ce0c5c31af9428c2c..117378add03d9e65ab5451eff1adbddbc8d56cb4 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -206,6 +206,8 @@
#error "Replace SLED_PIN with SOL1_PIN (applies to both Z_PROBE_SLED and SOLENOID_PROBE)."
#elif defined(CONTROLLERFAN_PIN)
#error "CONTROLLERFAN_PIN is now CONTROLLER_FAN_PIN, enabled with USE_CONTROLLER_FAN. Please update your Configuration_adv.h."
+#elif defined(MIN_RETRACT)
+ #error "MIN_RETRACT is now MIN_AUTORETRACT and MAX_AUTORETRACT. Please update your Configuration_adv.h."
#endif
/**
diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp
index c86ba08599fb28196e6c02de95bd47b5e575761b..aa34f9633c2e3f54076b9b5ffd42b95470a34824 100644
--- a/Marlin/configuration_store.cpp
+++ b/Marlin/configuration_store.cpp
@@ -36,7 +36,7 @@
*
*/
-#define EEPROM_VERSION "V39"
+#define EEPROM_VERSION "V40"
// Change EEPROM version if these are changed:
#define EEPROM_OFFSET 100
@@ -125,44 +125,45 @@
* DOGLCD: 2 bytes
* 502 M250 C lcd_contrast (uint16_t)
*
- * FWRETRACT: 29 bytes
+ * FWRETRACT: 33 bytes
* 504 M209 S autoretract_enabled (bool)
* 505 M207 S retract_length (float)
- * 509 M207 W retract_length_swap (float)
- * 513 M207 F retract_feedrate_mm_s (float)
- * 517 M207 Z retract_zlift (float)
- * 521 M208 S retract_recover_length (float)
- * 525 M208 W retract_recover_length_swap (float)
- * 529 M208 F retract_recover_feedrate_mm_s (float)
+ * 509 M207 F retract_feedrate_mm_s (float)
+ * 513 M207 Z retract_zlift (float)
+ * 517 M208 S retract_recover_length (float)
+ * 521 M208 F retract_recover_feedrate_mm_s (float)
+ * 525 M207 W swap_retract_length (float)
+ * 529 M208 W swap_retract_recover_length (float)
+ * 533 M208 R swap_retract_recover_feedrate_mm_s (float)
*
* Volumetric Extrusion: 21 bytes
- * 533 M200 D volumetric_enabled (bool)
- * 534 M200 T D filament_size (float x5) (T0..3)
+ * 537 M200 D volumetric_enabled (bool)
+ * 538 M200 T D filament_size (float x5) (T0..3)
*
* HAVE_TMC2130: 20 bytes
- * 554 M906 X Stepper X current (uint16_t)
- * 556 M906 Y Stepper Y current (uint16_t)
- * 558 M906 Z Stepper Z current (uint16_t)
- * 560 M906 X2 Stepper X2 current (uint16_t)
- * 562 M906 Y2 Stepper Y2 current (uint16_t)
- * 564 M906 Z2 Stepper Z2 current (uint16_t)
- * 566 M906 E0 Stepper E0 current (uint16_t)
- * 568 M906 E1 Stepper E1 current (uint16_t)
- * 570 M906 E2 Stepper E2 current (uint16_t)
- * 572 M906 E3 Stepper E3 current (uint16_t)
- * 576 M906 E4 Stepper E4 current (uint16_t)
+ * 558 M906 X Stepper X current (uint16_t)
+ * 560 M906 Y Stepper Y current (uint16_t)
+ * 562 M906 Z Stepper Z current (uint16_t)
+ * 564 M906 X2 Stepper X2 current (uint16_t)
+ * 566 M906 Y2 Stepper Y2 current (uint16_t)
+ * 568 M906 Z2 Stepper Z2 current (uint16_t)
+ * 570 M906 E0 Stepper E0 current (uint16_t)
+ * 572 M906 E1 Stepper E1 current (uint16_t)
+ * 574 M906 E2 Stepper E2 current (uint16_t)
+ * 576 M906 E3 Stepper E3 current (uint16_t)
+ * 580 M906 E4 Stepper E4 current (uint16_t)
*
* LIN_ADVANCE: 8 bytes
- * 580 M900 K extruder_advance_k (float)
- * 584 M900 WHD advance_ed_ratio (float)
+ * 584 M900 K extruder_advance_k (float)
+ * 588 M900 WHD advance_ed_ratio (float)
*
* HAS_MOTOR_CURRENT_PWM:
- * 588 M907 X Stepper XY current (uint32_t)
- * 592 M907 Z Stepper Z current (uint32_t)
- * 596 M907 E Stepper E current (uint32_t)
+ * 592 M907 X Stepper XY current (uint32_t)
+ * 596 M907 Z Stepper Z current (uint32_t)
+ * 600 M907 E Stepper E current (uint32_t)
*
- * 600 Minimum end-point
- * 1921 (600 + 36 + 9 + 288 + 988) Maximum end-point
+ * 604 Minimum end-point
+ * 1925 (604 + 36 + 9 + 288 + 988) Maximum end-point
*
* ========================================================================
* meshes_begin (between max and min end-point, directly above)
@@ -520,26 +521,26 @@ void MarlinSettings::postprocess() {
#endif
EEPROM_WRITE(lcd_contrast);
- #if ENABLED(FWRETRACT)
- EEPROM_WRITE(autoretract_enabled);
- EEPROM_WRITE(retract_length);
- #if EXTRUDERS > 1
- EEPROM_WRITE(retract_length_swap);
- #else
- dummy = 0.0f;
- EEPROM_WRITE(dummy);
- #endif
- EEPROM_WRITE(retract_feedrate_mm_s);
- EEPROM_WRITE(retract_zlift);
- EEPROM_WRITE(retract_recover_length);
- #if EXTRUDERS > 1
- EEPROM_WRITE(retract_recover_length_swap);
- #else
- dummy = 0.0f;
- EEPROM_WRITE(dummy);
- #endif
- EEPROM_WRITE(retract_recover_feedrate_mm_s);
- #endif // FWRETRACT
+ #if DISABLED(FWRETRACT)
+ const bool autoretract_enabled = false;
+ const float retract_length = 3,
+ retract_feedrate_mm_s = 45,
+ retract_zlift = 0,
+ retract_recover_length = 0,
+ retract_recover_feedrate_mm_s = 0,
+ swap_retract_length = 13,
+ swap_retract_recover_length = 0,
+ swap_retract_recover_feedrate_mm_s = 8;
+ #endif
+ EEPROM_WRITE(autoretract_enabled);
+ EEPROM_WRITE(retract_length);
+ EEPROM_WRITE(retract_feedrate_mm_s);
+ EEPROM_WRITE(retract_zlift);
+ EEPROM_WRITE(retract_recover_length);
+ EEPROM_WRITE(retract_recover_feedrate_mm_s);
+ EEPROM_WRITE(swap_retract_length);
+ EEPROM_WRITE(swap_retract_recover_length);
+ EEPROM_WRITE(swap_retract_recover_feedrate_mm_s);
EEPROM_WRITE(volumetric_enabled);
@@ -620,7 +621,7 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(val);
#else
val = 0;
- for (uint8_t q = 0; q < 11; ++q) EEPROM_WRITE(val);
+ for (uint8_t q = 11; q--;) EEPROM_WRITE(val);
#endif
//
@@ -701,6 +702,7 @@ void MarlinSettings::postprocess() {
}
else {
float dummy = 0;
+ bool dummyb;
working_crc = 0; //clear before reading first "real data"
@@ -830,7 +832,6 @@ void MarlinSettings::postprocess() {
EEPROM_READ(ubl.state.z_offset);
EEPROM_READ(ubl.state.storage_slot);
#else
- bool dummyb;
uint8_t dummyui8;
EEPROM_READ(dummyb);
EEPROM_READ(dummy);
@@ -915,21 +916,17 @@ void MarlinSettings::postprocess() {
#if ENABLED(FWRETRACT)
EEPROM_READ(autoretract_enabled);
EEPROM_READ(retract_length);
- #if EXTRUDERS > 1
- EEPROM_READ(retract_length_swap);
- #else
- EEPROM_READ(dummy);
- #endif
EEPROM_READ(retract_feedrate_mm_s);
EEPROM_READ(retract_zlift);
EEPROM_READ(retract_recover_length);
- #if EXTRUDERS > 1
- EEPROM_READ(retract_recover_length_swap);
- #else
- EEPROM_READ(dummy);
- #endif
EEPROM_READ(retract_recover_feedrate_mm_s);
- #endif // FWRETRACT
+ EEPROM_READ(swap_retract_length);
+ EEPROM_READ(swap_retract_recover_length);
+ EEPROM_READ(swap_retract_recover_feedrate_mm_s);
+ #else
+ EEPROM_READ(dummyb);
+ for (uint8_t q=8; q--;) EEPROM_READ(dummy);
+ #endif
EEPROM_READ(volumetric_enabled);
@@ -1291,17 +1288,14 @@ void MarlinSettings::reset() {
#if ENABLED(FWRETRACT)
autoretract_enabled = false;
retract_length = RETRACT_LENGTH;
- #if EXTRUDERS > 1
- retract_length_swap = RETRACT_LENGTH_SWAP;
- #endif
retract_feedrate_mm_s = RETRACT_FEEDRATE;
retract_zlift = RETRACT_ZLIFT;
retract_recover_length = RETRACT_RECOVER_LENGTH;
- #if EXTRUDERS > 1
- retract_recover_length_swap = RETRACT_RECOVER_LENGTH_SWAP;
- #endif
retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE;
- #endif
+ swap_retract_length = RETRACT_LENGTH_SWAP;
+ swap_retract_recover_length = RETRACT_RECOVER_LENGTH_SWAP;
+ swap_retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE_SWAP;
+ #endif // FWRETRACT
volumetric_enabled =
#if ENABLED(VOLUMETRIC_DEFAULT_ON)
@@ -1753,9 +1747,7 @@ void MarlinSettings::reset() {
}
CONFIG_ECHO_START;
SERIAL_ECHOPAIR(" M207 S", LINEAR_UNIT(retract_length));
- #if EXTRUDERS > 1
- SERIAL_ECHOPAIR(" W", LINEAR_UNIT(retract_length_swap));
- #endif
+ SERIAL_ECHOPAIR(" W", LINEAR_UNIT(swap_retract_length));
SERIAL_ECHOPAIR(" F", MMS_TO_MMM(LINEAR_UNIT(retract_feedrate_mm_s)));
SERIAL_ECHOLNPAIR(" Z", LINEAR_UNIT(retract_zlift));
@@ -1765,14 +1757,12 @@ void MarlinSettings::reset() {
}
CONFIG_ECHO_START;
SERIAL_ECHOPAIR(" M208 S", LINEAR_UNIT(retract_recover_length));
- #if EXTRUDERS > 1
- SERIAL_ECHOPAIR(" W", LINEAR_UNIT(retract_recover_length_swap));
- #endif
+ SERIAL_ECHOPAIR(" W", LINEAR_UNIT(swap_retract_recover_length));
SERIAL_ECHOLNPAIR(" F", MMS_TO_MMM(LINEAR_UNIT(retract_recover_feedrate_mm_s)));
if (!forReplay) {
CONFIG_ECHO_START;
- SERIAL_ECHOLNPGM("Auto-Retract: S=0 to disable, 1 to interpret extrude-only moves as retracts or recoveries");
+ SERIAL_ECHOLNPGM("Auto-Retract: S=0 to disable, 1 to interpret E-only moves as retract/recover");
}
CONFIG_ECHO_START;
SERIAL_ECHOLNPAIR(" M209 S", autoretract_enabled ? 1 : 0);
diff --git a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
index 0fbb97caad3843b4321199fbf66f8e00bc823ae9..4e0e75df32d9143cd076692509fcdaae729bf5ae 100644
--- a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
+++ b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
@@ -757,7 +757,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -767,7 +767,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/Anet/A6/Configuration_adv.h b/Marlin/example_configurations/Anet/A6/Configuration_adv.h
index 5e0ce3bc63fdcea5345b911818bbaa5f81380d76..815d3c50e4c93b1b316f05cc8db69c114aa4943b 100644
--- a/Marlin/example_configurations/Anet/A6/Configuration_adv.h
+++ b/Marlin/example_configurations/Anet/A6/Configuration_adv.h
@@ -764,7 +764,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -774,7 +774,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/Anet/A8/Configuration_adv.h b/Marlin/example_configurations/Anet/A8/Configuration_adv.h
index 84ae700441c2de37e6c79c1a7715a68b17182cf5..001517038c2e1f06cb5a19e2af8eeb1649091cec 100644
--- a/Marlin/example_configurations/Anet/A8/Configuration_adv.h
+++ b/Marlin/example_configurations/Anet/A8/Configuration_adv.h
@@ -764,7 +764,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -774,7 +774,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
index 59970954915956f4296336ca432fe7ef57522588..a02bb78741185eb6b30cd821a8cc7df54d266ce5 100644
--- a/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
@@ -757,7 +757,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -767,7 +767,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
index 9a01afa9be15872c904d132be4d4753908cb1c9c..6abb987baac100698aac8afe2a78154747692e3a 100644
--- a/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
@@ -740,7 +740,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -750,7 +750,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
index 59970954915956f4296336ca432fe7ef57522588..a02bb78741185eb6b30cd821a8cc7df54d266ce5 100644
--- a/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
@@ -757,7 +757,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -767,7 +767,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h
index ddcbf5dca18f69e8de3c9da9112249f30c4ed7b6..a02849482c38eeec1cb1d8d98cb6cd1d419ec536 100644
--- a/Marlin/example_configurations/Cartesio/Configuration_adv.h
+++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h
@@ -757,7 +757,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -767,7 +767,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h
index c86bbb5d9ab50f7e7f4901eb614447494accb0e8..e592fdb5f53a89279dc2cb36d242ec57b77d809b 100644
--- a/Marlin/example_configurations/Felix/Configuration_adv.h
+++ b/Marlin/example_configurations/Felix/Configuration_adv.h
@@ -757,7 +757,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -767,7 +767,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h b/Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h
index bb45cf54da303a7f6c5826a739a406da2df805da..f92a5eb9bdf30b92ec66ff5cd144d13fe2210a32 100644
--- a/Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h
+++ b/Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h
@@ -764,7 +764,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -774,7 +774,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
index 289d2a22695e13cdf8e18251faee797a645d65d0..e2686ad1d890ff80929962fdc0c36439b02e7eb7 100644
--- a/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
+++ b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
@@ -754,7 +754,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -764,7 +764,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/Malyan/M150/Configuration_adv.h b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
index 744a52b5bc5599cb5fd5d8e72deb9c5443fc959f..23fa37df43875b533bf1102273ba5aed0ae0698c 100644
--- a/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
+++ b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
@@ -764,7 +764,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -774,7 +774,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h
index 11d85927349360082cb3fe752aa123e1aa46ddbe..4a4a9547b9b66046121f3dda6eefa1c636eba282 100644
--- a/Marlin/example_configurations/RigidBot/Configuration_adv.h
+++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h
@@ -757,7 +757,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -767,7 +767,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h
index ec2f785309012ca564b14ab61cbb06faca83442c..83c9cd85aa6b82bf388591bd9895571a2c405c25 100644
--- a/Marlin/example_configurations/SCARA/Configuration_adv.h
+++ b/Marlin/example_configurations/SCARA/Configuration_adv.h
@@ -757,7 +757,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -767,7 +767,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 35 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
index ed8194cfebf1ca3275c959e1cde7d0198416fcf1..25f03db77f0a7c20fced5d9eff364bb920dd00e5 100644
--- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
+++ b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
@@ -760,7 +760,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -770,7 +770,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
index 3b3a74d53344310c3847b7827742479823221bd7..1cc82b071df873c145a6d927e28298412e8e2976 100644
--- a/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
+++ b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
@@ -770,7 +770,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -780,7 +780,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
index ae067b5676c19331e47a2569c1e15b7a8d54fdbf..3089cf4ba2bbeb97e4367147704fb5e23c0b9873 100644
--- a/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
+++ b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
@@ -757,7 +757,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -767,7 +767,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
index e6b3283836d96ccb3f62a0a2b3d7441a58b65a38..4944a6af560793a188729535dee366951c67e1c3 100644
--- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
@@ -762,7 +762,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -772,7 +772,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
index b25b49b1ab0c78830878e9c1832061b22f35f6d2..f227e01ce2e3be99f9a935f462299cf3cd0d8a03 100644
--- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
@@ -761,7 +761,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -771,7 +771,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h
index 739d2d6407219ba409ad1668e16a93ab8dccd0c9..8393ea2bede35ed90ea7a732abb97a072dd5d3f2 100644
--- a/Marlin/example_configurations/delta/generic/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h
@@ -759,7 +759,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -769,7 +769,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
index 739d2d6407219ba409ad1668e16a93ab8dccd0c9..8393ea2bede35ed90ea7a732abb97a072dd5d3f2 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
@@ -759,7 +759,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -769,7 +769,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
index e08ff0b48a379439c225b8957b0a43b1d6bfef68..dfa3b1461a81799f6c114edfcdbba0eba0460b22 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
@@ -764,7 +764,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -774,7 +774,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
index 3b9b4ddcd5754f332e954b50351d863328186be5..6eaa071a0516a5edcf8a24b6f75a84d011effea6 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
@@ -759,7 +759,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -769,7 +769,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
index 7f003a4b890118a3982052f57937907c371da6be..ee3267cc3cc5df21d725ed4d30cf8fc81b637479 100644
--- a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
+++ b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
@@ -764,7 +764,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -774,7 +774,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h
index 1f616b5b09b525c60aff26b1150ed795e93a2db5..88ecc16cf8e1bc129f881386745600d5dc8383e8 100644
--- a/Marlin/example_configurations/makibox/Configuration_adv.h
+++ b/Marlin/example_configurations/makibox/Configuration_adv.h
@@ -757,7 +757,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -767,7 +767,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
index b1cafd031b0bd73e699718192fac39e0ee9b9c93..824587af36d1686a6045f4aae3851c2e265fdf47 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
@@ -757,7 +757,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -767,7 +767,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/example_configurations/wt150/Configuration_adv.h b/Marlin/example_configurations/wt150/Configuration_adv.h
index afbeb57019ca537f22eb0ec71dbdb8ce086d1242..a5b9f070c5eacb0df2c2bea746deefdcbbdb37b1 100644
--- a/Marlin/example_configurations/wt150/Configuration_adv.h
+++ b/Marlin/example_configurations/wt150/Configuration_adv.h
@@ -764,7 +764,7 @@
* Use M207 and M208 to define parameters for retract / recover.
*
* Use M209 to enable or disable auto-retract.
- * With auto-retract enabled, all G1 E moves over the MIN_RETRACT length
+ * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves.
*
* Be sure to turn off auto-retract during filament change.
@@ -774,7 +774,8 @@
*/
//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define MIN_RETRACT 0.1 // A retract/recover of this length or longer can be converted to auto-retract
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
#define RETRACT_LENGTH 3 // Default retract length (positive mm)
#define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
#define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
diff --git a/Marlin/language_zh_CN.h b/Marlin/language_zh_CN.h
index 4ee33b4c743750f59424aafa89186a86a3ded37f..1332d76555922d5d597c735b84f0da43f267516c 100644
--- a/Marlin/language_zh_CN.h
+++ b/Marlin/language_zh_CN.h
@@ -134,11 +134,11 @@
#define MSG_KILLED _UxGT("已杀掉") //"KILLED. "
#define MSG_STOPPED _UxGT("已停止") //"STOPPED. "
#define MSG_CONTROL_RETRACT _UxGT("回抽长度mm") //"Retract mm" retract_length, retract length (positive mm)
-#define MSG_CONTROL_RETRACT_SWAP _UxGT("换手回抽长度mm") //"Swap Re.mm" retract_length_swap, swap retract length (positive mm), for extruder change
+#define MSG_CONTROL_RETRACT_SWAP _UxGT("换手回抽长度mm") //"Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
#define MSG_CONTROL_RETRACTF _UxGT("回抽速率mm/s") //"Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm") //"Hop mm" retract_zlift, retract Z-lift
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("回抽恢复长度mm") //"UnRet +mm" retract_recover_length, additional recover length (mm, added to retract length when recovering)
-#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("换手回抽恢复长度mm") //"S UnRet+mm" retract_recover_length_swap, additional swap recover length (mm, added to retract length when recovering from extruder change)
+#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("换手回抽恢复长度mm") //"S UnRet+mm" swap_retract_recover_length, additional swap recover length (mm, added to retract length when recovering from extruder change)
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("回抽恢复后进料速率mm/s") //"UnRet V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
#define MSG_AUTORETRACT _UxGT("自动抽回") //"AutoRetr." autoretract_enabled,
#define MSG_FILAMENTCHANGE _UxGT("更换丝料") //"Change filament"
diff --git a/Marlin/language_zh_TW.h b/Marlin/language_zh_TW.h
index c7563e786716125831743e2a05ebe70f212ac98b..1ac9aaf099686ceec8ffb17f55e03cddef29b0cf 100644
--- a/Marlin/language_zh_TW.h
+++ b/Marlin/language_zh_TW.h
@@ -134,11 +134,11 @@
#define MSG_KILLED _UxGT("已殺掉") //"KILLED. "
#define MSG_STOPPED _UxGT("已停止") //"STOPPED. "
#define MSG_CONTROL_RETRACT _UxGT("回抽長度mm") //"Retract mm" retract_length, retract length (positive mm)
-#define MSG_CONTROL_RETRACT_SWAP _UxGT("換手回抽長度mm") //"Swap Re.mm" retract_length_swap, swap retract length (positive mm), for extruder change
+#define MSG_CONTROL_RETRACT_SWAP _UxGT("換手回抽長度mm") //"Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
#define MSG_CONTROL_RETRACTF _UxGT("回抽速率mm/s") //"Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm") //"Hop mm" retract_zlift, retract Z-lift
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("回抽恢複長度mm") //"UnRet +mm" retract_recover_length, additional recover length (mm, added to retract length when recovering)
-#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("換手回抽恢複長度mm") //"S UnRet+mm" retract_recover_length_swap, additional swap recover length (mm, added to retract length when recovering from extruder change)
+#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("換手回抽恢複長度mm") //"S UnRet+mm" swap_retract_recover_length, additional swap recover length (mm, added to retract length when recovering from extruder change)
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("回抽恢複後進料速率mm/s") //"UnRet V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
#define MSG_AUTORETRACT _UxGT("自動抽回") //"AutoRetr." autoretract_enabled,
#define MSG_FILAMENTCHANGE _UxGT("更換絲料") //"Change filament"
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index aaa78fe3b7818967f9dfac3d3e90a4df62db5e05..83c2874c1a24900f90600c1b3debc8f48c1f869f 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -3380,13 +3380,13 @@ void kill_screen(const char* lcd_msg) {
MENU_ITEM_EDIT(bool, MSG_AUTORETRACT, &autoretract_enabled);
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT, &retract_length, 0, 100);
#if EXTRUDERS > 1
- MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_SWAP, &retract_length_swap, 0, 100);
+ MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_SWAP, &swap_retract_length, 0, 100);
#endif
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACTF, &retract_feedrate_mm_s, 1, 999);
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &retract_zlift, 0, 999);
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &retract_recover_length, -100, 100);
#if EXTRUDERS > 1
- MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER_SWAP, &retract_recover_length_swap, -100, 100);
+ MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER_SWAP, &swap_retract_recover_length, -100, 100);
#endif
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACT_RECOVERF, &retract_recover_feedrate_mm_s, 1, 999);
END_MENU();