thomas
/
marlin
Следить 1
В избранное 0
Форкнуть 0
Код Задачи 0 Pull Request'ы 0 Релизы 0 Вики Активность
Просмотр исходного кода

Merge pull request #4634 from thinkyhead/rc_lang_disp_char 

Set language display charset in language.h
Scott Lahteine 8 лет назад
Родитель
165d7abb1b aa30550b21
Сommit
7427290d3a
26 измененных файлов: 8 добавлений и 56 удалений
Единый вид Показать статистику Diff
  1. 8
    0
      Marlin/language.h
  2. 0
    2
      Marlin/language_an.h
  3. 0
    2
      Marlin/language_bg.h
  4. 0
    2
      Marlin/language_ca.h
  5. 0
    2
      Marlin/language_cz.h
  6. 0
    2
      Marlin/language_da.h
  7. 0
    2
      Marlin/language_de.h
  8. 0
    3
      Marlin/language_el-gr.h
  9. 0
    3
      Marlin/language_el.h
  10. 0
    5
      Marlin/language_en.h
  11. 0
    2
      Marlin/language_es.h
  12. 0
    2
      Marlin/language_eu.h
  13. 0
    2
      Marlin/language_fi.h
  14. 0
    2
      Marlin/language_fr.h
  15. 0
    2
      Marlin/language_gl.h
  16. 0
    3
      Marlin/language_hr.h
  17. 0
    2
      Marlin/language_it.h
  18. 0
    2
      Marlin/language_kana_utf8.h
  19. 0
    2
      Marlin/language_nl.h
  20. 0
    2
      Marlin/language_pl.h
  21. 0
    2
      Marlin/language_pt-br.h
  22. 0
    2
      Marlin/language_pt-br_utf8.h
  23. 0
    2
      Marlin/language_pt.h
  24. 0
    2
      Marlin/language_pt_utf8.h
  25. 0
    2
      Marlin/language_ru.h
  26. 0
    2
      Marlin/language_test.h

+ 8
- 0
Marlin/language.h Просмотреть файл

25
25
26 
 #include "MarlinConfig.h"
 26 
 #include "MarlinConfig.h"
27
27
28 
+// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
29 
+//#define SIMULATE_ROMFONT
30 
+
28 
 // Fallback if no language is set. DON'T CHANGE
 31 
 // Fallback if no language is set. DON'T CHANGE
29 
 #ifndef LCD_LANGUAGE
 32 
 #ifndef LCD_LANGUAGE
30 
   #define LCD_LANGUAGE en
 33 
   #define LCD_LANGUAGE en
239 
 #define INCLUDE_LANGUAGE LANGUAGE_INCL(LCD_LANGUAGE)
 242 
 #define INCLUDE_LANGUAGE LANGUAGE_INCL(LCD_LANGUAGE)
240
243
241 
 #include INCLUDE_LANGUAGE
 244 
 #include INCLUDE_LANGUAGE
245 
+
246 
+#if DISABLED(SIMULATE_ROMFONT) && DISABLED(DISPLAY_CHARSET_ISO10646_1) && DISABLED(DISPLAY_CHARSET_ISO10646_5) && DISABLED(DISPLAY_CHARSET_ISO10646_KANA) && DISABLED(DISPLAY_CHARSET_ISO10646_GREEK) && DISABLED(DISPLAY_CHARSET_ISO10646_CN)
247 
+  #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
248 
+#endif
249 
+
242 
 #include "language_en.h"
 250 
 #include "language_en.h"
243
251
244 
 #endif //__LANGUAGE_H
 252 
 #endif //__LANGUAGE_H

+ 0
- 2
Marlin/language_an.h Просмотреть файл

30 
 #ifndef LANGUAGE_AN_H
 30 
 #ifndef LANGUAGE_AN_H
31 
 #define LANGUAGE_AN_H
 31 
 #define LANGUAGE_AN_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
36
34
37 
 #define WELCOME_MSG                         MACHINE_NAME " parada."
 35 
 #define WELCOME_MSG                         MACHINE_NAME " parada."

+ 0
- 2
Marlin/language_bg.h Просмотреть файл

31 
 #define LANGUAGE_BG_H
 31 
 #define LANGUAGE_BG_H
32
32
33 
 #define MAPPER_D0D1                // For Cyrillic
 33 
 #define MAPPER_D0D1                // For Cyrillic
34 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
35 
-//#define SIMULATE_ROMFONT
36 
 #define DISPLAY_CHARSET_ISO10646_5
 34 
 #define DISPLAY_CHARSET_ISO10646_5
37
35
38 
 #define WELCOME_MSG                         MACHINE_NAME " Готов."
 36 
 #define WELCOME_MSG                         MACHINE_NAME " Готов."

+ 0
- 2
Marlin/language_ca.h Просмотреть файл

31 
 #define LANGUAGE_CA_H
 31 
 #define LANGUAGE_CA_H
32
32
33 
 #define MAPPER_C2C3  // because of "ó"
 33 
 #define MAPPER_C2C3  // because of "ó"
34 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
35 
-//#define SIMULATE_ROMFONT
36 
 #define DISPLAY_CHARSET_ISO10646_1
 34 
 #define DISPLAY_CHARSET_ISO10646_1
37
35
38 
 #define WELCOME_MSG                         MACHINE_NAME " preparada."
 36 
 #define WELCOME_MSG                         MACHINE_NAME " preparada."

+ 0
- 2
Marlin/language_cz.h Просмотреть файл

34 
 #ifndef LANGUAGE_CZ_H
 34 
 #ifndef LANGUAGE_CZ_H
35 
 #define LANGUAGE_CZ_H
 35 
 #define LANGUAGE_CZ_H
36
36
37 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
38 
-//#define SIMULATE_ROMFONT
39 
 #define DISPLAY_CHARSET_ISO10646_1
 37 
 #define DISPLAY_CHARSET_ISO10646_1
40
38
41 
 #define WELCOME_MSG                         MACHINE_NAME " pripraven."
 39 
 #define WELCOME_MSG                         MACHINE_NAME " pripraven."

+ 0
- 2
Marlin/language_da.h Просмотреть файл

31 
 #define LANGUAGE_DA_H
 31 
 #define LANGUAGE_DA_H
32
32
33 
 #define MAPPER_C2C3
 33 
 #define MAPPER_C2C3
34 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
35 
-//#define SIMULATE_ROMFONT
36 
 #define DISPLAY_CHARSET_ISO10646_1
 34 
 #define DISPLAY_CHARSET_ISO10646_1
37
35
38 
 #define WELCOME_MSG                         MACHINE_NAME " er klar"
 36 
 #define WELCOME_MSG                         MACHINE_NAME " er klar"

+ 0
- 2
Marlin/language_de.h Просмотреть файл

31 
 #define LANGUAGE_DE_H
 31 
 #define LANGUAGE_DE_H
32
32
33 
 #define MAPPER_C2C3
 33 
 #define MAPPER_C2C3
34 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
35 
-//#define SIMULATE_ROMFONT
36 
 #define DISPLAY_CHARSET_ISO10646_1
 34 
 #define DISPLAY_CHARSET_ISO10646_1
37
35
38 
 #define WELCOME_MSG                         MACHINE_NAME " bereit"
 36 
 #define WELCOME_MSG                         MACHINE_NAME " bereit"

+ 0
- 3
Marlin/language_el-gr.h Просмотреть файл

30 
 #ifndef LANGUAGE_EL_GR_H
 30 
 #ifndef LANGUAGE_EL_GR_H
31 
 #define LANGUAGE_EL_GR_H
 31 
 #define LANGUAGE_EL_GR_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
-
36 
 //#define MAPPER_CECF
 33 
 //#define MAPPER_CECF
37 
 //#define DISPLAY_CHARSET_ISO10646_GREEK
 34 
 //#define DISPLAY_CHARSET_ISO10646_GREEK
38
35

+ 0
- 3
Marlin/language_el.h Просмотреть файл

30 
 #ifndef LANGUAGE_EL_H
 30 
 #ifndef LANGUAGE_EL_H
31 
 #define LANGUAGE_EL_H
 31 
 #define LANGUAGE_EL_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
-
36 
 #define MAPPER_CECF
 33 
 #define MAPPER_CECF
37 
 #define DISPLAY_CHARSET_ISO10646_GREEK
 34 
 #define DISPLAY_CHARSET_ISO10646_GREEK
38
35

+ 0
- 5
Marlin/language_en.h Просмотреть файл

30 
 #ifndef LANGUAGE_EN_H
 30 
 #ifndef LANGUAGE_EN_H
31 
 #define LANGUAGE_EN_H
 31 
 #define LANGUAGE_EN_H
32
32
33 
-//#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays
34 
-#if DISABLED(SIMULATE_ROMFONT) && DISABLED(DISPLAY_CHARSET_ISO10646_1) && DISABLED(DISPLAY_CHARSET_ISO10646_5) && DISABLED(DISPLAY_CHARSET_ISO10646_KANA) && DISABLED(DISPLAY_CHARSET_ISO10646_GREEK) && DISABLED(DISPLAY_CHARSET_ISO10646_CN)
35 
-  #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
36 
-#endif
37 
-
38 
 #ifndef WELCOME_MSG
 33 
 #ifndef WELCOME_MSG
39 
   #define WELCOME_MSG                         MACHINE_NAME " ready."
 34 
   #define WELCOME_MSG                         MACHINE_NAME " ready."
40 
 #endif
 35 
 #endif

+ 0
- 2
Marlin/language_es.h Просмотреть файл

30 
 #ifndef LANGUAGE_ES_H
 30 
 #ifndef LANGUAGE_ES_H
31 
 #define LANGUAGE_ES_H
 31 
 #define LANGUAGE_ES_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
36
34
37 
 #define WELCOME_MSG                         MACHINE_NAME " lista."
 35 
 #define WELCOME_MSG                         MACHINE_NAME " lista."

+ 0
- 2
Marlin/language_eu.h Просмотреть файл

30 
 #ifndef LANGUAGE_EU_H
 30 
 #ifndef LANGUAGE_EU_H
31 
 #define LANGUAGE_EU_H
 31 
 #define LANGUAGE_EU_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
36
34
37 
 #define WELCOME_MSG                         MACHINE_NAME " prest."
 35 
 #define WELCOME_MSG                         MACHINE_NAME " prest."

+ 0
- 2
Marlin/language_fi.h Просмотреть файл

31 
 #define LANGUAGE_FI_H
 31 
 #define LANGUAGE_FI_H
32
32
33 
 #define MAPPER_C2C3
 33 
 #define MAPPER_C2C3
34 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
35 
-//#define SIMULATE_ROMFONT
36 
 #define DISPLAY_CHARSET_ISO10646_1
 34 
 #define DISPLAY_CHARSET_ISO10646_1
37
35
38 
 #define WELCOME_MSG                         MACHINE_NAME " valmis."
 36 
 #define WELCOME_MSG                         MACHINE_NAME " valmis."

+ 0
- 2
Marlin/language_fr.h Просмотреть файл

30 
 #ifndef LANGUAGE_FR_H
 30 
 #ifndef LANGUAGE_FR_H
31 
 #define LANGUAGE_FR_H
 31 
 #define LANGUAGE_FR_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
36
34
37 
 #define WELCOME_MSG                         MACHINE_NAME " prete."
 35 
 #define WELCOME_MSG                         MACHINE_NAME " prete."

+ 0
- 2
Marlin/language_gl.h Просмотреть файл

31 
 #define LANGUAGE_GL_H
 31 
 #define LANGUAGE_GL_H
32
32
33 
 #define MAPPER_C2C3
 33 
 #define MAPPER_C2C3
34 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
35 
-//#define SIMULATE_ROMFONT
36 
 #define DISPLAY_CHARSET_ISO10646_1
 34 
 #define DISPLAY_CHARSET_ISO10646_1
37
35
38 
 #define WELCOME_MSG                         MACHINE_NAME " lista."
 36 
 #define WELCOME_MSG                         MACHINE_NAME " lista."

+ 0
- 3
Marlin/language_hr.h Просмотреть файл

30 
 #ifndef LANGUAGE_HR_H
 30 
 #ifndef LANGUAGE_HR_H
31 
 #define LANGUAGE_HR_H
 31 
 #define LANGUAGE_HR_H
32
32
33 
-
34 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
35 
-//#define SIMULATE_ROMFONT
36 
 #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.
37
34
38 
 #define WELCOME_MSG                         MACHINE_NAME " spreman."
 35 
 #define WELCOME_MSG                         MACHINE_NAME " spreman."

+ 0
- 2
Marlin/language_it.h Просмотреть файл

30 
 #ifndef LANGUAGE_IT_H
 30 
 #ifndef LANGUAGE_IT_H
31 
 #define LANGUAGE_IT_H
 31 
 #define LANGUAGE_IT_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
36
34
37 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."
 35 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."

+ 0
- 2
Marlin/language_kana_utf8.h Просмотреть файл

32 
 #define LANGUAGE_KANA_UTF_H
 32 
 #define LANGUAGE_KANA_UTF_H
33
33
34 
 #define MAPPER_E382E383
 34 
 #define MAPPER_E382E383
35 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
36 
-//#define SIMULATE_ROMFONT
37 
 #define DISPLAY_CHARSET_ISO10646_KANA
 35 
 #define DISPLAY_CHARSET_ISO10646_KANA
38
36
39 
 // This just to show the potential benefit of unicode.
 37 
 // This just to show the potential benefit of unicode.

+ 0
- 2
Marlin/language_nl.h Просмотреть файл

30 
 #ifndef LANGUAGE_NL_H
 30 
 #ifndef LANGUAGE_NL_H
31 
 #define LANGUAGE_NL_H
 31 
 #define LANGUAGE_NL_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
36
34
37 
 #define WELCOME_MSG                         MACHINE_NAME " gereed."
 35 
 #define WELCOME_MSG                         MACHINE_NAME " gereed."

+ 0
- 2
Marlin/language_pl.h Просмотреть файл

30 
 #ifndef LANGUAGE_PL_H
 30 
 #ifndef LANGUAGE_PL_H
31 
 #define LANGUAGE_PL_H
 31 
 #define LANGUAGE_PL_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
36
34
37 
 #define WELCOME_MSG                         MACHINE_NAME " gotowy."
 35 
 #define WELCOME_MSG                         MACHINE_NAME " gotowy."

+ 0
- 2
Marlin/language_pt-br.h Просмотреть файл

30 
 #ifndef LANGUAGE_PT_BR_H
 30 
 #ifndef LANGUAGE_PT_BR_H
31 
 #define LANGUAGE_PT_BR_H
 31 
 #define LANGUAGE_PT_BR_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
36
34
37 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."
 35 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."

+ 0
- 2
Marlin/language_pt-br_utf8.h Просмотреть файл

30 
 #ifndef LANGUAGE_PT_BR_UTF_H
 30 
 #ifndef LANGUAGE_PT_BR_UTF_H
31 
 #define LANGUAGE_PT_BR_UTF_H
 31 
 #define LANGUAGE_PT_BR_UTF_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
36
34
37 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."
 35 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."

+ 0
- 2
Marlin/language_pt.h Просмотреть файл

30 
 #ifndef LANGUAGE_PT_H
 30 
 #ifndef LANGUAGE_PT_H
31 
 #define LANGUAGE_PT_H
 31 
 #define LANGUAGE_PT_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
36
34
37 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."
 35 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."

+ 0
- 2
Marlin/language_pt_utf8.h Просмотреть файл

30 
 #ifndef LANGUAGE_PT_UTF_H
 30 
 #ifndef LANGUAGE_PT_UTF_H
31 
 #define LANGUAGE_PT_UTF_H
 31 
 #define LANGUAGE_PT_UTF_H
32
32
33 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
34 
-//#define SIMULATE_ROMFONT
35 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
36
34
37 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."
 35 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."

+ 0
- 2
Marlin/language_ru.h Просмотреть файл

31 
 #define LANGUAGE_RU_H
 31 
 #define LANGUAGE_RU_H
32
32
33 
 #define MAPPER_D0D1                // For Cyrillic
 33 
 #define MAPPER_D0D1                // For Cyrillic
34 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
35 
-//#define SIMULATE_ROMFONT
36 
 #define DISPLAY_CHARSET_ISO10646_5
 34 
 #define DISPLAY_CHARSET_ISO10646_5
37
35
38 
 #define WELCOME_MSG                         MACHINE_NAME " Готов."
 36 
 #define WELCOME_MSG                         MACHINE_NAME " Готов."

+ 0
- 2
Marlin/language_test.h Просмотреть файл

51 
 //#define MAPPER_E382E383    // For Katakana
 51 
 //#define MAPPER_E382E383    // For Katakana
52 
 //#define MAPPER_NON         // For direct ascii codes. Fall back mapper - if no other is defined.
 52 
 //#define MAPPER_NON         // For direct ascii codes. Fall back mapper - if no other is defined.
53
53
54 
-// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
55 
-//#define SIMULATE_ROMFONT
56
54
57 
 // Select the better font for full graphic displays.
 55 
 // Select the better font for full graphic displays.
58 
 //#define DISPLAY_CHARSET_ISO10646_1
 56 
 //#define DISPLAY_CHARSET_ISO10646_1

Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить