Skip to content

Commit

Permalink
misc. updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@thinkyhead
thinkyhead committed Feb 28, 2023
1 parent 5aa8dc7 commit 43b43bf
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 88 deletions.
42 changes: 19 additions & 23 deletions Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ void DGUSRxHandler::ScreenChange(DGUS_VP &vp, void *data_ptr) {

if (vp.addr == DGUS_Addr::SCREENCHANGE_Idle
&& (ExtUI::isPrinting() || ExtUI::isPrintingPaused())) {
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_IMPOSSIBLE_WHILE_PRINTING));
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_NOT_WHILE_PRINTING));
return;
}

if (vp.addr == DGUS_Addr::SCREENCHANGE_Printing
&& (!ExtUI::isPrinting() && !ExtUI::isPrintingPaused())) {
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_IMPOSSIBLE_WHILE_IDLE));
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_NOT_WHILE_IDLE));
return;
}

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

if (dgus_screen_handler.filelist_selected < 0) {
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_NO_FILE_SELECTED ));
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_NO_FILE_SELECTED));
return;
}

Expand Down Expand Up @@ -598,7 +598,7 @@ void DGUSRxHandler::FilamentMove(DGUS_VP &vp, void *data_ptr) {
}

if (ExtUI::getActualTemp_celsius(extruder) < (float)EXTRUDE_MINTEMP) {
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_TEMP_TOO_LOW));
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_TEMP_TOO_LOW));
return;
}

Expand All @@ -614,6 +614,14 @@ void DGUSRxHandler::FilamentMove(DGUS_VP &vp, void *data_ptr) {
}
}

void ShowWaitScreenMessage(FSTR_P const msg, const DGUS_Screen screen) {
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
dgus_screen_handler.SetMessageLine(msg, 2);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
dgus_screen_handler.ShowWaitScreen(screen);
}

void DGUSRxHandler::Home(DGUS_VP &vp, void *data_ptr) {
UNUSED(vp);

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

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

dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(DGUS_MSG_HOMING), 2);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
dgus_screen_handler.ShowWaitScreen(dgus_screen_handler.GetCurrentScreen());
ShowWaitScreenMessage(GET_TEXT_F(DGUS_MSG_HOMING), dgus_screen_handler.GetCurrentScreen());

switch (axis) {
case DGUS_Data::Axis::X_Y_Z:
Expand Down Expand Up @@ -759,11 +763,7 @@ void DGUSRxHandler::GcodeExecute(DGUS_VP &vp, void *data_ptr) {
return;
}

dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(MSG_EXECUTING_COMMAND), 2);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
dgus_screen_handler.ShowWaitScreen(DGUS_Screen::GCODE);
ShowWaitScreenMessage(GET_TEXT_F(DGUS_MSG_EXECUTING_COMMAND), DGUS_Screen::GCODE);

queue.enqueue_one_now(dgus_screen_handler.gcode);
}
Expand Down Expand Up @@ -887,15 +887,15 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
heater = H_BED;
break;
#else
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_BED_PID_DISABLED));
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_BED_PID_DISABLED));
return;
#endif
case DGUS_Data::Heater::H0:
#if ENABLED(PIDTEMP)
heater = H_E0;
break;
#else
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_PID_DISABLED));
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_PID_DISABLED));
return;
#endif
#if HAS_MULTI_HOTEND
Expand All @@ -904,7 +904,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
heater = H_E1;
break;
#else
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_PID_DISABLED));
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_PID_DISABLED));
return;
#endif
#endif
Expand All @@ -913,11 +913,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
char buffer[24];
snprintf_P(buffer, sizeof(buffer), PSTR("M303C%dE%dS%dU1"), cycles, heater, dgus_screen_handler.pid_temp);

dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(MSG_PID_AUTOTUNING), 2);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
dgus_screen_handler.ShowWaitScreen(DGUS_Screen::PID);
ShowWaitScreenMessage(GET_TEXT_F(DGUS_MSG_PID_AUTOTUNING), DGUS_Screen::PID);

queue.enqueue_one_now(buffer);
queue.enqueue_now_P(DGUS_CMD_EEPROM_SAVE);
Expand Down Expand Up @@ -958,7 +954,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
}

if (!recovery.valid()) {
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_INVALID_RECOVERY_DATA ));
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(DGUS_MSG_INVALID_RECOVERY_DATA));
return;
}

Expand Down
27 changes: 10 additions & 17 deletions Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,6 @@ bool DGUSScreenHandler::leveling_active = false;
millis_t DGUSScreenHandler::status_expire = 0;
millis_t DGUSScreenHandler::eeprom_save = 0;

const char DGUS_MSG_HOMING_REQUIRED[] PROGMEM = "Homing required",
DGUS_MSG_BUSY[] PROGMEM = "Busy",
DGUS_MSG_UNDEF[] PROGMEM = "-",
DGUS_MSG_HOMING[] PROGMEM = "Homing...",
DGUS_MSG_FW_OUTDATED[] PROGMEM = "DWIN GUI/OS update required",
DGUS_MSG_ABL_REQUIRED[] PROGMEM = "Auto bed leveling required";

const char DGUS_CMD_HOME[] PROGMEM = "G28",
DGUS_CMD_EEPROM_SAVE[] PROGMEM = "M500";

Expand Down Expand Up @@ -159,25 +152,25 @@ void DGUSScreenHandler::Loop() {
}

void DGUSScreenHandler::PrinterKilled(FSTR_P const error, FSTR_P const component) {
SetMessageLinePGM(FTOP(error), 1);
SetMessageLinePGM(FTOP(component), 2);
SetMessageLine(error, 1);
SetMessageLine(component, 2);
SetMessageLinePGM(NUL_STR, 3);
SetMessageLinePGM(GET_TEXT(MSG_PLEASE_RESET), 4);
SetMessageLine(GET_TEXT_F(MSG_PLEASE_RESET), 4);

dgus_display.PlaySound(3, 1, 200);

MoveToScreen(DGUS_Screen::KILL, true);
}

void DGUSScreenHandler::UserConfirmRequired(const char * const msg) {
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
dgus_screen_handler.SetMessageLine(msg, 2);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
SetMessageLinePGM(NUL_STR, 1);
SetMessageLine(msg, 2);
SetMessageLinePGM(NUL_STR, 3);
SetMessageLinePGM(NUL_STR, 4);

dgus_display.PlaySound(3);

dgus_screen_handler.ShowWaitScreen(current_screen, true);
ShowWaitScreen(current_screen, true);
}

void DGUSScreenHandler::SettingsReset() {
Expand Down Expand Up @@ -347,7 +340,7 @@ void DGUSScreenHandler::FilamentRunout(const ExtUI::extruder_t extruder) {

#endif // HAS_PID_HEATING

void DGUSScreenHandler::SetMessageLine(const char* msg, uint8_t line) {
void DGUSScreenHandler::SetMessageLine(const char * const msg, const uint8_t line) {
switch (line) {
default: return;
case 1:
Expand All @@ -365,7 +358,7 @@ void DGUSScreenHandler::SetMessageLine(const char* msg, uint8_t line) {
}
}

void DGUSScreenHandler::SetMessageLinePGM(PGM_P msg, uint8_t line) {
void DGUSScreenHandler::SetMessageLinePGM(PGM_P const msg, const uint8_t line) {
switch (line) {
default: return;
case 1:
Expand Down
12 changes: 3 additions & 9 deletions Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ class DGUSScreenHandler {
static void PidTuning(const ExtUI::result_t rst);
#endif

static void SetMessageLine(const char* msg, uint8_t line);
static void SetMessageLinePGM(PGM_P msg, uint8_t line);
static void SetMessageLine(const char * const msg, const uint8_t line);
static void SetMessageLinePGM(PGM_P const msg, const uint8_t line);
static void SetMessageLine(FSTR_P const msg, const uint8_t line) { SetMessageLinePGM(FTOP(msg), line); }

static void SetStatusMessage(const char* msg, const millis_t duration=DGUS_STATUS_EXPIRATION_MS);
static void SetStatusMessage(FSTR_P const msg, const millis_t duration=DGUS_STATUS_EXPIRATION_MS);
Expand Down Expand Up @@ -140,12 +141,5 @@ class DGUSScreenHandler {

extern DGUSScreenHandler dgus_screen_handler;

extern const char DGUS_MSG_HOMING_REQUIRED[],
DGUS_MSG_BUSY[],
DGUS_MSG_UNDEF[],
DGUS_MSG_HOMING[],
DGUS_MSG_FW_OUTDATED[],
DGUS_MSG_ABL_REQUIRED[];

extern const char DGUS_CMD_HOME[],
DGUS_CMD_EEPROM_SAVE[];
26 changes: 11 additions & 15 deletions Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ bool DGUSSetupHandler::PrintAdjust() {
return false;
}

void ShowWaitScreenMessage(FSTR_P const msg, const DGUS_Screen screen) {
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
dgus_screen_handler.SetMessageLine(msg, 2);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
dgus_screen_handler.ShowWaitScreen(screen);
}

bool DGUSSetupHandler::LevelingMenu() {
ExtUI::setLevelingActive(dgus_screen_handler.leveling_active);

Expand All @@ -80,11 +88,7 @@ bool DGUSSetupHandler::LevelingMenu() {
return true;
}

dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(DGUS_MSG_HOMING), 2);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
dgus_screen_handler.ShowWaitScreen(DGUS_Screen::LEVELING_MENU);
ShowWaitScreenMessage(GET_TEXT_F(DGUS_MSG_HOMING), DGUS_Screen::LEVELING_MENU);

queue.enqueue_now_P(DGUS_CMD_HOME);

Expand All @@ -103,11 +107,7 @@ bool DGUSSetupHandler::LevelingManual() {
return false;
}

dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(DGUS_MSG_HOMING), 2);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
dgus_screen_handler.ShowWaitScreen(DGUS_Screen::LEVELING_MANUAL);
ShowWaitScreenMessage(GET_TEXT_F(DGUS_MSG_HOMING), DGUS_Screen::LEVELING_MANUAL);

queue.enqueue_now_P(DGUS_CMD_HOME);

Expand Down Expand Up @@ -136,11 +136,7 @@ bool DGUSSetupHandler::LevelingOffset() {
return true;
}

dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
dgus_screen_handler.SetMessageLinePGM(GET_TEXT(DGUS_MSG_HOMING), 2);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
dgus_screen_handler.ShowWaitScreen(DGUS_Screen::LEVELING_OFFSET);
ShowWaitScreenMessage(GET_TEXT_F(DGUS_MSG_HOMING), DGUS_Screen::LEVELING_OFFSET);

queue.enqueue_now_P(DGUS_CMD_HOME);

Expand Down
19 changes: 10 additions & 9 deletions Marlin/src/lcd/language/language_en.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -883,15 +883,16 @@ namespace Language_en {
LSTR MSG_PID_F_E = _UxGT("PID-F *");
LSTR MSG_BACKLASH_N = _UxGT("@");

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

LSTR DGUS_MSG_HOMING_REQUIRED = _UxGT("Homing required");
LSTR DGUS_MSG_BUSY = _UxGT("Busy");
Expand Down
20 changes: 11 additions & 9 deletions Marlin/src/lcd/language/language_fr_na.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
*/

#define DISPLAY_CHARSET_ISO10646_1
#define NOT_EXTENDED_ISO10646_1_5X7

namespace Language_fr {
using namespace Language_en; // Inherit undefined strings from English
Expand Down Expand Up @@ -632,15 +633,16 @@ namespace Language_fr {
LSTR MSG_SD_CARD = _UxGT("Carte SD");
LSTR MSG_USB_DISK = _UxGT("Cle USB");

LSTR MSG_IMPOSSIBLE_WHILE_PRINTING = _UxGT("Impossible pendant une impression");
LSTR MSG_IMPOSSIBLE_WHILE_IDLE = _UxGT("Impossible tant que l'imprimante est en attente");
LSTR MSG_NO_FILE_SELECTED = _UxGT("Aucun fichier selectionne");
LSTR MSG_TEMP_TOO_LOW = _UxGT("Temperature trop basse");
LSTR MSG_EXECUTING_COMMAND = _UxGT("Execution de la commande...");
LSTR MSG_BED_PID_DISABLED = _UxGT("Bed PID desactive");
LSTR MSG_PID_DISABLED = _UxGT("PID desactive");
LSTR MSG_PID_AUTOTUNING = _UxGT("Autocalibrage du PID...");
LSTR MSG_INVALID_RECOVERY_DATA = _UxGT("Donnees de recuperation non valides");
// DGUS-Specific message strings, not used elsewhere
LSTR DGUS_MSG_NOT_WHILE_PRINTING = _UxGT("Impossible pendant une impression");
LSTR DGUS_MSG_NOT_WHILE_IDLE = _UxGT("Impossible tant que l'imprimante est en attente");
LSTR DGUS_MSG_NO_FILE_SELECTED = _UxGT("Aucun fichier selectionne");
LSTR DGUS_MSG_TEMP_TOO_LOW = _UxGT("Temperature trop basse");
LSTR DGUS_MSG_EXECUTING_COMMAND = _UxGT("Execution de la commande...");
LSTR DGUS_MSG_BED_PID_DISABLED = _UxGT("Bed PID desactive");
LSTR DGUS_MSG_PID_DISABLED = _UxGT("PID desactive");
LSTR DGUS_MSG_PID_AUTOTUNING = _UxGT("Autocalibrage du PID...");
LSTR DGUS_MSG_INVALID_RECOVERY_DATA = _UxGT("Donnees de recuperation non valides");

LSTR DGUS_MSG_HOMING_REQUIRED = _UxGT("Retour a l'origine necessaire...");
LSTR DGUS_MSG_BUSY = _UxGT("Occupe");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_pt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* See also https://marlinfw.org/docs/development/lcd_language.html
*/

#define DISPLAY_CHARSET_ISO10646_1
#define DISPLAY_CHARSET_ISO10646_1

namespace Language_pt {
using namespace Language_en; // Inherit undefined strings from English
Expand Down
2 changes: 1 addition & 1 deletion buildroot/share/fonts/genallfont.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ OLDWD=`pwd`
#
# By default loop through all languages
#
LANGS_DEFAULT="an bg ca cz da de el el_CY en es eu fi fr gl hr hu it jp_kana ko_KR nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test"
LANGS_DEFAULT="an bg ca cz da de el el_CY en es eu fi fr fr_na gl hr hu it jp_kana ko_KR nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test"

#
# Generate data for language list MARLIN_LANGS or all if not provided
Expand Down
8 changes: 4 additions & 4 deletions buildroot/tests/FYSETC_F6
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
set -e

#
# Build with the default configurations
# Build with the default config plus DGUS_LCD_UI FYSETC
#
restore_configs
opt_set MOTHERBOARD BOARD_FYSETC_F6_13 LCD_SERIAL_PORT 1 DGUS_LCD_UI FYSETC
exec_test $1 $2 "FYSETC F6 1.3 with DGUS (FYSETC)" "$3"

#
# Test IA_CREALITY
# Test DGUS_LCD_UI RELOADED
#
restore_configs
opt_set MOTHERBOARD BOARD_FYSETC_F6_13 LCD_SERIAL_PORT 1 DGUS_LCD_UI IA_CREALITY LCD_SCREEN_ROTATE 90
opt_set MOTHERBOARD BOARD_FYSETC_F6_13 TEMP_SENSOR_BED 2 LCD_SERIAL_PORT 1 DGUS_LCD_UI RELOADED LCD_SCREEN_ROTATE 90
opt_enable ADVANCED_PAUSE_FEATURE LCD_BED_TRAMMING CLASSIC_JERK BABYSTEPPING AUTO_BED_LEVELING_BILINEAR NOZZLE_PARK_FEATURE PROBE_MANUALLY
exec_test $1 $2 "FYSETC F6 1.3 with DGUS (IA_CREALITY)" "$3"
exec_test $1 $2 "FYSETC F6 1.3 with DGUS (RELOADED)" "$3"

#
# Delta Config (generic) + UBL + ALLEN_KEY + EEPROM_SETTINGS + OLED_PANEL_TINYBOY2
Expand Down

0 comments on commit 43b43bf

Please sign in to comment.