Browse Source

SHORT_MANUAL_Z_MOVE => FINE_MANUAL_MOVE

Scott Lahteine 4 years ago
parent
commit
b0392be4bf
33 changed files with 48 additions and 46 deletions
  1. 1
    1
      Marlin/Configuration_adv.h
  2. 3
    1
      Marlin/src/inc/SanityCheck.h
  3. 1
    1
      Marlin/src/lcd/language/language_an.h
  4. 1
    1
      Marlin/src/lcd/language/language_bg.h
  5. 1
    1
      Marlin/src/lcd/language/language_ca.h
  6. 1
    1
      Marlin/src/lcd/language/language_cz.h
  7. 1
    1
      Marlin/src/lcd/language/language_da.h
  8. 1
    1
      Marlin/src/lcd/language/language_de.h
  9. 1
    1
      Marlin/src/lcd/language/language_el.h
  10. 1
    1
      Marlin/src/lcd/language/language_el_gr.h
  11. 1
    1
      Marlin/src/lcd/language/language_en.h
  12. 1
    1
      Marlin/src/lcd/language/language_es.h
  13. 1
    1
      Marlin/src/lcd/language/language_eu.h
  14. 1
    1
      Marlin/src/lcd/language/language_fi.h
  15. 1
    1
      Marlin/src/lcd/language/language_fr.h
  16. 1
    1
      Marlin/src/lcd/language/language_gl.h
  17. 1
    1
      Marlin/src/lcd/language/language_hr.h
  18. 1
    1
      Marlin/src/lcd/language/language_hu.h
  19. 1
    1
      Marlin/src/lcd/language/language_it.h
  20. 1
    1
      Marlin/src/lcd/language/language_jp_kana.h
  21. 1
    1
      Marlin/src/lcd/language/language_nl.h
  22. 1
    1
      Marlin/src/lcd/language/language_pl.h
  23. 1
    1
      Marlin/src/lcd/language/language_pt.h
  24. 1
    1
      Marlin/src/lcd/language/language_pt_br.h
  25. 1
    1
      Marlin/src/lcd/language/language_ro.h
  26. 1
    1
      Marlin/src/lcd/language/language_ru.h
  27. 1
    1
      Marlin/src/lcd/language/language_sk.h
  28. 1
    1
      Marlin/src/lcd/language/language_tr.h
  29. 1
    1
      Marlin/src/lcd/language/language_uk.h
  30. 1
    1
      Marlin/src/lcd/language/language_zh_CN.h
  31. 1
    1
      Marlin/src/lcd/language/language_zh_TW.h
  32. 9
    9
      Marlin/src/lcd/menu/menu_motion.cpp
  33. 6
    6
      Marlin/src/lcd/menu/menu_probe_offset.cpp

+ 1
- 1
Marlin/Configuration_adv.h View File

@@ -1055,7 +1055,7 @@
1055 1055
 
1056 1056
 #if EITHER(IS_ULTIPANEL, EXTENSIBLE_UI)
1057 1057
   #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // (mm/min) Feedrates for manual moves along X, Y, Z, E from panel
1058
-  #define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
1058
+  #define FINE_MANUAL_MOVE 0.025    // (mm) Smallest manual move (< 0.1mm) applying to Z on most machines
1059 1059
   #if IS_ULTIPANEL
1060 1060
     #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
1061 1061
     #define ULTIPANEL_FEEDMULTIPLY  // Encoder sets the feedrate multiplier on the Status Screen

+ 3
- 1
Marlin/src/inc/SanityCheck.h View File

@@ -531,6 +531,8 @@
531 531
   #error "PROBE_OFFSET_START is now PROBE_OFFSET_WIZARD_START_Z."
532 532
 #elif defined(POWER_LOSS_PULL)
533 533
   #error "POWER_LOSS_PULL is now specifically POWER_LOSS_PULL(UP|DOWN)."
534
+#elif defined(SHORT_MANUAL_Z_MOVE)
535
+  #error "SHORT_MANUAL_Z_MOVE is now FINE_MANUAL_MOVE, applying to Z on most printers."
534 536
 #elif defined(FIL_RUNOUT_INVERTING)
535 537
   #if FIL_RUNOUT_INVERTING
536 538
     #error "FIL_RUNOUT_INVERTING true is now FIL_RUNOUT_STATE HIGH."
@@ -2657,7 +2659,7 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
2657 2659
   #elif ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
2658 2660
     #error "SENSORLESS_PROBING cannot be used with Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN."
2659 2661
   #elif ENABLED(USE_PROBE_FOR_Z_HOMING)
2660
-    #error "SENSORLESS_PROBING cannot be used with USE_PROBE_FOR_Z_HOMING."   
2662
+    #error "SENSORLESS_PROBING cannot be used with USE_PROBE_FOR_Z_HOMING."
2661 2663
   #elif !Z_SENSORLESS
2662 2664
     #error "SENSORLESS_PROBING requires a TMC stepper driver with StallGuard on Z."
2663 2665
   #endif

+ 1
- 1
Marlin/src/lcd/language/language_an.h View File

@@ -85,7 +85,7 @@ namespace Language_an {
85 85
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Mover Z");
86 86
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrusor");
87 87
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrusor *");
88
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Mover %smm");
88
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mover %smm");
89 89
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
90 90
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
91 91
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_bg.h View File

@@ -75,7 +75,7 @@ namespace Language_bg {
75 75
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Движение по Z");
76 76
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Екструдер");
77 77
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Екструдер *");
78
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Премести с %smm");
78
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Премести с %smm");
79 79
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Премести с 0.1mm");
80 80
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Премести с 1mm");
81 81
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Премести с 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_ca.h View File

@@ -85,7 +85,7 @@ namespace Language_ca {
85 85
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Mou Z");
86 86
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrusor");
87 87
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrusor *");
88
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Mou %smm");
88
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mou %smm");
89 89
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mou 0.1mm");
90 90
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mou 1mm");
91 91
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mou 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_cz.h View File

@@ -241,7 +241,7 @@ namespace Language_cz {
241 241
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrudér");
242 242
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrudér *");
243 243
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend je studený");
244
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Posunout o %smm");
244
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Posunout o %smm");
245 245
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Posunout o 0,1mm");
246 246
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Posunout o 1mm");
247 247
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Posunout o 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_da.h View File

@@ -75,7 +75,7 @@ namespace Language_da {
75 75
   PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Flyt X");
76 76
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Flyt Y");
77 77
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Flyt Z");
78
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Flyt %smm");
78
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Flyt %smm");
79 79
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Flyt 0.1mm");
80 80
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Flyt 1mm");
81 81
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Flyt 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_de.h View File

@@ -234,7 +234,7 @@ namespace Language_de {
234 234
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Bewege Extruder");
235 235
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Bewege Extruder *");
236 236
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend zu kalt");
237
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT(" %s mm");
237
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT(" %s mm");
238 238
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT(" 0,1   mm");
239 239
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT(" 1,0   mm");
240 240
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("10,0   mm");

+ 1
- 1
Marlin/src/lcd/language/language_el.h View File

@@ -83,7 +83,7 @@ namespace Language_el {
83 83
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Μετακίνηση Z");
84 84
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Εξωθητήρας");
85 85
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Εξωθητήρας *");
86
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Μετακίνηση %s μμ");
86
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Μετακίνηση %s μμ");
87 87
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Μετακίνηση 0,1 μμ");
88 88
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Μετακίνηση 1 μμ");
89 89
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Μετακίνηση 10 μμ");

+ 1
- 1
Marlin/src/lcd/language/language_el_gr.h View File

@@ -84,7 +84,7 @@ namespace Language_el_gr {
84 84
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Μετακίνηση Z");
85 85
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Εξωθητήρας");
86 86
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Εξωθητήρας *");
87
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Μετακίνηση %s μμ");
87
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Μετακίνηση %s μμ");
88 88
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Μετακίνηση 0,1 μμ");
89 89
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Μετακίνηση 1 μμ");
90 90
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Μετακίνηση 10 μμ");

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

@@ -257,7 +257,7 @@ namespace Language_en {
257 257
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
258 258
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
259 259
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend too cold");
260
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Move %smm");
260
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Move %smm");
261 261
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Move 0.1mm");
262 262
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Move 1mm");
263 263
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Move 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_es.h View File

@@ -236,7 +236,7 @@ namespace Language_es {
236 236
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrusor");
237 237
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrusor *");
238 238
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend muy frio");
239
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Mover %smm");
239
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mover %smm");
240 240
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
241 241
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
242 242
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_eu.h View File

@@ -139,7 +139,7 @@ namespace Language_eu {
139 139
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Mugitu Z");
140 140
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Estrusorea");
141 141
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Estrusorea *");
142
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Mugitu %smm");
142
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mugitu %smm");
143 143
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mugitu 0.1mm");
144 144
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mugitu 1mm");
145 145
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mugitu 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_fi.h View File

@@ -72,7 +72,7 @@ namespace Language_fi {
72 72
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Liikuta Z");
73 73
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
74 74
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
75
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Liikuta %smm");
75
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Liikuta %smm");
76 76
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Liikuta 0.1mm");
77 77
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Liikuta 1mm");
78 78
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Liikuta 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_fr.h View File

@@ -225,7 +225,7 @@ namespace Language_fr {
225 225
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrudeur");
226 226
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrudeur *");
227 227
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Buse trop froide");
228
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Déplacer %smm");
228
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Déplacer %smm");
229 229
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Déplacer 0.1mm");
230 230
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Déplacer 1mm");
231 231
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Déplacer 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_gl.h View File

@@ -233,7 +233,7 @@ namespace Language_gl {
233 233
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrusor");
234 234
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrusor *");
235 235
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Bico moi frío");
236
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Mover %smm");
236
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mover %smm");
237 237
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
238 238
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
239 239
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_hr.h View File

@@ -79,7 +79,7 @@ namespace Language_hr {
79 79
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Niveliraj bed");
80 80
   PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Miči X");
81 81
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Miči Y");
82
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Miči %smm");
82
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Miči %smm");
83 83
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Miči 0.1mm");
84 84
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Miči 1mm");
85 85
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Miči 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_hu.h View File

@@ -235,7 +235,7 @@ namespace Language_hu {
235 235
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Adagoló");
236 236
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Adagoló *");
237 237
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("A fúvóka túl hideg");
238
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Mozgás %smm");
238
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mozgás %smm");
239 239
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mozgás 0.1mm");
240 240
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mozgás 1mm");
241 241
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mozgás 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_it.h View File

@@ -250,7 +250,7 @@ namespace Language_it {
250 250
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Estrusore");
251 251
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Estrusore *");
252 252
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Ugello freddo");
253
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Muovi di %smm");
253
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Muovi di %smm");
254 254
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Muovi di 0.1mm");
255 255
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Muovi di 1mm");
256 256
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Muovi di 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_jp_kana.h View File

@@ -94,7 +94,7 @@ namespace Language_jp_kana {
94 94
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Yジク イドウ");                  // "Move Y"
95 95
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Zジク イドウ");                  // "Move Z"
96 96
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("エクストルーダー");                // "Extruder"
97
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("%smm イドウ");                  // "Move 0.025mm"
97
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("%smm イドウ");                  // "Move 0.025mm"
98 98
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("0.1mm イドウ");                 // "Move 0.1mm"
99 99
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("  1mm イドウ");                 // "Move 1mm"
100 100
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT(" 10mm イドウ");                 // "Move 10mm"

+ 1
- 1
Marlin/src/lcd/language/language_nl.h View File

@@ -87,7 +87,7 @@ namespace Language_nl {
87 87
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Verplaats Z");
88 88
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
89 89
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
90
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Verplaats %smm");
90
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Verplaats %smm");
91 91
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Verplaats 0.1mm");
92 92
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Verplaats 1mm");
93 93
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Verplaats 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_pl.h View File

@@ -230,7 +230,7 @@ namespace Language_pl {
230 230
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Ekstruzja (os E)");
231 231
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Ekstruzja (os E) *");
232 232
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Dysza za zimna");
233
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Przesuń co %smm");
233
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Przesuń co %smm");
234 234
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Przesuń co .1mm");
235 235
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Przesuń co 1mm");
236 236
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Przesuń co 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_pt.h View File

@@ -81,7 +81,7 @@ namespace Language_pt {
81 81
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Mover Z");
82 82
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Mover Extrusor");
83 83
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Mover Extrusor *");
84
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Mover %smm");
84
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mover %smm");
85 85
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
86 86
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
87 87
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_pt_br.h View File

@@ -214,7 +214,7 @@ namespace Language_pt_br {
214 214
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Mover Extrusor");
215 215
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Mover Extrusor *");
216 216
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Extrus. mto fria");
217
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Mover %smm");
217
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mover %smm");
218 218
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
219 219
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
220 220
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_ro.h View File

@@ -232,7 +232,7 @@ namespace Language_ro {
232 232
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
233 233
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
234 234
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Capat Prea Rece");
235
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Move %smm");
235
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Move %smm");
236 236
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Move 0.1mm");
237 237
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Move 1mm");
238 238
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Move 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_ru.h View File

@@ -290,7 +290,7 @@ namespace Language_ru {
290 290
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Экструдер");
291 291
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Экструдер *");
292 292
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Сопло не нагрето");
293
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Движение %sмм");
293
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Движение %sмм");
294 294
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Движение 0.1мм");
295 295
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Движение 1мм");
296 296
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Движение 10мм");

+ 1
- 1
Marlin/src/lcd/language/language_sk.h View File

@@ -247,7 +247,7 @@ namespace Language_sk {
247 247
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrudér");
248 248
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrudér *");
249 249
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend je studený");
250
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Posunúť o %smm");
250
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Posunúť o %smm");
251 251
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Posunúť o 0,1mm");
252 252
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Posunúť o 1mm");
253 253
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Posunúť o 10mm");

+ 1
- 1
Marlin/src/lcd/language/language_tr.h View File

@@ -235,7 +235,7 @@ namespace Language_tr {
235 235
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Ekstruder");
236 236
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Ekstruder *");
237 237
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Nozul Çok Soğuk");
238
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("%smm");
238
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("%smm");
239 239
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("0.1mm");
240 240
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("1mm");
241 241
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("10mm");

+ 1
- 1
Marlin/src/lcd/language/language_uk.h View File

@@ -286,7 +286,7 @@ namespace Language_uk {
286 286
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Екструдер");
287 287
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Екструдер *");
288 288
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Сопло дуже холодне");
289
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("Рух по %sмм");
289
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Рух по %sмм");
290 290
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Рух по 0.1мм");
291 291
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Рух по 1мм");
292 292
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Рух по 10мм");

+ 1
- 1
Marlin/src/lcd/language/language_zh_CN.h View File

@@ -230,7 +230,7 @@ namespace Language_zh_CN {
230 230
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("挤出机");     //"Extruder"
231 231
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("挤出机 *");     //"Extruder"
232 232
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("热端太冷");
233
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("移动 %s mm");     //"Move 0.025mm"
233
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("移动 %s mm");     //"Move 0.025mm"
234 234
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("移动 0.1 mm");     //"Move 0.1mm"
235 235
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("移动 1 mm");     //"Move 1mm"
236 236
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移动 10 mm");     //"Move 10mm"

+ 1
- 1
Marlin/src/lcd/language/language_zh_TW.h View File

@@ -228,7 +228,7 @@ namespace Language_zh_TW {
228 228
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("擠出機");     //"Extruder"
229 229
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("擠出機 *");       //"Extruder *"
230 230
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("噴嘴溫度不夠");  //"Hotend too cold"
231
-  PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("移動 %s mm");     //"Move 0.025mm"
231
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("移動 %s mm");     //"Move 0.025mm"
232 232
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("移動 0.1 mm");     //"Move 0.1mm"
233 233
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("移動 1 mm");     //"Move 1mm"
234 234
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移動 10 mm");     //"Move 10mm"

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

@@ -143,8 +143,8 @@ void lcd_move_z() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Z), Z_AXIS); }
143 143
 // "Motion" > "Move Xmm" > "Move XYZ" submenu
144 144
 //
145 145
 
146
-#ifndef SHORT_MANUAL_Z_MOVE
147
-  #define SHORT_MANUAL_Z_MOVE 0.025
146
+#ifndef FINE_MANUAL_MOVE
147
+  #define FINE_MANUAL_MOVE 0.025
148 148
 #endif
149 149
 
150 150
 screenFunc_t _manual_move_func_ptr;
@@ -180,22 +180,22 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
180 180
     SUBMENU(MSG_MOVE_10MM, []{ _goto_manual_move(10);    });
181 181
     SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move( 1);    });
182 182
     SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });
183
-    if (axis == Z_AXIS && (SHORT_MANUAL_Z_MOVE) > 0.0f && (SHORT_MANUAL_Z_MOVE) < 0.1f) {
183
+    if (axis == Z_AXIS && (FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f) {
184 184
       // Determine digits needed right of decimal
185
-      constexpr uint8_t digs = !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) * 1000 - int((SHORT_MANUAL_Z_MOVE) * 1000)) ? 4 :
186
-                               !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) *  100 - int((SHORT_MANUAL_Z_MOVE) *  100)) ? 3 : 2;
187
-      PGM_P const label = GET_TEXT(MSG_MOVE_Z_DIST);
185
+      constexpr uint8_t digs = !UNEAR_ZERO((FINE_MANUAL_MOVE) * 1000 - int((FINE_MANUAL_MOVE) * 1000)) ? 4 :
186
+                               !UNEAR_ZERO((FINE_MANUAL_MOVE) *  100 - int((FINE_MANUAL_MOVE) *  100)) ? 3 : 2;
187
+      PGM_P const label = GET_TEXT(MSG_MOVE_N_MM);
188 188
       char tmp[strlen_P(label) + 10 + 1], numstr[10];
189
-      sprintf_P(tmp, label, dtostrf(SHORT_MANUAL_Z_MOVE, 1, digs, numstr));
189
+      sprintf_P(tmp, label, dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
190 190
 
191 191
       #if DISABLED(HAS_GRAPHICAL_TFT)
192 192
         extern const char NUL_STR[];
193
-        SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
193
+        SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
194 194
         MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
195 195
         lcd_put_u8str(tmp);
196 196
         MENU_ITEM_ADDON_END();
197 197
       #else
198
-        SUBMENU_P(tmp, []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
198
+        SUBMENU_P(tmp, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
199 199
       #endif
200 200
     }
201 201
   }

+ 6
- 6
Marlin/src/lcd/menu/menu_probe_offset.cpp View File

@@ -81,20 +81,20 @@ void probe_offset_wizard_menu() {
81 81
   SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move_z( 1);    });
82 82
   SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move_z( 0.1f); });
83 83
 
84
-  if ((SHORT_MANUAL_Z_MOVE) > 0.0f && (SHORT_MANUAL_Z_MOVE) < 0.1f) {
84
+  if ((FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f) {
85 85
     char tmp[20], numstr[10];
86 86
     // Determine digits needed right of decimal
87
-    const uint8_t digs = !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) * 1000 - int((SHORT_MANUAL_Z_MOVE) * 1000)) ? 4 :
88
-                         !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) *  100 - int((SHORT_MANUAL_Z_MOVE) *  100)) ? 3 : 2;
89
-    sprintf_P(tmp, GET_TEXT(MSG_MOVE_Z_DIST), dtostrf(SHORT_MANUAL_Z_MOVE, 1, digs, numstr));
87
+    const uint8_t digs = !UNEAR_ZERO((FINE_MANUAL_MOVE) * 1000 - int((FINE_MANUAL_MOVE) * 1000)) ? 4 :
88
+                         !UNEAR_ZERO((FINE_MANUAL_MOVE) *  100 - int((FINE_MANUAL_MOVE) *  100)) ? 3 : 2;
89
+    sprintf_P(tmp, GET_TEXT(MSG_MOVE_N_MM), dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
90 90
     #if DISABLED(HAS_GRAPHICAL_TFT)
91 91
       extern const char NUL_STR[];
92
-      SUBMENU_P(NUL_STR, []{ _goto_manual_move_z(float(SHORT_MANUAL_Z_MOVE)); });
92
+      SUBMENU_P(NUL_STR, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
93 93
       MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
94 94
       lcd_put_u8str(tmp);
95 95
       MENU_ITEM_ADDON_END();
96 96
     #else
97
-      SUBMENU_P(tmp, []{ _goto_manual_move_z(float(SHORT_MANUAL_Z_MOVE)); });
97
+      SUBMENU_P(tmp, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
98 98
     #endif
99 99
   }
100 100
 

Loading…
Cancel
Save