瀏覽代碼

LULZBOT_TOUCH_UI extended character set (#15301)

Marcio Teixeira 4 年之前
父節點
當前提交
4ff59d178d
共有 100 個檔案被更改,包括 3438 行新增890 行删除
  1. 22
    2
      Marlin/Configuration_adv.h
  2. 20
    6
      Marlin/src/lcd/extensible_ui/lib/lulzbot/config.h
  3. 9
    9
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/commands.cpp
  4. 2
    1
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/compat.h
  5. 35
    25
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/command_processor.h
  6. 3
    3
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/dl_cache.cpp
  7. 2
    2
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/event_loop.cpp
  8. 2
    2
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/screen_types.cpp
  9. 1
    1
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/sound_player.cpp
  10. 7
    4
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/text_box.cpp
  11. 1
    1
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
  12. 二進制
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
  13. 141
    41
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
  14. 1
    1
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/font_size_t.cpp
  15. 8
    2
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
  16. 30
    1
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/unicode.cpp
  17. 5
    0
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/unicode.h
  18. 114
    3
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/western_char_set.cpp
  19. 1271
    620
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
  20. 32
    13
      Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extras/bitmap2cpp.py
  21. 1
    1
      Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_printing_dialog_box.cpp
  22. 1
    1
      Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/status_screen.cpp
  23. 1
    1
      Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/touch_calibration_screen.cpp
  24. 22
    2
      config/default/Configuration_adv.h
  25. 22
    2
      config/examples/3DFabXYZ/Migbot/Configuration_adv.h
  26. 22
    2
      config/examples/ADIMLab/Gantry v1/Configuration_adv.h
  27. 22
    2
      config/examples/ADIMLab/Gantry v2/Configuration_adv.h
  28. 22
    2
      config/examples/AlephObjects/TAZ4/Configuration_adv.h
  29. 22
    2
      config/examples/Alfawise/U20-bltouch/Configuration_adv.h
  30. 22
    2
      config/examples/Alfawise/U20/Configuration_adv.h
  31. 22
    2
      config/examples/AliExpress/UM2pExt/Configuration_adv.h
  32. 22
    2
      config/examples/Anet/A2/Configuration_adv.h
  33. 22
    2
      config/examples/Anet/A2plus/Configuration_adv.h
  34. 22
    2
      config/examples/Anet/A6/Configuration_adv.h
  35. 22
    2
      config/examples/Anet/A8/Configuration_adv.h
  36. 22
    2
      config/examples/Anet/A8plus/Configuration_adv.h
  37. 22
    2
      config/examples/Anet/E16/Configuration_adv.h
  38. 22
    2
      config/examples/AnyCubic/i3/Configuration_adv.h
  39. 22
    2
      config/examples/ArmEd/Configuration_adv.h
  40. 22
    2
      config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
  41. 22
    2
      config/examples/BIBO/TouchX/default/Configuration_adv.h
  42. 22
    2
      config/examples/BQ/Hephestos/Configuration_adv.h
  43. 22
    2
      config/examples/BQ/Hephestos_2/Configuration_adv.h
  44. 22
    2
      config/examples/BQ/WITBOX/Configuration_adv.h
  45. 22
    2
      config/examples/Cartesio/Configuration_adv.h
  46. 22
    2
      config/examples/Creality/CR-10/Configuration_adv.h
  47. 22
    2
      config/examples/Creality/CR-10S/Configuration_adv.h
  48. 22
    2
      config/examples/Creality/CR-10_5S/Configuration_adv.h
  49. 22
    2
      config/examples/Creality/CR-10mini/Configuration_adv.h
  50. 22
    2
      config/examples/Creality/CR-20 Pro/Configuration_adv.h
  51. 22
    2
      config/examples/Creality/CR-20/Configuration_adv.h
  52. 22
    2
      config/examples/Creality/CR-8/Configuration_adv.h
  53. 22
    2
      config/examples/Creality/Ender-2/Configuration_adv.h
  54. 22
    2
      config/examples/Creality/Ender-3/Configuration_adv.h
  55. 22
    2
      config/examples/Creality/Ender-4/Configuration_adv.h
  56. 22
    2
      config/examples/Creality/Ender-5/Configuration_adv.h
  57. 22
    2
      config/examples/Dagoma/Disco Ultimate/Configuration_adv.h
  58. 22
    2
      config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h
  59. 22
    2
      config/examples/Einstart-S/Configuration_adv.h
  60. 22
    2
      config/examples/FYSETC/AIO_II/Configuration_adv.h
  61. 22
    2
      config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h
  62. 22
    2
      config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h
  63. 22
    2
      config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h
  64. 22
    2
      config/examples/FYSETC/Cheetah/base/Configuration_adv.h
  65. 22
    2
      config/examples/FYSETC/F6_13/Configuration_adv.h
  66. 22
    2
      config/examples/Felix/Configuration_adv.h
  67. 22
    2
      config/examples/FlashForge/CreatorPro/Configuration_adv.h
  68. 22
    2
      config/examples/FolgerTech/i3-2020/Configuration_adv.h
  69. 22
    2
      config/examples/Formbot/Raptor/Configuration_adv.h
  70. 22
    2
      config/examples/Formbot/T_Rex_2+/Configuration_adv.h
  71. 22
    2
      config/examples/Formbot/T_Rex_3/Configuration_adv.h
  72. 22
    2
      config/examples/Geeetech/A10/Configuration_adv.h
  73. 22
    2
      config/examples/Geeetech/A10M/Configuration_adv.h
  74. 22
    2
      config/examples/Geeetech/A20M/Configuration_adv.h
  75. 22
    2
      config/examples/Geeetech/MeCreator2/Configuration_adv.h
  76. 22
    2
      config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
  77. 22
    2
      config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
  78. 79
    0
      config/examples/HMS434/Configuration_adv.h
  79. 22
    2
      config/examples/Infitary/i3-M508/Configuration_adv.h
  80. 22
    2
      config/examples/JGAurora/A1/Configuration_adv.h
  81. 22
    2
      config/examples/JGAurora/A5/Configuration_adv.h
  82. 22
    2
      config/examples/JGAurora/A5S/Configuration_adv.h
  83. 22
    2
      config/examples/MakerParts/Configuration_adv.h
  84. 22
    2
      config/examples/Malyan/M150/Configuration_adv.h
  85. 22
    2
      config/examples/Malyan/M200/Configuration_adv.h
  86. 22
    2
      config/examples/Micromake/C1/enhanced/Configuration_adv.h
  87. 22
    2
      config/examples/Mks/Robin/Configuration_adv.h
  88. 22
    2
      config/examples/Mks/Sbase/Configuration_adv.h
  89. 22
    2
      config/examples/RapideLite/RL200/Configuration_adv.h
  90. 22
    2
      config/examples/RigidBot/Configuration_adv.h
  91. 22
    2
      config/examples/SCARA/Configuration_adv.h
  92. 22
    2
      config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h
  93. 22
    2
      config/examples/Sanguinololu/Configuration_adv.h
  94. 22
    2
      config/examples/Tevo/Michelangelo/Configuration_adv.h
  95. 22
    2
      config/examples/Tevo/Tarantula Pro/Configuration_adv.h
  96. 22
    2
      config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h
  97. 22
    2
      config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h
  98. 22
    2
      config/examples/TheBorg/Configuration_adv.h
  99. 22
    2
      config/examples/TinyBoy2/Configuration_adv.h
  100. 0
    0
      config/examples/Tronxy/X3A/Configuration_adv.h

+ 22
- 2
Marlin/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 20
- 6
Marlin/src/lcd/extensible_ui/lib/lulzbot/config.h 查看文件

@@ -76,10 +76,27 @@
76 76
 //#define TOUCH_UI_PORTRAIT
77 77
 //#define TOUCH_UI_MIRRORED
78 78
 
79
-// Enable UTF8 rendering capabilities.
79
+// Enable UTF8 processing and rendering. Unsupported characters
80
+// will be shown as '?'.
80 81
 //#define TOUCH_UI_USE_UTF8
81
-#ifdef  TOUCH_UI_USE_UTF8
82
+#ifdef TOUCH_UI_USE_UTF8
83
+  // Western accents support. These accented characters use
84
+  // combined bitmaps and require relatively little storage.
82 85
   #define TOUCH_UI_UTF8_WESTERN_CHARSET
86
+  #ifdef TOUCH_UI_UTF8_WESTERN_CHARSET
87
+    // Additional character groups. These characters require
88
+    // full bitmaps and take up considerable storage:
89
+    //#define TOUCH_UI_UTF8_SUPERSCRIPTS    // ¹ ² ³
90
+    //#define TOUCH_UI_UTF8_COPYRIGHT       // © ®
91
+    //#define TOUCH_UI_UTF8_GERMANIC        // ß
92
+    //#define TOUCH_UI_UTF8_SCANDINAVIAN    // Æ Ð Ø Þ æ ð ø þ
93
+    //#define TOUCH_UI_UTF8_PUNCTUATION     // « » ¿ ¡
94
+    //#define TOUCH_UI_UTF8_CURRENCY        // ¢ £ ¤ ¥
95
+    //#define TOUCH_UI_UTF8_ORDINALS        // º ª
96
+    //#define TOUCH_UI_UTF8_MATHEMATICS     // ± × ÷
97
+    //#define TOUCH_UI_UTF8_FRACTIONS       // ¼ ½ ¾
98
+    //#define TOUCH_UI_UTF8_SYMBOLS         // µ ¶ ¦ § ¬
99
+  #endif
83 100
 #endif
84 101
 
85 102
 // When labels do not fit buttons, use smaller font
@@ -97,14 +114,11 @@
97 114
 //#define LCD_TIMEOUT_TO_STATUS 15000
98 115
 
99 116
 // Enable this to debug the event framework
100
-//#define UI_FRAMEWORK_DEBUG
117
+//#define TOUCH_UI_DEBUG
101 118
 
102 119
 // Enable the developer's menu and screens
103 120
 //#define DEVELOPER_SCREENS
104 121
 
105
-// Maximum feed rate for manual extrusion (mm/s)
106
-#define MAX_MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60}
107
-
108 122
 // Sets the SPI speed in Hz
109 123
 
110 124
 #define SPI_FREQUENCY 8000000 >> SPI_SPEED

+ 9
- 9
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/commands.cpp 查看文件

@@ -921,7 +921,7 @@ template <class T> bool CLCD::CommandFifo::_write_unaligned(T data, uint16_t len
921 921
   uint32_t bytes_tail, bytes_head;
922 922
   uint32_t command_read_ptr;
923 923
 
924
-  #ifdef UI_FRAMEWORK_DEBUG
924
+  #if ENABLED(TOUCH_UI_DEBUG)
925 925
   if (command_write_ptr == 0xFFFFFFFFul) {
926 926
     SERIAL_ECHO_START();
927 927
     SERIAL_ECHOLNPGM("Attempt to write to FIFO before CommandFifo::Cmd_Start().");
@@ -940,7 +940,7 @@ template <class T> bool CLCD::CommandFifo::_write_unaligned(T data, uint16_t len
940 940
     }
941 941
     // Check for faults which can lock up the command processor
942 942
     if (has_fault()) {
943
-      #ifdef UI_FRAMEWORK_DEBUG
943
+      #if ENABLED(TOUCH_UI_DEBUG)
944 944
         SERIAL_ECHOLNPGM("Fault waiting for space in the command processor");
945 945
       #endif
946 946
       return false;
@@ -985,7 +985,7 @@ void CLCD::CommandFifo::execute() {
985 985
 }
986 986
 
987 987
 void CLCD::CommandFifo::reset() {
988
-  #ifdef UI_FRAMEWORK_DEBUG
988
+  #if ENABLED(TOUCH_UI_DEBUG)
989 989
     SERIAL_ECHOLNPGM("Resetting command processor");
990 990
   #endif
991 991
   safe_delay(100);
@@ -1004,7 +1004,7 @@ template <class T> bool CLCD::CommandFifo::write(T data, uint16_t len) {
1004 1004
   const uint8_t padding = MULTIPLE_OF_4(len) - len;
1005 1005
 
1006 1006
   if (has_fault()) {
1007
-    #ifdef UI_FRAMEWORK_DEBUG
1007
+    #if ENABLED(TOUCH_UI_DEBUG)
1008 1008
       SERIAL_ECHOLNPGM("Faulted... ignoring write.");
1009 1009
     #endif
1010 1010
     return false;
@@ -1014,7 +1014,7 @@ template <class T> bool CLCD::CommandFifo::write(T data, uint16_t len) {
1014 1014
   // management.
1015 1015
   uint16_t Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF;
1016 1016
   if (Command_Space < (len + padding)) {
1017
-    #ifdef UI_FRAMEWORK_DEBUG
1017
+    #if ENABLED(TOUCH_UI_DEBUG)
1018 1018
       SERIAL_ECHO_START();
1019 1019
       SERIAL_ECHOPAIR("Waiting for ", len + padding);
1020 1020
       SERIAL_ECHOPAIR(" bytes in command queue, now free: ", Command_Space);
@@ -1022,13 +1022,13 @@ template <class T> bool CLCD::CommandFifo::write(T data, uint16_t len) {
1022 1022
     do {
1023 1023
       Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF;
1024 1024
       if (has_fault()) {
1025
-        #ifdef UI_FRAMEWORK_DEBUG
1025
+        #if ENABLED(TOUCH_UI_DEBUG)
1026 1026
           SERIAL_ECHOLNPGM("... fault");
1027 1027
         #endif
1028 1028
         return false;
1029 1029
       }
1030 1030
     } while (Command_Space < len + padding);
1031
-    #ifdef UI_FRAMEWORK_DEBUG
1031
+    #if ENABLED(TOUCH_UI_DEBUG)
1032 1032
       SERIAL_ECHOLNPGM("... done");
1033 1033
     #endif
1034 1034
   }
@@ -1070,7 +1070,7 @@ void CLCD::init() {
1070 1070
   for(counter = 0; counter < 250; counter++) {
1071 1071
    uint8_t device_id = mem_read_8(REG::ID);            // Read Device ID, Should Be 0x7C;
1072 1072
    if (device_id == 0x7c) {
1073
-     #ifdef UI_FRAMEWORK_DEBUG
1073
+     #if ENABLED(TOUCH_UI_DEBUG)
1074 1074
        SERIAL_ECHO_START();
1075 1075
        SERIAL_ECHOLNPGM("FTDI chip initialized ");
1076 1076
      #endif
@@ -1080,7 +1080,7 @@ void CLCD::init() {
1080 1080
      delay(1);
1081 1081
    }
1082 1082
    if (counter == 249) {
1083
-     #ifdef UI_FRAMEWORK_DEBUG
1083
+     #if ENABLED(TOUCH_UI_DEBUG)
1084 1084
        SERIAL_ECHO_START();
1085 1085
        SERIAL_ECHOLNPAIR("Timeout waiting for device ID, should be 124, got ", device_id);
1086 1086
      #endif

+ 2
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/compat.h 查看文件

@@ -208,7 +208,8 @@
208 208
   #define SWITCH_ENABLED_    1
209 209
   #define ENABLED(b)         _CAT(SWITCH_ENABLED_, b)
210 210
   #define DISABLED(b)        !ENABLED(b)
211
-  #define ANY(A,B)           ENABLED(A) || ENABLED(B)
211
+  #define ANY(A,B)           (ENABLED(A) || ENABLED(B))
212
+  #define BOTH(A,B)          (ENABLED(A) && ENABLED(B))
212 213
 
213 214
   // Remove compiler warning on an unused variable
214 215
   #ifndef UNUSED

+ 35
- 25
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/command_processor.h 查看文件

@@ -310,15 +310,20 @@ class CommandProcessor : public CLCD::CommandFifo {
310 310
     int8_t apply_fit_text(int16_t w, int16_t h, T text) {
311 311
       using namespace FTDI;
312 312
       int8_t font = _font;
313
+      const bool is_utf8 = has_utf8_chars(text);
313 314
       for (;font >= 26;) {
315
+        int16_t width, height;
314 316
         #ifdef TOUCH_UI_USE_UTF8
315
-          const int16_t width  = get_utf8_text_width(text, font_size_t::from_romfont(font));
316
-          const int16_t height = font_size_t::from_romfont(font).get_height();
317
-        #else
318
-          CLCD::FontMetrics fm(font);
319
-          const int16_t width  = fm.get_text_width(text);
320
-          const int16_t height = fm.height;
317
+          if (is_utf8) {
318
+            width  = get_utf8_text_width(text, font_size_t::from_romfont(font));
319
+            height = font_size_t::from_romfont(font).get_height();
320
+          } else
321 321
         #endif
322
+          {
323
+            CLCD::FontMetrics fm(font);
324
+            width  = fm.get_text_width(text);
325
+            height = fm.height;
326
+          }
322 327
         if (width < w && height < h) break;
323 328
         font--;
324 329
       }
@@ -336,11 +341,11 @@ class CommandProcessor : public CLCD::CommandFifo {
336 341
     uint16_t text_width(T text) {
337 342
       using namespace FTDI;
338 343
       #ifdef TOUCH_UI_USE_UTF8
339
-        return get_utf8_text_width(text, font_size_t::from_romfont(_font));
340
-      #else
341
-        CLCD::FontMetrics fm(_font);
342
-        return fm.get_text_width(text);
344
+        if (has_utf8_chars(text))
345
+          return get_utf8_text_width(text, font_size_t::from_romfont(_font));
343 346
       #endif
347
+      CLCD::FontMetrics fm(_font);
348
+      return fm.get_text_width(text);
344 349
     }
345 350
 
346 351
     template<typename T>
@@ -353,11 +358,14 @@ class CommandProcessor : public CLCD::CommandFifo {
353 358
         const int8_t font = _font;
354 359
       #endif
355 360
       #ifdef TOUCH_UI_USE_UTF8
356
-        draw_utf8_text(*this, x, y, text, font_size_t::from_romfont(font), options);
357
-      #else
361
+        if (has_utf8_chars(text))
362
+          draw_utf8_text(*this, x, y, text, font_size_t::from_romfont(font), options);
363
+        else
364
+      #endif
365
+      {
358 366
         CLCD::CommandFifo::text(x, y, font, options);
359 367
         CLCD::CommandFifo::str(text);
360
-      #endif
368
+      }
361 369
       return *this;
362 370
     }
363 371
 
@@ -389,20 +397,22 @@ class CommandProcessor : public CLCD::CommandFifo {
389 397
       #endif
390 398
       CLCD::CommandFifo::button(x, y, w, h, font, options);
391 399
       #ifdef TOUCH_UI_USE_UTF8
392
-        apply_text_alignment(x, y, w, h, OPT_CENTER);
393
-        CLCD::CommandFifo::str(F(""));
394
-        if (!(options & FTDI::OPT_FLAT)) {
395
-          // Reproduce the black "shadow" the FTDI adds to the button label
396
-          CLCD::CommandFifo::cmd(SAVE_CONTEXT());
397
-          CLCD::CommandFifo::cmd(COLOR_RGB(0x00000));
398
-          draw_utf8_text(*this, x-1, y-1, text, font_size_t::from_romfont(font), OPT_CENTER);
399
-          CLCD::CommandFifo::cmd(RESTORE_CONTEXT());
400
+        if (has_utf8_chars(text)) {
401
+          CLCD::CommandFifo::str(F(""));
402
+          apply_text_alignment(x, y, w, h, OPT_CENTER);
403
+          if (!(options & FTDI::OPT_FLAT)) {
404
+            // Reproduce the black "shadow" the FTDI adds to the button label
405
+            CLCD::CommandFifo::cmd(SAVE_CONTEXT());
406
+            CLCD::CommandFifo::cmd(COLOR_RGB(0x00000));
407
+            draw_utf8_text(*this, x-1, y-1, text, font_size_t::from_romfont(font), OPT_CENTER);
408
+            CLCD::CommandFifo::cmd(RESTORE_CONTEXT());
409
+          }
410
+          // Draw the button label
411
+          draw_utf8_text(*this, x, y, text, font_size_t::from_romfont(font), OPT_CENTER);
400 412
         }
401
-        // Draw the button label
402
-        draw_utf8_text(*this, x, y, text, font_size_t::from_romfont(font), OPT_CENTER);
403
-      #else
404
-        CLCD::CommandFifo::str(text);
413
+        else
405 414
       #endif
415
+        CLCD::CommandFifo::str(text);
406 416
       if (_btn_style_callback && styleModified) _btn_style_callback(*this, _tag, _style, options, true);
407 417
       return *this;
408 418
     }

+ 3
- 3
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/dl_cache.cpp 查看文件

@@ -128,14 +128,14 @@ bool DLCache::store(uint32_t num_bytes /* = 0*/) {
128 128
 
129 129
   if (dl_size > free_space) {
130 130
     // Not enough memory to cache the display list.
131
-    #ifdef UI_FRAMEWORK_DEBUG
131
+    #if ENABLED(TOUCH_UI_DEBUG)
132 132
       SERIAL_ECHO_START();
133 133
       SERIAL_ECHOPAIR("Not enough space in GRAM to cache display list, free space: ", free_space);
134 134
       SERIAL_ECHOLNPAIR(" Required: ", dl_size);
135 135
     #endif
136 136
     return false;
137 137
   } else {
138
-    #ifdef UI_FRAMEWORK_DEBUG
138
+    #if ENABLED(TOUCH_UI_DEBUG)
139 139
       SERIAL_ECHO_START();
140 140
       SERIAL_ECHOPAIR("Saving DL to RAMG cache, bytes: ", dl_size);
141 141
       SERIAL_ECHOLNPAIR(" Free space: ", free_space);
@@ -164,7 +164,7 @@ void DLCache::load_slot() {
164 164
 void DLCache::append() {
165 165
   CLCD::CommandFifo cmd;
166 166
   cmd.append(dl_addr, dl_size);
167
-  #ifdef UI_FRAMEWORK_DEBUG
167
+  #if ENABLED(TOUCH_UI_DEBUG)
168 168
     cmd.execute();
169 169
     wait_until_idle();
170 170
     SERIAL_ECHO_START();

+ 2
- 2
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/event_loop.cpp 查看文件

@@ -124,7 +124,7 @@ namespace FTDI {
124 124
     switch (pressed_tag) {
125 125
       case UNPRESSED:
126 126
         if (tag != 0) {
127
-          #ifdef UI_FRAMEWORK_DEBUG
127
+          #if ENABLED(TOUCH_UI_DEBUG)
128 128
             SERIAL_ECHO_START();
129 129
             SERIAL_ECHOLNPAIR("Touch start: ", tag);
130 130
           #endif
@@ -189,7 +189,7 @@ namespace FTDI {
189 189
 
190 190
             if (UIData::flags.bits.touch_end_sound) sound.play(unpress_sound);
191 191
 
192
-            #ifdef UI_FRAMEWORK_DEBUG
192
+            #if ENABLED(TOUCH_UI_DEBUG)
193 193
               SERIAL_ECHO_START();
194 194
               SERIAL_ECHOLNPAIR("Touch end: ", tag);
195 195
             #endif

+ 2
- 2
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/screen_types.cpp 查看文件

@@ -31,7 +31,7 @@ uint8_t ScreenRef::lookupScreen(onRedraw_func_t onRedraw_ptr) {
31 31
       return type;
32 32
     }
33 33
   }
34
-  #ifdef UI_FRAMEWORK_DEBUG
34
+  #if ENABLED(TOUCH_UI_DEBUG)
35 35
     SERIAL_ECHO_START();
36 36
     SERIAL_ECHOPAIR("Screen not found: ", (uintptr_t) onRedraw_ptr);
37 37
   #endif
@@ -42,7 +42,7 @@ void ScreenRef::setScreen(onRedraw_func_t onRedraw_ptr) {
42 42
   uint8_t type = lookupScreen(onRedraw_ptr);
43 43
   if (type != 0xFF) {
44 44
     setType(type);
45
-    #ifdef UI_FRAMEWORK_DEBUG
45
+    #if ENABLED(TOUCH_UI_DEBUG)
46 46
       SERIAL_ECHO_START();
47 47
       SERIAL_ECHOLNPAIR("New screen: ", type);
48 48
     #endif

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/sound_player.cpp 查看文件

@@ -36,7 +36,7 @@ namespace FTDI {
36 36
 
37 37
   void SoundPlayer::play(effect_t effect, note_t note) {
38 38
 
39
-    #ifdef UI_FRAMEWORK_DEBUG
39
+    #if ENABLED(TOUCH_UI_DEBUG)
40 40
       SERIAL_ECHO_START();
41 41
       SERIAL_ECHOPAIR("Playing note ", note);
42 42
       SERIAL_ECHOLNPAIR(", instrument ", effect);

+ 7
- 4
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/text_box.cpp 查看文件

@@ -104,11 +104,14 @@ namespace FTDI {
104 104
           line[line_len - 1] = 0;
105 105
 
106 106
         #ifdef TOUCH_UI_USE_UTF8
107
-          draw_utf8_text(cmd, x + dx, y + dy, line, fm.fs, options & ~OPT_CENTERY);
108
-        #else
109
-          cmd.CLCD::CommandFifo::text(x + dx, y + dy, font, options & ~OPT_CENTERY);
110
-          cmd.CLCD::CommandFifo::str(line);
107
+          if (has_utf8_chars(line)) {
108
+            draw_utf8_text(cmd, x + dx, y + dy, line, fm.fs, options & ~OPT_CENTERY);
109
+          } else
111 110
         #endif
111
+          {
112
+            cmd.CLCD::CommandFifo::text(x + dx, y + dy, font, options & ~OPT_CENTERY);
113
+            cmd.CLCD::CommandFifo::str(line);
114
+          }
112 115
       }
113 116
       y += fm.get_height();
114 117
 

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp 查看文件

@@ -26,7 +26,7 @@
26 26
 namespace FTDI {
27 27
 
28 28
   void write_rle_data(uint16_t addr, const uint8_t *data, size_t n) {
29
-    for (; n > 2; n -= 2) {
29
+    for (; n >= 2; n -= 2) {
30 30
       uint8_t count = pgm_read_byte(data++);
31 31
       uint8_t value = pgm_read_byte(data++);
32 32
       while (count--) CLCD::mem_write_8(addr++, value);

二進制
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png 查看文件


+ 141
- 41
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg 查看文件

@@ -11,13 +11,13 @@
11 11
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
12 12
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
13 13
    width="38"
14
-   height="1225"
15
-   viewBox="0 0 10.054166 324.11458"
14
+   height="2107"
15
+   viewBox="0 0 10.054166 557.47707"
16 16
    version="1.1"
17 17
    id="svg8"
18
-   inkscape:version="0.92.1 r15371"
19
-   sodipodi:docname="western_european_bitmap_31.svg"
20
-   inkscape:export-filename="/home/aleph/git-repos/marlin-devel/tests/ftdi-eve-lib-examples/unicode_demo/src/ftdi_eve_lib/extended/unicode/font_bitmaps/western_european_bitmap_31.png"
18
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
19
+   sodipodi:docname="western_char_set_bitmap_31.svg"
20
+   inkscape:export-filename="/home/aleph/git-repos/marlin-devel/tests/ftdi-eve-lib-examples/unicode_demo/src/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png"
21 21
    inkscape:export-xdpi="96"
22 22
    inkscape:export-ydpi="96">
23 23
   <defs
@@ -30,16 +30,16 @@
30 30
      inkscape:pageopacity="1"
31 31
      inkscape:pageshadow="2"
32 32
      inkscape:zoom="3.6948106"
33
-     inkscape:cx="25.324413"
34
-     inkscape:cy="265.38829"
33
+     inkscape:cx="-66.497155"
34
+     inkscape:cy="512.92836"
35 35
      inkscape:document-units="mm"
36 36
      inkscape:current-layer="layer1"
37 37
      showgrid="true"
38 38
      units="px"
39
-     inkscape:window-width="1382"
40
-     inkscape:window-height="815"
41
-     inkscape:window-x="2126"
42
-     inkscape:window-y="131"
39
+     inkscape:window-width="1330"
40
+     inkscape:window-height="965"
41
+     inkscape:window-x="59"
42
+     inkscape:window-y="18"
43 43
      inkscape:window-maximized="0">
44 44
     <inkscape:grid
45 45
        type="xygrid"
@@ -50,7 +50,7 @@
50 50
        empspacing="1"
51 51
        color="#000000"
52 52
        opacity="0"
53
-       originx="0"
53
+       originx="8.1491663"
54 54
        empcolor="#3fff69"
55 55
        empopacity="0.25098039" />
56 56
     <inkscape:grid
@@ -114,7 +114,7 @@
114 114
      inkscape:label="Layer 1"
115 115
      inkscape:groupmode="layer"
116 116
      id="layer1"
117
-     transform="translate(0,27.114583)">
117
+     transform="translate(0,260.47708)">
118 118
     <image
119 119
        y="-947.59998"
120 120
        x="-1.7763568e-15"
@@ -139,140 +139,240 @@
139 139
        xml:space="preserve"
140 140
        style="font-style:normal;font-weight:normal;font-size:10.26181126px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.20578496"
141 141
        x="-3.5527137e-15"
142
-       y="-38.800373"
142
+       y="-272.16272"
143 143
        id="text4642"
144 144
        inkscape:export-xdpi="91.400002"
145 145
        inkscape:export-ydpi="91.400002"><tspan
146 146
          sodipodi:role="line"
147 147
          x="-3.5527137e-15"
148
-         y="-29.721075"
148
+         y="-263.08344"
149 149
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.3770504px;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
150 150
          id="tspan4614" /><tspan
151 151
          sodipodi:role="line"
152 152
          x="-3.5527137e-15"
153
-         y="-16.761999"
153
+         y="-250.12434"
154 154
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
155 155
          id="tspan4658">  ̀</tspan><tspan
156 156
          sodipodi:role="line"
157 157
          x="-3.5527137e-15"
158
-         y="-3.8029218"
158
+         y="-237.16527"
159 159
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
160 160
          id="tspan4553">  ́</tspan><tspan
161 161
          sodipodi:role="line"
162 162
          x="-3.5527137e-15"
163
-         y="9.1561546"
163
+         y="-224.20619"
164 164
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
165 165
          id="tspan4555">  ̂</tspan><tspan
166 166
          sodipodi:role="line"
167 167
          x="-3.5527137e-15"
168
-         y="22.115232"
168
+         y="-211.24712"
169 169
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
170 170
          id="tspan4557">  ̃</tspan><tspan
171 171
          sodipodi:role="line"
172 172
          x="-3.5527137e-15"
173
-         y="35.07431"
173
+         y="-198.28804"
174 174
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
175 175
          id="tspan4559">  ̈</tspan><tspan
176 176
          sodipodi:role="line"
177 177
          x="-3.5527137e-15"
178
-         y="48.033386"
178
+         y="-185.32896"
179 179
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
180 180
          id="tspan4561">  ̊</tspan><tspan
181 181
          sodipodi:role="line"
182 182
          x="-3.5527137e-15"
183
-         y="60.992462"
183
+         y="-172.36989"
184 184
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
185 185
          id="tspan4609">  ̧</tspan><tspan
186 186
          sodipodi:role="line"
187 187
          x="-3.5527137e-15"
188
-         y="73.951538"
188
+         y="-159.41081"
189 189
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
190 190
          id="tspan8898">ı</tspan><tspan
191 191
          sodipodi:role="line"
192 192
          x="-3.5527137e-15"
193
-         y="86.910614"
193
+         y="-146.45174"
194 194
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
195 195
          id="tspan4565">ß</tspan><tspan
196 196
          sodipodi:role="line"
197 197
          x="-3.5527137e-15"
198
-         y="99.86969"
198
+         y="-133.49266"
199 199
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
200 200
          id="tspan4742">Ø</tspan><tspan
201 201
          sodipodi:role="line"
202 202
          x="-3.5527137e-15"
203
-         y="112.82877"
203
+         y="-120.53358"
204 204
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
205 205
          id="tspan4750">ø</tspan><tspan
206 206
          sodipodi:role="line"
207 207
          x="-3.5527137e-15"
208
-         y="125.78785"
208
+         y="-107.5745"
209 209
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
210 210
          id="tspan4626">Æ</tspan><tspan
211 211
          sodipodi:role="line"
212 212
          x="-3.5527137e-15"
213
-         y="138.74692"
213
+         y="-94.615425"
214 214
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
215 215
          id="tspan4788">æ</tspan><tspan
216 216
          sodipodi:role="line"
217 217
          x="-3.5527137e-15"
218
-         y="151.70599"
218
+         y="-81.656349"
219 219
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
220 220
          id="tspan4792">Ð</tspan><tspan
221 221
          sodipodi:role="line"
222 222
          x="-3.5527137e-15"
223
-         y="164.66507"
223
+         y="-68.697273"
224 224
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
225 225
          id="tspan4796">ð</tspan><tspan
226 226
          sodipodi:role="line"
227 227
          x="-3.5527137e-15"
228
-         y="177.62415"
228
+         y="-55.738197"
229 229
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
230 230
          id="tspan4798">Þ</tspan><tspan
231 231
          sodipodi:role="line"
232 232
          x="-3.5527137e-15"
233
-         y="190.58324"
233
+         y="-42.779121"
234 234
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
235 235
          id="tspan4637">þ</tspan><tspan
236 236
          sodipodi:role="line"
237 237
          x="-3.5527137e-15"
238
-         y="203.54231"
238
+         y="-29.820045"
239 239
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
240 240
          id="tspan4767">«</tspan><tspan
241 241
          sodipodi:role="line"
242 242
          x="-3.5527137e-15"
243
-         y="216.50139"
243
+         y="-16.86097"
244 244
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
245 245
          id="tspan4771">»</tspan><tspan
246 246
          sodipodi:role="line"
247 247
          x="-3.5527137e-15"
248
-         y="229.46046"
248
+         y="-3.9018936"
249 249
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
250 250
          id="tspan4643">¡</tspan><tspan
251 251
          sodipodi:role="line"
252 252
          x="-3.5527137e-15"
253
-         y="242.41954"
253
+         y="9.0571823"
254 254
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
255 255
          id="tspan4720">¿</tspan><tspan
256 256
          sodipodi:role="line"
257 257
          x="-3.5527137e-15"
258
-         y="255.37862"
258
+         y="22.016258"
259 259
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
260 260
          id="tspan4775">¢</tspan><tspan
261 261
          sodipodi:role="line"
262 262
          x="-3.5527137e-15"
263
-         y="268.33768"
263
+         y="34.975334"
264 264
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
265 265
          id="tspan4724">£</tspan><tspan
266 266
          sodipodi:role="line"
267 267
          x="-3.5527137e-15"
268
-         y="281.29675"
268
+         y="47.934425"
269 269
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
270 270
          id="tspan4726">¤</tspan><tspan
271 271
          sodipodi:role="line"
272 272
          x="-3.5527137e-15"
273
-         y="294.25583"
273
+         y="60.893501"
274
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
275
+         id="tspan4654">¥</tspan><tspan
276
+         sodipodi:role="line"
277
+         x="-3.5527137e-15"
278
+         y="73.852577"
279
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
280
+         id="tspan881">¹</tspan><tspan
281
+         sodipodi:role="line"
282
+         x="-3.5527137e-15"
283
+         y="86.811653"
284
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
285
+         id="tspan864">²</tspan><tspan
286
+         sodipodi:role="line"
287
+         x="-3.5527137e-15"
288
+         y="99.770729"
289
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
290
+         id="tspan862">³</tspan><tspan
291
+         sodipodi:role="line"
292
+         x="-3.5527137e-15"
293
+         y="112.7298"
294
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
295
+         id="tspan866">º</tspan><tspan
296
+         sodipodi:role="line"
297
+         x="-3.5527137e-15"
298
+         y="125.68888"
299
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
300
+         id="tspan869">ª</tspan><tspan
301
+         sodipodi:role="line"
302
+         x="-3.5527137e-15"
303
+         y="138.64796"
304
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
305
+         id="tspan871">©</tspan><tspan
306
+         sodipodi:role="line"
307
+         x="-3.5527137e-15"
308
+         y="151.60704"
309
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
310
+         id="tspan873">®</tspan><tspan
311
+         sodipodi:role="line"
312
+         x="-3.5527137e-15"
313
+         y="164.56612"
314
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
315
+         id="tspan875">±</tspan><tspan
316
+         sodipodi:role="line"
317
+         x="-3.5527137e-15"
318
+         y="177.52519"
319
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
320
+         id="tspan877">×</tspan><tspan
321
+         sodipodi:role="line"
322
+         x="-3.5527137e-15"
323
+         y="190.48427"
324
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
325
+         id="tspan879">÷</tspan><tspan
326
+         sodipodi:role="line"
327
+         x="-3.5527137e-15"
328
+         y="203.44334"
329
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
330
+         id="tspan886">¼</tspan><tspan
331
+         sodipodi:role="line"
332
+         x="-3.5527137e-15"
333
+         y="216.40242"
334
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
335
+         id="tspan888">½</tspan><tspan
336
+         sodipodi:role="line"
337
+         x="-3.5527137e-15"
338
+         y="229.3615"
339
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
340
+         id="tspan890">¾</tspan><tspan
341
+         sodipodi:role="line"
342
+         x="-3.5527137e-15"
343
+         y="242.32057"
344
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
345
+         id="tspan882">µ</tspan><tspan
346
+         sodipodi:role="line"
347
+         x="-3.5527137e-15"
348
+         y="255.27965"
349
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
350
+         id="tspan892">¶</tspan><tspan
351
+         sodipodi:role="line"
352
+         x="-3.5527137e-15"
353
+         y="268.23871"
354
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
355
+         id="tspan896">¦</tspan><tspan
356
+         sodipodi:role="line"
357
+         x="-3.5527137e-15"
358
+         y="281.19778"
359
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
360
+         id="tspan898">§</tspan><tspan
361
+         sodipodi:role="line"
362
+         x="-3.5527137e-15"
363
+         y="294.15686"
364
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
365
+         id="tspan900">¬</tspan><tspan
366
+         sodipodi:role="line"
367
+         x="-3.5527137e-15"
368
+         y="306.98413"
369
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
370
+         id="tspan868" /><tspan
371
+         sodipodi:role="line"
372
+         x="-3.5527137e-15"
373
+         y="319.8114"
274 374
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
275
-         id="tspan4654">¥</tspan></text>
375
+         id="tspan860" /></text>
276 376
     <text
277 377
        xml:space="preserve"
278 378
        style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/font_size_t.cpp 查看文件

@@ -21,7 +21,7 @@
21 21
 
22 22
 #include "../ftdi_extended.h"
23 23
 
24
-#if defined(FTDI_EXTENDED) && defined(TOUCH_UI_USE_UTF8)
24
+#if defined(FTDI_EXTENDED) && ENABLED(TOUCH_UI_USE_UTF8)
25 25
 
26 26
 namespace FTDI {
27 27
   // Returns the height of a standard FTDI romfont

+ 8
- 2
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/standard_char_set.cpp 查看文件

@@ -21,7 +21,7 @@
21 21
 
22 22
 #include "../ftdi_extended.h"
23 23
 
24
-#if defined(FTDI_EXTENDED) && defined(TOUCH_UI_USE_UTF8)
24
+#if defined(FTDI_EXTENDED) && ENABLED(TOUCH_UI_USE_UTF8)
25 25
 
26 26
   constexpr static uint8_t std_font = 31;
27 27
 
@@ -89,6 +89,12 @@
89 89
     uint8_t which = (c >= ' ' && c < 128) ? c : '?';
90 90
     uint8_t width = std_char_width(which);
91 91
 
92
+    if (c == '\t') {
93
+      // Special handling for the tab character
94
+      which = ' ';
95
+      width = std_char_width(' ');
96
+    }
97
+
92 98
     // Draw the character
93 99
     if (cmd) ext_vertex2ii(*cmd, x, y, std_font, which);
94 100
 
@@ -97,4 +103,4 @@
97 103
     return true;
98 104
   }
99 105
 
100
-#endif // FTDI_EXTENDED
106
+#endif // FTDI_EXTENDED && TOUCH_UI_USE_UTF8

+ 30
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/unicode.cpp 查看文件

@@ -21,11 +21,40 @@
21 21
 
22 22
 #include "../ftdi_extended.h"
23 23
 
24
-#if defined(FTDI_EXTENDED) && defined(TOUCH_UI_USE_UTF8)
24
+#if defined(FTDI_EXTENDED) && ENABLED(TOUCH_UI_USE_UTF8)
25 25
 
26 26
   using namespace FTDI;
27 27
 
28 28
   /**
29
+   * Return true if a string has UTF8 characters
30
+   *
31
+   * Parameters:
32
+   *
33
+   *   c  - Pointer to a string.
34
+   *
35
+   * Returns: True if the strings has UTF8 characters
36
+   */
37
+
38
+  bool FTDI::has_utf8_chars(const char *str) {
39
+    for (;;) {
40
+      const char c = *str++;
41
+      if (!c) break;
42
+      if ((c & 0xC0) == 0x80) return true;
43
+    }
44
+    return false;
45
+  }
46
+
47
+  bool FTDI::has_utf8_chars(progmem_str _str) {
48
+    const char *str = (const char *) _str;
49
+    for (;;) {
50
+      const char c = pgm_read_byte(str++);
51
+      if (!c) break;
52
+      if ((c & 0xC0) == 0x80) return true;
53
+    }
54
+    return false;
55
+  }
56
+
57
+  /**
29 58
    * Return a character in a UTF8 string and increment the
30 59
    * pointer to the next character
31 60
    *

+ 5
- 0
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/unicode.h 查看文件

@@ -38,6 +38,11 @@ namespace FTDI {
38 38
                             (0xF0808080 | ((c & 0b000111000000000000000000) << 6) | ((c & 0b111111000000000000) << 4) | ((c & 0b111111000000) << 2) | (c & 0b111111));
39 39
     }
40 40
 
41
+    /* Returns true if the string has UTF8 string characters */
42
+
43
+    bool has_utf8_chars(progmem_str str);
44
+    bool has_utf8_chars(const char *str);
45
+
41 46
     /* Returns the next character in a UTF8 string and increments the
42 47
      * pointer to the next character */
43 48
 

+ 114
- 3
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/western_char_set.cpp 查看文件

@@ -21,7 +21,8 @@
21 21
 
22 22
 #include "../ftdi_extended.h"
23 23
 
24
-#if defined(FTDI_EXTENDED) && defined(TOUCH_UI_USE_UTF8) && defined(TOUCH_UI_UTF8_WESTERN_CHARSET)
24
+#if defined(FTDI_EXTENDED) && BOTH(TOUCH_UI_USE_UTF8, TOUCH_UI_UTF8_WESTERN_CHARSET)
25
+
25 26
   #include "western_char_set_bitmap_31.h"
26 27
 
27 28
   #define NUM_ELEMENTS(a) (sizeof(a)/sizeof(a[0]))
@@ -44,7 +45,10 @@
44 45
     DOT_ABOVE,
45 46
     CEDILLA,
46 47
     NO_DOT_I,
48
+#if ENABLED(TOUCH_UI_UTF8_GERMANIC)
47 49
     SHARP_S,
50
+#endif
51
+#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
48 52
     LRG_O_STROKE,
49 53
     SML_O_STROKE,
50 54
     LRG_AE,
@@ -53,14 +57,49 @@
53 57
     SML_ETH,
54 58
     LRG_THORN,
55 59
     SML_THORN,
60
+#endif
61
+#if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
56 62
     LEFT_DBL_QUOTE,
57 63
     RIGHT_DBL_QUOTE,
58 64
     INV_EXCLAMATION,
59 65
     INV_QUESTION,
66
+#endif
67
+#if ENABLED(TOUCH_UI_UTF8_CURRENCY)
60 68
     CENT_SIGN,
61 69
     POUND_SIGN,
62 70
     CURRENCY_SIGN,
63
-    YEN_SIGN
71
+    YEN_SIGN,
72
+#endif
73
+#if ENABLED(TOUCH_UI_UTF8_SUPERSCRIPTS)
74
+    SUPERSCRIPT_ONE,
75
+    SUPERSCRIPT_TWO,
76
+    SUPERSCRIPT_THREE,
77
+#endif
78
+#if ENABLED(TOUCH_UI_UTF8_ORDINALS)
79
+    MASCULINE_ORDINAL,
80
+    FEMININE_ORDINAL,
81
+#endif
82
+#if ENABLED(TOUCH_UI_UTF8_COPYRIGHT)
83
+    COPYRIGHT_SIGN,
84
+    REGISTERED_SIGN,
85
+#endif
86
+#if ENABLED(TOUCH_UI_UTF8_MATHEMATICS)
87
+    PLUS_MINUS_SIGN,
88
+    MULTIPLICATION_SIGN,
89
+    DIVISION_SIGN,
90
+#endif
91
+#if ENABLED(TOUCH_UI_UTF8_FRACTIONS)
92
+    FRACTION_QUARTER,
93
+    FRACTION_HALF,
94
+    FRACTION_THREE_FOURTHS,
95
+#endif
96
+#if ENABLED(TOUCH_UI_UTF8_SYMBOLS)
97
+    MICRON_SIGN,
98
+    PILCROW_SIGN,
99
+    BROKEN_BAR,
100
+    SECTION_SIGN,
101
+    NOT_SIGN
102
+#endif
64 103
   };
65 104
 
66 105
   /* Centerline of characters that can take accents */
@@ -105,22 +144,72 @@
105 144
     uint8_t  alt_data; // For accented characters, the centerline; else char width
106 145
   } char_recipe[] = {
107 146
     {0,          0,  NO_DOT_I,           10   },
147
+#if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
108 148
     {UTF8('¡'),  0 , INV_EXCLAMATION,    13   },
149
+#endif
150
+#if ENABLED(TOUCH_UI_UTF8_CURRENCY)
109 151
     {UTF8('¢'),  0 , CENT_SIGN,          23   },
110 152
     {UTF8('£'),  0 , POUND_SIGN,         24   },
111 153
     {UTF8('¤'),  0 , CURRENCY_SIGN,      26   },
112 154
     {UTF8('¥'),  0 , YEN_SIGN,           26   },
155
+#endif
156
+#if ENABLED(TOUCH_UI_UTF8_SYMBOLS)
157
+    {UTF8('¦'),  0 , BROKEN_BAR,         11   },
158
+    {UTF8('§'),  0 , SECTION_SIGN,       21   },
159
+#endif
160
+#if ENABLED(TOUCH_UI_UTF8_COPYRIGHT)
161
+    {UTF8('©'),  0 , COPYRIGHT_SIGN,     38   },
162
+#endif
163
+#if ENABLED(TOUCH_UI_UTF8_ORDINALS)
164
+    {UTF8('ª'),  0 , FEMININE_ORDINAL,   19   },
165
+#endif
166
+#if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
113 167
     {UTF8('«'),  0 , LEFT_DBL_QUOTE,     23   },
168
+#endif
169
+#if ENABLED(TOUCH_UI_UTF8_SYMBOLS)
170
+    {UTF8('¬'),  0 , NOT_SIGN,           32   },
171
+#endif
172
+#if ENABLED(TOUCH_UI_UTF8_COPYRIGHT)
173
+    {UTF8('®'),  0 , REGISTERED_SIGN,    38   },
174
+#endif
114 175
     {UTF8('°'),  0 , DOT_ABOVE,          24   },
176
+#if ENABLED(TOUCH_UI_UTF8_MATHEMATICS)
177
+    {UTF8('±'),  0 , NOT_SIGN,           32   },
178
+#endif
179
+#if ENABLED(TOUCH_UI_UTF8_SUPERSCRIPTS)
180
+    {UTF8('²'),  0 , SUPERSCRIPT_TWO,    16   },
181
+    {UTF8('³'),  0 , SUPERSCRIPT_THREE,  16   },
182
+#endif
183
+#if ENABLED(TOUCH_UI_UTF8_SYMBOLS)
184
+    {UTF8('µ'),  0 , MICRON_SIGN,        28   },
185
+    {UTF8('¶'),  0 , PILCROW_SIGN,       24   },
186
+#endif
187
+#if ENABLED(TOUCH_UI_UTF8_SUPERSCRIPTS)
188
+    {UTF8('¹'),  0 , SUPERSCRIPT_ONE,    16   },
189
+#endif
190
+#if ENABLED(TOUCH_UI_UTF8_ORDINALS)
191
+    {UTF8('º'),  0 , MASCULINE_ORDINAL,  19   },
192
+#endif
193
+#if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
115 194
     {UTF8('»'),  0 , RIGHT_DBL_QUOTE,    24   },
195
+#endif
196
+#if ENABLED(TOUCH_UI_UTF8_FRACTIONS)
197
+    {UTF8('¼'),  0 , FRACTION_QUARTER,   40   },
198
+    {UTF8('½'),  0 , FRACTION_HALF,      40   },
199
+    {UTF8('¾'),  0 , FRACTION_THREE_FOURTHS, 40 },
200
+#endif
201
+#if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
116 202
     {UTF8('¿'),  0 , INV_QUESTION,       21   },
203
+#endif
117 204
     {UTF8('À'), 'A', GRAVE,              mid_A},
118 205
     {UTF8('Á'), 'A', ACUTE,              mid_A},
119 206
     {UTF8('Â'), 'A', CIRCUMFLEX,         mid_A},
120 207
     {UTF8('Ã'), 'A', TILDE,              mid_A},
121 208
     {UTF8('Ä'), 'A', DIAERESIS,          mid_A},
122 209
     {UTF8('Å'), 'A', DOT_ABOVE,          mid_A},
123
-    {UTF8('Æ'),  0 , LRG_AE,             mid_E},
210
+#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
211
+    {UTF8('Æ'),  0 , LRG_AE,             40},
212
+#endif
124 213
     {UTF8('Ç'), 'C', CEDILLA,            mid_C},
125 214
     {UTF8('È'), 'E', GRAVE,              mid_E},
126 215
     {UTF8('É'), 'E', ACUTE,              mid_E},
@@ -130,28 +219,41 @@
130 219
     {UTF8('Í'), 'I', ACUTE,              mid_I},
131 220
     {UTF8('Î'), 'I', CIRCUMFLEX,         mid_I},
132 221
     {UTF8('Ï'), 'I', DIAERESIS,          mid_I},
222
+#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
133 223
     {UTF8('Ð'),  0,  LRG_ETH,            31   },
224
+#endif
134 225
     {UTF8('Ñ'), 'N', TILDE,              mid_N},
135 226
     {UTF8('Ò'), 'O', GRAVE,              mid_O},
136 227
     {UTF8('Ó'), 'O', ACUTE,              mid_O},
137 228
     {UTF8('Ô'), 'O', CIRCUMFLEX,         mid_O},
138 229
     {UTF8('Õ'), 'O', TILDE,              mid_O},
139 230
     {UTF8('Ö'), 'O', DIAERESIS,          mid_O},
231
+#if ENABLED(TOUCH_UI_UTF8_MATHEMATICS)
232
+    {UTF8('×'),  0 , MULTIPLICATION_SIGN, 32 },
233
+#endif
234
+#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
140 235
     {UTF8('Ø'),  0 , LRG_O_STROKE,       32   },
236
+#endif
141 237
     {UTF8('Ù'), 'U', GRAVE,              mid_U},
142 238
     {UTF8('Ú'), 'U', ACUTE,              mid_U},
143 239
     {UTF8('Û'), 'U', CIRCUMFLEX,         mid_U},
144 240
     {UTF8('Ü'), 'U', DIAERESIS,          mid_U},
145 241
     {UTF8('Ý'), 'Y', ACUTE,              mid_Y},
242
+#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
146 243
     {UTF8('Þ'),  0 , LRG_THORN,          25   },
244
+#endif
245
+#if ENABLED(TOUCH_UI_UTF8_GERMANIC)
147 246
     {UTF8('ß'),  0 , SHARP_S,            26   },
247
+#endif
148 248
     {UTF8('à'), 'a', GRAVE,              mid_a},
149 249
     {UTF8('á'), 'a', ACUTE,              mid_a},
150 250
     {UTF8('â'), 'a', CIRCUMFLEX,         mid_a},
151 251
     {UTF8('ã'), 'a', TILDE,              mid_a},
152 252
     {UTF8('ä'), 'a', DIAERESIS,          mid_a},
153 253
     {UTF8('å'), 'a', DOT_ABOVE,          mid_a},
254
+#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
154 255
     {UTF8('æ'),  0 , SML_AE,             40   },
256
+#endif
155 257
     {UTF8('ç'), 'c', CEDILLA,            mid_c},
156 258
     {UTF8('è'), 'e', GRAVE,              mid_e},
157 259
     {UTF8('é'), 'e', ACUTE,              mid_e},
@@ -161,20 +263,29 @@
161 263
     {UTF8('í'), 'i', ACUTE,              mid_i},
162 264
     {UTF8('î'), 'i', CIRCUMFLEX,         mid_i},
163 265
     {UTF8('ï'), 'i', DIAERESIS,          mid_i},
266
+#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
164 267
     {UTF8('ð'),  0,  SML_ETH,            24   },
268
+#endif
165 269
     {UTF8('ñ'), 'n', TILDE,              mid_n},
166 270
     {UTF8('ò'), 'o', GRAVE,              mid_o},
167 271
     {UTF8('ó'), 'o', ACUTE,              mid_o},
168 272
     {UTF8('ô'), 'o', CIRCUMFLEX,         mid_o},
169 273
     {UTF8('õ'), 'o', TILDE,              mid_o},
170 274
     {UTF8('ö'), 'o', DIAERESIS,          mid_o},
275
+#if ENABLED(TOUCH_UI_UTF8_MATHEMATICS)
276
+    {UTF8('÷'),  0 , DIVISION_SIGN,      32 },
277
+#endif
278
+#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
171 279
     {UTF8('ø'),  0 , SML_O_STROKE,       25   },
280
+#endif
172 281
     {UTF8('ù'), 'u', GRAVE,              mid_u},
173 282
     {UTF8('ú'), 'u', ACUTE,              mid_u},
174 283
     {UTF8('û'), 'u', CIRCUMFLEX,         mid_u},
175 284
     {UTF8('ü'), 'u', DIAERESIS,          mid_u},
176 285
     {UTF8('ý'), 'y', ACUTE,              mid_y},
286
+#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
177 287
     {UTF8('þ'),  0 , SML_THORN,          25   },
288
+#endif
178 289
     {UTF8('ÿ'), 'y', DIAERESIS,          mid_y}
179 290
   };
180 291
 

+ 1271
- 620
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
文件差異過大導致無法顯示
查看文件


+ 32
- 13
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extras/bitmap2cpp.py 查看文件

@@ -1,6 +1,6 @@
1 1
 #!/usr/bin/python
2 2
 
3
-# Written By Marcio Teixeira 2018 - Aleph Objects, Inc.
3
+# Written By Marcio Teixeira 2019 - Aleph Objects, Inc.
4 4
 #
5 5
 # This program is free software: you can redistribute it and/or modify
6 6
 # it under the terms of the GNU General Public License as published by
@@ -38,13 +38,16 @@ def pack_rle(data):
38 38
   return rle
39 39
 
40 40
 class WriteSource:
41
-  def __init__(self):
42
-    self.values = []
41
+  def __init__(self, lines_in_blocks):
42
+    self.blocks      = []
43
+    self.values      = []
44
+    self.block_size  = lines_in_blocks
45
+    self.rows        = 0
43 46
 
44 47
   def add_pixel(self, value):
45 48
     self.values.append(value)
46 49
 
47
-  def convert_to_4bpp(self, data):
50
+  def convert_to_4bpp(self, data, chunk_size = 0):
48 51
     # Invert the image
49 52
     data = map(lambda i: 255 - i, data)
50 53
     # Quanitize 8-bit values into 4-bits
@@ -60,30 +63,46 @@ class WriteSource:
60 63
     # Convert values into hex strings
61 64
     return map(lambda a: "0x" + format(a, '02x'), data)
62 65
 
63
-  def end_row(self):
66
+  def end_row(self, y):
64 67
     # Pad each row into even number of values
65 68
     if len(self.values) & 1:
66 69
       self.values.append(0)
67 70
 
71
+    self.rows += 1
72
+    if self.block_size and (self.rows % self.block_size) == 0:
73
+      self.blocks.append(self.values)
74
+      self.values = []
75
+
68 76
   def write(self):
69
-    data = self.convert_to_4bpp(self.values)
70
-    data = ', '.join(data)
71
-    data = textwrap.fill(data, 75, initial_indent = '  ', subsequent_indent = '  ')
77
+    if len(self.values):
78
+      self.blocks.append(self.values)
79
+
80
+    block_strs = [];
81
+    for b in self.blocks:
82
+      data = self.convert_to_4bpp(b)
83
+      data = ', '.join(data)
84
+      data = textwrap.fill(data, 75, initial_indent = '  ', subsequent_indent = '  ')
85
+      block_strs.append(data)
72 86
 
73 87
     print("const unsigned char font[] PROGMEM = {")
74
-    print(data);
75
-    print("};")
88
+    for i, b in enumerate(block_strs):
89
+      if i:
90
+        print(',')
91
+      print('\n  /* {} */'.format(i))
92
+      print(b, end='')
93
+    print("\n};")
76 94
 
77 95
 if __name__ == "__main__":
78 96
   parser = argparse.ArgumentParser(description='Converts a grayscale bitmap into a 16-level RLE packed C array for use as font data')
79 97
   parser.add_argument("input")
98
+  parser.add_argument('--char_height', help='Adds a separator every so many lines', type=int)
80 99
   args = parser.parse_args()
81 100
 
82
-  img = Image.open(args.input).convert('L')
101
+  writer = WriteSource(args.char_height)
83 102
 
84
-  writer = WriteSource()
103
+  img = Image.open(args.input).convert('L')
85 104
   for y in range(img.height):
86 105
     for x in range(img.width):
87 106
       writer.add_pixel(img.getpixel((x,y)))
88
-    writer.end_row()
107
+    writer.end_row(y)
89 108
   writer.write()

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_printing_dialog_box.cpp 查看文件

@@ -130,7 +130,7 @@ void BioPrintingDialogBox::setStatusMessage(const char* message) {
130 130
   draw_interaction_buttons(BACKGROUND);
131 131
   storeBackground();
132 132
 
133
-  #ifdef UI_FRAMEWORK_DEBUG
133
+  #if ENABLED(TOUCH_UI_DEBUG)
134 134
     SERIAL_ECHO_START();
135 135
     SERIAL_ECHOLNPAIR("New status message: ", message);
136 136
   #endif

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/status_screen.cpp 查看文件

@@ -333,7 +333,7 @@ void StatusScreen::setStatusMessage(const char* message) {
333 333
 
334 334
   storeBackground();
335 335
 
336
-  #ifdef UI_FRAMEWORK_DEBUG
336
+  #if ENABLED(TOUCH_UI_DEBUG)
337 337
     SERIAL_ECHO_START();
338 338
     SERIAL_ECHOLNPAIR("New status message: ", message);
339 339
   #endif

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/touch_calibration_screen.cpp 查看文件

@@ -51,7 +51,7 @@ void TouchCalibrationScreen::onEntry() {
51 51
        .execute();
52 52
 
53 53
     while (CLCD::is_touching()) {
54
-      #ifdef UI_FRAMEWORK_DEBUG
54
+      #if ENABLED(TOUCH_UI_DEBUG)
55 55
         SERIAL_ECHO_START();
56 56
         SERIAL_ECHOLNPGM("Waiting for touch release");
57 57
       #endif

+ 22
- 2
config/default/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/3DFabXYZ/Migbot/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/ADIMLab/Gantry v1/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/ADIMLab/Gantry v2/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/AlephObjects/TAZ4/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Alfawise/U20-bltouch/Configuration_adv.h 查看文件

@@ -1209,13 +1209,30 @@
1209 1209
   //#define TOUCH_UI_PORTRAIT
1210 1210
   //#define TOUCH_UI_MIRRORED
1211 1211
 
1212
-  // Enable UTF8 rendering capabilities.
1212
+  // UTF8 processing and rendering.
1213
+  // Unsupported characters are shown as '?'.
1213 1214
   //#define TOUCH_UI_USE_UTF8
1214 1215
   #if ENABLED(TOUCH_UI_USE_UTF8)
1216
+    // Western accents support. These accented characters use
1217
+    // combined bitmaps and require relatively little storage.
1215 1218
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1219
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1220
+      // Additional character groups. These characters require
1221
+      // full bitmaps and take up considerable storage:
1222
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1223
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1224
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1225
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1226
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1227
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1228
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1229
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1230
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1231
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1232
+    #endif
1216 1233
   #endif
1217 1234
 
1218
-  // When labels do not fit buttons, use smaller font
1235
+  // Use a smaller font when labels don't fit buttons
1219 1236
   #define TOUCH_UI_FIT_TEXT
1220 1237
 
1221 1238
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1224,6 +1241,9 @@
1224 1241
   // Use a numeric passcode for "Screen lock" keypad.
1225 1242
   // (recommended for smaller displays)
1226 1243
   //#define TOUCH_UI_PASSCODE
1244
+
1245
+  // Output extra debug info for Touch UI events
1246
+  //#define TOUCH_UI_DEBUG
1227 1247
 #endif
1228 1248
 
1229 1249
 //

+ 22
- 2
config/examples/Alfawise/U20/Configuration_adv.h 查看文件

@@ -1208,13 +1208,30 @@
1208 1208
   //#define TOUCH_UI_PORTRAIT
1209 1209
   //#define TOUCH_UI_MIRRORED
1210 1210
 
1211
-  // Enable UTF8 rendering capabilities.
1211
+  // UTF8 processing and rendering.
1212
+  // Unsupported characters are shown as '?'.
1212 1213
   //#define TOUCH_UI_USE_UTF8
1213 1214
   #if ENABLED(TOUCH_UI_USE_UTF8)
1215
+    // Western accents support. These accented characters use
1216
+    // combined bitmaps and require relatively little storage.
1214 1217
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1218
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1219
+      // Additional character groups. These characters require
1220
+      // full bitmaps and take up considerable storage:
1221
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1222
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1223
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1224
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1225
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1226
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1227
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1228
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1229
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1230
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1231
+    #endif
1215 1232
   #endif
1216 1233
 
1217
-  // When labels do not fit buttons, use smaller font
1234
+  // Use a smaller font when labels don't fit buttons
1218 1235
   #define TOUCH_UI_FIT_TEXT
1219 1236
 
1220 1237
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1223,6 +1240,9 @@
1223 1240
   // Use a numeric passcode for "Screen lock" keypad.
1224 1241
   // (recommended for smaller displays)
1225 1242
   //#define TOUCH_UI_PASSCODE
1243
+
1244
+  // Output extra debug info for Touch UI events
1245
+  //#define TOUCH_UI_DEBUG
1226 1246
 #endif
1227 1247
 
1228 1248
 //

+ 22
- 2
config/examples/AliExpress/UM2pExt/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Anet/A2/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Anet/A2plus/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Anet/A6/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Anet/A8/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Anet/A8plus/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Anet/E16/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/AnyCubic/i3/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/ArmEd/Configuration_adv.h 查看文件

@@ -1209,13 +1209,30 @@
1209 1209
   //#define TOUCH_UI_PORTRAIT
1210 1210
   //#define TOUCH_UI_MIRRORED
1211 1211
 
1212
-  // Enable UTF8 rendering capabilities.
1212
+  // UTF8 processing and rendering.
1213
+  // Unsupported characters are shown as '?'.
1213 1214
   //#define TOUCH_UI_USE_UTF8
1214 1215
   #if ENABLED(TOUCH_UI_USE_UTF8)
1216
+    // Western accents support. These accented characters use
1217
+    // combined bitmaps and require relatively little storage.
1215 1218
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1219
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1220
+      // Additional character groups. These characters require
1221
+      // full bitmaps and take up considerable storage:
1222
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1223
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1224
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1225
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1226
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1227
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1228
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1229
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1230
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1231
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1232
+    #endif
1216 1233
   #endif
1217 1234
 
1218
-  // When labels do not fit buttons, use smaller font
1235
+  // Use a smaller font when labels don't fit buttons
1219 1236
   #define TOUCH_UI_FIT_TEXT
1220 1237
 
1221 1238
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1224,6 +1241,9 @@
1224 1241
   // Use a numeric passcode for "Screen lock" keypad.
1225 1242
   // (recommended for smaller displays)
1226 1243
   //#define TOUCH_UI_PASSCODE
1244
+
1245
+  // Output extra debug info for Touch UI events
1246
+  //#define TOUCH_UI_DEBUG
1227 1247
 #endif
1228 1248
 
1229 1249
 //

+ 22
- 2
config/examples/BIBO/TouchX/cyclops/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/BIBO/TouchX/default/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/BQ/Hephestos/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/BQ/Hephestos_2/Configuration_adv.h 查看文件

@@ -1213,13 +1213,30 @@
1213 1213
   //#define TOUCH_UI_PORTRAIT
1214 1214
   //#define TOUCH_UI_MIRRORED
1215 1215
 
1216
-  // Enable UTF8 rendering capabilities.
1216
+  // UTF8 processing and rendering.
1217
+  // Unsupported characters are shown as '?'.
1217 1218
   //#define TOUCH_UI_USE_UTF8
1218 1219
   #if ENABLED(TOUCH_UI_USE_UTF8)
1220
+    // Western accents support. These accented characters use
1221
+    // combined bitmaps and require relatively little storage.
1219 1222
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1223
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1224
+      // Additional character groups. These characters require
1225
+      // full bitmaps and take up considerable storage:
1226
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1227
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1228
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1229
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1230
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1231
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1232
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1233
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1234
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1235
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1236
+    #endif
1220 1237
   #endif
1221 1238
 
1222
-  // When labels do not fit buttons, use smaller font
1239
+  // Use a smaller font when labels don't fit buttons
1223 1240
   #define TOUCH_UI_FIT_TEXT
1224 1241
 
1225 1242
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1228,6 +1245,9 @@
1228 1245
   // Use a numeric passcode for "Screen lock" keypad.
1229 1246
   // (recommended for smaller displays)
1230 1247
   //#define TOUCH_UI_PASSCODE
1248
+
1249
+  // Output extra debug info for Touch UI events
1250
+  //#define TOUCH_UI_DEBUG
1231 1251
 #endif
1232 1252
 
1233 1253
 //

+ 22
- 2
config/examples/BQ/WITBOX/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Cartesio/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Creality/CR-10/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Creality/CR-10S/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Creality/CR-10_5S/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Creality/CR-10mini/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Creality/CR-20 Pro/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Creality/CR-20/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Creality/CR-8/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Creality/Ender-2/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Creality/Ender-3/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Creality/Ender-4/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Creality/Ender-5/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Dagoma/Disco Ultimate/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Einstart-S/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/FYSETC/AIO_II/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/FYSETC/Cheetah/base/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/FYSETC/F6_13/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Felix/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/FlashForge/CreatorPro/Configuration_adv.h 查看文件

@@ -1204,13 +1204,30 @@
1204 1204
   //#define TOUCH_UI_PORTRAIT
1205 1205
   //#define TOUCH_UI_MIRRORED
1206 1206
 
1207
-  // Enable UTF8 rendering capabilities.
1207
+  // UTF8 processing and rendering.
1208
+  // Unsupported characters are shown as '?'.
1208 1209
   //#define TOUCH_UI_USE_UTF8
1209 1210
   #if ENABLED(TOUCH_UI_USE_UTF8)
1211
+    // Western accents support. These accented characters use
1212
+    // combined bitmaps and require relatively little storage.
1210 1213
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1214
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1215
+      // Additional character groups. These characters require
1216
+      // full bitmaps and take up considerable storage:
1217
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1218
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1219
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1220
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1221
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1222
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1223
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1224
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1225
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1226
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1227
+    #endif
1211 1228
   #endif
1212 1229
 
1213
-  // When labels do not fit buttons, use smaller font
1230
+  // Use a smaller font when labels don't fit buttons
1214 1231
   #define TOUCH_UI_FIT_TEXT
1215 1232
 
1216 1233
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1219,6 +1236,9 @@
1219 1236
   // Use a numeric passcode for "Screen lock" keypad.
1220 1237
   // (recommended for smaller displays)
1221 1238
   //#define TOUCH_UI_PASSCODE
1239
+
1240
+  // Output extra debug info for Touch UI events
1241
+  //#define TOUCH_UI_DEBUG
1222 1242
 #endif
1223 1243
 
1224 1244
 //

+ 22
- 2
config/examples/FolgerTech/i3-2020/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Formbot/Raptor/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Formbot/T_Rex_2+/Configuration_adv.h 查看文件

@@ -1209,13 +1209,30 @@
1209 1209
   //#define TOUCH_UI_PORTRAIT
1210 1210
   //#define TOUCH_UI_MIRRORED
1211 1211
 
1212
-  // Enable UTF8 rendering capabilities.
1212
+  // UTF8 processing and rendering.
1213
+  // Unsupported characters are shown as '?'.
1213 1214
   //#define TOUCH_UI_USE_UTF8
1214 1215
   #if ENABLED(TOUCH_UI_USE_UTF8)
1216
+    // Western accents support. These accented characters use
1217
+    // combined bitmaps and require relatively little storage.
1215 1218
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1219
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1220
+      // Additional character groups. These characters require
1221
+      // full bitmaps and take up considerable storage:
1222
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1223
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1224
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1225
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1226
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1227
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1228
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1229
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1230
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1231
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1232
+    #endif
1216 1233
   #endif
1217 1234
 
1218
-  // When labels do not fit buttons, use smaller font
1235
+  // Use a smaller font when labels don't fit buttons
1219 1236
   #define TOUCH_UI_FIT_TEXT
1220 1237
 
1221 1238
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1224,6 +1241,9 @@
1224 1241
   // Use a numeric passcode for "Screen lock" keypad.
1225 1242
   // (recommended for smaller displays)
1226 1243
   //#define TOUCH_UI_PASSCODE
1244
+
1245
+  // Output extra debug info for Touch UI events
1246
+  //#define TOUCH_UI_DEBUG
1227 1247
 #endif
1228 1248
 
1229 1249
 //

+ 22
- 2
config/examples/Formbot/T_Rex_3/Configuration_adv.h 查看文件

@@ -1209,13 +1209,30 @@
1209 1209
   //#define TOUCH_UI_PORTRAIT
1210 1210
   //#define TOUCH_UI_MIRRORED
1211 1211
 
1212
-  // Enable UTF8 rendering capabilities.
1212
+  // UTF8 processing and rendering.
1213
+  // Unsupported characters are shown as '?'.
1213 1214
   //#define TOUCH_UI_USE_UTF8
1214 1215
   #if ENABLED(TOUCH_UI_USE_UTF8)
1216
+    // Western accents support. These accented characters use
1217
+    // combined bitmaps and require relatively little storage.
1215 1218
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1219
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1220
+      // Additional character groups. These characters require
1221
+      // full bitmaps and take up considerable storage:
1222
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1223
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1224
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1225
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1226
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1227
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1228
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1229
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1230
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1231
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1232
+    #endif
1216 1233
   #endif
1217 1234
 
1218
-  // When labels do not fit buttons, use smaller font
1235
+  // Use a smaller font when labels don't fit buttons
1219 1236
   #define TOUCH_UI_FIT_TEXT
1220 1237
 
1221 1238
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1224,6 +1241,9 @@
1224 1241
   // Use a numeric passcode for "Screen lock" keypad.
1225 1242
   // (recommended for smaller displays)
1226 1243
   //#define TOUCH_UI_PASSCODE
1244
+
1245
+  // Output extra debug info for Touch UI events
1246
+  //#define TOUCH_UI_DEBUG
1227 1247
 #endif
1228 1248
 
1229 1249
 //

+ 22
- 2
config/examples/Geeetech/A10/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Geeetech/A10M/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Geeetech/A20M/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Geeetech/MeCreator2/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 79
- 0
config/examples/HMS434/Configuration_adv.h 查看文件

@@ -1147,6 +1147,85 @@
1147 1147
 #endif // HAS_GRAPHICAL_LCD
1148 1148
 
1149 1149
 //
1150
+// Lulzbot Touch UI
1151
+//
1152
+#if ENABLED(LULZBOT_TOUCH_UI)
1153
+  // Display board used
1154
+  //#define LCD_FTDI_VM800B35A        // FTDI 3.5" with FT800 (320x240)
1155
+  //#define LCD_4DSYSTEMS_4DLCD_FT843 // 4D Systems 4.3" (480x272)
1156
+  //#define LCD_HAOYU_FT800CB         // Haoyu with 4.3" or 5" (480x272)
1157
+  //#define LCD_HAOYU_FT810CB         // Haoyu with 5" (800x480)
1158
+  //#define LCD_ALEPHOBJECTS_CLCD_UI  // Aleph Objects Color LCD UI
1159
+
1160
+  // Correct the resolution if not using the stock TFT panel.
1161
+  //#define TOUCH_UI_320x240
1162
+  //#define TOUCH_UI_480x272
1163
+  //#define TOUCH_UI_800x480
1164
+
1165
+  // Mappings for boards with a standard RepRapDiscount Display connector
1166
+  //#define AO_EXP1_PINMAP    // AlephObjects CLCD UI EXP1 mapping
1167
+  //#define AO_EXP2_PINMAP    // AlephObjects CLCD UI EXP2 mapping
1168
+  //#define CR10_TFT_PINMAP   // Rudolph Riedel's CR10 pin mapping
1169
+  //#define OTHER_PIN_LAYOUT  // Define pins manually below
1170
+  #if ENABLED(OTHER_PIN_LAYOUT)
1171
+    // The pins for CS and MOD_RESET (PD) must be chosen.
1172
+    #define CLCD_MOD_RESET  9
1173
+    #define CLCD_SPI_CS    10
1174
+
1175
+    // If using software SPI, specify pins for SCLK, MOSI, MISO
1176
+    //#define CLCD_USE_SOFT_SPI
1177
+    #if ENABLED(CLCD_USE_SOFT_SPI)
1178
+      #define CLCD_SOFT_SPI_MOSI 11
1179
+      #define CLCD_SOFT_SPI_MISO 12
1180
+      #define CLCD_SOFT_SPI_SCLK 13
1181
+    #endif
1182
+  #endif
1183
+
1184
+  // Display Orientation. An inverted (i.e. upside-down) display
1185
+  // is supported on the FT800. The FT810 and beyond also support
1186
+  // portrait and mirrored orientations.
1187
+  //#define TOUCH_UI_INVERTED
1188
+  //#define TOUCH_UI_PORTRAIT
1189
+  //#define TOUCH_UI_MIRRORED
1190
+
1191
+  // UTF8 processing and rendering.
1192
+  // Unsupported characters are shown as '?'.
1193
+  //#define TOUCH_UI_USE_UTF8
1194
+  #if ENABLED(TOUCH_UI_USE_UTF8)
1195
+    // Western accents support. These accented characters use
1196
+    // combined bitmaps and require relatively little storage.
1197
+    #define TOUCH_UI_UTF8_WESTERN_CHARSET
1198
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1199
+      // Additional character groups. These characters require
1200
+      // full bitmaps and take up considerable storage:
1201
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1202
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1203
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1204
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1205
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1206
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1207
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1208
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1209
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1210
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1211
+    #endif
1212
+  #endif
1213
+
1214
+  // Use a smaller font when labels don't fit buttons
1215
+  #define TOUCH_UI_FIT_TEXT
1216
+
1217
+  // Runtime language selection (otherwise LCD_LANGUAGE)
1218
+  //#define TOUCH_UI_LANGUAGE_MENU
1219
+
1220
+  // Use a numeric passcode for "Screen lock" keypad.
1221
+  // (recommended for smaller displays)
1222
+  //#define TOUCH_UI_PASSCODE
1223
+
1224
+  // Output extra debug info for Touch UI events
1225
+  //#define TOUCH_UI_DEBUG
1226
+#endif
1227
+
1228
+//
1150 1229
 // FSMC Graphical TFT
1151 1230
 //
1152 1231
 #if ENABLED(FSMC_GRAPHICAL_TFT)

+ 22
- 2
config/examples/Infitary/i3-M508/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/JGAurora/A1/Configuration_adv.h 查看文件

@@ -1210,13 +1210,30 @@
1210 1210
   //#define TOUCH_UI_PORTRAIT
1211 1211
   //#define TOUCH_UI_MIRRORED
1212 1212
 
1213
-  // Enable UTF8 rendering capabilities.
1213
+  // UTF8 processing and rendering.
1214
+  // Unsupported characters are shown as '?'.
1214 1215
   //#define TOUCH_UI_USE_UTF8
1215 1216
   #if ENABLED(TOUCH_UI_USE_UTF8)
1217
+    // Western accents support. These accented characters use
1218
+    // combined bitmaps and require relatively little storage.
1216 1219
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1220
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1221
+      // Additional character groups. These characters require
1222
+      // full bitmaps and take up considerable storage:
1223
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1224
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1225
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1226
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1227
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1228
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1229
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1230
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1231
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1232
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1233
+    #endif
1217 1234
   #endif
1218 1235
 
1219
-  // When labels do not fit buttons, use smaller font
1236
+  // Use a smaller font when labels don't fit buttons
1220 1237
   #define TOUCH_UI_FIT_TEXT
1221 1238
 
1222 1239
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1225,6 +1242,9 @@
1225 1242
   // Use a numeric passcode for "Screen lock" keypad.
1226 1243
   // (recommended for smaller displays)
1227 1244
   //#define TOUCH_UI_PASSCODE
1245
+
1246
+  // Output extra debug info for Touch UI events
1247
+  //#define TOUCH_UI_DEBUG
1228 1248
 #endif
1229 1249
 
1230 1250
 //

+ 22
- 2
config/examples/JGAurora/A5/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/JGAurora/A5S/Configuration_adv.h 查看文件

@@ -1210,13 +1210,30 @@
1210 1210
   //#define TOUCH_UI_PORTRAIT
1211 1211
   //#define TOUCH_UI_MIRRORED
1212 1212
 
1213
-  // Enable UTF8 rendering capabilities.
1213
+  // UTF8 processing and rendering.
1214
+  // Unsupported characters are shown as '?'.
1214 1215
   //#define TOUCH_UI_USE_UTF8
1215 1216
   #if ENABLED(TOUCH_UI_USE_UTF8)
1217
+    // Western accents support. These accented characters use
1218
+    // combined bitmaps and require relatively little storage.
1216 1219
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1220
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1221
+      // Additional character groups. These characters require
1222
+      // full bitmaps and take up considerable storage:
1223
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1224
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1225
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1226
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1227
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1228
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1229
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1230
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1231
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1232
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1233
+    #endif
1217 1234
   #endif
1218 1235
 
1219
-  // When labels do not fit buttons, use smaller font
1236
+  // Use a smaller font when labels don't fit buttons
1220 1237
   #define TOUCH_UI_FIT_TEXT
1221 1238
 
1222 1239
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1225,6 +1242,9 @@
1225 1242
   // Use a numeric passcode for "Screen lock" keypad.
1226 1243
   // (recommended for smaller displays)
1227 1244
   //#define TOUCH_UI_PASSCODE
1245
+
1246
+  // Output extra debug info for Touch UI events
1247
+  //#define TOUCH_UI_DEBUG
1228 1248
 #endif
1229 1249
 
1230 1250
 //

+ 22
- 2
config/examples/MakerParts/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Malyan/M150/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Malyan/M200/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Micromake/C1/enhanced/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Mks/Robin/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Mks/Sbase/Configuration_adv.h 查看文件

@@ -1206,13 +1206,30 @@
1206 1206
   //#define TOUCH_UI_PORTRAIT
1207 1207
   //#define TOUCH_UI_MIRRORED
1208 1208
 
1209
-  // Enable UTF8 rendering capabilities.
1209
+  // UTF8 processing and rendering.
1210
+  // Unsupported characters are shown as '?'.
1210 1211
   //#define TOUCH_UI_USE_UTF8
1211 1212
   #if ENABLED(TOUCH_UI_USE_UTF8)
1213
+    // Western accents support. These accented characters use
1214
+    // combined bitmaps and require relatively little storage.
1212 1215
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1216
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1217
+      // Additional character groups. These characters require
1218
+      // full bitmaps and take up considerable storage:
1219
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1220
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1221
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1222
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1223
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1224
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1225
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1226
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1227
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1228
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1229
+    #endif
1213 1230
   #endif
1214 1231
 
1215
-  // When labels do not fit buttons, use smaller font
1232
+  // Use a smaller font when labels don't fit buttons
1216 1233
   #define TOUCH_UI_FIT_TEXT
1217 1234
 
1218 1235
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1221,6 +1238,9 @@
1221 1238
   // Use a numeric passcode for "Screen lock" keypad.
1222 1239
   // (recommended for smaller displays)
1223 1240
   //#define TOUCH_UI_PASSCODE
1241
+
1242
+  // Output extra debug info for Touch UI events
1243
+  //#define TOUCH_UI_DEBUG
1224 1244
 #endif
1225 1245
 
1226 1246
 //

+ 22
- 2
config/examples/RapideLite/RL200/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/RigidBot/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/SCARA/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Sanguinololu/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Tevo/Michelangelo/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Tevo/Tarantula Pro/Configuration_adv.h 查看文件

@@ -1201,13 +1201,30 @@
1201 1201
   //#define TOUCH_UI_PORTRAIT
1202 1202
   //#define TOUCH_UI_MIRRORED
1203 1203
 
1204
-  // Enable UTF8 rendering capabilities.
1204
+  // UTF8 processing and rendering.
1205
+  // Unsupported characters are shown as '?'.
1205 1206
   //#define TOUCH_UI_USE_UTF8
1206 1207
   #if ENABLED(TOUCH_UI_USE_UTF8)
1208
+    // Western accents support. These accented characters use
1209
+    // combined bitmaps and require relatively little storage.
1207 1210
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1211
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1212
+      // Additional character groups. These characters require
1213
+      // full bitmaps and take up considerable storage:
1214
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1215
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1216
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1217
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1218
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1219
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1220
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1221
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1222
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1223
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1224
+    #endif
1208 1225
   #endif
1209 1226
 
1210
-  // When labels do not fit buttons, use smaller font
1227
+  // Use a smaller font when labels don't fit buttons
1211 1228
   #define TOUCH_UI_FIT_TEXT
1212 1229
 
1213 1230
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1216,6 +1233,9 @@
1216 1233
   // Use a numeric passcode for "Screen lock" keypad.
1217 1234
   // (recommended for smaller displays)
1218 1235
   //#define TOUCH_UI_PASSCODE
1236
+
1237
+  // Output extra debug info for Touch UI events
1238
+  //#define TOUCH_UI_DEBUG
1219 1239
 #endif
1220 1240
 
1221 1241
 //

+ 22
- 2
config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/TheBorg/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 22
- 2
config/examples/TinyBoy2/Configuration_adv.h 查看文件

@@ -1205,13 +1205,30 @@
1205 1205
   //#define TOUCH_UI_PORTRAIT
1206 1206
   //#define TOUCH_UI_MIRRORED
1207 1207
 
1208
-  // Enable UTF8 rendering capabilities.
1208
+  // UTF8 processing and rendering.
1209
+  // Unsupported characters are shown as '?'.
1209 1210
   //#define TOUCH_UI_USE_UTF8
1210 1211
   #if ENABLED(TOUCH_UI_USE_UTF8)
1212
+    // Western accents support. These accented characters use
1213
+    // combined bitmaps and require relatively little storage.
1211 1214
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1215
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1216
+      // Additional character groups. These characters require
1217
+      // full bitmaps and take up considerable storage:
1218
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1219
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1220
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1221
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1222
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1223
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1224
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1225
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1226
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1227
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1228
+    #endif
1212 1229
   #endif
1213 1230
 
1214
-  // When labels do not fit buttons, use smaller font
1231
+  // Use a smaller font when labels don't fit buttons
1215 1232
   #define TOUCH_UI_FIT_TEXT
1216 1233
 
1217 1234
   // Runtime language selection (otherwise LCD_LANGUAGE)
@@ -1220,6 +1237,9 @@
1220 1237
   // Use a numeric passcode for "Screen lock" keypad.
1221 1238
   // (recommended for smaller displays)
1222 1239
   //#define TOUCH_UI_PASSCODE
1240
+
1241
+  // Output extra debug info for Touch UI events
1242
+  //#define TOUCH_UI_DEBUG
1223 1243
 #endif
1224 1244
 
1225 1245
 //

+ 0
- 0
config/examples/Tronxy/X3A/Configuration_adv.h 查看文件


部分文件因文件數量過多而無法顯示

Loading…
取消
儲存