diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 654cfedf6..a0b9bb0a0 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -156,11 +156,17 @@ #ifndef MSG_LEVEL_BED #define MSG_LEVEL_BED _UxGT("Level bed") #endif +#ifndef MSG_EDITING_STOPPED + #define MSG_EDITING_STOPPED _UxGT("Mesh Editing Stopped") +#endif #ifndef MSG_USER_MENU #define MSG_USER_MENU _UxGT("Custom Commands") #endif #if ENABLED(AUTO_BED_LEVELING_UBL) + #ifndef MSG_UBL_DOING_G29 + #define MSG_UBL_DOING_G29 _UxGT("Doing G29 UBL!") + #endif #ifndef MSG_UBL_UNHOMED #define MSG_UBL_UNHOMED _UxGT("Home XYZ first") #endif @@ -173,6 +179,18 @@ #ifndef MSG_UBL_MANUAL_MESH #define MSG_UBL_MANUAL_MESH _UxGT("Manually Build Mesh") #endif + #ifndef MSG_UBL_BC_INSERT + #define MSG_UBL_BC_INSERT _UxGT("Place shim & measure") + #endif + #ifndef MSG_UBL_BC_INSERT2 + #define MSG_UBL_BC_INSERT2 _UxGT("Measure") + #endif + #ifndef MSG_UBL_BC_REMOVE + #define MSG_UBL_BC_REMOVE _UxGT("Remove & measure bed") + #endif + #ifndef MSG_UBL_MOVING_TO_NEXT + #define MSG_UBL_MOVING_TO_NEXT _UxGT("Moving to next") + #endif #ifndef MSG_UBL_ACTIVATE_MESH #define MSG_UBL_ACTIVATE_MESH _UxGT("Activate UBL") #endif @@ -194,6 +212,12 @@ #ifndef MSG_UBL_EDIT_CUSTOM_MESH #define MSG_UBL_EDIT_CUSTOM_MESH _UxGT("Edit Custom Mesh") #endif + #ifndef MSG_UBL_FINE_TUNE_MESH + #define MSG_UBL_FINE_TUNE_MESH _UxGT("Fine Tuning Mesh") + #endif + #ifndef MSG_UBL_DONE_EDITING_MESH + #define MSG_UBL_DONE_EDITING_MESH _UxGT("Done Editing Mesh") + #endif #ifndef MSG_UBL_BUILD_CUSTOM_MESH #define MSG_UBL_BUILD_CUSTOM_MESH _UxGT("Build Custom Mesh") #endif @@ -299,6 +323,15 @@ #ifndef MSG_UBL_SAVE_MESH #define MSG_UBL_SAVE_MESH _UxGT("Save Bed Mesh") #endif + #ifndef MSG_UBL_SAVE_ERROR + #define MSG_UBL_SAVE_ERROR _UxGT("save_UBL_active() error") + #endif + #ifndef MSG_UBL_RESTORE_ERROR + #define MSG_UBL_RESTORE_ERROR _UxGT("restore_UBL_active() error") + #endif + #ifndef MSG_UBL_Z_OFFSET_STOPPED + #define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Z-Offset Stopped") + #endif #endif // AUTO_BED_LEVELING_UBL #ifndef MSG_MOVING diff --git a/Marlin/ubl_G29.cpp b/Marlin/ubl_G29.cpp index ab0ac32cb..063475e9e 100644 --- a/Marlin/ubl_G29.cpp +++ b/Marlin/ubl_G29.cpp @@ -713,7 +713,7 @@ if (ELAPSED(millis(), nxt)) { SERIAL_PROTOCOLLNPGM("\nZ-Offset Adjustment Stopped."); do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE); - LCD_MESSAGEPGM("Z-Offset Stopped"); // TODO: Make translatable string + LCD_MESSAGEPGM(MSG_UBL_Z_OFFSET_STOPPED); restore_ubl_active_state_and_leave(); goto LEAVE; } @@ -971,7 +971,7 @@ stepper.synchronize(); SERIAL_PROTOCOLPGM("Place shim under nozzle"); - LCD_MESSAGEPGM("Place shim & measure"); // TODO: Make translatable string + LCD_MESSAGEPGM(MSG_UBL_BC_INSERT); lcd_return_to_status(); echo_and_take_a_measurement(); @@ -980,7 +980,7 @@ stepper.synchronize(); SERIAL_PROTOCOLPGM("Remove shim"); - LCD_MESSAGEPGM("Remove & measure bed"); // TODO: Make translatable string + LCD_MESSAGEPGM(MSG_UBL_BC_REMOVE); echo_and_take_a_measurement(); const float z2 = measure_point_with_encoder(); @@ -1029,7 +1029,7 @@ do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES); - LCD_MESSAGEPGM("Moving to next"); // TODO: Make translatable string + LCD_MESSAGEPGM(MSG_UBL_MOVING_TO_NEXT); do_blocking_move_to_xy(xProbe, yProbe); do_blocking_move_to_z(z_clearance); @@ -1039,7 +1039,7 @@ if (do_ubl_mesh_map) display_map(g29_map_type); // show user where we're probing - serialprintPGM(parser.seen('B') ? PSTR("Place shim & measure") : PSTR("Measure")); // TODO: Make translatable strings + serialprintPGM(parser.seen('B') ? PSTR(MSG_UBL_BC_INSERT) : PSTR(MSG_UBL_BC_INSERT2)); const float z_step = 0.01; // existing behavior: 0.01mm per click, occasionally step //const float z_step = 1.0 / planner.axis_steps_per_mm[Z_AXIS]; // approx one step each click @@ -1097,7 +1097,7 @@ bool err_flag = false; #if ENABLED(NEWPANEL) - LCD_MESSAGEPGM("Doing G29 UBL!"); // TODO: Make translatable string + LCD_MESSAGEPGM(MSG_UBL_DOING_G29); lcd_quick_feedback(); #endif @@ -1207,7 +1207,7 @@ SERIAL_ECHOLNPGM("save_ubl_active_state_and_disabled() called multiple times in a row."); #if ENABLED(NEWPANEL) - LCD_MESSAGEPGM("save_UBL_active() error"); // TODO: Make translatable string + LCD_MESSAGEPGM(MSG_UBL_SAVE_ERROR); lcd_quick_feedback(); #endif @@ -1222,7 +1222,7 @@ SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times."); #if ENABLED(NEWPANEL) - LCD_MESSAGEPGM("restore_UBL_active() error"); // TODO: Make translatable string + LCD_MESSAGEPGM(MSG_UBL_RESTORE_ERROR); lcd_quick_feedback(); #endif @@ -1476,7 +1476,7 @@ memset(not_done, 0xFF, sizeof(not_done)); - LCD_MESSAGEPGM("Fine Tuning Mesh"); // TODO: Make translatable string + LCD_MESSAGEPGM(MSG_UBL_FINE_TUNE_MESH); do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES); do_blocking_move_to_xy(lx, ly); @@ -1538,7 +1538,7 @@ lcd_return_to_status(); //SERIAL_PROTOCOLLNPGM("\nFine Tuning of Mesh Stopped."); do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES); - LCD_MESSAGEPGM("Mesh Editing Stopped"); // TODO: Make translatable string + LCD_MESSAGEPGM(MSG_EDITING_STOPPED); while (ubl_lcd_clicked()) idle(); @@ -1565,7 +1565,7 @@ do_blocking_move_to_xy(lx, ly); - LCD_MESSAGEPGM("Done Editing Mesh"); // TODO: Make translatable string + LCD_MESSAGEPGM(MSG_UBL_DONE_EDITING_MESH); SERIAL_ECHOLNPGM("Done Editing Mesh"); } #endif