Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 9161048

Browse files
thinkyheadthinkyhead
committedFeb 28, 2023
misc. updates
1 parent 5867690 commit 9161048

16 files changed

+32
-66
lines changed
 

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ void DGUSRxHandler::Home(DGUS_VP &vp, void *data_ptr) {
625625
DGUS_Data::Axis axis = (DGUS_Data::Axis)((uint8_t*)data_ptr)[1];
626626

627627
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
628-
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(DGUS_MSG_HOMING), 2);
628+
dgus_screen_handler.SetMessageLine(GET_TEXT_F(DGUS_MSG_HOMING), 2);
629629
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
630630
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
631631
dgus_screen_handler.ShowWaitScreen(dgus_screen_handler.GetCurrentScreen());
@@ -760,7 +760,7 @@ void DGUSRxHandler::GcodeExecute(DGUS_VP &vp, void *data_ptr) {
760760
}
761761

762762
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
763-
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(MSG_EXECUTING_COMMAND), 2);
763+
dgus_screen_handler.SetMessageLine(GET_TEXT_F(MSG_EXECUTING_COMMAND), 2);
764764
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
765765
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
766766
dgus_screen_handler.ShowWaitScreen(DGUS_Screen::GCODE);
@@ -914,7 +914,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
914914
snprintf_P(buffer, sizeof(buffer), PSTR("M303C%dE%dS%dU1"), cycles, heater, dgus_screen_handler.pid_temp);
915915

916916
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
917-
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(MSG_PID_AUTOTUNING), 2);
917+
dgus_screen_handler.SetMessageLine(GET_TEXT_F(MSG_PID_AUTOTUNING), 2);
918918
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
919919
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
920920
dgus_screen_handler.ShowWaitScreen(DGUS_Screen::PID);

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

+10-17
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,6 @@ 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";
78-
7972
const char DGUS_CMD_HOME[] PROGMEM = "G28",
8073
DGUS_CMD_EEPROM_SAVE[] PROGMEM = "M500";
8174

@@ -159,25 +152,25 @@ void DGUSScreenHandler::Loop() {
159152
}
160153

161154
void DGUSScreenHandler::PrinterKilled(FSTR_P const error, FSTR_P const component) {
162-
SetMessageLinePGM(FTOP(error), 1);
163-
SetMessageLinePGM(FTOP(component), 2);
155+
SetMessageLine(error, 1);
156+
SetMessageLine(component, 2);
164157
SetMessageLinePGM(NUL_STR, 3);
165-
SetMessageLinePGM(GET_TEXT(MSG_PLEASE_RESET), 4);
158+
SetMessageLine(GET_TEXT_F(MSG_PLEASE_RESET), 4);
166159

167160
dgus_display.PlaySound(3, 1, 200);
168161

169162
MoveToScreen(DGUS_Screen::KILL, true);
170163
}
171164

172165
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);
166+
SetMessageLinePGM(NUL_STR, 1);
167+
SetMessageLine(msg, 2);
168+
SetMessageLinePGM(NUL_STR, 3);
169+
SetMessageLinePGM(NUL_STR, 4);
177170

178171
dgus_display.PlaySound(3);
179172

180-
dgus_screen_handler.ShowWaitScreen(current_screen, true);
173+
ShowWaitScreen(current_screen, true);
181174
}
182175

183176
void DGUSScreenHandler::SettingsReset() {
@@ -347,7 +340,7 @@ void DGUSScreenHandler::FilamentRunout(const ExtUI::extruder_t extruder) {
347340

348341
#endif // HAS_PID_HEATING
349342

350-
void DGUSScreenHandler::SetMessageLine(const char* msg, uint8_t line) {
343+
void DGUSScreenHandler::SetMessageLine(const char * const msg, const uint8_t line) {
351344
switch (line) {
352345
default: return;
353346
case 1:
@@ -365,7 +358,7 @@ void DGUSScreenHandler::SetMessageLine(const char* msg, uint8_t line) {
365358
}
366359
}
367360

368-
void DGUSScreenHandler::SetMessageLinePGM(PGM_P msg, uint8_t line) {
361+
void DGUSScreenHandler::SetMessageLinePGM(PGM_P const msg, const uint8_t line) {
369362
switch (line) {
370363
default: return;
371364
case 1:

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

+3-9
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ 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);
@@ -140,12 +141,5 @@ class DGUSScreenHandler {
140141

141142
extern DGUSScreenHandler dgus_screen_handler;
142143

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[];
149-
150144
extern const char DGUS_CMD_HOME[],
151145
DGUS_CMD_EEPROM_SAVE[];

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

+11-15
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ bool DGUSSetupHandler::PrintAdjust() {
6464
return false;
6565
}
6666

67+
void ShowWaitScreenMessage(FSTR_P const msg, const DGUS_Screen screen) {
68+
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
69+
dgus_screen_handler.SetMessageLine(msg, 2);
70+
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
71+
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
72+
dgus_screen_handler.ShowWaitScreen(screen);
73+
}
74+
6775
bool DGUSSetupHandler::LevelingMenu() {
6876
ExtUI::setLevelingActive(dgus_screen_handler.leveling_active);
6977

@@ -80,11 +88,7 @@ bool DGUSSetupHandler::LevelingMenu() {
8088
return true;
8189
}
8290

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);
91+
ShowWaitScreenMessage(GET_TEXT_F(DGUS_MSG_HOMING), DGUS_Screen::LEVELING_MENU);
8892

8993
queue.enqueue_now_P(DGUS_CMD_HOME);
9094

@@ -103,11 +107,7 @@ bool DGUSSetupHandler::LevelingManual() {
103107
return false;
104108
}
105109

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);
110+
ShowWaitScreenMessage(GET_TEXT_F(DGUS_MSG_HOMING), DGUS_Screen::LEVELING_MANUAL);
111111

112112
queue.enqueue_now_P(DGUS_CMD_HOME);
113113

@@ -136,11 +136,7 @@ bool DGUSSetupHandler::LevelingOffset() {
136136
return true;
137137
}
138138

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);
139+
ShowWaitScreenMessage(GET_TEXT_F(DGUS_MSG_HOMING), DGUS_Screen::LEVELING_OFFSET);
144140

145141
queue.enqueue_now_P(DGUS_CMD_HOME);
146142

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

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
* See also https://marlinfw.org/docs/development/lcd_language.html
2929
*/
3030

31-
#define DISPLAY_CHARSET_ISO10646_1
3231
#define NOT_EXTENDED_ISO10646_1_5X7
3332

3433
namespace Language_an {

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

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
* See also https://marlinfw.org/docs/development/lcd_language.html
2929
*/
3030

31-
#define DISPLAY_CHARSET_ISO10646_1
32-
3331
namespace Language_da {
3432
using namespace Language_en; // Inherit undefined strings from English
3533

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

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
* See also https://marlinfw.org/docs/development/lcd_language.html
2929
*/
3030

31-
#define DISPLAY_CHARSET_ISO10646_1
3231
#define NOT_EXTENDED_ISO10646_1_5X7
3332

3433
namespace Language_eu {

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

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
* See also https://marlinfw.org/docs/development/lcd_language.html
2929
*/
3030

31-
#define DISPLAY_CHARSET_ISO10646_1
32-
3331
namespace Language_fi {
3432
using namespace Language_en; // Inherit undefined strings from English
3533

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

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
* See also https://marlinfw.org/docs/development/lcd_language.html
2929
*/
3030

31-
#define DISPLAY_CHARSET_ISO10646_1
32-
3331
namespace Language_fr {
3432
using namespace Language_en; // Inherit undefined strings from English
3533

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* See also https://marlinfw.org/docs/development/lcd_language.html
2929
*/
3030

31-
#define DISPLAY_CHARSET_ISO10646_1
31+
#define NOT_EXTENDED_ISO10646_1_5X7
3232

3333
namespace Language_fr_na {
3434
using namespace Language_en; // Inherit undefined strings from English

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

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
* See also https://marlinfw.org/docs/development/lcd_language.html
2929
*/
3030

31-
#define DISPLAY_CHARSET_ISO10646_1
32-
3331
namespace Language_gl {
3432
using namespace Language_en; // Inherit undefined strings from English
3533

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

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
* @ displays an axis name such as XYZUVW, or E for an extruder
3737
*/
3838

39-
#define DISPLAY_CHARSET_ISO10646_1
40-
4139
namespace Language_it {
4240
using namespace Language_en; // Inherit undefined strings from English
4341

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

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
* See also https://marlinfw.org/docs/development/lcd_language.html
2929
*/
3030

31-
#define DISPLAY_CHARSET_ISO10646_1
3231
#define NOT_EXTENDED_ISO10646_1_5X7
3332

3433
namespace Language_nl {

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

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
* See also https://marlinfw.org/docs/development/lcd_language.html
3030
*/
3131

32-
#define DISPLAY_CHARSET_ISO10646_1
33-
3432
namespace Language_pt {
3533
using namespace Language_en; // Inherit undefined strings from English
3634

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

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
* See also https://marlinfw.org/docs/development/lcd_language.html
2929
*/
3030

31-
#define DISPLAY_CHARSET_ISO10646_1
32-
3331
namespace Language_sv {
3432
using namespace Language_en; // Inherit undefined strings from English
3533

‎buildroot/tests/FYSETC_F6

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
set -e
88

99
#
10-
# Build with the default configurations
10+
# Build with the default config plus DGUS_LCD_UI FYSETC
1111
#
1212
restore_configs
1313
opt_set MOTHERBOARD BOARD_FYSETC_F6_13 LCD_SERIAL_PORT 1 DGUS_LCD_UI FYSETC
1414
exec_test $1 $2 "FYSETC F6 1.3 with DGUS (FYSETC)" "$3"
1515

1616
#
17-
# Test IA_CREALITY
17+
# Test DGUS_LCD_UI RELOADED
1818
#
1919
restore_configs
20-
opt_set MOTHERBOARD BOARD_FYSETC_F6_13 LCD_SERIAL_PORT 1 DGUS_LCD_UI IA_CREALITY LCD_SCREEN_ROTATE 90
20+
opt_set MOTHERBOARD BOARD_FYSETC_F6_13 LCD_SERIAL_PORT 1 DGUS_LCD_UI RELOADED LCD_SCREEN_ROTATE 90
2121
opt_enable ADVANCED_PAUSE_FEATURE LCD_BED_TRAMMING CLASSIC_JERK BABYSTEPPING AUTO_BED_LEVELING_BILINEAR NOZZLE_PARK_FEATURE PROBE_MANUALLY
22-
exec_test $1 $2 "FYSETC F6 1.3 with DGUS (IA_CREALITY)" "$3"
22+
exec_test $1 $2 "FYSETC F6 1.3 with DGUS (RELOADED)" "$3"
2323

2424
#
2525
# Delta Config (generic) + UBL + ALLEN_KEY + EEPROM_SETTINGS + OLED_PANEL_TINYBOY2

0 commit comments

Comments
 (0)
Please sign in to comment.