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

More translatable LCD strings (#15190)

Browse Source
This commit is contained in:
Ludy
2019-09-08 07:15:25 +02:00
committed by Scott Lahteine
parent ec3f29a33a
commit 068c303742
7 changed files with 80 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/gcode/bedlevel/G26.cpp
View File

@ -168,7 +168,7 @@ int8_t g26_prime_flag;
*/
bool user_canceled() {
if (!ui.button_pressed()) return false; // Return if the button isn't pressed
ui.set_status_P(PSTR("Mesh Validation Stopped."), 99);
ui.set_status_P(PSTR(MSG_G26_CANCELED), 99);
#if HAS_LCD_MENU
ui.quick_feedback();
#endif
@ -386,7 +386,7 @@ inline bool turn_on_heaters() {
if (g26_bed_temp > 25) {
#if HAS_SPI_LCD
ui.set_status_P(PSTR("G26 Heating Bed."), 99);
ui.set_status_P(PSTR(MSG_G26_HEATING_BED), 99);
ui.quick_feedback();
#if HAS_LCD_MENU
ui.capture();
@ -407,7 +407,7 @@ inline bool turn_on_heaters() {
// Start heating the active nozzle
#if HAS_SPI_LCD
ui.set_status_P(PSTR("G26 Heating Nozzle."), 99);
ui.set_status_P(PSTR(MSG_G26_HEATING_NOZZLE), 99);
ui.quick_feedback();
#endif
thermalManager.setTargetHotend(g26_hotend_temp, active_extruder);
@ -441,7 +441,7 @@ inline bool prime_nozzle() {
if (g26_prime_flag == -1) { // The user wants to control how much filament gets purged
ui.capture();
ui.set_status_P(PSTR("User-Controlled Prime"), 99);
ui.set_status_P(PSTR(MSG_G26_MANUAL_PRIME), 99);
ui.chirp();
set_destination_from_current();
@ -465,7 +465,7 @@ inline bool prime_nozzle() {
ui.wait_for_release();
ui.set_status_P(PSTR("Done Priming"), 99);
ui.set_status_P(PSTR(MSG_G26_PRIME_DONE), 99);
ui.quick_feedback();
ui.release();
}
@ -473,7 +473,7 @@ inline bool prime_nozzle() {
#endif
{
#if HAS_SPI_LCD
ui.set_status_P(PSTR("Fixed Length Prime."), 99);
ui.set_status_P(PSTR(MSG_G26_FIXED_LENGTH), 99);
ui.quick_feedback();
#endif
set_destination_from_current();
@ -852,7 +852,7 @@ void GcodeSuite::G26() {
} while (--g26_repeats && location.x_index >= 0 && location.y_index >= 0);
LEAVE:
ui.set_status_P(PSTR("Leaving G26"), -1);
ui.set_status_P(PSTR(MSG_G26_LEAVING), -1);
retract_filament(destination);
destination[Z_AXIS] = Z_CLEARANCE_BETWEEN_PROBES;