Skip to content

Commit d94defc

Browse files
thinkyheadthinkyhead
committed
🎨 Language / menu cleanup
1 parent 212167b commit d94defc

30 files changed

+102
-110
lines changed

‎Marlin/src/lcd/e3v2/proui/dwin.cpp

+78-54
Large diffs are not rendered by default.

‎Marlin/src/lcd/e3v2/proui/dwin.h

+14-9
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@ static constexpr size_t eeprom_data_size = sizeof(HMI_data_t);
141141

142142
typedef struct {
143143
int8_t Color[3]; // Color components
144-
TERN_(HAS_PID_HEATING, pidresult_t pidresult = PID_DONE);
144+
#if HAS_PID_HEATING
145+
tempcontrol_t pidresult = PID_DONE;
146+
#endif
145147
uint8_t Select = 0; // Auxiliary selector variable
146148
AxisEnum axis = X_AXIS; // Axis Select
147149
} HMI_value_t;
@@ -213,10 +215,10 @@ void ParkHead();
213215
void ApplyLEDColor();
214216
#endif
215217
#if ENABLED(AUTO_BED_LEVELING_UBL)
216-
void UBLTiltMesh();
218+
void UBLMeshTilt();
217219
bool UBLValidMesh();
218-
void UBLSaveMesh();
219-
void UBLLoadMesh();
220+
void UBLMeshSave();
221+
void UBLMeshLoad();
220222
#endif
221223
#if ENABLED(HOST_SHUTDOWN_MENU_ITEM) && defined(SHUTDOWN_ACTION)
222224
void HostShutDown();
@@ -356,10 +358,13 @@ void Draw_Steps_Menu();
356358
#endif
357359

358360
// PID
359-
void DWIN_PidTuning(pidresult_t result);
360-
#if ENABLED(PIDTEMP)
361-
void Draw_HotendPID_Menu();
361+
#if HAS_PID_HEATING
362+
void DWIN_PidTuning(tempcontrol_t result);
363+
#if ENABLED(PIDTEMP)
364+
void Draw_HotendPID_Menu();
365+
#endif
366+
#if ENABLED(PIDTEMPBED)
367+
void Draw_BedPID_Menu();
368+
#endif
362369
#endif
363-
#if ENABLED(PIDTEMPBED)
364-
void Draw_BedPID_Menu();
365370
#endif

‎Marlin/src/lcd/e3v2/proui/dwinui.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,12 @@
138138
#define ICON_UBLActive ICON_HotendTemp
139139
#define ICON_UBLActive ICON_HotendTemp
140140
#define ICON_UBLSlot ICON_ResumeEEPROM
141-
#define ICON_UBLSaveMesh ICON_WriteEEPROM
142-
#define ICON_UBLLoadMesh ICON_ReadEEPROM
141+
#define ICON_UBLMeshSave ICON_WriteEEPROM
142+
#define ICON_UBLMeshLoad ICON_ReadEEPROM
143143
#define ICON_UBLTiltGrid ICON_PrintSize
144144
#define ICON_UBLSmartFill ICON_StockConfiguration
145145
#define ICON_ZAfterHome ICON_SetEndTemp
146146

147-
148-
149147
#define ICON_CaseLight ICON_Motion
150148
#define ICON_LedControl ICON_Motion
151149

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

-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ namespace Language_an {
103103
LSTR MSG_FLOW_N = _UxGT("Fluxo ~");
104104
LSTR MSG_CONTROL = _UxGT("Control");
105105
LSTR MSG_AUTOTEMP = _UxGT("Temperatura Auto.");
106-
LSTR MSG_SELECT = _UxGT("Trigar");
107106
LSTR MSG_SELECT_E = _UxGT("Trigar *");
108107
LSTR MSG_ACC = _UxGT("Aceleracion");
109108
LSTR MSG_VTRAV_MIN = _UxGT("Vel. viache min");

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

-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ namespace Language_cz {
264264
LSTR MSG_LCD_OFF = _UxGT("Vyp");
265265
LSTR MSG_PID_AUTOTUNE = _UxGT("PID automatika");
266266
LSTR MSG_PID_AUTOTUNE_E = _UxGT("PID automatika *");
267-
LSTR MSG_SELECT = _UxGT("Vybrat");
268267
LSTR MSG_SELECT_E = _UxGT("Vybrat *");
269268
LSTR MSG_ACC = _UxGT("Zrychl");
270269
LSTR MSG_JERK = _UxGT("Jerk");

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

-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ namespace Language_da {
9898
LSTR MSG_AUTOTEMP = _UxGT("Autotemp");
9999
LSTR MSG_LCD_ON = _UxGT("Til");
100100
LSTR MSG_LCD_OFF = _UxGT("Fra");
101-
LSTR MSG_SELECT = _UxGT("Vælg");
102101
LSTR MSG_SELECT_E = _UxGT("Vælg *");
103102
LSTR MSG_A_RETRACT = _UxGT("A-retract");
104103
LSTR MSG_A_TRAVEL = _UxGT("A-rejse");

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

-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@ namespace Language_de {
357357
LSTR MSG_SENSOR_RESPONSIVENESS_E = _UxGT("Sensor res *");
358358
LSTR MSG_MPC_AMBIENT_XFER_COEFF_E = _UxGT("Ambient h *");
359359
LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E = _UxGT("Amb. h fan *");
360-
LSTR MSG_SELECT = _UxGT("Auswählen");
361360
LSTR MSG_SELECT_E = _UxGT("Auswählen *");
362361
LSTR MSG_ACC = _UxGT("Beschleunigung");
363362
LSTR MSG_JERK = _UxGT("Jerk");

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,6 @@ namespace Language_en {
378378
LSTR MSG_SENSOR_RESPONSIVENESS_E = _UxGT("Sensor res *");
379379
LSTR MSG_MPC_AMBIENT_XFER_COEFF_E = _UxGT("Ambient h *");
380380
LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E = _UxGT("Amb. h fan *");
381-
LSTR MSG_SELECT = _UxGT("Select");
382381
LSTR MSG_SELECT_E = _UxGT("Select *");
383382
LSTR MSG_ACC = _UxGT("Accel");
384383
LSTR MSG_JERK = _UxGT("Jerk");
@@ -553,11 +552,11 @@ namespace Language_en {
553552
LSTR MSG_TOOL_MIGRATION_END = _UxGT("Last Extruder");
554553
LSTR MSG_TOOL_MIGRATION_SWAP = _UxGT("Migrate to *");
555554
LSTR MSG_FILAMENTCHANGE = _UxGT("Change Filament");
556-
LSTR MSG_FILAMENTCHANGE_E = _UxGT("Change Filament *");
555+
LSTR MSG_FILAMENTCHANGE_E = _UxGT("Change * Filament");
557556
LSTR MSG_FILAMENTLOAD = _UxGT("Load Filament");
558-
LSTR MSG_FILAMENTLOAD_E = _UxGT("Load *");
557+
LSTR MSG_FILAMENTLOAD_E = _UxGT("Load * Filament");
559558
LSTR MSG_FILAMENTUNLOAD = _UxGT("Unload Filament");
560-
LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Unload *");
559+
LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Unload * Filament");
561560
LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Unload All");
562561
#if ENABLED(MULTI_VOLUME)
563562
LSTR MSG_ATTACH_MEDIA = _UxGT("Attach SD Card");

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

-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ namespace Language_es {
265265
LSTR MSG_LCD_OFF = _UxGT("Apg");
266266
LSTR MSG_PID_AUTOTUNE = _UxGT("PID Auto-ajuste");
267267
LSTR MSG_PID_AUTOTUNE_E = _UxGT("PID Auto-ajuste *");
268-
LSTR MSG_SELECT = _UxGT("Seleccionar");
269268
LSTR MSG_SELECT_E = _UxGT("Seleccionar *");
270269
LSTR MSG_ACC = _UxGT("Aceleración");
271270
LSTR MSG_JERK = _UxGT("Jerk");

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

-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ namespace Language_eu {
161161
LSTR MSG_MAX = " " LCD_STR_THERMOMETER _UxGT(" Max");
162162
LSTR MSG_FACTOR = " " LCD_STR_THERMOMETER _UxGT(" Fakt");
163163
LSTR MSG_AUTOTEMP = _UxGT("Auto tenperatura");
164-
LSTR MSG_SELECT = _UxGT("Aukeratu");
165164
LSTR MSG_SELECT_E = _UxGT("Aukeratu *");
166165
LSTR MSG_ACC = _UxGT("Azelerazioa");
167166
LSTR MSG_JERK = _UxGT("Astindua");

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

-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ namespace Language_fr {
272272
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Echec Autotune! E incorrect");
273273
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Echec Autotune! Temp. trop haute");
274274
LSTR MSG_PID_TIMEOUT = _UxGT("Echec Autotune! Opér. expirée");
275-
LSTR MSG_SELECT = _UxGT("Sélectionner");
276275
LSTR MSG_SELECT_E = _UxGT("Sélectionner *");
277276
LSTR MSG_ACC = _UxGT("Accélération");
278277
LSTR MSG_JERK = _UxGT("Jerk");

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

-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ namespace Language_gl {
266266
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Auto-Sint. fallida! Extrusor danado.");
267267
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Auto-Sint. fallida! Temperatura moi alta.");
268268
LSTR MSG_PID_TIMEOUT = _UxGT("Auto-Sint. fallida! Tempo excedido.");
269-
LSTR MSG_SELECT = _UxGT("Escolla");
270269
LSTR MSG_SELECT_E = _UxGT("Escolla *");
271270
LSTR MSG_ACC = _UxGT("Acel");
272271
LSTR MSG_JERK = _UxGT("Jerk");

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

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ namespace Language_hr {
9595
LSTR MSG_BED = _UxGT("Bed");
9696
LSTR MSG_FAN_SPEED = _UxGT("Brzina ventilatora");
9797
LSTR MSG_FAN_SPEED_N = _UxGT("Brzina ventilatora ~");
98-
LSTR MSG_SELECT = _UxGT("Odaberi");
9998
LSTR MSG_SELECT_E = _UxGT("Odaberi *");
10099
LSTR MSG_TEMPERATURE = _UxGT("Temperature");
101100
LSTR MSG_MOTION = _UxGT("Gibanje");

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

-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ namespace Language_hu {
309309
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Hangolási hiba! Rossz adagoló.");
310310
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Hangolási hiba! Magas hömérséklet.");
311311
LSTR MSG_PID_TIMEOUT = _UxGT("Hangolási hiba! Idötúllépés.");
312-
LSTR MSG_SELECT = _UxGT("Kiválaszt");
313312
LSTR MSG_SELECT_E = _UxGT("Kiválaszt *");
314313
LSTR MSG_ACC = _UxGT("Gyorsítás");
315314
LSTR MSG_JERK = _UxGT("Rántás");

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

-1
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,6 @@ namespace Language_it {
370370
LSTR MSG_SENSOR_RESPONSIVENESS_E = _UxGT("Reattiv.Sens. *");
371371
LSTR MSG_MPC_AMBIENT_XFER_COEFF_E = _UxGT("H ambiente *");
372372
LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E = _UxGT("H Amb. vent. *");
373-
LSTR MSG_SELECT = _UxGT("Seleziona");
374373
LSTR MSG_SELECT_E = _UxGT("Seleziona *");
375374
LSTR MSG_ACC = _UxGT("Accel");
376375
LSTR MSG_JERK = _UxGT("Jerk");

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

-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ namespace Language_jp_kana {
114114
LSTR MSG_AUTOTEMP = _UxGT("ジドウオンドセイギョ"); // "Autotemp"
115115
LSTR MSG_LCD_ON = _UxGT("オン"); // "On"
116116
LSTR MSG_LCD_OFF = _UxGT("オフ"); // "Off"
117-
LSTR MSG_SELECT = _UxGT("センタク"); // "Select"
118117
LSTR MSG_SELECT_E = _UxGT("センタク *");
119118
LSTR MSG_ACC = _UxGT("カソクド mm/s") SUPERSCRIPT_TWO; // "Accel"
120119
LSTR MSG_JERK = _UxGT("ヤクドウ mm/s"); // "Jerk"

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

-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ namespace Language_nl {
108108
LSTR MSG_AUTOTEMP = _UxGT("Autotemp");
109109
LSTR MSG_LCD_ON = _UxGT("Aan");
110110
LSTR MSG_LCD_OFF = _UxGT("Uit");
111-
LSTR MSG_SELECT = _UxGT("Selecteer");
112111
LSTR MSG_SELECT_E = _UxGT("Selecteer *");
113112
LSTR MSG_ACC = _UxGT("Versn");
114113
LSTR MSG_TEMPERATURE = _UxGT("Temperatuur");

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

-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ namespace Language_pl {
269269
LSTR MSG_PID_AUTOTUNE = _UxGT("PID Autostrojenie");
270270
LSTR MSG_PID_AUTOTUNE_E = _UxGT("PID Autostrojenie *");
271271
LSTR MSG_PID_AUTOTUNE_DONE = _UxGT("Strojenie PID zakończone");
272-
LSTR MSG_SELECT = _UxGT("Wybierz");
273272
LSTR MSG_SELECT_E = _UxGT("Wybierz *");
274273
LSTR MSG_ACC = _UxGT("Przyspieszenie");
275274
LSTR MSG_JERK = _UxGT("Zryw");

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

-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ namespace Language_pt_br {
236236
LSTR MSG_AUTOTEMP = _UxGT("Temp. Automática");
237237
LSTR MSG_LCD_ON = _UxGT("Ligado");
238238
LSTR MSG_LCD_OFF = _UxGT("Desligado");
239-
LSTR MSG_SELECT = _UxGT("Selecionar");
240239
LSTR MSG_SELECT_E = _UxGT("Selecionar *");
241240
LSTR MSG_ACC = _UxGT("Acel.");
242241
LSTR MSG_JERK = _UxGT("Arrancada");

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

-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ namespace Language_ro {
264264
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Autotune failed! Bad extruder.");
265265
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Autotune failed! Temperature too high.");
266266
LSTR MSG_PID_TIMEOUT = _UxGT("Autotune failed! Timeout.");
267-
LSTR MSG_SELECT = _UxGT("Select");
268267
LSTR MSG_SELECT_E = _UxGT("Select *");
269268
LSTR MSG_ACC = _UxGT("Accel");
270269
LSTR MSG_JERK = _UxGT("Jerk");

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

-1
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@ namespace Language_ru {
386386
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Сбой автоподбора! Температура повышена.");
387387
LSTR MSG_PID_TIMEOUT = _UxGT("Сбой автоподбора! Завершение времени.");
388388

389-
LSTR MSG_SELECT = _UxGT("Выбор");
390389
LSTR MSG_SELECT_E = _UxGT("Выбор *");
391390
LSTR MSG_ACC = _UxGT("Ускорение");
392391
LSTR MSG_JERK = _UxGT("Рывок");

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

-1
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,6 @@ namespace Language_sk {
368368
LSTR MSG_SENSOR_RESPONSIVENESS_E = _UxGT("Rozliš. senz. *");
369369
LSTR MSG_MPC_AMBIENT_XFER_COEFF_E = _UxGT("H okolia *");
370370
LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E = _UxGT("H vent. okolia *");
371-
LSTR MSG_SELECT = _UxGT("Vybrať");
372371
LSTR MSG_SELECT_E = _UxGT("Vybrať *");
373372
LSTR MSG_ACC = _UxGT("Zrýchlenie");
374373
LSTR MSG_JERK = _UxGT("Skok");

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

-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ namespace Language_sv {
294294
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Autojustera misslyckad! Dålig extruder.");
295295
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Autojustera misslyckad! Temperatur för hög.");
296296
LSTR MSG_PID_TIMEOUT = _UxGT("Autojustera misslyckad! Tidsgräns.");
297-
LSTR MSG_SELECT = _UxGT("Välj");
298297
LSTR MSG_SELECT_E = _UxGT("Välj *");
299298
LSTR MSG_ACC = _UxGT("Accel");
300299
LSTR MSG_JERK = _UxGT("Ryck");

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

-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ namespace Language_tr {
256256
LSTR MSG_LCD_OFF = _UxGT("Kapalı");
257257
LSTR MSG_PID_AUTOTUNE = _UxGT("PID Kalibrasyon");
258258
LSTR MSG_PID_AUTOTUNE_E = _UxGT("PID Kalibrasyon *");
259-
LSTR MSG_SELECT = _UxGT("Seç");
260259
LSTR MSG_SELECT_E = _UxGT("Seç *");
261260
LSTR MSG_ACC = _UxGT("İvme");
262261

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

-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,6 @@ namespace Language_uk {
391391
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Збій автопідбору! Температура завищена.");
392392
LSTR MSG_PID_TIMEOUT = _UxGT("Збій автопідбору! Вичерпан час.");
393393

394-
LSTR MSG_SELECT = _UxGT("Вибрати");
395394
LSTR MSG_SELECT_E = _UxGT("Вибрати *");
396395
LSTR MSG_ACC = _UxGT("Прискорорення");
397396
LSTR MSG_JERK = _UxGT("Ривок");

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

-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ namespace Language_vi {
224224
LSTR MSG_AUTOTEMP = _UxGT("Nhiệt độ tự động"); // Autotemp
225225
LSTR MSG_LCD_ON = _UxGT("Bật"); // on
226226
LSTR MSG_LCD_OFF = _UxGT("Tắt"); // off
227-
LSTR MSG_SELECT = _UxGT("Lựa"); // Select
228227
LSTR MSG_SELECT_E = _UxGT("Lựa *");
229228
LSTR MSG_ACC = _UxGT("Tăng Tốc");
230229
LSTR MSG_JERK = _UxGT("Giật");

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

-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ namespace Language_zh_CN {
264264
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("自动调失败! 坏的挤出机");
265265
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("自动调失败! 温度太高");
266266
LSTR MSG_PID_TIMEOUT = _UxGT("自动调失败! 超时");
267-
LSTR MSG_SELECT = _UxGT("选择"); // "Select"
268267
LSTR MSG_SELECT_E = _UxGT("选择 *");
269268
LSTR MSG_ACC = _UxGT("加速度"); // "Accel" acceleration
270269
LSTR MSG_JERK = _UxGT("抖动速率"); // "Jerk"

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

-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@ namespace Language_zh_TW {
249249
LSTR MSG_LCD_ON = _UxGT("開 "); // "On"
250250
LSTR MSG_LCD_OFF = _UxGT("關 "); // "Off"
251251

252-
LSTR MSG_SELECT = _UxGT("選擇"); // "Select"
253252
LSTR MSG_SELECT_E = _UxGT("選擇 *");
254253
LSTR MSG_ACC = _UxGT("加速度"); // "Accel" acceleration
255254
LSTR MSG_JERK = _UxGT("抖動速率"); // "Jerk"

‎Marlin/src/lcd/menu/menu_motion.cpp

+4-14
Original file line numberDiff line numberDiff line change
@@ -246,25 +246,15 @@ void menu_move() {
246246
#endif
247247
}
248248
#elif EXTRUDERS == 3
249-
if (active_extruder < 2) {
250-
if (active_extruder)
251-
GCODES_ITEM_N(0, MSG_SELECT_E, F("T0"));
252-
else
253-
GCODES_ITEM_N(1, MSG_SELECT_E, F("T1"));
254-
}
249+
if (active_extruder < 2)
250+
GCODES_ITEM_N(1 - active_extruder, MSG_SELECT_E, active_extruder ? F("T0") : F("T1"));
255251
#else
256-
if (active_extruder)
257-
GCODES_ITEM_N(0, MSG_SELECT_E, F("T0"));
258-
else
259-
GCODES_ITEM_N(1, MSG_SELECT_E, F("T1"));
252+
GCODES_ITEM_N(1 - active_extruder, MSG_SELECT_E, active_extruder ? F("T0") : F("T1"));
260253
#endif
261254

262255
#elif ENABLED(DUAL_X_CARRIAGE)
263256

264-
if (active_extruder)
265-
GCODES_ITEM_N(0, MSG_SELECT_E, F("T0"));
266-
else
267-
GCODES_ITEM_N(1, MSG_SELECT_E, F("T1"));
257+
GCODES_ITEM_N(1 - active_extruder, MSG_SELECT_E, active_extruder ? F("T0") : F("T1"));
268258

269259
#endif
270260

‎Marlin/src/module/probe.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#endif
5151

5252
#if ALL(DWIN_LCD_PROUI, INDIVIDUAL_AXIS_HOMING_SUBMENU, MESH_BED_LEVELING)
53-
#define Z_POST_CLEARANCE HMI_data.z_after_homing;
53+
#define Z_POST_CLEARANCE HMI_data.z_after_homing
5454
#elif defined(Z_AFTER_HOMING)
5555
#define Z_POST_CLEARANCE Z_AFTER_HOMING
5656
#elif defined(Z_HOMING_HEIGHT)

0 commit comments

Comments
 (0)