bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🌐 MSG_PROBING_MESH => MSG_PROBING_POINT

Browse Source
This commit is contained in:
Scott Lahteine 2021-08-29 23:02:53 -05:00 committed by Scott Lahteine
parent 61c000d96f
commit c14b162b9e
22 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@ -736,7 +736,7 @@ void unified_bed_leveling::shift_mesh_height() {
const uint8_t point_num = (GRID_MAX_POINTS - count) + 1;
SERIAL_ECHOLNPAIR("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), point_num, int(GRID_MAX_POINTS)));
TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), point_num, int(GRID_MAX_POINTS)));
#if HAS_LCD_MENU
if (ui.button_pressed()) {

4
Marlin/src/gcode/bedlevel/abl/G29.cpp
View File

@ -637,7 +637,7 @@ G29_TYPE GcodeSuite::G29() {
if (TERN0(IS_KINEMATIC, !probe.can_reach(abl.probePos))) continue;
if (abl.verbose_level) SERIAL_ECHOLNPAIR("Probing mesh point ", pt_index, "/", abl.abl_points, ".");
TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), int(pt_index), int(abl.abl_points)));
TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), int(pt_index), int(abl.abl_points)));
abl.measured_z = faux ? 0.001f * random(-100, 101) : probe.probe_at_point(abl.probePos, raise_after, abl.verbose_level);
@ -682,7 +682,7 @@ G29_TYPE GcodeSuite::G29() {
LOOP_L_N(i, 3) {
if (abl.verbose_level) SERIAL_ECHOLNPAIR("Probing point ", i + 1, "/3.");
TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_MESH), int(i + 1)));
TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_POINT), int(i + 1)));
// Retain the last probe position
abl.probePos = xy_pos_t(points[i]);

2
Marlin/src/gcode/bedlevel/mbl/G29.cpp
View File

@ -211,7 +211,7 @@ void GcodeSuite::G29() {
if (state == MeshNext) {
SERIAL_ECHOLNPAIR("MBL G29 point ", _MIN(mbl_probe_index, GRID_MAX_POINTS), " of ", GRID_MAX_POINTS);
if (mbl_probe_index > 0) TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), _MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS)));
if (mbl_probe_index > 0) TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), _MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS)));
}
report_current_position();

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

@ -114,7 +114,7 @@ namespace Language_cz {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Editor sítě");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Upravit síť bodů");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Konec úprav sítě");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Měření bodu");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Měření bodu");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Index X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Index Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Hodnota Z");

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

@ -107,7 +107,7 @@ namespace Language_de {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Netz Editor");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Netz bearbeiten");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Netzbearb. angeh.");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Messpunkt");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Messpunkt");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Index X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Index Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Z-Wert");

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

@ -147,7 +147,7 @@ namespace Language_en {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Mesh Editor");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Edit Mesh");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Mesh Editing Stopped");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Probing Point");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Probing Point");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Index X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Index Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Z Value");

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

@ -110,7 +110,7 @@ namespace Language_es {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Editor Mallado");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Editar Mallado");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Ed. Mallado parada");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Sondear Punto");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Sondear Punto");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Índice X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Índice Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Valor Z");

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

@ -117,7 +117,7 @@ namespace Language_fr {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Modif. maille"); // 13 car. max
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Modifier grille");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Modification arrêtée");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Mesure point");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Mesure point");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Index X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Index Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Valeur Z");

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

@ -108,7 +108,7 @@ namespace Language_gl {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Editor Mallado");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Editar Mallado");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Ed. Mallado Detida");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Punto de Proba");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Punto de Proba");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Índice X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Índice Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Valor Z");

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

@ -141,7 +141,7 @@ namespace Language_hu {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Háló szerkesztö");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Háló szerkesztése");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Háló szerk. állj");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Próbapont");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Próbapont");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Index X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Index Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Z érték");

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

@ -145,7 +145,7 @@ namespace Language_it {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Editor Mesh");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Modifica Mesh");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Modif. Mesh Fermata");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Punto sondato");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Punto sondato");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Indice X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Indice Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Valore di Z");

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

@ -139,7 +139,7 @@ namespace Language_pl {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Edytor siatki");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Edycja siatki");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Edycja siatki zatrzymana");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Punkt pomiarowy");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Punkt pomiarowy");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Indeks X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Indeks Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Wartość Z");

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

@ -99,7 +99,7 @@ namespace Language_pt_br {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Editor de Malha");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Editar Malha");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Fim da Edição");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Sondando ponto");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Sondando ponto");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Índice X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Índice Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Valor Z");

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

@ -107,7 +107,7 @@ namespace Language_ro {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Editor Mesh");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Editeaza Mesh");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Editarea Meshului Oprita");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Punctul de Probare");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Punctul de Probare");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Index X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Index Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Valoare Z");

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

@ -178,7 +178,7 @@ namespace Language_ru {
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Правка окончена");
#endif
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Редактировать сетку");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Точка сетки");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Точка сетки");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Индекс X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Индекс Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Значение Z");

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

@ -141,7 +141,7 @@ namespace Language_sk {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Editor sieťe bodov");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Upraviť sieť bodov");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Koniec úprav siete");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Skúšam bod");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Skúšam bod");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Index X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Index Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Hodnota Z");

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

@ -130,7 +130,7 @@ namespace Language_sv {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Nät Redigerare");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Redigera Nät");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Nätredigering Stoppad");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Sonderingspunkt");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Sonderingspunkt");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Index X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Index Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Z Värde");

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

@ -110,7 +110,7 @@ namespace Language_tr {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Mesh Editörü");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Mesh Düzenle");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Mesh Düzenleme Durdu");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Prop Noktası");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Prop Noktası");
PROGMEM Language_Str MSG_MESH_X = _UxGT("İndeks X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("İndeks Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Z Değeri");

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

@ -179,7 +179,7 @@ namespace Language_uk {
#endif
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Редагувати сітку");
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Редагув. зупинено");
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Точка сітки");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("Точка сітки");
PROGMEM Language_Str MSG_MESH_X = _UxGT("Індекс X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("Індекс Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Значення Z");

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

@ -105,7 +105,7 @@ namespace Language_zh_CN {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("网格编辑器");
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("编辑网格"); // "Edit Mesh"
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("网格编辑已停止"); // "Mesh Editing Stopped"
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("探测点");
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("探测点");
PROGMEM Language_Str MSG_MESH_X = _UxGT("索引X");
PROGMEM Language_Str MSG_MESH_Y = _UxGT("索引Y");
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Z 值");

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

@ -103,7 +103,7 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("網格編輯器"); // "Mesh Editor"
PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("編輯網格"); // "Edit Mesh"
PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("網格編輯已停止"); // "Mesh Editing Stopped"
PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("探測點"); // "Probing Point"
PROGMEM Language_Str MSG_PROBING_POINT = _UxGT("探測點"); // "Probing Point"
PROGMEM Language_Str MSG_MESH_X = _UxGT("索引 X"); // "Index X"
PROGMEM Language_Str MSG_MESH_Y = _UxGT("索引 Y"); // "Index Y"
PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Z 值"); // "Z Value"

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

@ -172,7 +172,7 @@ static void _lcd_level_bed_corners_get_next_position() {
TERN_(HAS_MARLINUI_U8GLIB, ui.set_font(FONT_MENU)); // Set up the font for extra info
MenuItem_static::draw(0, GET_TEXT(MSG_PROBING_MESH), SS_INVERT); // "Probing Mesh" heading
MenuItem_static::draw(0, GET_TEXT(MSG_PROBING_POINT), SS_INVERT); // "Probing Mesh" heading
uint8_t cy = TERN(TFT_COLOR_UI, 3, LCD_HEIGHT - 1), y = LCD_ROW_Y(cy);