Browse Source

🚸 Manual Move coordinates >= 1000 (#22165)

ellensp 4 years ago
parent
commit
ad1ad93ea9
No account linked to committer's email address
2 changed files with 7 additions and 2 deletions
  1. 2
    0
      Marlin/src/lcd/language/language_en.h
  2. 5
    2
      Marlin/src/lcd/menu/menu_motion.cpp

+ 2
- 0
Marlin/src/lcd/language/language_en.h View File

281
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Move 0.1mm");
281
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Move 0.1mm");
282
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Move 1mm");
282
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Move 1mm");
283
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Move 10mm");
283
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Move 10mm");
284
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Move 100mm");
284
   PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Move 0.001in");
285
   PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Move 0.001in");
285
   PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Move 0.01in");
286
   PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Move 0.01in");
286
   PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Move 0.1in");
287
   PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Move 0.1in");
288
+  PROGMEM Language_Str MSG_MOVE_10IN                       = _UxGT("Move 1.0in");
287
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Speed");
289
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Speed");
288
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
290
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
289
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");
291
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");

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

28
 
28
 
29
 #if HAS_LCD_MENU
29
 #if HAS_LCD_MENU
30
 
30
 
31
+#define LARGE_BED_TEST ((X_BED_SIZE) >= 1000 || (Y_BED_SIZE) >= 1000)
32
+
31
 #include "menu_item.h"
33
 #include "menu_item.h"
32
 #include "menu_addon.h"
34
 #include "menu_addon.h"
33
 
35
 
85
       MenuEditItemBase::draw_edit_screen(name, ftostr63(imp_pos));
87
       MenuEditItemBase::draw_edit_screen(name, ftostr63(imp_pos));
86
     }
88
     }
87
     else
89
     else
88
-      MenuEditItemBase::draw_edit_screen(name, ui.manual_move.menu_scale >= 0.1f ? ftostr41sign(pos) : ftostr63(pos));
90
+      MenuEditItemBase::draw_edit_screen(name, ui.manual_move.menu_scale >= 0.1f ? (LARGE_BED_TEST ? ftostr51sign(pos) : ftostr41sign(pos)) : ftostr63(pos));
89
   }
91
   }
90
 }
92
 }
91
 void lcd_move_x() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_X), X_AXIS); }
93
 void lcd_move_x() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_X), X_AXIS); }
165
 
167
 
166
   BACK_ITEM(MSG_MOVE_AXIS);
168
   BACK_ITEM(MSG_MOVE_AXIS);
167
   if (parser.using_inch_units()) {
169
   if (parser.using_inch_units()) {
170
+    if (LARGE_BED_TEST) SUBMENU(MSG_MOVE_10IN, []{ _goto_manual_move(IN_TO_MM(1.000f)); });
168
     SUBMENU(MSG_MOVE_01IN,   []{ _goto_manual_move(IN_TO_MM(0.100f)); });
171
     SUBMENU(MSG_MOVE_01IN,   []{ _goto_manual_move(IN_TO_MM(0.100f)); });
169
     SUBMENU(MSG_MOVE_001IN,  []{ _goto_manual_move(IN_TO_MM(0.010f)); });
172
     SUBMENU(MSG_MOVE_001IN,  []{ _goto_manual_move(IN_TO_MM(0.010f)); });
170
     SUBMENU(MSG_MOVE_0001IN, []{ _goto_manual_move(IN_TO_MM(0.001f)); });
173
     SUBMENU(MSG_MOVE_0001IN, []{ _goto_manual_move(IN_TO_MM(0.001f)); });
171
   }
174
   }
172
   else {
175
   else {
176
+    if (LARGE_BED_TEST) SUBMENU(MSG_MOVE_100MM, []{ _goto_manual_move(100); });
173
     SUBMENU(MSG_MOVE_10MM, []{ _goto_manual_move(10);    });
177
     SUBMENU(MSG_MOVE_10MM, []{ _goto_manual_move(10);    });
174
     SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move( 1);    });
178
     SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move( 1);    });
175
     SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });
179
     SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });
180
       PGM_P const label = GET_TEXT(MSG_MOVE_N_MM);
184
       PGM_P const label = GET_TEXT(MSG_MOVE_N_MM);
181
       char tmp[strlen_P(label) + 10 + 1], numstr[10];
185
       char tmp[strlen_P(label) + 10 + 1], numstr[10];
182
       sprintf_P(tmp, label, dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
186
       sprintf_P(tmp, label, dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
183
-
184
       #if DISABLED(HAS_GRAPHICAL_TFT)
187
       #if DISABLED(HAS_GRAPHICAL_TFT)
185
         SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
188
         SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
186
         MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
189
         MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));

Loading…
Cancel
Save