|
|
@@ -604,7 +604,7 @@ static void lcd_status_screen()
|
|
|
|
|
|
/*if (farm_mode && !printer_connected) {
|
|
|
lcd.setCursor(0, 3);
|
|
|
- lcd_printPGM(MSG_PRINTER_DISCONNECTED);
|
|
|
+ lcd_printPGM(_i("Printer disconnected"));////MSG_PRINTER_DISCONNECTED c=20 r=1
|
|
|
}*/
|
|
|
|
|
|
|
|
|
@@ -639,7 +639,7 @@ void lcd_commands()
|
|
|
}
|
|
|
}
|
|
|
if (lcd_commands_step == 1 && !blocks_queued() && !homing_flag) {
|
|
|
- lcd_setstatuspgm(MSG_PRINT_PAUSED);
|
|
|
+ lcd_setstatuspgm(_i("Print paused"));////MSG_PRINT_PAUSED c=20 r=1
|
|
|
isPrintPaused = true;
|
|
|
long_pause();
|
|
|
lcd_commands_type = 0;
|
|
|
@@ -703,7 +703,7 @@ void lcd_commands()
|
|
|
strcat(cmd1, ftostr32(pause_lastpos[Y_AXIS]));
|
|
|
enquecommand(cmd1);
|
|
|
|
|
|
- lcd_setstatuspgm(MSG_RESUMING_PRINT);
|
|
|
+ lcd_setstatuspgm(_i("Resuming print"));////MSG_RESUMING_PRINT c=20 r=1
|
|
|
lcd_commands_step = 3;
|
|
|
}
|
|
|
}
|
|
|
@@ -1363,13 +1363,13 @@ void lcd_commands()
|
|
|
strcpy(cmd1, "M303 E0 S");
|
|
|
strcat(cmd1, ftostr3(pid_temp));
|
|
|
enquecommand(cmd1);
|
|
|
- lcd_setstatuspgm(MSG_PID_RUNNING);
|
|
|
+ lcd_setstatuspgm(_i("PID cal. "));////MSG_PID_RUNNING c=20 r=1
|
|
|
lcd_commands_step = 2;
|
|
|
}
|
|
|
if (lcd_commands_step == 2 && pid_tuning_finished) { //saving to eeprom
|
|
|
pid_tuning_finished = false;
|
|
|
custom_message_state = 0;
|
|
|
- lcd_setstatuspgm(MSG_PID_FINISHED);
|
|
|
+ lcd_setstatuspgm(_i("PID cal. finished"));////MSG_PID_FINISHED c=20 r=1
|
|
|
if (_Kp != 0 || _Ki != 0 || _Kd != 0) {
|
|
|
strcpy(cmd1, "M301 P");
|
|
|
strcat(cmd1, ftostr32(_Kp));
|
|
|
@@ -1534,7 +1534,7 @@ static void lcd_menu_extruder_info()
|
|
|
// Display Nozzle fan RPM
|
|
|
|
|
|
lcd.setCursor(0, 0);
|
|
|
- lcd_printPGM(MSG_INFO_NOZZLE_FAN);
|
|
|
+ lcd_printPGM(_i("Nozzle FAN:"));////MSG_INFO_NOZZLE_FAN c=11 r=1
|
|
|
|
|
|
lcd.setCursor(11, 0);
|
|
|
lcd.print(" ");
|
|
|
@@ -1546,7 +1546,7 @@ static void lcd_menu_extruder_info()
|
|
|
|
|
|
#if (defined(TACH_1))
|
|
|
lcd.setCursor(0, 1);
|
|
|
- lcd_printPGM(MSG_INFO_PRINT_FAN);
|
|
|
+ lcd_printPGM(_i("Print FAN: "));////MSG_INFO_PRINT_FAN c=11 r=1
|
|
|
|
|
|
lcd.setCursor(11, 1);
|
|
|
lcd.print(" ");
|
|
|
@@ -1817,15 +1817,15 @@ static void lcd_support_menu()
|
|
|
MENU_ITEM(back, PSTR("FW - " FW_version), 0);
|
|
|
}*/
|
|
|
|
|
|
- MENU_ITEM(back, MSG_PRUSA3D, 0);
|
|
|
- MENU_ITEM(back, MSG_PRUSA3D_FORUM, 0);
|
|
|
- MENU_ITEM(back, MSG_PRUSA3D_HOWTO, 0);
|
|
|
+ MENU_ITEM(back, _i("prusa3d.com"), 0);////MSG_PRUSA3D c=0 r=0
|
|
|
+ MENU_ITEM(back, _i("forum.prusa3d.com"), 0);////MSG_PRUSA3D_FORUM c=0 r=0
|
|
|
+ MENU_ITEM(back, _i("howto.prusa3d.com"), 0);////MSG_PRUSA3D_HOWTO c=0 r=0
|
|
|
MENU_ITEM(back, PSTR("------------"), 0);
|
|
|
MENU_ITEM(back, PSTR(FILAMENT_SIZE), 0);
|
|
|
MENU_ITEM(back, PSTR(ELECTRONICS),0);
|
|
|
MENU_ITEM(back, PSTR(NOZZLE_TYPE),0);
|
|
|
MENU_ITEM(back, PSTR("------------"), 0);
|
|
|
- MENU_ITEM(back, MSG_DATE, 0);
|
|
|
+ MENU_ITEM(back, _i("Date:"), 0);////MSG_DATE c=17 r=1
|
|
|
MENU_ITEM(back, PSTR(__DATE__), 0);
|
|
|
|
|
|
// Show the FlashAir IP address, if the card is available.
|
|
|
@@ -1836,17 +1836,17 @@ static void lcd_support_menu()
|
|
|
}
|
|
|
#ifndef MK1BP
|
|
|
MENU_ITEM(back, PSTR("------------"), 0);
|
|
|
- MENU_ITEM(submenu, MSG_XYZ_DETAILS, lcd_menu_xyz_y_min);
|
|
|
- MENU_ITEM(submenu, MSG_INFO_EXTRUDER, lcd_menu_extruder_info);
|
|
|
+ MENU_ITEM(submenu, _i("XYZ cal. details"), lcd_menu_xyz_y_min);////MSG_XYZ_DETAILS c=19 r=1
|
|
|
+ MENU_ITEM(submenu, _i("Extruder info"), lcd_menu_extruder_info);////MSG_INFO_EXTRUDER c=15 r=1
|
|
|
|
|
|
#ifdef TMC2130
|
|
|
- MENU_ITEM(submenu, MSG_MENU_BELT_STATUS, lcd_menu_belt_status);
|
|
|
+ MENU_ITEM(submenu, _i("Belt status"), lcd_menu_belt_status);////MSG_MENU_BELT_STATUS c=15 r=1
|
|
|
#endif //TMC2130
|
|
|
|
|
|
- MENU_ITEM(submenu, MSG_MENU_TEMPERATURES, lcd_menu_temperatures);
|
|
|
+ MENU_ITEM(submenu, _i("Temperatures"), lcd_menu_temperatures);////MSG_MENU_TEMPERATURES c=15 r=1
|
|
|
|
|
|
#if defined (VOLT_BED_PIN) || defined (VOLT_PWR_PIN)
|
|
|
- MENU_ITEM(submenu, MSG_MENU_VOLTAGES, lcd_menu_voltages);
|
|
|
+ MENU_ITEM(submenu, _i("Voltages"), lcd_menu_voltages);////MSG_MENU_VOLTAGES c=15 r=1
|
|
|
#endif //defined VOLT_BED_PIN || defined VOLT_PWR_PIN
|
|
|
|
|
|
#ifdef DEBUG_BUILD
|
|
|
@@ -1897,7 +1897,7 @@ void lcd_change_filament() {
|
|
|
|
|
|
lcd.setCursor(0, 1);
|
|
|
|
|
|
- lcd_printPGM(MSG_CHANGING_FILAMENT);
|
|
|
+ lcd_printPGM(_i("Changing filament!"));////MSG_CHANGING_FILAMENT c=20 r=0
|
|
|
|
|
|
|
|
|
}
|
|
|
@@ -1909,12 +1909,12 @@ void lcd_wait_interact() {
|
|
|
|
|
|
lcd.setCursor(0, 1);
|
|
|
#ifdef SNMM
|
|
|
- lcd_printPGM(MSG_PREPARE_FILAMENT);
|
|
|
+ lcd_printPGM(_i("Prepare new filament"));////MSG_PREPARE_FILAMENT c=20 r=1
|
|
|
#else
|
|
|
- lcd_printPGM(MSG_INSERT_FILAMENT);
|
|
|
+ lcd_printPGM(_i("Insert filament"));////MSG_INSERT_FILAMENT c=20 r=0
|
|
|
#endif
|
|
|
lcd.setCursor(0, 2);
|
|
|
- lcd_printPGM(MSG_PRESS);
|
|
|
+ lcd_printPGM(_i("and press the knob"));////MSG_PRESS c=20 r=0
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -1925,7 +1925,7 @@ void lcd_change_success() {
|
|
|
|
|
|
lcd.setCursor(0, 2);
|
|
|
|
|
|
- lcd_printPGM(MSG_CHANGE_SUCCESS);
|
|
|
+ lcd_printPGM(_i("Change success!"));////MSG_CHANGE_SUCCESS c=0 r=0
|
|
|
|
|
|
|
|
|
}
|
|
|
@@ -1937,7 +1937,7 @@ void lcd_loading_color() {
|
|
|
|
|
|
lcd.setCursor(0, 0);
|
|
|
|
|
|
- lcd_printPGM(MSG_LOADING_COLOR);
|
|
|
+ lcd_printPGM(_i("Loading color"));////MSG_LOADING_COLOR c=0 r=0
|
|
|
lcd.setCursor(0, 2);
|
|
|
lcd_printPGM(MSG_PLEASE_WAIT);
|
|
|
|
|
|
@@ -2004,7 +2004,7 @@ void lcd_alright() {
|
|
|
|
|
|
lcd.setCursor(0, 0);
|
|
|
|
|
|
- lcd_printPGM(MSG_CORRECTLY);
|
|
|
+ lcd_printPGM(_i("Changed correctly?"));////MSG_CORRECTLY c=20 r=0
|
|
|
|
|
|
lcd.setCursor(1, 1);
|
|
|
|
|
|
@@ -2012,11 +2012,11 @@ void lcd_alright() {
|
|
|
|
|
|
lcd.setCursor(1, 2);
|
|
|
|
|
|
- lcd_printPGM(MSG_NOT_LOADED);
|
|
|
+ lcd_printPGM(_i("Filament not loaded"));////MSG_NOT_LOADED c=19 r=0
|
|
|
|
|
|
|
|
|
lcd.setCursor(1, 3);
|
|
|
- lcd_printPGM(MSG_NOT_COLOR);
|
|
|
+ lcd_printPGM(_i("Color not correct"));////MSG_NOT_COLOR c=0 r=0
|
|
|
|
|
|
|
|
|
lcd.setCursor(0, 1);
|
|
|
@@ -2087,7 +2087,7 @@ static void lcd_menu_AutoLoadFilament()
|
|
|
if (degHotend0() > EXTRUDE_MINTEMP)
|
|
|
{
|
|
|
uint8_t nlines;
|
|
|
- lcd_display_message_fullscreen_nonBlocking_P(MSG_AUTOLOADING_ENABLED,nlines);
|
|
|
+ lcd_display_message_fullscreen_nonBlocking_P(_i("Autoloading filament is active, just press the knob and insert filament..."),nlines);////MSG_AUTOLOADING_ENABLED c=20 r=4
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -2140,7 +2140,7 @@ void lcd_menu_statistics()
|
|
|
int _s = _t - ((_h * 3600) + (_m * 60));
|
|
|
|
|
|
lcd.setCursor(0, 0);
|
|
|
- lcd_printPGM(MSG_STATS_FILAMENTUSED);
|
|
|
+ lcd_printPGM(_i("Filament used: "));////MSG_STATS_FILAMENTUSED c=20 r=0
|
|
|
|
|
|
lcd.setCursor(6, 1);
|
|
|
lcd.print(itostr3(_met));
|
|
|
@@ -2149,7 +2149,7 @@ void lcd_menu_statistics()
|
|
|
lcd.print("cm");
|
|
|
|
|
|
lcd.setCursor(0, 2);
|
|
|
- lcd_printPGM(MSG_STATS_PRINTTIME);
|
|
|
+ lcd_printPGM(_i("Print time: "));////MSG_STATS_PRINTTIME c=20 r=0
|
|
|
|
|
|
lcd.setCursor(8, 3);
|
|
|
lcd.print(itostr2(_h));
|
|
|
@@ -2184,7 +2184,7 @@ void lcd_menu_statistics()
|
|
|
lcd_implementation_clear();
|
|
|
|
|
|
lcd.setCursor(0, 0);
|
|
|
- lcd_printPGM(MSG_STATS_TOTALFILAMENT);
|
|
|
+ lcd_printPGM(_i("Total filament :"));////MSG_STATS_TOTALFILAMENT c=20 r=0
|
|
|
lcd.setCursor(17 - strlen(ftostr32ns(_filament_m)), 1);
|
|
|
lcd.print(ftostr32ns(_filament_m));
|
|
|
|
|
|
@@ -2201,7 +2201,7 @@ void lcd_menu_statistics()
|
|
|
lcd.print("m");
|
|
|
|
|
|
lcd.setCursor(0, 2);
|
|
|
- lcd_printPGM(MSG_STATS_TOTALPRINTTIME);;
|
|
|
+ lcd_printPGM(_i("Total print time :"));;////MSG_STATS_TOTALPRINTTIME c=20 r=0
|
|
|
|
|
|
lcd.setCursor(18, 3);
|
|
|
lcd.print("m");
|
|
|
@@ -2304,10 +2304,10 @@ static void lcd_move_e()
|
|
|
static void lcd_menu_xyz_y_min()
|
|
|
{
|
|
|
lcd.setCursor(0,0);
|
|
|
- lcd_printPGM(MSG_Y_DISTANCE_FROM_MIN);
|
|
|
+ lcd_printPGM(_i("Y distance from min:"));////MSG_Y_DISTANCE_FROM_MIN c=20 r=1
|
|
|
lcd_print_at_PGM(0, 1, separator);
|
|
|
- lcd_print_at_PGM(0, 2, MSG_LEFT);
|
|
|
- lcd_print_at_PGM(0, 3, MSG_RIGHT);
|
|
|
+ lcd_print_at_PGM(0, 2, _i("Left:"));////MSG_LEFT c=12 r=1
|
|
|
+ lcd_print_at_PGM(0, 3, _i("Right:"));////MSG_RIGHT c=12 r=1
|
|
|
|
|
|
float distanceMin[2];
|
|
|
count_xyz_details(distanceMin);
|
|
|
@@ -2333,18 +2333,18 @@ static void lcd_menu_xyz_skew()
|
|
|
angleDiff = eeprom_read_float((float*)(EEPROM_XYZ_CAL_SKEW));
|
|
|
|
|
|
lcd.setCursor(0,0);
|
|
|
- lcd_printPGM(MSG_MEASURED_SKEW);
|
|
|
+ lcd_printPGM(_i("Measured skew:"));////MSG_MEASURED_SKEW c=15 r=1
|
|
|
if (angleDiff < 100) {
|
|
|
lcd.setCursor(15, 0);
|
|
|
lcd.print(angleDiff * 180 / M_PI);
|
|
|
lcd.print(LCD_STR_DEGREE);
|
|
|
}else lcd_print_at_PGM(16, 0, PSTR("N/A"));
|
|
|
lcd_print_at_PGM(0, 1, separator);
|
|
|
- lcd_print_at_PGM(0, 2, MSG_SLIGHT_SKEW);
|
|
|
+ lcd_print_at_PGM(0, 2, _i("Slight skew:"));////MSG_SLIGHT_SKEW c=15 r=1
|
|
|
lcd_print_at_PGM(15, 2, PSTR(""));
|
|
|
lcd.print(bed_skew_angle_mild * 180 / M_PI);
|
|
|
lcd.print(LCD_STR_DEGREE);
|
|
|
- lcd_print_at_PGM(0, 3, MSG_SEVERE_SKEW);
|
|
|
+ lcd_print_at_PGM(0, 3, _i("Severe skew:"));////MSG_SEVERE_SKEW c=15 r=1
|
|
|
lcd_print_at_PGM(15, 3, PSTR(""));
|
|
|
lcd.print(bed_skew_angle_extreme * 180 / M_PI);
|
|
|
lcd.print(LCD_STR_DEGREE);
|
|
|
@@ -2360,7 +2360,7 @@ static void lcd_menu_xyz_skew()
|
|
|
static void lcd_menu_xyz_offset()
|
|
|
{
|
|
|
lcd.setCursor(0,0);
|
|
|
- lcd_printPGM(MSG_MEASURED_OFFSET);
|
|
|
+ lcd_printPGM(_i("[0;0] point offset"));////MSG_MEASURED_OFFSET c=0 r=0
|
|
|
lcd_print_at_PGM(0, 1, separator);
|
|
|
lcd_print_at_PGM(0, 2, PSTR("X"));
|
|
|
lcd_print_at_PGM(0, 3, PSTR("Y"));
|
|
|
@@ -2479,13 +2479,13 @@ static void _lcd_babystep(int axis, const char *msg)
|
|
|
}
|
|
|
|
|
|
static void lcd_babystep_x() {
|
|
|
- _lcd_babystep(X_AXIS, (MSG_BABYSTEPPING_X));
|
|
|
+ _lcd_babystep(X_AXIS, (_i("Babystepping X")));////MSG_BABYSTEPPING_X c=0 r=0
|
|
|
}
|
|
|
static void lcd_babystep_y() {
|
|
|
- _lcd_babystep(Y_AXIS, (MSG_BABYSTEPPING_Y));
|
|
|
+ _lcd_babystep(Y_AXIS, (_i("Babystepping Y")));////MSG_BABYSTEPPING_Y c=0 r=0
|
|
|
}
|
|
|
static void lcd_babystep_z() {
|
|
|
- _lcd_babystep(Z_AXIS, (MSG_BABYSTEPPING_Z));
|
|
|
+ _lcd_babystep(Z_AXIS, (_i("Adjusting Z")));////MSG_BABYSTEPPING_Z c=20 r=0
|
|
|
}
|
|
|
|
|
|
static void lcd_adjust_bed();
|
|
|
@@ -2561,11 +2561,11 @@ static void lcd_adjust_bed()
|
|
|
|
|
|
START_MENU();
|
|
|
MENU_ITEM(back, MSG_SETTINGS, 0);
|
|
|
- MENU_ITEM_EDIT(int3, MSG_BED_CORRECTION_LEFT, &menuData.adjustBed.left2, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);
|
|
|
- MENU_ITEM_EDIT(int3, MSG_BED_CORRECTION_RIGHT, &menuData.adjustBed.right2, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);
|
|
|
- MENU_ITEM_EDIT(int3, MSG_BED_CORRECTION_FRONT, &menuData.adjustBed.front2, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);
|
|
|
- MENU_ITEM_EDIT(int3, MSG_BED_CORRECTION_REAR, &menuData.adjustBed.rear2, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);
|
|
|
- MENU_ITEM(function, MSG_BED_CORRECTION_RESET, lcd_adjust_bed_reset);
|
|
|
+ MENU_ITEM_EDIT(int3, _i("Left side [um]"), &menuData.adjustBed.left2, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_LEFT c=14 r=1
|
|
|
+ MENU_ITEM_EDIT(int3, _i("Right side[um]"), &menuData.adjustBed.right2, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_RIGHT c=14 r=1
|
|
|
+ MENU_ITEM_EDIT(int3, _i("Front side[um]"), &menuData.adjustBed.front2, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_FRONT c=14 r=1
|
|
|
+ MENU_ITEM_EDIT(int3, _i("Rear side [um]"), &menuData.adjustBed.rear2, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_REAR c=14 r=1
|
|
|
+ MENU_ITEM(function, _i("Reset"), lcd_adjust_bed_reset);////MSG_BED_CORRECTION_RESET c=0 r=0
|
|
|
END_MENU();
|
|
|
}
|
|
|
|
|
|
@@ -2573,7 +2573,7 @@ void pid_extruder() {
|
|
|
|
|
|
lcd_implementation_clear();
|
|
|
lcd.setCursor(1, 0);
|
|
|
- lcd_printPGM(MSG_SET_TEMPERATURE);
|
|
|
+ lcd_printPGM(_i("Set temperature:"));////MSG_SET_TEMPERATURE c=19 r=1
|
|
|
pid_temp += int(encoderPosition);
|
|
|
if (pid_temp > HEATER_0_MAXTEMP) pid_temp = HEATER_0_MAXTEMP;
|
|
|
if (pid_temp < HEATER_0_MINTEMP) pid_temp = HEATER_0_MINTEMP;
|
|
|
@@ -2598,7 +2598,7 @@ void lcd_adjust_z() {
|
|
|
|
|
|
lcd_implementation_clear();
|
|
|
lcd.setCursor(0, 0);
|
|
|
- lcd_printPGM(MSG_ADJUSTZ);
|
|
|
+ lcd_printPGM(_i("Auto adjust Z?"));////MSG_ADJUSTZ c=0 r=0
|
|
|
lcd.setCursor(1, 1);
|
|
|
lcd_printPGM(MSG_YES);
|
|
|
|
|
|
@@ -2681,7 +2681,7 @@ bool lcd_wait_for_pinda(float temp) {
|
|
|
bool target_temp_reached = true;
|
|
|
|
|
|
while (current_temperature_pinda > temp){
|
|
|
- lcd_display_message_fullscreen_P(MSG_WAITING_TEMP_PINDA);
|
|
|
+ lcd_display_message_fullscreen_P(_i("Waiting for PINDA probe cooling"));////MSG_WAITING_TEMP_PINDA c=20 r=3
|
|
|
|
|
|
lcd.setCursor(0, 4);
|
|
|
lcd.print(LCD_STR_THERMOMETER[0]);
|
|
|
@@ -2717,7 +2717,7 @@ void lcd_wait_for_cool_down() {
|
|
|
setTargetHotend(0,0);
|
|
|
setTargetBed(0);
|
|
|
while ((degHotend(0)>MAX_HOTEND_TEMP_CALIBRATION) || (degBed() > MAX_BED_TEMP_CALIBRATION)) {
|
|
|
- lcd_display_message_fullscreen_P(MSG_WAITING_TEMP);
|
|
|
+ lcd_display_message_fullscreen_P(_i("Waiting for nozzle and bed cooling"));////MSG_WAITING_TEMP c=20 r=3
|
|
|
|
|
|
lcd.setCursor(0, 4);
|
|
|
lcd.print(LCD_STR_THERMOMETER[0]);
|
|
|
@@ -2754,7 +2754,7 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z)
|
|
|
// Until confirmed by the confirmation dialog.
|
|
|
for (;;) {
|
|
|
unsigned long previous_millis_cmd = millis();
|
|
|
- const char *msg = only_z ? MSG_MOVE_CARRIAGE_TO_THE_TOP_Z : MSG_MOVE_CARRIAGE_TO_THE_TOP;
|
|
|
+ const char *msg = only_z ? _i("Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done.") : _i("Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done.");////MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8////MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8
|
|
|
const char *msg_next = lcd_display_message_fullscreen_P(msg);
|
|
|
const bool multi_screen = msg_next != NULL;
|
|
|
unsigned long previous_millis_msg = millis();
|
|
|
@@ -2801,7 +2801,7 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z)
|
|
|
|
|
|
|
|
|
// Let the user confirm, that the Z carriage is at the top end stoppers.
|
|
|
- int8_t result = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_CONFIRM_CARRIAGE_AT_THE_TOP, false);
|
|
|
+ int8_t result = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Are left and right Z~carriages all up?"), false);////MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2
|
|
|
if (result == -1)
|
|
|
goto canceled;
|
|
|
else if (result == 1)
|
|
|
@@ -3117,31 +3117,31 @@ void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, ui
|
|
|
{
|
|
|
const char *msg = NULL;
|
|
|
if (result == BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND) {
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND);
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("XYZ calibration failed. Bed calibration point was not found."));////MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=8
|
|
|
} else if (result == BED_SKEW_OFFSET_DETECTION_FITTING_FAILED) {
|
|
|
if (point_too_far_mask == 0)
|
|
|
msg = MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED;
|
|
|
else if (point_too_far_mask == 2 || point_too_far_mask == 7)
|
|
|
// Only the center point or all the three front points.
|
|
|
- msg = MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR;
|
|
|
+ msg = _i("XYZ calibration failed. Front calibration points not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=8
|
|
|
else if (point_too_far_mask & 1 == 0)
|
|
|
// The right and maybe the center point out of reach.
|
|
|
- msg = MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR;
|
|
|
+ msg = _i("XYZ calibration failed. Right front calibration point not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=8
|
|
|
else
|
|
|
// The left and maybe the center point out of reach.
|
|
|
- msg = MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_LEFT_FAR;
|
|
|
+ msg = _i("XYZ calibration failed. Left front calibration point not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_LEFT_FAR c=20 r=8
|
|
|
lcd_show_fullscreen_message_and_wait_P(msg);
|
|
|
} else {
|
|
|
if (point_too_far_mask != 0) {
|
|
|
if (point_too_far_mask == 2 || point_too_far_mask == 7)
|
|
|
// Only the center point or all the three front points.
|
|
|
- msg = MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR;
|
|
|
+ msg = _i("XYZ calibration compromised. Front calibration points not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8
|
|
|
else if (point_too_far_mask & 1 == 0)
|
|
|
// The right and maybe the center point out of reach.
|
|
|
- msg = MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR;
|
|
|
+ msg = _i("XYZ calibration compromised. Right front calibration point not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8
|
|
|
else
|
|
|
// The left and maybe the center point out of reach.
|
|
|
- msg = MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR;
|
|
|
+ msg = _i("XYZ calibration compromised. Left front calibration point not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8
|
|
|
lcd_show_fullscreen_message_and_wait_P(msg);
|
|
|
}
|
|
|
if (point_too_far_mask == 0 || result > 0) {
|
|
|
@@ -3151,13 +3151,13 @@ void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, ui
|
|
|
msg = MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED;
|
|
|
break;
|
|
|
case BED_SKEW_OFFSET_DETECTION_PERFECT:
|
|
|
- msg = MSG_BED_SKEW_OFFSET_DETECTION_PERFECT;
|
|
|
+ msg = _i("XYZ calibration ok. X/Y axes are perpendicular. Congratulations!");////MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8
|
|
|
break;
|
|
|
case BED_SKEW_OFFSET_DETECTION_SKEW_MILD:
|
|
|
- msg = MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD;
|
|
|
+ msg = _i("XYZ calibration all right. X/Y axes are slightly skewed. Good job!");////MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8
|
|
|
break;
|
|
|
case BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME:
|
|
|
- msg = MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME;
|
|
|
+ msg = _i("XYZ calibration all right. Skew will be corrected automatically.");////MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8
|
|
|
break;
|
|
|
}
|
|
|
lcd_show_fullscreen_message_and_wait_P(msg);
|
|
|
@@ -3187,7 +3187,7 @@ void lcd_temp_cal_show_result(bool result) {
|
|
|
else {
|
|
|
eeprom_update_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA, 0);
|
|
|
SERIAL_ECHOLNPGM("Temperature calibration failed. Continue with pressing the knob.");
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_TEMP_CAL_FAILED);
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("Temperature calibration failed"));////MSG_TEMP_CAL_FAILED c=20 r=8
|
|
|
temp_cal_active = false;
|
|
|
eeprom_update_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE, 0);
|
|
|
}
|
|
|
@@ -3461,7 +3461,7 @@ void lcd_pick_babystep(){
|
|
|
|
|
|
lcd.setCursor(0, 0);
|
|
|
|
|
|
- lcd_printPGM(MSG_PICK_Z);
|
|
|
+ lcd_printPGM(_i("Pick print"));////MSG_PICK_Z c=0 r=0
|
|
|
|
|
|
|
|
|
lcd.setCursor(3, 2);
|
|
|
@@ -3555,10 +3555,10 @@ void lcd_move_menu_axis()
|
|
|
{
|
|
|
START_MENU();
|
|
|
MENU_ITEM(back, MSG_SETTINGS, 0);
|
|
|
- MENU_ITEM(submenu, MSG_MOVE_X, lcd_move_x);
|
|
|
- MENU_ITEM(submenu, MSG_MOVE_Y, lcd_move_y);
|
|
|
- MENU_ITEM(submenu, MSG_MOVE_Z, lcd_move_z);
|
|
|
- MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e);
|
|
|
+ MENU_ITEM(submenu, _i("Move X"), lcd_move_x);////MSG_MOVE_X c=0 r=0
|
|
|
+ MENU_ITEM(submenu, _i("Move Y"), lcd_move_y);////MSG_MOVE_Y c=0 r=0
|
|
|
+ MENU_ITEM(submenu, _i("Move Z"), lcd_move_z);////MSG_MOVE_Z c=0 r=0
|
|
|
+ MENU_ITEM(submenu, _i("Extruder"), lcd_move_e);////MSG_MOVE_E c=0 r=0
|
|
|
END_MENU();
|
|
|
}
|
|
|
|
|
|
@@ -3611,7 +3611,7 @@ static void lcd_crash_mode_info()
|
|
|
static uint32_t tim = 0;
|
|
|
if ((tim + 1000) < millis())
|
|
|
{
|
|
|
- fputs_P(MSG_CRASH_DET_ONLY_IN_NORMAL, lcdout);
|
|
|
+ fputs_P(_i("[2JCrash detection can[1;0Hbe turned on only in[2;0HNormal mode"), lcdout);////MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4
|
|
|
tim = millis();
|
|
|
}
|
|
|
if (lcd_clicked())
|
|
|
@@ -3624,7 +3624,7 @@ static void lcd_crash_mode_info2()
|
|
|
static uint32_t tim = 0;
|
|
|
if ((tim + 1000) < millis())
|
|
|
{
|
|
|
- fputs_P(MSG_CRASH_DET_STEALTH_FORCE_OFF, lcdout);
|
|
|
+ fputs_P(_i("[2JWARNING:[1;0HCrash detection[2;0Hdisabled in[3;0HStealth mode"), lcdout);////MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
|
|
|
tim = millis();
|
|
|
}
|
|
|
if (lcd_clicked())
|
|
|
@@ -3635,12 +3635,12 @@ static void lcd_crash_mode_info2()
|
|
|
#ifdef PAT9125
|
|
|
static void lcd_filament_autoload_info()
|
|
|
{
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_AUTOLOADING_ONLY_IF_FSENS_ON);
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("Autoloading filament available only when filament sensor is turned on..."));////MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
|
|
|
}
|
|
|
|
|
|
static void lcd_fsensor_fail()
|
|
|
{
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_FSENS_NOT_RESPONDING);
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("ERROR: Filament sensor is not responding, please check connection."));////MSG_FSENS_NOT_RESPONDING c=20 r=4
|
|
|
}
|
|
|
#endif //PAT9125
|
|
|
|
|
|
@@ -3782,7 +3782,7 @@ void lcd_pinda_calibration_menu()
|
|
|
{
|
|
|
START_MENU();
|
|
|
MENU_ITEM(back, MSG_MENU_CALIBRATION, 0);
|
|
|
- MENU_ITEM(submenu, MSG_CALIBRATE_PINDA, lcd_calibrate_pinda);
|
|
|
+ MENU_ITEM(submenu, _i("Calibrate"), lcd_calibrate_pinda);////MSG_CALIBRATE_PINDA c=17 r=1
|
|
|
END_MENU();
|
|
|
}
|
|
|
|
|
|
@@ -3823,12 +3823,12 @@ void lcd_calibrate_pinda() {
|
|
|
float e_steps_per_unit;
|
|
|
float feedrate = (180 / axis_steps_per_unit[E_AXIS]) * 1; //3 //initial automatic extrusion feedrate (depends on current value of axis_steps_per_unit to avoid too fast extrusion)
|
|
|
float e_shift_calibration = (axis_steps_per_unit[E_AXIS] > 180 ) ? ((180 / axis_steps_per_unit[E_AXIS]) * 70): 70; //length of initial automatic extrusion sequence
|
|
|
- const char *msg_e_cal_knob = MSG_E_CAL_KNOB;
|
|
|
+ const char *msg_e_cal_knob = _i("Rotate knob until mark reaches extruder body. Click when done.");////MSG_E_CAL_KNOB c=20 r=8
|
|
|
const char *msg_next_e_cal_knob = lcd_display_message_fullscreen_P(msg_e_cal_knob);
|
|
|
const bool multi_screen = msg_next_e_cal_knob != NULL;
|
|
|
unsigned long msg_millis;
|
|
|
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_MARK_FIL);
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("Mark filament 100mm from extruder body. Click when done."));////MSG_MARK_FIL c=20 r=8
|
|
|
lcd_implementation_clear();
|
|
|
|
|
|
|
|
|
@@ -3878,7 +3878,7 @@ void lcd_calibrate_pinda() {
|
|
|
//lcd_implementation_drawedit(PSTR("Result"), ftostr31(axis_steps_per_unit[E_AXIS]));
|
|
|
//delay_keep_alive(2000);
|
|
|
delay_keep_alive(500);
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_CLEAN_NOZZLE_E);
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("E calibration finished. Please clean the nozzle. Click when done."));////MSG_CLEAN_NOZZLE_E c=20 r=8
|
|
|
lcd_update_enable(true);
|
|
|
lcdDrawUpdate = 2;
|
|
|
|
|
|
@@ -3912,12 +3912,12 @@ void lcd_toshiba_flash_air_compatibility_toggle()
|
|
|
}
|
|
|
|
|
|
void lcd_v2_calibration() {
|
|
|
- bool loaded = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_PLA_FILAMENT_LOADED, false, true);
|
|
|
+ bool loaded = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is PLA filament loaded?"), false, true);////MSG_PLA_FILAMENT_LOADED c=20 r=2
|
|
|
if (loaded) {
|
|
|
lcd_commands_type = LCD_COMMAND_V2_CAL;
|
|
|
}
|
|
|
else {
|
|
|
- lcd_display_message_fullscreen_P(MSG_PLEASE_LOAD_PLA);
|
|
|
+ lcd_display_message_fullscreen_P(_i("Please load PLA filament first."));////MSG_PLEASE_LOAD_PLA c=20 r=4
|
|
|
for (int i = 0; i < 20; i++) { //wait max. 2s
|
|
|
delay_keep_alive(100);
|
|
|
if (lcd_clicked()) {
|
|
|
@@ -3935,7 +3935,7 @@ void lcd_v2_calibration() {
|
|
|
void lcd_wizard() {
|
|
|
bool result = true;
|
|
|
if (calibration_status() != CALIBRATION_STATUS_ASSEMBLED) {
|
|
|
- result = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_RERUN, false, false);
|
|
|
+ result = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Running Wizard will delete current calibration results and start from the beginning. Continue?"), false, false);////MSG_WIZARD_RERUN c=20 r=7
|
|
|
}
|
|
|
if (result) {
|
|
|
calibration_status_store(CALIBRATION_STATUS_ASSEMBLED);
|
|
|
@@ -3956,7 +3956,7 @@ void lcd_wizard(int state) {
|
|
|
while (!end) {
|
|
|
switch (state) {
|
|
|
case 0: // run wizard?
|
|
|
- wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_WELCOME, false, true);
|
|
|
+ wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"), false, true);////MSG_WIZARD_WELCOME c=20 r=7
|
|
|
if (wizard_event) {
|
|
|
state = 1;
|
|
|
eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1);
|
|
|
@@ -3977,7 +3977,7 @@ void lcd_wizard(int state) {
|
|
|
}
|
|
|
break;
|
|
|
case 2: //selftest
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_SELFTEST);
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("First, I will run the selftest to check most common assembly problems."));////MSG_WIZARD_SELFTEST c=20 r=8
|
|
|
wizard_event = lcd_selftest();
|
|
|
if (wizard_event) {
|
|
|
calibration_status_store(CALIBRATION_STATUS_XYZ_CALIBRATION);
|
|
|
@@ -3986,13 +3986,13 @@ void lcd_wizard(int state) {
|
|
|
else end = true;
|
|
|
break;
|
|
|
case 3: //xyz cal.
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_XYZ_CAL);
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("I will run xyz calibration now. It will take approx. 12 mins."));////MSG_WIZARD_XYZ_CAL c=20 r=8
|
|
|
wizard_event = gcode_M45(false, 0);
|
|
|
if (wizard_event) state = 5;
|
|
|
else end = true;
|
|
|
break;
|
|
|
case 4: //z cal.
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_Z_CAL);
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("I will run z calibration now."));////MSG_WIZARD_Z_CAL c=20 r=8
|
|
|
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_STEEL_SHEET_CHECK, false, false);
|
|
|
if (!wizard_event) lcd_show_fullscreen_message_and_wait_P(MSG_PLACE_STEEL_SHEET);
|
|
|
wizard_event = gcode_M45(true, 0);
|
|
|
@@ -4003,14 +4003,14 @@ void lcd_wizard(int state) {
|
|
|
//start to preheat nozzle and bed to save some time later
|
|
|
setTargetHotend(PLA_PREHEAT_HOTEND_TEMP, 0);
|
|
|
setTargetBed(PLA_PREHEAT_HPB_TEMP);
|
|
|
- wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_WIZARD_FILAMENT_LOADED, false);
|
|
|
+ wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), false);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2
|
|
|
if (wizard_event) state = 8;
|
|
|
else state = 6;
|
|
|
|
|
|
break;
|
|
|
case 6: //waiting for preheat nozzle for PLA;
|
|
|
#ifndef SNMM
|
|
|
- lcd_display_message_fullscreen_P(MSG_WIZARD_WILL_PREHEAT);
|
|
|
+ lcd_display_message_fullscreen_P(_i("Now I will preheat nozzle for PLA."));////MSG_WIZARD_WILL_PREHEAT c=20 r=4
|
|
|
current_position[Z_AXIS] = 100; //move in z axis to make space for loading filament
|
|
|
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 60, active_extruder);
|
|
|
delay_keep_alive(2000);
|
|
|
@@ -4034,7 +4034,7 @@ void lcd_wizard(int state) {
|
|
|
#ifdef PAT9125
|
|
|
fsensor_block();
|
|
|
#endif //PAT9125
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_LOAD_FILAMENT);
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("Please insert PLA filament to the extruder, then press knob to load it."));////MSG_WIZARD_LOAD_FILAMENT c=20 r=8
|
|
|
lcd_update_enable(false);
|
|
|
lcd_implementation_clear();
|
|
|
lcd_print_at_PGM(0, 2, MSG_LOADING_FILAMENT);
|
|
|
@@ -4048,20 +4048,20 @@ void lcd_wizard(int state) {
|
|
|
state = 9;
|
|
|
break;
|
|
|
case 8:
|
|
|
- wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_WIZARD_PLA_FILAMENT, false, true);
|
|
|
+ wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is it PLA filament?"), false, true);////MSG_WIZARD_PLA_FILAMENT c=20 r=2
|
|
|
if (wizard_event) state = 9;
|
|
|
else end = true;
|
|
|
break;
|
|
|
case 9:
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_V2_CAL);
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_V2_CAL_2);
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("Now I will calibrate distance between tip of the nozzle and heatbed surface."));////MSG_WIZARD_V2_CAL c=20 r=8
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration."));////MSG_WIZARD_V2_CAL_2 c=20 r=12
|
|
|
lcd_commands_type = LCD_COMMAND_V2_CAL;
|
|
|
end = true;
|
|
|
break;
|
|
|
case 10: //repeat first layer cal.?
|
|
|
- wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_REPEAT_V2_CAL, false);
|
|
|
+ wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Do you want to repeat last step to readjust distance between nozzle and heatbed?"), false);////MSG_WIZARD_REPEAT_V2_CAL c=20 r=7
|
|
|
if (wizard_event) {
|
|
|
- lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_CLEAN_HEATBED);
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(_i("Please clean heatbed and then press the knob."));////MSG_WIZARD_CLEAN_HEATBED c=20 r=8
|
|
|
state = 9;
|
|
|
}
|
|
|
else {
|
|
|
@@ -4097,7 +4097,7 @@ void lcd_wizard(int state) {
|
|
|
msg = MSG_WIZARD_CALIBRATION_FAILED;
|
|
|
break;
|
|
|
case 8:
|
|
|
- msg = MSG_WIZARD_INSERT_CORRECT_FILAMENT;
|
|
|
+ msg = _i("Please load PLA filament and then resume Wizard by rebooting the printer.");////MSG_WIZARD_INSERT_CORRECT_FILAMENT c=20 r=8
|
|
|
break;
|
|
|
case 9: break; //exit wizard for v2 calibration, which is implemted in lcd_commands (we need lcd_update running)
|
|
|
case 11: //we are finished
|
|
|
@@ -4127,14 +4127,14 @@ static void lcd_settings_menu()
|
|
|
|
|
|
MENU_ITEM(back, MSG_MAIN, lcd_settings_menu_back);
|
|
|
|
|
|
- MENU_ITEM(submenu, MSG_TEMPERATURE, lcd_control_temperature_menu);
|
|
|
+ MENU_ITEM(submenu, _i("Temperature"), lcd_control_temperature_menu);////MSG_TEMPERATURE c=0 r=0
|
|
|
if (!homing_flag)
|
|
|
{
|
|
|
- MENU_ITEM(submenu, MSG_MOVE_AXIS, lcd_move_menu_1mm);
|
|
|
+ MENU_ITEM(submenu, _i("Move axis"), lcd_move_menu_1mm);////MSG_MOVE_AXIS c=0 r=0
|
|
|
}
|
|
|
if (!isPrintPaused)
|
|
|
{
|
|
|
- MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84"));
|
|
|
+ MENU_ITEM(gcode, _i("Disable steppers"), PSTR("M84"));////MSG_DISABLE_STEPPERS c=0 r=0
|
|
|
}
|
|
|
#ifndef TMC2130
|
|
|
if (!farm_mode) { //dont show in menu if we are in farm mode
|
|
|
@@ -4152,7 +4152,7 @@ static void lcd_settings_menu()
|
|
|
if (FSensorStateMenu == 0) {
|
|
|
if (fsensor_not_responding){
|
|
|
// Filament sensor not working
|
|
|
- MENU_ITEM(function, MSG_FSENSOR_NA, lcd_fsensor_state_set);
|
|
|
+ MENU_ITEM(function, _i("Fil. sensor [N/A]"), lcd_fsensor_state_set);////MSG_FSENSOR_NA c=0 r=0
|
|
|
MENU_ITEM(function, MSG_FSENS_AUTOLOAD_NA, lcd_fsensor_fail);
|
|
|
}
|
|
|
else{
|
|
|
@@ -4165,10 +4165,10 @@ static void lcd_settings_menu()
|
|
|
MENU_ITEM(function, MSG_FSENSOR_ON, lcd_fsensor_state_set);
|
|
|
|
|
|
if ((filament_autoload_enabled == true)) {
|
|
|
- MENU_ITEM(function, MSG_FSENS_AUTOLOAD_ON, lcd_set_filament_autoload);
|
|
|
+ MENU_ITEM(function, _i("F. autoload [on]"), lcd_set_filament_autoload);////MSG_FSENS_AUTOLOAD_ON c=17 r=1
|
|
|
}
|
|
|
else {
|
|
|
- MENU_ITEM(function, MSG_FSENS_AUTOLOAD_OFF, lcd_set_filament_autoload);
|
|
|
+ MENU_ITEM(function, _i("F. autoload [off]"), lcd_set_filament_autoload);////MSG_FSENS_AUTOLOAD_OFF c=17 r=1
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -4176,10 +4176,10 @@ static void lcd_settings_menu()
|
|
|
#endif //PAT9125
|
|
|
|
|
|
if (fans_check_enabled == true) {
|
|
|
- MENU_ITEM(function, MSG_FANS_CHECK_ON, lcd_set_fan_check);
|
|
|
+ MENU_ITEM(function, _i("Fans check [on]"), lcd_set_fan_check);////MSG_FANS_CHECK_ON c=17 r=1
|
|
|
}
|
|
|
else {
|
|
|
- MENU_ITEM(function, MSG_FANS_CHECK_OFF, lcd_set_fan_check);
|
|
|
+ MENU_ITEM(function, _i("Fans check [off]"), lcd_set_fan_check);////MSG_FANS_CHECK_OFF c=17 r=1
|
|
|
}
|
|
|
|
|
|
#ifdef TMC2130
|
|
|
@@ -4195,21 +4195,21 @@ static void lcd_settings_menu()
|
|
|
}
|
|
|
else MENU_ITEM(submenu, MSG_CRASHDETECT_NA, lcd_crash_mode_info);
|
|
|
}
|
|
|
- MENU_ITEM_EDIT(wfac, MSG_EXTRUDER_CORRECTION, &tmc2130_wave_fac[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);
|
|
|
+ MENU_ITEM_EDIT(wfac, _i("E-correct"), &tmc2130_wave_fac[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0
|
|
|
#endif //TMC2130
|
|
|
|
|
|
if (temp_cal_active == false) {
|
|
|
- MENU_ITEM(function, MSG_TEMP_CALIBRATION_OFF, lcd_temp_calibration_set);
|
|
|
+ MENU_ITEM(function, _i("Temp. cal. [off]"), lcd_temp_calibration_set);////MSG_TEMP_CALIBRATION_OFF c=20 r=1
|
|
|
}
|
|
|
else {
|
|
|
- MENU_ITEM(function, MSG_TEMP_CALIBRATION_ON, lcd_temp_calibration_set);
|
|
|
+ MENU_ITEM(function, _i("Temp. cal. [on]"), lcd_temp_calibration_set);////MSG_TEMP_CALIBRATION_ON c=20 r=1
|
|
|
}
|
|
|
#ifdef HAS_SECOND_SERIAL_PORT
|
|
|
if (selectedSerialPort == 0) {
|
|
|
- MENU_ITEM(function, MSG_SECOND_SERIAL_OFF, lcd_second_serial_set);
|
|
|
+ MENU_ITEM(function, _i("RPi port [off]"), lcd_second_serial_set);////MSG_SECOND_SERIAL_OFF c=17 r=1
|
|
|
}
|
|
|
else {
|
|
|
- MENU_ITEM(function, MSG_SECOND_SERIAL_ON, lcd_second_serial_set);
|
|
|
+ MENU_ITEM(function, _i("RPi port [on]"), lcd_second_serial_set);////MSG_SECOND_SERIAL_ON c=17 r=1
|
|
|
}
|
|
|
#endif //HAS_SECOND_SERIAL
|
|
|
|
|
|
@@ -4217,12 +4217,12 @@ static void lcd_settings_menu()
|
|
|
{
|
|
|
MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z);
|
|
|
}
|
|
|
- MENU_ITEM(submenu, MSG_LANGUAGE_SELECT, lcd_language_menu);
|
|
|
+ MENU_ITEM(submenu, _i("Select language"), lcd_language_menu);////MSG_LANGUAGE_SELECT c=0 r=0
|
|
|
|
|
|
if (card.ToshibaFlashAir_isEnabled()) {
|
|
|
- MENU_ITEM(function, MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON, lcd_toshiba_flash_air_compatibility_toggle);
|
|
|
+ MENU_ITEM(function, _i("SD card [FlshAir]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1
|
|
|
} else {
|
|
|
- MENU_ITEM(function, MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF, lcd_toshiba_flash_air_compatibility_toggle);
|
|
|
+ MENU_ITEM(function, _i("SD card [normal]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1
|
|
|
}
|
|
|
|
|
|
#ifdef SDCARD_SORT_ALPHA
|
|
|
@@ -4230,9 +4230,9 @@ static void lcd_settings_menu()
|
|
|
uint8_t sdSort;
|
|
|
EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort));
|
|
|
switch (sdSort) {
|
|
|
- case SD_SORT_TIME: MENU_ITEM(function, MSG_SORT_TIME, lcd_sort_type_set); break;
|
|
|
- case SD_SORT_ALPHA: MENU_ITEM(function, MSG_SORT_ALPHA, lcd_sort_type_set); break;
|
|
|
- default: MENU_ITEM(function, MSG_SORT_NONE, lcd_sort_type_set);
|
|
|
+ case SD_SORT_TIME: MENU_ITEM(function, _i("Sort: [Time]"), lcd_sort_type_set); break;////MSG_SORT_TIME c=17 r=1
|
|
|
+ case SD_SORT_ALPHA: MENU_ITEM(function, _i("Sort: [Alphabet]"), lcd_sort_type_set); break;////MSG_SORT_ALPHA c=17 r=1
|
|
|
+ default: MENU_ITEM(function, _i("Sort: [None]"), lcd_sort_type_set);////MSG_SORT_NONE c=17 r=1
|
|
|
}
|
|
|
}
|
|
|
#endif // SDCARD_SORT_ALPHA
|
|
|
@@ -4488,37 +4488,37 @@ static void lcd_calibration_menu()
|
|
|
MENU_ITEM(back, MSG_MAIN, 0);
|
|
|
if (!isPrintPaused)
|
|
|
{
|
|
|
- MENU_ITEM(function, MSG_WIZARD, lcd_wizard);
|
|
|
- MENU_ITEM(submenu, MSG_V2_CALIBRATION, lcd_v2_calibration);
|
|
|
+ MENU_ITEM(function, _i("Wizard"), lcd_wizard);////MSG_WIZARD c=17 r=1
|
|
|
+ MENU_ITEM(submenu, _i("First layer cal."), lcd_v2_calibration);////MSG_V2_CALIBRATION c=17 r=1
|
|
|
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28 W"));
|
|
|
- MENU_ITEM(function, MSG_SELFTEST, lcd_selftest_v);
|
|
|
+ MENU_ITEM(function, _i("Selftest "), lcd_selftest_v);////MSG_SELFTEST c=0 r=0
|
|
|
#ifdef MK1BP
|
|
|
// MK1
|
|
|
// "Calibrate Z"
|
|
|
MENU_ITEM(gcode, MSG_HOMEYZ, PSTR("G28 Z"));
|
|
|
#else //MK1BP
|
|
|
// MK2
|
|
|
- MENU_ITEM(function, MSG_CALIBRATE_BED, lcd_mesh_calibration);
|
|
|
+ MENU_ITEM(function, _i("Calibrate XYZ"), lcd_mesh_calibration);////MSG_CALIBRATE_BED c=0 r=0
|
|
|
// "Calibrate Z" with storing the reference values to EEPROM.
|
|
|
MENU_ITEM(submenu, MSG_HOMEYZ, lcd_mesh_calibration_z);
|
|
|
#ifndef SNMM
|
|
|
- //MENU_ITEM(function, MSG_CALIBRATE_E, lcd_calibrate_extruder);
|
|
|
+ //MENU_ITEM(function, _i("Calibrate E"), lcd_calibrate_extruder);////MSG_CALIBRATE_E c=20 r=1
|
|
|
#endif
|
|
|
// "Mesh Bed Leveling"
|
|
|
- MENU_ITEM(submenu, MSG_MESH_BED_LEVELING, lcd_mesh_bedleveling);
|
|
|
+ MENU_ITEM(submenu, _i("Mesh Bed Leveling"), lcd_mesh_bedleveling);////MSG_MESH_BED_LEVELING c=0 r=0
|
|
|
|
|
|
#endif //MK1BP
|
|
|
- MENU_ITEM(submenu, MSG_BED_CORRECTION_MENU, lcd_adjust_bed);
|
|
|
- MENU_ITEM(submenu, MSG_PID_EXTRUDER, pid_extruder);
|
|
|
- MENU_ITEM(submenu, MSG_SHOW_END_STOPS, menu_show_end_stops);
|
|
|
+ MENU_ITEM(submenu, _i("Bed level correct"), lcd_adjust_bed);////MSG_BED_CORRECTION_MENU c=0 r=0
|
|
|
+ MENU_ITEM(submenu, _i("PID calibration"), pid_extruder);////MSG_PID_EXTRUDER c=17 r=1
|
|
|
+ MENU_ITEM(submenu, _i("Show end stops"), menu_show_end_stops);////MSG_SHOW_END_STOPS c=17 r=1
|
|
|
#ifndef MK1BP
|
|
|
- MENU_ITEM(gcode, MSG_CALIBRATE_BED_RESET, PSTR("M44"));
|
|
|
+ MENU_ITEM(gcode, _i("Reset XYZ calibr."), PSTR("M44"));////MSG_CALIBRATE_BED_RESET c=0 r=0
|
|
|
#endif //MK1BP
|
|
|
#ifndef SNMM
|
|
|
//MENU_ITEM(function, MSG_RESET_CALIBRATE_E, lcd_extr_cal_reset);
|
|
|
#endif
|
|
|
#ifndef MK1BP
|
|
|
- MENU_ITEM(submenu, MSG_CALIBRATION_PINDA_MENU, lcd_pinda_calibration_menu);
|
|
|
+ MENU_ITEM(submenu, _i("Temp. calibration"), lcd_pinda_calibration_menu);////MSG_CALIBRATION_PINDA_MENU c=17 r=1
|
|
|
#endif //MK1BP
|
|
|
}
|
|
|
|
|
|
@@ -4827,8 +4827,8 @@ static char snmm_stop_print_menu() { //menu for choosing which filaments will be
|
|
|
lcd_print_at_PGM(0,0,MSG_UNLOAD_FILAMENT); lcd.print(":");
|
|
|
lcd.setCursor(0, 1); lcd.print(">");
|
|
|
lcd_print_at_PGM(1,1,MSG_ALL);
|
|
|
- lcd_print_at_PGM(1,2,MSG_USED);
|
|
|
- lcd_print_at_PGM(1,3,MSG_CURRENT);
|
|
|
+ lcd_print_at_PGM(1,2,_i("Used during print"));////MSG_USED c=19 r=1
|
|
|
+ lcd_print_at_PGM(1,3,_i("Current"));////MSG_CURRENT c=19 r=1
|
|
|
char cursor_pos = 1;
|
|
|
int enc_dif = 0;
|
|
|
KEEPALIVE_STATE(PAUSED_FOR_USER);
|
|
|
@@ -5361,11 +5361,11 @@ static void fil_load_menu()
|
|
|
{
|
|
|
START_MENU();
|
|
|
MENU_ITEM(back, MSG_MAIN, 0);
|
|
|
- MENU_ITEM(function, MSG_LOAD_ALL, load_all);
|
|
|
- MENU_ITEM(function, MSG_LOAD_FILAMENT_1, extr_adj_0);
|
|
|
- MENU_ITEM(function, MSG_LOAD_FILAMENT_2, extr_adj_1);
|
|
|
- MENU_ITEM(function, MSG_LOAD_FILAMENT_3, extr_adj_2);
|
|
|
- MENU_ITEM(function, MSG_LOAD_FILAMENT_4, extr_adj_3);
|
|
|
+ MENU_ITEM(function, _i("Load all"), load_all);////MSG_LOAD_ALL c=0 r=0
|
|
|
+ MENU_ITEM(function, _i("Load filament 1"), extr_adj_0);////MSG_LOAD_FILAMENT_1 c=17 r=0
|
|
|
+ MENU_ITEM(function, _i("Load filament 2"), extr_adj_1);////MSG_LOAD_FILAMENT_2 c=17 r=0
|
|
|
+ MENU_ITEM(function, _i("Load filament 3"), extr_adj_2);////MSG_LOAD_FILAMENT_3 c=17 r=0
|
|
|
+ MENU_ITEM(function, _i("Load filament 4"), extr_adj_3);////MSG_LOAD_FILAMENT_4 c=17 r=0
|
|
|
|
|
|
END_MENU();
|
|
|
}
|
|
|
@@ -5374,11 +5374,11 @@ static void fil_unload_menu()
|
|
|
{
|
|
|
START_MENU();
|
|
|
MENU_ITEM(back, MSG_MAIN, 0);
|
|
|
- MENU_ITEM(function, MSG_UNLOAD_ALL, extr_unload_all);
|
|
|
- MENU_ITEM(function, MSG_UNLOAD_FILAMENT_1, extr_unload_0);
|
|
|
- MENU_ITEM(function, MSG_UNLOAD_FILAMENT_2, extr_unload_1);
|
|
|
- MENU_ITEM(function, MSG_UNLOAD_FILAMENT_3, extr_unload_2);
|
|
|
- MENU_ITEM(function, MSG_UNLOAD_FILAMENT_4, extr_unload_3);
|
|
|
+ MENU_ITEM(function, _i("Unload all"), extr_unload_all);////MSG_UNLOAD_ALL c=0 r=0
|
|
|
+ MENU_ITEM(function, _i("Unload filament 1"), extr_unload_0);////MSG_UNLOAD_FILAMENT_1 c=17 r=0
|
|
|
+ MENU_ITEM(function, _i("Unload filament 2"), extr_unload_1);////MSG_UNLOAD_FILAMENT_2 c=17 r=0
|
|
|
+ MENU_ITEM(function, _i("Unload filament 3"), extr_unload_2);////MSG_UNLOAD_FILAMENT_3 c=17 r=0
|
|
|
+ MENU_ITEM(function, _i("Unload filament 4"), extr_unload_3);////MSG_UNLOAD_FILAMENT_4 c=17 r=0
|
|
|
|
|
|
END_MENU();
|
|
|
}
|
|
|
@@ -5386,10 +5386,10 @@ static void fil_unload_menu()
|
|
|
static void change_extr_menu(){
|
|
|
START_MENU();
|
|
|
MENU_ITEM(back, MSG_MAIN, 0);
|
|
|
- MENU_ITEM(function, MSG_EXTRUDER_1, extr_change_0);
|
|
|
- MENU_ITEM(function, MSG_EXTRUDER_2, extr_change_1);
|
|
|
- MENU_ITEM(function, MSG_EXTRUDER_3, extr_change_2);
|
|
|
- MENU_ITEM(function, MSG_EXTRUDER_4, extr_change_3);
|
|
|
+ MENU_ITEM(function, _i("Extruder 1"), extr_change_0);////MSG_EXTRUDER_1 c=17 r=1
|
|
|
+ MENU_ITEM(function, _i("Extruder 2"), extr_change_1);////MSG_EXTRUDER_2 c=17 r=1
|
|
|
+ MENU_ITEM(function, _i("Extruder 3"), extr_change_2);////MSG_EXTRUDER_3 c=17 r=1
|
|
|
+ MENU_ITEM(function, _i("Extruder 4"), extr_change_3);////MSG_EXTRUDER_4 c=17 r=1
|
|
|
|
|
|
END_MENU();
|
|
|
}
|
|
|
@@ -5707,10 +5707,10 @@ static void lcd_main_menu()
|
|
|
|
|
|
if ( moves_planned() || IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL))
|
|
|
{
|
|
|
- MENU_ITEM(submenu, MSG_TUNE, lcd_tune_menu);
|
|
|
+ MENU_ITEM(submenu, _i("Tune"), lcd_tune_menu);////MSG_TUNE c=0 r=0
|
|
|
} else
|
|
|
{
|
|
|
- MENU_ITEM(submenu, MSG_PREHEAT, lcd_preheat_menu);
|
|
|
+ MENU_ITEM(submenu, _i("Preheat"), lcd_preheat_menu);////MSG_PREHEAT c=0 r=0
|
|
|
}
|
|
|
|
|
|
#ifdef SDSUPPORT
|
|
|
@@ -5721,11 +5721,11 @@ static void lcd_main_menu()
|
|
|
if (mesh_bed_leveling_flag == false && homing_flag == false) {
|
|
|
if (card.sdprinting)
|
|
|
{
|
|
|
- MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_sdcard_pause);
|
|
|
+ MENU_ITEM(function, _i("Pause print"), lcd_sdcard_pause);////MSG_PAUSE_PRINT c=0 r=0
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- MENU_ITEM(function, MSG_RESUME_PRINT, lcd_sdcard_resume);
|
|
|
+ MENU_ITEM(function, _i("Resume print"), lcd_sdcard_resume);////MSG_RESUME_PRINT c=0 r=0
|
|
|
}
|
|
|
MENU_ITEM(submenu, MSG_STOP_PRINT, lcd_sdcard_stop);
|
|
|
}
|
|
|
@@ -5741,15 +5741,15 @@ static void lcd_main_menu()
|
|
|
/*else*/ MENU_ITEM(submenu, MSG_CARD_MENU, lcd_sdcard_menu);
|
|
|
}
|
|
|
#if SDCARDDETECT < 1
|
|
|
- MENU_ITEM(gcode, MSG_CNG_SDCARD, PSTR("M21")); // SD-card changed by user
|
|
|
+ MENU_ITEM(gcode, _i("Change SD card"), PSTR("M21")); // SD-card changed by user////MSG_CNG_SDCARD c=0 r=0
|
|
|
#endif
|
|
|
}
|
|
|
|
|
|
} else
|
|
|
{
|
|
|
- MENU_ITEM(submenu, MSG_NO_CARD, lcd_sdcard_menu);
|
|
|
+ MENU_ITEM(submenu, _i("No SD card"), lcd_sdcard_menu);////MSG_NO_CARD c=0 r=0
|
|
|
#if SDCARDDETECT < 1
|
|
|
- MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface
|
|
|
+ MENU_ITEM(gcode, _i("Init. SD card"), PSTR("M21")); // Manually initialize the SD-card via user interface////MSG_INIT_SDCARD c=0 r=0
|
|
|
#endif
|
|
|
}
|
|
|
#endif
|
|
|
@@ -5767,7 +5767,7 @@ static void lcd_main_menu()
|
|
|
#ifndef SNMM
|
|
|
#ifdef PAT9125
|
|
|
if ( ((filament_autoload_enabled == true) && (fsensor_enabled == true)))
|
|
|
- MENU_ITEM(submenu, MSG_AUTOLOAD_FILAMENT, lcd_menu_AutoLoadFilament);
|
|
|
+ MENU_ITEM(submenu, _i("AutoLoad filament"), lcd_menu_AutoLoadFilament);////MSG_AUTOLOAD_FILAMENT c=17 r=0
|
|
|
else
|
|
|
#endif //PAT9125
|
|
|
MENU_ITEM(function, MSG_LOAD_FILAMENT, lcd_LoadFilament);
|
|
|
@@ -5776,7 +5776,7 @@ static void lcd_main_menu()
|
|
|
#ifdef SNMM
|
|
|
MENU_ITEM(submenu, MSG_LOAD_FILAMENT, fil_load_menu);
|
|
|
MENU_ITEM(submenu, MSG_UNLOAD_FILAMENT, fil_unload_menu);
|
|
|
- MENU_ITEM(submenu, MSG_CHANGE_EXTR, change_extr_menu);
|
|
|
+ MENU_ITEM(submenu, _i("Change extruder"), change_extr_menu);////MSG_CHANGE_EXTR c=20 r=1
|
|
|
#endif
|
|
|
MENU_ITEM(submenu, MSG_SETTINGS, lcd_settings_menu);
|
|
|
if(!isPrintPaused) MENU_ITEM(submenu, MSG_MENU_CALIBRATION, lcd_calibration_menu);
|
|
|
@@ -5788,14 +5788,14 @@ static void lcd_main_menu()
|
|
|
|
|
|
if (!is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL))
|
|
|
{
|
|
|
- MENU_ITEM(submenu, MSG_STATISTICS, lcd_menu_statistics);
|
|
|
+ MENU_ITEM(submenu, _i("Statistics "), lcd_menu_statistics);////MSG_STATISTICS c=0 r=0
|
|
|
}
|
|
|
|
|
|
#if defined(TMC2130) || defined(PAT9125)
|
|
|
MENU_ITEM(submenu, PSTR("Fail stats"), lcd_menu_fails_stats);
|
|
|
#endif
|
|
|
|
|
|
- MENU_ITEM(submenu, MSG_SUPPORT, lcd_support_menu);
|
|
|
+ MENU_ITEM(submenu, _i("Support"), lcd_support_menu);////MSG_SUPPORT c=0 r=0
|
|
|
|
|
|
END_MENU();
|
|
|
|
|
|
@@ -5806,7 +5806,7 @@ void stack_error() {
|
|
|
WRITE(BEEPER, HIGH);
|
|
|
delay(1000);
|
|
|
WRITE(BEEPER, LOW);
|
|
|
- lcd_display_message_fullscreen_P(MSG_STACK_ERROR);
|
|
|
+ lcd_display_message_fullscreen_P(_i("Error - static memory has been overwritten"));////MSG_STACK_ERROR c=20 r=4
|
|
|
//err_triggered = 1;
|
|
|
while (1) delay_keep_alive(1000);
|
|
|
}
|
|
|
@@ -5889,13 +5889,13 @@ static void lcd_tune_menu()
|
|
|
|
|
|
START_MENU();
|
|
|
MENU_ITEM(back, MSG_MAIN, 0); //1
|
|
|
- MENU_ITEM_EDIT(int3, MSG_SPEED, &feedmultiply, 10, 999);//2
|
|
|
+ MENU_ITEM_EDIT(int3, _i("Speed"), &feedmultiply, 10, 999);//2////MSG_SPEED c=0 r=0
|
|
|
|
|
|
MENU_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 10);//3
|
|
|
MENU_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 10);//4
|
|
|
|
|
|
MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);//5
|
|
|
- MENU_ITEM_EDIT(int3, MSG_FLOW, &extrudemultiply, 10, 999);//6
|
|
|
+ MENU_ITEM_EDIT(int3, _i("Flow"), &extrudemultiply, 10, 999);//6////MSG_FLOW c=0 r=0
|
|
|
#ifdef FILAMENTCHANGEENABLE
|
|
|
MENU_ITEM(function, MSG_FILAMENTCHANGE, lcd_colorprint_change);//7
|
|
|
#endif
|
|
|
@@ -5958,10 +5958,10 @@ static void lcd_control_temperature_menu()
|
|
|
MENU_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 10);
|
|
|
#endif
|
|
|
#if TEMP_SENSOR_1 != 0
|
|
|
- MENU_ITEM_EDIT(int3, MSG_NOZZLE1, &target_temperature[1], 0, HEATER_1_MAXTEMP - 10);
|
|
|
+ MENU_ITEM_EDIT(int3, _i("Nozzle2"), &target_temperature[1], 0, HEATER_1_MAXTEMP - 10);////MSG_NOZZLE1 c=0 r=0
|
|
|
#endif
|
|
|
#if TEMP_SENSOR_2 != 0
|
|
|
- MENU_ITEM_EDIT(int3, MSG_NOZZLE2, &target_temperature[2], 0, HEATER_2_MAXTEMP - 10);
|
|
|
+ MENU_ITEM_EDIT(int3, _i("Nozzle3"), &target_temperature[2], 0, HEATER_2_MAXTEMP - 10);////MSG_NOZZLE2 c=0 r=0
|
|
|
#endif
|
|
|
#if TEMP_SENSOR_BED != 0
|
|
|
MENU_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 3);
|
|
|
@@ -5969,9 +5969,9 @@ static void lcd_control_temperature_menu()
|
|
|
MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
|
|
|
#if defined AUTOTEMP && (TEMP_SENSOR_0 != 0)
|
|
|
MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &autotemp_enabled);
|
|
|
- MENU_ITEM_EDIT(float3, MSG_MIN, &autotemp_min, 0, HEATER_0_MAXTEMP - 10);
|
|
|
- MENU_ITEM_EDIT(float3, MSG_MAX, &autotemp_max, 0, HEATER_0_MAXTEMP - 10);
|
|
|
- MENU_ITEM_EDIT(float32, MSG_FACTOR, &autotemp_factor, 0.0, 1.0);
|
|
|
+ MENU_ITEM_EDIT(float3, _i(" MENU_ITEM_EDIT(float3, MSG_MIN, &autotemp_min, 0, HEATER_0_MAXTEMP - 10);02 Min"), &autotemp_min, 0, HEATER_0_MAXTEMP - 10);////MSG_MIN c=0 r=0
|
|
|
+ MENU_ITEM_EDIT(float3, _i(" MENU_ITEM_EDIT(float3, MSG_MAX, &autotemp_max, 0, HEATER_0_MAXTEMP - 10);02 Max"), &autotemp_max, 0, HEATER_0_MAXTEMP - 10);////MSG_MAX c=0 r=0
|
|
|
+ MENU_ITEM_EDIT(float32, _i(" MENU_ITEM_EDIT(float32, MSG_FACTOR, &autotemp_factor, 0.0, 1.0);02 Fact"), &autotemp_factor, 0.0, 1.0);////MSG_FACTOR c=0 r=0
|
|
|
#endif
|
|
|
|
|
|
END_MENU();
|
|
|
@@ -6275,7 +6275,7 @@ char *wfac_to_str5(const uint8_t &x)
|
|
|
conv[0] = '[';
|
|
|
ftostr43(((float)((uint16_t)x + 1000) / 1000), 1);
|
|
|
}
|
|
|
- else strcpy_P(conv, MSG_EXTRUDER_CORRECTION_OFF);
|
|
|
+ else strcpy_P(conv, _i(" [off"));////MSG_EXTRUDER_CORRECTION_OFF c=6 r=0
|
|
|
conv[6] = ']';
|
|
|
conv[7] = ' ';
|
|
|
conv[8] = 0;
|
|
|
@@ -6305,7 +6305,7 @@ bool lcd_selftest()
|
|
|
bool _result = true;
|
|
|
lcd_wait_for_cool_down();
|
|
|
lcd_implementation_clear();
|
|
|
- lcd.setCursor(0, 0); lcd_printPGM(MSG_SELFTEST_START);
|
|
|
+ lcd.setCursor(0, 0); lcd_printPGM(_i("Self test start "));////MSG_SELFTEST_START c=20 r=0
|
|
|
#ifdef TMC2130
|
|
|
FORCE_HIGH_POWER_START;
|
|
|
#endif // TMC2130
|
|
|
@@ -6468,7 +6468,7 @@ bool lcd_selftest()
|
|
|
|
|
|
if (_result)
|
|
|
{
|
|
|
- LCD_ALERTMESSAGERPGM(MSG_SELFTEST_OK);
|
|
|
+ LCD_ALERTMESSAGERPGM(_i("Self test OK"));////MSG_SELFTEST_OK c=0 r=0
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -6900,27 +6900,27 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char *
|
|
|
lcd_implementation_clear();
|
|
|
|
|
|
lcd.setCursor(0, 0);
|
|
|
- lcd_printPGM(MSG_SELFTEST_ERROR);
|
|
|
+ lcd_printPGM(_i("Selftest error !"));////MSG_SELFTEST_ERROR c=0 r=0
|
|
|
lcd.setCursor(0, 1);
|
|
|
- lcd_printPGM(MSG_SELFTEST_PLEASECHECK);
|
|
|
+ lcd_printPGM(_i("Please check :"));////MSG_SELFTEST_PLEASECHECK c=0 r=0
|
|
|
|
|
|
switch (_error_no)
|
|
|
{
|
|
|
case 1:
|
|
|
lcd.setCursor(0, 2);
|
|
|
- lcd_printPGM(MSG_SELFTEST_HEATERTHERMISTOR);
|
|
|
+ lcd_printPGM(_i("Heater/Thermistor"));////MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0
|
|
|
lcd.setCursor(0, 3);
|
|
|
- lcd_printPGM(MSG_SELFTEST_NOTCONNECTED);
|
|
|
+ lcd_printPGM(_i("Not connected"));////MSG_SELFTEST_NOTCONNECTED c=0 r=0
|
|
|
break;
|
|
|
case 2:
|
|
|
lcd.setCursor(0, 2);
|
|
|
- lcd_printPGM(MSG_SELFTEST_BEDHEATER);
|
|
|
+ lcd_printPGM(_i("Bed / Heater"));////MSG_SELFTEST_BEDHEATER c=0 r=0
|
|
|
lcd.setCursor(0, 3);
|
|
|
lcd_printPGM(MSG_SELFTEST_WIRINGERROR);
|
|
|
break;
|
|
|
case 3:
|
|
|
lcd.setCursor(0, 2);
|
|
|
- lcd_printPGM(MSG_SELFTEST_ENDSTOPS);
|
|
|
+ lcd_printPGM(_i("Endstops"));////MSG_SELFTEST_ENDSTOPS c=0 r=0
|
|
|
lcd.setCursor(0, 3);
|
|
|
lcd_printPGM(MSG_SELFTEST_WIRINGERROR);
|
|
|
lcd.setCursor(17, 3);
|
|
|
@@ -6932,13 +6932,13 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char *
|
|
|
lcd.setCursor(18, 2);
|
|
|
lcd.print(_error_1);
|
|
|
lcd.setCursor(0, 3);
|
|
|
- lcd_printPGM(MSG_SELFTEST_ENDSTOP);
|
|
|
+ lcd_printPGM(_i("Endstop"));////MSG_SELFTEST_ENDSTOP c=0 r=0
|
|
|
lcd.setCursor(18, 3);
|
|
|
lcd.print(_error_2);
|
|
|
break;
|
|
|
case 5:
|
|
|
lcd.setCursor(0, 2);
|
|
|
- lcd_printPGM(MSG_SELFTEST_ENDSTOP_NOTHIT);
|
|
|
+ lcd_printPGM(_i("Endstop not hit"));////MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1
|
|
|
lcd.setCursor(0, 3);
|
|
|
lcd_printPGM(MSG_SELFTEST_MOTOR);
|
|
|
lcd.setCursor(18, 3);
|
|
|
@@ -6962,7 +6962,7 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char *
|
|
|
break;
|
|
|
case 8:
|
|
|
lcd.setCursor(0, 2);
|
|
|
- lcd_printPGM(MSG_LOOSE_PULLEY);
|
|
|
+ lcd_printPGM(_i("Loose pulley"));////MSG_LOOSE_PULLEY c=20 r=1
|
|
|
lcd.setCursor(0, 3);
|
|
|
lcd_printPGM(MSG_SELFTEST_MOTOR);
|
|
|
lcd.setCursor(18, 3);
|
|
|
@@ -6970,23 +6970,23 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char *
|
|
|
break;
|
|
|
case 9:
|
|
|
lcd.setCursor(0, 2);
|
|
|
- lcd_printPGM(MSG_SELFTEST_AXIS_LENGTH);
|
|
|
+ lcd_printPGM(_i("Axis length"));////MSG_SELFTEST_AXIS_LENGTH c=0 r=0
|
|
|
lcd.setCursor(0, 3);
|
|
|
- lcd_printPGM(MSG_SELFTEST_AXIS);
|
|
|
+ lcd_printPGM(_i("Axis"));////MSG_SELFTEST_AXIS c=0 r=0
|
|
|
lcd.setCursor(18, 3);
|
|
|
lcd.print(_error_1);
|
|
|
break;
|
|
|
case 10:
|
|
|
lcd.setCursor(0, 2);
|
|
|
- lcd_printPGM(MSG_SELFTEST_FANS);
|
|
|
+ lcd_printPGM(_i("Front/left fans"));////MSG_SELFTEST_FANS c=0 r=0
|
|
|
lcd.setCursor(0, 3);
|
|
|
- lcd_printPGM(MSG_SELFTEST_SWAPPED);
|
|
|
+ lcd_printPGM(_i("Swapped"));////MSG_SELFTEST_SWAPPED c=0 r=0
|
|
|
lcd.setCursor(18, 3);
|
|
|
lcd.print(_error_1);
|
|
|
break;
|
|
|
case 11:
|
|
|
lcd.setCursor(0, 2);
|
|
|
- lcd_printPGM(MSG_FILAMENT_SENSOR);
|
|
|
+ lcd_printPGM(_i("Filament sensor"));////MSG_FILAMENT_SENSOR c=20 r=0
|
|
|
lcd.setCursor(0, 3);
|
|
|
lcd_printPGM(MSG_SELFTEST_WIRINGERROR);
|
|
|
break;
|
|
|
@@ -7189,16 +7189,16 @@ static int lcd_selftest_screen(int _step, int _progress, int _progress_scale, bo
|
|
|
if (_step == -1) lcd_printPGM(MSG_SELFTEST_FAN);
|
|
|
if (_step == 0) lcd_printPGM(MSG_SELFTEST_FAN);
|
|
|
if (_step == 1) lcd_printPGM(MSG_SELFTEST_FAN);
|
|
|
- if (_step == 2) lcd_printPGM(MSG_SELFTEST_CHECK_ENDSTOPS);
|
|
|
- if (_step == 3) lcd_printPGM(MSG_SELFTEST_CHECK_HOTEND);
|
|
|
- if (_step == 4) lcd_printPGM(MSG_SELFTEST_CHECK_X);
|
|
|
- if (_step == 5) lcd_printPGM(MSG_SELFTEST_CHECK_Y);
|
|
|
- if (_step == 6) lcd_printPGM(MSG_SELFTEST_CHECK_Z);
|
|
|
+ if (_step == 2) lcd_printPGM(_i("Checking endstops"));////MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0
|
|
|
+ if (_step == 3) lcd_printPGM(_i("Checking hotend "));////MSG_SELFTEST_CHECK_HOTEND c=20 r=0
|
|
|
+ if (_step == 4) lcd_printPGM(_i("Checking X axis "));////MSG_SELFTEST_CHECK_X c=20 r=0
|
|
|
+ if (_step == 5) lcd_printPGM(_i("Checking Y axis "));////MSG_SELFTEST_CHECK_Y c=20 r=0
|
|
|
+ if (_step == 6) lcd_printPGM(_i("Checking Z axis "));////MSG_SELFTEST_CHECK_Z c=20 r=0
|
|
|
if (_step == 7) lcd_printPGM(MSG_SELFTEST_CHECK_BED);
|
|
|
if (_step == 8) lcd_printPGM(MSG_SELFTEST_CHECK_BED);
|
|
|
if (_step == 9) lcd_printPGM(MSG_SELFTEST_CHECK_FSENSOR);
|
|
|
if (_step == 10) lcd_printPGM(MSG_SELFTEST_CHECK_FSENSOR);
|
|
|
- if (_step == 11) lcd_printPGM(MSG_SELFTEST_CHECK_ALLCORRECT);
|
|
|
+ if (_step == 11) lcd_printPGM(_i("All correct "));////MSG_SELFTEST_CHECK_ALLCORRECT c=20 r=0
|
|
|
if (_step == 12) lcd_printPGM(MSG_SELFTEST_FAILED);
|
|
|
if (_step == 13) lcd_printPGM(PSTR("Calibrating home"));
|
|
|
|
|
|
@@ -7207,16 +7207,16 @@ static int lcd_selftest_screen(int _step, int _progress, int _progress_scale, bo
|
|
|
if ((_step >= -1) && (_step <= 1))
|
|
|
{
|
|
|
//SERIAL_ECHOLNPGM("Fan test");
|
|
|
- lcd_print_at_PGM(0, 2, MSG_SELFTEST_EXTRUDER_FAN_SPEED);
|
|
|
+ lcd_print_at_PGM(0, 2, _i("Extruder fan:"));////MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0
|
|
|
lcd.setCursor(18, 2);
|
|
|
(_step < 0) ? lcd.print(_indicator) : lcd.print("OK");
|
|
|
- lcd_print_at_PGM(0, 3, MSG_SELFTEST_PRINT_FAN_SPEED);
|
|
|
+ lcd_print_at_PGM(0, 3, _i("Print fan:"));////MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0
|
|
|
lcd.setCursor(18, 3);
|
|
|
(_step < 1) ? lcd.print(_indicator) : lcd.print("OK");
|
|
|
}
|
|
|
else if (_step >= 9 && _step <= 10)
|
|
|
{
|
|
|
- lcd_print_at_PGM(0, 2, MSG_SELFTEST_FILAMENT_SENSOR);
|
|
|
+ lcd_print_at_PGM(0, 2, _i("Filament sensor:"));////MSG_SELFTEST_FILAMENT_SENSOR c=18 r=0
|
|
|
lcd.setCursor(18, 2);
|
|
|
(_step == 9) ? lcd.print(_indicator) : lcd.print("OK");
|
|
|
}
|
|
|
@@ -7359,7 +7359,7 @@ static void menu_action_sdfile(const char* filename, char* longFilename)
|
|
|
}
|
|
|
|
|
|
if (!check_file(filename)) {
|
|
|
- result = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_FILE_INCOMPLETE, false, false);
|
|
|
+ result = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("File incomplete. Continue anyway?"), false, false);////MSG_FILE_INCOMPLETE c=20 r=2
|
|
|
lcd_update_enable(true);
|
|
|
}
|
|
|
if (result) {
|
|
|
@@ -7513,13 +7513,13 @@ void lcd_update(uint8_t lcdDrawUpdateOverride)
|
|
|
if (lcd_oldcardstatus)
|
|
|
{
|
|
|
card.initsd();
|
|
|
- LCD_MESSAGERPGM(MSG_SD_INSERTED);
|
|
|
+ LCD_MESSAGERPGM(_i("Card inserted"));////MSG_SD_INSERTED c=0 r=0
|
|
|
//get_description();
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
card.release();
|
|
|
- LCD_MESSAGERPGM(MSG_SD_REMOVED);
|
|
|
+ LCD_MESSAGERPGM(_i("Card removed"));////MSG_SD_REMOVED c=0 r=0
|
|
|
}
|
|
|
}
|
|
|
#endif//CARDINSERTED
|
Robert Pelnar