From aad987bd98d91e46f6bf75019ae8a1f248208d7e Mon Sep 17 00:00:00 2001 From: Steven Haigh Date: Thu, 30 Sep 2021 02:22:46 +1000 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Fix=20DWIN=5FCompletedL?= =?UTF-8?q?eveling=20(#22851)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Scott Lahteine --- Marlin/src/lcd/e3v2/enhanced/dwin.cpp | 2 +- Marlin/src/lcd/e3v2/jyersui/dwin.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp index 6edfc81c609b..8bb5a155eea0 100644 --- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp +++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp @@ -1665,7 +1665,7 @@ void DWIN_MeshLevelingStart() { #endif } -void DWIN_CompletedLeveling() { DWIN_MeshViewer(); } +void DWIN_CompletedLeveling() { TERN_(HAS_MESH, DWIN_MeshViewer()); } #if HAS_MESH void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) { diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp index a48987e68ddf..6d4f8b0a3a49 100644 --- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp @@ -3246,7 +3246,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/ break; case LEVELING_VIEW: if (draw) - Draw_Menu_Item(row, ICON_Mesh, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true); + Draw_Menu_Item(row, ICON_Mesh, GET_TEXT(MSG_MESH_VIEW), nullptr, true); else { #if ENABLED(AUTO_BED_LEVELING_UBL) if (ubl.storage_slot < 0) { @@ -3319,7 +3319,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/ break; case LEVELING_VIEW_MESH: if (draw) - Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true); + Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT(MSG_MESH_VIEW), nullptr, true); else Draw_Menu(MeshViewer); break; @@ -4070,9 +4070,9 @@ const char * CrealityDWINClass::Get_Menu_Title(uint8_t menu) { case InfoMain: return "Info"; #if HAS_MESH case Leveling: return "Leveling"; - case LevelView: return GET_TEXT_F(MSG_MESH_VIEW); + case LevelView: return GET_TEXT(MSG_MESH_VIEW); case LevelSettings: return "Leveling Settings"; - case MeshViewer: return GET_TEXT_F(MSG_MESH_VIEW); + case MeshViewer: return GET_TEXT(MSG_MESH_VIEW); case LevelManual: return "Manual Tuning"; #endif #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE