Skip to content

Commit ec71d1f

Browse files
albatorsssxthinkyhead
authored and
Tracy Spiva
committed
🌐 DGUS Reloaded non-accented French (MarlinFirmware#25443)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
1 parent 6388248 commit ec71d1f

16 files changed

+804
-110
lines changed

‎Marlin/src/core/language.h

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
// eu Basque-Euskera
5656
// fi Finnish
5757
// fr French
58+
// fr_na French without accents (DWIN T5UID1 touchscreen)
5859
// gl Galician
5960
// hr Croatian
6061
// hu Hungarian

‎Marlin/src/lcd/dogm/fontdata/langdata_fr_na.h

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/**
2+
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
3+
* Contents will be REPLACED by future processing!
4+
* Use genallfont.sh to generate font data for updated languages.
5+
*/
6+
#pragma once
7+
8+
#include "langdata.h"
9+
10+
static const uxg_fontinfo_t g_fontinfo_fr_na[] PROGMEM = {};

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

+34-46
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(F("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(F("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(F("No file selected"));
140+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_NO_FILE_SELECTED));
141141
return;
142142
}
143143

@@ -147,7 +147,7 @@ void DGUSRxHandler::ScreenChange(DGUS_VP &vp, void *data_ptr) {
147147
}
148148

149149
if (!dgus_screen_handler.IsPrinterIdle()) {
150-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
150+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
151151
return;
152152
}
153153

@@ -205,7 +205,7 @@ void DGUSRxHandler::PrintResume(DGUS_VP &vp, void *data_ptr) {
205205
}
206206

207207
if (!dgus_screen_handler.IsPrinterIdle()) {
208-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
208+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
209209
return;
210210
}
211211

@@ -362,7 +362,7 @@ void DGUSRxHandler::TempCool(DGUS_VP &vp, void *data_ptr) {
362362
#endif
363363
}
364364

365-
dgus_screen_handler.SetStatusMessage(F("Cooling..."));
365+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_COOLING));
366366

367367
dgus_screen_handler.TriggerFullUpdate();
368368
}
@@ -388,12 +388,12 @@ void DGUSRxHandler::ZOffset(DGUS_VP &vp, void *data_ptr) {
388388
UNUSED(vp);
389389

390390
if (!ExtUI::isAxisPositionKnown(ExtUI::Z)) {
391-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_HOMING_REQUIRED));
391+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_HOMING_REQUIRED));
392392
return;
393393
}
394394

395395
if (!dgus_screen_handler.IsPrinterIdle()) {
396-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
396+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
397397
return;
398398
}
399399

@@ -412,12 +412,12 @@ void DGUSRxHandler::ZOffsetStep(DGUS_VP &vp, void *data_ptr) {
412412
UNUSED(vp);
413413

414414
if (!ExtUI::isAxisPositionKnown(ExtUI::Z)) {
415-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_HOMING_REQUIRED));
415+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_HOMING_REQUIRED));
416416
return;
417417
}
418418

419419
if (!dgus_screen_handler.IsPrinterIdle()) {
420-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
420+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
421421
return;
422422
}
423423

@@ -454,12 +454,12 @@ void DGUSRxHandler::MoveToPoint(DGUS_VP &vp, void *data_ptr) {
454454
UNUSED(vp);
455455

456456
if (!ExtUI::isPositionKnown()) {
457-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_HOMING_REQUIRED));
457+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_HOMING_REQUIRED));
458458
return;
459459
}
460460

461461
if (!dgus_screen_handler.IsPrinterIdle()) {
462-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
462+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
463463
return;
464464
}
465465

@@ -509,12 +509,12 @@ void DGUSRxHandler::Probe(DGUS_VP &vp, void *data_ptr) {
509509
#endif
510510

511511
if (!ExtUI::isPositionKnown()) {
512-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_HOMING_REQUIRED));
512+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_HOMING_REQUIRED));
513513
return;
514514
}
515515

516516
if (!dgus_screen_handler.IsPrinterIdle()) {
517-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
517+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
518518
return;
519519
}
520520

@@ -533,7 +533,7 @@ void DGUSRxHandler::DisableABL(DGUS_VP &vp, void *data_ptr) {
533533
UNUSED(data_ptr);
534534

535535
if (!dgus_screen_handler.IsPrinterIdle()) {
536-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
536+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
537537
return;
538538
}
539539

@@ -574,7 +574,7 @@ void DGUSRxHandler::FilamentMove(DGUS_VP &vp, void *data_ptr) {
574574
UNUSED(vp);
575575

576576
if (!dgus_screen_handler.IsPrinterIdle()) {
577-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
577+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
578578
return;
579579
}
580580

@@ -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(F("Temperature too low"));
601+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_TEMP_TOO_LOW));
602602
return;
603603
}
604604

@@ -618,17 +618,13 @@ void DGUSRxHandler::Home(DGUS_VP &vp, void *data_ptr) {
618618
UNUSED(vp);
619619

620620
if (!dgus_screen_handler.IsPrinterIdle()) {
621-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
621+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
622622
return;
623623
}
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(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:
@@ -662,7 +658,7 @@ void DGUSRxHandler::Move(DGUS_VP &vp, void *data_ptr) {
662658
}
663659

664660
if (!ExtUI::isAxisPositionKnown(axis)) {
665-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_HOMING_REQUIRED));
661+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_HOMING_REQUIRED));
666662
return;
667663
}
668664

@@ -718,7 +714,7 @@ void DGUSRxHandler::MoveStep(DGUS_VP &vp, void *data_ptr) {
718714
}
719715

720716
if (!ExtUI::isAxisPositionKnown(axis)) {
721-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_HOMING_REQUIRED));
717+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_HOMING_REQUIRED));
722718
return;
723719
}
724720

@@ -755,15 +751,11 @@ void DGUSRxHandler::GcodeExecute(DGUS_VP &vp, void *data_ptr) {
755751
}
756752

757753
if (!dgus_screen_handler.IsPrinterIdle()) {
758-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
754+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
759755
return;
760756
}
761757

762-
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
763-
dgus_screen_handler.SetMessageLinePGM(PSTR("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
}
@@ -778,7 +770,7 @@ void DGUSRxHandler::ResetEEPROM(DGUS_VP &vp, void *data_ptr) {
778770
}
779771

780772
if (!dgus_screen_handler.IsPrinterIdle()) {
781-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
773+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
782774
return;
783775
}
784776

@@ -796,7 +788,7 @@ void DGUSRxHandler::SettingsExtra(DGUS_VP &vp, void *data_ptr) {
796788
case DGUS_Data::Extra::BUTTON1:
797789
#if ENABLED(BLTOUCH)
798790
if (!dgus_screen_handler.IsPrinterIdle()) {
799-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
791+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
800792
return;
801793
}
802794

@@ -842,7 +834,7 @@ void DGUSRxHandler::PIDSetTemp(DGUS_VP &vp, void *data_ptr) {
842834
UNUSED(vp);
843835

844836
if (!dgus_screen_handler.IsPrinterIdle()) {
845-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
837+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
846838
return;
847839
}
848840

@@ -873,7 +865,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
873865
UNUSED(data_ptr);
874866

875867
if (!dgus_screen_handler.IsPrinterIdle()) {
876-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
868+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
877869
return;
878870
}
879871

@@ -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(F("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(F("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(F("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(PSTR("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);
@@ -934,7 +922,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
934922
}
935923

936924
if (!dgus_screen_handler.IsPrinterIdle()) {
937-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
925+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
938926
return;
939927
}
940928

@@ -953,12 +941,12 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
953941
}
954942

955943
if (!dgus_screen_handler.IsPrinterIdle()) {
956-
dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
944+
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BUSY));
957945
return;
958946
}
959947

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

0 commit comments

Comments
 (0)