Browse Source

🌐 MSG_PROBING_MESH => MSG_PROBING_POINT

Scott Lahteine 2 years ago
parent
commit
d95d452b29

+ 1
- 1
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp View File

@@ -736,7 +736,7 @@ void unified_bed_leveling::shift_mesh_height() {
736 736
 
737 737
       const uint8_t point_num = (GRID_MAX_POINTS - count) + 1;
738 738
       SERIAL_ECHOLNPAIR("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
739
-      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)));
739
+      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)));
740 740
 
741 741
       #if HAS_LCD_MENU
742 742
         if (ui.button_pressed()) {

+ 2
- 2
Marlin/src/gcode/bedlevel/abl/G29.cpp View File

@@ -637,7 +637,7 @@ G29_TYPE GcodeSuite::G29() {
637 637
           if (TERN0(IS_KINEMATIC, !probe.can_reach(abl.probePos))) continue;
638 638
 
639 639
           if (abl.verbose_level) SERIAL_ECHOLNPAIR("Probing mesh point ", pt_index, "/", abl.abl_points, ".");
640
-          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)));
640
+          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)));
641 641
 
642 642
           abl.measured_z = faux ? 0.001f * random(-100, 101) : probe.probe_at_point(abl.probePos, raise_after, abl.verbose_level);
643 643
 
@@ -682,7 +682,7 @@ G29_TYPE GcodeSuite::G29() {
682 682
 
683 683
       LOOP_L_N(i, 3) {
684 684
         if (abl.verbose_level) SERIAL_ECHOLNPAIR("Probing point ", i + 1, "/3.");
685
-        TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_MESH), int(i + 1)));
685
+        TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_POINT), int(i + 1)));
686 686
 
687 687
         // Retain the last probe position
688 688
         abl.probePos = xy_pos_t(points[i]);

+ 1
- 1
Marlin/src/gcode/bedlevel/mbl/G29.cpp View File

@@ -211,7 +211,7 @@ void GcodeSuite::G29() {
211 211
 
212 212
   if (state == MeshNext) {
213 213
     SERIAL_ECHOLNPAIR("MBL G29 point ", _MIN(mbl_probe_index, GRID_MAX_POINTS), " of ", GRID_MAX_POINTS);
214
-    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)));
214
+    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)));
215 215
   }
216 216
 
217 217
   report_current_position();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 1
- 1
Marlin/src/lcd/menu/menu_bed_corners.cpp View File

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

Loading…
Cancel
Save