thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Removed unused macros

Yunhui Fu 7 years ago
parent
3f71e951f1
commit
41839746a2
21 changed files with 9 additions and 28 deletions
Unified View Show Diff Stats
  1. 0
    1
      Marlin/src/lcd/language/language_bg.h
  2. 0
    2
      Marlin/src/lcd/language/language_ca.h
  3. 0
    1
      Marlin/src/lcd/language/language_cz.h
  4. 0
    1
      Marlin/src/lcd/language/language_da.h
  5. 0
    2
      Marlin/src/lcd/language/language_de.h
  6. 0
    1
      Marlin/src/lcd/language/language_el-gr.h
  7. 0
    1
      Marlin/src/lcd/language/language_el.h
  8. 0
    1
      Marlin/src/lcd/language/language_es.h
  9. 0
    1
      Marlin/src/lcd/language/language_fi.h
  10. 0
    1
      Marlin/src/lcd/language/language_fr.h
  11. 0
    1
      Marlin/src/lcd/language/language_gl.h
  12. 0
    1
      Marlin/src/lcd/language/language_it.h
  13. 0
    1
      Marlin/src/lcd/language/language_jp-kana.h
  14. 0
    1
      Marlin/src/lcd/language/language_pl.h
  15. 3
    2
      Marlin/src/lcd/language/language_pt-br.h
  16. 0
    1
      Marlin/src/lcd/language/language_pt.h
  17. 0
    1
      Marlin/src/lcd/language/language_ru.h
  18. 6
    1
      Marlin/src/lcd/language/language_sk.h
  19. 0
    5
      Marlin/src/lcd/language/language_test.h
  20. 0
    1
      Marlin/src/lcd/language/language_tr.h
  21. 0
    1
      Marlin/src/lcd/language/language_uk.h

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

30 
 #ifndef LANGUAGE_BG_H
 30 
 #ifndef LANGUAGE_BG_H
31 
 #define LANGUAGE_BG_H
 31 
 #define LANGUAGE_BG_H
32
32
33 
-#define MAPPER_D0D1                // For Cyrillic
34 
 #define DISPLAY_CHARSET_ISO10646_5
 33 
 #define DISPLAY_CHARSET_ISO10646_5
35 
 #define CHARSIZE 2
 34 
 #define CHARSIZE 2
36
35

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

30 
 #ifndef LANGUAGE_CA_H
 30 
 #ifndef LANGUAGE_CA_H
31 
 #define LANGUAGE_CA_H
 31 
 #define LANGUAGE_CA_H
32
32
33 
-#define MAPPER_C2C3  // because of "ó"
34 
-#define DISPLAY_CHARSET_ISO10646_1
35 
 #define CHARSIZE 2
 33 
 #define CHARSIZE 2
36
34
37 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" preparada.")
 35 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" preparada.")

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

35 
 #ifndef LANGUAGE_CZ_UTF_H
 35 
 #ifndef LANGUAGE_CZ_UTF_H
36 
 #define LANGUAGE_CZ_UTF_H
 36 
 #define LANGUAGE_CZ_UTF_H
37
37
38 
-#define MAPPER_C3C4C5_CZ
39 
 #define DISPLAY_CHARSET_ISO10646_CZ
 38 
 #define DISPLAY_CHARSET_ISO10646_CZ
40 
 #define CHARSIZE 2
 39 
 #define CHARSIZE 2
41
40

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

30 
 #ifndef LANGUAGE_DA_H
 30 
 #ifndef LANGUAGE_DA_H
31 
 #define LANGUAGE_DA_H
 31 
 #define LANGUAGE_DA_H
32
32
33 
-#define MAPPER_C2C3
34 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
35 
 #define CHARSIZE 2
 34 
 #define CHARSIZE 2
36
35

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

30 
 #ifndef LANGUAGE_DE_H
 30 
 #ifndef LANGUAGE_DE_H
31 
 #define LANGUAGE_DE_H
 31 
 #define LANGUAGE_DE_H
32
32
33 
-#define MAPPER_C2C3
34 
-#define DISPLAY_CHARSET_ISO10646_1
35 
 #define CHARSIZE 2
 33 
 #define CHARSIZE 2
36
34
37 
 #define THIS_LANGUAGES_SPECIAL_SYMBOLS      _UxGT("ÄäÖöÜüß²³")
 35 
 #define THIS_LANGUAGES_SPECIAL_SYMBOLS      _UxGT("ÄäÖöÜüß²³")

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

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 MAPPER_CECF
34 
 #define DISPLAY_CHARSET_ISO10646_GREEK
 33 
 #define DISPLAY_CHARSET_ISO10646_GREEK
35 
 #define CHARSIZE 2
 34 
 #define CHARSIZE 2
36
35

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

30 
 #ifndef LANGUAGE_EL_H
 30 
 #ifndef LANGUAGE_EL_H
31 
 #define LANGUAGE_EL_H
 31 
 #define LANGUAGE_EL_H
32
32
33 
-#define MAPPER_CECF
34 
 #define DISPLAY_CHARSET_ISO10646_GREEK
 33 
 #define DISPLAY_CHARSET_ISO10646_GREEK
35 
 #define CHARSIZE 2
 34 
 #define CHARSIZE 2
36
35

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

30 
 #ifndef LANGUAGE_ES_UTF_H
 30 
 #ifndef LANGUAGE_ES_UTF_H
31 
 #define LANGUAGE_ES_UTF_H
 31 
 #define LANGUAGE_ES_UTF_H
32
32
33 
-#define MAPPER_C2C3
34 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
35 
 #define CHARSIZE 2
 34 
 #define CHARSIZE 2
36
35

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

30 
 #ifndef LANGUAGE_FI_H
 30 
 #ifndef LANGUAGE_FI_H
31 
 #define LANGUAGE_FI_H
 31 
 #define LANGUAGE_FI_H
32
32
33 
-#define MAPPER_C2C3
34 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
35 
 #define CHARSIZE 2
 34 
 #define CHARSIZE 2
36
35

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

30 
 #ifndef LANGUAGE_FR_UTF_H
 30 
 #ifndef LANGUAGE_FR_UTF_H
31 
 #define LANGUAGE_FR_UTF_H
 31 
 #define LANGUAGE_FR_UTF_H
32
32
33 
-#define MAPPER_C2C3
34 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
35 
 #define CHARSIZE 2
 34 
 #define CHARSIZE 2
36
35

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

30 
 #ifndef LANGUAGE_GL_H
 30 
 #ifndef LANGUAGE_GL_H
31 
 #define LANGUAGE_GL_H
 31 
 #define LANGUAGE_GL_H
32
32
33 
-#define MAPPER_C2C3
34 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
35 
 #define NOT_EXTENDED_ISO10646_1_5X7
 34 
 #define NOT_EXTENDED_ISO10646_1_5X7
36
35

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

30 
 #ifndef LANGUAGE_IT_H
 30 
 #ifndef LANGUAGE_IT_H
31 
 #define LANGUAGE_IT_H
 31 
 #define LANGUAGE_IT_H
32
32
33 
-#define MAPPER_C2C3
34 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
35
34
36 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronto.")
 35 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronto.")

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

32 
 #ifndef LANGUAGE_KANA_UTF_H
 32 
 #ifndef LANGUAGE_KANA_UTF_H
33 
 #define LANGUAGE_KANA_UTF_H
 33 
 #define LANGUAGE_KANA_UTF_H
34
34
35 
-#define MAPPER_E382E383
36 
 #define DISPLAY_CHARSET_ISO10646_KANA
 35 
 #define DISPLAY_CHARSET_ISO10646_KANA
37 
 #define CHARSIZE 3
 36 
 #define CHARSIZE 3
38
37

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

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
29
30 
-#define MAPPER_C3C4C5_PL
31 
 #define DISPLAY_CHARSET_ISO10646_PL
 30 
 #define DISPLAY_CHARSET_ISO10646_PL
32
31
33 
 #define CHARSIZE 2
 32 
 #define CHARSIZE 2

+ 3
- 2
Marlin/src/lcd/language/language_pt-br.h View File

31 
 #ifndef LANGUAGE_PT_BR_UTF_H
 31 
 #ifndef LANGUAGE_PT_BR_UTF_H
32 
 #define LANGUAGE_PT_BR_UTF_H
 32 
 #define LANGUAGE_PT_BR_UTF_H
33
33
34 
-#define MAPPER_C2C3
35 
-#define DISPLAY_CHARSET_ISO10646_1
34 
+// Put characters here that should be displayed with M117
35 
+//_UxGT("áãàçÉéêíóõ")
36 
+
36 
 #define CHARSIZE 2
 37 
 #define CHARSIZE 2
37
38
38 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronto.")
 39 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronto.")

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

31 
 #ifndef LANGUAGE_PT_UTF_H
 31 
 #ifndef LANGUAGE_PT_UTF_H
32 
 #define LANGUAGE_PT_UTF_H
 32 
 #define LANGUAGE_PT_UTF_H
33
33
34 
-#define MAPPER_C2C3
35 
 #define DISPLAY_CHARSET_ISO10646_1
 34 
 #define DISPLAY_CHARSET_ISO10646_1
36 
 #define CHARSIZE 2
 35 
 #define CHARSIZE 2
37
36

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

30 
 #ifndef LANGUAGE_RU_H
 30 
 #ifndef LANGUAGE_RU_H
31 
 #define LANGUAGE_RU_H
 31 
 #define LANGUAGE_RU_H
32
32
33 
-#define MAPPER_D0D1                // For Cyrillic
34 
 #define DISPLAY_CHARSET_ISO10646_5
 33 
 #define DISPLAY_CHARSET_ISO10646_5
35 
 #define CHARSIZE 2
 34 
 #define CHARSIZE 2
36
35

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

34 
 #ifndef LANGUAGE_SK_UTF_H
 34 
 #ifndef LANGUAGE_SK_UTF_H
35 
 #define LANGUAGE_SK_UTF_H
 35 
 #define LANGUAGE_SK_UTF_H
36
36
37 
-#define MAPPER_C3C4C5_SK
37 
+// Put characters here that should be displayed with M117
38 
+//_UxGT("aäAÄaáAÁeéEÉiíIÍlĺLĹ")
39 
+//_UxGT("oóOÓoôOÔrŕRŔuúUÚyýYÝ")
40 
+//_UxGT("cčCČdďDĎlľLĽnňNŇsšSŠ")
41 
+//_UxGT("tťTŤzžZŽ")
42 
+
38 
 #define DISPLAY_CHARSET_ISO10646_SK
 43 
 #define DISPLAY_CHARSET_ISO10646_SK
39 
 #define CHARSIZE 2
 44 
 #define CHARSIZE 2
40
45

+ 0
- 5
Marlin/src/lcd/language/language_test.h View File

46 
 //   Kanji (an other Japanese symbol set) uses far more than two codepages. So currently I don't see a chance to map the Unicodes. Its not
 46 
 //   Kanji (an other Japanese symbol set) uses far more than two codepages. So currently I don't see a chance to map the Unicodes. Its not
47 
 //   impossible to have a close to direct mapping but will need giant conversion tables and fonts (we don't want to have in a embedded system).
 47 
 //   impossible to have a close to direct mapping but will need giant conversion tables and fonts (we don't want to have in a embedded system).
48
48
49 
-//#define MAPPER_C2C3        // For most European languages when language file is in utf8
50 
-//#define MAPPER_D0D1        // For Cyrillic
51 
-//#define MAPPER_E382E383    // For Katakana
52 
-//#define MAPPER_NON         // For direct ascii codes. Fall back mapper - if no other is defined.
53 
-
54
49
55 
 // Select the better font for full graphic displays.
 50 
 // Select the better font for full graphic displays.
56 
 //#define DISPLAY_CHARSET_ISO10646_1
 51 
 //#define DISPLAY_CHARSET_ISO10646_1

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

30 
 #ifndef LANGUAGE_TR_H
 30 
 #ifndef LANGUAGE_TR_H
31 
 #define LANGUAGE_TR_H
 31 
 #define LANGUAGE_TR_H
32
32
33 
-#define MAPPER_C2C3_TR
34 
 #define DISPLAY_CHARSET_ISO10646_TR
 33 
 #define DISPLAY_CHARSET_ISO10646_TR
35 
 #define CHARSIZE 2
 34 
 #define CHARSIZE 2
36
35

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

30 
 #ifndef LANGUAGE_UK_H
 30 
 #ifndef LANGUAGE_UK_H
31 
 #define LANGUAGE_UK_H
 31 
 #define LANGUAGE_UK_H
32
32
33 
-#define MAPPER_D0D1                // For Cyrillic
34 
 #define DISPLAY_CHARSET_ISO10646_5
 33 
 #define DISPLAY_CHARSET_ISO10646_5
35 
 #define CHARSIZE 2
 34 
 #define CHARSIZE 2
36
35

Write Preview
Loading…
Cancel
Save