diff --git a/Firmware/language_en.h b/Firmware/language_en.h index 8c5e71d8a..224582f39 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -10,7 +10,7 @@ #define MSG_SD_INSERTED "Card inserted" #define MSG_SD_REMOVED "Card removed" #define MSG_MAIN "Main" -#define MSG_DISABLE_STEPPERS "Disable steppers" +#define(length=20) MSG_DISABLE_STEPPERS "Disable steppers" #define MSG_AUTO_HOME "Auto home" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Set origin" @@ -27,7 +27,7 @@ #define MSG_NOZZLE1 "Nozzle2" #define MSG_NOZZLE2 "Nozzle3" #define MSG_BED "Bed" -#define(length=14) MSG_FAN_SPEED "Fan speed" +#define(length=20) MSG_FAN_SPEED "Fan speed" #define MSG_FLOW "Flow" #define MSG_FLOW0 "Flow 0" #define MSG_FLOW1 "Flow 1" @@ -52,11 +52,11 @@ #define MSG_CARD_MENU "Print from SD" #define MSG_NO_CARD "No SD card" #define MSG_DWELL "Sleep..." -#define MSG_USERWAIT "Wait for user..." -#define MSG_RESUMING "Resuming print" +#define(length=20) MSG_USERWAIT "Wait for user..." +#define(length=20) MSG_RESUMING "Resuming print" #define(length=20) MSG_PRINT_ABORTED "Print aborted" #define MSG_NO_MOVE "No move." -#define MSG_KILLED "KILLED. " +#define(length=20) MSG_KILLED "KILLED. " #define MSG_STOPPED "STOPPED. " #define MSG_FILAMENTCHANGE "Change filament" #define MSG_INIT_SDCARD "Init. SD card" @@ -64,8 +64,8 @@ #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Live adjust Z" -#define MSG_ADJUSTZ "Auto adjust Z?" -#define MSG_PICK_Z "Pick print" +#define(length=20) MSG_ADJUSTZ "Auto adjust Z?" +#define(length=20) MSG_PICK_Z "Pick print" #define MSG_SETTINGS "Settings" #define MSG_PREHEAT "Preheat" @@ -80,11 +80,11 @@ #define MSG_YES "Yes" #define MSG_NO "No" #define(length=19) MSG_NOT_LOADED "Filament not loaded" -#define MSG_NOT_COLOR "Color not clear" +#define(length=20) MSG_NOT_COLOR "Color not clear" #define(length=20) MSG_LOADING_FILAMENT "Loading filament" #define(length=20) MSG_PLEASE_WAIT "Please wait" #define MSG_LOADING_COLOR "Loading color" -#define MSG_CHANGE_SUCCESS "Change success!" +#define(length=20) MSG_CHANGE_SUCCESS "Change success!" #define(length=20) MSG_PRESS "and press the knob" #define(length=20) MSG_INSERT_FILAMENT "Insert filament" #define(length=20) MSG_CHANGING_FILAMENT "Changing filament!" @@ -93,7 +93,7 @@ #define MSG_SILENT_MODE_ON "Mode [silent]" #define MSG_SILENT_MODE_OFF "Mode [high power]" #define(length=20) MSG_REBOOT "Reboot the printer" -#define(length=20) MSG_TAKE_EFFECT " for take effect" +#define(length=20, lines=2) MSG_TAKE_EFFECT " for take effect" #define MSG_Enqueing "enqueing \"" #define MSG_POWERUP "PowerUp" @@ -153,24 +153,24 @@ #define MSG_PRUSA3D_FORUM "forum.prusa3d.com" #define MSG_PRUSA3D_HOWTO "howto.prusa3d.com" -#define MSG_SELFTEST_ERROR "Selftest error !" +#define(length=20) MSG_SELFTEST_ERROR "Selftest error !" #define MSG_SELFTEST_PLEASECHECK "Please check :" -#define MSG_SELFTEST_NOTCONNECTED "Not connected" +#define(length=20) MSG_SELFTEST_NOTCONNECTED "Not connected" #define MSG_SELFTEST_HEATERTHERMISTOR "Heater/Thermistor" #define MSG_SELFTEST_BEDHEATER "Bed / Heater" -#define MSG_SELFTEST_WIRINGERROR "Wiring error" +#define(length=20) MSG_SELFTEST_WIRINGERROR "Wiring error" #define MSG_SELFTEST_ENDSTOPS "Endstops" #define MSG_SELFTEST_MOTOR "Motor" #define MSG_SELFTEST_ENDSTOP "Endstop" -#define MSG_SELFTEST_ENDSTOP_NOTHIT "Endstop not hit" +#define(length=20) MSG_SELFTEST_ENDSTOP_NOTHIT "Endstop not hit" #define MSG_SELFTEST_OK "Self test OK" -#define MSG_LOOSE_PULLEY "Loose pulley" +#define(length=20) MSG_LOOSE_PULLEY "Loose pulley" #define(length=20) MSG_SELFTEST_FAN "Fan test"; #define(length=20) MSG_SELFTEST_COOLING_FAN "Front print fan?"; #define(length=20) MSG_SELFTEST_EXTRUDER_FAN "Left hotend fan?"; #define MSG_SELFTEST_FAN_YES "Spinning"; -#define MSG_SELFTEST_FAN_NO "Not spinning"; +#define(length=20) MSG_SELFTEST_FAN_NO "Not spinning"; #define(length=20) MSG_STATS_TOTALFILAMENT "Total filament :" #define(length=20) MSG_STATS_TOTALPRINTTIME "Total print time :" @@ -222,9 +222,9 @@ #define(length=20,lines=8) MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR "XYZ calibration compromised. Right front calibration point not reachable." #define(length=20,lines=8) MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR "XYZ calibration compromised. Front calibration points not reachable." -#define(length=20,lines=4) MSG_BED_LEVELING_FAILED_POINT_LOW "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." -#define(length=20,lines=4) MSG_BED_LEVELING_FAILED_POINT_HIGH "Bed leveling failed. Sensor triggered too high. Waiting for reset." -#define(length=20,lines=4) MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." +#define(length=20,lines=6) MSG_BED_LEVELING_FAILED_POINT_LOW "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." +#define(length=20,lines=6) MSG_BED_LEVELING_FAILED_POINT_HIGH "Bed leveling failed. Sensor triggered too high. Waiting for reset." +#define(length=20,lines=6) MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." #define(length=20,lines=2) MSG_NEW_FIRMWARE_AVAILABLE "New firmware version available:" #define(length=20) MSG_NEW_FIRMWARE_PLEASE_UPGRADE "Please upgrade." @@ -238,8 +238,8 @@ #define(length=20, lines=4) MSG_FILAMENT_LOADING_T3 "Insert filament into extruder 4. Click when done." #define(length=20, lines=1) MSG_CHANGE_EXTR "Change extruder" -#define(length=20, lines=1) MSG_FIL_LOADED_CHECK "Is filament loaded?" -#define(length=20, lines=2) MSG_FIL_TUNING "Rotate the knob to adjust filament." +#define(length=20, lines=2) MSG_FIL_LOADED_CHECK "Is filament loaded?" +#define(length=20, lines=3) MSG_FIL_TUNING "Rotate the knob to adjust filament." #define(length=20, lines=4) MSG_FIL_ADJUSTING "Adjusting filaments. Please wait." #define(length=20,lines=8) MSG_CONFIRM_NOZZLE_CLEAN_FIL_ADJ "Filaments are now adjusted. Please clean the nozzle for calibration. Click when done." #define(length=20, lines=4) MSG_STACK_ERROR "Error - static memory has been overwritten" @@ -252,10 +252,10 @@ #define(length=20, lines=8) MSG_CLEAN_NOZZLE_E "E calibration finished. Please clean the nozzle. Click when done." #define(length=20, lines=3) MSG_WAITING_TEMP "Waiting for nozzle and bed cooling" #define(length=20, lines=2) MSG_FILAMENT_CLEAN "Is color clear?" -#define(lenght=20) MSG_UNLOADING_FILAMENT "Unloading filament" -#define(length=20, lines=8) MSG_PAPER "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." +#define(length=20) MSG_UNLOADING_FILAMENT "Unloading filament" +#define(length=20, lines=10) MSG_PAPER "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." -#define MSG_BED_CORRECTION_MENU "Bed level correct" +#define(length=20) MSG_BED_CORRECTION_MENU "Bed level correct" #define MSG_BED_CORRECTION_LEFT "Left side um" #define MSG_BED_CORRECTION_RIGHT "Right side um" #define MSG_BED_CORRECTION_FRONT "Front side um" @@ -266,21 +266,21 @@ #define MSG_MENU_CALIBRATION "Calibration" #define MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF "SD card [normal]" #define MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON "SD card [FlshAir]" -#define MSG_PRINTER_DISCONNECTED "Printer disconnected" +#define(length=20) MSG_PRINTER_DISCONNECTED "Printer disconnected" #define(length=20, lines=1) MSG_FINISHING_MOVEMENTS "Finishing movements" #define(length=20, lines=1) MSG_PRINT_PAUSED "Print paused" #define(length=20, lines=1) MSG_RESUMING_PRINT "Resuming print" -#define(length=17, lines=1) MSG_PID_EXTRUDER "PID calibration" -#define(length=19, lines=1) MSG_SET_TEMPERATURE "Set temperature:" +#define(length=20, lines=1) MSG_PID_EXTRUDER "PID calibration" +#define(length=20, lines=1) MSG_SET_TEMPERATURE "Set temperature:" #define(length=20, lines=1) MSG_PID_FINISHED "PID cal. finished" #define(length=20, lines=1) MSG_PID_RUNNING "PID cal. " -#define(length=17, lines=1) MSG_CALIBRATE_PINDA "Calibrate" -#define(length=17, lines=1) MSG_CALIBRATION_PINDA_MENU "Temp. calibration" -#define(length=20, lines=4) MSG_PINDA_NOT_CALIBRATED "Temperature calibration has not been run yet" +#define(length=20, lines=1) MSG_CALIBRATE_PINDA "PINDA Temp. cal." +#define(length=20, lines=1) MSG_CALIBRATION_PINDA_MENU "PINDA Temp. cal." +#define(length=20, lines=4) MSG_PINDA_NOT_CALIBRATED "PINDA temperature calibration has not been run yet" #define(length=20, lines=1) MSG_PINDA_PREHEAT "Preheating" -#define(length=20, lines=1) MSG_TEMP_CALIBRATION "Temp. cal. " -#define(length=20, lines=4) MSG_TEMP_CALIBRATION_DONE "Temperature calibration is finished. Click to continue." -#define(length=20, lines=1) MSG_TEMP_CALIBRATION_ON "Temp. cal. [ON]" -#define(length=20, lines=1) MSG_TEMP_CALIBRATION_OFF "Temp. cal. [OFF]" +#define(length=20, lines=1) MSG_TEMP_CALIBRATION "PINDA Temp.cal." +#define(length=20, lines=5) MSG_TEMP_CALIBRATION_DONE "PINDA temperature calibration is finished. Click to continue." +#define(length=20, lines=1) MSG_TEMP_CALIBRATION_ON "PINDA T.cal. [ON]" +#define(length=20, lines=1) MSG_TEMP_CALIBRATION_OFF "PINDA T.cal.[OFF]" diff --git a/Firmware/ultralcd_implementation_hitachi_HD44780.h b/Firmware/ultralcd_implementation_hitachi_HD44780.h index da393a66f..abc528634 100644 --- a/Firmware/ultralcd_implementation_hitachi_HD44780.h +++ b/Firmware/ultralcd_implementation_hitachi_HD44780.h @@ -964,7 +964,7 @@ static void lcd_implementation_status_screen() char progress[4]; lcd.setCursor(0, 3); lcd_printPGM(MSG_TEMP_CALIBRATION); - lcd.setCursor(12, 3); + lcd.setCursor(15, 3); sprintf(progress, "%d/6", custom_message_state); lcd.print(progress); }