Skip to content

Commit

Permalink
🚑️ Fix DWIN_CompletedLeveling (MarlinFirmware#22851)
Browse files Browse the repository at this point in the history
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
  • Loading branch information
2 people authored and Darred committed Dec 1, 2021
1 parent 9df16b4 commit aad987b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Marlin/src/lcd/e3v2/enhanced/dwin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions Marlin/src/lcd/e3v2/jyersui/dwin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit aad987b

Please sign in to comment.