Skip to content

Commit 549aa1e

Browse files
thinkyheadthinkyhead
committed
misc. updates
1 parent 5aa8dc7 commit 549aa1e

15 files changed

+80
-103
lines changed

‎Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp

+11-23
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ void DGUSRxHandler::ScreenChange(DGUS_VP &vp, void *data_ptr) {
6363

6464
if (vp.addr == DGUS_Addr::SCREENCHANGE_Idle
6565
&& (ExtUI::isPrinting() || ExtUI::isPrintingPaused())) {
66-
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_IMPOSSIBLE_WHILE_PRINTING));
66+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_NOT_WHILE_PRINTING));
6767
return;
6868
}
6969

7070
if (vp.addr == DGUS_Addr::SCREENCHANGE_Printing
7171
&& (!ExtUI::isPrinting() && !ExtUI::isPrintingPaused())) {
72-
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_IMPOSSIBLE_WHILE_IDLE));
72+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_NOT_WHILE_IDLE));
7373
return;
7474
}
7575

@@ -137,7 +137,7 @@ void DGUSRxHandler::ScreenChange(DGUS_VP &vp, void *data_ptr) {
137137
UNUSED(data_ptr);
138138

139139
if (dgus_screen_handler.filelist_selected < 0) {
140-
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_NO_FILE_SELECTED ));
140+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_NO_FILE_SELECTED));
141141
return;
142142
}
143143

@@ -598,7 +598,7 @@ void DGUSRxHandler::FilamentMove(DGUS_VP &vp, void *data_ptr) {
598598
}
599599

600600
if (ExtUI::getActualTemp_celsius(extruder) < (float)EXTRUDE_MINTEMP) {
601-
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_TEMP_TOO_LOW));
601+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_TEMP_TOO_LOW));
602602
return;
603603
}
604604

@@ -624,11 +624,7 @@ void DGUSRxHandler::Home(DGUS_VP &vp, void *data_ptr) {
624624

625625
DGUS_Data::Axis axis = (DGUS_Data::Axis)((uint8_t*)data_ptr)[1];
626626

627-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
628-
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(DGUS_MSG_HOMING), 2);
629-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
630-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
631-
dgus_screen_handler.ShowWaitScreen(dgus_screen_handler.GetCurrentScreen());
627+
dgus_screen_handler.ShowWaitScreen(GET_TEXT_F(DGUS_MSG_HOMING), dgus_screen_handler.GetCurrentScreen());
632628

633629
switch (axis) {
634630
case DGUS_Data::Axis::X_Y_Z:
@@ -759,11 +755,7 @@ void DGUSRxHandler::GcodeExecute(DGUS_VP &vp, void *data_ptr) {
759755
return;
760756
}
761757

762-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
763-
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(MSG_EXECUTING_COMMAND), 2);
764-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
765-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
766-
dgus_screen_handler.ShowWaitScreen(DGUS_Screen::GCODE);
758+
dgus_screen_handler.ShowWaitScreen(GET_TEXT_F(DGUS_MSG_EXECUTING_COMMAND), DGUS_Screen::GCODE);
767759

768760
queue.enqueue_one_now(dgus_screen_handler.gcode);
769761
}
@@ -887,15 +879,15 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
887879
heater = H_BED;
888880
break;
889881
#else
890-
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_BED_PID_DISABLED));
882+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BED_PID_DISABLED));
891883
return;
892884
#endif
893885
case DGUS_Data::Heater::H0:
894886
#if ENABLED(PIDTEMP)
895887
heater = H_E0;
896888
break;
897889
#else
898-
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_PID_DISABLED));
890+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_PID_DISABLED));
899891
return;
900892
#endif
901893
#if HAS_MULTI_HOTEND
@@ -904,7 +896,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
904896
heater = H_E1;
905897
break;
906898
#else
907-
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_PID_DISABLED));
899+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_PID_DISABLED));
908900
return;
909901
#endif
910902
#endif
@@ -913,11 +905,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
913905
char buffer[24];
914906
snprintf_P(buffer, sizeof(buffer), PSTR("M303C%dE%dS%dU1"), cycles, heater, dgus_screen_handler.pid_temp);
915907

916-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
917-
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(MSG_PID_AUTOTUNING), 2);
918-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
919-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
920-
dgus_screen_handler.ShowWaitScreen(DGUS_Screen::PID);
908+
dgus_screen_handler.ShowWaitScreen(GET_TEXT_F(DGUS_MSG_PID_AUTOTUNING), DGUS_Screen::PID);
921909

922910
queue.enqueue_one_now(buffer);
923911
queue.enqueue_now_P(DGUS_CMD_EEPROM_SAVE);
@@ -958,7 +946,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
958946
}
959947

960948
if (!recovery.valid()) {
961-
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_INVALID_RECOVERY_DATA ));
949+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_INVALID_RECOVERY_DATA));
962950
return;
963951
}
964952

‎Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp

+20-17
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,7 @@ bool DGUSScreenHandler::leveling_active = false;
6969
millis_t DGUSScreenHandler::status_expire = 0;
7070
millis_t DGUSScreenHandler::eeprom_save = 0;
7171

72-
const char DGUS_MSG_HOMING_REQUIRED[] PROGMEM = "Homing required",
73-
DGUS_MSG_BUSY[] PROGMEM = "Busy",
74-
DGUS_MSG_UNDEF[] PROGMEM = "-",
75-
DGUS_MSG_HOMING[] PROGMEM = "Homing...",
76-
DGUS_MSG_FW_OUTDATED[] PROGMEM = "DWIN GUI/OS update required",
77-
DGUS_MSG_ABL_REQUIRED[] PROGMEM = "Auto bed leveling required";
72+
const char DGUS_MSG_UNDEF[] PROGMEM = "-";
7873

7974
const char DGUS_CMD_HOME[] PROGMEM = "G28",
8075
DGUS_CMD_EEPROM_SAVE[] PROGMEM = "M500";
@@ -159,25 +154,25 @@ void DGUSScreenHandler::Loop() {
159154
}
160155

161156
void DGUSScreenHandler::PrinterKilled(FSTR_P const error, FSTR_P const component) {
162-
SetMessageLinePGM(FTOP(error), 1);
163-
SetMessageLinePGM(FTOP(component), 2);
157+
SetMessageLine(error, 1);
158+
SetMessageLine(component, 2);
164159
SetMessageLinePGM(NUL_STR, 3);
165-
SetMessageLinePGM(GET_TEXT(MSG_PLEASE_RESET), 4);
160+
SetMessageLine(GET_TEXT_F(MSG_PLEASE_RESET), 4);
166161

167162
dgus_display.PlaySound(3, 1, 200);
168163

169164
MoveToScreen(DGUS_Screen::KILL, true);
170165
}
171166

172167
void DGUSScreenHandler::UserConfirmRequired(const char * const msg) {
173-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
174-
dgus_screen_handler.SetMessageLine(msg, 2);
175-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
176-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
168+
SetMessageLinePGM(NUL_STR, 1);
169+
SetMessageLine(msg, 2);
170+
SetMessageLinePGM(NUL_STR, 3);
171+
SetMessageLinePGM(NUL_STR, 4);
177172

178173
dgus_display.PlaySound(3);
179174

180-
dgus_screen_handler.ShowWaitScreen(current_screen, true);
175+
ShowWaitScreen(current_screen, true);
181176
}
182177

183178
void DGUSScreenHandler::SettingsReset() {
@@ -347,7 +342,7 @@ void DGUSScreenHandler::FilamentRunout(const ExtUI::extruder_t extruder) {
347342

348343
#endif // HAS_PID_HEATING
349344

350-
void DGUSScreenHandler::SetMessageLine(const char* msg, uint8_t line) {
345+
void DGUSScreenHandler::SetMessageLine(const char * const msg, const uint8_t line) {
351346
switch (line) {
352347
default: return;
353348
case 1:
@@ -365,7 +360,7 @@ void DGUSScreenHandler::SetMessageLine(const char* msg, uint8_t line) {
365360
}
366361
}
367362

368-
void DGUSScreenHandler::SetMessageLinePGM(PGM_P msg, uint8_t line) {
363+
void DGUSScreenHandler::SetMessageLinePGM(PGM_P const msg, const uint8_t line) {
369364
switch (line) {
370365
default: return;
371366
case 1:
@@ -395,7 +390,7 @@ void DGUSScreenHandler::SetStatusMessage(FSTR_P const fmsg, const millis_t durat
395390
status_expire = (duration > 0 ? ExtUI::safe_millis() + duration : 0);
396391
}
397392

398-
void DGUSScreenHandler::ShowWaitScreen(DGUS_Screen return_screen, bool has_continue) {
393+
void DGUSScreenHandler::ShowWaitScreen(const DGUS_Screen return_screen, const bool has_continue/*=false*/) {
399394
if (return_screen != DGUS_Screen::WAIT) {
400395
wait_return_screen = return_screen;
401396
}
@@ -404,6 +399,14 @@ void DGUSScreenHandler::ShowWaitScreen(DGUS_Screen return_screen, bool has_conti
404399
TriggerScreenChange(DGUS_Screen::WAIT);
405400
}
406401

402+
void DGUSScreenHandler::ShowWaitScreen(FSTR_P const msg, const DGUS_Screen return_screen, const bool has_continue/*=false*/) {
403+
SetMessageLinePGM(NUL_STR, 1);
404+
SetMessageLine(msg, 2);
405+
SetMessageLinePGM(NUL_STR, 3);
406+
SetMessageLinePGM(NUL_STR, 4);
407+
ShowWaitScreen(return_screen, has_continue);
408+
}
409+
407410
DGUS_Screen DGUSScreenHandler::GetCurrentScreen() {
408411
return current_screen;
409412
}

‎Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h

+6-9
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,15 @@ class DGUSScreenHandler {
6969
static void PidTuning(const ExtUI::result_t rst);
7070
#endif
7171

72-
static void SetMessageLine(const char* msg, uint8_t line);
73-
static void SetMessageLinePGM(PGM_P msg, uint8_t line);
72+
static void SetMessageLine(const char * const msg, const uint8_t line);
73+
static void SetMessageLinePGM(PGM_P const msg, const uint8_t line);
74+
static void SetMessageLine(FSTR_P const msg, const uint8_t line) { SetMessageLinePGM(FTOP(msg), line); }
7475

7576
static void SetStatusMessage(const char* msg, const millis_t duration=DGUS_STATUS_EXPIRATION_MS);
7677
static void SetStatusMessage(FSTR_P const msg, const millis_t duration=DGUS_STATUS_EXPIRATION_MS);
7778

78-
static void ShowWaitScreen(DGUS_Screen return_screen, bool has_continue=false);
79+
static void ShowWaitScreen(const DGUS_Screen return_screen, const bool has_continue=false);
80+
static void ShowWaitScreen(FSTR_P const msg, const DGUS_Screen return_screen, const bool has_continue=false);
7981

8082
static DGUS_Screen GetCurrentScreen();
8183
static void TriggerScreenChange(DGUS_Screen screen);
@@ -140,12 +142,7 @@ class DGUSScreenHandler {
140142

141143
extern DGUSScreenHandler dgus_screen_handler;
142144

143-
extern const char DGUS_MSG_HOMING_REQUIRED[],
144-
DGUS_MSG_BUSY[],
145-
DGUS_MSG_UNDEF[],
146-
DGUS_MSG_HOMING[],
147-
DGUS_MSG_FW_OUTDATED[],
148-
DGUS_MSG_ABL_REQUIRED[];
145+
extern const char DGUS_MSG_UNDEF[];
149146

150147
extern const char DGUS_CMD_HOME[],
151148
DGUS_CMD_EEPROM_SAVE[];

‎Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp

+4-16
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,7 @@ bool DGUSSetupHandler::LevelingMenu() {
8080
return true;
8181
}
8282

83-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
84-
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(DGUS_MSG_HOMING), 2);
85-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
86-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
87-
dgus_screen_handler.ShowWaitScreen(DGUS_Screen::LEVELING_MENU);
83+
dgus_screen_handler.ShowWaitScreen(GET_TEXT_F(DGUS_MSG_HOMING), DGUS_Screen::LEVELING_MENU);
8884

8985
queue.enqueue_now_P(DGUS_CMD_HOME);
9086

@@ -103,11 +99,7 @@ bool DGUSSetupHandler::LevelingManual() {
10399
return false;
104100
}
105101

106-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
107-
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(DGUS_MSG_HOMING), 2);
108-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
109-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
110-
dgus_screen_handler.ShowWaitScreen(DGUS_Screen::LEVELING_MANUAL);
102+
dgus_screen_handler.ShowWaitScreen(GET_TEXT_F(DGUS_MSG_HOMING), DGUS_Screen::LEVELING_MANUAL);
111103

112104
queue.enqueue_now_P(DGUS_CMD_HOME);
113105

@@ -136,11 +128,7 @@ bool DGUSSetupHandler::LevelingOffset() {
136128
return true;
137129
}
138130

139-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
140-
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(DGUS_MSG_HOMING), 2);
141-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
142-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
143-
dgus_screen_handler.ShowWaitScreen(DGUS_Screen::LEVELING_OFFSET);
131+
dgus_screen_handler.ShowWaitScreen(GET_TEXT_F(DGUS_MSG_HOMING), DGUS_Screen::LEVELING_OFFSET);
144132

145133
queue.enqueue_now_P(DGUS_CMD_HOME);
146134

@@ -186,7 +174,7 @@ bool DGUSSetupHandler::Gcode() {
186174
ZERO(dgus_screen_handler.gcode);
187175

188176
if (dgus_display.gui_version < 0x30 || dgus_display.os_version < 0x21) {
189-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_FW_OUTDATED));
177+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_FW_OUTDATED));
190178
return false;
191179
}
192180

‎Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void DGUSTxHandler::PositionZ(DGUS_VP &vp) {
188188
dgus_display.Write((uint16_t)vp.addr, Swap16(data));
189189
}
190190

191-
void DGUSTxHandler::Ellapsed(DGUS_VP &vp) {
191+
void DGUSTxHandler::Elapsed(DGUS_VP &vp) {
192192
char buffer[21];
193193
duration_t(print_job_timer.duration()).toString(buffer);
194194

‎Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace DGUSTxHandler {
3737
#endif
3838

3939
void PositionZ(DGUS_VP &);
40-
void Ellapsed(DGUS_VP &);
40+
void Elapsed(DGUS_VP &);
4141
void Percent(DGUS_VP &);
4242
void StatusIcons(DGUS_VP &);
4343

‎Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ enum class DGUS_Addr : uint16_t {
108108
SD_ScrollIcons = 0x30C5, // Bits: DGUS_Data::ScrollIcon
109109
SD_SelectedFileName = 0x30C6, // 0x30C6 - 0x30E5
110110
STATUS_PositionZ = 0x30E6, // Type: Fixed point, 1 decimal (16 bits signed)
111-
STATUS_Ellapsed = 0x30E7, // 0x30E7 - 0x30F5
111+
STATUS_Elapsed = 0x30E7, // 0x30E7 - 0x30F5
112112
STATUS_Percent = 0x30F6, // Type: Integer (16 bits unsigned)
113113
STATUS_Icons = 0x30F7, // Bits: DGUS_Data::StatusIcon
114114
ADJUST_Feedrate = 0x30F8, // Type: Integer (16 bits signed)

‎Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ constexpr DGUS_Addr LIST_PRINT_STATUS[] PROGMEM = {
5656
DGUS_Addr::TEMP_Current_Bed,
5757
DGUS_Addr::TEMP_Target_Bed,
5858
DGUS_Addr::STATUS_PositionZ,
59-
DGUS_Addr::STATUS_Ellapsed,
59+
DGUS_Addr::STATUS_Elapsed,
6060
DGUS_Addr::STATUS_Percent,
6161
DGUS_Addr::STATUS_Icons,
6262
(DGUS_Addr)0
@@ -78,7 +78,7 @@ constexpr DGUS_Addr LIST_PRINT_FINISHED[] PROGMEM = {
7878
DGUS_Addr::TEMP_Current_Bed,
7979
DGUS_Addr::TEMP_Target_Bed,
8080
DGUS_Addr::STATUS_PositionZ,
81-
DGUS_Addr::STATUS_Ellapsed,
81+
DGUS_Addr::STATUS_Elapsed,
8282
DGUS_Addr::STATUS_Percent_Complete,
8383
(DGUS_Addr)0
8484
};

‎Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,12 @@ const struct DGUS_VP vp_list[] PROGMEM = {
177177
VP_HELPER_TX_AUTO(DGUS_Addr::STATUS_PositionZ,
178178
nullptr,
179179
&DGUSTxHandler::PositionZ),
180-
VP_HELPER(DGUS_Addr::STATUS_Ellapsed,
180+
VP_HELPER(DGUS_Addr::STATUS_Elapsed,
181181
DGUS_ELAPSED_LEN,
182182
VPFLAG_AUTOUPLOAD,
183183
nullptr,
184184
nullptr,
185-
&DGUSTxHandler::Ellapsed),
185+
&DGUSTxHandler::Elapsed),
186186
VP_HELPER_TX_AUTO(DGUS_Addr::STATUS_Percent,
187187
nullptr,
188188
&DGUSTxHandler::Percent),

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -883,19 +883,19 @@ namespace Language_en {
883883
LSTR MSG_PID_F_E = _UxGT("PID-F *");
884884
LSTR MSG_BACKLASH_N = _UxGT("@");
885885

886-
LSTR MSG_IMPOSSIBLE_WHILE_PRINTING = _UxGT("Impossible while printing");
887-
LSTR MSG_IMPOSSIBLE_WHILE_IDLE = _UxGT("Impossible while idle");
888-
LSTR MSG_NO_FILE_SELECTED = _UxGT("No file selected");
889-
LSTR MSG_TEMP_TOO_LOW = _UxGT("Temperature too low");
890-
LSTR MSG_EXECUTING_COMMAND = _UxGT("Executing command...");
891-
LSTR MSG_BED_PID_DISABLED = _UxGT("Bed PID disabled");
892-
LSTR MSG_PID_DISABLED = _UxGT("PID disabled");
893-
LSTR MSG_PID_AUTOTUNING = _UxGT("PID autotuning...");
894-
LSTR MSG_INVALID_RECOVERY_DATA = _UxGT("Invalid recovery data");
886+
// DGUS-Specific message strings, not used elsewhere
887+
LSTR DGUS_MSG_NOT_WHILE_PRINTING = _UxGT("Not allowed during print");
888+
LSTR DGUS_MSG_NOT_WHILE_IDLE = _UxGT("Not allowed while idle");
889+
LSTR DGUS_MSG_NO_FILE_SELECTED = _UxGT("No file selected");
890+
LSTR DGUS_MSG_TEMP_TOO_LOW = _UxGT("Temperature too low");
891+
LSTR DGUS_MSG_EXECUTING_COMMAND = _UxGT("Executing command...");
892+
LSTR DGUS_MSG_BED_PID_DISABLED = _UxGT("Bed PID disabled");
893+
LSTR DGUS_MSG_PID_DISABLED = _UxGT("PID disabled");
894+
LSTR DGUS_MSG_PID_AUTOTUNING = _UxGT("PID autotuning...");
895+
LSTR DGUS_MSG_INVALID_RECOVERY_DATA = _UxGT("Invalid recovery data");
895896

896897
LSTR DGUS_MSG_HOMING_REQUIRED = _UxGT("Homing required");
897898
LSTR DGUS_MSG_BUSY = _UxGT("Busy");
898-
LSTR DGUS_MSG_UNDEF = _UxGT("-");
899899
LSTR DGUS_MSG_HOMING = _UxGT("Homing...");
900900
LSTR DGUS_MSG_FW_OUTDATED = _UxGT("DWIN GUI/OS update required");
901901
LSTR DGUS_MSG_ABL_REQUIRED = _UxGT("Auto bed leveling required");
@@ -904,7 +904,7 @@ namespace Language_en {
904904
LSTR DGUS_MSG_RESET_EEPROM = _UxGT("EEPROM reset");
905905
LSTR DGUS_MSG_WRITE_EEPROM_FAILED = _UxGT("EEPROM write failed");
906906
LSTR DGUS_MSG_READ_EEPROM_FAILED = _UxGT("EEPROM read failed");
907-
LSTR DGUS_MSG_FILAMENT_RUNOUT = _UxGT("Filament runout E");
907+
LSTR DGUS_MSG_FILAMENT_RUNOUT = _UxGT("Filament runout E%d");
908908

909909
}
910910

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,6 @@ namespace Language_fr {
644644

645645
LSTR DGUS_MSG_HOMING_REQUIRED = _UxGT("Retour a l'origine necessaire...");
646646
LSTR DGUS_MSG_BUSY = _UxGT("Occupe");
647-
LSTR DGUS_MSG_UNDEF = _UxGT("-");
648647
LSTR DGUS_MSG_HOMING = _UxGT("Retour a l'origine...");
649648
LSTR DGUS_MSG_FW_OUTDATED = _UxGT("Mise a jour DWIN GUI/OS necessaire");
650649
LSTR DGUS_MSG_ABL_REQUIRED = _UxGT("Nivellement du bed necessaire");
@@ -653,6 +652,6 @@ namespace Language_fr {
653652
LSTR DGUS_MSG_RESET_EEPROM = _UxGT("Reinitialisation de l'EEPROM");
654653
LSTR DGUS_MSG_WRITE_EEPROM_FAILED = _UxGT("Echec ecriture de l'EEPROM");
655654
LSTR DGUS_MSG_READ_EEPROM_FAILED = _UxGT("Echec lecture de l'EEPROM");
656-
LSTR DGUS_MSG_FILAMENT_RUNOUT = _UxGT("Sortie de filament E");
655+
LSTR DGUS_MSG_FILAMENT_RUNOUT = _UxGT("Sortie de filament E%d");
657656

658657
}

0 commit comments

Comments
 (0)