Browse Source

Size lcd_status_message based on language (#9545)

Scott Lahteine 6 years ago
parent
commit
5a70887467
No account linked to committer's email address

+ 2
- 1
.travis.yml View File

86
   - opt_enable_adv CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING BABYSTEP_XY LIN_ADVANCE NANODLP_Z_SYNC
86
   - opt_enable_adv CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING BABYSTEP_XY LIN_ADVANCE NANODLP_Z_SYNC
87
   - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
87
   - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
88
   #
88
   #
89
-  # Add a Sled Z Probe, do non-segmented moves
89
+  # Add a Sled Z Probe, do non-segmented moves, use Japanese language
90
   #
90
   #
91
+  - opt_set LANGUAGE kana_utf8
91
   - opt_enable Z_PROBE_SLED
92
   - opt_enable Z_PROBE_SLED
92
   - opt_disable SEGMENT_LEVELED_MOVES
93
   - opt_disable SEGMENT_LEVELED_MOVES
93
   - opt_enable_adv BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING
94
   - opt_enable_adv BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING

+ 1
- 0
Marlin/src/lcd/language/language_bg.h View File

32
 
32
 
33
 #define MAPPER_D0D1                // For Cyrillic
33
 #define MAPPER_D0D1                // For Cyrillic
34
 #define DISPLAY_CHARSET_ISO10646_5
34
 #define DISPLAY_CHARSET_ISO10646_5
35
+#define CHARSIZE 2
35
 
36
 
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" Готов.")
37
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" Готов.")
37
 #define MSG_SD_INSERTED                     _UxGT("Картата е поставена")
38
 #define MSG_SD_INSERTED                     _UxGT("Картата е поставена")

+ 1
- 0
Marlin/src/lcd/language/language_ca.h View File

32
 
32
 
33
 #define MAPPER_C2C3  // because of "ó"
33
 #define MAPPER_C2C3  // because of "ó"
34
 #define DISPLAY_CHARSET_ISO10646_1
34
 #define DISPLAY_CHARSET_ISO10646_1
35
+#define CHARSIZE 2
35
 
36
 
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" preparada.")
37
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" preparada.")
37
 #define MSG_SD_INSERTED                     _UxGT("Targeta detectada.")
38
 #define MSG_SD_INSERTED                     _UxGT("Targeta detectada.")

+ 1
- 0
Marlin/src/lcd/language/language_cn.h View File

31
 #define LANGUAGE_CN_H
31
 #define LANGUAGE_CN_H
32
 
32
 
33
 #define DISPLAY_CHARSET_ISO10646_CN
33
 #define DISPLAY_CHARSET_ISO10646_CN
34
+#define CHARSIZE 2
34
 
35
 
35
 #define WELCOME_MSG                         "\xa4\xa5\xa6\xa7"
36
 #define WELCOME_MSG                         "\xa4\xa5\xa6\xa7"
36
 #define MSG_SD_INSERTED                     "\xa8\xa9\xaa\xab"
37
 #define MSG_SD_INSERTED                     "\xa8\xa9\xaa\xab"

+ 1
- 0
Marlin/src/lcd/language/language_cz_utf8.h View File

37
 
37
 
38
 #define MAPPER_C3C4C5_CZ
38
 #define MAPPER_C3C4C5_CZ
39
 #define DISPLAY_CHARSET_ISO10646_CZ
39
 #define DISPLAY_CHARSET_ISO10646_CZ
40
+#define CHARSIZE 2
40
 
41
 
41
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" připraven.")
42
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" připraven.")
42
 #define MSG_BACK                            _UxGT("Zpět")
43
 #define MSG_BACK                            _UxGT("Zpět")

+ 1
- 0
Marlin/src/lcd/language/language_da.h View File

32
 
32
 
33
 #define MAPPER_C2C3
33
 #define MAPPER_C2C3
34
 #define DISPLAY_CHARSET_ISO10646_1
34
 #define DISPLAY_CHARSET_ISO10646_1
35
+#define CHARSIZE 2
35
 
36
 
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" er klar")
37
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" er klar")
37
 #define MSG_SD_INSERTED                     _UxGT("Kort isat")
38
 #define MSG_SD_INSERTED                     _UxGT("Kort isat")

+ 1
- 0
Marlin/src/lcd/language/language_de.h View File

32
 
32
 
33
 #define MAPPER_C2C3
33
 #define MAPPER_C2C3
34
 #define DISPLAY_CHARSET_ISO10646_1
34
 #define DISPLAY_CHARSET_ISO10646_1
35
+#define CHARSIZE 2
35
 
36
 
36
 #define THIS_LANGUAGES_SPECIAL_SYMBOLS      _UxGT("ÄäÖöÜüß²³")
37
 #define THIS_LANGUAGES_SPECIAL_SYMBOLS      _UxGT("ÄäÖöÜüß²³")
37
 
38
 

+ 1
- 0
Marlin/src/lcd/language/language_el-gr.h View File

32
 
32
 
33
 #define MAPPER_CECF
33
 #define MAPPER_CECF
34
 #define DISPLAY_CHARSET_ISO10646_GREEK
34
 #define DISPLAY_CHARSET_ISO10646_GREEK
35
+#define CHARSIZE 2
35
 
36
 
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" έτοιμο.")
37
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" έτοιμο.")
37
 #define MSG_SD_INSERTED                     _UxGT("Εισαγωγή κάρτας")
38
 #define MSG_SD_INSERTED                     _UxGT("Εισαγωγή κάρτας")

+ 1
- 0
Marlin/src/lcd/language/language_el.h View File

32
 
32
 
33
 #define MAPPER_CECF
33
 #define MAPPER_CECF
34
 #define DISPLAY_CHARSET_ISO10646_GREEK
34
 #define DISPLAY_CHARSET_ISO10646_GREEK
35
+#define CHARSIZE 2
35
 
36
 
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" έτοιμο.")
37
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" έτοιμο.")
37
 #define MSG_SD_INSERTED                     _UxGT("Εισαγωγή κάρτας")
38
 #define MSG_SD_INSERTED                     _UxGT("Εισαγωγή κάρτας")

+ 4
- 0
Marlin/src/lcd/language/language_en.h View File

36
 #endif
36
 #endif
37
 #undef en
37
 #undef en
38
 
38
 
39
+#ifndef CHARSIZE
40
+  #define CHARSIZE 1
41
+#endif
42
+
39
 #ifndef WELCOME_MSG
43
 #ifndef WELCOME_MSG
40
   #define WELCOME_MSG                         MACHINE_NAME _UxGT(" Ready.")
44
   #define WELCOME_MSG                         MACHINE_NAME _UxGT(" Ready.")
41
 #endif
45
 #endif

+ 1
- 1
Marlin/src/lcd/language/language_es.h View File

32
 
32
 
33
 #define DISPLAY_CHARSET_ISO10646_1
33
 #define DISPLAY_CHARSET_ISO10646_1
34
 #define NOT_EXTENDED_ISO10646_1_5X7
34
 #define NOT_EXTENDED_ISO10646_1_5X7
35
-
35
+#define CHARSIZE 2
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" lista.")
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" lista.")
37
 #define MSG_BACK                            _UxGT("Atras")
37
 #define MSG_BACK                            _UxGT("Atras")
38
 #define MSG_SD_INSERTED                     _UxGT("Tarjeta colocada")
38
 #define MSG_SD_INSERTED                     _UxGT("Tarjeta colocada")

+ 1
- 0
Marlin/src/lcd/language/language_fi.h View File

32
 
32
 
33
 #define MAPPER_C2C3
33
 #define MAPPER_C2C3
34
 #define DISPLAY_CHARSET_ISO10646_1
34
 #define DISPLAY_CHARSET_ISO10646_1
35
+#define CHARSIZE 2
35
 
36
 
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" valmis.")
37
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" valmis.")
37
 #define MSG_SD_INSERTED                     _UxGT("Kortti asetettu")
38
 #define MSG_SD_INSERTED                     _UxGT("Kortti asetettu")

+ 1
- 0
Marlin/src/lcd/language/language_fr.h View File

32
 
32
 
33
 #define MAPPER_NON
33
 #define MAPPER_NON
34
 #define NOT_EXTENDED_ISO10646_1_5X7
34
 #define NOT_EXTENDED_ISO10646_1_5X7
35
+#define CHARSIZE 2
35
 
36
 
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" prete.")
37
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" prete.")
37
 #define MSG_BACK                            _UxGT("Retour")
38
 #define MSG_BACK                            _UxGT("Retour")

+ 1
- 0
Marlin/src/lcd/language/language_hr.h View File

31
 #define LANGUAGE_HR_H
31
 #define LANGUAGE_HR_H
32
 
32
 
33
 #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
33
 #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
34
+#define CHARSIZE 2
34
 
35
 
35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" spreman.")
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" spreman.")
36
 #define MSG_SD_INSERTED                     _UxGT("SD kartica umetnuta")
37
 #define MSG_SD_INSERTED                     _UxGT("SD kartica umetnuta")

+ 1
- 0
Marlin/src/lcd/language/language_kana.h View File

34
 // Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34
 // Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
35
 #define SIMULATE_ROMFONT
35
 #define SIMULATE_ROMFONT
36
 #define DISPLAY_CHARSET_ISO10646_KANA
36
 #define DISPLAY_CHARSET_ISO10646_KANA
37
+#define CHARSIZE 2
37
 
38
 
38
 // 片仮名表示定義
39
 // 片仮名表示定義
39
 #define WELCOME_MSG                         MACHINE_NAME " ready."
40
 #define WELCOME_MSG                         MACHINE_NAME " ready."

+ 1
- 0
Marlin/src/lcd/language/language_kana_utf8.h View File

34
 
34
 
35
 #define MAPPER_E382E383
35
 #define MAPPER_E382E383
36
 #define DISPLAY_CHARSET_ISO10646_KANA
36
 #define DISPLAY_CHARSET_ISO10646_KANA
37
+#define CHARSIZE 3
37
 
38
 
38
 // This just to show the potential benefit of unicode.
39
 // This just to show the potential benefit of unicode.
39
 // This translation can be improved by using the full charset of unicode codeblock U+30A0 to U+30FF.
40
 // This translation can be improved by using the full charset of unicode codeblock U+30A0 to U+30FF.

+ 1
- 0
Marlin/src/lcd/language/language_pl-DOGM.h View File

26
 
26
 
27
 #ifndef LANGUAGE_PL_DOGM_H
27
 #ifndef LANGUAGE_PL_DOGM_H
28
 #define LANGUAGE_PL_DOGM_H
28
 #define LANGUAGE_PL_DOGM_H
29
+#define CHARSIZE 2
29
 
30
 
30
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" gotowy.")
31
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" gotowy.")
31
 #define MSG_SD_INSERTED                     _UxGT("Karta włożona")
32
 #define MSG_SD_INSERTED                     _UxGT("Karta włożona")

+ 1
- 0
Marlin/src/lcd/language/language_pt-br_utf8.h View File

32
 #define LANGUAGE_PT_BR_UTF_H
32
 #define LANGUAGE_PT_BR_UTF_H
33
 
33
 
34
 #define DISPLAY_CHARSET_ISO10646_1
34
 #define DISPLAY_CHARSET_ISO10646_1
35
+#define CHARSIZE 2
35
 
36
 
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronto.")
37
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronto.")
37
 #define MSG_SD_INSERTED                     _UxGT("Cartão inserido")
38
 #define MSG_SD_INSERTED                     _UxGT("Cartão inserido")

+ 1
- 0
Marlin/src/lcd/language/language_pt_utf8.h View File

32
 #define LANGUAGE_PT_UTF_H
32
 #define LANGUAGE_PT_UTF_H
33
 
33
 
34
 #define DISPLAY_CHARSET_ISO10646_1
34
 #define DISPLAY_CHARSET_ISO10646_1
35
+#define CHARSIZE 2
35
 
36
 
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronta.")
37
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronta.")
37
 #define MSG_SD_INSERTED                     _UxGT("Cartão inserido")
38
 #define MSG_SD_INSERTED                     _UxGT("Cartão inserido")

+ 1
- 0
Marlin/src/lcd/language/language_ru.h View File

32
 
32
 
33
 #define MAPPER_D0D1                // For Cyrillic
33
 #define MAPPER_D0D1                // For Cyrillic
34
 #define DISPLAY_CHARSET_ISO10646_5
34
 #define DISPLAY_CHARSET_ISO10646_5
35
+#define CHARSIZE 2
35
 
36
 
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" Готов.")
37
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" Готов.")
37
 #define MSG_BACK                            _UxGT("Назад")
38
 #define MSG_BACK                            _UxGT("Назад")

+ 1
- 0
Marlin/src/lcd/language/language_sk_utf8.h View File

36
 
36
 
37
 #define MAPPER_C3C4C5_SK
37
 #define MAPPER_C3C4C5_SK
38
 #define DISPLAY_CHARSET_ISO10646_SK
38
 #define DISPLAY_CHARSET_ISO10646_SK
39
+#define CHARSIZE 2
39
 
40
 
40
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pripravená.")
41
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pripravená.")
41
 #define MSG_BACK                            _UxGT("Naspať")
42
 #define MSG_BACK                            _UxGT("Naspať")

+ 1
- 0
Marlin/src/lcd/language/language_tr.h View File

32
 
32
 
33
 #define MAPPER_C2C3_TR
33
 #define MAPPER_C2C3_TR
34
 #define DISPLAY_CHARSET_ISO10646_TR
34
 #define DISPLAY_CHARSET_ISO10646_TR
35
+#define CHARSIZE 2
35
 
36
 
36
 #if DISABLED(DOGLCD)
37
 #if DISABLED(DOGLCD)
37
   #error "Turkish needs a graphical display."
38
   #error "Turkish needs a graphical display."

+ 1
- 0
Marlin/src/lcd/language/language_uk.h View File

32
 
32
 
33
 #define MAPPER_D0D1                // For Cyrillic
33
 #define MAPPER_D0D1                // For Cyrillic
34
 #define DISPLAY_CHARSET_ISO10646_5
34
 #define DISPLAY_CHARSET_ISO10646_5
35
+#define CHARSIZE 2
35
 
36
 
36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" готовий.")
37
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" готовий.")
37
 #define MSG_SD_INSERTED                     _UxGT("Картка вставлена")
38
 #define MSG_SD_INSERTED                     _UxGT("Картка вставлена")

+ 2
- 0
Marlin/src/lcd/language/language_zh_CN.h View File

30
 #ifndef LANGUAGE_ZH_CN_H
30
 #ifndef LANGUAGE_ZH_CN_H
31
 #define LANGUAGE_ZH_CN_H
31
 #define LANGUAGE_ZH_CN_H
32
 
32
 
33
+#define CHARSIZE 3
34
+
33
 #define WELCOME_MSG                         MACHINE_NAME _UxGT("已就绪.")  //" ready."
35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT("已就绪.")  //" ready."
34
 #define MSG_SD_INSERTED                     _UxGT("存储卡已插入")  //"Card inserted"
36
 #define MSG_SD_INSERTED                     _UxGT("存储卡已插入")  //"Card inserted"
35
 #define MSG_SD_REMOVED                      _UxGT("存储卡被拔出")  //"Card removed"
37
 #define MSG_SD_REMOVED                      _UxGT("存储卡被拔出")  //"Card removed"

+ 2
- 0
Marlin/src/lcd/language/language_zh_TW.h View File

30
 #ifndef LANGUAGE_ZH_TW_H
30
 #ifndef LANGUAGE_ZH_TW_H
31
 #define LANGUAGE_ZH_TW_H
31
 #define LANGUAGE_ZH_TW_H
32
 
32
 
33
+#define CHARSIZE 3
34
+
33
 #define WELCOME_MSG                         MACHINE_NAME _UxGT("已就緒.")  //" ready."
35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT("已就緒.")  //" ready."
34
 #define MSG_SD_INSERTED                     _UxGT("記憶卡已插入")  //"Card inserted"
36
 #define MSG_SD_INSERTED                     _UxGT("記憶卡已插入")  //"Card inserted"
35
 #define MSG_SD_REMOVED                      _UxGT("記憶卡被拔出")  //"Card removed"
37
 #define MSG_SD_REMOVED                      _UxGT("記憶卡被拔出")  //"Card removed"

+ 5
- 1
Marlin/src/lcd/ultralcd.cpp View File

90
 
90
 
91
 uint8_t lcd_status_update_delay = 1, // First update one loop delayed
91
 uint8_t lcd_status_update_delay = 1, // First update one loop delayed
92
         lcd_status_message_level;    // Higher level blocks lower level
92
         lcd_status_message_level;    // Higher level blocks lower level
93
-char lcd_status_message[3 * (LCD_WIDTH) + 1] = WELCOME_MSG; // worst case is kana with up to 3*LCD_WIDTH+1
94
 
93
 
95
 #if ENABLED(STATUS_MESSAGE_SCROLLING)
94
 #if ENABLED(STATUS_MESSAGE_SCROLLING)
95
+  #define MAX_MESSAGE_LENGTH max(2 * CHARSIZE * LCD_WIDTH, LONG_FILENAME_LENGTH)
96
   uint8_t status_scroll_pos = 0;
96
   uint8_t status_scroll_pos = 0;
97
+#else
98
+  #define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH)
97
 #endif
99
 #endif
98
 
100
 
101
+char lcd_status_message[MAX_MESSAGE_LENGTH + 1];
102
+
99
 #if ENABLED(SCROLL_LONG_FILENAMES)
103
 #if ENABLED(SCROLL_LONG_FILENAMES)
100
   uint8_t filename_scroll_pos, filename_scroll_max, filename_scroll_hash;
104
   uint8_t filename_scroll_pos, filename_scroll_max, filename_scroll_hash;
101
 #endif
105
 #endif

Loading…
Cancel
Save