Scott Lahteine
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with
36 additions and
3 deletions
-
.travis.yml
-
Marlin/src/lcd/language/language_bg.h
-
Marlin/src/lcd/language/language_ca.h
-
Marlin/src/lcd/language/language_cn.h
-
Marlin/src/lcd/language/language_cz_utf8.h
-
Marlin/src/lcd/language/language_da.h
-
Marlin/src/lcd/language/language_de.h
-
Marlin/src/lcd/language/language_el-gr.h
-
Marlin/src/lcd/language/language_el.h
-
Marlin/src/lcd/language/language_en.h
-
Marlin/src/lcd/language/language_es.h
-
Marlin/src/lcd/language/language_fi.h
-
Marlin/src/lcd/language/language_fr.h
-
Marlin/src/lcd/language/language_hr.h
-
Marlin/src/lcd/language/language_kana.h
-
Marlin/src/lcd/language/language_kana_utf8.h
-
Marlin/src/lcd/language/language_pl-DOGM.h
-
Marlin/src/lcd/language/language_pt-br_utf8.h
-
Marlin/src/lcd/language/language_pt_utf8.h
-
Marlin/src/lcd/language/language_ru.h
-
Marlin/src/lcd/language/language_sk_utf8.h
-
Marlin/src/lcd/language/language_tr.h
-
Marlin/src/lcd/language/language_uk.h
-
Marlin/src/lcd/language/language_zh_CN.h
-
Marlin/src/lcd/language/language_zh_TW.h
-
Marlin/src/lcd/ultralcd.cpp
|
|
@ -86,8 +86,9 @@ script: |
|
|
|
- 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} |
|
|
|
# |
|
|
|
# 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_disable SEGMENT_LEVELED_MOVES |
|
|
|
- opt_enable_adv BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_D0D1 // For Cyrillic
|
|
|
|
#define DISPLAY_CHARSET_ISO10646_5 |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" Готов.") |
|
|
|
#define MSG_SD_INSERTED _UxGT("Картата е поставена") |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_C2C3 // because of "ó"
|
|
|
|
#define DISPLAY_CHARSET_ISO10646_1 |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" preparada.") |
|
|
|
#define MSG_SD_INSERTED _UxGT("Targeta detectada.") |
|
|
|
|
|
@ -31,6 +31,7 @@ |
|
|
|
#define LANGUAGE_CN_H |
|
|
|
|
|
|
|
#define DISPLAY_CHARSET_ISO10646_CN |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG "\xa4\xa5\xa6\xa7" |
|
|
|
#define MSG_SD_INSERTED "\xa8\xa9\xaa\xab" |
|
|
|
|
|
@ -37,6 +37,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_C3C4C5_CZ |
|
|
|
#define DISPLAY_CHARSET_ISO10646_CZ |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" připraven.") |
|
|
|
#define MSG_BACK _UxGT("Zpět") |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_C2C3 |
|
|
|
#define DISPLAY_CHARSET_ISO10646_1 |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" er klar") |
|
|
|
#define MSG_SD_INSERTED _UxGT("Kort isat") |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_C2C3 |
|
|
|
#define DISPLAY_CHARSET_ISO10646_1 |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define THIS_LANGUAGES_SPECIAL_SYMBOLS _UxGT("ÄäÖöÜüß²³") |
|
|
|
|
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_CECF |
|
|
|
#define DISPLAY_CHARSET_ISO10646_GREEK |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" έτοιμο.") |
|
|
|
#define MSG_SD_INSERTED _UxGT("Εισαγωγή κάρτας") |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_CECF |
|
|
|
#define DISPLAY_CHARSET_ISO10646_GREEK |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" έτοιμο.") |
|
|
|
#define MSG_SD_INSERTED _UxGT("Εισαγωγή κάρτας") |
|
|
|
|
|
@ -36,6 +36,10 @@ |
|
|
|
#endif |
|
|
|
#undef en |
|
|
|
|
|
|
|
#ifndef CHARSIZE |
|
|
|
#define CHARSIZE 1 |
|
|
|
#endif |
|
|
|
|
|
|
|
#ifndef WELCOME_MSG |
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" Ready.") |
|
|
|
#endif |
|
|
|
|
|
@ -32,7 +32,7 @@ |
|
|
|
|
|
|
|
#define DISPLAY_CHARSET_ISO10646_1 |
|
|
|
#define NOT_EXTENDED_ISO10646_1_5X7 |
|
|
|
|
|
|
|
#define CHARSIZE 2 |
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" lista.") |
|
|
|
#define MSG_BACK _UxGT("Atras") |
|
|
|
#define MSG_SD_INSERTED _UxGT("Tarjeta colocada") |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_C2C3 |
|
|
|
#define DISPLAY_CHARSET_ISO10646_1 |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" valmis.") |
|
|
|
#define MSG_SD_INSERTED _UxGT("Kortti asetettu") |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_NON |
|
|
|
#define NOT_EXTENDED_ISO10646_1_5X7 |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" prete.") |
|
|
|
#define MSG_BACK _UxGT("Retour") |
|
|
|
|
|
@ -31,6 +31,7 @@ |
|
|
|
#define LANGUAGE_HR_H |
|
|
|
|
|
|
|
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
|
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" spreman.") |
|
|
|
#define MSG_SD_INSERTED _UxGT("SD kartica umetnuta") |
|
|
|
|
|
@ -34,6 +34,7 @@ |
|
|
|
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
|
|
|
|
#define SIMULATE_ROMFONT |
|
|
|
#define DISPLAY_CHARSET_ISO10646_KANA |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
// 片仮名表示定義
|
|
|
|
#define WELCOME_MSG MACHINE_NAME " ready." |
|
|
|
|
|
@ -34,6 +34,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_E382E383 |
|
|
|
#define DISPLAY_CHARSET_ISO10646_KANA |
|
|
|
#define CHARSIZE 3 |
|
|
|
|
|
|
|
// 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.
|
|
|
|
|
|
@ -26,6 +26,7 @@ |
|
|
|
|
|
|
|
#ifndef LANGUAGE_PL_DOGM_H |
|
|
|
#define LANGUAGE_PL_DOGM_H |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" gotowy.") |
|
|
|
#define MSG_SD_INSERTED _UxGT("Karta włożona") |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
#define LANGUAGE_PT_BR_UTF_H |
|
|
|
|
|
|
|
#define DISPLAY_CHARSET_ISO10646_1 |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" pronto.") |
|
|
|
#define MSG_SD_INSERTED _UxGT("Cartão inserido") |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
#define LANGUAGE_PT_UTF_H |
|
|
|
|
|
|
|
#define DISPLAY_CHARSET_ISO10646_1 |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" pronta.") |
|
|
|
#define MSG_SD_INSERTED _UxGT("Cartão inserido") |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_D0D1 // For Cyrillic
|
|
|
|
#define DISPLAY_CHARSET_ISO10646_5 |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" Готов.") |
|
|
|
#define MSG_BACK _UxGT("Назад") |
|
|
|
|
|
@ -36,6 +36,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_C3C4C5_SK |
|
|
|
#define DISPLAY_CHARSET_ISO10646_SK |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" pripravená.") |
|
|
|
#define MSG_BACK _UxGT("Naspať") |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_C2C3_TR |
|
|
|
#define DISPLAY_CHARSET_ISO10646_TR |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#if DISABLED(DOGLCD) |
|
|
|
#error "Turkish needs a graphical display." |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
|
|
|
|
|
#define MAPPER_D0D1 // For Cyrillic
|
|
|
|
#define DISPLAY_CHARSET_ISO10646_5 |
|
|
|
#define CHARSIZE 2 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT(" готовий.") |
|
|
|
#define MSG_SD_INSERTED _UxGT("Картка вставлена") |
|
|
|
|
|
@ -30,6 +30,8 @@ |
|
|
|
#ifndef LANGUAGE_ZH_CN_H |
|
|
|
#define LANGUAGE_ZH_CN_H |
|
|
|
|
|
|
|
#define CHARSIZE 3 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT("已就绪.") //" ready."
|
|
|
|
#define MSG_SD_INSERTED _UxGT("存储卡已插入") //"Card inserted"
|
|
|
|
#define MSG_SD_REMOVED _UxGT("存储卡被拔出") //"Card removed"
|
|
|
|
|
|
@ -30,6 +30,8 @@ |
|
|
|
#ifndef LANGUAGE_ZH_TW_H |
|
|
|
#define LANGUAGE_ZH_TW_H |
|
|
|
|
|
|
|
#define CHARSIZE 3 |
|
|
|
|
|
|
|
#define WELCOME_MSG MACHINE_NAME _UxGT("已就緒.") //" ready."
|
|
|
|
#define MSG_SD_INSERTED _UxGT("記憶卡已插入") //"Card inserted"
|
|
|
|
#define MSG_SD_REMOVED _UxGT("記憶卡被拔出") //"Card removed"
|
|
|
|
|
|
@ -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
|
|
|
|
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) |
|
|
|
#define MAX_MESSAGE_LENGTH max(2 * CHARSIZE * LCD_WIDTH, LONG_FILENAME_LENGTH) |
|
|
|
uint8_t status_scroll_pos = 0; |
|
|
|
#else |
|
|
|
#define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH) |
|
|
|
#endif |
|
|
|
|
|
|
|
char lcd_status_message[MAX_MESSAGE_LENGTH + 1]; |
|
|
|
|
|
|
|
#if ENABLED(SCROLL_LONG_FILENAMES) |
|
|
|
uint8_t filename_scroll_pos, filename_scroll_max, filename_scroll_hash; |
|
|
|
#endif |
|
|
|