Skip to content

Commit 617daaa

Browse files
studiodyneEmmanuel Viala
studiodyne
authored and
Emmanuel Viala
committed
Automatic Tool Migration feature (MarlinFirmware#17248)
1 parent 7c967af commit 617daaa

27 files changed

+575
-151
lines changed

‎Marlin/Configuration_adv.h

+47-9
Original file line numberDiff line numberDiff line change
@@ -1847,19 +1847,55 @@
18471847
*/
18481848
#if EXTRUDERS > 1
18491849
// Z raise distance for tool-change, as needed for some extruders
1850-
#define TOOLCHANGE_ZRAISE 2 // (mm)
1851-
//#define TOOLCHANGE_NO_RETURN // Never return to the previous position on tool-change
1850+
#define TOOLCHANGE_ZRAISE 2 // (mm)
1851+
//#define TOOLCHANGE_ZRAISE_BEFORE_RETRACT // Apply raise before swap retraction (if enabled)
1852+
//#define TOOLCHANGE_NO_RETURN // Never return to previous position on tool-change
18521853
#if ENABLED(TOOLCHANGE_NO_RETURN)
1853-
//#define EVENT_GCODE_AFTER_TOOLCHANGE "G12X" // G-code to run after tool-change is complete
1854+
//#define EVENT_GCODE_AFTER_TOOLCHANGE "G12X" // Extra G-code to run after tool-change
18541855
#endif
18551856

1856-
// Retract and prime filament on tool-change
1857+
/**
1858+
* Retract and prime filament on tool-change to reduce
1859+
* ooze and stringing and to get cleaner transitions.
1860+
*/
18571861
//#define TOOLCHANGE_FILAMENT_SWAP
18581862
#if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
1859-
#define TOOLCHANGE_FIL_SWAP_LENGTH 12 // (mm)
1860-
#define TOOLCHANGE_FIL_EXTRA_PRIME 2 // (mm)
1861-
#define TOOLCHANGE_FIL_SWAP_RETRACT_SPEED 3600 // (mm/m)
1862-
#define TOOLCHANGE_FIL_SWAP_PRIME_SPEED 3600 // (mm/m)
1863+
// Load / Unload
1864+
#define TOOLCHANGE_FS_LENGTH 12 // (mm) Load / Unload length
1865+
#define TOOLCHANGE_FS_EXTRA_RESUME_LENGTH 0 // (mm) Extra length for better restart, fine tune by LCD/Gcode)
1866+
#define TOOLCHANGE_FS_RETRACT_SPEED (50*60) // (mm/m) (Unloading)
1867+
#define TOOLCHANGE_FS_UNRETRACT_SPEED (25*60) // (mm/m) (On SINGLENOZZLE or Bowden loading must be slowed down)
1868+
1869+
// Longer prime to clean out a SINGLENOZZLE
1870+
#define TOOLCHANGE_FS_EXTRA_PRIME 0 // (mm) Extra priming length
1871+
#define TOOLCHANGE_FS_PRIME_SPEED (4.6*60) // (mm/m) Extra priming feedrate
1872+
#define TOOLCHANGE_FS_WIPE_RETRACT 0 // (mm/m) Retract before cooling for less stringing, better wipe, etc.
1873+
1874+
// Cool after prime to reduce stringing
1875+
#define TOOLCHANGE_FS_FAN -1 // Fan index or -1 to skip
1876+
#define TOOLCHANGE_FS_FAN_SPEED 255 // 0-255
1877+
#define TOOLCHANGE_FS_FAN_TIME 10 // (seconds)
1878+
1879+
// Swap uninitialized extruder with TOOLCHANGE_FS_PRIME_SPEED for all lengths (recover + prime)
1880+
// (May break filament if not retracted beforehand.)
1881+
//#define TOOLCHANGE_FS_INIT_BEFORE_SWAP
1882+
1883+
// Prime on the first T command even if the same or no toolchange / swap
1884+
// Enable it (M217 V[0/1]) before printing, to avoid unwanted priming on host connect
1885+
//#define TOOLCHANGE_FS_PRIME_FIRST_USED
1886+
1887+
/**
1888+
* Tool Change Migration
1889+
* This feature provides G-code and LCD options to switch tools mid-print.
1890+
* All applicable tool properties are migrated so the print can continue.
1891+
* Tools must be closely matching and other restrictions may apply.
1892+
* Useful to:
1893+
* - Change filament color without interruption
1894+
* - Switch spools automatically on filament runout
1895+
* - Switch to a different nozzle on an extruder jam
1896+
*/
1897+
#define TOOLCHANGE_MIGRATION_FEATURE
1898+
18631899
#endif
18641900

18651901
/**
@@ -1870,8 +1906,10 @@
18701906
#if ENABLED(TOOLCHANGE_PARK)
18711907
#define TOOLCHANGE_PARK_XY { X_MIN_POS + 10, Y_MIN_POS + 10 }
18721908
#define TOOLCHANGE_PARK_XY_FEEDRATE 6000 // (mm/m)
1909+
//#define TOOLCHANGE_PARK_X_ONLY // X axis only move
1910+
//#define TOOLCHANGE_PARK_Y_ONLY // Y axis only move
18731911
#endif
1874-
#endif
1912+
#endif // EXTRUDERS > 1
18751913

18761914
/**
18771915
* Advanced Pause

‎Marlin/src/feature/runout.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ bool FilamentMonitorBase::enabled = true,
3939
bool FilamentMonitorBase::host_handling; // = false
4040
#endif
4141

42+
#if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
43+
#include "../module/tool_change.h"
44+
#endif
45+
4246
/**
4347
* Called by FilamentSensorSwitch::run when filament is detected.
4448
* Called by FilamentSensorEncoder::block_completed when motion is detected.
@@ -76,6 +80,11 @@ void event_filament_runout() {
7680

7781
if (TERN0(ADVANCED_PAUSE_FEATURE, did_pause_print)) return; // Action already in progress. Purge triggered repeated runout.
7882

83+
#if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
84+
if (migration.in_progress) return; // Action already in progress. Purge triggered repeated runout.
85+
if (migration.automode) { extruder_migration(); return; }
86+
#endif
87+
7988
TERN_(EXTENSIBLE_UI, ExtUI::onFilamentRunout(ExtUI::getActiveTool()));
8089

8190
#if EITHER(HOST_PROMPT_SUPPORT, HOST_ACTION_COMMANDS)

‎Marlin/src/gcode/config/M217.cpp

+90-22
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
#include "../gcode.h"
2828
#include "../../module/tool_change.h"
2929

30+
#if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
31+
#include "../../module/motion.h"
32+
#endif
33+
3034
#include "../../MarlinCore.h" // for SP_X_STR, etc.
3135

3236
extern const char SP_X_STR[], SP_Y_STR[], SP_Z_STR[];
@@ -35,16 +39,30 @@ void M217_report(const bool eeprom=false) {
3539

3640
#if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
3741
serialprintPGM(eeprom ? PSTR(" M217") : PSTR("Toolchange:"));
38-
SERIAL_ECHOPAIR(" S", LINEAR_UNIT(toolchange_settings.swap_length));
39-
SERIAL_ECHOPAIR_P(SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime));
40-
SERIAL_ECHOPAIR_P(SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
41-
SERIAL_ECHOPAIR(" R", LINEAR_UNIT(toolchange_settings.retract_speed));
42+
SERIAL_ECHOPAIR(" S", LINEAR_UNIT(toolchange_settings.swap_length),
43+
" B", LINEAR_UNIT(toolchange_settings.extra_resume));
44+
SERIAL_ECHOPAIR_P(SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime),
45+
SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
46+
SERIAL_ECHOPAIR(" R", LINEAR_UNIT(toolchange_settings.retract_speed),
47+
" U", LINEAR_UNIT(toolchange_settings.unretract_speed),
48+
" F", toolchange_settings.fan_speed,
49+
" G", toolchange_settings.fan_time);
50+
51+
#if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
52+
SERIAL_ECHOPAIR(" N", int(migration.automode));
53+
SERIAL_ECHOPAIR(" L", LINEAR_UNIT(migration.last));
54+
#endif
4255

4356
#if ENABLED(TOOLCHANGE_PARK)
57+
SERIAL_ECHOPAIR(" W", LINEAR_UNIT(toolchange_settings.enable_park));
4458
SERIAL_ECHOPAIR_P(SP_X_STR, LINEAR_UNIT(toolchange_settings.change_point.x));
4559
SERIAL_ECHOPAIR_P(SP_Y_STR, LINEAR_UNIT(toolchange_settings.change_point.y));
4660
#endif
4761

62+
#if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
63+
SERIAL_ECHOPAIR(" V", LINEAR_UNIT(enable_first_prime));
64+
#endif
65+
4866
#else
4967

5068
UNUSED(eeprom);
@@ -58,48 +76,98 @@ void M217_report(const bool eeprom=false) {
5876
/**
5977
* M217 - Set SINGLENOZZLE toolchange parameters
6078
*
79+
* // Tool change command
80+
* Q Prime active tool and exit
81+
*
82+
* // Tool change settings
6183
* S[linear] Swap length
62-
* E[linear] Purge length
84+
* B[linear] Extra Swap length
85+
* E[linear] Prime length
6386
* P[linear/m] Prime speed
6487
* R[linear/m] Retract speed
88+
* U[linear/m] UnRetract speed
89+
* V[linear] 0/1 Enable auto prime first extruder used
90+
* W[linear] 0/1 Enable park & Z Raise
6591
* X[linear] Park X (Requires TOOLCHANGE_PARK)
6692
* Y[linear] Park Y (Requires TOOLCHANGE_PARK)
6793
* Z[linear] Z Raise
94+
* F[linear] Fan Speed 0-255
95+
* G[linear/s] Fan time
96+
*
97+
* Tool migration settings
98+
* A[0|1] Enable auto-migration on runout
99+
* L[index] Last extruder to use for auto-migration
100+
*
101+
* Tool migration command
102+
* T[index] Migrate to next extruder or the given extruder
68103
*/
69104
void GcodeSuite::M217() {
70105

71-
#define SPR_PARAM
72-
#define XY_PARAM
73-
74106
#if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
75107

76-
#undef SPR_PARAM
77-
#define SPR_PARAM "SPRE"
108+
static constexpr float max_extrude = TERN(PREVENT_LENGTHY_EXTRUDE, EXTRUDE_MAXLENGTH, 500);
78109

79-
static constexpr float max_extrude =
80-
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
81-
EXTRUDE_MAXLENGTH
82-
#else
83-
500
84-
#endif
85-
;
110+
if (parser.seen('Q')) { tool_change_prime(); return; }
86111

87112
if (parser.seenval('S')) { const float v = parser.value_linear_units(); toolchange_settings.swap_length = constrain(v, 0, max_extrude); }
113+
if (parser.seenval('B')) { const float v = parser.value_linear_units(); toolchange_settings.extra_resume = constrain(v, -10, 10); }
88114
if (parser.seenval('E')) { const float v = parser.value_linear_units(); toolchange_settings.extra_prime = constrain(v, 0, max_extrude); }
89115
if (parser.seenval('P')) { const int16_t v = parser.value_linear_units(); toolchange_settings.prime_speed = constrain(v, 10, 5400); }
90116
if (parser.seenval('R')) { const int16_t v = parser.value_linear_units(); toolchange_settings.retract_speed = constrain(v, 10, 5400); }
117+
if (parser.seenval('U')) { const int16_t v = parser.value_linear_units(); toolchange_settings.unretract_speed = constrain(v, 10, 5400); }
118+
#if TOOLCHANGE_FS_FAN >= 0 && FAN_COUNT > 0
119+
if (parser.seenval('F')) { const int16_t v = parser.value_linear_units(); toolchange_settings.fan_speed = constrain(v, 0, 255); }
120+
if (parser.seenval('G')) { const int16_t v = parser.value_linear_units(); toolchange_settings.fan_time = constrain(v, 1, 30); }
121+
#endif
122+
#endif
123+
124+
#if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
125+
if (parser.seenval('V')) { enable_first_prime = parser.value_linear_units(); }
91126
#endif
92127

93128
#if ENABLED(TOOLCHANGE_PARK)
94-
#undef XY_PARAM
95-
#define XY_PARAM "XY"
96-
if (parser.seenval('X')) { toolchange_settings.change_point.x = parser.value_linear_units(); }
97-
if (parser.seenval('Y')) { toolchange_settings.change_point.y = parser.value_linear_units(); }
129+
if (parser.seenval('W')) { toolchange_settings.enable_park = parser.value_linear_units(); }
130+
if (parser.seenval('X')) { const int16_t v = parser.value_linear_units(); toolchange_settings.change_point.x = constrain(v, X_MIN_POS, X_MAX_POS); }
131+
if (parser.seenval('Y')) { const int16_t v = parser.value_linear_units(); toolchange_settings.change_point.y = constrain(v, Y_MIN_POS, Y_MAX_POS); }
98132
#endif
99133

100134
if (parser.seenval('Z')) { toolchange_settings.z_raise = parser.value_linear_units(); }
101135

102-
if (!parser.seen(SPR_PARAM XY_PARAM "Z")) M217_report();
136+
#if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
137+
migration.target = 0; // 0 = disabled
138+
139+
if (parser.seenval('L')) { // Last
140+
const int16_t lval = parser.value_int();
141+
if (WITHIN(lval, 0, EXTRUDERS - 1)) {
142+
migration.last = lval;
143+
migration.automode = (active_extruder < migration.last);
144+
}
145+
}
146+
147+
if (parser.seen('A')) // Auto on/off
148+
migration.automode = parser.value_bool();
149+
150+
if (parser.seen('T')) { // Migrate now
151+
if (parser.has_value()) {
152+
const int16_t tval = parser.value_int();
153+
if (WITHIN(tval, 0, EXTRUDERS - 1) && tval != active_extruder) {
154+
migration.target = tval + 1;
155+
extruder_migration();
156+
migration.target = 0; // disable
157+
return;
158+
}
159+
else
160+
migration.target = 0; // disable
161+
}
162+
else {
163+
extruder_migration();
164+
return;
165+
}
166+
}
167+
168+
#endif
169+
170+
M217_report();
103171
}
104172

105173
#endif // EXTRUDERS > 1

‎Marlin/src/gcode/config/M221.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ void GcodeSuite::M221() {
3333
const int8_t target_extruder = get_target_extruder_from_command();
3434
if (target_extruder < 0) return;
3535

36-
if (parser.seenval('S')) {
37-
planner.flow_percentage[target_extruder] = parser.value_int();
38-
planner.refresh_e_factor(target_extruder);
39-
}
36+
if (parser.seenval('S'))
37+
planner.set_flow(target_extruder, parser.value_int());
4038
else {
4139
SERIAL_ECHO_START();
4240
SERIAL_CHAR('E', '0' + target_extruder);

‎Marlin/src/gcode/sd/M1001.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
#include "../queue.h"
3232
#endif
3333

34-
#if HAS_LEDS_OFF_FLAG
35-
#include "../../MarlinCore.h"
36-
#endif
37-
3834
#if EITHER(LCD_SET_PROGRESS_MANUALLY, SD_REPRINT_LAST_SELECTED_FILE)
3935
#include "../../lcd/ultralcd.h"
4036
#endif
@@ -44,6 +40,7 @@
4440
#endif
4541

4642
#if HAS_LEDS_OFF_FLAG
43+
#include "../../MarlinCore.h" // for wait_for_user_response
4744
#include "../../feature/leds/printer_event_leds.h"
4845
#endif
4946

‎Marlin/src/inc/Conditionals_post.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -2222,8 +2222,8 @@
22222222
#define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 0
22232223
#endif
22242224

2225-
#if EXTRUDERS > 1 && !defined(TOOLCHANGE_FIL_EXTRA_PRIME)
2226-
#define TOOLCHANGE_FIL_EXTRA_PRIME 0
2225+
#if EXTRUDERS > 1 && !defined(TOOLCHANGE_FS_EXTRA_PRIME)
2226+
#define TOOLCHANGE_FS_EXTRA_PRIME 0
22272227
#endif
22282228

22292229
/**

‎Marlin/src/inc/SanityCheck.h

+7-6
Original file line numberDiff line numberDiff line change
@@ -833,14 +833,15 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
833833
#endif
834834

835835
#if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
836-
#ifndef TOOLCHANGE_FIL_SWAP_LENGTH
837-
#error "TOOLCHANGE_FILAMENT_SWAP requires TOOLCHANGE_FIL_SWAP_LENGTH. Please update your Configuration."
838-
#elif !defined(TOOLCHANGE_FIL_SWAP_RETRACT_SPEED)
839-
#error "TOOLCHANGE_FILAMENT_SWAP requires TOOLCHANGE_FIL_SWAP_RETRACT_SPEED. Please update your Configuration."
840-
#elif !defined(TOOLCHANGE_FIL_SWAP_PRIME_SPEED)
841-
#error "TOOLCHANGE_FILAMENT_SWAP requires TOOLCHANGE_FIL_SWAP_PRIME_SPEED. Please update your Configuration."
836+
#ifndef TOOLCHANGE_FS_LENGTH
837+
#error "TOOLCHANGE_FILAMENT_SWAP requires TOOLCHANGE_FS_LENGTH. Please update your Configuration_adv.h."
838+
#elif !defined(TOOLCHANGE_FS_RETRACT_SPEED)
839+
#error "TOOLCHANGE_FILAMENT_SWAP requires TOOLCHANGE_FS_RETRACT_SPEED. Please update your Configuration_adv.h."
840+
#elif !defined(TOOLCHANGE_FS_PRIME_SPEED)
841+
#error "TOOLCHANGE_FILAMENT_SWAP requires TOOLCHANGE_FS_PRIME_SPEED. Please update your Configuration_adv.h."
842842
#endif
843843
#endif
844+
844845
#if ENABLED(TOOLCHANGE_PARK)
845846
#ifndef TOOLCHANGE_PARK_XY
846847
#error "TOOLCHANGE_PARK requires TOOLCHANGE_PARK_XY. Please update your Configuration."

‎Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,7 @@ void DGUSScreenVariableHandler::HandleFlowRateChanged(DGUS_VP_Variable &var, voi
573573
#endif
574574
}
575575

576-
planner.flow_percentage[target_extruder] = newvalue;
577-
planner.refresh_e_factor(target_extruder);
576+
planner.set_flow(target_extruder, newvalue);
578577
ScreenHandler.skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
579578
#else
580579
UNUSED(var); UNUSED(val_ptr);

‎Marlin/src/lcd/extui/ui_api.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -669,10 +669,7 @@ namespace ExtUI {
669669
float getRetractAcceleration_mm_s2() { return planner.settings.retract_acceleration; }
670670
float getTravelAcceleration_mm_s2() { return planner.settings.travel_acceleration; }
671671
void setFeedrate_mm_s(const feedRate_t fr) { feedrate_mm_s = fr; }
672-
void setFlow_percent(const int16_t flow, const extruder_t extr) {
673-
planner.flow_percentage[extr] = flow;
674-
planner.refresh_e_factor(extr);
675-
}
672+
void setFlow_percent(const int16_t flow, const extruder_t extr) { planner.set_flow(extr, flow); }
676673
void setMinFeedrate_mm_s(const feedRate_t fr) { planner.settings.min_feedrate_mm_s = fr; }
677674
void setMinTravelFeedrate_mm_s(const feedRate_t fr) { planner.settings.min_travel_feedrate_mm_s = fr; }
678675
void setPrintingAcceleration_mm_s2(const float acc) { planner.settings.acceleration = acc; }

‎Marlin/src/lcd/language/language_cz.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,8 @@ namespace Language_cz {
357357
PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH = _UxGT("Délka zavedení");
358358
PROGMEM Language_Str MSG_TOOL_CHANGE = _UxGT("Výměna nástroje");
359359
PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT = _UxGT("Zdvih Z");
360-
PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPD = _UxGT("Rychlost primár.");
361-
PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPD = _UxGT("Rychlost retrak.");
360+
PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED = _UxGT("Rychlost primár.");
361+
PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED = _UxGT("Rychlost retrak.");
362362
PROGMEM Language_Str MSG_NOZZLE_STANDBY = _UxGT("Tryska standby");
363363
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Vyměnit filament");
364364
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Vyměnit filament *");

‎Marlin/src/lcd/language/language_de.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -347,9 +347,9 @@ namespace Language_de {
347347
PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH = _UxGT("Entladelänge");
348348
PROGMEM Language_Str MSG_TOOL_CHANGE = _UxGT("Werkzeugwechsel");
349349
PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT = _UxGT("Z anheben");
350-
PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPD = _UxGT("Prime-Geschwin.");
351-
PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPD = _UxGT("Einzug-Geschwin.");
352-
350+
PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED = _UxGT("Prime-Geschwin.");
351+
PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED = _UxGT("Einzug-Geschwin.");
352+
PROGMEM Language_Str MSG_NOZZLE_STANDBY = _UxGT("Düsen-Standby");
353353
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Filament wechseln");
354354
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Filament wechseln *");
355355
PROGMEM Language_Str MSG_FILAMENTLOAD = _UxGT("Filament laden");

‎Marlin/src/lcd/language/language_en.h

+13-2
Original file line numberDiff line numberDiff line change
@@ -371,11 +371,22 @@ namespace Language_en {
371371
PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF = _UxGT("S UnRet V");
372372
PROGMEM Language_Str MSG_AUTORETRACT = _UxGT("AutoRetr.");
373373
PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH = _UxGT("Swap Length");
374+
PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA = _UxGT("Swap Extra");
374375
PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH = _UxGT("Purge Length");
375376
PROGMEM Language_Str MSG_TOOL_CHANGE = _UxGT("Tool Change");
376377
PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT = _UxGT("Z Raise");
377-
PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPD = _UxGT("Prime Speed");
378-
PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPD = _UxGT("Retract Speed");
378+
PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED = _UxGT("Prime Speed");
379+
PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED = _UxGT("Retract Speed");
380+
PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED = _UxGT("Park Head");
381+
PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED = _UxGT("Recover Speed");
382+
PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED = _UxGT("Fan Speed");
383+
PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME = _UxGT("Fan Time");
384+
PROGMEM Language_Str MSG_TOOL_MIGRATION_ON = _UxGT("Auto ON");
385+
PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF = _UxGT("Auto OFF");
386+
PROGMEM Language_Str MSG_TOOL_MIGRATION = _UxGT("Tool Migration");
387+
PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO = _UxGT("Auto-migration");
388+
PROGMEM Language_Str MSG_TOOL_MIGRATION_END = _UxGT("Last Extruder");
389+
PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP = _UxGT("Migrate to *");
379390
PROGMEM Language_Str MSG_FILAMENTCHANGE = _UxGT("Change Filament");
380391
PROGMEM Language_Str MSG_FILAMENTCHANGE_E = _UxGT("Change Filament *");
381392
PROGMEM Language_Str MSG_FILAMENTLOAD = _UxGT("Load Filament");

0 commit comments

Comments
 (0)