andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix extraneous "Home XYZ First" message

pull/1/head
Scott Lahteine 5 years ago
parent
9a209012b5
commit
b2e1f77f58
35 changed files with 248 additions and 284 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
  2. 2
      Marlin/src/feature/pause.cpp
  3. 2
      Marlin/src/gcode/feature/pause/M600.cpp
  4. 8
      Marlin/src/gcode/feature/pause/M701_M702.cpp
  5. 5
      Marlin/src/gcode/motion/G0_G1.cpp
  6. 5
      Marlin/src/lcd/language/language_an.h
  7. 5
      Marlin/src/lcd/language/language_ca.h
  8. 6
      Marlin/src/lcd/language/language_cz.h
  9. 5
      Marlin/src/lcd/language/language_da.h
  10. 6
      Marlin/src/lcd/language/language_de.h
  11. 12
      Marlin/src/lcd/language/language_en.h
  12. 6
      Marlin/src/lcd/language/language_es.h
  13. 6
      Marlin/src/lcd/language/language_eu.h
  14. 3
      Marlin/src/lcd/language/language_fi.h
  15. 6
      Marlin/src/lcd/language/language_fr.h
  16. 109
      Marlin/src/lcd/language/language_gl.h
  17. 217
      Marlin/src/lcd/language/language_hr.h
  18. 6
      Marlin/src/lcd/language/language_it.h
  19. 5
      Marlin/src/lcd/language/language_jp-kana.h
  20. 6
      Marlin/src/lcd/language/language_ko_KR.h
  21. 5
      Marlin/src/lcd/language/language_nl.h
  22. 5
      Marlin/src/lcd/language/language_pl.h
  23. 6
      Marlin/src/lcd/language/language_pt-br.h
  24. 3
      Marlin/src/lcd/language/language_pt.h
  25. 6
      Marlin/src/lcd/language/language_ru.h
  26. 6
      Marlin/src/lcd/language/language_sk.h
  27. 4
      Marlin/src/lcd/language/language_tr.h
  28. 5
      Marlin/src/lcd/language/language_uk.h
  29. 6
      Marlin/src/lcd/language/language_vi.h
  30. 6
      Marlin/src/lcd/language/language_zh_CN.h
  31. 6
      Marlin/src/lcd/language/language_zh_TW.h
  32. 36
      Marlin/src/module/motion.cpp
  33. 3
      Marlin/src/module/motion.h
  34. 11
      Marlin/src/module/probe.cpp
  35. 2
      Marlin/src/module/tool_change.cpp

2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@ -313,7 +313,7 @@
// Check for commands that require the printer to be homed
if (may_move) {
planner.synchronize();
if (axis_unhomed_error()) gcode.home_all_axes();
if (axes_need_homing()) gcode.home_all_axes();
#if ENABLED(DUAL_X_CARRIAGE)
if (active_extruder != 0) tool_change(0);
#endif

2
Marlin/src/feature/pause.cpp
View File

@ -442,7 +442,7 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u
do_pause_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
// Park the nozzle by moving up by z_lift and then moving to (x_pos, y_pos)
if (!axis_unhomed_error())
if (!axes_need_homing())
nozzle.park(2, park_point);
#if ENABLED(DUAL_X_CARRIAGE)

2
Marlin/src/gcode/feature/pause/M600.cpp
View File

@ -98,7 +98,7 @@ void GcodeSuite::M600() {
#if ENABLED(HOME_BEFORE_FILAMENT_CHANGE)
// Don't allow filament change without homing first
if (axis_unhomed_error()) home_all_axes();
if (axes_need_homing()) home_all_axes();
#endif
#if EXTRUDERS > 1

8
Marlin/src/gcode/feature/pause/M701_M702.cpp
View File

@ -60,8 +60,8 @@ void GcodeSuite::M701() {
point_t park_point = NOZZLE_PARK_POINT;
#if ENABLED(NO_MOTION_BEFORE_HOMING)
// Only raise Z if the machine is homed
if (axis_unhomed_error()) park_point.z = 0;
// Don't raise Z if the machine isn't homed
if (axes_need_homing()) park_point.z = 0;
#endif
#if ENABLED(MIXING_EXTRUDER)
@ -149,8 +149,8 @@ void GcodeSuite::M702() {
point_t park_point = NOZZLE_PARK_POINT;
#if ENABLED(NO_MOTION_BEFORE_HOMING)
// Only raise Z if the machine is homed
if (axis_unhomed_error()) park_point.z = 0;
// Don't raise Z if the machine isn't homed
if (axes_need_homing()) park_point.z = 0;
#endif
#if ENABLED(MIXING_EXTRUDER)

5
Marlin/src/gcode/motion/G0_G1.cpp
View File

@ -52,7 +52,10 @@ void GcodeSuite::G0_G1(
if (IsRunning()
#if ENABLED(NO_MOTION_BEFORE_HOMING)
&& !axis_unhomed_error(parser.seen('X'), parser.seen('Y'), parser.seen('Z'))
&& !axis_unhomed_error(
(parser.seen('X') ? _BV(X_AXIS) : 0)
| (parser.seen('Y') ? _BV(Y_AXIS) : 0)
| (parser.seen('Z') ? _BV(Z_AXIS) : 0) )
#endif
) {

5
Marlin/src/lcd/language/language_an.h
View File

@ -168,8 +168,7 @@
#define MSG_ZPROBE_OUT _UxGT("Sonda Z fuera")
#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch Auto-Test")
#define MSG_BLTOUCH_RESET _UxGT("Reset BLTouch")
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("first")
#define MSG_HOME_FIRST _UxGT("Home %s%s%s first")
#define MSG_ZPROBE_ZOFFSET _UxGT("Desfase Z")
#define MSG_BABYSTEP_X _UxGT("Micropaso X")
#define MSG_BABYSTEP_Y _UxGT("Micropaso Y")
@ -182,7 +181,7 @@
#define MSG_ERR_MINTEMP _UxGT("Error: Temp Menima")
#define MSG_ERR_MAXTEMP_BED _UxGT("Error: Temp Max base")
#define MSG_ERR_MINTEMP_BED _UxGT("Error: Temp Min base")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Home XY first")
#define MSG_HALTED _UxGT("IMPRESORA ATURADA")
#define MSG_PLEASE_RESET _UxGT("Per favor reinic.")
#define MSG_SHORT_DAY _UxGT("d")

5
Marlin/src/lcd/language/language_ca.h
View File

@ -170,8 +170,7 @@
#define MSG_CHANGE_MEDIA _UxGT("Canvia SD")
#define MSG_ZPROBE_OUT _UxGT("Sonda Z fora")
#define MSG_BLTOUCH_RESET _UxGT("Reinicia BLTouch")
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("primer")
#define MSG_HOME_FIRST _UxGT("Home %s%s%s primer")
#define MSG_ZPROBE_ZOFFSET _UxGT("Decalatge Z")
#define MSG_BABYSTEP_X _UxGT("Micropas X")
#define MSG_BABYSTEP_Y _UxGT("Micropas Y")
@ -184,7 +183,7 @@
#define MSG_ERR_MINTEMP _UxGT("Err: TEMP MINIMA")
#define MSG_ERR_MAXTEMP_BED _UxGT("Err: TEMPMAX LLIT")
#define MSG_ERR_MINTEMP_BED _UxGT("Err: TEMPMIN LLIT")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Home XY primer")
#define MSG_HALTED _UxGT("IMPRESSORA PARADA")
#define MSG_PLEASE_RESET _UxGT("Reinicieu")
#define MSG_SHORT_DAY _UxGT("d") // One character only

6
Marlin/src/lcd/language/language_cz.h
View File

@ -116,7 +116,6 @@
#define MSG_Z_OFFSET _UxGT("2. tryska Z")
#define MSG_UBL_DOING_G29 _UxGT("Provádím G29")
#define MSG_UBL_UNHOMED _UxGT("Přejeďte domů")
#define MSG_UBL_TOOLS _UxGT("UBL nástroje")
#define MSG_UBL_LEVEL_BED _UxGT("Unified Bed Leveling")
#define MSG_UBL_MANUAL_MESH _UxGT("Manuální síť bodů")
@ -335,8 +334,7 @@
#define MSG_BLTOUCH_STOW _UxGT("BLTouch zasunout")
#define MSG_MANUAL_DEPLOY _UxGT("Vysunout Z-sondu")
#define MSG_MANUAL_STOW _UxGT("Zasunout Z-sondu")
#define MSG_HOME _UxGT("Domů") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("první")
#define MSG_HOME_FIRST _UxGT("Domů %s%s%s první")
#define MSG_ZPROBE_ZOFFSET _UxGT("Z ofset")
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
@ -354,7 +352,7 @@
#define MSG_ERR_MINTEMP_BED _UxGT("NÍZ. TEPL. PODL.")
#define MSG_ERR_MAXTEMP_CHAMBER _UxGT("Err: MAXTEMP KOMORA")
#define MSG_ERR_MINTEMP_CHAMBER _UxGT("Err: MINTEMP KOMORA")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Domů XY první")
#define MSG_HALTED _UxGT("TISK. ZASTAVENA")
#define MSG_PLEASE_RESET _UxGT("Proveďte reset")
#define MSG_SHORT_DAY _UxGT("d")

5
Marlin/src/lcd/language/language_da.h
View File

@ -168,8 +168,7 @@
#define MSG_ZPROBE_OUT _UxGT("Probe udenfor plade")
#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch Selv-Test")
#define MSG_BLTOUCH_RESET _UxGT("Reset BLTouch")
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("først")
#define MSG_HOME_FIRST _UxGT("Home %s%s%s først")
#define MSG_ZPROBE_ZOFFSET _UxGT("Z Offset")
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
@ -182,7 +181,7 @@
#define MSG_ERR_MINTEMP _UxGT("Fejl: Min temp")
#define MSG_ERR_MAXTEMP_BED _UxGT("Fejl: Maks Plade temp")
#define MSG_ERR_MINTEMP_BED _UxGT("Fejl: Min Plade temp")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Home XY først")
#define MSG_HALTED _UxGT("PRINTER STOPPET")
#define MSG_PLEASE_RESET _UxGT("Reset Venligst")
#define MSG_SHORT_DAY _UxGT("d") // Kun et bogstav

6
Marlin/src/lcd/language/language_de.h
View File

@ -121,7 +121,6 @@
#define MSG_Y_OFFSET _UxGT("2. Düse Y")
#define MSG_Z_OFFSET _UxGT("2. Düse Z")
#define MSG_UBL_DOING_G29 _UxGT("G29 ausführen")
#define MSG_UBL_UNHOMED _UxGT("Home XYZ zuerst")
#define MSG_UBL_TOOLS _UxGT("UBL-Werkzeuge")
#define MSG_UBL_LEVEL_BED _UxGT("Unified Bed Leveling")
#define MSG_UBL_MANUAL_MESH _UxGT("Netz manuell erst.")
@ -363,8 +362,7 @@
#define MSG_MANUAL_DEPLOY_TOUCHMI _UxGT("TouchMI ausfahren")
#define MSG_MANUAL_DEPLOY _UxGT("Z-Sonde ausfahren")
#define MSG_MANUAL_STOW _UxGT("Z-Sonde einfahren")
#define MSG_HOME _UxGT("Vorher") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("homen")
#define MSG_HOME_FIRST _UxGT("Vorher %s%s%s homen")
#define MSG_ZPROBE_ZOFFSET _UxGT("Sondenversatz Z")
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
@ -384,7 +382,7 @@
#define MSG_ERR_MINTEMP_BED _UxGT("BETT ") LCD_STR_THERMOMETER _UxGT(" UNTERSCHRITTEN")
#define MSG_ERR_MAXTEMP_CHAMBER _UxGT("Err:Gehäuse max Temp")
#define MSG_ERR_MINTEMP_CHAMBER _UxGT("Err:Gehäuse min Temp")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Vorher XY vorher")
#define MSG_HALTED _UxGT("DRUCKER GESTOPPT")
#define MSG_PLEASE_RESET _UxGT("Bitte neustarten")
#define MSG_SHORT_DAY _UxGT("t") // One character only

12
Marlin/src/lcd/language/language_en.h
View File

@ -310,9 +310,6 @@
#ifndef MSG_UBL_DOING_G29
#define MSG_UBL_DOING_G29 _UxGT("Doing G29")
#endif
#ifndef MSG_UBL_UNHOMED
#define MSG_UBL_UNHOMED _UxGT("Home XYZ First")
#endif
#ifndef MSG_UBL_TOOLS
#define MSG_UBL_TOOLS _UxGT("UBL Tools")
#endif
@ -1026,11 +1023,8 @@
#ifndef MSG_MANUAL_STOW
#define MSG_MANUAL_STOW _UxGT("Stow Z-Probe")
#endif
#ifndef MSG_HOME
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#endif
#ifndef MSG_FIRST
#define MSG_FIRST _UxGT("First")
#ifndef MSG_HOME_FIRST
#define MSG_HOME_FIRST _UxGT("Home %s%s%s First")
#endif
#ifndef MSG_ZPROBE_ZOFFSET
#define MSG_ZPROBE_ZOFFSET _UxGT("Probe Z Offset")
@ -1090,7 +1084,7 @@
#define MSG_ERR_MINTEMP_CHAMBER _UxGT("Err: MINTEMP CHAMBER")
#endif
#ifndef MSG_ERR_Z_HOMING
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Home XY First")
#endif
#ifndef MSG_HALTED
#define MSG_HALTED _UxGT("PRINTER HALTED")

6
Marlin/src/lcd/language/language_es.h
View File

@ -120,7 +120,6 @@
#define MSG_Y_OFFSET _UxGT("2ª Boquilla Y")
#define MSG_Z_OFFSET _UxGT("2ª Boquilla Z")
#define MSG_UBL_DOING_G29 _UxGT("Hacer G29")
#define MSG_UBL_UNHOMED _UxGT("Inicio XYZ Primero")
#define MSG_UBL_TOOLS _UxGT("Herramientas UBL")
#define MSG_UBL_LEVEL_BED _UxGT("Nivel.Cama.Uni.(UBL)")
#define MSG_LCD_TILTING_MESH _UxGT("Punto de inclinación")
@ -364,8 +363,7 @@
#define MSG_MANUAL_DEPLOY_TOUCHMI _UxGT("Subir TouchMI")
#define MSG_MANUAL_DEPLOY _UxGT("Subir Sonda Z")
#define MSG_MANUAL_STOW _UxGT("Bajar Sonda Z")
#define MSG_HOME _UxGT("Origen") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("Primero")
#define MSG_HOME_FIRST _UxGT("Origen %s%s%s Primero")
#define MSG_ZPROBE_ZOFFSET _UxGT("Desfase Z")
#define MSG_BABYSTEP_X _UxGT("Micropaso X")
#define MSG_BABYSTEP_Y _UxGT("Micropaso Y")
@ -385,7 +383,7 @@
#define MSG_ERR_MINTEMP_BED _UxGT("Err:TEMP. MIN CAMA")
#define MSG_ERR_MAXTEMP_CHAMBER _UxGT("Err:TEMP. MÁX CÁMARA")
#define MSG_ERR_MINTEMP_CHAMBER _UxGT("Err:TEMP. MIN CÁMARA")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Origen XY Primero")
#define MSG_HALTED _UxGT("IMPRESORA DETENIDA")
#define MSG_PLEASE_RESET _UxGT("Por favor, reinicie")
#define MSG_SHORT_DAY _UxGT("d") // One character only

6
Marlin/src/lcd/language/language_eu.h
View File

@ -81,7 +81,6 @@
//#define MSG_USER_MENU _UxGT("Custom Commands")
#define MSG_UBL_DOING_G29 _UxGT("G29 exekutatzen")
#define MSG_UBL_UNHOMED _UxGT("XYZ etxeratu lehenengo")
#define MSG_UBL_TOOLS _UxGT("UBL Tresnak")
#define MSG_UBL_LEVEL_BED _UxGT("Unified Bed Leveling")
#define MSG_UBL_MANUAL_MESH _UxGT("Sarea eskuz sortu")
@ -277,8 +276,7 @@
#define MSG_BLTOUCH_RESET _UxGT("BLTouch berrabia.")
#define MSG_BLTOUCH_DEPLOY _UxGT("BLTouch jaitsi/luzatu")
#define MSG_BLTOUCH_STOW _UxGT("BLTouch igo/jaso")
#define MSG_HOME _UxGT("Etxera") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("lehenengo")
#define MSG_HOME_FIRST _UxGT("Etxera %s%s%s lehenengo")
#define MSG_ZPROBE_ZOFFSET _UxGT("Z Konpentsatu")
#define MSG_BABYSTEP_X _UxGT("Mikro-urratsa X")
#define MSG_BABYSTEP_Y _UxGT("Mikro-urratsa Y")
@ -291,7 +289,7 @@
#define MSG_ERR_MINTEMP _UxGT("Err: Tenp Minimoa")
#define MSG_ERR_MAXTEMP_BED _UxGT("Err: Ohe Tenp Max")
#define MSG_ERR_MINTEMP_BED _UxGT("Err: Ohe Tenp Min")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Etxera XY lehenengo")
#define MSG_HALTED _UxGT("INPRIMA. GELDIRIK")
#define MSG_PLEASE_RESET _UxGT("Berrabia. Mesedez")
#define MSG_SHORT_DAY _UxGT("d") // One character only

3
Marlin/src/lcd/language/language_fi.h
View File

@ -156,8 +156,7 @@
#define MSG_INIT_MEDIA _UxGT("Init. SD-Card")
#define MSG_CHANGE_MEDIA _UxGT("Change SD-Card")
#define MSG_ZPROBE_OUT _UxGT("Z probe out. bed")
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("first")
#define MSG_HOME_FIRST _UxGT("Home %s%s%s first")
#define MSG_ZPROBE_ZOFFSET _UxGT("Z Offset")
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")

6
Marlin/src/lcd/language/language_fr.h
View File

@ -124,7 +124,6 @@
#define MSG_G26_CANCELED _UxGT("G26 annulé")
#define MSG_G26_LEAVING _UxGT("Sortie G26")
#define MSG_UBL_DOING_G29 _UxGT("G29 en cours")
#define MSG_UBL_UNHOMED _UxGT("Origine XYZ requise")
#define MSG_UBL_TOOLS _UxGT("Outils UBL")
#define MSG_UBL_LEVEL_BED _UxGT("Niveau lit unifié")
#define MSG_UBL_MANUAL_MESH _UxGT("Maillage manuel")
@ -360,8 +359,7 @@
#define MSG_MANUAL_DEPLOY_TOUCHMI _UxGT("Déployer TouchMI")
#define MSG_MANUAL_DEPLOY _UxGT("Déployer Sonde Z")
#define MSG_MANUAL_STOW _UxGT("Ranger Sonde Z")
#define MSG_HOME _UxGT("Origine") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("Premier")
#define MSG_HOME_FIRST _UxGT("Origine %s%s%s Premier")
#define MSG_ZPROBE_ZOFFSET _UxGT("Décalage Z")
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
@ -381,7 +379,7 @@
#define MSG_ERR_MINTEMP_BED _UxGT("Err TEMP. MIN LIT")
#define MSG_ERR_MAXTEMP_CHAMBER _UxGT("Err MAXTEMP CAISSON")
#define MSG_ERR_MINTEMP_CHAMBER _UxGT("Err MINTEMP CAISSON")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Origine XY Premier")
#define MSG_HALTED _UxGT("IMPR. STOPPÉE")
#define MSG_PLEASE_RESET _UxGT("Redémarrer SVP")

109
Marlin/src/lcd/language/language_gl.h
View File

@ -82,36 +82,36 @@
#define MSG_BED _UxGT("Cama")
#define MSG_FAN_SPEED _UxGT("Velocidade vent.")
#define MSG_FLOW _UxGT("Fluxo")
#define MSG_CONTROL _UxGT("Control")
//#define MSG_CONTROL _UxGT("Control")
#define MSG_MIN _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Min")
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Autotemp")
#define MSG_LCD_ON _UxGT("On")
#define MSG_LCD_OFF _UxGT("Off")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
#define MSG_PID_C _UxGT("PID-C")
//#define MSG_AUTOTEMP _UxGT("Autotemp")
//#define MSG_LCD_ON _UxGT("On")
//#define MSG_LCD_OFF _UxGT("Off")
//#define MSG_PID_P _UxGT("PID-P")
//#define MSG_PID_I _UxGT("PID-I")
//#define MSG_PID_D _UxGT("PID-D")
//#define MSG_PID_C _UxGT("PID-C")
#define MSG_SELECT _UxGT("Escolla")
#define MSG_ACC _UxGT("Acel")
#define MSG_JERK _UxGT("Jerk")
#if IS_KINEMATIC
#define MSG_VA_JERK _UxGT("Va-jerk")
#define MSG_VB_JERK _UxGT("Vb-jerk")
#define MSG_VC_JERK _UxGT("Vc-jerk")
#else
#define MSG_VA_JERK _UxGT("Vx-jerk")
#define MSG_VB_JERK _UxGT("Vy-jerk")
#define MSG_VC_JERK _UxGT("Vz-jerk")
#endif
#define MSG_VE_JERK _UxGT("Ve-jerk")
#define MSG_VMAX _UxGT("Vmax ")
#define MSG_VMIN _UxGT("Vmin")
#define MSG_VTRAV_MIN _UxGT("VTrav min")
#define MSG_AMAX _UxGT("Amax ")
#define MSG_A_RETRACT _UxGT("A-retract")
#define MSG_A_TRAVEL _UxGT("A-travel")
//#define MSG_JERK _UxGT("Jerk")
//#if IS_KINEMATIC
// #define MSG_VA_JERK _UxGT("Va-jerk")
// #define MSG_VB_JERK _UxGT("Vb-jerk")
// #define MSG_VC_JERK _UxGT("Vc-jerk")
//#else
// #define MSG_VA_JERK _UxGT("Vx-jerk")
// #define MSG_VB_JERK _UxGT("Vy-jerk")
// #define MSG_VC_JERK _UxGT("Vz-jerk")
//#endif
//#define MSG_VE_JERK _UxGT("Ve-jerk")
//#define MSG_VMAX _UxGT("Vmax ")
//#define MSG_VMIN _UxGT("Vmin")
//#define MSG_VTRAV_MIN _UxGT("VTrav min")
//#define MSG_AMAX _UxGT("Amax ")
//#define MSG_A_RETRACT _UxGT("A-retract")
//#define MSG_A_TRAVEL _UxGT("A-travel")
#define MSG_STEPS_PER_MM _UxGT("Pasos/mm")
#if IS_KINEMATIC
#define MSG_ASTEPS _UxGT("A pasos/mm")
@ -165,10 +165,9 @@
#define MSG_INIT_MEDIA _UxGT("Iniciando SD")
#define MSG_CHANGE_MEDIA _UxGT("Cambiar SD")
#define MSG_ZPROBE_OUT _UxGT("Sonda-Z sen cama")
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
//#define MSG_HOME_FIRST _UxGT("Home %s%s%s first")
#define MSG_BLTOUCH_SELFTEST _UxGT("Comprobar BLTouch")
#define MSG_BLTOUCH_RESET _UxGT("Iniciar BLTouch")
#define MSG_FIRST _UxGT("first")
#define MSG_ZPROBE_ZOFFSET _UxGT("Offset Z")
#define MSG_BABYSTEP_X _UxGT("Micropaso X")
#define MSG_BABYSTEP_Y _UxGT("Micropaso Y")
@ -177,16 +176,16 @@
#define MSG_HEATING_FAILED_LCD _UxGT("Fallo quentando")
#define MSG_ERR_REDUNDANT_TEMP _UxGT("Erro temperatura")
#define MSG_THERMAL_RUNAWAY _UxGT("Temp. excesiva")
#define MSG_ERR_MAXTEMP _UxGT("Err: temp. max.")
#define MSG_ERR_MINTEMP _UxGT("Err: temp. min.")
#define MSG_ERR_MAXTEMP_BED _UxGT("Err: MAXTEMP BED")
#define MSG_ERR_MINTEMP_BED _UxGT("Err: MINTEMP BED")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
//#define MSG_ERR_MAXTEMP _UxGT("Err: temp. max.")
//#define MSG_ERR_MINTEMP _UxGT("Err: temp. min.")
//#define MSG_ERR_MAXTEMP_BED _UxGT("Err: MAXTEMP BED")
//#define MSG_ERR_MINTEMP_BED _UxGT("Err: MINTEMP BED")
//#define MSG_ERR_Z_HOMING _UxGT("Home XY first")
#define MSG_HALTED _UxGT("SISTEMA MORTO")
#define MSG_PLEASE_RESET _UxGT("Debe reiniciar!")
#define MSG_SHORT_DAY _UxGT("d") // One character only
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
//#define MSG_SHORT_DAY _UxGT("d") // One character only
//#define MSG_SHORT_HOUR _UxGT("h") // One character only
//#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Quentando...")
#define MSG_BED_HEATING _UxGT("Quentando cama...")
#define MSG_DELTA_CALIBRATE _UxGT("Calibracion Delta")
@ -229,26 +228,26 @@
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Agarde para")
#define MSG_FILAMENT_CHANGE_INIT_2 _UxGT("iniciar troco")
#define MSG_FILAMENT_CHANGE_INIT_3 _UxGT("de filamento")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Agarde pola")
#define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("descarga do")
#define MSG_FILAMENT_CHANGE_UNLOAD_3 _UxGT("filamento")
#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Introduza o")
#define MSG_FILAMENT_CHANGE_INSERT_2 _UxGT("filamento e")
#define MSG_FILAMENT_CHANGE_INSERT_3 _UxGT("faga click")
#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Agarde pola")
#define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("carga do")
#define MSG_FILAMENT_CHANGE_LOAD_3 _UxGT("filamento")
#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Agarde para")
#define MSG_FILAMENT_CHANGE_RESUME_2 _UxGT("seguir co")
#define MSG_FILAMENT_CHANGE_RESUME_3 _UxGT("traballo")
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Agarde para")
#define MSG_FILAMENT_CHANGE_INIT_2 _UxGT("iniciar troco")
#define MSG_FILAMENT_CHANGE_INIT_3 _UxGT("de filamento")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Agarde pola")
#define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("descarga do")
#define MSG_FILAMENT_CHANGE_UNLOAD_3 _UxGT("filamento")
#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Introduza o")
#define MSG_FILAMENT_CHANGE_INSERT_2 _UxGT("filamento e")
#define MSG_FILAMENT_CHANGE_INSERT_3 _UxGT("faga click")
#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Agarde pola")
#define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("carga do")
#define MSG_FILAMENT_CHANGE_LOAD_3 _UxGT("filamento")
#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Agarde para")
#define MSG_FILAMENT_CHANGE_RESUME_2 _UxGT("seguir co")
#define MSG_FILAMENT_CHANGE_RESUME_3 _UxGT("traballo")
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Agarde...")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Descargando...")
#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Introduza e click")
#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Cargando...")
#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Seguindo...")
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Agarde...")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Descargando...")
#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Introduza e click")
#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Cargando...")
#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Seguindo...")
#endif // LCD_HEIGHT < 4

217
Marlin/src/lcd/language/language_hr.h
View File

@ -35,8 +35,8 @@
#define WELCOME_MSG MACHINE_NAME _UxGT(" spreman.")
#define MSG_MEDIA_INSERTED _UxGT("SD kartica umetnuta")
#define MSG_MEDIA_REMOVED _UxGT("SD kartica uklonjena")
#define MSG_LCD_ENDSTOPS _UxGT("Endstops") // Max length 8 characters
#define MSG_MAIN _UxGT("Main")
//#define MSG_LCD_ENDSTOPS _UxGT("Endstops") // Max length 8 characters
//#define MSG_MAIN _UxGT("Main")
#define MSG_AUTOSTART _UxGT("Auto pokretanje")
#define MSG_DISABLE_STEPPERS _UxGT("Ugasi steppere")
#define MSG_AUTO_HOME _UxGT("Automatski homing")
@ -63,15 +63,15 @@
#define MSG_COOLDOWN _UxGT("Hlađenje")
#define MSG_SWITCH_PS_ON _UxGT("Uključi napajanje")
#define MSG_SWITCH_PS_OFF _UxGT("Isključi napajanje")
#define MSG_EXTRUDE _UxGT("Extrude")
#define MSG_RETRACT _UxGT("Retract")
//#define MSG_EXTRUDE _UxGT("Extrude")
//#define MSG_RETRACT _UxGT("Retract")
#define MSG_MOVE_AXIS _UxGT("Miči os")
#define MSG_BED_LEVELING _UxGT("Niveliraj bed")
#define MSG_LEVEL_BED _UxGT("Niveliraj bed")
#define MSG_MOVE_X _UxGT("Miči X")
#define MSG_MOVE_Y _UxGT("Miči Y")
#define MSG_MOVE_Z _UxGT("Miči Z")
#define MSG_MOVE_E _UxGT("Extruder")
//#define MSG_MOVE_E _UxGT("Extruder")
#define MSG_MOVE_Z_DIST _UxGT("Miči %smm")
#define MSG_MOVE_01MM _UxGT("Miči 0.1mm")
#define MSG_MOVE_1MM _UxGT("Miči 1mm")
@ -81,57 +81,57 @@
#define MSG_NOZZLE _UxGT("Dizna")
#define MSG_BED _UxGT("Bed")
#define MSG_FAN_SPEED _UxGT("Brzina ventilatora")
#define MSG_FLOW _UxGT("Flow")
#define MSG_CONTROL _UxGT("Control")
#define MSG_MIN _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Min")
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Autotemp")
#define MSG_LCD_ON _UxGT("On")
#define MSG_LCD_OFF _UxGT("Off")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
#define MSG_PID_C _UxGT("PID-C")
//#define MSG_FLOW _UxGT("Flow")
//#define MSG_CONTROL _UxGT("Control")
//#define MSG_MIN _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Min")
//#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
//#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
//#define MSG_AUTOTEMP _UxGT("Autotemp")
//#define MSG_LCD_ON _UxGT("On")
//#define MSG_LCD_OFF _UxGT("Off")
//#define MSG_PID_P _UxGT("PID-P")
//#define MSG_PID_I _UxGT("PID-I")
//#define MSG_PID_D _UxGT("PID-D")
//#define MSG_PID_C _UxGT("PID-C")
#define MSG_SELECT _UxGT("Odaberi")
#define MSG_ACC _UxGT("Accel")
#define MSG_JERK _UxGT("Jerk")
#if IS_KINEMATIC
#define MSG_VA_JERK _UxGT("Va-jerk")
#define MSG_VB_JERK _UxGT("Vb-jerk")
#define MSG_VC_JERK _UxGT("Vc-jerk")
#else
#define MSG_VA_JERK _UxGT("Vx-jerk")
#define MSG_VB_JERK _UxGT("Vy-jerk")
#define MSG_VC_JERK _UxGT("Vz-jerk")
#endif
#define MSG_VE_JERK _UxGT("Ve-jerk")
#define MSG_VMAX _UxGT("Vmax ")
#define MSG_VMIN _UxGT("Vmin")
#define MSG_VTRAV_MIN _UxGT("VTrav min")
#define MSG_AMAX _UxGT("Amax ")
#define MSG_A_RETRACT _UxGT("A-retract")
#define MSG_A_TRAVEL _UxGT("A-travel")
#define MSG_STEPS_PER_MM _UxGT("Steps/mm")
#if IS_KINEMATIC
#define MSG_ASTEPS _UxGT("Asteps/mm")
#define MSG_BSTEPS _UxGT("Bsteps/mm")
#define MSG_CSTEPS _UxGT("Csteps/mm")
#else
#define MSG_ASTEPS _UxGT("Xsteps/mm")
#define MSG_BSTEPS _UxGT("Ysteps/mm")
#define MSG_CSTEPS _UxGT("Zsteps/mm")
#endif
#define MSG_ESTEPS _UxGT("Esteps/mm")
#define MSG_E1STEPS _UxGT("E1steps/mm")
#define MSG_E2STEPS _UxGT("E2steps/mm")
#define MSG_E3STEPS _UxGT("E3steps/mm")
#define MSG_E4STEPS _UxGT("E4steps/mm")
#define MSG_E5STEPS _UxGT("E5steps/mm")
#define MSG_E6STEPS _UxGT("E6steps/mm")
//#define MSG_ACC _UxGT("Accel")
//#define MSG_JERK _UxGT("Jerk")
//#if IS_KINEMATIC
// #define MSG_VA_JERK _UxGT("Va-jerk")
// #define MSG_VB_JERK _UxGT("Vb-jerk")
// #define MSG_VC_JERK _UxGT("Vc-jerk")
//#else
// #define MSG_VA_JERK _UxGT("Vx-jerk")
// #define MSG_VB_JERK _UxGT("Vy-jerk")
// #define MSG_VC_JERK _UxGT("Vz-jerk")
//#endif
//#define MSG_VE_JERK _UxGT("Ve-jerk")
//#define MSG_VMAX _UxGT("Vmax ")
//#define MSG_VMIN _UxGT("Vmin")
//#define MSG_VTRAV_MIN _UxGT("VTrav min")
//#define MSG_AMAX _UxGT("Amax ")
//#define MSG_A_RETRACT _UxGT("A-retract")
//#define MSG_A_TRAVEL _UxGT("A-travel")
//#define MSG_STEPS_PER_MM _UxGT("Steps/mm")
//#if IS_KINEMATIC
// #define MSG_ASTEPS _UxGT("Asteps/mm")
// #define MSG_BSTEPS _UxGT("Bsteps/mm")
// #define MSG_CSTEPS _UxGT("Csteps/mm")
//#else
// #define MSG_ASTEPS _UxGT("Xsteps/mm")
// #define MSG_BSTEPS _UxGT("Ysteps/mm")
// #define MSG_CSTEPS _UxGT("Zsteps/mm")
//#endif
//#define MSG_ESTEPS _UxGT("Esteps/mm")
//#define MSG_E1STEPS _UxGT("E1steps/mm")
//#define MSG_E2STEPS _UxGT("E2steps/mm")
//#define MSG_E3STEPS _UxGT("E3steps/mm")
//#define MSG_E4STEPS _UxGT("E4steps/mm")
//#define MSG_E5STEPS _UxGT("E5steps/mm")
//#define MSG_E6STEPS _UxGT("E6steps/mm")
#define MSG_TEMPERATURE _UxGT("Temperature")
#define MSG_MOTION _UxGT("Gibanje")
#define MSG_FILAMENT _UxGT("Filament")
//#define MSG_FILAMENT _UxGT("Filament")
#define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm3")
#define MSG_FILAMENT_DIAM _UxGT("Fil. Dia.")
#define MSG_CONTRAST _UxGT("Kontrast LCD-a")
@ -141,52 +141,51 @@
#define MSG_REFRESH _UxGT("Osvježi")
#define MSG_WATCH _UxGT("Info screen")
#define MSG_PREPARE _UxGT("Pripremi")
#define MSG_TUNE _UxGT("Tune")
//#define MSG_TUNE _UxGT("Tune")
#define MSG_PAUSE_PRINT _UxGT("Pauziraj print")
#define MSG_RESUME_PRINT _UxGT("Nastavi print")
#define MSG_STOP_PRINT _UxGT("Zaustavi print")
#define MSG_MEDIA_MENU _UxGT("Printaj s SD kartice")
#define MSG_NO_MEDIA _UxGT("Nema SD kartice")
#define MSG_DWELL _UxGT("Sleep...")
//#define MSG_DWELL _UxGT("Sleep...")
#define MSG_USERWAIT _UxGT("Čekaj korisnika...")
#define MSG_PRINT_ABORTED _UxGT("Print otkazan")
#define MSG_NO_MOVE _UxGT("No move.")
#define MSG_KILLED _UxGT("KILLED. ")
//#define MSG_NO_MOVE _UxGT("No move.")
//#define MSG_KILLED _UxGT("KILLED. ")
#define MSG_STOPPED _UxGT("ZAUSTAVLJEN. ")
#define MSG_CONTROL_RETRACT _UxGT("Retract mm")
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Re.mm")
#define MSG_CONTROL_RETRACTF _UxGT("Retract V")
#define MSG_CONTROL_RETRACT_ZHOP _UxGT("Hop mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
#define MSG_AUTORETRACT _UxGT("AutoRetr.")
//#define MSG_CONTROL_RETRACT _UxGT("Retract mm")
//#define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Re.mm")
//#define MSG_CONTROL_RETRACTF _UxGT("Retract V")
//#define MSG_CONTROL_RETRACT_ZHOP _UxGT("Hop mm")
//#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
//#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet mm")
//#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
//#define MSG_AUTORETRACT _UxGT("AutoRetr.")
#define MSG_FILAMENTCHANGE _UxGT("Promijeni filament")
#define MSG_INIT_MEDIA _UxGT("Init. SD karticu")
#define MSG_CHANGE_MEDIA _UxGT("Promijeni SD karticu")
#define MSG_ZPROBE_OUT _UxGT("Z probe out. bed")
#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch Self-Test")
#define MSG_BLTOUCH_RESET _UxGT("Reset BLTouch")
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("first")
#define MSG_ZPROBE_ZOFFSET _UxGT("Z Offset")
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
#define MSG_BABYSTEP_Z _UxGT("Babystep Z")
#define MSG_ENDSTOP_ABORT _UxGT("Endstop abort")
//#define MSG_ZPROBE_OUT _UxGT("Z probe out. bed")
//#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch Self-Test")
//#define MSG_BLTOUCH_RESET _UxGT("Reset BLTouch")
//#define MSG_HOME_FIRST _UxGT("Home %s%s%s first")
//#define MSG_ZPROBE_ZOFFSET _UxGT("Z Offset")
//#define MSG_BABYSTEP_X _UxGT("Babystep X")
//#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
//#define MSG_BABYSTEP_Z _UxGT("Babystep Z")
//#define MSG_ENDSTOP_ABORT _UxGT("Endstop abort")
#define MSG_HEATING_FAILED_LCD _UxGT("Grijanje neuspješno")
#define MSG_ERR_REDUNDANT_TEMP _UxGT("Err: REDUNDANT TEMP")
#define MSG_THERMAL_RUNAWAY _UxGT("THERMAL RUNAWAY")
#define MSG_ERR_MAXTEMP _UxGT("Err: MAXTEMP")
#define MSG_ERR_MINTEMP _UxGT("Err: MINTEMP")
#define MSG_ERR_MAXTEMP_BED _UxGT("Err: MAXTEMP BED")
#define MSG_ERR_MINTEMP_BED _UxGT("Err: MINTEMP BED")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_HALTED _UxGT("PRINTER HALTED")
#define MSG_PLEASE_RESET _UxGT("Please reset")
#define MSG_SHORT_DAY _UxGT("d") // One character only
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
//#define MSG_ERR_REDUNDANT_TEMP _UxGT("Err: REDUNDANT TEMP")
//#define MSG_THERMAL_RUNAWAY _UxGT("THERMAL RUNAWAY")
//#define MSG_ERR_MAXTEMP _UxGT("Err: MAXTEMP")
//#define MSG_ERR_MINTEMP _UxGT("Err: MINTEMP")
//#define MSG_ERR_MAXTEMP_BED _UxGT("Err: MAXTEMP BED")
//#define MSG_ERR_MINTEMP_BED _UxGT("Err: MINTEMP BED")
//#define MSG_ERR_Z_HOMING _UxGT("Home XY first")
//#define MSG_HALTED _UxGT("PRINTER HALTED")
//#define MSG_PLEASE_RESET _UxGT("Please reset")
//#define MSG_SHORT_DAY _UxGT("d") // One character only
//#define MSG_SHORT_HOUR _UxGT("h") // One character only
//#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Grijanje...")
#define MSG_BED_HEATING _UxGT("Grijanje Bed-a...")
#define MSG_DELTA_CALIBRATE _UxGT("Delta Kalibracija")
@ -220,34 +219,34 @@
#define MSG_INFO_PRINT_FILAMENT _UxGT("Extrudirano")
#endif
#define MSG_INFO_MIN_TEMP _UxGT("Min Temp")
#define MSG_INFO_MAX_TEMP _UxGT("Max Temp")
//#define MSG_INFO_MIN_TEMP _UxGT("Min Temp")
//#define MSG_INFO_MAX_TEMP _UxGT("Max Temp")
#define MSG_INFO_PSU _UxGT("Napajanje")
#define MSG_DRIVE_STRENGTH _UxGT("Drive Strength")
#define MSG_DAC_PERCENT _UxGT("Driver %")
#define MSG_DAC_EEPROM_WRITE _UxGT("DAC EEPROM Write")
//#define MSG_DRIVE_STRENGTH _UxGT("Drive Strength")
//#define MSG_DAC_PERCENT _UxGT("Driver %")
//#define MSG_DAC_EEPROM_WRITE _UxGT("DAC EEPROM Write")
#define MSG_FILAMENT_CHANGE_OPTION_RESUME _UxGT("Nastavi print")
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Čekaj početak")
#define MSG_FILAMENT_CHANGE_INIT_2 _UxGT("filamenta")
#define MSG_FILAMENT_CHANGE_INIT_3 _UxGT("promijeni")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Čekaj")
#define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("filament unload")
#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Umetni filament")
#define MSG_FILAMENT_CHANGE_INSERT_2 _UxGT("i pritisni tipku")
#define MSG_FILAMENT_CHANGE_INSERT_3 _UxGT("za nastavak...")
#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Pričekaj")
#define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("filament load")
#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Wait for print")
#define MSG_FILAMENT_CHANGE_RESUME_2 _UxGT("to resume")
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Čekaj početak")
#define MSG_FILAMENT_CHANGE_INIT_2 _UxGT("filamenta")
#define MSG_FILAMENT_CHANGE_INIT_3 _UxGT("promijeni")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Čekaj")
#define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("filament unload")
#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Umetni filament")
#define MSG_FILAMENT_CHANGE_INSERT_2 _UxGT("i pritisni tipku")
#define MSG_FILAMENT_CHANGE_INSERT_3 _UxGT("za nastavak...")
#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Pričekaj")
#define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("filament load")
//#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Wait for print")
//#define MSG_FILAMENT_CHANGE_RESUME_2 _UxGT("to resume")
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Pričekaj...")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Ejecting...")
#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Insert and Click")
#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Loading...")
#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Nastavljam...")
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Pričekaj...")
//#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Ejecting...")
//#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Insert and Click")
//#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Loading...")
#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Nastavljam...")
#endif // LCD_HEIGHT < 4

6
Marlin/src/lcd/language/language_it.h
View File

@ -113,7 +113,6 @@
#define MSG_Y_OFFSET _UxGT("2° ugello Y")
#define MSG_Z_OFFSET _UxGT("2° ugello Z")
#define MSG_UBL_DOING_G29 _UxGT("G29 in corso")
#define MSG_UBL_UNHOMED _UxGT("Home XYZ prima")
#define MSG_UBL_TOOLS _UxGT("Strumenti UBL")
#define MSG_UBL_LEVEL_BED _UxGT("Unified Bed Leveling")
#define MSG_UBL_MANUAL_MESH _UxGT("Mesh Manuale")
@ -348,8 +347,7 @@
#define MSG_MANUAL_DEPLOY _UxGT("Estendi Sonda-Z")
#define MSG_BLTOUCH_STOW _UxGT("Ritrai BLTouch")
#define MSG_MANUAL_STOW _UxGT("Ritrai Sonda-Z")
#define MSG_HOME _UxGT("Home") // Usato come MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("prima")
#define MSG_HOME_FIRST _UxGT("Home %s%s%s prima")
#define MSG_ZPROBE_ZOFFSET _UxGT("Offset sonda Z")
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
@ -369,7 +367,7 @@
#define MSG_ERR_MINTEMP_BED _UxGT("Err: TEMP MIN PIATTO")
#define MSG_ERR_MAXTEMP_CHAMBER _UxGT("Err: TEMP MAX CAMERA")
#define MSG_ERR_MINTEMP_CHAMBER _UxGT("Err: TEMP MIN CAMERA")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Home XY prima")
#define MSG_HALTED _UxGT("STAMPANTE FERMATA")
#define MSG_PLEASE_RESET _UxGT("Riavviare prego")
#define MSG_SHORT_DAY _UxGT("g") // Un solo carattere

5
Marlin/src/lcd/language/language_jp-kana.h
View File

@ -161,8 +161,7 @@
#define MSG_ZPROBE_OUT _UxGT("Zプローブ ベッドガイ") // "Z probe out. bed"
#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch ジコシンダン") // "BLTouch Self-Test"
#define MSG_BLTOUCH_RESET _UxGT("BLTouch リセット") // "Reset BLTouch"
#define MSG_HOME _UxGT("サキニ") // "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("ヲフッキサセテクダサイ") // "first"
#define MSG_HOME_FIRST _UxGT("サキニ %s%s%s ヲフッキサセテクダサイ") // "Home ... first"
#define MSG_ZPROBE_ZOFFSET _UxGT("Zオフセット") // "Z Offset"
#define MSG_BABYSTEP_X _UxGT("Xジク ビドウ") // "Babystep X"
#define MSG_BABYSTEP_Y _UxGT("Yジク ビドウ") // "Babystep Y"
@ -175,7 +174,7 @@
#define MSG_ERR_MINTEMP _UxGT("エラー:サイテイオンミマン") // "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED _UxGT("エラー:ベッド サイコウオンチョウカ") // "Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED _UxGT("エラー:ベッド サイテイオンミマン") // "Err: MINTEMP BED"
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST // "Home XY first"
#define MSG_ERR_Z_HOMING _UxGT("サキニ XY ヲフッキサセテクダサイ") // "Home XY first"
#define MSG_HALTED _UxGT("プリンターハテイシシマシタ") // "PRINTER HALTED"
#define MSG_PLEASE_RESET _UxGT("リセットシテクダサイ") // "Please reset"
#define MSG_SHORT_DAY _UxGT("d") // One character only

6
Marlin/src/lcd/language/language_ko_KR.h
View File

@ -91,7 +91,6 @@
//#define MSG_Y_OFFSET _UxGT("2nd nozzle Y")
//#define MSG_Z_OFFSET _UxGT("2nd nozzle Z")
#define MSG_UBL_DOING_G29 _UxGT("오토레벨링 하기")
//#define MSG_UBL_UNHOMED _UxGT("Home XYZ first")
//#define MSG_UBL_TOOLS _UxGT("UBL Tools")
//#define MSG_UBL_LEVEL_BED _UxGT("Unified Bed Leveling")
//#define MSG_UBL_MANUAL_MESH _UxGT("Manually Build Mesh")
@ -293,8 +292,7 @@
//#define MSG_BLTOUCH_STOW _UxGT("Stow BLTouch")
//#define MSG_MANUAL_DEPLOY _UxGT("Deploy Z-Probe")
//#define MSG_MANUAL_STOW _UxGT("Stow Z-Probe")
//#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
//#define MSG_FIRST _UxGT("first")
//#define MSG_HOME_FIRST _UxGT("Home %s%s%s first")
//#define MSG_ZPROBE_ZOFFSET _UxGT("Probe Z Offset")
//#define MSG_BABYSTEP_X _UxGT("Babystep X")
//#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
@ -309,7 +307,7 @@
//#define MSG_ERR_MINTEMP _UxGT("Err: MINTEMP")
//#define MSG_ERR_MAXTEMP_BED _UxGT("Err: MAXTEMP BED")
//#define MSG_ERR_MINTEMP_BED _UxGT("Err: MINTEMP BED")
//#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
//#define MSG_ERR_Z_HOMING _UxGT("Home XY first")
//#define MSG_HALTED _UxGT("PRINTER HALTED")
//#define MSG_PLEASE_RESET _UxGT("Please reset")
//#define MSG_SHORT_DAY _UxGT("d") // One character only

5
Marlin/src/lcd/language/language_nl.h
View File

@ -176,8 +176,7 @@
#define MSG_ZPROBE_OUT _UxGT("Z probe uit. bed")
#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch Zelf-Test")
#define MSG_BLTOUCH_RESET _UxGT("Reset BLTouch")
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("Eerst")
#define MSG_HOME_FIRST _UxGT("Home %s%s%s Eerst")
#define MSG_ZPROBE_ZOFFSET _UxGT("Z Offset") //accepted English term in Dutch
#define MSG_BABYSTEP_X _UxGT("Babystap X")
#define MSG_BABYSTEP_Y _UxGT("Babystap Y")
@ -190,7 +189,7 @@
#define MSG_ERR_MINTEMP _UxGT("Err: Min. temp")
#define MSG_ERR_MAXTEMP_BED _UxGT("Err: Max.tmp bed")
#define MSG_ERR_MINTEMP_BED _UxGT("Err: Min.tmp bed")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Home XY Eerst")
#define MSG_HALTED _UxGT("PRINTER GESTOPT")
#define MSG_PLEASE_RESET _UxGT("Reset A.U.B.")
#define MSG_SHORT_DAY _UxGT("d") // One character only. Keep English standard

5
Marlin/src/lcd/language/language_pl.h
View File

@ -166,8 +166,7 @@
#define MSG_ZPROBE_OUT _UxGT("Sonda Z za stołem")
#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch Self-Test")
#define MSG_BLTOUCH_RESET _UxGT("Reset BLTouch")
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("first")
#define MSG_HOME_FIRST _UxGT("Home %s%s%s first")
#define MSG_ZPROBE_ZOFFSET _UxGT("Offset Z")
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
@ -180,7 +179,7 @@
#define MSG_ERR_MINTEMP _UxGT("Err min temp")
#define MSG_ERR_MAXTEMP_BED _UxGT("Err max temp stołu")
#define MSG_ERR_MINTEMP_BED _UxGT("Err min temp stołu")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Home XY first")
#define MSG_HALTED _UxGT("Drukarka zatrzym.")
#define MSG_PLEASE_RESET _UxGT("Proszę zresetować")
#define MSG_SHORT_DAY _UxGT("d") // One character only

6
Marlin/src/lcd/language/language_pt-br.h
View File

@ -102,7 +102,6 @@
#define MSG_Z_OFFSET _UxGT("2o bico Z")
#define MSG_UBL_DOING_G29 _UxGT("Executando G29")
#define MSG_UBL_UNHOMED _UxGT("Fora da Origam")
#define MSG_UBL_TOOLS _UxGT("Ferramentas UBL")
#define MSG_UBL_LEVEL_BED _UxGT("Nivel. Mesa Unif.")
#define MSG_UBL_MANUAL_MESH _UxGT("Fazer malha manual")
@ -311,8 +310,7 @@
#define MSG_MANUAL_DEPLOY _UxGT("Estender Sonda-Z")
#define MSG_MANUAL_STOW _UxGT("Recolher Sonda-Z")
#define MSG_HOME _UxGT("Home")
#define MSG_FIRST _UxGT("Primeiro")
#define MSG_HOME_FIRST _UxGT("Home %s%s%s Primeiro")
#define MSG_ZPROBE_ZOFFSET _UxGT("Compensar Sonda em Z")
#define MSG_BABYSTEP_X _UxGT("Passinho X")
#define MSG_BABYSTEP_Y _UxGT("Passinho Y")
@ -327,7 +325,7 @@
#define MSG_ERR_MINTEMP _UxGT("Erro:Temp Mínima")
#define MSG_ERR_MAXTEMP_BED _UxGT("Erro:Temp Mesa Máx")
#define MSG_ERR_MINTEMP_BED _UxGT("Erro:Temp Mesa Mín")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Home XY Primeiro")
#define MSG_HALTED _UxGT("IMPRESSORA PAROU")
#define MSG_PLEASE_RESET _UxGT("Favor resetar")
#define MSG_SHORT_DAY _UxGT("d")

3
Marlin/src/lcd/language/language_pt.h
View File

@ -162,8 +162,7 @@
#define MSG_INIT_MEDIA _UxGT("Inici. cartão SD")
#define MSG_CHANGE_MEDIA _UxGT("Trocar cartão SD")
#define MSG_ZPROBE_OUT _UxGT("Sensor fora/base")
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("first")
#define MSG_HOME_FIRST _UxGT("Home %s%s%s first")
#define MSG_ZPROBE_ZOFFSET _UxGT("Desvio Z")
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")

6
Marlin/src/lcd/language/language_ru.h
View File

@ -96,7 +96,6 @@
#define MSG_Z_OFFSET _UxGT("2-е сопло Z")
#define MSG_UBL_DOING_G29 _UxGT("Выполняем G29")
#define MSG_UBL_UNHOMED _UxGT("Паркуем сначала XYZ")
#define MSG_UBL_TOOLS _UxGT("Утилиты UBL")
#define MSG_UBL_LEVEL_BED _UxGT("Калибровка UBL")
#define MSG_UBL_MANUAL_MESH _UxGT("Постр. сетку от руки")
@ -316,8 +315,7 @@
// TODO: TouchMI Probe, Manual deploy/stow
#define MSG_HOME _UxGT("Паркуй") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("сначала")
#define MSG_HOME_FIRST _UxGT("Паркуй %s%s%s сначала")
#define MSG_ZPROBE_ZOFFSET _UxGT("Смещение Z")
#define MSG_BABYSTEP_X _UxGT("Микрошаг X")
#define MSG_BABYSTEP_Y _UxGT("Микрошаг Y")
@ -334,7 +332,7 @@
#define MSG_ERR_MAXTEMP_BED _UxGT("Ошибка: Т стола макс")
#define MSG_ERR_MINTEMP_BED _UxGT("Ошибка: Т стола мин.")
// TODO: Heated chamber
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Паркуй XY сначала")
#define MSG_HALTED _UxGT("ПРИНТЕР ОСТАНОВЛЕН")
#define MSG_PLEASE_RESET _UxGT("Сделайте сброс")
#define MSG_SHORT_DAY _UxGT("д") // One character only

6
Marlin/src/lcd/language/language_sk.h
View File

@ -120,7 +120,6 @@
#define MSG_Y_OFFSET _UxGT("2. tryska Y")
#define MSG_Z_OFFSET _UxGT("2. tryska Z")
#define MSG_UBL_DOING_G29 _UxGT("Vykonávam G29")
#define MSG_UBL_UNHOMED _UxGT("Prejdite domov")
#define MSG_UBL_TOOLS _UxGT("Nástroje UBL")
#define MSG_UBL_LEVEL_BED _UxGT("UBL rovnanie")
#define MSG_LCD_TILTING_MESH _UxGT("Vyrovnávam bod")
@ -357,8 +356,7 @@
#define MSG_MANUAL_DEPLOY_TOUCHMI _UxGT("Zasunúť TouchMI")
#define MSG_MANUAL_DEPLOY _UxGT("Zasunúť sondu Z")
#define MSG_MANUAL_STOW _UxGT("Vysunúť sondu Z")
#define MSG_HOME _UxGT("Najskôr os") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("domov")
#define MSG_HOME_FIRST _UxGT("Najskôr os %s%s%s domov")
#define MSG_ZPROBE_ZOFFSET _UxGT("Ofset sondy Z")
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
@ -378,7 +376,7 @@
#define MSG_ERR_MINTEMP_BED _UxGT("Chyba: MINTEMP PODL.")
#define MSG_ERR_MAXTEMP_CHAMBER _UxGT("Chyba: MAXTEMP KOMO.")
#define MSG_ERR_MINTEMP_CHAMBER _UxGT("Chyba: MINTEMP KOMO.")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Najskôr os XY domov")
#define MSG_HALTED _UxGT("TLAČIAREŇ ZASTAVENÁ")
#define MSG_PLEASE_RESET _UxGT("Reštartuje ju")
#define MSG_SHORT_DAY _UxGT("d")

4
Marlin/src/lcd/language/language_tr.h
View File

@ -101,7 +101,6 @@
#define MSG_Y_OFFSET _UxGT("2. nozul Y")
#define MSG_Z_OFFSET _UxGT("2. nozul Z")
#define MSG_UBL_DOING_G29 _UxGT("G29 Çalışıyor")
#define MSG_UBL_UNHOMED _UxGT("Ilk XYZ Sıfırla")
#define MSG_UBL_TOOLS _UxGT("UBL Araçları")
#define MSG_UBL_LEVEL_BED _UxGT("UBL Yatak Hizalama")
#define MSG_UBL_MANUAL_MESH _UxGT("Elle Mesh Oluştur")
@ -309,8 +308,7 @@
#define MSG_BLTOUCH_STOW _UxGT("BLTouch Kapat")
#define MSG_MANUAL_DEPLOY _UxGT("Z-Prob Aç")
#define MSG_MANUAL_STOW _UxGT("Z-Sensör Kapat")
#define MSG_HOME _UxGT("Sıfırla")
#define MSG_FIRST _UxGT("Önce")
#define MSG_HOME_FIRST _UxGT("Sıfırla %s%s%s Önce")
#define MSG_ZPROBE_ZOFFSET _UxGT("Z Offset")
#define MSG_BABYSTEP_X _UxGT("Miniadım X")
#define MSG_BABYSTEP_Y _UxGT("Miniadım Y")

5
Marlin/src/lcd/language/language_uk.h
View File

@ -159,8 +159,7 @@
#define MSG_ZPROBE_OUT _UxGT("Z дет. не в межах")
#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch Само-Тест")
#define MSG_BLTOUCH_RESET _UxGT("Скинути BLTouch")
#define MSG_HOME _UxGT("Дім") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("перший")
#define MSG_HOME_FIRST _UxGT("Дім %s%s%s перший")
#define MSG_ZPROBE_ZOFFSET _UxGT("Зміщення Z")
#define MSG_BABYSTEP_X _UxGT("Мікрокрок X")
#define MSG_BABYSTEP_Y _UxGT("Мікрокрок Y")
@ -168,7 +167,7 @@
#define MSG_ENDSTOP_ABORT _UxGT("невдача кінцевика")
#define MSG_HEATING_FAILED_LCD _UxGT("Невдалий нагрів")
#define MSG_THERMAL_RUNAWAY _UxGT("ЗБІЙ ТЕМПЕРАТУРИ")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Дім XY перший")
#define MSG_HALTED _UxGT("ПРИНТЕР ЗУПИНЕНО")
#define MSG_PLEASE_RESET _UxGT("Перезавантажте")
#define MSG_SHORT_DAY _UxGT("д") // One character only

6
Marlin/src/lcd/language/language_vi.h
View File

@ -88,7 +88,6 @@
#define MSG_MESH_EDIT_Z _UxGT("Giá trị Z") // Z Value
#define MSG_USER_MENU _UxGT("Các lệnh tự chọn") // Custom Commands
#define MSG_UBL_DOING_G29 _UxGT("Đang chạy G29") // Doing G29
#define MSG_UBL_UNHOMED _UxGT("Về nhà XYZ trước")
#define MSG_UBL_TOOLS _UxGT("Công cụ UBL") // UBL tools
#define MSG_UBL_LEVEL_BED _UxGT("San Lấp Bàn Thống Nhất (UBL)") // Unified Bed Leveling
#define MSG_IDEX_MENU _UxGT("chế độ IDEX") // IDEX Mode
@ -307,8 +306,7 @@
#define MSG_BLTOUCH_STOW _UxGT("Cất BLTouch") // Stow BLTouch
#define MSG_MANUAL_DEPLOY _UxGT("Đem Đầu Dò-Z") // Deploy Z-Probe
#define MSG_MANUAL_STOW _UxGT("Cất Đầu Dò-Z") // Stow Z-Probe
#define MSG_HOME _UxGT("Về nhà") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("Trước")
#define MSG_HOME_FIRST _UxGT("Về nhà %s%s%s Trước")
#define MSG_ZPROBE_ZOFFSET _UxGT("Đầu Dò Bù Đắp Z") // Probe Z Offset
#define MSG_BABYSTEP_X _UxGT("Nhít X") // Babystep X
#define MSG_BABYSTEP_Y _UxGT("Nhít Y")
@ -323,7 +321,7 @@
#define MSG_ERR_MINTEMP _UxGT("Điều sai: nhiệt độ tối thiểu") // Err: MINTEMP
#define MSG_ERR_MAXTEMP_BED _UxGT("Điều sai: nhiệt độ bàn tối đa") // Err: MAXTEMP BED
#define MSG_ERR_MINTEMP_BED _UxGT("Điều sai: nhiệt độ bàn tối thiểu") // Err: MINTEMP BED
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("Về nhà XY Trước") // Home XY First
#define MSG_HALTED _UxGT("MÁY IN ĐÃ DỪNG LẠI") // PRINTER HALTED
#define MSG_PLEASE_RESET _UxGT("Xin bặt lại") // Please reset
#define MSG_SHORT_DAY _UxGT("n") // d - ngày - One character only

6
Marlin/src/lcd/language/language_zh_CN.h
View File

@ -79,7 +79,6 @@
#define MSG_USER_MENU _UxGT("定制命令") // "Custom Commands"
#define MSG_UBL_DOING_G29 _UxGT("执行G29") // "Doing G29"
#define MSG_UBL_UNHOMED _UxGT("先回XYZ原点") // "Home XYZ first"
#define MSG_UBL_TOOLS _UxGT("UBL工具") // "UBL Tools"
#define MSG_UBL_LEVEL_BED _UxGT("统一热床调平(UBL)") // "Unified Bed Leveling"
#define MSG_UBL_MANUAL_MESH _UxGT("手工创设网格") // "Manually Build Mesh"
@ -274,8 +273,7 @@
#define MSG_BLTOUCH_RESET _UxGT("重置BLTouch") // "Reset BLTouch"
#define MSG_BLTOUCH_DEPLOY _UxGT("部署BLTouch") // "Deploy BLTouch"
#define MSG_BLTOUCH_STOW _UxGT("装载BLTouch") // "Stow BLTouch"
#define MSG_HOME _UxGT("归位") //"Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("先") //"first"
#define MSG_HOME_FIRST _UxGT("归位 %s%s%s 先") //"Home ... first"
#define MSG_ZPROBE_ZOFFSET _UxGT("Z偏移") //"Z Offset"
#define MSG_BABYSTEP_X _UxGT("微量调整X轴") //"Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts
#define MSG_BABYSTEP_Y _UxGT("微量调整Y轴") //"Babystep Y"
@ -288,7 +286,7 @@
#define MSG_ERR_MINTEMP _UxGT("错误：最低温度") //"Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED _UxGT("错误：最高热床温度") //"Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED _UxGT("错误：最低热床温度") //"Err: MINTEMP BED"
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("归位 XY 先") // "Home XY First"
#define MSG_HALTED _UxGT("打印停机") //"PRINTER HALTED"
#define MSG_PLEASE_RESET _UxGT("请重置") //"Please reset"
#define MSG_SHORT_DAY _UxGT("天") //"d" // One character only

6
Marlin/src/lcd/language/language_zh_TW.h
View File

@ -79,7 +79,6 @@
#define MSG_USER_MENU _UxGT("客制命令") // "Custom Commands"
#define MSG_UBL_DOING_G29 _UxGT("执行G29") // "Doing G29"
#define MSG_UBL_UNHOMED _UxGT("先回XYZ原點") // "Home XYZ first"
#define MSG_UBL_TOOLS _UxGT("UBL工具") // "UBL Tools"
#define MSG_UBL_LEVEL_BED _UxGT("統一熱床調平(UBL)") // "Unified Bed Leveling"
#define MSG_UBL_MANUAL_MESH _UxGT("手工建网") // "Manually Build Mesh"
@ -274,8 +273,7 @@
#define MSG_BLTOUCH_RESET _UxGT("重置BLTouch") // "Reset BLTouch"
#define MSG_BLTOUCH_DEPLOY _UxGT("部署BLTouch") // "Deploy BLTouch"
#define MSG_BLTOUCH_STOW _UxGT("裝載BLTouch") // "Stow BLTouch"
#define MSG_HOME _UxGT("歸位") //"Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("先") //"first"
#define MSG_HOME_FIRST _UxGT("歸位 %s%s%s 先") //"Home ... first"
#define MSG_ZPROBE_ZOFFSET _UxGT("Z偏移") //"Z Offset"
#define MSG_BABYSTEP_X _UxGT("微量調整X軸") //"Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts
#define MSG_BABYSTEP_Y _UxGT("微量調整Y軸") //"Babystep Y"
@ -288,7 +286,7 @@
#define MSG_ERR_MINTEMP _UxGT("錯誤：最低溫度") //"Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED _UxGT("錯誤：最高熱床溫度") //"Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED _UxGT("錯誤：最低熱床溫度") //"Err: MINTEMP BED"
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_ERR_Z_HOMING _UxGT("歸位 XY 先") //"Home XY First"
#define MSG_HALTED _UxGT("印表機停機") //"PRINTER HALTED"
#define MSG_PLEASE_RESET _UxGT("請重置") //"Please reset"
#define MSG_SHORT_DAY _UxGT("天") //"d" // One character only

36
Marlin/src/module/motion.cpp
View File

@ -1030,26 +1030,32 @@ void prepare_move_to_destination() {
set_current_from_destination();
}
bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool z/*=true*/) {
uint8_t axes_need_homing(uint8_t axis_bits/*=0x07*/) {
#if ENABLED(HOME_AFTER_DEACTIVATE)
const bool xx = x && !TEST(axis_known_position, X_AXIS),
yy = y && !TEST(axis_known_position, Y_AXIS),
zz = z && !TEST(axis_known_position, Z_AXIS);
#define HOMED_FLAGS axis_known_position
#else
const bool xx = x && !TEST(axis_homed, X_AXIS),
yy = y && !TEST(axis_homed, Y_AXIS),
zz = z && !TEST(axis_homed, Z_AXIS);
#define HOMED_FLAGS axis_homed
#endif
if (xx || yy || zz) {
SERIAL_ECHO_START();
SERIAL_ECHOPGM(MSG_HOME " ");
if (xx) SERIAL_CHAR('X');
if (yy) SERIAL_CHAR('Y');
if (zz) SERIAL_CHAR('Z');
SERIAL_ECHOLNPGM(" " MSG_FIRST);
// Clear test bits that are homed
if (TEST(axis_bits, X_AXIS) && TEST(HOMED_FLAGS, X_AXIS)) CBI(axis_bits, X_AXIS);
if (TEST(axis_bits, Y_AXIS) && TEST(HOMED_FLAGS, Y_AXIS)) CBI(axis_bits, Y_AXIS);
if (TEST(axis_bits, Z_AXIS) && TEST(HOMED_FLAGS, Z_AXIS)) CBI(axis_bits, Z_AXIS);
return axis_bits;
}
bool axis_unhomed_error(uint8_t axis_bits/*=0x07*/) {
if ((axis_bits = axes_need_homing(axis_bits))) {
static const char home_first[] PROGMEM = MSG_HOME_FIRST;
char msg[sizeof(home_first)];
sprintf_P(msg, home_first,
TEST(axis_bits, X_AXIS) ? "X" : "",
TEST(axis_bits, Y_AXIS) ? "Y" : "",
TEST(axis_bits, Z_AXIS) ? "Z" : ""
);
SERIAL_ECHO_START();
SERIAL_ECHO(msg);
#if HAS_DISPLAY
ui.status_printf_P(0, PSTR(MSG_HOME " %s%s%s " MSG_FIRST), xx ? MSG_X : "", yy ? MSG_Y : "", zz ? MSG_Z : "");
ui.set_status(msg);
#endif
return true;
}

3
Marlin/src/module/motion.h
View File

@ -211,7 +211,8 @@ void restore_feedrate_and_scaling();
// Homing
//
bool axis_unhomed_error(const bool x=true, const bool y=true, const bool z=true);
uint8_t axes_need_homing(uint8_t axis_bits=0x07);
bool axis_unhomed_error(uint8_t axis_bits=0x07);
#if ENABLED(NO_MOTION_BEFORE_HOMING)
#define MOTION_CONDITIONS (IsRunning() && !axis_unhomed_error())

11
Marlin/src/module/probe.cpp
View File

@ -373,12 +373,11 @@ bool set_probe_deployed(const bool deploy) {
do_probe_raise(_MAX(Z_CLEARANCE_BETWEEN_PROBES, Z_CLEARANCE_DEPLOY_PROBE));
#if EITHER(Z_PROBE_SLED, Z_PROBE_ALLEN_KEY)
#if ENABLED(Z_PROBE_SLED)
#define _AUE_ARGS true, false, false
#else
#define _AUE_ARGS
#endif
if (axis_unhomed_error(_AUE_ARGS)) {
if (axis_unhomed_error(
#if ENABLED(Z_PROBE_SLED)
_BV(X_AXIS)
#endif
)) {
SERIAL_ERROR_MSG(MSG_STOP_UNHOMED);
stop();
return true;

2
Marlin/src/module/tool_change.cpp
View File

@ -158,7 +158,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
#endif
);
if (axis_unhomed_error(true, false, false)) return;
if (axis_unhomed_error(_BV(X_AXIS))) return;
/**
* Z Lift and Nozzle Offset shift ar defined in caller method to work equal with any Multi Hotend realization

Write Preview
Loading…
Cancel
Save