Browse Source

🚑️ Fix DWIN_CompletedLeveling (#22851)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Steven Haigh 3 years ago
parent
commit
c6ceac9067
No account linked to committer's email address
2 changed files with 5 additions and 5 deletions
  1. 1
    1
      Marlin/src/lcd/e3v2/enhanced/dwin.cpp
  2. 4
    4
      Marlin/src/lcd/e3v2/jyersui/dwin.cpp

+ 1
- 1
Marlin/src/lcd/e3v2/enhanced/dwin.cpp View File

1665
   #endif
1665
   #endif
1666
 }
1666
 }
1667
 
1667
 
1668
-void DWIN_CompletedLeveling() { DWIN_MeshViewer(); }
1668
+void DWIN_CompletedLeveling() { TERN_(HAS_MESH, DWIN_MeshViewer()); }
1669
 
1669
 
1670
 #if HAS_MESH
1670
 #if HAS_MESH
1671
   void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
1671
   void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {

+ 4
- 4
Marlin/src/lcd/e3v2/jyersui/dwin.cpp View File

3246
             break;
3246
             break;
3247
           case LEVELING_VIEW:
3247
           case LEVELING_VIEW:
3248
             if (draw)
3248
             if (draw)
3249
-              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
3249
+              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT(MSG_MESH_VIEW), nullptr, true);
3250
             else {
3250
             else {
3251
               #if ENABLED(AUTO_BED_LEVELING_UBL)
3251
               #if ENABLED(AUTO_BED_LEVELING_UBL)
3252
                 if (ubl.storage_slot < 0) {
3252
                 if (ubl.storage_slot < 0) {
3319
             break;
3319
             break;
3320
           case LEVELING_VIEW_MESH:
3320
           case LEVELING_VIEW_MESH:
3321
             if (draw)
3321
             if (draw)
3322
-              Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
3322
+              Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT(MSG_MESH_VIEW), nullptr, true);
3323
             else
3323
             else
3324
               Draw_Menu(MeshViewer);
3324
               Draw_Menu(MeshViewer);
3325
             break;
3325
             break;
4070
     case InfoMain:          return "Info";
4070
     case InfoMain:          return "Info";
4071
     #if HAS_MESH
4071
     #if HAS_MESH
4072
       case Leveling:        return "Leveling";
4072
       case Leveling:        return "Leveling";
4073
-      case LevelView:       return GET_TEXT_F(MSG_MESH_VIEW);
4073
+      case LevelView:       return GET_TEXT(MSG_MESH_VIEW);
4074
       case LevelSettings:   return "Leveling Settings";
4074
       case LevelSettings:   return "Leveling Settings";
4075
-      case MeshViewer:      return GET_TEXT_F(MSG_MESH_VIEW);
4075
+      case MeshViewer:      return GET_TEXT(MSG_MESH_VIEW);
4076
       case LevelManual:     return "Manual Tuning";
4076
       case LevelManual:     return "Manual Tuning";
4077
     #endif
4077
     #endif
4078
     #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
4078
     #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE

Loading…
Cancel
Save