🚸 Add 50mm manual move (MarlinFirmware#24884)

pierre-quelin · Dec 16, 2022 · 7d0f1dd · 7d0f1dd
1 parent b6051fe
commit 7d0f1dd
Show file tree

Hide file tree

Showing 21 changed files with 49 additions and 7 deletions.
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
@@ -90,6 +90,7 @@ namespace Language_an {
   LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Mover 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Mover 100mm");
   LSTR MSG_SPEED                          = _UxGT("Velocidat");
   LSTR MSG_BED_Z                          = _UxGT("Base Z");

diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
@@ -79,6 +79,7 @@ namespace Language_bg {
   LSTR MSG_MOVE_01MM                      = _UxGT("Премести с 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Премести с 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Премести с 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Премести с 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Премести с 100mm");
   LSTR MSG_SPEED                          = _UxGT("Скорост");
   LSTR MSG_BED_Z                          = _UxGT("Bed Z");

diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
@@ -90,6 +90,7 @@ namespace Language_ca {
   LSTR MSG_MOVE_01MM                      = _UxGT("Mou 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mou 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mou 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Mou 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Mou 100mm");
   LSTR MSG_SPEED                          = _UxGT("Velocitat");
   LSTR MSG_BED_Z                          = _UxGT("Llit Z");

diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
@@ -240,6 +240,7 @@ namespace Language_cz {
   LSTR MSG_MOVE_01MM                      = _UxGT("Posunout o 0,1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Posunout o 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Posunout o 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Posunout o 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Posunout o 100mm");
   LSTR MSG_SPEED                          = _UxGT("Rychlost");
   LSTR MSG_BED_Z                          = _UxGT("Výška podl.");

diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
@@ -81,6 +81,7 @@ namespace Language_da {
   LSTR MSG_MOVE_01MM                      = _UxGT("Flyt 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Flyt 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Flyt 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Flyt 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Flyt 100mm");
   LSTR MSG_SPEED                          = _UxGT("Hastighed");
   LSTR MSG_BED_Z                          = _UxGT("Plade Z");

diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
@@ -301,6 +301,7 @@ namespace Language_de {
   LSTR MSG_MOVE_01MM                      = _UxGT("  0,1  mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("  1,0  mm");
   LSTR MSG_MOVE_10MM                      = _UxGT(" 10,0  mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT(" 50,0  mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("100,0  mm");
   LSTR MSG_MOVE_0001IN                    = _UxGT("0.001 in");
   LSTR MSG_MOVE_001IN                     = _UxGT("0.010 in");

diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
@@ -99,6 +99,7 @@ namespace Language_el {
   LSTR MSG_MOVE_01MM                      = _UxGT("Μετακίνηση 0,1 μμ");
   LSTR MSG_MOVE_1MM                       = _UxGT("Μετακίνηση 1 μμ");
   LSTR MSG_MOVE_10MM                      = _UxGT("Μετακίνηση 10 μμ");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Μετακίνηση 50 μμ");
   LSTR MSG_MOVE_100MM                     = _UxGT("Μετακίνηση 100 μμ");
   LSTR MSG_SPEED                          = _UxGT("Ταχύτητα");
   LSTR MSG_BED_Z                          = _UxGT("Επ. Εκτύπωσης Z");

diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
@@ -88,6 +88,7 @@ namespace Language_el_gr {
   LSTR MSG_MOVE_01MM                      = _UxGT("Μετακίνηση 0,1 μμ");
   LSTR MSG_MOVE_1MM                       = _UxGT("Μετακίνηση 1 μμ");
   LSTR MSG_MOVE_10MM                      = _UxGT("Μετακίνηση 10 μμ");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Μετακίνηση 50 μμ");
   LSTR MSG_MOVE_100MM                     = _UxGT("Μετακίνηση 100 μμ");
   LSTR MSG_SPEED                          = _UxGT("Ταχύτητα");
   LSTR MSG_BED_Z                          = _UxGT("Κλίνη Z");

diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
@@ -316,10 +316,12 @@ namespace Language_en {
   LSTR MSG_MOVE_01MM                      = _UxGT("Move 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Move 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Move 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Move 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Move 100mm");
   LSTR MSG_MOVE_0001IN                    = _UxGT("Move 0.001in");
   LSTR MSG_MOVE_001IN                     = _UxGT("Move 0.01in");
   LSTR MSG_MOVE_01IN                      = _UxGT("Move 0.1in");
+  LSTR MSG_MOVE_05IN                      = _UxGT("Move 0.5in");
   LSTR MSG_MOVE_1IN                       = _UxGT("Move 1.0in");
   LSTR MSG_SPEED                          = _UxGT("Speed");
   LSTR MSG_BED_Z                          = _UxGT("Bed Z");

diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
@@ -234,6 +234,7 @@ namespace Language_es {
   LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Mover 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Mover 100mm");
   LSTR MSG_SPEED                          = _UxGT("Velocidad");
   LSTR MSG_BED_Z                          = _UxGT("Cama Z");

diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
@@ -143,6 +143,7 @@ namespace Language_eu {
   LSTR MSG_MOVE_01MM                      = _UxGT("Mugitu 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mugitu 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mugitu 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Mugitu 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Mugitu 100mm");
   LSTR MSG_SPEED                          = _UxGT("Abiadura");
   LSTR MSG_BED_Z                          = _UxGT("Z Ohea");

diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
@@ -76,6 +76,7 @@ namespace Language_fi {
   LSTR MSG_MOVE_01MM                      = _UxGT("Liikuta 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Liikuta 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Liikuta 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Liikuta 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Liikuta 100mm");
   LSTR MSG_SPEED                          = _UxGT("Nopeus");
   LSTR MSG_NOZZLE                         = _UxGT("Suutin");

diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
@@ -238,10 +238,12 @@ namespace Language_fr {
   LSTR MSG_MOVE_01MM                      = _UxGT("Déplacer 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Déplacer 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Déplacer 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Déplacer 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Déplacer 100mm");
   LSTR MSG_MOVE_0001IN                    = _UxGT("Déplacer 0.001\"");
   LSTR MSG_MOVE_001IN                     = _UxGT("Déplacer 0.01\"");
   LSTR MSG_MOVE_01IN                      = _UxGT("Déplacer 0.1\"");
+  LSTR MSG_MOVE_05IN                      = _UxGT("Déplacer 0.5\"");
   LSTR MSG_MOVE_1IN                       = _UxGT("Déplacer 1\"");
   LSTR MSG_SPEED                          = _UxGT("Vitesse");
   LSTR MSG_BED_Z                          = _UxGT("Lit Z");

diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
@@ -231,6 +231,7 @@ namespace Language_gl {
   LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Mover 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Mover 100mm");
   LSTR MSG_SPEED                          = _UxGT("Velocidade");
   LSTR MSG_BED_Z                          = _UxGT("Cama Z");

diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
@@ -86,6 +86,7 @@ namespace Language_hr {
   LSTR MSG_MOVE_01MM                      = _UxGT("Miči 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Miči 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Miči 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Miči 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Miči 100mm");
   LSTR MSG_SPEED                          = _UxGT("Brzina");
   LSTR MSG_BED_Z                          = _UxGT("Bed Z");

diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
@@ -264,10 +264,12 @@ namespace Language_hu {
   LSTR MSG_MOVE_01MM                      = _UxGT("Mozgás 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mozgás 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mozgás 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Mozgás 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Mozgás 100mm");
   LSTR MSG_MOVE_0001IN                    = _UxGT("Mozgás 0.025mm");
   LSTR MSG_MOVE_001IN                     = _UxGT("Mozgás 0.254mm");
   LSTR MSG_MOVE_01IN                      = _UxGT("Mozgás 2.54mm");
+  LSTR MSG_MOVE_05IN                      = _UxGT("Mozgás 12.7mm");
   LSTR MSG_MOVE_1IN                       = _UxGT("Mozgáá 25.4mm");
   LSTR MSG_SPEED                          = _UxGT("Sebesség");
   LSTR MSG_BED_Z                          = _UxGT("Z ágy");

diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
@@ -313,10 +313,12 @@ namespace Language_it {
   LSTR MSG_MOVE_01MM                      = _UxGT("Muovi di 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Muovi di 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Muovi di 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Muovi di 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Muovi di 100mm");
   LSTR MSG_MOVE_0001IN                    = _UxGT("Muovi di 0.001\"");
   LSTR MSG_MOVE_001IN                     = _UxGT("Muovi di 0.01\"");
   LSTR MSG_MOVE_01IN                      = _UxGT("Muovi di 0.1\"");
+  LSTR MSG_MOVE_05IN                      = _UxGT("Muovi di 0.5\"");
   LSTR MSG_MOVE_1IN                       = _UxGT("Muovi di 1\"");
   LSTR MSG_SPEED                          = _UxGT("Velocità");
   LSTR MSG_BED_Z                          = _UxGT("Piatto Z");

diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
@@ -99,6 +99,7 @@ namespace Language_jp_kana {
   LSTR MSG_MOVE_01MM                      = _UxGT("0.1mm イドウ");                 // "Move 0.1mm"
   LSTR MSG_MOVE_1MM                       = _UxGT("  1mm イドウ");                 // "Move 1mm"
   LSTR MSG_MOVE_10MM                      = _UxGT(" 10mm イドウ");                 // "Move 10mm"
+  LSTR MSG_MOVE_50MM                      = _UxGT(" 50mm イドウ");                 // "Move 50mm"
   LSTR MSG_MOVE_100MM                     = _UxGT(" 100mm イドウ");                 // "Move 100mm"
   LSTR MSG_SPEED                          = _UxGT("ソクド");                       // "Speed"
   LSTR MSG_BED_Z                          = _UxGT("Zオフセット");                   // "Bed Z"

diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
@@ -226,6 +226,7 @@ namespace Language_zh_TW {
   LSTR MSG_MOVE_01MM                      = _UxGT("移動 0.1 mm");    // "Move 0.1mm"
   LSTR MSG_MOVE_1MM                       = _UxGT("移動 1 mm");      // "Move 1mm"
   LSTR MSG_MOVE_10MM                      = _UxGT("移動 10 mm");     // "Move 10mm"
+  LSTR MSG_MOVE_50MM                      = _UxGT("移動 50 mm");     // "Move 50mm"
   LSTR MSG_MOVE_100MM                     = _UxGT("移動 100 mm");    // "Move 100mm"
   LSTR MSG_SPEED                          = _UxGT("速率");     // "Speed"
   LSTR MSG_BED_Z                          = _UxGT("熱床Z");     // "Bed Z"

diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -28,7 +28,13 @@
 
 #if HAS_MARLINUI_MENU
 
-#define LARGE_AREA_TEST ((X_BED_SIZE) >= 1000 || TERN0(HAS_Y_AXIS, (Y_BED_SIZE) >= 1000) || TERN0(HAS_Z_AXIS, (Z_MAX_POS) >= 1000))
+#if ENABLED(TRULY_LARGE_AREA)
+  #define LARGE_AREA_TEST true
+#elif ENABLED(SLIM_LCD_MENUS)
+  #define LARGE_AREA_TEST false
+#else
+  #define LARGE_AREA_TEST ((X_BED_SIZE) >= 1000 || TERN0(HAS_Y_AXIS, (Y_BED_SIZE) >= 1000) || TERN0(HAS_Z_AXIS, (Z_MAX_POS) >= 1000))
+#endif
 
 #include "menu_item.h"
 #include "menu_addon.h"
@@ -150,13 +156,19 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
 
   BACK_ITEM(MSG_MOVE_AXIS);
   if (parser.using_inch_units()) {
-    if (LARGE_AREA_TEST) SUBMENU(MSG_MOVE_1IN, []{ _goto_manual_move(IN_TO_MM(1.000f)); });
+    if (LARGE_AREA_TEST) {
+      SUBMENU(MSG_MOVE_1IN, []{ _goto_manual_move(IN_TO_MM(1.000f)); });
+      SUBMENU(MSG_MOVE_05IN, []{ _goto_manual_move(IN_TO_MM(0.500f)); });
+    }
     SUBMENU(MSG_MOVE_01IN,   []{ _goto_manual_move(IN_TO_MM(0.100f)); });
     SUBMENU(MSG_MOVE_001IN,  []{ _goto_manual_move(IN_TO_MM(0.010f)); });
     SUBMENU(MSG_MOVE_0001IN, []{ _goto_manual_move(IN_TO_MM(0.001f)); });
   }
   else {
-    if (LARGE_AREA_TEST) SUBMENU(MSG_MOVE_100MM, []{ _goto_manual_move(100); });
+    if (LARGE_AREA_TEST) {
+      SUBMENU(MSG_MOVE_100MM, []{ _goto_manual_move(100); });
+      SUBMENU(MSG_MOVE_50MM, []{ _goto_manual_move(50); });
+    }
     SUBMENU(MSG_MOVE_10MM, []{ _goto_manual_move(10);    });
     SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move( 1);    });
     SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });
@@ -356,6 +368,13 @@ void menu_motion() {
     GCODES_ITEM(MSG_MANUAL_STOW, F("M402"));
   #endif
 
+  //
+  // Probe Offset Wizard
+  //
+  #if ENABLED(PROBE_OFFSET_WIZARD)
+    SUBMENU(MSG_PROBE_WIZARD, goto_probe_offset_wizard);
+  #endif
+
   //
   // Assisted Bed Tramming
   //

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
@@ -53,11 +53,11 @@
 //
 //#define WIFI_SERIAL 1// USART1
 #if ENABLED(MKS_WIFI_MODULE)
-  #define WIFI_IO0_PIN PB14   // MKS ESP WIFI IO0 PIN
-  #define WIFI_IO1_PIN PB15   // MKS ESP WIFI IO1 PIN
-  #define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN
+  #define WIFI_IO0_PIN                      PB14  // MKS ESP WIFI IO0 PIN
+  #define WIFI_IO1_PIN                      PB15  // MKS ESP WIFI IO1 PIN
+  #define WIFI_RESET_PIN                    PD14  // MKS ESP WIFI RESET PIN
 #endif
 
-#define NEOPIXEL_PIN                       PC5
+#define NEOPIXEL_PIN                        PC5
 
 #include "pins_MKS_MONSTER8_common.h"