浏览代码

Apply ENABLED in ExiUI / FTDI

Scott Lahteine 4 年前
父节点
当前提交
59de35e749
共有 41 个文件被更改,包括 91 次插入165 次删除
  1. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
  2. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
  3. 5
    5
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
  4. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
  5. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
  6. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
  7. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
  8. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
  9. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
  10. 3
    3
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
  11. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
  12. 2
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
  13. 2
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
  14. 3
    11
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
  15. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
  16. 5
    5
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
  17. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
  18. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
  19. 9
    9
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
  20. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp
  21. 5
    5
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
  22. 4
    4
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
  23. 8
    8
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
  24. 2
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
  25. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/custom_user_menus.cpp
  26. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
  27. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
  28. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp
  29. 2
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
  30. 3
    3
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
  31. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
  32. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.cpp
  33. 2
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
  34. 4
    26
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
  35. 0
    22
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
  36. 1
    23
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
  37. 5
    5
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
  38. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
  39. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
  40. 2
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
  41. 3
    3
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h 查看文件

45
     static_assert(thfp + thb + Hsize == th, "Mismatch in display th"); \
45
     static_assert(thfp + thb + Hsize == th, "Mismatch in display th"); \
46
     static_assert(tvfp + tvb + Vsize == tv, "Mismatch in display tv");
46
     static_assert(tvfp + tvb + Vsize == tv, "Mismatch in display tv");
47
 
47
 
48
-#ifdef TOUCH_UI_320x240
48
+#if ENABLED(TOUCH_UI_320x240)
49
   namespace FTDI {
49
   namespace FTDI {
50
     constexpr uint8_t Pclk                 =    8;
50
     constexpr uint8_t Pclk                 =    8;
51
     constexpr uint8_t Pclkpol              =    0;
51
     constexpr uint8_t Pclkpol              =    0;

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp 查看文件

21
 
21
 
22
 #include "ftdi_extended.h"
22
 #include "ftdi_extended.h"
23
 
23
 
24
-#ifdef FTDI_EXTENDED
24
+#if ENABLED(FTDI_EXTENDED)
25
 
25
 
26
 CommandProcessor::btn_style_func_t  *CommandProcessor::_btn_style_callback = CommandProcessor::default_button_style_func;
26
 CommandProcessor::btn_style_func_t  *CommandProcessor::_btn_style_callback = CommandProcessor::default_button_style_func;
27
 bool CommandProcessor::is_tracking = false;
27
 bool CommandProcessor::is_tracking = false;

+ 5
- 5
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h 查看文件

312
     int8_t apply_fit_text(int16_t w, int16_t h, T text) {
312
     int8_t apply_fit_text(int16_t w, int16_t h, T text) {
313
       using namespace FTDI;
313
       using namespace FTDI;
314
       int8_t font = _font;
314
       int8_t font = _font;
315
-      #ifdef TOUCH_UI_USE_UTF8
315
+      #if ENABLED(TOUCH_UI_USE_UTF8)
316
         const bool is_utf8 = has_utf8_chars(text);
316
         const bool is_utf8 = has_utf8_chars(text);
317
       #endif
317
       #endif
318
       for (;font > 26;) {
318
       for (;font > 26;) {
319
         int16_t width, height;
319
         int16_t width, height;
320
-        #ifdef TOUCH_UI_USE_UTF8
320
+        #if ENABLED(TOUCH_UI_USE_UTF8)
321
           if (is_utf8) {
321
           if (is_utf8) {
322
             width  = get_utf8_text_width(text, font_size_t::from_romfont(font));
322
             width  = get_utf8_text_width(text, font_size_t::from_romfont(font));
323
             height = font_size_t::from_romfont(font).get_height();
323
             height = font_size_t::from_romfont(font).get_height();
345
     template<typename T>
345
     template<typename T>
346
     uint16_t text_width(T text) {
346
     uint16_t text_width(T text) {
347
       using namespace FTDI;
347
       using namespace FTDI;
348
-      #ifdef TOUCH_UI_USE_UTF8
348
+      #if ENABLED(TOUCH_UI_USE_UTF8)
349
         if (has_utf8_chars(text))
349
         if (has_utf8_chars(text))
350
           return get_utf8_text_width(text, font_size_t::from_romfont(_font));
350
           return get_utf8_text_width(text, font_size_t::from_romfont(_font));
351
       #endif
351
       #endif
362
       #else
362
       #else
363
         const int8_t font = _font;
363
         const int8_t font = _font;
364
       #endif
364
       #endif
365
-      #ifdef TOUCH_UI_USE_UTF8
365
+      #if ENABLED(TOUCH_UI_USE_UTF8)
366
         if (has_utf8_chars(text))
366
         if (has_utf8_chars(text))
367
           draw_utf8_text(*this, x, y, text, font_size_t::from_romfont(font), options);
367
           draw_utf8_text(*this, x, y, text, font_size_t::from_romfont(font), options);
368
         else
368
         else
401
         const int8_t font = _font;
401
         const int8_t font = _font;
402
       #endif
402
       #endif
403
       CLCD::CommandFifo::button(x, y, w, h, font, options);
403
       CLCD::CommandFifo::button(x, y, w, h, font, options);
404
-      #ifdef TOUCH_UI_USE_UTF8
404
+      #if ENABLED(TOUCH_UI_USE_UTF8)
405
         if (has_utf8_chars(text)) {
405
         if (has_utf8_chars(text)) {
406
           CLCD::CommandFifo::str(F(""));
406
           CLCD::CommandFifo::str(F(""));
407
           apply_text_alignment(x, y, w, h, OPT_CENTER);
407
           apply_text_alignment(x, y, w, h, OPT_CENTER);

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp 查看文件

22
 
22
 
23
 #include "ftdi_extended.h"
23
 #include "ftdi_extended.h"
24
 
24
 
25
-#ifdef FTDI_EXTENDED
25
+#if ENABLED(FTDI_EXTENDED)
26
 
26
 
27
 /* The Display List Cache mechanism stores the display list corresponding
27
 /* The Display List Cache mechanism stores the display list corresponding
28
  * to a menu into RAM_G so that on subsequent calls drawing the menu does
28
  * to a menu into RAM_G so that on subsequent calls drawing the menu does

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp 查看文件

22
 
22
 
23
 #include "ftdi_extended.h"
23
 #include "ftdi_extended.h"
24
 
24
 
25
-#ifdef FTDI_EXTENDED
25
+#if ENABLED(FTDI_EXTENDED)
26
 using namespace FTDI;
26
 using namespace FTDI;
27
 
27
 
28
 enum {
28
 enum {

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h 查看文件

29
   #define FTDI_EXTENDED
29
   #define FTDI_EXTENDED
30
 #endif
30
 #endif
31
 
31
 
32
-#ifdef FTDI_EXTENDED
32
+#if ENABLED(FTDI_EXTENDED)
33
   #include "unicode/font_size_t.h"
33
   #include "unicode/font_size_t.h"
34
   #include "unicode/unicode.h"
34
   #include "unicode/unicode.h"
35
   #include "unicode/standard_char_set.h"
35
   #include "unicode/standard_char_set.h"

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h 查看文件

88
   }
88
   }
89
 
89
 
90
 namespace FTDI {
90
 namespace FTDI {
91
-  #ifdef TOUCH_UI_PORTRAIT
91
+  #if ENABLED(TOUCH_UI_PORTRAIT)
92
     constexpr uint16_t display_width  = Vsize;
92
     constexpr uint16_t display_width  = Vsize;
93
     constexpr uint16_t display_height = Hsize;
93
     constexpr uint16_t display_height = Hsize;
94
   #else
94
   #else

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h 查看文件

66
         cmd.cmd(STENCIL_FUNC(STENCIL_FUNC_ALWAYS, 255, 255));
66
         cmd.cmd(STENCIL_FUNC(STENCIL_FUNC_ALWAYS, 255, 255));
67
         // Drawing the edge strip along scan lines
67
         // Drawing the edge strip along scan lines
68
         // seems to yield the best performance
68
         // seems to yield the best performance
69
-        #ifdef TOUCH_UI_PORTRAIT
69
+        #if ENABLED(TOUCH_UI_PORTRAIT)
70
           path_initiator = EDGE_STRIP_B;
70
           path_initiator = EDGE_STRIP_B;
71
         #else
71
         #else
72
           path_initiator = EDGE_STRIP_R;
72
           path_initiator = EDGE_STRIP_R;

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp 查看文件

21
 
21
 
22
 #include "ftdi_extended.h"
22
 #include "ftdi_extended.h"
23
 
23
 
24
-#ifdef FTDI_EXTENDED
24
+#if ENABLED(FTDI_EXTENDED)
25
 
25
 
26
 /********************** VIRTUAL DISPATCH DATA TYPE  ******************************/
26
 /********************** VIRTUAL DISPATCH DATA TYPE  ******************************/
27
 
27
 

+ 3
- 3
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h 查看文件

158
       using namespace FTDI;
158
       using namespace FTDI;
159
       CommandProcessor cmd;
159
       CommandProcessor cmd;
160
       cmd.cmd(CMD_DLSTART);
160
       cmd.cmd(CMD_DLSTART);
161
-      #ifdef TOUCH_UI_USE_UTF8
161
+      #if ENABLED(TOUCH_UI_USE_UTF8)
162
         load_utf8_bitmaps(cmd);
162
         load_utf8_bitmaps(cmd);
163
       #endif
163
       #endif
164
 
164
 
199
       CommandProcessor cmd;
199
       CommandProcessor cmd;
200
 
200
 
201
       cmd.cmd(CMD_DLSTART);
201
       cmd.cmd(CMD_DLSTART);
202
-      #ifdef TOUCH_UI_USE_UTF8
202
+      #if ENABLED(TOUCH_UI_USE_UTF8)
203
         load_utf8_bitmaps(cmd);
203
         load_utf8_bitmaps(cmd);
204
       #endif
204
       #endif
205
       current_screen.onRedraw(BACKGROUND);
205
       current_screen.onRedraw(BACKGROUND);
222
         dlcache.append();
222
         dlcache.append();
223
       }
223
       }
224
       else {
224
       else {
225
-        #ifdef TOUCH_UI_USE_UTF8
225
+        #if ENABLED(TOUCH_UI_USE_UTF8)
226
           load_utf8_bitmaps(cmd);
226
           load_utf8_bitmaps(cmd);
227
         #endif
227
         #endif
228
         current_screen.onRedraw(BACKGROUND);
228
         current_screen.onRedraw(BACKGROUND);

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

21
 
21
 
22
 #include "ftdi_extended.h"
22
 #include "ftdi_extended.h"
23
 
23
 
24
-#ifdef FTDI_EXTENDED
24
+#if ENABLED(FTDI_EXTENDED)
25
 
25
 
26
 namespace FTDI {
26
 namespace FTDI {
27
   SoundPlayer sound; // Global sound player object
27
   SoundPlayer sound; // Global sound player object

+ 2
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp 查看文件

21
 
21
 
22
 #include "ftdi_extended.h"
22
 #include "ftdi_extended.h"
23
 
23
 
24
-#ifdef FTDI_EXTENDED
24
+#if ENABLED(FTDI_EXTENDED)
25
 
25
 
26
 namespace FTDI {
26
 namespace FTDI {
27
   /**
27
   /**
103
         if (line[line_len - 1] == '\n' || line[line_len - 1] == ' ')
103
         if (line[line_len - 1] == '\n' || line[line_len - 1] == ' ')
104
           line[line_len - 1] = 0;
104
           line[line_len - 1] = 0;
105
 
105
 
106
-        #ifdef TOUCH_UI_USE_UTF8
106
+        #if ENABLED(TOUCH_UI_USE_UTF8)
107
           if (has_utf8_chars(line)) {
107
           if (has_utf8_chars(line)) {
108
             draw_utf8_text(cmd, x + dx, y + dy, line, fm.fs, options & ~OPT_CENTERY);
108
             draw_utf8_text(cmd, x + dx, y + dy, line, fm.fs, options & ~OPT_CENTERY);
109
           } else
109
           } else

+ 2
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp 查看文件

21
 
21
 
22
 #include "ftdi_extended.h"
22
 #include "ftdi_extended.h"
23
 
23
 
24
-#ifdef FTDI_EXTENDED
24
+#if ENABLED(FTDI_EXTENDED)
25
 
25
 
26
 namespace FTDI {
26
 namespace FTDI {
27
 
27
 
60
     }
60
     }
61
 
61
 
62
     cmd.apply_text_alignment(x, y, w, h, options);
62
     cmd.apply_text_alignment(x, y, w, h, options);
63
-    #ifdef TOUCH_UI_USE_UTF8
63
+    #if ENABLED(TOUCH_UI_USE_UTF8)
64
       if (has_utf8_chars(str)) {
64
       if (has_utf8_chars(str)) {
65
         draw_utf8_text(cmd, x, y, str, font_size_t::from_romfont(font), options);
65
         draw_utf8_text(cmd, x, y, str, font_size_t::from_romfont(font), options);
66
       } else
66
       } else

+ 3
- 11
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp 查看文件

21
 
21
 
22
 #include "ftdi_extended.h"
22
 #include "ftdi_extended.h"
23
 
23
 
24
-#ifdef FTDI_EXTENDED
24
+#if ENABLED(FTDI_EXTENDED)
25
 
25
 
26
 bool tiny_timer_t::elapsed(tiny_time_t duration) {
26
 bool tiny_timer_t::elapsed(tiny_time_t duration) {
27
   uint8_t now = tiny_time_t::tiny_time(
27
   uint8_t now = tiny_time_t::tiny_time(
28
-    #ifdef __MARLIN_FIRMWARE__
29
-      ExtUI::safe_millis()
30
-    #else
31
-      millis()
32
-    #endif
28
+    TERN(__MARLIN_FIRMWARE__, ExtUI::safe_millis(), millis())
33
   );
29
   );
34
   uint8_t elapsed = now - _start;
30
   uint8_t elapsed = now - _start;
35
   return elapsed >= duration._duration;
31
   return elapsed >= duration._duration;
37
 
33
 
38
 void tiny_timer_t::start() {
34
 void tiny_timer_t::start() {
39
   _start = tiny_time_t::tiny_time(
35
   _start = tiny_time_t::tiny_time(
40
-    #ifdef __MARLIN_FIRMWARE__
41
-      ExtUI::safe_millis()
42
-    #else
43
-      millis()
44
-    #endif
36
+    TERN(__MARLIN_FIRMWARE__, ExtUI::safe_millis(), millis())
45
   );
37
   );
46
 }
38
 }
47
 #endif // FTDI_EXTENDED
39
 #endif // FTDI_EXTENDED

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

21
 
21
 
22
 #include "../ftdi_extended.h"
22
 #include "../ftdi_extended.h"
23
 
23
 
24
-#ifdef FTDI_EXTENDED
24
+#if ENABLED(FTDI_EXTENDED)
25
 
25
 
26
 namespace FTDI {
26
 namespace FTDI {
27
 
27
 

+ 5
- 5
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h 查看文件

24
 class CommandProcessor;
24
 class CommandProcessor;
25
 
25
 
26
 namespace FTDI {
26
 namespace FTDI {
27
-  #ifdef TOUCH_UI_USE_UTF8
27
+  #if ENABLED(TOUCH_UI_USE_UTF8)
28
     typedef uint16_t utf8_char_t;
28
     typedef uint16_t utf8_char_t;
29
 
29
 
30
     /**
30
     /**
75
   // Similar to CLCD::FontMetrics, but can be used with UTF8 encoded strings.
75
   // Similar to CLCD::FontMetrics, but can be used with UTF8 encoded strings.
76
 
76
 
77
   struct FontMetrics {
77
   struct FontMetrics {
78
-    #ifdef TOUCH_UI_USE_UTF8
78
+    #if ENABLED(TOUCH_UI_USE_UTF8)
79
       font_size_t fs;
79
       font_size_t fs;
80
     #else
80
     #else
81
       CLCD::FontMetrics fm;
81
       CLCD::FontMetrics fm;
82
     #endif
82
     #endif
83
 
83
 
84
     inline void load(uint8_t rom_font_size) {
84
     inline void load(uint8_t rom_font_size) {
85
-      #ifdef TOUCH_UI_USE_UTF8
85
+      #if ENABLED(TOUCH_UI_USE_UTF8)
86
         fs = font_size_t::from_romfont(rom_font_size);
86
         fs = font_size_t::from_romfont(rom_font_size);
87
       #else
87
       #else
88
         fm.load(rom_font_size);
88
         fm.load(rom_font_size);
90
     }
90
     }
91
 
91
 
92
     inline uint16_t get_char_width(utf8_char_t c) const {
92
     inline uint16_t get_char_width(utf8_char_t c) const {
93
-      #ifdef TOUCH_UI_USE_UTF8
93
+      #if ENABLED(TOUCH_UI_USE_UTF8)
94
         return get_utf8_char_width(c, fs);
94
         return get_utf8_char_width(c, fs);
95
       #else
95
       #else
96
         return fm.char_widths[(uint8_t)c];
96
         return fm.char_widths[(uint8_t)c];
98
     }
98
     }
99
 
99
 
100
     inline uint8_t get_height() const {
100
     inline uint8_t get_height() const {
101
-      #ifdef TOUCH_UI_USE_UTF8
101
+      #if ENABLED(TOUCH_UI_USE_UTF8)
102
         return fs.get_height();
102
         return fs.get_height();
103
       #else
103
       #else
104
         return fm.height;
104
         return fm.height;

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h 查看文件

146
   PROGMEM Language_Str MSG_LEVELING                 = u8"Leveling";
146
   PROGMEM Language_Str MSG_LEVELING                 = u8"Leveling";
147
   PROGMEM Language_Str MSG_SHOW_MESH                = u8"Show Bed Mesh";
147
   PROGMEM Language_Str MSG_SHOW_MESH                = u8"Show Bed Mesh";
148
 
148
 
149
-  #ifdef TOUCH_UI_LULZBOT_BIO
149
+  #if ENABLED(TOUCH_UI_LULZBOT_BIO)
150
     PROGMEM Language_Str MSG_MOVE_TO_HOME           = u8"Move to Home";
150
     PROGMEM Language_Str MSG_MOVE_TO_HOME           = u8"Move to Home";
151
     PROGMEM Language_Str MSG_RAISE_PLUNGER          = u8"Raise Plunger";
151
     PROGMEM Language_Str MSG_RAISE_PLUNGER          = u8"Raise Plunger";
152
     PROGMEM Language_Str MSG_RELEASE_XY_AXIS        = u8"Release X and Y Axis";
152
     PROGMEM Language_Str MSG_RELEASE_XY_AXIS        = u8"Release X and Y Axis";

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp 查看文件

37
        .cmd(CLEAR(true,true,true));
37
        .cmd(CLEAR(true,true,true));
38
   }
38
   }
39
 
39
 
40
-    #ifdef TOUCH_UI_PORTRAIT
40
+    #if ENABLED(TOUCH_UI_PORTRAIT)
41
       #if EITHER(HAS_MULTI_HOTEND, SENSORLESS_HOMING)
41
       #if EITHER(HAS_MULTI_HOTEND, SENSORLESS_HOMING)
42
         #define GRID_ROWS 9
42
         #define GRID_ROWS 9
43
       #else
43
       #else

+ 9
- 9
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp 查看文件

30
 using namespace FTDI;
30
 using namespace FTDI;
31
 using namespace Theme;
31
 using namespace Theme;
32
 
32
 
33
-#ifdef TOUCH_UI_PORTRAIT
33
+#if ENABLED(TOUCH_UI_PORTRAIT)
34
   #define GRID_COLS 13
34
   #define GRID_COLS 13
35
   #define GRID_ROWS 10
35
   #define GRID_ROWS 10
36
   #define LAYOUT_FONT font_small
36
   #define LAYOUT_FONT font_small
53
 
53
 
54
   cmd.font(font_medium);
54
   cmd.font(font_medium);
55
   _button(cmd, 1,
55
   _button(cmd, 1,
56
-    #ifdef TOUCH_UI_PORTRAIT
56
+    #if ENABLED(TOUCH_UI_PORTRAIT)
57
       BTN_POS(1,10), BTN_SIZE(13,1),
57
       BTN_POS(1,10), BTN_SIZE(13,1),
58
     #else
58
     #else
59
       BTN_POS(15,7), BTN_SIZE(4,1),
59
       BTN_POS(15,7), BTN_SIZE(4,1),
129
     cmd.font(font_medium)
129
     cmd.font(font_medium)
130
        .tag(0)
130
        .tag(0)
131
        .text(
131
        .text(
132
-         #ifdef TOUCH_UI_PORTRAIT
132
+         #if ENABLED(TOUCH_UI_PORTRAIT)
133
            BTN_POS(1, _line), BTN_SIZE(12,1),
133
            BTN_POS(1, _line), BTN_SIZE(12,1),
134
          #else
134
          #else
135
            BTN_POS(5, _line), BTN_SIZE(8,1),
135
            BTN_POS(5, _line), BTN_SIZE(8,1),
141
   _line++;
141
   _line++;
142
 }
142
 }
143
 
143
 
144
-#ifdef TOUCH_UI_PORTRAIT
144
+#if ENABLED(TOUCH_UI_PORTRAIT)
145
   #ifdef TOUCH_UI_800x480
145
   #ifdef TOUCH_UI_800x480
146
     #undef EDGE_R
146
     #undef EDGE_R
147
     #define EDGE_R 20
147
     #define EDGE_R 20
172
   const bool highlight = (_what & FOREGROUND) && (increment == tag);
172
   const bool highlight = (_what & FOREGROUND) && (increment == tag);
173
 
173
 
174
   switch (pos) {
174
   switch (pos) {
175
-    #ifdef TOUCH_UI_PORTRAIT
175
+    #if ENABLED(TOUCH_UI_PORTRAIT)
176
       case 0: _button(cmd, tag, BTN_POS(5,_line), BTN_SIZE(2,1), progmem_str(label), true, highlight); break;
176
       case 0: _button(cmd, tag, BTN_POS(5,_line), BTN_SIZE(2,1), progmem_str(label), true, highlight); break;
177
       case 1: _button(cmd, tag, BTN_POS(7,_line), BTN_SIZE(2,1), progmem_str(label), true, highlight); break;
177
       case 1: _button(cmd, tag, BTN_POS(7,_line), BTN_SIZE(2,1), progmem_str(label), true, highlight); break;
178
       case 2: _button(cmd, tag, BTN_POS(9,_line), BTN_SIZE(2,1), progmem_str(label), true, highlight); break;
178
       case 2: _button(cmd, tag, BTN_POS(9,_line), BTN_SIZE(2,1), progmem_str(label), true, highlight); break;
192
   if (_what & BACKGROUND) {
192
   if (_what & BACKGROUND) {
193
     _button_style(cmd, TEXT_LABEL);
193
     _button_style(cmd, TEXT_LABEL);
194
     cmd.tag(0).text(
194
     cmd.tag(0).text(
195
-      #ifdef TOUCH_UI_PORTRAIT
195
+      #if ENABLED(TOUCH_UI_PORTRAIT)
196
         BTN_POS(1, _line), BTN_SIZE(4,1),
196
         BTN_POS(1, _line), BTN_SIZE(4,1),
197
       #else
197
       #else
198
         BTN_POS(15,    1), BTN_SIZE(4,1),
198
         BTN_POS(15,    1), BTN_SIZE(4,1),
205
   _draw_increment_btn(cmd, _line+1, 244 - _decimals);
205
   _draw_increment_btn(cmd, _line+1, 244 - _decimals);
206
   _draw_increment_btn(cmd, _line+1, 243 - _decimals);
206
   _draw_increment_btn(cmd, _line+1, 243 - _decimals);
207
 
207
 
208
-  #ifdef TOUCH_UI_PORTRAIT
208
+  #if ENABLED(TOUCH_UI_PORTRAIT)
209
     _line++;
209
     _line++;
210
   #endif
210
   #endif
211
 }
211
 }
308
     _button_style(cmd, TEXT_LABEL);
308
     _button_style(cmd, TEXT_LABEL);
309
     cmd.font(font_small)
309
     cmd.font(font_small)
310
        .text(
310
        .text(
311
-        #ifdef TOUCH_UI_PORTRAIT
311
+        #if ENABLED(TOUCH_UI_PORTRAIT)
312
           BTN_POS(1, _line), BTN_SIZE( 8,1),
312
           BTN_POS(1, _line), BTN_SIZE( 8,1),
313
         #else
313
         #else
314
           BTN_POS(1, _line), BTN_SIZE(10,1),
314
           BTN_POS(1, _line), BTN_SIZE(10,1),
323
        .enabled(is_enabled)
323
        .enabled(is_enabled)
324
        .font(font_small)
324
        .font(font_small)
325
        .toggle2(
325
        .toggle2(
326
-        #ifdef TOUCH_UI_PORTRAIT
326
+        #if ENABLED(TOUCH_UI_PORTRAIT)
327
           BTN_POS( 9,_line), BTN_SIZE(5,1),
327
           BTN_POS( 9,_line), BTN_SIZE(5,1),
328
         #else
328
         #else
329
           BTN_POS(10,_line), BTN_SIZE(4,1),
329
           BTN_POS(10,_line), BTN_SIZE(4,1),

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp 查看文件

30
 using namespace Theme;
30
 using namespace Theme;
31
 using namespace ExtUI;
31
 using namespace ExtUI;
32
 
32
 
33
-#ifdef TOUCH_UI_PORTRAIT
33
+#if ENABLED(TOUCH_UI_PORTRAIT)
34
   #define GRID_COLS 2
34
   #define GRID_COLS 2
35
   #define GRID_ROWS 10
35
   #define GRID_ROWS 10
36
 
36
 

+ 5
- 5
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp 查看文件

73
     // The LulzBot Bio shows the temperature for
73
     // The LulzBot Bio shows the temperature for
74
     // the bed.
74
     // the bed.
75
 
75
 
76
-    #ifdef TOUCH_UI_PORTRAIT
76
+    #if ENABLED(TOUCH_UI_PORTRAIT)
77
       // Draw touch surfaces
77
       // Draw touch surfaces
78
       ui.bounds(POLY(target_temp), x, y, h, v);
78
       ui.bounds(POLY(target_temp), x, y, h, v);
79
       cmd.rectangle(x, y, h, v);
79
       cmd.rectangle(x, y, h, v);
95
        .cmd(COLOR_RGB(bg_text_enabled))
95
        .cmd(COLOR_RGB(bg_text_enabled))
96
        .icon (x, y, h, v, Bed_Heat_Icon_Info, icon_scale * 2);
96
        .icon (x, y, h, v, Bed_Heat_Icon_Info, icon_scale * 2);
97
 
97
 
98
-    #ifdef TOUCH_UI_USE_UTF8
98
+    #if ENABLED(TOUCH_UI_USE_UTF8)
99
       load_utf8_bitmaps(cmd); // Restore font bitmap handles
99
       load_utf8_bitmaps(cmd); // Restore font bitmap handles
100
     #endif
100
     #endif
101
   }
101
   }
105
     cmd.cmd(COLOR_RGB(bg_text_enabled));
105
     cmd.cmd(COLOR_RGB(bg_text_enabled));
106
     cmd.font(font_medium);
106
     cmd.font(font_medium);
107
 
107
 
108
-    #ifdef TOUCH_UI_PORTRAIT
108
+    #if ENABLED(TOUCH_UI_PORTRAIT)
109
       if (!isHeaterIdle(BED) && getTargetTemp_celsius(BED) > 0)
109
       if (!isHeaterIdle(BED) && getTargetTemp_celsius(BED) > 0)
110
         format_temp(str, getTargetTemp_celsius(BED));
110
         format_temp(str, getTargetTemp_celsius(BED));
111
       else
111
       else
204
   PolyUI ui(cmd, what);
204
   PolyUI ui(cmd, what);
205
 
205
 
206
   cmd.font(
206
   cmd.font(
207
-    #ifdef TOUCH_UI_PORTRAIT
207
+    #if ENABLED(TOUCH_UI_PORTRAIT)
208
       font_medium
208
       font_medium
209
     #else
209
     #else
210
       font_small
210
       font_small
273
   CLCD::mem_write_pgm(base + Bed_Heat_Icon_Info.RAMG_offset, Bed_Heat_Icon, sizeof(Bed_Heat_Icon));
273
   CLCD::mem_write_pgm(base + Bed_Heat_Icon_Info.RAMG_offset, Bed_Heat_Icon, sizeof(Bed_Heat_Icon));
274
 
274
 
275
   // Load fonts for internationalization
275
   // Load fonts for internationalization
276
-  #ifdef TOUCH_UI_USE_UTF8
276
+  #if ENABLED(TOUCH_UI_USE_UTF8)
277
     load_utf8_data(base + UTF8_FONT_OFFSET);
277
     load_utf8_data(base + UTF8_FONT_OFFSET);
278
   #endif
278
   #endif
279
 }
279
 }

+ 4
- 4
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp 查看文件

30
 #include "../ftdi_eve_lib/extras/poly_ui.h"
30
 #include "../ftdi_eve_lib/extras/poly_ui.h"
31
 #include "../archim2-flash/flash_storage.h"
31
 #include "../archim2-flash/flash_storage.h"
32
 
32
 
33
-#ifdef SHOW_CUSTOM_BOOTSCREEN
34
-  #ifdef TOUCH_UI_PORTRAIT
33
+#if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
34
+  #if ENABLED(TOUCH_UI_PORTRAIT)
35
     #include "../theme/bootscreen_logo_portrait.h"
35
     #include "../theme/bootscreen_logo_portrait.h"
36
   #else
36
   #else
37
     #include "../theme/_bootscreen_landscape.h"
37
     #include "../theme/_bootscreen_landscape.h"
38
   #endif
38
   #endif
39
 #else
39
 #else
40
-  #ifdef TOUCH_UI_PORTRAIT
40
+  #if ENABLED(TOUCH_UI_PORTRAIT)
41
     #include "../theme/marlin_bootscreen_portrait.h"
41
     #include "../theme/marlin_bootscreen_portrait.h"
42
   #else
42
   #else
43
     #include "../theme/marlin_bootscreen_landscape.h"
43
     #include "../theme/marlin_bootscreen_landscape.h"
92
 
92
 
93
     StatusScreen::loadBitmaps();
93
     StatusScreen::loadBitmaps();
94
 
94
 
95
-    #ifdef TOUCH_UI_LULZBOT_BIO
95
+    #if ENABLED(TOUCH_UI_LULZBOT_BIO)
96
       GOTO_SCREEN(BioConfirmHomeXYZ);
96
       GOTO_SCREEN(BioConfirmHomeXYZ);
97
       current_screen.forget();
97
       current_screen.forget();
98
       PUSH_SCREEN(StatusScreen);
98
       PUSH_SCREEN(StatusScreen);

+ 8
- 8
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp 查看文件

101
 void ChangeFilamentScreen::onRedraw(draw_mode_t what) {
101
 void ChangeFilamentScreen::onRedraw(draw_mode_t what) {
102
   CommandProcessor cmd;
102
   CommandProcessor cmd;
103
 
103
 
104
-  #ifdef TOUCH_UI_PORTRAIT
104
+  #if ENABLED(TOUCH_UI_PORTRAIT)
105
     #define GRID_COLS 2
105
     #define GRID_COLS 2
106
     #define GRID_ROWS 11
106
     #define GRID_ROWS 11
107
   #else
107
   #else
114
        .cmd(CLEAR(true,true,true))
114
        .cmd(CLEAR(true,true,true))
115
        .cmd(COLOR_RGB(bg_text_enabled))
115
        .cmd(COLOR_RGB(bg_text_enabled))
116
        .tag(0)
116
        .tag(0)
117
-    #ifdef TOUCH_UI_PORTRAIT
117
+    #if ENABLED(TOUCH_UI_PORTRAIT)
118
        .font(font_large)
118
        .font(font_large)
119
     #else
119
     #else
120
        .font(font_medium)
120
        .font(font_medium)
121
     #endif
121
     #endif
122
        .text(BTN_POS(1,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_EXTRUDER_SELECTION))
122
        .text(BTN_POS(1,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_EXTRUDER_SELECTION))
123
-    #ifdef TOUCH_UI_PORTRAIT
123
+    #if ENABLED(TOUCH_UI_PORTRAIT)
124
        .text(BTN_POS(1,7), BTN_SIZE(1,1), GET_TEXT_F(MSG_CURRENT_TEMPERATURE))
124
        .text(BTN_POS(1,7), BTN_SIZE(1,1), GET_TEXT_F(MSG_CURRENT_TEMPERATURE))
125
     #else
125
     #else
126
        .text(BTN_POS(3,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_CURRENT_TEMPERATURE))
126
        .text(BTN_POS(3,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_CURRENT_TEMPERATURE))
142
     const rgb_t tcol = getWarmColor(getActualTemp_celsius(e), COOL_TEMP, LOW_TEMP, MED_TEMP, HIGH_TEMP);
142
     const rgb_t tcol = getWarmColor(getActualTemp_celsius(e), COOL_TEMP, LOW_TEMP, MED_TEMP, HIGH_TEMP);
143
     cmd.cmd(COLOR_RGB(tcol))
143
     cmd.cmd(COLOR_RGB(tcol))
144
        .tag(15)
144
        .tag(15)
145
-    #ifdef TOUCH_UI_PORTRAIT
145
+    #if ENABLED(TOUCH_UI_PORTRAIT)
146
        .rectangle(BTN_POS(2,7), BTN_SIZE(1,1))
146
        .rectangle(BTN_POS(2,7), BTN_SIZE(1,1))
147
     #else
147
     #else
148
        .rectangle(BTN_POS(3,2), BTN_SIZE(2,1))
148
        .rectangle(BTN_POS(3,2), BTN_SIZE(2,1))
149
     #endif
149
     #endif
150
        .cmd(COLOR_RGB(tcol.luminance() > 128 ? 0x000000 : 0xFFFFFF))
150
        .cmd(COLOR_RGB(tcol.luminance() > 128 ? 0x000000 : 0xFFFFFF))
151
        .font(font_medium)
151
        .font(font_medium)
152
-    #ifdef TOUCH_UI_PORTRAIT
152
+    #if ENABLED(TOUCH_UI_PORTRAIT)
153
        .text(BTN_POS(2,7), BTN_SIZE(1,1), e_str)
153
        .text(BTN_POS(2,7), BTN_SIZE(1,1), e_str)
154
     #else
154
     #else
155
        .text(BTN_POS(3,2), BTN_SIZE(2,1), e_str)
155
        .text(BTN_POS(3,2), BTN_SIZE(2,1), e_str)
177
       const bool tog11 = screen_data.ChangeFilamentScreen.e_tag == 11;
177
       const bool tog11 = screen_data.ChangeFilamentScreen.e_tag == 11;
178
     #endif
178
     #endif
179
 
179
 
180
-    #ifdef TOUCH_UI_PORTRAIT
180
+    #if ENABLED(TOUCH_UI_PORTRAIT)
181
       cmd.font(font_large)
181
       cmd.font(font_large)
182
     #else
182
     #else
183
       cmd.font(font_medium)
183
       cmd.font(font_medium)
198
 
198
 
199
 
199
 
200
     cmd.font(
200
     cmd.font(
201
-      #ifdef TOUCH_UI_PORTRAIT
201
+      #if ENABLED(TOUCH_UI_PORTRAIT)
202
         font_large
202
         font_large
203
       #else
203
       #else
204
         font_small
204
         font_small
227
     .cmd(COLOR_MASK(1,1,1,1))
227
     .cmd(COLOR_MASK(1,1,1,1))
228
 
228
 
229
     .cmd(COLOR_RGB(t_ok ? bg_text_enabled : bg_text_disabled))
229
     .cmd(COLOR_RGB(t_ok ? bg_text_enabled : bg_text_disabled))
230
-    #ifdef TOUCH_UI_PORTRAIT
230
+    #if ENABLED(TOUCH_UI_PORTRAIT)
231
        .font(font_large)
231
        .font(font_large)
232
        .tag(0)                              .text   (BTN_POS(1,8),  BTN_SIZE(1,1), GET_TEXT_F(MSG_UNLOAD_FILAMENT))
232
        .tag(0)                              .text   (BTN_POS(1,8),  BTN_SIZE(1,1), GET_TEXT_F(MSG_UNLOAD_FILAMENT))
233
                                             .text   (BTN_POS(2,8),  BTN_SIZE(1,1), GET_TEXT_F(MSG_LOAD_FILAMENT))
233
                                             .text   (BTN_POS(2,8),  BTN_SIZE(1,1), GET_TEXT_F(MSG_LOAD_FILAMENT))

+ 2
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp 查看文件

45
   constexpr uint32_t base = ftdi_memory_map::RAM_G;
45
   constexpr uint32_t base = ftdi_memory_map::RAM_G;
46
 
46
 
47
   // Load fonts for internationalization
47
   // Load fonts for internationalization
48
-  #ifdef TOUCH_UI_USE_UTF8
48
+  #if ENABLED(TOUCH_UI_USE_UTF8)
49
     load_utf8_data(base + UTF8_FONT_OFFSET);
49
     load_utf8_data(base + UTF8_FONT_OFFSET);
50
   #endif
50
   #endif
51
 }
51
 }
111
     ui.bounds(POLY(h3_label), x, y, h, v);
111
     ui.bounds(POLY(h3_label), x, y, h, v);
112
     cmd.text(x, y, h, v, GET_TEXT_F(MSG_CHAMBER));
112
     cmd.text(x, y, h, v, GET_TEXT_F(MSG_CHAMBER));
113
 
113
 
114
-    #ifdef TOUCH_UI_USE_UTF8
114
+    #if ENABLED(TOUCH_UI_USE_UTF8)
115
       load_utf8_bitmaps(cmd); // Restore font bitmap handles
115
       load_utf8_bitmaps(cmd); // Restore font bitmap handles
116
     #endif
116
     #endif
117
   }
117
   }

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/custom_user_menus.cpp 查看文件

57
     #define _MORE_THAN_TEN 0
57
     #define _MORE_THAN_TEN 0
58
   #endif
58
   #endif
59
 
59
 
60
-  #ifdef TOUCH_UI_PORTRAIT
60
+  #if ENABLED(TOUCH_UI_PORTRAIT)
61
     #define GRID_ROWS 11
61
     #define GRID_ROWS 11
62
     #define GRID_COLS (1 + _MORE_THAN_TEN)
62
     #define GRID_COLS (1 + _MORE_THAN_TEN)
63
     #define USER_ITEM_POS(N) BTN_POS((1+((N-1)/10)), ((N-1) % 10 + 1)), BTN_SIZE(1,1)
63
     #define USER_ITEM_POS(N) BTN_POS((1+((N-1)/10)), ((N-1) % 10 + 1)), BTN_SIZE(1,1)

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp 查看文件

52
     #endif
52
     #endif
53
 
53
 
54
     cmd.cmd(COLOR_RGB(bg_text_enabled));
54
     cmd.cmd(COLOR_RGB(bg_text_enabled));
55
-    #ifdef TOUCH_UI_PORTRAIT
55
+    #if ENABLED(TOUCH_UI_PORTRAIT)
56
       #define GRID_ROWS 10
56
       #define GRID_ROWS 10
57
       #define GRID_COLS 1
57
       #define GRID_COLS 1
58
       cmd.font(font_large)         .text  ( BTN_POS(1,1), BTN_SIZE(1,1), F("Developer Menu"))
58
       cmd.font(font_large)         .text  ( BTN_POS(1,1), BTN_SIZE(1,1), F("Developer Menu"))

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp 查看文件

53
   #define PIN_DISABLED(X,Y,LABEL,PIN)     cmd.enabled(0).PIN_BTN(X,Y,PIN,LABEL);
53
   #define PIN_DISABLED(X,Y,LABEL,PIN)     cmd.enabled(0).PIN_BTN(X,Y,PIN,LABEL);
54
 
54
 
55
   cmd.font(
55
   cmd.font(
56
-    #ifdef TOUCH_UI_PORTRAIT
56
+    #if ENABLED(TOUCH_UI_PORTRAIT)
57
       font_large
57
       font_large
58
     #else
58
     #else
59
       font_medium
59
       font_medium

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp 查看文件

30
 using namespace ExtUI;
30
 using namespace ExtUI;
31
 using namespace Theme;
31
 using namespace Theme;
32
 
32
 
33
-#ifdef TOUCH_UI_PORTRAIT
33
+#if ENABLED(TOUCH_UI_PORTRAIT)
34
   #define GRID_ROWS 9
34
   #define GRID_ROWS 9
35
   #define GRID_COLS 2
35
   #define GRID_COLS 2
36
   #define TITLE_POS          BTN_POS(1,1), BTN_SIZE(2,1)
36
   #define TITLE_POS          BTN_POS(1,1), BTN_SIZE(2,1)

+ 2
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp 查看文件

67
   return screen_data.FilesScreen.cur_page * files_per_page + tag - 2;
67
   return screen_data.FilesScreen.cur_page * files_per_page + tag - 2;
68
 }
68
 }
69
 
69
 
70
-#ifdef TOUCH_UI_PORTRAIT
70
+#if ENABLED(TOUCH_UI_PORTRAIT)
71
   #define GRID_COLS  6
71
   #define GRID_COLS  6
72
   #define GRID_ROWS (files_per_page + header_h + footer_h)
72
   #define GRID_ROWS (files_per_page + header_h + footer_h)
73
 #else
73
 #else
151
 void FilesScreen::drawFooter() {
151
 void FilesScreen::drawFooter() {
152
   #undef MARGIN_T
152
   #undef MARGIN_T
153
   #undef MARGIN_B
153
   #undef MARGIN_B
154
-  #ifdef TOUCH_UI_PORTRAIT
154
+  #if ENABLED(TOUCH_UI_PORTRAIT)
155
     #define MARGIN_T 15
155
     #define MARGIN_T 15
156
     #define MARGIN_B 5
156
     #define MARGIN_B 5
157
   #else
157
   #else

+ 3
- 3
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp 查看文件

58
   if (what & BACKGROUND) {
58
   if (what & BACKGROUND) {
59
 
59
 
60
     #define GRID_COLS 4
60
     #define GRID_COLS 4
61
-    #ifdef TOUCH_UI_PORTRAIT
61
+    #if ENABLED(TOUCH_UI_PORTRAIT)
62
       #define GRID_ROWS 7
62
       #define GRID_ROWS 7
63
     #else
63
     #else
64
       #define GRID_ROWS 6
64
       #define GRID_ROWS 6
86
   }
86
   }
87
 
87
 
88
   if (what & FOREGROUND) {
88
   if (what & FOREGROUND) {
89
-    #ifdef TOUCH_UI_PORTRAIT
89
+    #if ENABLED(TOUCH_UI_PORTRAIT)
90
       constexpr uint8_t w = 2;
90
       constexpr uint8_t w = 2;
91
     #else
91
     #else
92
       constexpr uint8_t w = 1;
92
       constexpr uint8_t w = 1;
106
     #endif
106
     #endif
107
     #undef EDGE_R
107
     #undef EDGE_R
108
     #define EDGE_R 0
108
     #define EDGE_R 0
109
-    #ifdef TOUCH_UI_PORTRAIT
109
+    #if ENABLED(TOUCH_UI_PORTRAIT)
110
        .colors(normal_btn)
110
        .colors(normal_btn)
111
        .tag(6).button (BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_SOUNDS))
111
        .tag(6).button (BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_SOUNDS))
112
        .colors(action_btn)
112
        .colors(action_btn)

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp 查看文件

84
   }
84
   }
85
 
85
 
86
   if (what & FOREGROUND) {
86
   if (what & FOREGROUND) {
87
-    #ifdef TOUCH_UI_PORTRAIT
87
+    #if ENABLED(TOUCH_UI_PORTRAIT)
88
       constexpr uint8_t w = 2;
88
       constexpr uint8_t w = 2;
89
     #else
89
     #else
90
       constexpr uint8_t w = 1;
90
       constexpr uint8_t w = 1;

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.cpp 查看文件

34
 using namespace ExtUI;
34
 using namespace ExtUI;
35
 using namespace Theme;
35
 using namespace Theme;
36
 
36
 
37
-#ifdef TOUCH_UI_PORTRAIT
37
+#if ENABLED(TOUCH_UI_PORTRAIT)
38
   #define GRID_ROWS 9
38
   #define GRID_ROWS 9
39
   #define GRID_COLS 2
39
   #define GRID_COLS 2
40
   #define TITLE_POS          BTN_POS(1,1), BTN_SIZE(2,1)
40
   #define TITLE_POS          BTN_POS(1,1), BTN_SIZE(2,1)

+ 2
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp 查看文件

50
   }
50
   }
51
 
51
 
52
   if (what & FOREGROUND) {
52
   if (what & FOREGROUND) {
53
-    #ifdef TOUCH_UI_PORTRAIT
53
+    #if ENABLED(TOUCH_UI_PORTRAIT)
54
       #define GRID_COLS 1
54
       #define GRID_COLS 1
55
       #define GRID_ROWS 10
55
       #define GRID_ROWS 10
56
     #else
56
     #else
81
     const uint8_t pressed = EventLoop::get_pressed_tag();
81
     const uint8_t pressed = EventLoop::get_pressed_tag();
82
 
82
 
83
     cmd.font(font_large)
83
     cmd.font(font_large)
84
-    #ifdef TOUCH_UI_PORTRAIT
84
+    #if ENABLED(TOUCH_UI_PORTRAIT)
85
        .text(BTN_POS(1,2), BTN_SIZE(1,1), message)
85
        .text(BTN_POS(1,2), BTN_SIZE(1,1), message)
86
        .font(font_xlarge)
86
        .font(font_xlarge)
87
        .text(BTN_POS(1,4), BTN_SIZE(1,1), screen_data.LockScreen.passcode)
87
        .text(BTN_POS(1,4), BTN_SIZE(1,1), screen_data.LockScreen.passcode)

+ 4
- 26
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp 查看文件

1
-/**
2
- * Marlin 3D Printer Firmware
3
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
- *
5
- * Based on Sprinter and grbl.
6
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
- *
8
- * This program is free software: you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License as published by
10
- * the Free Software Foundation, either version 3 of the License, or
11
- * (at your option) any later version.
12
- *
13
- * This program is distributed in the hope that it will be useful,
14
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
- * GNU General Public License for more details.
17
- *
18
- * You should have received a copy of the GNU General Public License
19
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
20
- *
21
- */
22
-
23
 /*****************
1
 /*****************
24
  * main_menu.cpp *
2
  * main_menu.cpp *
25
  *****************/
3
  *****************/
59
        .cmd(CLEAR(true,true,true));
37
        .cmd(CLEAR(true,true,true));
60
   }
38
   }
61
 
39
 
62
-  #ifdef TOUCH_UI_PORTRAIT
40
+  #if ENABLED(TOUCH_UI_PORTRAIT)
63
     #define GRID_ROWS 8
41
     #define GRID_ROWS 8
64
     #define GRID_COLS 2
42
     #define GRID_COLS 2
65
     #define ABOUT_PRINTER_POS     BTN_POS(1,1), BTN_SIZE(2,1)
43
     #define ABOUT_PRINTER_POS     BTN_POS(1,1), BTN_SIZE(2,1)
129
     case 1:  SaveSettingsDialogBox::promptToSaveSettings();           break;
107
     case 1:  SaveSettingsDialogBox::promptToSaveSettings();           break;
130
     case 2:  SpinnerDialogBox::enqueueAndWait_P(F("G28"));            break;
108
     case 2:  SpinnerDialogBox::enqueueAndWait_P(F("G28"));            break;
131
     #if ENABLED(NOZZLE_CLEAN_FEATURE)
109
     #if ENABLED(NOZZLE_CLEAN_FEATURE)
132
-    case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
110
+      case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
133
     #endif
111
     #endif
134
     case 4:  GOTO_SCREEN(MoveAxisScreen);                             break;
112
     case 4:  GOTO_SCREEN(MoveAxisScreen);                             break;
135
     case 5:  injectCommands_P(PSTR("M84"));                           break;
113
     case 5:  injectCommands_P(PSTR("M84"));                           break;
136
     case 6:  GOTO_SCREEN(TemperatureScreen);                          break;
114
     case 6:  GOTO_SCREEN(TemperatureScreen);                          break;
137
     case 7:  GOTO_SCREEN(ChangeFilamentScreen);                       break;
115
     case 7:  GOTO_SCREEN(ChangeFilamentScreen);                       break;
138
     case 8:  GOTO_SCREEN(AdvancedSettingsMenu);                       break;
116
     case 8:  GOTO_SCREEN(AdvancedSettingsMenu);                       break;
139
-    #ifdef HAS_LEVELING
140
-    case 9:  GOTO_SCREEN(LevelingMenu);                               break;
117
+    #if HAS_LEVELING
118
+      case 9:  GOTO_SCREEN(LevelingMenu);                             break;
141
     #endif
119
     #endif
142
     case 10: GOTO_SCREEN(AboutScreen);                                break;
120
     case 10: GOTO_SCREEN(AboutScreen);                                break;
143
     #if ENABLED(CUSTOM_USER_MENUS)
121
     #if ENABLED(CUSTOM_USER_MENUS)

+ 0
- 22
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp 查看文件

1
-/**
2
- * Marlin 3D Printer Firmware
3
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
- *
5
- * Based on Sprinter and grbl.
6
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
- *
8
- * This program is free software: you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License as published by
10
- * the Free Software Foundation, either version 3 of the License, or
11
- * (at your option) any later version.
12
- *
13
- * This program is distributed in the hope that it will be useful,
14
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
- * GNU General Public License for more details.
17
- *
18
- * You should have received a copy of the GNU General Public License
19
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
20
- *
21
- */
22
-
23
 /***************
1
 /***************
24
  * screens.cpp *
2
  * screens.cpp *
25
  ***************/
3
  ***************/

+ 1
- 23
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h 查看文件

1
-/**
2
- * Marlin 3D Printer Firmware
3
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
- *
5
- * Based on Sprinter and grbl.
6
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
- *
8
- * This program is free software: you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License as published by
10
- * the Free Software Foundation, either version 3 of the License, or
11
- * (at your option) any later version.
12
- *
13
- * This program is distributed in the hope that it will be useful,
14
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
- * GNU General Public License for more details.
17
- *
18
- * You should have received a copy of the GNU General Public License
19
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
20
- *
21
- */
22
-
23
 /*************
1
 /*************
24
  * screens.h *
2
  * screens.h *
25
  *************/
3
  *************/
767
 
745
 
768
   class FilesScreen : public BaseScreen, public CachedScreen<FILES_SCREEN_CACHE, FILE_SCREEN_DL_SIZE> {
746
   class FilesScreen : public BaseScreen, public CachedScreen<FILES_SCREEN_CACHE, FILE_SCREEN_DL_SIZE> {
769
     private:
747
     private:
770
-      #ifdef TOUCH_UI_PORTRAIT
748
+      #if ENABLED(TOUCH_UI_PORTRAIT)
771
         static constexpr uint8_t header_h       = 2;
749
         static constexpr uint8_t header_h       = 2;
772
         static constexpr uint8_t footer_h       = 2;
750
         static constexpr uint8_t footer_h       = 2;
773
         static constexpr uint8_t files_per_page = 11;
751
         static constexpr uint8_t files_per_page = 11;

+ 5
- 5
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp 查看文件

32
 using namespace FTDI;
32
 using namespace FTDI;
33
 using namespace Theme;
33
 using namespace Theme;
34
 
34
 
35
-#ifdef TOUCH_UI_PORTRAIT
35
+#if ENABLED(TOUCH_UI_PORTRAIT)
36
     #define GRID_ROWS 8
36
     #define GRID_ROWS 8
37
 #else
37
 #else
38
     #define GRID_ROWS 8
38
     #define GRID_ROWS 8
43
 
43
 
44
   #define GRID_COLS 3
44
   #define GRID_COLS 3
45
 
45
 
46
-  #ifdef TOUCH_UI_PORTRAIT
46
+  #if ENABLED(TOUCH_UI_PORTRAIT)
47
     #define X_LBL_POS  BTN_POS(1,5), BTN_SIZE(1,1)
47
     #define X_LBL_POS  BTN_POS(1,5), BTN_SIZE(1,1)
48
     #define Y_LBL_POS  BTN_POS(1,6), BTN_SIZE(1,1)
48
     #define Y_LBL_POS  BTN_POS(1,6), BTN_SIZE(1,1)
49
     #define Z_LBL_POS  BTN_POS(1,7), BTN_SIZE(1,1)
49
     #define Z_LBL_POS  BTN_POS(1,7), BTN_SIZE(1,1)
111
   #undef GRID_COLS
111
   #undef GRID_COLS
112
 }
112
 }
113
 
113
 
114
-#ifdef TOUCH_UI_PORTRAIT
114
+#if ENABLED(TOUCH_UI_PORTRAIT)
115
   #define GRID_COLS 8
115
   #define GRID_COLS 8
116
 #else
116
 #else
117
   #define GRID_COLS 12
117
   #define GRID_COLS 12
164
        .cmd (BITMAP_SIZE  (Fan_Icon_Info))
164
        .cmd (BITMAP_SIZE  (Fan_Icon_Info))
165
        .icon(ICON_POS(FAN_POS), Fan_Icon_Info, icon_scale);
165
        .icon(ICON_POS(FAN_POS), Fan_Icon_Info, icon_scale);
166
 
166
 
167
-    #ifdef TOUCH_UI_USE_UTF8
167
+    #if ENABLED(TOUCH_UI_USE_UTF8)
168
       load_utf8_bitmaps(cmd); // Restore font bitmap handles
168
       load_utf8_bitmaps(cmd); // Restore font bitmap handles
169
     #endif
169
     #endif
170
   }
170
   }
334
   CLCD::mem_write_pgm(base + Fan_Icon_Info.RAMG_offset,      Fan_Icon,      sizeof(Fan_Icon));
334
   CLCD::mem_write_pgm(base + Fan_Icon_Info.RAMG_offset,      Fan_Icon,      sizeof(Fan_Icon));
335
 
335
 
336
   // Load fonts for internationalization
336
   // Load fonts for internationalization
337
-  #ifdef TOUCH_UI_USE_UTF8
337
+  #if ENABLED(TOUCH_UI_USE_UTF8)
338
     load_utf8_data(base + UTF8_FONT_OFFSET);
338
     load_utf8_data(base + UTF8_FONT_OFFSET);
339
   #endif
339
   #endif
340
 }
340
 }

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp 查看文件

41
   w.heading(GET_TEXT_F(MSG_TEMPERATURE));
41
   w.heading(GET_TEXT_F(MSG_TEMPERATURE));
42
   w.button(30, GET_TEXT_F(MSG_COOLDOWN));
42
   w.button(30, GET_TEXT_F(MSG_COOLDOWN));
43
   #ifndef NO_TOOLHEAD_HEATER_GCODE
43
   #ifndef NO_TOOLHEAD_HEATER_GCODE
44
-    #ifdef TOUCH_UI_COCOA_PRESS
44
+    #if ENABLED(TOUCH_UI_COCOA_PRESS)
45
       w.adjuster(   2, GET_TEXT_F(MSG_NOZZLE), getTargetTemp_celsius(E0));
45
       w.adjuster(   2, GET_TEXT_F(MSG_NOZZLE), getTargetTemp_celsius(E0));
46
       w.adjuster(   4, GET_TEXT_F(MSG_BODY), getTargetTemp_celsius(E1));
46
       w.adjuster(   4, GET_TEXT_F(MSG_BODY), getTargetTemp_celsius(E1));
47
       #if ENABLED(COCOA_PRESS_EXTRA_HEATER)
47
       #if ENABLED(COCOA_PRESS_EXTRA_HEATER)

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp 查看文件

38
        .cmd(CLEAR(true,true,true));
38
        .cmd(CLEAR(true,true,true));
39
   }
39
   }
40
 
40
 
41
-  #ifdef TOUCH_UI_PORTRAIT
41
+  #if ENABLED(TOUCH_UI_PORTRAIT)
42
     #define GRID_ROWS 9
42
     #define GRID_ROWS 9
43
     #define GRID_COLS 2
43
     #define GRID_COLS 2
44
     #define TEMPERATURE_POS BTN_POS(1,1), BTN_SIZE(2,1)
44
     #define TEMPERATURE_POS BTN_POS(1,1), BTN_SIZE(2,1)

+ 2
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp 查看文件

51
   const uint16_t m   = (slider_val*12*60/0xFFFFU)%60;
51
   const uint16_t m   = (slider_val*12*60/0xFFFFU)%60;
52
   const uint16_t s   = (slider_val*12*60*60/0xFFFFU)%60;
52
   const uint16_t s   = (slider_val*12*60*60/0xFFFFU)%60;
53
 
53
 
54
-  #ifdef TOUCH_UI_PORTRAIT
54
+  #if ENABLED(TOUCH_UI_PORTRAIT)
55
     #define GRID_COLS 3
55
     #define GRID_COLS 3
56
     #define GRID_ROWS 8
56
     #define GRID_ROWS 8
57
     cmd.font(font_large)
57
     cmd.font(font_large)
113
   CommandProcessor cmd;
113
   CommandProcessor cmd;
114
   switch (tag) {
114
   switch (tag) {
115
     case 1: GOTO_PREVIOUS();                                               break;
115
     case 1: GOTO_PREVIOUS();                                               break;
116
-  #ifdef TOUCH_UI_PORTRAIT
116
+  #if ENABLED(TOUCH_UI_PORTRAIT)
117
     case 2: cmd.track_circular (BTN_POS(1,2), BTN_SIZE(1,2), 2).execute(); break;
117
     case 2: cmd.track_circular (BTN_POS(1,2), BTN_SIZE(1,2), 2).execute(); break;
118
     case 4: cmd.track_linear   (BTN_POS(2,3), BTN_SIZE(2,1), 4).execute(); break;
118
     case 4: cmd.track_linear   (BTN_POS(2,3), BTN_SIZE(2,1), 4).execute(); break;
119
     case 5: cmd.track_linear   (BTN_POS(2,4), BTN_SIZE(2,1), 5).execute(); break;
119
     case 5: cmd.track_linear   (BTN_POS(2,4), BTN_SIZE(2,1), 5).execute(); break;

+ 3
- 3
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h 查看文件

24
 
24
 
25
 namespace Theme {
25
 namespace Theme {
26
   #ifdef TOUCH_UI_800x480
26
   #ifdef TOUCH_UI_800x480
27
-    #ifdef TOUCH_UI_PORTRAIT
27
+    #if ENABLED(TOUCH_UI_PORTRAIT)
28
       constexpr int16_t  font_tiny     = 26;
28
       constexpr int16_t  font_tiny     = 26;
29
       constexpr int16_t  font_xsmall   = 28;
29
       constexpr int16_t  font_xsmall   = 28;
30
       constexpr int16_t  font_small    = 29;
30
       constexpr int16_t  font_small    = 29;
41
     #endif
41
     #endif
42
     constexpr float      icon_scale    = 1.0;
42
     constexpr float      icon_scale    = 1.0;
43
   #elif defined(TOUCH_UI_480x272)
43
   #elif defined(TOUCH_UI_480x272)
44
-    #ifdef TOUCH_UI_PORTRAIT
44
+    #if ENABLED(TOUCH_UI_PORTRAIT)
45
     constexpr int16_t  font_tiny     = 26;
45
     constexpr int16_t  font_tiny     = 26;
46
     constexpr int16_t  font_xsmall   = 26;
46
     constexpr int16_t  font_xsmall   = 26;
47
     constexpr int16_t  font_small    = 26;
47
     constexpr int16_t  font_small    = 26;
59
     constexpr float    icon_scale    = 0.6;
59
     constexpr float    icon_scale    = 0.6;
60
     #endif
60
     #endif
61
   #elif defined(TOUCH_UI_320x240)
61
   #elif defined(TOUCH_UI_320x240)
62
-    #ifdef TOUCH_UI_PORTRAIT
62
+    #if ENABLED(TOUCH_UI_PORTRAIT)
63
     constexpr int16_t  font_tiny     = 26;
63
     constexpr int16_t  font_tiny     = 26;
64
     constexpr int16_t  font_xsmall   = 26;
64
     constexpr int16_t  font_xsmall   = 26;
65
     constexpr int16_t  font_small    = 26;
65
     constexpr int16_t  font_small    = 26;

正在加载...
取消
保存