misc. updates

MarlinFirmware · Feb 28, 2023 · 9161048 · 9161048
1 parent 5867690
commit 9161048
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 66 deletions.
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -625,7 +625,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.SetMessageLine(GET_TEXT_F(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());
@@ -760,7 +760,7 @@ void DGUSRxHandler::GcodeExecute(DGUS_VP &vp, void *data_ptr) {
   }
 
   dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
-  dgus_screen_handler.SetMessageLinePGM(GET_TEXT(MSG_EXECUTING_COMMAND), 2);
+  dgus_screen_handler.SetMessageLine(GET_TEXT_F(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);
@@ -914,7 +914,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
   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.SetMessageLine(GET_TEXT_F(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);

diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
@@ -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";
 
@@ -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() {
@@ -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:
@@ -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:

diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
@@ -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);
@@ -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[];
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
@@ -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);
 
@@ -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);
 
@@ -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);
 
@@ -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);
 

diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
@@ -28,7 +28,6 @@
  * See also https://marlinfw.org/docs/development/lcd_language.html
  */
 
-#define DISPLAY_CHARSET_ISO10646_1
 #define NOT_EXTENDED_ISO10646_1_5X7
 
 namespace Language_an {

diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
@@ -28,8 +28,6 @@
  * See also https://marlinfw.org/docs/development/lcd_language.html
  */
 
-#define DISPLAY_CHARSET_ISO10646_1
-
 namespace Language_da {
   using namespace Language_en; // Inherit undefined strings from English
 

diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
@@ -28,7 +28,6 @@
  * See also https://marlinfw.org/docs/development/lcd_language.html
  */
 
-#define DISPLAY_CHARSET_ISO10646_1
 #define NOT_EXTENDED_ISO10646_1_5X7
 
 namespace Language_eu {

diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
@@ -28,8 +28,6 @@
  * See also https://marlinfw.org/docs/development/lcd_language.html
  */
 
-#define DISPLAY_CHARSET_ISO10646_1
-
 namespace Language_fi {
   using namespace Language_en; // Inherit undefined strings from English
 

diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
@@ -28,8 +28,6 @@
  * See also https://marlinfw.org/docs/development/lcd_language.html
  */
 
-#define DISPLAY_CHARSET_ISO10646_1
-
 namespace Language_fr {
   using namespace Language_en; // Inherit undefined strings from English
 

diff --git a/Marlin/src/lcd/language/language_fr_na.h b/Marlin/src/lcd/language/language_fr_na.h
@@ -28,7 +28,7 @@
  * See also https://marlinfw.org/docs/development/lcd_language.html
  */
 
-#define DISPLAY_CHARSET_ISO10646_1
+#define NOT_EXTENDED_ISO10646_1_5X7
 
 namespace Language_fr_na {
   using namespace Language_en; // Inherit undefined strings from English

diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
@@ -28,8 +28,6 @@
  * See also https://marlinfw.org/docs/development/lcd_language.html
  */
 
-#define DISPLAY_CHARSET_ISO10646_1
-
 namespace Language_gl {
   using namespace Language_en; // Inherit undefined strings from English
 

diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
@@ -36,8 +36,6 @@
  *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
 
-#define DISPLAY_CHARSET_ISO10646_1
-
 namespace Language_it {
   using namespace Language_en; // Inherit undefined strings from English
 

diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
@@ -28,7 +28,6 @@
  * See also https://marlinfw.org/docs/development/lcd_language.html
  */
 
-#define DISPLAY_CHARSET_ISO10646_1
 #define NOT_EXTENDED_ISO10646_1_5X7
 
 namespace Language_nl {

diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
@@ -29,8 +29,6 @@
  * See also https://marlinfw.org/docs/development/lcd_language.html
  */
 
- #define DISPLAY_CHARSET_ISO10646_1
-
 namespace Language_pt {
   using namespace Language_en; // Inherit undefined strings from English
 

diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
@@ -28,8 +28,6 @@
  * See also https://marlinfw.org/docs/development/lcd_language.html
  */
 
-#define DISPLAY_CHARSET_ISO10646_1
-
 namespace Language_sv {
   using namespace Language_en; // Inherit undefined strings from English
 

diff --git a/buildroot/tests/FYSETC_F6 b/buildroot/tests/FYSETC_F6
@@ -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 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