Size lcd_status_message based on language (#9545)

This commit is contained in:
Scott Lahteine 2018-02-08 23:03:47 -06:00 committed by GitHub
parent 545cd8fa60
commit 5a70887467
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 36 additions and 3 deletions

View file

@ -86,8 +86,9 @@ script:
- opt_enable_adv CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING BABYSTEP_XY LIN_ADVANCE NANODLP_Z_SYNC - opt_enable_adv CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING BABYSTEP_XY LIN_ADVANCE NANODLP_Z_SYNC
- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM} - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
# #
# Add a Sled Z Probe, do non-segmented moves # Add a Sled Z Probe, do non-segmented moves, use Japanese language
# #
- opt_set LANGUAGE kana_utf8
- opt_enable Z_PROBE_SLED - opt_enable Z_PROBE_SLED
- opt_disable SEGMENT_LEVELED_MOVES - opt_disable SEGMENT_LEVELED_MOVES
- opt_enable_adv BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING - opt_enable_adv BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING

View file

@ -32,6 +32,7 @@
#define MAPPER_D0D1 // For Cyrillic #define MAPPER_D0D1 // For Cyrillic
#define DISPLAY_CHARSET_ISO10646_5 #define DISPLAY_CHARSET_ISO10646_5
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" Готов.") #define WELCOME_MSG MACHINE_NAME _UxGT(" Готов.")
#define MSG_SD_INSERTED _UxGT("Картата е поставена") #define MSG_SD_INSERTED _UxGT("Картата е поставена")

View file

@ -32,6 +32,7 @@
#define MAPPER_C2C3 // because of "ó" #define MAPPER_C2C3 // because of "ó"
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" preparada.") #define WELCOME_MSG MACHINE_NAME _UxGT(" preparada.")
#define MSG_SD_INSERTED _UxGT("Targeta detectada.") #define MSG_SD_INSERTED _UxGT("Targeta detectada.")

View file

@ -31,6 +31,7 @@
#define LANGUAGE_CN_H #define LANGUAGE_CN_H
#define DISPLAY_CHARSET_ISO10646_CN #define DISPLAY_CHARSET_ISO10646_CN
#define CHARSIZE 2
#define WELCOME_MSG "\xa4\xa5\xa6\xa7" #define WELCOME_MSG "\xa4\xa5\xa6\xa7"
#define MSG_SD_INSERTED "\xa8\xa9\xaa\xab" #define MSG_SD_INSERTED "\xa8\xa9\xaa\xab"

View file

@ -37,6 +37,7 @@
#define MAPPER_C3C4C5_CZ #define MAPPER_C3C4C5_CZ
#define DISPLAY_CHARSET_ISO10646_CZ #define DISPLAY_CHARSET_ISO10646_CZ
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" připraven.") #define WELCOME_MSG MACHINE_NAME _UxGT(" připraven.")
#define MSG_BACK _UxGT("Zpět") #define MSG_BACK _UxGT("Zpět")

View file

@ -32,6 +32,7 @@
#define MAPPER_C2C3 #define MAPPER_C2C3
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" er klar") #define WELCOME_MSG MACHINE_NAME _UxGT(" er klar")
#define MSG_SD_INSERTED _UxGT("Kort isat") #define MSG_SD_INSERTED _UxGT("Kort isat")

View file

@ -32,6 +32,7 @@
#define MAPPER_C2C3 #define MAPPER_C2C3
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define CHARSIZE 2
#define THIS_LANGUAGES_SPECIAL_SYMBOLS _UxGT("ÄäÖöÜüß²³") #define THIS_LANGUAGES_SPECIAL_SYMBOLS _UxGT("ÄäÖöÜüß²³")

View file

@ -32,6 +32,7 @@
#define MAPPER_CECF #define MAPPER_CECF
#define DISPLAY_CHARSET_ISO10646_GREEK #define DISPLAY_CHARSET_ISO10646_GREEK
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" έτοιμο.") #define WELCOME_MSG MACHINE_NAME _UxGT(" έτοιμο.")
#define MSG_SD_INSERTED _UxGT("Εισαγωγή κάρτας") #define MSG_SD_INSERTED _UxGT("Εισαγωγή κάρτας")

View file

@ -32,6 +32,7 @@
#define MAPPER_CECF #define MAPPER_CECF
#define DISPLAY_CHARSET_ISO10646_GREEK #define DISPLAY_CHARSET_ISO10646_GREEK
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" έτοιμο.") #define WELCOME_MSG MACHINE_NAME _UxGT(" έτοιμο.")
#define MSG_SD_INSERTED _UxGT("Εισαγωγή κάρτας") #define MSG_SD_INSERTED _UxGT("Εισαγωγή κάρτας")

View file

@ -36,6 +36,10 @@
#endif #endif
#undef en #undef en
#ifndef CHARSIZE
#define CHARSIZE 1
#endif
#ifndef WELCOME_MSG #ifndef WELCOME_MSG
#define WELCOME_MSG MACHINE_NAME _UxGT(" Ready.") #define WELCOME_MSG MACHINE_NAME _UxGT(" Ready.")
#endif #endif

View file

@ -32,7 +32,7 @@
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define NOT_EXTENDED_ISO10646_1_5X7 #define NOT_EXTENDED_ISO10646_1_5X7
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" lista.") #define WELCOME_MSG MACHINE_NAME _UxGT(" lista.")
#define MSG_BACK _UxGT("Atras") #define MSG_BACK _UxGT("Atras")
#define MSG_SD_INSERTED _UxGT("Tarjeta colocada") #define MSG_SD_INSERTED _UxGT("Tarjeta colocada")

View file

@ -32,6 +32,7 @@
#define MAPPER_C2C3 #define MAPPER_C2C3
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" valmis.") #define WELCOME_MSG MACHINE_NAME _UxGT(" valmis.")
#define MSG_SD_INSERTED _UxGT("Kortti asetettu") #define MSG_SD_INSERTED _UxGT("Kortti asetettu")

View file

@ -32,6 +32,7 @@
#define MAPPER_NON #define MAPPER_NON
#define NOT_EXTENDED_ISO10646_1_5X7 #define NOT_EXTENDED_ISO10646_1_5X7
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" prete.") #define WELCOME_MSG MACHINE_NAME _UxGT(" prete.")
#define MSG_BACK _UxGT("Retour") #define MSG_BACK _UxGT("Retour")

View file

@ -31,6 +31,7 @@
#define LANGUAGE_HR_H #define LANGUAGE_HR_H
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays. #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" spreman.") #define WELCOME_MSG MACHINE_NAME _UxGT(" spreman.")
#define MSG_SD_INSERTED _UxGT("SD kartica umetnuta") #define MSG_SD_INSERTED _UxGT("SD kartica umetnuta")

View file

@ -34,6 +34,7 @@
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h // Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
#define SIMULATE_ROMFONT #define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_KANA #define DISPLAY_CHARSET_ISO10646_KANA
#define CHARSIZE 2
// 片仮名表示定義 // 片仮名表示定義
#define WELCOME_MSG MACHINE_NAME " ready." #define WELCOME_MSG MACHINE_NAME " ready."

View file

@ -34,6 +34,7 @@
#define MAPPER_E382E383 #define MAPPER_E382E383
#define DISPLAY_CHARSET_ISO10646_KANA #define DISPLAY_CHARSET_ISO10646_KANA
#define CHARSIZE 3
// This just to show the potential benefit of unicode. // This just to show the potential benefit of unicode.
// This translation can be improved by using the full charset of unicode codeblock U+30A0 to U+30FF. // This translation can be improved by using the full charset of unicode codeblock U+30A0 to U+30FF.

View file

@ -26,6 +26,7 @@
#ifndef LANGUAGE_PL_DOGM_H #ifndef LANGUAGE_PL_DOGM_H
#define LANGUAGE_PL_DOGM_H #define LANGUAGE_PL_DOGM_H
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" gotowy.") #define WELCOME_MSG MACHINE_NAME _UxGT(" gotowy.")
#define MSG_SD_INSERTED _UxGT("Karta włożona") #define MSG_SD_INSERTED _UxGT("Karta włożona")

View file

@ -32,6 +32,7 @@
#define LANGUAGE_PT_BR_UTF_H #define LANGUAGE_PT_BR_UTF_H
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" pronto.") #define WELCOME_MSG MACHINE_NAME _UxGT(" pronto.")
#define MSG_SD_INSERTED _UxGT("Cartão inserido") #define MSG_SD_INSERTED _UxGT("Cartão inserido")

View file

@ -32,6 +32,7 @@
#define LANGUAGE_PT_UTF_H #define LANGUAGE_PT_UTF_H
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" pronta.") #define WELCOME_MSG MACHINE_NAME _UxGT(" pronta.")
#define MSG_SD_INSERTED _UxGT("Cartão inserido") #define MSG_SD_INSERTED _UxGT("Cartão inserido")

View file

@ -32,6 +32,7 @@
#define MAPPER_D0D1 // For Cyrillic #define MAPPER_D0D1 // For Cyrillic
#define DISPLAY_CHARSET_ISO10646_5 #define DISPLAY_CHARSET_ISO10646_5
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" Готов.") #define WELCOME_MSG MACHINE_NAME _UxGT(" Готов.")
#define MSG_BACK _UxGT("Назад") #define MSG_BACK _UxGT("Назад")

View file

@ -36,6 +36,7 @@
#define MAPPER_C3C4C5_SK #define MAPPER_C3C4C5_SK
#define DISPLAY_CHARSET_ISO10646_SK #define DISPLAY_CHARSET_ISO10646_SK
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" pripravená.") #define WELCOME_MSG MACHINE_NAME _UxGT(" pripravená.")
#define MSG_BACK _UxGT("Naspať") #define MSG_BACK _UxGT("Naspať")

View file

@ -32,6 +32,7 @@
#define MAPPER_C2C3_TR #define MAPPER_C2C3_TR
#define DISPLAY_CHARSET_ISO10646_TR #define DISPLAY_CHARSET_ISO10646_TR
#define CHARSIZE 2
#if DISABLED(DOGLCD) #if DISABLED(DOGLCD)
#error "Turkish needs a graphical display." #error "Turkish needs a graphical display."

View file

@ -32,6 +32,7 @@
#define MAPPER_D0D1 // For Cyrillic #define MAPPER_D0D1 // For Cyrillic
#define DISPLAY_CHARSET_ISO10646_5 #define DISPLAY_CHARSET_ISO10646_5
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" готовий.") #define WELCOME_MSG MACHINE_NAME _UxGT(" готовий.")
#define MSG_SD_INSERTED _UxGT("Картка вставлена") #define MSG_SD_INSERTED _UxGT("Картка вставлена")

View file

@ -30,6 +30,8 @@
#ifndef LANGUAGE_ZH_CN_H #ifndef LANGUAGE_ZH_CN_H
#define LANGUAGE_ZH_CN_H #define LANGUAGE_ZH_CN_H
#define CHARSIZE 3
#define WELCOME_MSG MACHINE_NAME _UxGT("已就绪.") //" ready." #define WELCOME_MSG MACHINE_NAME _UxGT("已就绪.") //" ready."
#define MSG_SD_INSERTED _UxGT("存储卡已插入") //"Card inserted" #define MSG_SD_INSERTED _UxGT("存储卡已插入") //"Card inserted"
#define MSG_SD_REMOVED _UxGT("存储卡被拔出") //"Card removed" #define MSG_SD_REMOVED _UxGT("存储卡被拔出") //"Card removed"

View file

@ -30,6 +30,8 @@
#ifndef LANGUAGE_ZH_TW_H #ifndef LANGUAGE_ZH_TW_H
#define LANGUAGE_ZH_TW_H #define LANGUAGE_ZH_TW_H
#define CHARSIZE 3
#define WELCOME_MSG MACHINE_NAME _UxGT("已就緒.") //" ready." #define WELCOME_MSG MACHINE_NAME _UxGT("已就緒.") //" ready."
#define MSG_SD_INSERTED _UxGT("記憶卡已插入") //"Card inserted" #define MSG_SD_INSERTED _UxGT("記憶卡已插入") //"Card inserted"
#define MSG_SD_REMOVED _UxGT("記憶卡被拔出") //"Card removed" #define MSG_SD_REMOVED _UxGT("記憶卡被拔出") //"Card removed"

View file

@ -90,12 +90,16 @@ int16_t lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_spe
uint8_t lcd_status_update_delay = 1, // First update one loop delayed uint8_t lcd_status_update_delay = 1, // First update one loop delayed
lcd_status_message_level; // Higher level blocks lower level lcd_status_message_level; // Higher level blocks lower level
char lcd_status_message[3 * (LCD_WIDTH) + 1] = WELCOME_MSG; // worst case is kana with up to 3*LCD_WIDTH+1
#if ENABLED(STATUS_MESSAGE_SCROLLING) #if ENABLED(STATUS_MESSAGE_SCROLLING)
#define MAX_MESSAGE_LENGTH max(2 * CHARSIZE * LCD_WIDTH, LONG_FILENAME_LENGTH)
uint8_t status_scroll_pos = 0; uint8_t status_scroll_pos = 0;
#else
#define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH)
#endif #endif
char lcd_status_message[MAX_MESSAGE_LENGTH + 1];
#if ENABLED(SCROLL_LONG_FILENAMES) #if ENABLED(SCROLL_LONG_FILENAMES)
uint8_t filename_scroll_pos, filename_scroll_max, filename_scroll_hash; uint8_t filename_scroll_pos, filename_scroll_max, filename_scroll_hash;
#endif #endif