Browse Source

Move ExtUI displays to sub-folder (#19070)

Scott Lahteine 5 years ago
parent
commit
853aec2c9a
No account linked to committer's email address

Marlin/src/lcd/extui_anycubic_chiron_lcd.cpp → Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp View File

21
  */
21
  */
22
 
22
 
23
 /**
23
 /**
24
- * extui_anycubic_chiron_lcd.cpp
24
+ * anycubic_chiron_lcd.cpp
25
  *
25
  *
26
  * Anycubic Chiron TFT support for Marlin
26
  * Anycubic Chiron TFT support for Marlin
27
  */
27
  */
28
 
28
 
29
-#include "../inc/MarlinConfigPre.h"
29
+#include "../../inc/MarlinConfigPre.h"
30
 
30
 
31
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
31
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
32
 
32
 
33
-#include "extui/ui_api.h"
33
+#include "ui_api.h"
34
 
34
 
35
 #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
35
 #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
36
   #if GRID_MAX_POINTS_X != 5 || GRID_MAX_POINTS_Y != 5
36
   #if GRID_MAX_POINTS_X != 5 || GRID_MAX_POINTS_Y != 5

Marlin/src/lcd/extui_anycubic_i3mega_lcd.cpp → Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp View File

21
  */
21
  */
22
 
22
 
23
 /**
23
 /**
24
- * extui_anycubic_i3mega_lcd.cpp
24
+ * anycubic_i3mega_lcd.cpp
25
  */
25
  */
26
 
26
 
27
-#include "../inc/MarlinConfigPre.h"
27
+#include "../../inc/MarlinConfigPre.h"
28
 
28
 
29
 #if ENABLED(ANYCUBIC_LCD_I3MEGA)
29
 #if ENABLED(ANYCUBIC_LCD_I3MEGA)
30
 
30
 
31
-#include "extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.h"
32
-#include "extui/ui_api.h"
31
+#include "lib/anycubic_i3mega/anycubic_i3mega_lcd.h"
32
+#include "ui_api.h"
33
 
33
 
34
 #include <Arduino.h>    // for the ::tone() call
34
 #include <Arduino.h>    // for the ::tone() call
35
 
35
 

Marlin/src/lcd/extui_dgus_lcd.cpp → Marlin/src/lcd/extui/dgus_lcd.cpp View File

21
  */
21
  */
22
 
22
 
23
 /**
23
 /**
24
- * extui_dgus_lcd.cpp
24
+ * dgus_lcd.cpp
25
  *
25
  *
26
  * DGUS implementation for Marlin by coldtobi, Feb-May 2019
26
  * DGUS implementation for Marlin by coldtobi, Feb-May 2019
27
  */
27
  */
28
 
28
 
29
-#include "../inc/MarlinConfigPre.h"
29
+#include "../../inc/MarlinConfigPre.h"
30
 
30
 
31
 #if HAS_DGUS_LCD
31
 #if HAS_DGUS_LCD
32
 
32
 
33
-#include "extui/ui_api.h"
34
-#include "extui/lib/dgus/DGUSDisplay.h"
35
-#include "extui/lib/dgus/DGUSDisplayDef.h"
36
-#include "extui/lib/dgus/DGUSScreenHandler.h"
33
+#include "ui_api.h"
34
+#include "lib/dgus/DGUSDisplay.h"
35
+#include "lib/dgus/DGUSDisplayDef.h"
36
+#include "lib/dgus/DGUSScreenHandler.h"
37
 
37
 
38
 extern const char NUL_STR[];
38
 extern const char NUL_STR[];
39
 
39
 

Marlin/src/lcd/extui_example.cpp → Marlin/src/lcd/extui/example.cpp View File

1
 /*********************
1
 /*********************
2
- * extui_example.cpp *
2
+ * example.cpp *
3
  *********************/
3
  *********************/
4
 
4
 
5
 /****************************************************************************
5
 /****************************************************************************
19
  *   location: <https://www.gnu.org/licenses/>.                              *
19
  *   location: <https://www.gnu.org/licenses/>.                              *
20
  ****************************************************************************/
20
  ****************************************************************************/
21
 
21
 
22
-#include "../inc/MarlinConfigPre.h"
22
+#include "../../inc/MarlinConfigPre.h"
23
 
23
 
24
 #if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI)
24
 #if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI)
25
 
25
 
26
-#include "extui/ui_api.h"
26
+#include "ui_api.h"
27
 
27
 
28
 // To implement a new UI, complete the functions below and
28
 // To implement a new UI, complete the functions below and
29
 // read or update Marlin's state using the methods in the
29
 // read or update Marlin's state using the methods in the

Marlin/src/lcd/extui_malyan_lcd.cpp → Marlin/src/lcd/extui/malyan_lcd.cpp View File

21
  */
21
  */
22
 
22
 
23
 /**
23
 /**
24
- * extui_malyan_lcd.cpp
24
+ * malyan_lcd.cpp
25
  *
25
  *
26
  * LCD implementation for Malyan's LCD, a separate ESP8266 MCU running
26
  * LCD implementation for Malyan's LCD, a separate ESP8266 MCU running
27
  * on Serial1 for the M200 board. This module outputs a pseudo-gcode
27
  * on Serial1 for the M200 board. This module outputs a pseudo-gcode
41
  * Copyright (c) 2017 Jason Nelson (xC0000005)
41
  * Copyright (c) 2017 Jason Nelson (xC0000005)
42
  */
42
  */
43
 
43
 
44
-#include "../inc/MarlinConfigPre.h"
44
+#include "../../inc/MarlinConfigPre.h"
45
 
45
 
46
 #if ENABLED(MALYAN_LCD)
46
 #if ENABLED(MALYAN_LCD)
47
 
47
 
48
 #define DEBUG_MALYAN_LCD
48
 #define DEBUG_MALYAN_LCD
49
 
49
 
50
-#include "extui/ui_api.h"
50
+#include "ui_api.h"
51
 
51
 
52
-#include "ultralcd.h"
53
-#include "../sd/cardreader.h"
54
-#include "../module/temperature.h"
55
-#include "../module/stepper.h"
56
-#include "../module/motion.h"
57
-#include "../libs/duration_t.h"
58
-#include "../module/printcounter.h"
59
-#include "../gcode/queue.h"
52
+#include "../ultralcd.h"
53
+#include "../../sd/cardreader.h"
54
+#include "../../module/temperature.h"
55
+#include "../../module/stepper.h"
56
+#include "../../module/motion.h"
57
+#include "../../libs/duration_t.h"
58
+#include "../../module/printcounter.h"
59
+#include "../../gcode/queue.h"
60
 
60
 
61
 #define DEBUG_OUT ENABLED(DEBUG_MALYAN_LCD)
61
 #define DEBUG_OUT ENABLED(DEBUG_MALYAN_LCD)
62
-#include "../core/debug_out.h"
62
+#include "../../core/debug_out.h"
63
 
63
 
64
 // On the Malyan M200, this will be Serial1. On a RAMPS board,
64
 // On the Malyan M200, this will be Serial1. On a RAMPS board,
65
 // it might not be.
65
 // it might not be.

+ 8
- 8
platformio.ini View File

49
   -<src/lcd/menu/menu_touch_screen.cpp>
49
   -<src/lcd/menu/menu_touch_screen.cpp>
50
   -<src/lcd/menu/menu_ubl.cpp>
50
   -<src/lcd/menu/menu_ubl.cpp>
51
   -<src/lcd/extui/lib/mks_ui>
51
   -<src/lcd/extui/lib/mks_ui>
52
-  -<src/lcd/extui/lib/dgus> -<src/lcd/extui_dgus_lcd.cpp>
53
-  -<src/lcd/extui_example.cpp>
54
-  -<src/lcd/extui_malyan_lcd.cpp>
52
+  -<src/lcd/extui/lib/dgus> -<src/lcd/extui/dgus_lcd.cpp>
53
+  -<src/lcd/extui/example.cpp>
54
+  -<src/lcd/extui/malyan_lcd.cpp>
55
   -<src/lcd/extui/lib/ftdi_eve_touch_ui>
55
   -<src/lcd/extui/lib/ftdi_eve_touch_ui>
56
   -<src/lcd/extui/lib/anycubic_i3mega>
56
   -<src/lcd/extui/lib/anycubic_i3mega>
57
-  -<src/lcd/extui_anycubic_tft.cpp>
57
+  -<src/lcd/extui/anycubic_tft.cpp>
58
   -<src/lcd/lcdprint.cpp>
58
   -<src/lcd/lcdprint.cpp>
59
   -<src/sd/usb_flashdrive>
59
   -<src/sd/usb_flashdrive>
60
   -<src/feature/backlash.cpp>
60
   -<src/feature/backlash.cpp>
241
 HAS_MENU_TOUCH_SCREEN   = src_filter=+<src/lcd/menu/menu_touch_screen.cpp>
241
 HAS_MENU_TOUCH_SCREEN   = src_filter=+<src/lcd/menu/menu_touch_screen.cpp>
242
 HAS_MENU_UBL            = src_filter=+<src/lcd/menu/menu_ubl.cpp>
242
 HAS_MENU_UBL            = src_filter=+<src/lcd/menu/menu_ubl.cpp>
243
 ANYCUBIC_LCD_I3MEGA     = src_filter=+<src/lcd/extui/lib/anycubic_i3mega>
243
 ANYCUBIC_LCD_I3MEGA     = src_filter=+<src/lcd/extui/lib/anycubic_i3mega>
244
-HAS_DGUS_LCD            = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui_dgus_lcd.cpp>
244
+HAS_DGUS_LCD            = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui/dgus_lcd.cpp>
245
 TOUCH_UI_FTDI_EVE       = src_filter=+<src/lcd/extui/lib/ftdi_eve_touch_ui>
245
 TOUCH_UI_FTDI_EVE       = src_filter=+<src/lcd/extui/lib/ftdi_eve_touch_ui>
246
-HAS_ANYCUBIC_TFT_EXTUI  = src_filter=+<src/lcd/extui_anycubic_tft.cpp>
247
-EXTUI_EXAMPLE           = src_filter=+<src/lcd/extui_example.cpp>
248
-MALYAN_LCD              = src_filter=+<src/lcd/extui_malyan_lcd.cpp>
246
+HAS_ANYCUBIC_TFT_EXTUI  = src_filter=+<src/lcd/extui/anycubic_tft.cpp>
247
+EXTUI_EXAMPLE           = src_filter=+<src/lcd/extui/example.cpp>
248
+MALYAN_LCD              = src_filter=+<src/lcd/extui/malyan_lcd.cpp>
249
 HAS_SPI_LCD             = src_filter=+<src/lcd/lcdprint.cpp>
249
 HAS_SPI_LCD             = src_filter=+<src/lcd/lcdprint.cpp>
250
 USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive>
250
 USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive>
251
 AUTO_BED_LEVELING_BILINEAR = src_filter=+<src/feature/bedlevel/abl>
251
 AUTO_BED_LEVELING_BILINEAR = src_filter=+<src/feature/bedlevel/abl>

Loading…
Cancel
Save