Browse Source

🚸 MarlinUI Move Z >= 1000 (#22192)

ellensp 4 years ago
parent
commit
41daf63768
No account linked to committer's email address
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      Marlin/src/lcd/menu/menu_motion.cpp

+ 4
- 4
Marlin/src/lcd/menu/menu_motion.cpp View File

@@ -28,7 +28,7 @@
28 28
 
29 29
 #if HAS_LCD_MENU
30 30
 
31
-#define LARGE_BED_TEST ((X_BED_SIZE) >= 1000 || (Y_BED_SIZE) >= 1000)
31
+#define LARGE_AREA_TEST ((X_BED_SIZE) >= 1000 || (Y_BED_SIZE) >= 1000 || (Z_MAX_POS) >= 1000)
32 32
 
33 33
 #include "menu_item.h"
34 34
 #include "menu_addon.h"
@@ -87,7 +87,7 @@ static void _lcd_move_xyz(PGM_P const name, const AxisEnum axis) {
87 87
       MenuEditItemBase::draw_edit_screen(name, ftostr63(imp_pos));
88 88
     }
89 89
     else
90
-      MenuEditItemBase::draw_edit_screen(name, ui.manual_move.menu_scale >= 0.1f ? (LARGE_BED_TEST ? ftostr51sign(pos) : ftostr41sign(pos)) : ftostr63(pos));
90
+      MenuEditItemBase::draw_edit_screen(name, ui.manual_move.menu_scale >= 0.1f ? (LARGE_AREA_TEST ? ftostr51sign(pos) : ftostr41sign(pos)) : ftostr63(pos));
91 91
   }
92 92
 }
93 93
 void lcd_move_x() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_X), X_AXIS); }
@@ -167,13 +167,13 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
167 167
 
168 168
   BACK_ITEM(MSG_MOVE_AXIS);
169 169
   if (parser.using_inch_units()) {
170
-    if (LARGE_BED_TEST) SUBMENU(MSG_MOVE_1IN, []{ _goto_manual_move(IN_TO_MM(1.000f)); });
170
+    if (LARGE_AREA_TEST) SUBMENU(MSG_MOVE_1IN, []{ _goto_manual_move(IN_TO_MM(1.000f)); });
171 171
     SUBMENU(MSG_MOVE_01IN,   []{ _goto_manual_move(IN_TO_MM(0.100f)); });
172 172
     SUBMENU(MSG_MOVE_001IN,  []{ _goto_manual_move(IN_TO_MM(0.010f)); });
173 173
     SUBMENU(MSG_MOVE_0001IN, []{ _goto_manual_move(IN_TO_MM(0.001f)); });
174 174
   }
175 175
   else {
176
-    if (LARGE_BED_TEST) SUBMENU(MSG_MOVE_100MM, []{ _goto_manual_move(100); });
176
+    if (LARGE_AREA_TEST) SUBMENU(MSG_MOVE_100MM, []{ _goto_manual_move(100); });
177 177
     SUBMENU(MSG_MOVE_10MM, []{ _goto_manual_move(10);    });
178 178
     SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move( 1);    });
179 179
     SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });

Loading…
Cancel
Save