瀏覽代碼

Merge pull request #3176 from thinkyhead/rc_patch_3149_part_ii

Use const parameters in lcd_implementation_drawedit (etc.)
Scott Lahteine 9 年之前
父節點
當前提交
7f2375ab46

+ 2
- 2
Marlin/dogm_lcd_implementation.h 查看文件

169
   }
169
   }
170
 }
170
 }
171
 
171
 
172
-char lcd_print(char* str) {
172
+char lcd_print(const char* str) {
173
   char c;
173
   char c;
174
   int i = 0;
174
   int i = 0;
175
   char n = 0;
175
   char n = 0;
508
 #define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5(*(data)))
508
 #define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5(*(data)))
509
 #define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
509
 #define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
510
 
510
 
511
-void lcd_implementation_drawedit(const char* pstr, char* value) {
511
+void lcd_implementation_drawedit(const char* pstr, const char* value) {
512
   uint8_t rows = 1;
512
   uint8_t rows = 1;
513
   uint8_t lcd_width = LCD_WIDTH, char_width = DOG_CHAR_WIDTH;
513
   uint8_t lcd_width = LCD_WIDTH, char_width = DOG_CHAR_WIDTH;
514
   uint8_t vallen = lcd_strlen(value);
514
   uint8_t vallen = lcd_strlen(value);

+ 1
- 0
Marlin/language_an.h 查看文件

20
 #define MSG_AUTOSTART                       " Autostart"
20
 #define MSG_AUTOSTART                       " Autostart"
21
 #define MSG_DISABLE_STEPPERS                "Amortar motors"
21
 #define MSG_DISABLE_STEPPERS                "Amortar motors"
22
 #define MSG_AUTO_HOME                       "Levar a l'orichen"
22
 #define MSG_AUTO_HOME                       "Levar a l'orichen"
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
24
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
24
 #define MSG_SET_ORIGIN                      "Establir zero"
25
 #define MSG_SET_ORIGIN                      "Establir zero"
25
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"
26
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"

+ 1
- 0
Marlin/language_bg.h 查看文件

20
 #define MSG_AUTOSTART                       "Автостарт"
20
 #define MSG_AUTOSTART                       "Автостарт"
21
 #define MSG_DISABLE_STEPPERS                "Изкл. двигатели"
21
 #define MSG_DISABLE_STEPPERS                "Изкл. двигатели"
22
 #define MSG_AUTO_HOME                       "Паркиране"
22
 #define MSG_AUTO_HOME                       "Паркиране"
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Задай Начало"
24
 #define MSG_SET_HOME_OFFSETS                "Задай Начало"
24
 #define MSG_SET_ORIGIN                      "Изходна точка"
25
 #define MSG_SET_ORIGIN                      "Изходна точка"
25
 #define MSG_PREHEAT_PLA                     "Подгряване PLA"
26
 #define MSG_PREHEAT_PLA                     "Подгряване PLA"

+ 1
- 0
Marlin/language_ca.h 查看文件

21
 #define MSG_AUTOSTART                       "Inici automatic"
21
 #define MSG_AUTOSTART                       "Inici automatic"
22
 #define MSG_DISABLE_STEPPERS                "Apagar motors"
22
 #define MSG_DISABLE_STEPPERS                "Apagar motors"
23
 #define MSG_AUTO_HOME                       "Home global"
23
 #define MSG_AUTO_HOME                       "Home global"
24
+#define MSG_LEVEL_BED_HOMING                "Homing"
24
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
25
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
25
 #define MSG_SET_ORIGIN                      "Establir origen"
26
 #define MSG_SET_ORIGIN                      "Establir origen"
26
 #define MSG_PREHEAT_PLA                     "Preescalfar PLA"
27
 #define MSG_PREHEAT_PLA                     "Preescalfar PLA"

+ 1
- 0
Marlin/language_cn.h 查看文件

18
 #define MSG_AUTOSTART                       "\xb1\xb2\xb3\xb4"
18
 #define MSG_AUTOSTART                       "\xb1\xb2\xb3\xb4"
19
 #define MSG_DISABLE_STEPPERS                "\xb5\xb6\xb7\xb8\xb9\xba"
19
 #define MSG_DISABLE_STEPPERS                "\xb5\xb6\xb7\xb8\xb9\xba"
20
 #define MSG_AUTO_HOME                       "\xbb\xbc\xbd"
20
 #define MSG_AUTO_HOME                       "\xbb\xbc\xbd"
21
+#define MSG_LEVEL_BED_HOMING                "Homing"
21
 #define MSG_SET_HOME_OFFSETS                "\xbe\xbf\xbb\xbc\xbd\xc0\xc1"
22
 #define MSG_SET_HOME_OFFSETS                "\xbe\xbf\xbb\xbc\xbd\xc0\xc1"
22
 #define MSG_SET_ORIGIN                      "\xbe\xbf\xbc\xbd"
23
 #define MSG_SET_ORIGIN                      "\xbe\xbf\xbc\xbd"
23
 #define MSG_PREHEAT_PLA                     "\xc3\xc4 PLA"
24
 #define MSG_PREHEAT_PLA                     "\xc3\xc4 PLA"

+ 1
- 0
Marlin/language_cz.h 查看文件

24
 #define MSG_AUTOSTART                       "Autostart"
24
 #define MSG_AUTOSTART                       "Autostart"
25
 #define MSG_DISABLE_STEPPERS                "Uvolnit motory"
25
 #define MSG_DISABLE_STEPPERS                "Uvolnit motory"
26
 #define MSG_AUTO_HOME                       "Domovska pozice"
26
 #define MSG_AUTO_HOME                       "Domovska pozice"
27
+#define MSG_LEVEL_BED_HOMING                "Homing"
27
 #define MSG_SET_HOME_OFFSETS                "Nastavit ofsety"
28
 #define MSG_SET_HOME_OFFSETS                "Nastavit ofsety"
28
 #define MSG_SET_ORIGIN                      "Nastavit pocatek"
29
 #define MSG_SET_ORIGIN                      "Nastavit pocatek"
29
 #define MSG_PREHEAT_PLA                     "Zahrat PLA"
30
 #define MSG_PREHEAT_PLA                     "Zahrat PLA"

+ 1
- 0
Marlin/language_da.h 查看文件

21
 #define MSG_AUTO_HOME                       "Home" // G28
21
 #define MSG_AUTO_HOME                       "Home" // G28
22
 #define MSG_COOLDOWN                        "Afkøl"
22
 #define MSG_COOLDOWN                        "Afkøl"
23
 #define MSG_DISABLE_STEPPERS                "Slå stepper fra"
23
 #define MSG_DISABLE_STEPPERS                "Slå stepper fra"
24
+#define MSG_LEVEL_BED_HOMING                "Homing"
24
 #define MSG_SET_HOME_OFFSETS                "Sæt home offsets"
25
 #define MSG_SET_HOME_OFFSETS                "Sæt home offsets"
25
 #define MSG_SET_ORIGIN                      "Sæt origin"
26
 #define MSG_SET_ORIGIN                      "Sæt origin"
26
 #define MSG_SWITCH_PS_ON                    "Slå strøm til"
27
 #define MSG_SWITCH_PS_ON                    "Slå strøm til"

+ 1
- 0
Marlin/language_de.h 查看文件

20
 #define MSG_AUTOSTART                       "Autostart"
20
 #define MSG_AUTOSTART                       "Autostart"
21
 #define MSG_DISABLE_STEPPERS                "Motoren Aus" // M84
21
 #define MSG_DISABLE_STEPPERS                "Motoren Aus" // M84
22
 #define MSG_AUTO_HOME                       "Home" // G28
22
 #define MSG_AUTO_HOME                       "Home" // G28
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Setze Home hier"
24
 #define MSG_SET_HOME_OFFSETS                "Setze Home hier"
24
 #define MSG_SET_ORIGIN                      "Setze Null hier" //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
25
 #define MSG_SET_ORIGIN                      "Setze Null hier" //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
25
 #define MSG_PREHEAT_PLA                     "Vorwärmen PLA"
26
 #define MSG_PREHEAT_PLA                     "Vorwärmen PLA"

+ 3
- 0
Marlin/language_en.h 查看文件

39
 #ifndef MSG_AUTO_HOME
39
 #ifndef MSG_AUTO_HOME
40
   #define MSG_AUTO_HOME                       "Auto home"
40
   #define MSG_AUTO_HOME                       "Auto home"
41
 #endif
41
 #endif
42
+#ifndef MSG_LEVEL_BED_HOMING
43
+  #define MSG_LEVEL_BED_HOMING                "Homing"
44
+#endif
42
 #ifndef MSG_SET_HOME_OFFSETS
45
 #ifndef MSG_SET_HOME_OFFSETS
43
   #define MSG_SET_HOME_OFFSETS                "Set home offsets"
46
   #define MSG_SET_HOME_OFFSETS                "Set home offsets"
44
 #endif
47
 #endif

+ 1
- 0
Marlin/language_es.h 查看文件

20
 #define MSG_AUTOSTART                       "Autostart"
20
 #define MSG_AUTOSTART                       "Autostart"
21
 #define MSG_DISABLE_STEPPERS                "Apagar motores"
21
 #define MSG_DISABLE_STEPPERS                "Apagar motores"
22
 #define MSG_AUTO_HOME                       "Llevar al origen"
22
 #define MSG_AUTO_HOME                       "Llevar al origen"
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Ajustar offsets"
24
 #define MSG_SET_HOME_OFFSETS                "Ajustar offsets"
24
 #define MSG_SET_ORIGIN                      "Establecer cero"
25
 #define MSG_SET_ORIGIN                      "Establecer cero"
25
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"
26
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"

+ 1
- 0
Marlin/language_eu.h 查看文件

20
 #define MSG_AUTOSTART                       "Auto hasiera"
20
 #define MSG_AUTOSTART                       "Auto hasiera"
21
 #define MSG_DISABLE_STEPPERS                "Itzali motoreak"
21
 #define MSG_DISABLE_STEPPERS                "Itzali motoreak"
22
 #define MSG_AUTO_HOME                       "Hasierara joan"
22
 #define MSG_AUTO_HOME                       "Hasierara joan"
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
24
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
24
 #define MSG_SET_ORIGIN                      "Hasiera ipini"
25
 #define MSG_SET_ORIGIN                      "Hasiera ipini"
25
 #define MSG_PREHEAT_PLA                     "Aurreberotu PLA"
26
 #define MSG_PREHEAT_PLA                     "Aurreberotu PLA"

+ 1
- 0
Marlin/language_fi.h 查看文件

20
 #define MSG_AUTOSTART                       "Automaatti"
20
 #define MSG_AUTOSTART                       "Automaatti"
21
 #define MSG_DISABLE_STEPPERS                "Vapauta moottorit"
21
 #define MSG_DISABLE_STEPPERS                "Vapauta moottorit"
22
 #define MSG_AUTO_HOME                       "Aja referenssiin"
22
 #define MSG_AUTO_HOME                       "Aja referenssiin"
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
24
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
24
 #define MSG_SET_ORIGIN                      "Aseta origo"
25
 #define MSG_SET_ORIGIN                      "Aseta origo"
25
 #define MSG_PREHEAT_PLA                     "Esilämmitä PLA"
26
 #define MSG_PREHEAT_PLA                     "Esilämmitä PLA"

+ 1
- 0
Marlin/language_fr.h 查看文件

21
 #define MSG_AUTOSTART                       "Demarrage auto"
21
 #define MSG_AUTOSTART                       "Demarrage auto"
22
 #define MSG_DISABLE_STEPPERS                "Arreter moteurs"
22
 #define MSG_DISABLE_STEPPERS                "Arreter moteurs"
23
 #define MSG_AUTO_HOME                       "Home auto."
23
 #define MSG_AUTO_HOME                       "Home auto."
24
+#define MSG_LEVEL_BED_HOMING                "Homing"
24
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
25
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
25
 #define MSG_SET_ORIGIN                      "Regler origine"
26
 #define MSG_SET_ORIGIN                      "Regler origine"
26
 #define MSG_PREHEAT_PLA                     "Prechauffage PLA"
27
 #define MSG_PREHEAT_PLA                     "Prechauffage PLA"

+ 1
- 0
Marlin/language_it.h 查看文件

20
 #define MSG_AUTOSTART                       "Autostart"
20
 #define MSG_AUTOSTART                       "Autostart"
21
 #define MSG_DISABLE_STEPPERS                "Disabilita Motori"
21
 #define MSG_DISABLE_STEPPERS                "Disabilita Motori"
22
 #define MSG_AUTO_HOME                       "Auto Home"
22
 #define MSG_AUTO_HOME                       "Auto Home"
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Setta offset home"
24
 #define MSG_SET_HOME_OFFSETS                "Setta offset home"
24
 #define MSG_SET_ORIGIN                      "Imposta Origine"
25
 #define MSG_SET_ORIGIN                      "Imposta Origine"
25
 #define MSG_PREHEAT_PLA                     "Preriscalda PLA"
26
 #define MSG_PREHEAT_PLA                     "Preriscalda PLA"

+ 1
- 0
Marlin/language_kana.h 查看文件

22
 #define MSG_AUTOSTART                       "\xbc\xde\xc4\xde\xb3\xb6\xb2\xbc"                             // "Autostart"
22
 #define MSG_AUTOSTART                       "\xbc\xde\xc4\xde\xb3\xb6\xb2\xbc"                             // "Autostart"
23
 #define MSG_DISABLE_STEPPERS                "\xd3\xb0\xc0\xb0\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xcc"         // "Disable steppers"
23
 #define MSG_DISABLE_STEPPERS                "\xd3\xb0\xc0\xb0\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xcc"         // "Disable steppers"
24
 #define MSG_AUTO_HOME                       "\xb9\xde\xdd\xc3\xdd\xc6\xb2\xc4\xde\xb3"                     // "Auto home"
24
 #define MSG_AUTO_HOME                       "\xb9\xde\xdd\xc3\xdd\xc6\xb2\xc4\xde\xb3"                     // "Auto home"
25
+#define MSG_LEVEL_BED_HOMING                "Homing"
25
 #define MSG_SET_HOME_OFFSETS                "\xb7\xbc\xde\xad\xdd\xb5\xcc\xbe\xaf\xc4\xbe\xaf\xc3\xb2"     // "Set home offsets"
26
 #define MSG_SET_HOME_OFFSETS                "\xb7\xbc\xde\xad\xdd\xb5\xcc\xbe\xaf\xc4\xbe\xaf\xc3\xb2"     // "Set home offsets"
26
 #define MSG_SET_ORIGIN                      "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4"                             // "Set origin"
27
 #define MSG_SET_ORIGIN                      "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4"                             // "Set origin"
27
 #define MSG_PREHEAT_PLA                     "PLA \xd6\xc8\xc2"                                             // "Preheat PLA"
28
 #define MSG_PREHEAT_PLA                     "PLA \xd6\xc8\xc2"                                             // "Preheat PLA"

+ 1
- 0
Marlin/language_kana_utf8.h 查看文件

26
 #define MSG_AUTOSTART                       "ジドウカイシ"                   // "Autostart"
26
 #define MSG_AUTOSTART                       "ジドウカイシ"                   // "Autostart"
27
 #define MSG_DISABLE_STEPPERS                "モーターデンゲン オフ"             // "Disable steppers"
27
 #define MSG_DISABLE_STEPPERS                "モーターデンゲン オフ"             // "Disable steppers"
28
 #define MSG_AUTO_HOME                       "ゲンテンニイドウ"                // "Auto home"
28
 #define MSG_AUTO_HOME                       "ゲンテンニイドウ"                // "Auto home"
29
+#define MSG_LEVEL_BED_HOMING                "Homing"
29
 #define MSG_SET_HOME_OFFSETS                "キジュンオフセットセッテイ"         // "Set home offsets"
30
 #define MSG_SET_HOME_OFFSETS                "キジュンオフセットセッテイ"         // "Set home offsets"
30
 #define MSG_SET_ORIGIN                      "キジュンセット"                 // "Set origin"
31
 #define MSG_SET_ORIGIN                      "キジュンセット"                 // "Set origin"
31
 #define MSG_PREHEAT_PLA                     "PLA ヨネツ"                    // "Preheat PLA"
32
 #define MSG_PREHEAT_PLA                     "PLA ヨネツ"                    // "Preheat PLA"

+ 1
- 0
Marlin/language_nl.h 查看文件

20
 #define MSG_AUTOSTART                       "Autostart"
20
 #define MSG_AUTOSTART                       "Autostart"
21
 #define MSG_DISABLE_STEPPERS                "Motoren uit"
21
 #define MSG_DISABLE_STEPPERS                "Motoren uit"
22
 #define MSG_AUTO_HOME                       "Auto home"
22
 #define MSG_AUTO_HOME                       "Auto home"
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
24
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
24
 #define MSG_SET_ORIGIN                      "Nulpunt instellen"
25
 #define MSG_SET_ORIGIN                      "Nulpunt instellen"
25
 #define MSG_PREHEAT_PLA                     "PLA voorverwarmen"
26
 #define MSG_PREHEAT_PLA                     "PLA voorverwarmen"

+ 1
- 0
Marlin/language_pl.h 查看文件

20
 #define MSG_AUTOSTART                       "Autostart"
20
 #define MSG_AUTOSTART                       "Autostart"
21
 #define MSG_DISABLE_STEPPERS                "Wylacz silniki"
21
 #define MSG_DISABLE_STEPPERS                "Wylacz silniki"
22
 #define MSG_AUTO_HOME                       "Auto. poz. zerowa"
22
 #define MSG_AUTO_HOME                       "Auto. poz. zerowa"
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
24
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
24
 #define MSG_SET_ORIGIN                      "Ustaw punkt zero"
25
 #define MSG_SET_ORIGIN                      "Ustaw punkt zero"
25
 #define MSG_PREHEAT_PLA                     "Rozgrzej PLA"
26
 #define MSG_PREHEAT_PLA                     "Rozgrzej PLA"

+ 1
- 0
Marlin/language_pt-br.h 查看文件

20
 #define MSG_AUTOSTART                       "Autostart"
20
 #define MSG_AUTOSTART                       "Autostart"
21
 #define MSG_DISABLE_STEPPERS                "Desabi. motores"
21
 #define MSG_DISABLE_STEPPERS                "Desabi. motores"
22
 #define MSG_AUTO_HOME                       "Ir para origen"
22
 #define MSG_AUTO_HOME                       "Ir para origen"
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Ajustar Jogo"
24
 #define MSG_SET_HOME_OFFSETS                "Ajustar Jogo"
24
 #define MSG_SET_ORIGIN                      "Ajustar orig."
25
 #define MSG_SET_ORIGIN                      "Ajustar orig."
25
 #define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"
26
 #define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"

+ 1
- 0
Marlin/language_pt-br_utf.h 查看文件

20
 #define MSG_AUTOSTART                       "Autostart"
20
 #define MSG_AUTOSTART                       "Autostart"
21
 #define MSG_DISABLE_STEPPERS                "Desabi. motores"
21
 #define MSG_DISABLE_STEPPERS                "Desabi. motores"
22
 #define MSG_AUTO_HOME                       "Ir para origen"
22
 #define MSG_AUTO_HOME                       "Ir para origen"
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Ajustar Jogo"
24
 #define MSG_SET_HOME_OFFSETS                "Ajustar Jogo"
24
 #define MSG_SET_ORIGIN                      "Ajustar orig."
25
 #define MSG_SET_ORIGIN                      "Ajustar orig."
25
 #define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"
26
 #define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"

+ 1
- 0
Marlin/language_pt.h 查看文件

20
 #define MSG_AUTOSTART                       "Autostart"
20
 #define MSG_AUTOSTART                       "Autostart"
21
 #define MSG_DISABLE_STEPPERS                " Desactivar motores"
21
 #define MSG_DISABLE_STEPPERS                " Desactivar motores"
22
 #define MSG_AUTO_HOME                       "Ir para origem"
22
 #define MSG_AUTO_HOME                       "Ir para origem"
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Def. desvio origem"
24
 #define MSG_SET_HOME_OFFSETS                "Def. desvio origem"
24
 #define MSG_SET_ORIGIN                      "Definir origem"
25
 #define MSG_SET_ORIGIN                      "Definir origem"
25
 #define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"
26
 #define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"

+ 1
- 0
Marlin/language_ru.h 查看文件

20
 #define MSG_AUTOSTART                       "Автостарт"
20
 #define MSG_AUTOSTART                       "Автостарт"
21
 #define MSG_DISABLE_STEPPERS                "Выкл. двигатели"
21
 #define MSG_DISABLE_STEPPERS                "Выкл. двигатели"
22
 #define MSG_AUTO_HOME                       "Парковка"
22
 #define MSG_AUTO_HOME                       "Парковка"
23
+#define MSG_LEVEL_BED_HOMING                "Homing"
23
 #define MSG_SET_HOME_OFFSETS                "Запомнить парковку"
24
 #define MSG_SET_HOME_OFFSETS                "Запомнить парковку"
24
 #define MSG_SET_ORIGIN                      "Запомнить ноль"
25
 #define MSG_SET_ORIGIN                      "Запомнить ноль"
25
 #define MSG_PREHEAT_PLA                     "Преднагрев PLA"
26
 #define MSG_PREHEAT_PLA                     "Преднагрев PLA"

+ 3
- 3
Marlin/ultralcd.cpp 查看文件

516
         babystepsTodo[axis] += distance;
516
         babystepsTodo[axis] += distance;
517
       #endif
517
       #endif
518
     }
518
     }
519
-    if (lcdDrawUpdate) lcd_implementation_drawedit(msg, (char*)"");
519
+    if (lcdDrawUpdate) lcd_implementation_drawedit(msg, PSTR(""));
520
     if (LCD_CLICKED) lcd_goto_previous_menu();
520
     if (LCD_CLICKED) lcd_goto_previous_menu();
521
   }
521
   }
522
 
522
 
1715
   #endif
1715
   #endif
1716
 }
1716
 }
1717
 
1717
 
1718
-int lcd_strlen(char* s) {
1718
+int lcd_strlen(const char* s) {
1719
   int i = 0, j = 0;
1719
   int i = 0, j = 0;
1720
   while (s[i]) {
1720
   while (s[i]) {
1721
     if ((s[i] & 0xc0) != 0x80) j++;
1721
     if ((s[i] & 0xc0) != 0x80) j++;
2397
    * MBL Move to mesh starting point
2397
    * MBL Move to mesh starting point
2398
    */
2398
    */
2399
   static void _lcd_level_bed_homing() {
2399
   static void _lcd_level_bed_homing() {
2400
-    if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ"), (char*)"Homing");
2400
+    if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ"), PSTR(MSG_LEVEL_BED_HOMING));
2401
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) {
2401
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) {
2402
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
2402
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
2403
       plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
2403
       plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);

+ 1
- 1
Marlin/ultralcd.h 查看文件

5
 #if ENABLED(ULTRA_LCD)
5
 #if ENABLED(ULTRA_LCD)
6
   #include "buzzer.h"
6
   #include "buzzer.h"
7
 
7
 
8
-  int lcd_strlen(char* s);
8
+  int lcd_strlen(const char* s);
9
   int lcd_strlen_P(const char* s);
9
   int lcd_strlen_P(const char* s);
10
   void lcd_update();
10
   void lcd_update();
11
   void lcd_init();
11
   void lcd_init();

+ 2
- 2
Marlin/ultralcd_implementation_hitachi_HD44780.h 查看文件

407
   return n;
407
   return n;
408
 }
408
 }
409
 
409
 
410
-char lcd_print(char* str) {
410
+char lcd_print(const char* str) {
411
   char c, n = 0;
411
   char c, n = 0;
412
   unsigned char i = 0;
412
   unsigned char i = 0;
413
   while ((c = str[i++])) n += charset_mapper(c);
413
   while ((c = str[i++])) n += charset_mapper(c);
825
 #define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5(*(data)))
825
 #define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5(*(data)))
826
 #define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
826
 #define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
827
 
827
 
828
-void lcd_implementation_drawedit(const char* pstr, char* value) {
828
+void lcd_implementation_drawedit(const char* pstr, const char* value) {
829
   lcd.setCursor(1, 1);
829
   lcd.setCursor(1, 1);
830
   lcd_printPGM(pstr);
830
   lcd_printPGM(pstr);
831
   lcd.print(':');
831
   lcd.print(':');

Loading…
取消
儲存