MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

🩹 Fix manual move titles (#24518)

Browse Source
This commit is contained in:
Scott Lahteine 2022-07-18 19:52:47 -05:00
parent 915203f545
commit 97a73147fa
29 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,6 +83,7 @@ namespace Language_an {
LSTR MSG_MOVE_X = _UxGT("Mover X");
LSTR MSG_MOVE_Y = _UxGT("Mover Y");
LSTR MSG_MOVE_Z = _UxGT("Mover Z");
LSTR MSG_MOVE_N = _UxGT("Mover @");
LSTR MSG_MOVE_E = _UxGT("Extrusor");
LSTR MSG_MOVE_EN = _UxGT("Extrusor *");
LSTR MSG_MOVE_N_MM = _UxGT("Mover $mm");

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

@ -72,6 +72,7 @@ namespace Language_bg {
LSTR MSG_MOVE_X = _UxGT("Движение по X");
LSTR MSG_MOVE_Y = _UxGT("Движение по Y");
LSTR MSG_MOVE_Z = _UxGT("Движение по Z");
LSTR MSG_MOVE_N = _UxGT("Движение по @");
LSTR MSG_MOVE_E = _UxGT("Екструдер");
LSTR MSG_MOVE_EN = _UxGT("Екструдер *");
LSTR MSG_MOVE_N_MM = _UxGT("Премести с $mm");

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

@ -83,6 +83,7 @@ namespace Language_ca {
LSTR MSG_MOVE_X = _UxGT("Mou X");
LSTR MSG_MOVE_Y = _UxGT("Mou Y");
LSTR MSG_MOVE_Z = _UxGT("Mou Z");
LSTR MSG_MOVE_N = _UxGT("Mou @");
LSTR MSG_MOVE_E = _UxGT("Extrusor");
LSTR MSG_MOVE_EN = _UxGT("Extrusor *");
LSTR MSG_MOVE_N_MM = _UxGT("Mou $mm");

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

@ -232,6 +232,7 @@ namespace Language_cz {
LSTR MSG_MOVE_X = _UxGT("Posunout X");
LSTR MSG_MOVE_Y = _UxGT("Posunout Y");
LSTR MSG_MOVE_Z = _UxGT("Posunout Z");
LSTR MSG_MOVE_N = _UxGT("Posunout @");
LSTR MSG_MOVE_E = _UxGT("Extrudér");
LSTR MSG_MOVE_EN = _UxGT("Extrudér *");
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Hotend je studený");

3
Marlin/src/lcd/language/language_da.h
View File

@ -74,6 +74,9 @@ namespace Language_da {
LSTR MSG_MOVE_X = _UxGT("Flyt X");
LSTR MSG_MOVE_Y = _UxGT("Flyt Y");
LSTR MSG_MOVE_Z = _UxGT("Flyt Z");
LSTR MSG_MOVE_N = _UxGT("Flyt @");
LSTR MSG_MOVE_E = _UxGT("Flyt E");
LSTR MSG_MOVE_EN = _UxGT("Flyt *");
LSTR MSG_MOVE_N_MM = _UxGT("Flyt $mm");
LSTR MSG_MOVE_01MM = _UxGT("Flyt 0.1mm");
LSTR MSG_MOVE_1MM = _UxGT("Flyt 1mm");

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

@ -92,6 +92,7 @@ namespace Language_el {
LSTR MSG_MOVE_X = _UxGT("Μετακίνηση X");
LSTR MSG_MOVE_Y = _UxGT("Μετακίνηση Y");
LSTR MSG_MOVE_Z = _UxGT("Μετακίνηση Z");
LSTR MSG_MOVE_N = _UxGT("Μετακίνηση @");
LSTR MSG_MOVE_E = _UxGT("Εξωθητής");
LSTR MSG_MOVE_EN = _UxGT("Εξωθητής *");
LSTR MSG_MOVE_N_MM = _UxGT("Μετακίνηση %s μμ");

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

@ -81,6 +81,7 @@ namespace Language_el_gr {
LSTR MSG_MOVE_X = _UxGT("Μετακίνηση X");
LSTR MSG_MOVE_Y = _UxGT("Μετακίνηση Y");
LSTR MSG_MOVE_Z = _UxGT("Μετακίνηση Z");
LSTR MSG_MOVE_N = _UxGT("Μετακίνηση @");
LSTR MSG_MOVE_E = _UxGT("Εξωθητήρας");
LSTR MSG_MOVE_EN = _UxGT("Εξωθητήρας *");
LSTR MSG_MOVE_N_MM = _UxGT("Μετακίνηση %s μμ");

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

@ -226,6 +226,7 @@ namespace Language_es {
LSTR MSG_MOVE_X = _UxGT("Mover X");
LSTR MSG_MOVE_Y = _UxGT("Mover Y");
LSTR MSG_MOVE_Z = _UxGT("Mover Z");
LSTR MSG_MOVE_N = _UxGT("Mover @");
LSTR MSG_MOVE_E = _UxGT("Extrusor");
LSTR MSG_MOVE_EN = _UxGT("Extrusor *");
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Hotend muy frio");

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

@ -136,6 +136,7 @@ namespace Language_eu {
LSTR MSG_MOVE_X = _UxGT("Mugitu X");
LSTR MSG_MOVE_Y = _UxGT("Mugitu Y");
LSTR MSG_MOVE_Z = _UxGT("Mugitu Z");
LSTR MSG_MOVE_N = _UxGT("Mugitu @");
LSTR MSG_MOVE_E = _UxGT("Estrusorea");
LSTR MSG_MOVE_EN = _UxGT("Estrusorea *");
LSTR MSG_MOVE_N_MM = _UxGT("Mugitu $mm");

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

@ -69,6 +69,7 @@ namespace Language_fi {
LSTR MSG_MOVE_X = _UxGT("Liikuta X");
LSTR MSG_MOVE_Y = _UxGT("Liikuta Y");
LSTR MSG_MOVE_Z = _UxGT("Liikuta Z");
LSTR MSG_MOVE_N = _UxGT("Liikuta @");
LSTR MSG_MOVE_E = _UxGT("Extruder");
LSTR MSG_MOVE_EN = _UxGT("Extruder *");
LSTR MSG_MOVE_N_MM = _UxGT("Liikuta $mm");

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

@ -223,6 +223,7 @@ namespace Language_gl {
LSTR MSG_MOVE_X = _UxGT("Mover X");
LSTR MSG_MOVE_Y = _UxGT("Mover Y");
LSTR MSG_MOVE_Z = _UxGT("Mover Z");
LSTR MSG_MOVE_N = _UxGT("Mover @");
LSTR MSG_MOVE_E = _UxGT("Extrusor");
LSTR MSG_MOVE_EN = _UxGT("Extrusor *");
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Bico moi frío");

4
Marlin/src/lcd/language/language_hr.h
View File

@ -78,6 +78,10 @@ namespace Language_hr {
LSTR MSG_LEVEL_BED = _UxGT("Niveliraj bed");
LSTR MSG_MOVE_X = _UxGT("Miči X");
LSTR MSG_MOVE_Y = _UxGT("Miči Y");
LSTR MSG_MOVE_Z = _UxGT("Miči Z");
LSTR MSG_MOVE_N = _UxGT("Miči @");
LSTR MSG_MOVE_E = _UxGT("Miči E");
LSTR MSG_MOVE_EN = _UxGT("Miči *");
LSTR MSG_MOVE_N_MM = _UxGT("Miči $mm");
LSTR MSG_MOVE_01MM = _UxGT("Miči 0.1mm");
LSTR MSG_MOVE_1MM = _UxGT("Miči 1mm");

2
Marlin/src/lcd/language/language_jp_kana.h
View File

@ -92,7 +92,9 @@ namespace Language_jp_kana {
LSTR MSG_MOVE_X = _UxGT("Xジク イドウ"); // "Move X"
LSTR MSG_MOVE_Y = _UxGT("Yジク イドウ"); // "Move Y"
LSTR MSG_MOVE_Z = _UxGT("Zジク イドウ"); // "Move Z"
LSTR MSG_MOVE_N = _UxGT("@ジク イドウ"); // "Move @"
LSTR MSG_MOVE_E = _UxGT("エクストルーダー"); // "Extruder"
LSTR MSG_MOVE_EN = _UxGT("* エクストルーダー"); // "En"
LSTR MSG_MOVE_N_MM = _UxGT("$mm イドウ"); // "Move 0.025mm"
LSTR MSG_MOVE_01MM = _UxGT("0.1mm イドウ"); // "Move 0.1mm"
LSTR MSG_MOVE_1MM = _UxGT(" 1mm イドウ"); // "Move 1mm"

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

@ -84,6 +84,7 @@ namespace Language_nl {
LSTR MSG_MOVE_X = _UxGT("Verplaats X");
LSTR MSG_MOVE_Y = _UxGT("Verplaats Y");
LSTR MSG_MOVE_Z = _UxGT("Verplaats Z");
LSTR MSG_MOVE_N = _UxGT("Verplaats @");
LSTR MSG_MOVE_E = _UxGT("Extruder");
LSTR MSG_MOVE_EN = _UxGT("Extruder *");
LSTR MSG_MOVE_N_MM = _UxGT("Verplaats $mm");

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

@ -235,6 +235,7 @@ namespace Language_pl {
LSTR MSG_MOVE_X = _UxGT("Przesuń w X");
LSTR MSG_MOVE_Y = _UxGT("Przesuń w Y");
LSTR MSG_MOVE_Z = _UxGT("Przesuń w Z");
LSTR MSG_MOVE_N = _UxGT("Przesuń w @");
LSTR MSG_MOVE_E = _UxGT("Ekstruzja (os E)");
LSTR MSG_MOVE_EN = _UxGT("Ekstruzja (os E) *");
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Dysza za zimna");

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

@ -78,6 +78,7 @@ namespace Language_pt {
LSTR MSG_MOVE_X = _UxGT("Mover X");
LSTR MSG_MOVE_Y = _UxGT("Mover Y");
LSTR MSG_MOVE_Z = _UxGT("Mover Z");
LSTR MSG_MOVE_N = _UxGT("Mover @");
LSTR MSG_MOVE_E = _UxGT("Mover Extrusor");
LSTR MSG_MOVE_EN = _UxGT("Mover Extrusor *");
LSTR MSG_MOVE_N_MM = _UxGT("Mover $mm");

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

@ -209,6 +209,7 @@ namespace Language_pt_br {
LSTR MSG_MOVE_X = _UxGT("Mover X");
LSTR MSG_MOVE_Y = _UxGT("Mover Y");
LSTR MSG_MOVE_Z = _UxGT("Mover Z");
LSTR MSG_MOVE_N = _UxGT("Mover @");
LSTR MSG_MOVE_E = _UxGT("Mover Extrusor");
LSTR MSG_MOVE_EN = _UxGT("Mover Extrusor *");
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Extrus. mto fria");

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

@ -222,6 +222,7 @@ namespace Language_ro {
LSTR MSG_MOVE_X = _UxGT("Move X");
LSTR MSG_MOVE_Y = _UxGT("Move Y");
LSTR MSG_MOVE_Z = _UxGT("Move Z");
LSTR MSG_MOVE_N = _UxGT("Move @");
LSTR MSG_MOVE_E = _UxGT("Extruder");
LSTR MSG_MOVE_EN = _UxGT("Extruder *");
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Capat Prea Rece");

1
Marlin/src/lcd/language/language_sv.h
View File

@ -249,6 +249,7 @@ namespace Language_sv {
LSTR MSG_MOVE_X = _UxGT("Flytta X");
LSTR MSG_MOVE_Y = _UxGT("Flytta Y");
LSTR MSG_MOVE_Z = _UxGT("Flytta Z");
LSTR MSG_MOVE_N = _UxGT("Flytta @");
LSTR MSG_MOVE_E = _UxGT("Extruder");
LSTR MSG_MOVE_EN = _UxGT("Extruder *");
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Hetände för kall");

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

@ -225,6 +225,7 @@ namespace Language_tr {
LSTR MSG_MOVE_X = _UxGT("X Hareketi");
LSTR MSG_MOVE_Y = _UxGT("Y Hareketi");
LSTR MSG_MOVE_Z = _UxGT("Z Hareketi");
LSTR MSG_MOVE_N = _UxGT("@ Hareketi");
LSTR MSG_MOVE_E = _UxGT("Ekstruder");
LSTR MSG_MOVE_EN = _UxGT("Ekstruder *");
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Nozul Çok Soğuk");

1
Marlin/src/lcd/language/language_vi.h
View File

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

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

@ -222,6 +222,7 @@ namespace Language_zh_CN {
LSTR MSG_MOVE_X = _UxGT("移动X"); // "Move X"
LSTR MSG_MOVE_Y = _UxGT("移动Y"); // "Move Y"
LSTR MSG_MOVE_Z = _UxGT("移动Z"); // "Move Z"
LSTR MSG_MOVE_N = _UxGT("移动@"); // "Move @"
LSTR MSG_MOVE_E = _UxGT("挤出机"); // "Extruder"
LSTR MSG_MOVE_EN = _UxGT("挤出机 *"); // "Extruder"
LSTR MSG_HOTEND_TOO_COLD = _UxGT("热端太冷");

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

@ -218,6 +218,7 @@ namespace Language_zh_TW {
LSTR MSG_MOVE_X = _UxGT("移動X"); // "Move X"
LSTR MSG_MOVE_Y = _UxGT("移動Y"); // "Move Y"
LSTR MSG_MOVE_Z = _UxGT("移動Z"); // "Move Z"
LSTR MSG_MOVE_N = _UxGT("移動Q"); // "Move @"
LSTR MSG_MOVE_E = _UxGT("擠出機"); // "Extruder"
LSTR MSG_MOVE_EN = _UxGT("擠出機 *"); // "Extruder *"
LSTR MSG_HOTEND_TOO_COLD = _UxGT("噴嘴溫度不夠"); // "Hotend too cold"

2
Marlin/src/lcd/marlinui.h
View File

@ -176,6 +176,8 @@ typedef bool (*statusResetFunc_t)();
static void soon(const AxisEnum axis OPTARG(MULTI_E_MANUAL, const int8_t eindex=active_extruder));
};
void lcd_move_axis(const AxisEnum);
#endif
////////////////////////////////////////////

2
Marlin/src/lcd/menu/menu.cpp
View File

@ -191,7 +191,7 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
else {
#if ENABLED(MOVE_Z_WHEN_IDLE)
ui.manual_move.menu_scale = MOVE_Z_IDLE_MULTIPLICATOR;
screen = lcd_move_z;
screen = []{ lcd_move_axis(Z_AXIS); };
#endif
}
}

2
Marlin/src/lcd/menu/menu.h
View File

@ -214,8 +214,6 @@ void menu_move();
//////// Menu Item Helper Functions ////////
////////////////////////////////////////////
void lcd_move_axis(const AxisEnum);
void lcd_move_z();
void _lcd_draw_homing();
#define HAS_LINE_TO_Z ANY(DELTA, PROBE_MANUALLY, MESH_BED_LEVELING, LCD_BED_TRAMMING)

2
Marlin/src/lcd/menu/menu_delta_calibrate.cpp
View File

@ -52,7 +52,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
ui.wait_for_move = false;
ui.synchronize();
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
ui.goto_screen(lcd_move_z);
ui.goto_screen([]{ lcd_move_axis(Z_AXIS); });
}
}

2
Marlin/src/lcd/menu/menu_item.h
View File

@ -31,8 +31,6 @@
#include "../../module/planner.h"
#endif
void lcd_move_z();
////////////////////////////////////////////
///////////// Base Menu Items //////////////
////////////////////////////////////////////

6
Marlin/src/lcd/menu/menu_motion.cpp
View File

@ -74,6 +74,7 @@ void lcd_move_axis(const AxisEnum axis) {
}
ui.encoderPosition = 0;
if (ui.should_draw()) {
MenuEditItemBase::itemIndex = axis;
const float pos = ui.manual_move.axis_value(axis);
if (parser.using_inch_units()) {
const float imp_pos = LINEAR_UNIT(pos);
@ -84,9 +85,6 @@ void lcd_move_axis(const AxisEnum axis) {
}
}
// Move Z easy accessor
void lcd_move_z() { lcd_move_axis(Z_AXIS); }
#if E_MANUAL
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); }
void _goto_manual_move_z(const_float_t scale) {
ui.manual_move.menu_scale = scale;
ui.goto_screen(lcd_move_z);
ui.goto_screen([]{ lcd_move_axis(Z_AXIS); });
}
#endif