Skip to content

Commit 86ccdfb

Browse files
thinkyheadLCh-77
authored andcommitted
🩹 Fix manual move titles (MarlinFirmware#24518)
1 parent 137b887 commit 86ccdfb

29 files changed

+35
-10
lines changed

Marlin/src/lcd/language/language_an.h

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ namespace Language_an {
8383
LSTR MSG_MOVE_X = _UxGT("Mover X");
8484
LSTR MSG_MOVE_Y = _UxGT("Mover Y");
8585
LSTR MSG_MOVE_Z = _UxGT("Mover Z");
86+
LSTR MSG_MOVE_N = _UxGT("Mover @");
8687
LSTR MSG_MOVE_E = _UxGT("Extrusor");
8788
LSTR MSG_MOVE_EN = _UxGT("Extrusor *");
8889
LSTR MSG_MOVE_N_MM = _UxGT("Mover $mm");

Marlin/src/lcd/language/language_bg.h

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ namespace Language_bg {
7272
LSTR MSG_MOVE_X = _UxGT("Движение по X");
7373
LSTR MSG_MOVE_Y = _UxGT("Движение по Y");
7474
LSTR MSG_MOVE_Z = _UxGT("Движение по Z");
75+
LSTR MSG_MOVE_N = _UxGT("Движение по @");
7576
LSTR MSG_MOVE_E = _UxGT("Екструдер");
7677
LSTR MSG_MOVE_EN = _UxGT("Екструдер *");
7778
LSTR MSG_MOVE_N_MM = _UxGT("Премести с $mm");

Marlin/src/lcd/language/language_ca.h

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ namespace Language_ca {
8383
LSTR MSG_MOVE_X = _UxGT("Mou X");
8484
LSTR MSG_MOVE_Y = _UxGT("Mou Y");
8585
LSTR MSG_MOVE_Z = _UxGT("Mou Z");
86+
LSTR MSG_MOVE_N = _UxGT("Mou @");
8687
LSTR MSG_MOVE_E = _UxGT("Extrusor");
8788
LSTR MSG_MOVE_EN = _UxGT("Extrusor *");
8889
LSTR MSG_MOVE_N_MM = _UxGT("Mou $mm");

Marlin/src/lcd/language/language_cz.h

+1
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ namespace Language_cz {
232232
LSTR MSG_MOVE_X = _UxGT("Posunout X");
233233
LSTR MSG_MOVE_Y = _UxGT("Posunout Y");
234234
LSTR MSG_MOVE_Z = _UxGT("Posunout Z");
235+
LSTR MSG_MOVE_N = _UxGT("Posunout @");
235236
LSTR MSG_MOVE_E = _UxGT("Extrudér");
236237
LSTR MSG_MOVE_EN = _UxGT("Extrudér *");
237238
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Hotend je studený");

Marlin/src/lcd/language/language_da.h

+3
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ namespace Language_da {
7474
LSTR MSG_MOVE_X = _UxGT("Flyt X");
7575
LSTR MSG_MOVE_Y = _UxGT("Flyt Y");
7676
LSTR MSG_MOVE_Z = _UxGT("Flyt Z");
77+
LSTR MSG_MOVE_N = _UxGT("Flyt @");
78+
LSTR MSG_MOVE_E = _UxGT("Flyt E");
79+
LSTR MSG_MOVE_EN = _UxGT("Flyt *");
7780
LSTR MSG_MOVE_N_MM = _UxGT("Flyt $mm");
7881
LSTR MSG_MOVE_01MM = _UxGT("Flyt 0.1mm");
7982
LSTR MSG_MOVE_1MM = _UxGT("Flyt 1mm");

Marlin/src/lcd/language/language_el.h

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ namespace Language_el {
9292
LSTR MSG_MOVE_X = _UxGT("Μετακίνηση X");
9393
LSTR MSG_MOVE_Y = _UxGT("Μετακίνηση Y");
9494
LSTR MSG_MOVE_Z = _UxGT("Μετακίνηση Z");
95+
LSTR MSG_MOVE_N = _UxGT("Μετακίνηση @");
9596
LSTR MSG_MOVE_E = _UxGT("Εξωθητής");
9697
LSTR MSG_MOVE_EN = _UxGT("Εξωθητής *");
9798
LSTR MSG_MOVE_N_MM = _UxGT("Μετακίνηση %s μμ");

Marlin/src/lcd/language/language_el_gr.h

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ namespace Language_el_gr {
8181
LSTR MSG_MOVE_X = _UxGT("Μετακίνηση X");
8282
LSTR MSG_MOVE_Y = _UxGT("Μετακίνηση Y");
8383
LSTR MSG_MOVE_Z = _UxGT("Μετακίνηση Z");
84+
LSTR MSG_MOVE_N = _UxGT("Μετακίνηση @");
8485
LSTR MSG_MOVE_E = _UxGT("Εξωθητήρας");
8586
LSTR MSG_MOVE_EN = _UxGT("Εξωθητήρας *");
8687
LSTR MSG_MOVE_N_MM = _UxGT("Μετακίνηση %s μμ");

Marlin/src/lcd/language/language_es.h

+1
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ namespace Language_es {
226226
LSTR MSG_MOVE_X = _UxGT("Mover X");
227227
LSTR MSG_MOVE_Y = _UxGT("Mover Y");
228228
LSTR MSG_MOVE_Z = _UxGT("Mover Z");
229+
LSTR MSG_MOVE_N = _UxGT("Mover @");
229230
LSTR MSG_MOVE_E = _UxGT("Extrusor");
230231
LSTR MSG_MOVE_EN = _UxGT("Extrusor *");
231232
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Hotend muy frio");

Marlin/src/lcd/language/language_eu.h

+1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ namespace Language_eu {
136136
LSTR MSG_MOVE_X = _UxGT("Mugitu X");
137137
LSTR MSG_MOVE_Y = _UxGT("Mugitu Y");
138138
LSTR MSG_MOVE_Z = _UxGT("Mugitu Z");
139+
LSTR MSG_MOVE_N = _UxGT("Mugitu @");
139140
LSTR MSG_MOVE_E = _UxGT("Estrusorea");
140141
LSTR MSG_MOVE_EN = _UxGT("Estrusorea *");
141142
LSTR MSG_MOVE_N_MM = _UxGT("Mugitu $mm");

Marlin/src/lcd/language/language_fi.h

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ namespace Language_fi {
6969
LSTR MSG_MOVE_X = _UxGT("Liikuta X");
7070
LSTR MSG_MOVE_Y = _UxGT("Liikuta Y");
7171
LSTR MSG_MOVE_Z = _UxGT("Liikuta Z");
72+
LSTR MSG_MOVE_N = _UxGT("Liikuta @");
7273
LSTR MSG_MOVE_E = _UxGT("Extruder");
7374
LSTR MSG_MOVE_EN = _UxGT("Extruder *");
7475
LSTR MSG_MOVE_N_MM = _UxGT("Liikuta $mm");

Marlin/src/lcd/language/language_gl.h

+1
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ namespace Language_gl {
223223
LSTR MSG_MOVE_X = _UxGT("Mover X");
224224
LSTR MSG_MOVE_Y = _UxGT("Mover Y");
225225
LSTR MSG_MOVE_Z = _UxGT("Mover Z");
226+
LSTR MSG_MOVE_N = _UxGT("Mover @");
226227
LSTR MSG_MOVE_E = _UxGT("Extrusor");
227228
LSTR MSG_MOVE_EN = _UxGT("Extrusor *");
228229
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Bico moi frío");

Marlin/src/lcd/language/language_hr.h

+4
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ namespace Language_hr {
7878
LSTR MSG_LEVEL_BED = _UxGT("Niveliraj bed");
7979
LSTR MSG_MOVE_X = _UxGT("Miči X");
8080
LSTR MSG_MOVE_Y = _UxGT("Miči Y");
81+
LSTR MSG_MOVE_Z = _UxGT("Miči Z");
82+
LSTR MSG_MOVE_N = _UxGT("Miči @");
83+
LSTR MSG_MOVE_E = _UxGT("Miči E");
84+
LSTR MSG_MOVE_EN = _UxGT("Miči *");
8185
LSTR MSG_MOVE_N_MM = _UxGT("Miči $mm");
8286
LSTR MSG_MOVE_01MM = _UxGT("Miči 0.1mm");
8387
LSTR MSG_MOVE_1MM = _UxGT("Miči 1mm");

Marlin/src/lcd/language/language_jp_kana.h

+2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ namespace Language_jp_kana {
9292
LSTR MSG_MOVE_X = _UxGT("Xジク イドウ"); // "Move X"
9393
LSTR MSG_MOVE_Y = _UxGT("Yジク イドウ"); // "Move Y"
9494
LSTR MSG_MOVE_Z = _UxGT("Zジク イドウ"); // "Move Z"
95+
LSTR MSG_MOVE_N = _UxGT("@ジク イドウ"); // "Move @"
9596
LSTR MSG_MOVE_E = _UxGT("エクストルーダー"); // "Extruder"
97+
LSTR MSG_MOVE_EN = _UxGT("* エクストルーダー"); // "En"
9698
LSTR MSG_MOVE_N_MM = _UxGT("$mm イドウ"); // "Move 0.025mm"
9799
LSTR MSG_MOVE_01MM = _UxGT("0.1mm イドウ"); // "Move 0.1mm"
98100
LSTR MSG_MOVE_1MM = _UxGT(" 1mm イドウ"); // "Move 1mm"

Marlin/src/lcd/language/language_nl.h

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ namespace Language_nl {
8484
LSTR MSG_MOVE_X = _UxGT("Verplaats X");
8585
LSTR MSG_MOVE_Y = _UxGT("Verplaats Y");
8686
LSTR MSG_MOVE_Z = _UxGT("Verplaats Z");
87+
LSTR MSG_MOVE_N = _UxGT("Verplaats @");
8788
LSTR MSG_MOVE_E = _UxGT("Extruder");
8889
LSTR MSG_MOVE_EN = _UxGT("Extruder *");
8990
LSTR MSG_MOVE_N_MM = _UxGT("Verplaats $mm");

Marlin/src/lcd/language/language_pl.h

+1
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ namespace Language_pl {
235235
LSTR MSG_MOVE_X = _UxGT("Przesuń w X");
236236
LSTR MSG_MOVE_Y = _UxGT("Przesuń w Y");
237237
LSTR MSG_MOVE_Z = _UxGT("Przesuń w Z");
238+
LSTR MSG_MOVE_N = _UxGT("Przesuń w @");
238239
LSTR MSG_MOVE_E = _UxGT("Ekstruzja (os E)");
239240
LSTR MSG_MOVE_EN = _UxGT("Ekstruzja (os E) *");
240241
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Dysza za zimna");

Marlin/src/lcd/language/language_pt.h

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ namespace Language_pt {
7878
LSTR MSG_MOVE_X = _UxGT("Mover X");
7979
LSTR MSG_MOVE_Y = _UxGT("Mover Y");
8080
LSTR MSG_MOVE_Z = _UxGT("Mover Z");
81+
LSTR MSG_MOVE_N = _UxGT("Mover @");
8182
LSTR MSG_MOVE_E = _UxGT("Mover Extrusor");
8283
LSTR MSG_MOVE_EN = _UxGT("Mover Extrusor *");
8384
LSTR MSG_MOVE_N_MM = _UxGT("Mover $mm");

Marlin/src/lcd/language/language_pt_br.h

+1
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ namespace Language_pt_br {
209209
LSTR MSG_MOVE_X = _UxGT("Mover X");
210210
LSTR MSG_MOVE_Y = _UxGT("Mover Y");
211211
LSTR MSG_MOVE_Z = _UxGT("Mover Z");
212+
LSTR MSG_MOVE_N = _UxGT("Mover @");
212213
LSTR MSG_MOVE_E = _UxGT("Mover Extrusor");
213214
LSTR MSG_MOVE_EN = _UxGT("Mover Extrusor *");
214215
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Extrus. mto fria");

Marlin/src/lcd/language/language_ro.h

+1
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ namespace Language_ro {
222222
LSTR MSG_MOVE_X = _UxGT("Move X");
223223
LSTR MSG_MOVE_Y = _UxGT("Move Y");
224224
LSTR MSG_MOVE_Z = _UxGT("Move Z");
225+
LSTR MSG_MOVE_N = _UxGT("Move @");
225226
LSTR MSG_MOVE_E = _UxGT("Extruder");
226227
LSTR MSG_MOVE_EN = _UxGT("Extruder *");
227228
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Capat Prea Rece");

Marlin/src/lcd/language/language_sv.h

+1
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ namespace Language_sv {
249249
LSTR MSG_MOVE_X = _UxGT("Flytta X");
250250
LSTR MSG_MOVE_Y = _UxGT("Flytta Y");
251251
LSTR MSG_MOVE_Z = _UxGT("Flytta Z");
252+
LSTR MSG_MOVE_N = _UxGT("Flytta @");
252253
LSTR MSG_MOVE_E = _UxGT("Extruder");
253254
LSTR MSG_MOVE_EN = _UxGT("Extruder *");
254255
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Hetände för kall");

Marlin/src/lcd/language/language_tr.h

+1
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ namespace Language_tr {
225225
LSTR MSG_MOVE_X = _UxGT("X Hareketi");
226226
LSTR MSG_MOVE_Y = _UxGT("Y Hareketi");
227227
LSTR MSG_MOVE_Z = _UxGT("Z Hareketi");
228+
LSTR MSG_MOVE_N = _UxGT("@ Hareketi");
228229
LSTR MSG_MOVE_E = _UxGT("Ekstruder");
229230
LSTR MSG_MOVE_EN = _UxGT("Ekstruder *");
230231
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Nozul Çok Soğuk");

Marlin/src/lcd/language/language_vi.h

+1
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ namespace Language_vi {
198198
LSTR MSG_MOVE_X = _UxGT("Di chuyển X"); // Move X
199199
LSTR MSG_MOVE_Y = _UxGT("Di chuyển Y");
200200
LSTR MSG_MOVE_Z = _UxGT("Di chuyển Z");
201+
LSTR MSG_MOVE_N = _UxGT("Di chuyển @");
201202
LSTR MSG_MOVE_E = _UxGT("Máy đùn"); // Extruder
202203
LSTR MSG_MOVE_EN = _UxGT("Máy đùn *");
203204
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Đầu nóng quá lạnh"); // Hotend too cold

Marlin/src/lcd/language/language_zh_CN.h

+1
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ namespace Language_zh_CN {
222222
LSTR MSG_MOVE_X = _UxGT("移动X"); // "Move X"
223223
LSTR MSG_MOVE_Y = _UxGT("移动Y"); // "Move Y"
224224
LSTR MSG_MOVE_Z = _UxGT("移动Z"); // "Move Z"
225+
LSTR MSG_MOVE_N = _UxGT("移动@"); // "Move @"
225226
LSTR MSG_MOVE_E = _UxGT("挤出机"); // "Extruder"
226227
LSTR MSG_MOVE_EN = _UxGT("挤出机 *"); // "Extruder"
227228
LSTR MSG_HOTEND_TOO_COLD = _UxGT("热端太冷");

Marlin/src/lcd/language/language_zh_TW.h

+1
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ namespace Language_zh_TW {
218218
LSTR MSG_MOVE_X = _UxGT("移動X"); // "Move X"
219219
LSTR MSG_MOVE_Y = _UxGT("移動Y"); // "Move Y"
220220
LSTR MSG_MOVE_Z = _UxGT("移動Z"); // "Move Z"
221+
LSTR MSG_MOVE_N = _UxGT("移動Q"); // "Move @"
221222
LSTR MSG_MOVE_E = _UxGT("擠出機"); // "Extruder"
222223
LSTR MSG_MOVE_EN = _UxGT("擠出機 *"); // "Extruder *"
223224
LSTR MSG_HOTEND_TOO_COLD = _UxGT("噴嘴溫度不夠"); // "Hotend too cold"

Marlin/src/lcd/marlinui.h

+2
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ typedef bool (*statusResetFunc_t)();
178178
static void soon(const AxisEnum axis OPTARG(MULTI_E_MANUAL, const int8_t eindex=active_extruder));
179179
};
180180

181+
void lcd_move_axis(const AxisEnum);
182+
181183
#endif
182184

183185
////////////////////////////////////////////

Marlin/src/lcd/menu/menu.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
191191
else {
192192
#if ENABLED(MOVE_Z_WHEN_IDLE)
193193
ui.manual_move.menu_scale = MOVE_Z_IDLE_MULTIPLICATOR;
194-
screen = lcd_move_z;
194+
screen = []{ lcd_move_axis(Z_AXIS); };
195195
#endif
196196
}
197197
}

Marlin/src/lcd/menu/menu.h

-2
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,6 @@ void menu_move();
214214
//////// Menu Item Helper Functions ////////
215215
////////////////////////////////////////////
216216

217-
void lcd_move_axis(const AxisEnum);
218-
void lcd_move_z();
219217
void _lcd_draw_homing();
220218

221219
#define HAS_LINE_TO_Z ANY(DELTA, PROBE_MANUALLY, MESH_BED_LEVELING, LCD_BED_TRAMMING)

Marlin/src/lcd/menu/menu_delta_calibrate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
5252
ui.wait_for_move = false;
5353
ui.synchronize();
5454
ui.manual_move.menu_scale = _MAX(PROBE_MANUALLY_STEP, MIN_STEPS_PER_SEGMENT / planner.settings.axis_steps_per_mm[0]); // Use first axis as for delta XYZ should always match
55-
ui.goto_screen(lcd_move_z);
55+
ui.goto_screen([]{ lcd_move_axis(Z_AXIS); });
5656
}
5757
}
5858

Marlin/src/lcd/menu/menu_item.h

-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
#include "../../module/planner.h"
3232
#endif
3333

34-
void lcd_move_z();
35-
3634
////////////////////////////////////////////
3735
///////////// Base Menu Items //////////////
3836
////////////////////////////////////////////

Marlin/src/lcd/menu/menu_motion.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ void lcd_move_axis(const AxisEnum axis) {
7474
}
7575
ui.encoderPosition = 0;
7676
if (ui.should_draw()) {
77+
MenuEditItemBase::itemIndex = axis;
7778
const float pos = ui.manual_move.axis_value(axis);
7879
if (parser.using_inch_units()) {
7980
const float imp_pos = LINEAR_UNIT(pos);
@@ -84,9 +85,6 @@ void lcd_move_axis(const AxisEnum axis) {
8485
}
8586
}
8687

87-
// Move Z easy accessor
88-
void lcd_move_z() { lcd_move_axis(Z_AXIS); }
89-
9088
#if E_MANUAL
9189

9290
static void lcd_move_e(TERN_(MULTI_E_MANUAL, const int8_t eindex=active_extruder)) {
@@ -118,7 +116,7 @@ void lcd_move_z() { lcd_move_axis(Z_AXIS); }
118116

119117
void _goto_manual_move_z(const_float_t scale) {
120118
ui.manual_move.menu_scale = scale;
121-
ui.goto_screen(lcd_move_z);
119+
ui.goto_screen([]{ lcd_move_axis(Z_AXIS); });
122120
}
123121

124122
#endif

0 commit comments

Comments
 (0)