Browse Source

FTDI Touch UI fix and reorganize (#21487)

Marcio T 4 years ago
parent
commit
7573524a14
No account linked to committer's email address
17 changed files with 184 additions and 156 deletions
  1. 26
    23
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
  2. 16
    15
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h
  3. 108
    0
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.cpp
  4. 27
    0
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.h
  5. 3
    0
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
  6. 0
    0
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
  7. 0
    105
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h
  8. 0
    0
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py
  9. 0
    0
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
  10. 0
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp
  11. 0
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
  12. 0
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
  13. 0
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
  14. 0
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp
  15. 0
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp
  16. 0
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
  17. 4
    0
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h

Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/adjuster_widget.cpp → Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp View File

@@ -19,10 +19,9 @@
19 19
  *   location: <https://www.gnu.org/licenses/>.                             *
20 20
  ****************************************************************************/
21 21
 
22
-#include "../ftdi_eve_lib.h"
23
-#include "../extended/grid_layout.h"
22
+#include "ftdi_extended.h"
24 23
 
25
-#include "adjuster_widget.h"
24
+#if ENABLED(FTDI_EXTENDED)
26 25
 
27 26
 #define SUB_COLS          9
28 27
 #define SUB_ROWS          1
@@ -30,28 +29,32 @@
30 29
 #define INC_POS           SUB_POS(6,1), SUB_SIZE(2,1)
31 30
 #define DEC_POS           SUB_POS(8,1), SUB_SIZE(2,1)
32 31
 
33
-void draw_adjuster_value(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, float value, progmem_str units, int8_t width, uint8_t precision) {
34
-  char str[width + precision + 10 + (units ? strlen_P((const char*) units) : 0)];
35
-  if (isnan(value))
36
-    strcpy_P(str, PSTR("-"));
37
-  else
38
-    dtostrf(value, width, precision, str);
32
+namespace FTDI {
33
+  void draw_adjuster_value(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, float value, progmem_str units, int8_t width, uint8_t precision) {
34
+    char str[width + precision + 10 + (units ? strlen_P((const char*) units) : 0)];
35
+    if (isnan(value))
36
+      strcpy_P(str, PSTR("-"));
37
+    else
38
+      dtostrf(value, width, precision, str);
39 39
 
40
-  if (units) {
41
-    strcat_P(str, PSTR(" "));
42
-    strcat_P(str, (const char*) units);
43
-  }
40
+    if (units) {
41
+      strcat_P(str, PSTR(" "));
42
+      strcat_P(str, (const char*) units);
43
+    }
44 44
 
45
-  cmd.text(VAL_POS, str);
46
-}
45
+    cmd.text(VAL_POS, str);
46
+  }
47 47
 
48
-void draw_adjuster(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, uint8_t tag, float value, progmem_str units, int8_t width, uint8_t precision, draw_mode_t what) {
49
-  if (what & BACKGROUND)
50
-    cmd.tag(0).button(VAL_POS, F(""), FTDI::OPT_FLAT);
48
+  void draw_adjuster(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, uint8_t tag, float value, progmem_str units, int8_t width, uint8_t precision, draw_mode_t what) {
49
+    if (what & BACKGROUND)
50
+      cmd.tag(0).button(VAL_POS, F(""), FTDI::OPT_FLAT);
51 51
 
52
-  if (what & FOREGROUND) {
53
-    draw_adjuster_value(cmd, x, y, w, h, value, units, width, precision);
54
-    cmd.tag(tag  ).button(INC_POS, F("-"))
55
-       .tag(tag+1).button(DEC_POS, F("+"));
52
+    if (what & FOREGROUND) {
53
+      draw_adjuster_value(cmd, x, y, w, h, value, units, width, precision);
54
+      cmd.tag(tag  ).button(INC_POS, F("-"))
55
+         .tag(tag+1).button(DEC_POS, F("+"));
56
+    }
56 57
   }
57
-}
58
+} // namespace FTDI
59
+
60
+#endif // FTDI_EXTENDED

Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/adjuster_widget.h → Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h View File

@@ -20,20 +20,21 @@
20 20
  ****************************************************************************/
21 21
 
22 22
 #pragma once
23
-#include "../extended/screen_types.h"
24 23
 
25
-void draw_adjuster_value(
26
-  CommandProcessor& cmd,
27
-  int16_t x, int16_t y, int16_t w, int16_t h,
28
-  float value, progmem_str units = nullptr,
29
-  int8_t width = 5, uint8_t precision = 1
30
-);
24
+namespace FTDI {
25
+  void draw_adjuster_value(
26
+    CommandProcessor& cmd,
27
+    int16_t x, int16_t y, int16_t w, int16_t h,
28
+    float value, progmem_str units = nullptr,
29
+    int8_t width = 5, uint8_t precision = 1
30
+  );
31 31
 
32
-void draw_adjuster(
33
-  CommandProcessor& cmd,
34
-  int16_t x, int16_t y, int16_t w, int16_t h,
35
-  uint8_t tag,
36
-  float value, progmem_str units = nullptr,
37
-  int8_t width = 5, uint8_t precision = 1,
38
-  draw_mode_t what = BOTH
39
-);
32
+  void draw_adjuster(
33
+    CommandProcessor& cmd,
34
+    int16_t x, int16_t y, int16_t w, int16_t h,
35
+    uint8_t tag,
36
+    float value, progmem_str units = nullptr,
37
+    int8_t width = 5, uint8_t precision = 1,
38
+    draw_mode_t what = BOTH
39
+  );
40
+}

+ 108
- 0
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.cpp View File

@@ -0,0 +1,108 @@
1
+/*************************
2
+ * circular_progress.cpp *
3
+ *************************/
4
+
5
+/****************************************************************************
6
+ *   Written By Marcio Teixeira 2019 - Aleph Objects, Inc.                  *
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
+ *   To view a copy of the GNU General Public License, go to the following  *
19
+ *   location: <https://www.gnu.org/licenses/>.                             *
20
+ ****************************************************************************/
21
+
22
+#include "ftdi_extended.h"
23
+
24
+#if ENABLED(FTDI_EXTENDED)
25
+
26
+/* This function draws a circular progress "ring" */
27
+namespace FTDI {
28
+  void draw_circular_progress(CommandProcessor& cmd, int x, int y, int w, int h, float percent, char *text, uint32_t bgcolor, uint32_t fgcolor) {
29
+    const float rim = 0.3;
30
+    const float a  = percent/100.0*2.0*PI;
31
+    const float a1 = min(PI/2, a);
32
+    const float a2 = min(PI/2, a-a1);
33
+    const float a3 = min(PI/2, a-a1-a2);
34
+    const float a4 = min(PI/2, a-a1-a2-a3);
35
+
36
+    const int ro  = min(w,h) * 8;
37
+    const int rr = ro * rim;
38
+    const int cx = x * 16 + w * 8;
39
+    const int cy = y * 16 + h * 8;
40
+
41
+    // Load a rim shape into stencil buffer
42
+    cmd.cmd(SAVE_CONTEXT());
43
+    cmd.cmd(TAG_MASK(0));
44
+    cmd.cmd(CLEAR(0,1,0));
45
+    cmd.cmd(COLOR_MASK(0,0,0,0));
46
+    cmd.cmd(STENCIL_OP(STENCIL_OP_KEEP, STENCIL_OP_INVERT));
47
+    cmd.cmd(STENCIL_FUNC(STENCIL_FUNC_ALWAYS, 255, 255));
48
+    cmd.cmd(BEGIN(POINTS));
49
+    cmd.cmd(POINT_SIZE(ro));
50
+    cmd.cmd(VERTEX2F(cx, cy));
51
+    cmd.cmd(POINT_SIZE(ro - rr));
52
+    cmd.cmd(VERTEX2F(cx, cy));
53
+    cmd.cmd(RESTORE_CONTEXT());
54
+
55
+    // Mask further drawing by stencil buffer
56
+    cmd.cmd(SAVE_CONTEXT());
57
+    cmd.cmd(STENCIL_FUNC(STENCIL_FUNC_NOTEQUAL, 0, 255));
58
+
59
+    // Fill the background
60
+    cmd.cmd(COLOR_RGB(bgcolor));
61
+    cmd.cmd(BEGIN(POINTS));
62
+    cmd.cmd(POINT_SIZE(ro));
63
+    cmd.cmd(VERTEX2F(cx, cy));
64
+    cmd.cmd(COLOR_RGB(fgcolor));
65
+
66
+    // Paint upper-right quadrant
67
+    cmd.cmd(BEGIN(EDGE_STRIP_A));
68
+    cmd.cmd(VERTEX2F(cx, cy));
69
+    cmd.cmd(VERTEX2F(cx + ro*sin(a1) + 16,cy - ro*cos(a1) + 8));
70
+
71
+    // Paint lower-right quadrant
72
+    if (a > PI/2) {
73
+      cmd.cmd(BEGIN(EDGE_STRIP_R));
74
+      cmd.cmd(VERTEX2F(cx, cy));
75
+      cmd.cmd(VERTEX2F(cx + ro*cos(a2),cy + ro*sin(a2) + 16));
76
+    }
77
+
78
+    // Paint lower-left quadrant
79
+    if (a > PI) {
80
+      cmd.cmd(BEGIN(EDGE_STRIP_B));
81
+      cmd.cmd(VERTEX2F(cx, cy));
82
+      cmd.cmd(VERTEX2F(cx - ro*sin(a3) - 8,cy + ro*cos(a3)));
83
+    }
84
+
85
+    // Paint upper-left quadrant
86
+    if (a > 1.5*PI) {
87
+      cmd.cmd(BEGIN(EDGE_STRIP_L));
88
+      cmd.cmd(VERTEX2F(cx, cy));
89
+      cmd.cmd(VERTEX2F(cx - ro*cos(a4),cy - ro*sin(a4)));
90
+    }
91
+    cmd.cmd(RESTORE_CONTEXT());
92
+
93
+    // Draw the text
94
+
95
+    cmd.cmd(SAVE_CONTEXT());
96
+    cmd.cmd(COLOR_RGB(fgcolor));
97
+    cmd.text(x,y,w,h,text, OPT_CENTERX | OPT_CENTERY);
98
+    cmd.cmd(RESTORE_CONTEXT());
99
+  }
100
+
101
+  void draw_circular_progress(CommandProcessor& cmd, int x, int y, int w, int h, float percent, uint32_t bgcolor, uint32_t fgcolor) {
102
+    char str[5];
103
+    sprintf(str,"%d\%%",int(percent));
104
+    draw_circular_progress(cmd, x, y, w, h, percent, str, bgcolor, fgcolor);
105
+  }
106
+} // namespace FTDI
107
+
108
+#endif // FTDI_EXTENDED

+ 27
- 0
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.h View File

@@ -0,0 +1,27 @@
1
+/***********************
2
+ * circular_progress.h *
3
+ ***********************/
4
+
5
+/****************************************************************************
6
+ *   Written By Marcio Teixeira 2019 - Aleph Objects, Inc.                  *
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
+ *   To view a copy of the GNU General Public License, go to the following  *
19
+ *   location: <https://www.gnu.org/licenses/>.                             *
20
+ ****************************************************************************/
21
+
22
+#pragma once
23
+
24
+namespace FTDI {
25
+  void draw_circular_progress(CommandProcessor& cmd, int x, int y, int w, int h, float percent, char *text, uint32_t bgcolor, uint32_t fgcolor);
26
+  void draw_circular_progress(CommandProcessor& cmd, int x, int y, int w, int h, float percent,             uint32_t bgcolor, uint32_t fgcolor);
27
+}

+ 3
- 0
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h View File

@@ -47,6 +47,9 @@
47 47
   #include "sound_player.h"
48 48
   #include "sound_list.h"
49 49
   #include "polygon.h"
50
+  #include "poly_ui.h"
50 51
   #include "text_box.h"
51 52
   #include "text_ellipsis.h"
53
+  #include "adjuster_widget.h"
54
+  #include "circular_progress.h"
52 55
 #endif

Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h → Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h View File


+ 0
- 105
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h View File

@@ -1,105 +0,0 @@
1
-/***********************
2
- * circular_progress.h *
3
- ***********************/
4
-
5
-/****************************************************************************
6
- *   Written By Marcio Teixeira 2019 - Aleph Objects, Inc.                  *
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
- *   To view a copy of the GNU General Public License, go to the following  *
19
- *   location: <https://www.gnu.org/licenses/>.                             *
20
- ****************************************************************************/
21
-
22
-#pragma once
23
-
24
-/* This function draws a circular progress "ring" */
25
-
26
-void draw_circular_progress(CommandProcessor& cmd, int x, int y, int w, int h, float percent, char *text, uint32_t bgcolor, uint32_t fgcolor) {
27
-  using namespace FTDI;
28
-
29
-  const float rim = 0.3;
30
-  const float a  = percent/100.0*2.0*PI;
31
-  const float a1 = min(PI/2, a);
32
-  const float a2 = min(PI/2, a-a1);
33
-  const float a3 = min(PI/2, a-a1-a2);
34
-  const float a4 = min(PI/2, a-a1-a2-a3);
35
-
36
-  const int ro  = min(w,h) * 8;
37
-  const int rr = ro * rim;
38
-  const int cx = x * 16 + w * 8;
39
-  const int cy = y * 16 + h * 8;
40
-
41
-  // Load a rim shape into stencil buffer
42
-  cmd.cmd(SAVE_CONTEXT());
43
-  cmd.cmd(TAG_MASK(0));
44
-  cmd.cmd(CLEAR(0,1,0));
45
-  cmd.cmd(COLOR_MASK(0,0,0,0));
46
-  cmd.cmd(STENCIL_OP(STENCIL_OP_KEEP, STENCIL_OP_INVERT));
47
-  cmd.cmd(STENCIL_FUNC(STENCIL_FUNC_ALWAYS, 255, 255));
48
-  cmd.cmd(BEGIN(POINTS));
49
-  cmd.cmd(POINT_SIZE(ro));
50
-  cmd.cmd(VERTEX2F(cx, cy));
51
-  cmd.cmd(POINT_SIZE(ro - rr));
52
-  cmd.cmd(VERTEX2F(cx, cy));
53
-  cmd.cmd(RESTORE_CONTEXT());
54
-
55
-  // Mask further drawing by stencil buffer
56
-  cmd.cmd(SAVE_CONTEXT());
57
-  cmd.cmd(STENCIL_FUNC(STENCIL_FUNC_NOTEQUAL, 0, 255));
58
-
59
-  // Fill the background
60
-  cmd.cmd(COLOR_RGB(bgcolor));
61
-  cmd.cmd(BEGIN(POINTS));
62
-  cmd.cmd(POINT_SIZE(ro));
63
-  cmd.cmd(VERTEX2F(cx, cy));
64
-  cmd.cmd(COLOR_RGB(fgcolor));
65
-
66
-  // Paint upper-right quadrant
67
-  cmd.cmd(BEGIN(EDGE_STRIP_A));
68
-  cmd.cmd(VERTEX2F(cx, cy));
69
-  cmd.cmd(VERTEX2F(cx + ro*sin(a1) + 16,cy - ro*cos(a1) + 8));
70
-
71
-  // Paint lower-right quadrant
72
-  if (a > PI/2) {
73
-    cmd.cmd(BEGIN(EDGE_STRIP_R));
74
-    cmd.cmd(VERTEX2F(cx, cy));
75
-    cmd.cmd(VERTEX2F(cx + ro*cos(a2),cy + ro*sin(a2) + 16));
76
-  }
77
-
78
-  // Paint lower-left quadrant
79
-  if (a > PI) {
80
-    cmd.cmd(BEGIN(EDGE_STRIP_B));
81
-    cmd.cmd(VERTEX2F(cx, cy));
82
-    cmd.cmd(VERTEX2F(cx - ro*sin(a3) - 8,cy + ro*cos(a3)));
83
-  }
84
-
85
-  // Paint upper-left quadrant
86
-  if (a > 1.5*PI) {
87
-    cmd.cmd(BEGIN(EDGE_STRIP_L));
88
-    cmd.cmd(VERTEX2F(cx, cy));
89
-    cmd.cmd(VERTEX2F(cx - ro*cos(a4),cy - ro*sin(a4)));
90
-  }
91
-  cmd.cmd(RESTORE_CONTEXT());
92
-
93
-  // Draw the text
94
-
95
-  cmd.cmd(SAVE_CONTEXT());
96
-  cmd.cmd(COLOR_RGB(fgcolor));
97
-  cmd.text(x,y,w,h,text, OPT_CENTERX | OPT_CENTERY);
98
-  cmd.cmd(RESTORE_CONTEXT());
99
-}
100
-
101
-void draw_circular_progress(CommandProcessor& cmd, int x, int y, int w, int h, float percent, uint32_t bgcolor, uint32_t fgcolor) {
102
-  char str[5];
103
-  sprintf(str,"%d\%%",int(percent));
104
-  draw_circular_progress(cmd, x, y, w, h, percent, str, bgcolor, fgcolor);
105
-}

Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py → Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py View File


Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py → Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py View File


+ 0
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp View File

@@ -25,8 +25,6 @@
25 25
 
26 26
 #ifdef FTDI_BED_MESH_SCREEN
27 27
 
28
-#include "../ftdi_eve_lib/extras/adjuster_widget.h"
29
-
30 28
 using namespace FTDI;
31 29
 using namespace Theme;
32 30
 using namespace ExtUI;

+ 0
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp View File

@@ -25,8 +25,6 @@
25 25
 
26 26
 #ifdef FTDI_BIO_PRINTING_DIALOG_BOX
27 27
 
28
-#include "../ftdi_eve_lib/extras/circular_progress.h"
29
-
30 28
 using namespace FTDI;
31 29
 using namespace ExtUI;
32 30
 using namespace Theme;

+ 0
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp View File

@@ -26,8 +26,6 @@
26 26
 
27 27
 #ifdef FTDI_BIO_STATUS_SCREEN
28 28
 
29
-#include "../ftdi_eve_lib/extras/poly_ui.h"
30
-
31 29
 #if ENABLED(TOUCH_UI_PORTRAIT)
32 30
   #include "bio_printer_ui_portrait.h"
33 31
 #else

+ 0
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp View File

@@ -26,7 +26,6 @@
26 26
 
27 27
 #ifdef FTDI_BOOT_SCREEN
28 28
 
29
-#include "../ftdi_eve_lib/extras/poly_ui.h"
30 29
 #include "../archim2-flash/flash_storage.h"
31 30
 
32 31
 #if ENABLED(SHOW_CUSTOM_BOOTSCREEN)

+ 0
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp View File

@@ -27,8 +27,6 @@
27 27
 
28 28
 #ifdef FTDI_COCOA_LOAD_CHOCOLATE_SCREEN
29 29
 
30
-#include "../ftdi_eve_lib/extras/poly_ui.h"
31
-
32 30
 #include "cocoa_press_ui.h"
33 31
 
34 32
 #define POLY(A) PolyUI::poly_reader_t(A, sizeof(A)/sizeof(A[0]))

+ 0
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp View File

@@ -25,8 +25,6 @@
25 25
 
26 26
 #ifdef FTDI_COCOA_PREHEAT_SCREEN
27 27
 
28
-#include "../ftdi_eve_lib/extras/circular_progress.h"
29
-
30 28
 using namespace FTDI;
31 29
 using namespace ExtUI;
32 30
 using namespace Theme;

+ 0
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp View File

@@ -26,8 +26,6 @@
26 26
 
27 27
 #ifdef FTDI_COCOA_STATUS_SCREEN
28 28
 
29
-#include "../ftdi_eve_lib/extras/poly_ui.h"
30
-
31 29
 #include "cocoa_press_ui.h"
32 30
 
33 31
 #define POLY(A) PolyUI::poly_reader_t(A, sizeof(A)/sizeof(A[0]))

+ 4
- 0
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h View File

@@ -22,6 +22,8 @@
22 22
 
23 23
 #pragma once
24 24
 
25
+#if ENABLED(TOUCH_UI_FTDI_EVE)
26
+
25 27
 #include "../ftdi_eve_lib/ftdi_eve_lib.h"
26 28
 #include "../language/language.h"
27 29
 #include "../theme/theme.h"
@@ -260,3 +262,5 @@ enum {
260 262
 #if NUM_LANGUAGES > 1
261 263
   #include "language_menu.h"
262 264
 #endif
265
+
266
+#endif // TOUCH_UI_FTDI_EVE

Loading…
Cancel
Save