thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Combine "XYZ" with MSG_LEVEL_BED_HOMING

Scott Lahteine 9 years ago
parent
097cc75ba8
commit
a393941d2d
18 changed files with 18 additions and 18 deletions
Unified View Show Diff Stats
  1. 1
    1
      Marlin/language_an.h
  2. 1
    1
      Marlin/language_bg.h
  3. 1
    1
      Marlin/language_ca.h
  4. 1
    1
      Marlin/language_cn.h
  5. 1
    1
      Marlin/language_da.h
  6. 1
    1
      Marlin/language_de.h
  7. 1
    1
      Marlin/language_en.h
  8. 1
    1
      Marlin/language_es.h
  9. 1
    1
      Marlin/language_eu.h
  10. 1
    1
      Marlin/language_fi.h
  11. 1
    1
      Marlin/language_fr.h
  12. 1
    1
      Marlin/language_it.h
  13. 1
    1
      Marlin/language_kana.h
  14. 1
    1
      Marlin/language_nl.h
  15. 1
    1
      Marlin/language_pl.h
  16. 1
    1
      Marlin/language_pt-br.h
  17. 1
    1
      Marlin/language_ru.h
  18. 1
    1
      Marlin/ultralcd.cpp

+ 1
- 1
Marlin/language_an.h View File

42 
 #define MSG_AUTOSTART                       " Autostart"
 42 
 #define MSG_AUTOSTART                       " Autostart"
43 
 #define MSG_DISABLE_STEPPERS                "Amortar motors"
 43 
 #define MSG_DISABLE_STEPPERS                "Amortar motors"
44 
 #define MSG_AUTO_HOME                       "Levar a l'orichen"
 44 
 #define MSG_AUTO_HOME                       "Levar a l'orichen"
45 
-#define MSG_LEVEL_BED_HOMING                "Homing"
45 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
46 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 46 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
47 
 #define MSG_SET_ORIGIN                      "Establir zero"
 47 
 #define MSG_SET_ORIGIN                      "Establir zero"
48 
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"
 48 
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"

+ 1
- 1
Marlin/language_bg.h View File

42 
 #define MSG_AUTOSTART                       "Автостарт"
 42 
 #define MSG_AUTOSTART                       "Автостарт"
43 
 #define MSG_DISABLE_STEPPERS                "Изкл. двигатели"
 43 
 #define MSG_DISABLE_STEPPERS                "Изкл. двигатели"
44 
 #define MSG_AUTO_HOME                       "Паркиране"
 44 
 #define MSG_AUTO_HOME                       "Паркиране"
45 
-#define MSG_LEVEL_BED_HOMING                "Homing"
45 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
46 
 #define MSG_SET_HOME_OFFSETS                "Задай Начало"
 46 
 #define MSG_SET_HOME_OFFSETS                "Задай Начало"
47 
 #define MSG_SET_ORIGIN                      "Изходна точка"
 47 
 #define MSG_SET_ORIGIN                      "Изходна точка"
48 
 #define MSG_PREHEAT_PLA                     "Подгряване PLA"
 48 
 #define MSG_PREHEAT_PLA                     "Подгряване PLA"

+ 1
- 1
Marlin/language_ca.h View File

43 
 #define MSG_AUTOSTART                       "Inici automatic"
 43 
 #define MSG_AUTOSTART                       "Inici automatic"
44 
 #define MSG_DISABLE_STEPPERS                "Apagar motors"
 44 
 #define MSG_DISABLE_STEPPERS                "Apagar motors"
45 
 #define MSG_AUTO_HOME                       "Home global"
 45 
 #define MSG_AUTO_HOME                       "Home global"
46 
-#define MSG_LEVEL_BED_HOMING                "Homing"
46 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
47 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 47 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
48 
 #define MSG_SET_ORIGIN                      "Establir origen"
 48 
 #define MSG_SET_ORIGIN                      "Establir origen"
49 
 #define MSG_PREHEAT_PLA                     "Preescalfar PLA"
 49 
 #define MSG_PREHEAT_PLA                     "Preescalfar PLA"

+ 1
- 1
Marlin/language_cn.h View File

40 
 #define MSG_AUTOSTART                       "\xb1\xb2\xb3\xb4"
 40 
 #define MSG_AUTOSTART                       "\xb1\xb2\xb3\xb4"
41 
 #define MSG_DISABLE_STEPPERS                "\xb5\xb6\xb7\xb8\xb9\xba"
 41 
 #define MSG_DISABLE_STEPPERS                "\xb5\xb6\xb7\xb8\xb9\xba"
42 
 #define MSG_AUTO_HOME                       "\xbb\xbc\xbd"
 42 
 #define MSG_AUTO_HOME                       "\xbb\xbc\xbd"
43 
-#define MSG_LEVEL_BED_HOMING                "Homing"
43 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
44 
 #define MSG_SET_HOME_OFFSETS                "\xbe\xbf\xbb\xbc\xbd\xc0\xc1"
 44 
 #define MSG_SET_HOME_OFFSETS                "\xbe\xbf\xbb\xbc\xbd\xc0\xc1"
45 
 #define MSG_SET_ORIGIN                      "\xbe\xbf\xbc\xbd"
 45 
 #define MSG_SET_ORIGIN                      "\xbe\xbf\xbc\xbd"
46 
 #define MSG_PREHEAT_PLA                     "\xc3\xc4 PLA"
 46 
 #define MSG_PREHEAT_PLA                     "\xc3\xc4 PLA"

+ 1
- 1
Marlin/language_da.h View File

43 
 #define MSG_AUTO_HOME                       "Home" // G28
 43 
 #define MSG_AUTO_HOME                       "Home" // G28
44 
 #define MSG_COOLDOWN                        "Afkøl"
 44 
 #define MSG_COOLDOWN                        "Afkøl"
45 
 #define MSG_DISABLE_STEPPERS                "Slå stepper fra"
 45 
 #define MSG_DISABLE_STEPPERS                "Slå stepper fra"
46 
-#define MSG_LEVEL_BED_HOMING                "Homing"
46 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
47 
 #define MSG_SET_HOME_OFFSETS                "Sæt home offsets"
 47 
 #define MSG_SET_HOME_OFFSETS                "Sæt home offsets"
48 
 #define MSG_SET_ORIGIN                      "Sæt origin"
 48 
 #define MSG_SET_ORIGIN                      "Sæt origin"
49 
 #define MSG_SWITCH_PS_ON                    "Slå strøm til"
 49 
 #define MSG_SWITCH_PS_ON                    "Slå strøm til"

+ 1
- 1
Marlin/language_de.h View File

42 
 #define MSG_AUTOSTART                       "Autostart"
 42 
 #define MSG_AUTOSTART                       "Autostart"
43 
 #define MSG_DISABLE_STEPPERS                "Motoren Aus" // M84
 43 
 #define MSG_DISABLE_STEPPERS                "Motoren Aus" // M84
44 
 #define MSG_AUTO_HOME                       "Home" // G28
 44 
 #define MSG_AUTO_HOME                       "Home" // G28
45 
-#define MSG_LEVEL_BED_HOMING                "Homing"
45 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
46 
 #define MSG_SET_HOME_OFFSETS                "Setze Home hier"
 46 
 #define MSG_SET_HOME_OFFSETS                "Setze Home hier"
47 
 #define MSG_SET_ORIGIN                      "Setze Null hier" //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
 47 
 #define MSG_SET_ORIGIN                      "Setze Null hier" //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
48 
 #define MSG_PREHEAT_PLA                     "Vorwärmen PLA"
 48 
 #define MSG_PREHEAT_PLA                     "Vorwärmen PLA"

+ 1
- 1
Marlin/language_en.h View File

62 
   #define MSG_AUTO_HOME                       "Auto home"
 62 
   #define MSG_AUTO_HOME                       "Auto home"
63 
 #endif
 63 
 #endif
64 
 #ifndef MSG_LEVEL_BED_HOMING
 64 
 #ifndef MSG_LEVEL_BED_HOMING
65 
-  #define MSG_LEVEL_BED_HOMING                "Homing"
65 
+  #define MSG_LEVEL_BED_HOMING                "Homing XYZ"
66 
 #endif
 66 
 #endif
67 
 #ifndef MSG_SET_HOME_OFFSETS
 67 
 #ifndef MSG_SET_HOME_OFFSETS
68 
   #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 68 
   #define MSG_SET_HOME_OFFSETS                "Set home offsets"

+ 1
- 1
Marlin/language_es.h View File

42 
 #define MSG_AUTOSTART                       "Autostart"
 42 
 #define MSG_AUTOSTART                       "Autostart"
43 
 #define MSG_DISABLE_STEPPERS                "Apagar motores"
 43 
 #define MSG_DISABLE_STEPPERS                "Apagar motores"
44 
 #define MSG_AUTO_HOME                       "Llevar al origen"
 44 
 #define MSG_AUTO_HOME                       "Llevar al origen"
45 
-#define MSG_LEVEL_BED_HOMING                "Homing"
45 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
46 
 #define MSG_SET_HOME_OFFSETS                "Ajustar offsets"
 46 
 #define MSG_SET_HOME_OFFSETS                "Ajustar offsets"
47 
 #define MSG_SET_ORIGIN                      "Establecer cero"
 47 
 #define MSG_SET_ORIGIN                      "Establecer cero"
48 
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"
 48 
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"

+ 1
- 1
Marlin/language_eu.h View File

42 
 #define MSG_AUTOSTART                       "Auto hasiera"
 42 
 #define MSG_AUTOSTART                       "Auto hasiera"
43 
 #define MSG_DISABLE_STEPPERS                "Itzali motoreak"
 43 
 #define MSG_DISABLE_STEPPERS                "Itzali motoreak"
44 
 #define MSG_AUTO_HOME                       "Hasierara joan"
 44 
 #define MSG_AUTO_HOME                       "Hasierara joan"
45 
-#define MSG_LEVEL_BED_HOMING                "Homing"
45 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
46 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 46 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
47 
 #define MSG_SET_ORIGIN                      "Hasiera ipini"
 47 
 #define MSG_SET_ORIGIN                      "Hasiera ipini"
48 
 #define MSG_PREHEAT_PLA                     "Aurreberotu PLA"
 48 
 #define MSG_PREHEAT_PLA                     "Aurreberotu PLA"

+ 1
- 1
Marlin/language_fi.h View File

42 
 #define MSG_AUTOSTART                       "Automaatti"
 42 
 #define MSG_AUTOSTART                       "Automaatti"
43 
 #define MSG_DISABLE_STEPPERS                "Vapauta moottorit"
 43 
 #define MSG_DISABLE_STEPPERS                "Vapauta moottorit"
44 
 #define MSG_AUTO_HOME                       "Aja referenssiin"
 44 
 #define MSG_AUTO_HOME                       "Aja referenssiin"
45 
-#define MSG_LEVEL_BED_HOMING                "Homing"
45 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
46 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 46 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
47 
 #define MSG_SET_ORIGIN                      "Aseta origo"
 47 
 #define MSG_SET_ORIGIN                      "Aseta origo"
48 
 #define MSG_PREHEAT_PLA                     "Esilämmitä PLA"
 48 
 #define MSG_PREHEAT_PLA                     "Esilämmitä PLA"

+ 1
- 1
Marlin/language_fr.h View File

43 
 #define MSG_AUTOSTART                       "Demarrage auto"
 43 
 #define MSG_AUTOSTART                       "Demarrage auto"
44 
 #define MSG_DISABLE_STEPPERS                "Arreter moteurs"
 44 
 #define MSG_DISABLE_STEPPERS                "Arreter moteurs"
45 
 #define MSG_AUTO_HOME                       "Home auto."
 45 
 #define MSG_AUTO_HOME                       "Home auto."
46 
-#define MSG_LEVEL_BED_HOMING                "Homing"
46 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
47 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 47 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
48 
 #define MSG_SET_ORIGIN                      "Regler origine"
 48 
 #define MSG_SET_ORIGIN                      "Regler origine"
49 
 #define MSG_PREHEAT_PLA                     "Prechauffage PLA"
 49 
 #define MSG_PREHEAT_PLA                     "Prechauffage PLA"

+ 1
- 1
Marlin/language_it.h View File

42 
 #define MSG_AUTOSTART                       "Autostart"
 42 
 #define MSG_AUTOSTART                       "Autostart"
43 
 #define MSG_DISABLE_STEPPERS                "Disabilita Motori"
 43 
 #define MSG_DISABLE_STEPPERS                "Disabilita Motori"
44 
 #define MSG_AUTO_HOME                       "Auto Home"
 44 
 #define MSG_AUTO_HOME                       "Auto Home"
45 
-#define MSG_LEVEL_BED_HOMING                "Homing"
45 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
46 
 #define MSG_SET_HOME_OFFSETS                "Setta offset home"
 46 
 #define MSG_SET_HOME_OFFSETS                "Setta offset home"
47 
 #define MSG_SET_ORIGIN                      "Imposta Origine"
 47 
 #define MSG_SET_ORIGIN                      "Imposta Origine"
48 
 #define MSG_PREHEAT_PLA                     "Preriscalda PLA"
 48 
 #define MSG_PREHEAT_PLA                     "Preriscalda PLA"

+ 1
- 1
Marlin/language_kana.h View File

44 
 #define MSG_AUTOSTART                       "\xbc\xde\xc4\xde\xb3\xb6\xb2\xbc"                             // "Autostart"
 44 
 #define MSG_AUTOSTART                       "\xbc\xde\xc4\xde\xb3\xb6\xb2\xbc"                             // "Autostart"
45 
 #define MSG_DISABLE_STEPPERS                "\xd3\xb0\xc0\xb0\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xcc"         // "Disable steppers"
 45 
 #define MSG_DISABLE_STEPPERS                "\xd3\xb0\xc0\xb0\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xcc"         // "Disable steppers"
46 
 #define MSG_AUTO_HOME                       "\xb9\xde\xdd\xc3\xdd\xc6\xb2\xc4\xde\xb3"                     // "Auto home"
 46 
 #define MSG_AUTO_HOME                       "\xb9\xde\xdd\xc3\xdd\xc6\xb2\xc4\xde\xb3"                     // "Auto home"
47 
-#define MSG_LEVEL_BED_HOMING                "\xb9\xde\xdd\xc3\xdd\xc6\xb2\xc4\xde\xb3"                     // "Homing"
47 
+#define MSG_LEVEL_BED_HOMING                "\xb9\xde\xdd\xc3\xdd\xc6\xb2\xc4\xde\xb3"                     // "Homing XYZ"
48 
 #define MSG_SET_HOME_OFFSETS                "\xb7\xbc\xde\xad\xdd\xb5\xcc\xbe\xaf\xc4\xbe\xaf\xc3\xb2"     // "Set home offsets"
 48 
 #define MSG_SET_HOME_OFFSETS                "\xb7\xbc\xde\xad\xdd\xb5\xcc\xbe\xaf\xc4\xbe\xaf\xc3\xb2"     // "Set home offsets"
49 
 #define MSG_SET_ORIGIN                      "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4"                             // "Set origin"
 49 
 #define MSG_SET_ORIGIN                      "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4"                             // "Set origin"
50 
 #define MSG_PREHEAT_PLA                     "PLA \xd6\xc8\xc2"                                             // "Preheat PLA"
 50 
 #define MSG_PREHEAT_PLA                     "PLA \xd6\xc8\xc2"                                             // "Preheat PLA"

+ 1
- 1
Marlin/language_nl.h View File

42 
 #define MSG_AUTOSTART                       "Autostart"
 42 
 #define MSG_AUTOSTART                       "Autostart"
43 
 #define MSG_DISABLE_STEPPERS                "Motoren uit"
 43 
 #define MSG_DISABLE_STEPPERS                "Motoren uit"
44 
 #define MSG_AUTO_HOME                       "Auto home"
 44 
 #define MSG_AUTO_HOME                       "Auto home"
45 
-#define MSG_LEVEL_BED_HOMING                "Homing"
45 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
46 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 46 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
47 
 #define MSG_SET_ORIGIN                      "Nulpunt instellen"
 47 
 #define MSG_SET_ORIGIN                      "Nulpunt instellen"
48 
 #define MSG_PREHEAT_PLA                     "PLA voorverwarmen"
 48 
 #define MSG_PREHEAT_PLA                     "PLA voorverwarmen"

+ 1
- 1
Marlin/language_pl.h View File

42 
 #define MSG_AUTOSTART                       "Autostart"
 42 
 #define MSG_AUTOSTART                       "Autostart"
43 
 #define MSG_DISABLE_STEPPERS                "Wylacz silniki"
 43 
 #define MSG_DISABLE_STEPPERS                "Wylacz silniki"
44 
 #define MSG_AUTO_HOME                       "Auto. poz. zerowa"
 44 
 #define MSG_AUTO_HOME                       "Auto. poz. zerowa"
45 
-#define MSG_LEVEL_BED_HOMING                "Homing"
45 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
46 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 46 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
47 
 #define MSG_SET_ORIGIN                      "Ustaw punkt zero"
 47 
 #define MSG_SET_ORIGIN                      "Ustaw punkt zero"
48 
 #define MSG_PREHEAT_PLA                     "Rozgrzej PLA"
 48 
 #define MSG_PREHEAT_PLA                     "Rozgrzej PLA"

+ 1
- 1
Marlin/language_pt-br.h View File

42 
 #define MSG_AUTOSTART                       "Autostart"
 42 
 #define MSG_AUTOSTART                       "Autostart"
43 
 #define MSG_DISABLE_STEPPERS                "Desabi. motores"
 43 
 #define MSG_DISABLE_STEPPERS                "Desabi. motores"
44 
 #define MSG_AUTO_HOME                       "Ir para origen"
 44 
 #define MSG_AUTO_HOME                       "Ir para origen"
45 
-#define MSG_LEVEL_BED_HOMING                "Homing"
45 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
46 
 #define MSG_SET_HOME_OFFSETS                "Ajustar Jogo"
 46 
 #define MSG_SET_HOME_OFFSETS                "Ajustar Jogo"
47 
 #define MSG_SET_ORIGIN                      "Ajustar orig."
 47 
 #define MSG_SET_ORIGIN                      "Ajustar orig."
48 
 #define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"
 48 
 #define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"

+ 1
- 1
Marlin/language_ru.h View File

42 
 #define MSG_AUTOSTART                       "Автостарт"
 42 
 #define MSG_AUTOSTART                       "Автостарт"
43 
 #define MSG_DISABLE_STEPPERS                "Выкл. двигатели"
 43 
 #define MSG_DISABLE_STEPPERS                "Выкл. двигатели"
44 
 #define MSG_AUTO_HOME                       "Парковка"
 44 
 #define MSG_AUTO_HOME                       "Парковка"
45 
-#define MSG_LEVEL_BED_HOMING                "Homing"
45 
+#define MSG_LEVEL_BED_HOMING                "Homing XYZ"
46 
 #define MSG_SET_HOME_OFFSETS                "Запомнить парковку"
 46 
 #define MSG_SET_HOME_OFFSETS                "Запомнить парковку"
47 
 #define MSG_SET_ORIGIN                      "Запомнить ноль"
 47 
 #define MSG_SET_ORIGIN                      "Запомнить ноль"
48 
 #define MSG_PREHEAT_PLA                     "Преднагрев PLA"
 48 
 #define MSG_PREHEAT_PLA                     "Преднагрев PLA"

+ 1
- 1
Marlin/ultralcd.cpp View File

2494 
    * MBL Move to mesh starting point
 2494 
    * MBL Move to mesh starting point
2495 
    */
 2495 
    */
2496 
   static void _lcd_level_bed_homing() {
 2496 
   static void _lcd_level_bed_homing() {
2497 
-    if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ " MSG_LEVEL_BED_HOMING), NULL);
2497 
+    if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_HOMING), NULL);
2498 
     lcdDrawUpdate = 1;
 2498 
     lcdDrawUpdate = 1;
2499 
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) {
 2499 
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) {
2500 
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
 2500 
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;

Write Preview
Loading…
Cancel
Save