Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move DWIN_CompletedLeveling() to within the IF HAS_MESH #22851

Merged
merged 4 commits into from
Sep 29, 2021
Merged

Move DWIN_CompletedLeveling() to within the IF HAS_MESH #22851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55344b5
Move DWIN_CompletedLeveling() to within the IF HAS_MESH
CRCinAU Sep 28, 2021
9a2f1cb
Merge 'upstream/bugfix-2.0.x' into pr/22851
thinkyhead Sep 29, 2021
93565cd
Restore DWIN_CompletedLeveling
thinkyhead Sep 29, 2021
b3c4d9b
Revert some JyersUI strings
thinkyhead Sep 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/lcd/e3v2/enhanced/dwin.cpp
View file
Open in desktop
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
View file
Open in desktop
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