diff --git a/Documentation/BedLeveling.md b/Documentation/BedLeveling.md index 62566ac7b..35a38bb3a 100644 --- a/Documentation/BedLeveling.md +++ b/Documentation/BedLeveling.md @@ -60,9 +60,9 @@ My preferred method: * g) You can raise the z probe with M402 command; * h) Fill the defines bellow multiplying the values by "-1" (just change the signal) - -* \#define X_PROBE_OFFSET_FROM_EXTRUDER -24.3 -* \#define Y_PROBE_OFFSET_FROM_EXTRUDER 31.4 +* X and Y-Offset must be Integers! +* \#define X_PROBE_OFFSET_FROM_EXTRUDER -24 +* \#define Y_PROBE_OFFSET_FROM_EXTRUDER 31 * \#define Z_PROBE_OFFSET_FROM_EXTRUDER -5.1 Sled Option Notes diff --git a/Marlin/language.h b/Marlin/language.h index 27a5793c4..e13fc3176 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -223,5 +223,6 @@ */ #include LANGUAGE_INCLUDE +#include "language_en.h" #endif //__LANGUAGE_H diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 49a22337d..086e5c1e3 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -8,124 +8,356 @@ #ifndef LANGUAGE_EN_H #define LANGUAGE_EN_H +#ifndef WELCOME_MSG #define WELCOME_MSG MACHINE_NAME " ready." +#endif +#ifndef MSG_SD_INSERTED #define MSG_SD_INSERTED "Card inserted" +#endif +#ifndef MSG_SD_REMOVED #define MSG_SD_REMOVED "Card removed" +#endif +#ifndef MSG_MAIN #define MSG_MAIN "Main" +#endif +#ifndef MSG_AUTOSTART #define MSG_AUTOSTART "Autostart" +#endif +#ifndef MSG_DISABLE_STEPPERS #define MSG_DISABLE_STEPPERS "Disable steppers" +#endif +#ifndef MSG_AUTO_HOME #define MSG_AUTO_HOME "Auto home" +#endif +#ifndef MSG_SET_HOME_OFFSETS #define MSG_SET_HOME_OFFSETS "Set home offsets" +#endif +#ifndef MSG_SET_ORIGIN #define MSG_SET_ORIGIN "Set origin" +#endif +#ifndef MSG_PREHEAT_PLA #define MSG_PREHEAT_PLA "Preheat PLA" +#endif +#ifndef MSG_PREHEAT_PLA_N #define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " " +#endif +#ifndef MSG_PREHEAT_PLA_ALL #define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " All" +#endif +#ifndef MSG_PREHEAT_PLA_BEDONLY #define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed" +#endif +#ifndef MSG_PREHEAT_PLA_SETTINGS #define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " conf" +#endif +#ifndef MSG_PREHEAT_ABS #define MSG_PREHEAT_ABS "Preheat ABS" +#endif +#ifndef MSG_PREHEAT_ABS_N #define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " " +#endif +#ifndef MSG_PREHEAT_ABS_ALL #define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " All" +#endif +#ifndef MSG_PREHEAT_ABS_BEDONLY #define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed" +#endif +#ifndef MSG_PREHEAT_ABS_SETTINGS #define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " conf" +#endif +#ifndef MSG_COOLDOWN #define MSG_COOLDOWN "Cooldown" +#endif +#ifndef MSG_SWITCH_PS_ON #define MSG_SWITCH_PS_ON "Switch power on" +#endif +#ifndef MSG_SWITCH_PS_OFF #define MSG_SWITCH_PS_OFF "Switch power off" +#endif +#ifndef MSG_EXTRUDE #define MSG_EXTRUDE "Extrude" +#endif +#ifndef MSG_RETRACT #define MSG_RETRACT "Retract" +#endif +#ifndef MSG_MOVE_AXIS #define MSG_MOVE_AXIS "Move axis" +#endif +#ifndef MSG_MOVE_X #define MSG_MOVE_X "Move X" +#endif +#ifndef MSG_MOVE_Y #define MSG_MOVE_Y "Move Y" +#endif +#ifndef MSG_MOVE_Z #define MSG_MOVE_Z "Move Z" +#endif +#ifndef MSG_MOVE_E #define MSG_MOVE_E "Extruder" +#endif +#ifndef MSG_MOVE_01MM #define MSG_MOVE_01MM "Move 0.1mm" +#endif +#ifndef MSG_MOVE_1MM #define MSG_MOVE_1MM "Move 1mm" +#endif +#ifndef MSG_MOVE_10MM #define MSG_MOVE_10MM "Move 10mm" +#endif +#ifndef MSG_SPEED #define MSG_SPEED "Speed" +#endif +#ifndef MSG_NOZZLE #define MSG_NOZZLE "Nozzle" +#endif +#ifndef MSG_BED #define MSG_BED "Bed" +#endif +#ifndef MSG_FAN_SPEED #define MSG_FAN_SPEED "Fan speed" +#endif +#ifndef MSG_FLOW #define MSG_FLOW "Flow" +#endif +#ifndef MSG_CONTROL #define MSG_CONTROL "Control" +#endif +#ifndef MSG_MIN #define MSG_MIN " " STR_THERMOMETER " Min" +#endif +#ifndef MSG_MAX #define MSG_MAX " " STR_THERMOMETER " Max" +#endif +#ifndef MSG_FACTOR #define MSG_FACTOR " " STR_THERMOMETER " Fact" +#endif +#ifndef MSG_AUTOTEMP #define MSG_AUTOTEMP "Autotemp" +#endif +#ifndef MSG_ON #define MSG_ON "On " +#endif +#ifndef MSG_OFF #define MSG_OFF "Off" +#endif +#ifndef MSG_PID_P #define MSG_PID_P "PID-P" +#endif +#ifndef MSG_PID_I #define MSG_PID_I "PID-I" +#endif +#ifndef MSG_PID_D #define MSG_PID_D "PID-D" +#endif +#ifndef MSG_PID_C #define MSG_PID_C "PID-C" +#endif +#ifndef MSG_ACC #define MSG_ACC "Accel" +#endif +#ifndef MSG_VXY_JERK #define MSG_VXY_JERK "Vxy-jerk" +#endif +#ifndef MSG_VZ_JERK #define MSG_VZ_JERK "Vz-jerk" +#endif +#ifndef MSG_VE_JERK #define MSG_VE_JERK "Ve-jerk" +#endif +#ifndef MSG_VMAX #define MSG_VMAX "Vmax " +#endif +#ifndef MSG_X #define MSG_X "x" +#endif +#ifndef MSG_Y #define MSG_Y "y" +#endif +#ifndef MSG_Z #define MSG_Z "z" +#endif +#ifndef MSG_E #define MSG_E "e" +#endif +#ifndef MSG_VMIN #define MSG_VMIN "Vmin" +#endif +#ifndef MSG_VTRAV_MIN #define MSG_VTRAV_MIN "VTrav min" +#endif +#ifndef MSG_AMAX #define MSG_AMAX "Amax " +#endif +#ifndef MSG_A_RETRACT #define MSG_A_RETRACT "A-retract" +#endif +#ifndef MSG_XSTEPS #define MSG_XSTEPS "Xsteps/mm" +#endif +#ifndef MSG_YSTEPS #define MSG_YSTEPS "Ysteps/mm" +#endif +#ifndef MSG_ZSTEPS #define MSG_ZSTEPS "Zsteps/mm" +#endif +#ifndef MSG_ESTEPS #define MSG_ESTEPS "Esteps/mm" +#endif +#ifndef MSG_TEMPERATURE #define MSG_TEMPERATURE "Temperature" +#endif +#ifndef MSG_MOTION #define MSG_MOTION "Motion" +#endif +#ifndef MSG_VOLUMETRIC #define MSG_VOLUMETRIC "Filament" +#endif +#ifndef MSG_VOLUMETRIC_ENABLED #define MSG_VOLUMETRIC_ENABLED "E in mm" STR_h3 +#endif +#ifndef MSG_FILAMENT_SIZE_EXTRUDER_0 #define MSG_FILAMENT_SIZE_EXTRUDER_0 "Fil. Dia. 1" +#endif +#ifndef MSG_FILAMENT_SIZE_EXTRUDER_1 #define MSG_FILAMENT_SIZE_EXTRUDER_1 "Fil. Dia. 2" +#endif +#ifndef MSG_FILAMENT_SIZE_EXTRUDER_2 #define MSG_FILAMENT_SIZE_EXTRUDER_2 "Fil. Dia. 3" +#endif +#ifndef MSG_FILAMENT_SIZE_EXTRUDER_3 #define MSG_FILAMENT_SIZE_EXTRUDER_3 "Fil. Dia. 4" +#endif +#ifndef MSG_CONTRAST #define MSG_CONTRAST "LCD contrast" +#endif +#ifndef MSG_STORE_EPROM #define MSG_STORE_EPROM "Store memory" +#endif +#ifndef MSG_LOAD_EPROM #define MSG_LOAD_EPROM "Load memory" +#endif +#ifndef MSG_RESTORE_FAILSAFE #define MSG_RESTORE_FAILSAFE "Restore failsafe" +#endif +#ifndef MSG_REFRESH #define MSG_REFRESH "Refresh" +#endif +#ifndef MSG_WATCH #define MSG_WATCH "Info screen" +#endif +#ifndef MSG_PREPARE #define MSG_PREPARE "Prepare" +#endif +#ifndef MSG_TUNE #define MSG_TUNE "Tune" +#endif +#ifndef MSG_PAUSE_PRINT #define MSG_PAUSE_PRINT "Pause print" +#endif +#ifndef MSG_RESUME_PRINT #define MSG_RESUME_PRINT "Resume print" +#endif +#ifndef MSG_STOP_PRINT #define MSG_STOP_PRINT "Stop print" +#endif +#ifndef MSG_CARD_MENU #define MSG_CARD_MENU "Print from SD" +#endif +#ifndef MSG_NO_CARD #define MSG_NO_CARD "No SD card" +#endif +#ifndef MSG_DWELL #define MSG_DWELL "Sleep..." +#endif +#ifndef MSG_USERWAIT #define MSG_USERWAIT "Wait for user..." +#endif +#ifndef MSG_RESUMING #define MSG_RESUMING "Resuming print" +#endif +#ifndef MSG_PRINT_ABORTED #define MSG_PRINT_ABORTED "Print aborted" +#endif +#ifndef MSG_NO_MOVE #define MSG_NO_MOVE "No move." +#endif +#ifndef MSG_KILLED #define MSG_KILLED "KILLED. " +#endif +#ifndef MSG_STOPPED #define MSG_STOPPED "STOPPED. " +#endif +#ifndef MSG_CONTROL_RETRACT #define MSG_CONTROL_RETRACT "Retract mm" +#endif +#ifndef MSG_CONTROL_RETRACT_SWAP #define MSG_CONTROL_RETRACT_SWAP "Swap Re.mm" +#endif +#ifndef MSG_CONTROL_RETRACTF #define MSG_CONTROL_RETRACTF "Retract V" +#endif +#ifndef MSG_CONTROL_RETRACT_ZLIFT #define MSG_CONTROL_RETRACT_ZLIFT "Hop mm" +#endif +#ifndef MSG_CONTROL_RETRACT_RECOVER #define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm" +#endif +#ifndef MSG_CONTROL_RETRACT_RECOVER_SWAP #define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm" +#endif +#ifndef MSG_CONTROL_RETRACT_RECOVERF #define MSG_CONTROL_RETRACT_RECOVERF "UnRet V" +#endif +#ifndef MSG_AUTORETRACT #define MSG_AUTORETRACT "AutoRetr." +#endif +#ifndef MSG_FILAMENTCHANGE #define MSG_FILAMENTCHANGE "Change filament" +#endif +#ifndef MSG_INIT_SDCARD #define MSG_INIT_SDCARD "Init. SD card" +#endif +#ifndef MSG_CNG_SDCARD #define MSG_CNG_SDCARD "Change SD card" +#endif +#ifndef MSG_ZPROBE_OUT #define MSG_ZPROBE_OUT "Z probe out. bed" +#endif +#ifndef MSG_POSITION_UNKNOWN #define MSG_POSITION_UNKNOWN "Home X/Y before Z" +#endif +#ifndef MSG_ZPROBE_ZOFFSET #define MSG_ZPROBE_ZOFFSET "Z Offset" +#endif +#ifndef MSG_BABYSTEP_X #define MSG_BABYSTEP_X "Babystep X" +#endif +#ifndef MSG_BABYSTEP_Y #define MSG_BABYSTEP_Y "Babystep Y" +#endif +#ifndef MSG_BABYSTEP_Z #define MSG_BABYSTEP_Z "Babystep Z" +#endif +#ifndef MSG_ENDSTOP_ABORT #define MSG_ENDSTOP_ABORT "Endstop abort" +#endif #ifdef DELTA_CALIBRATION_MENU + #ifndef MSG_DELTA_CALIBRATE #define MSG_DELTA_CALIBRATE "Delta Calibration" + #endif + #ifndef MSG_DELTA_CALIBRATE_X #define MSG_DELTA_CALIBRATE_X "Calibrate X" + #endif + #ifndef MSG_DELTA_CALIBRATE_Y #define MSG_DELTA_CALIBRATE_Y "Calibrate Y" + #endif + #ifndef MSG_DELTA_CALIBRATE_Z #define MSG_DELTA_CALIBRATE_Z "Calibrate Z" + #endif + #ifndef MSG_DELTA_CALIBRATE_CENTER #define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" + #endif #endif // DELTA_CALIBRATION_MENU #endif // LANGUAGE_EN_H