bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🚑️ Fix DWIN_CompletedLeveling (#22851)

Browse Source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Steven Haigh 2021-09-30 02:22:46 +10:00 committed by Scott Lahteine
parent 5d3e75905d
commit 2e602b9b88
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/e3v2/enhanced/dwin.cpp
View File

@ -1665,7 +1665,7 @@ void DWIN_MeshLevelingStart() {
#endif #endif
} }
void DWIN_CompletedLeveling() { DWIN_MeshViewer(); } void DWIN_CompletedLeveling() { TERN_(HAS_MESH, DWIN_MeshViewer()); }
#if HAS_MESH #if HAS_MESH
void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) { void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {

8
Marlin/src/lcd/e3v2/jyersui/dwin.cpp
View File

@ -3246,7 +3246,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
break; break;
case LEVELING_VIEW: case LEVELING_VIEW:
if (draw) 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 { else {
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
if (ubl.storage_slot < 0) { if (ubl.storage_slot < 0) {
@ -3319,7 +3319,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
break; break;
case LEVELING_VIEW_MESH: case LEVELING_VIEW_MESH:
if (draw) 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 else
Draw_Menu(MeshViewer); Draw_Menu(MeshViewer);
break; break;
@ -4070,9 +4070,9 @@ const char * CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
case InfoMain: return "Info"; case InfoMain: return "Info";
#if HAS_MESH #if HAS_MESH
case Leveling: return "Leveling"; 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 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"; case LevelManual: return "Manual Tuning";
#endif #endif
#if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE