Browse Source

Move ExtUI displays to sub-folder (#19070)

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
committed by GitHub
parent
commit
853aec2c9a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp
  2. 8
      Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp
  3. 12
      Marlin/src/lcd/extui/dgus_lcd.cpp
  4. 6
      Marlin/src/lcd/extui/example.cpp
  5. 24
      Marlin/src/lcd/extui/malyan_lcd.cpp
  6. 16
      platformio.ini

6
Marlin/src/lcd/extui_anycubic_chiron_lcd.cpp → Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp

@ -21,16 +21,16 @@
*/ */
/** /**
* extui_anycubic_chiron_lcd.cpp * anycubic_chiron_lcd.cpp
* *
* Anycubic Chiron TFT support for Marlin * Anycubic Chiron TFT support for Marlin
*/ */
#include "../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#if ENABLED(ANYCUBIC_LCD_CHIRON) #if ENABLED(ANYCUBIC_LCD_CHIRON)
#include "extui/ui_api.h" #include "ui_api.h"
#if ENABLED(AUTO_BED_LEVELING_BILINEAR) #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
#if GRID_MAX_POINTS_X != 5 || GRID_MAX_POINTS_Y != 5 #if GRID_MAX_POINTS_X != 5 || GRID_MAX_POINTS_Y != 5

8
Marlin/src/lcd/extui_anycubic_i3mega_lcd.cpp → Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp

@ -21,15 +21,15 @@
*/ */
/** /**
* extui_anycubic_i3mega_lcd.cpp * anycubic_i3mega_lcd.cpp
*/ */
#include "../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#if ENABLED(ANYCUBIC_LCD_I3MEGA) #if ENABLED(ANYCUBIC_LCD_I3MEGA)
#include "extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.h" #include "lib/anycubic_i3mega/anycubic_i3mega_lcd.h"
#include "extui/ui_api.h" #include "ui_api.h"
#include <Arduino.h> // for the ::tone() call #include <Arduino.h> // for the ::tone() call

12
Marlin/src/lcd/extui_dgus_lcd.cpp → Marlin/src/lcd/extui/dgus_lcd.cpp

@ -21,19 +21,19 @@
*/ */
/** /**
* extui_dgus_lcd.cpp * dgus_lcd.cpp
* *
* DGUS implementation for Marlin by coldtobi, Feb-May 2019 * DGUS implementation for Marlin by coldtobi, Feb-May 2019
*/ */
#include "../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#if HAS_DGUS_LCD #if HAS_DGUS_LCD
#include "extui/ui_api.h" #include "ui_api.h"
#include "extui/lib/dgus/DGUSDisplay.h" #include "lib/dgus/DGUSDisplay.h"
#include "extui/lib/dgus/DGUSDisplayDef.h" #include "lib/dgus/DGUSDisplayDef.h"
#include "extui/lib/dgus/DGUSScreenHandler.h" #include "lib/dgus/DGUSScreenHandler.h"
extern const char NUL_STR[]; extern const char NUL_STR[];

6
Marlin/src/lcd/extui_example.cpp → Marlin/src/lcd/extui/example.cpp

@ -1,5 +1,5 @@
/********************* /*********************
* extui_example.cpp * * example.cpp *
*********************/ *********************/
/**************************************************************************** /****************************************************************************
@ -19,11 +19,11 @@
* location: <https://www.gnu.org/licenses/>. * * location: <https://www.gnu.org/licenses/>. *
****************************************************************************/ ****************************************************************************/
#include "../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI) #if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI)
#include "extui/ui_api.h" #include "ui_api.h"
// To implement a new UI, complete the functions below and // To implement a new UI, complete the functions below and
// read or update Marlin's state using the methods in the // read or update Marlin's state using the methods in the

24
Marlin/src/lcd/extui_malyan_lcd.cpp → Marlin/src/lcd/extui/malyan_lcd.cpp

@ -21,7 +21,7 @@
*/ */
/** /**
* extui_malyan_lcd.cpp * malyan_lcd.cpp
* *
* LCD implementation for Malyan's LCD, a separate ESP8266 MCU running * LCD implementation for Malyan's LCD, a separate ESP8266 MCU running
* on Serial1 for the M200 board. This module outputs a pseudo-gcode * on Serial1 for the M200 board. This module outputs a pseudo-gcode
@ -41,25 +41,25 @@
* Copyright (c) 2017 Jason Nelson (xC0000005) * Copyright (c) 2017 Jason Nelson (xC0000005)
*/ */
#include "../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#if ENABLED(MALYAN_LCD) #if ENABLED(MALYAN_LCD)
#define DEBUG_MALYAN_LCD #define DEBUG_MALYAN_LCD
#include "extui/ui_api.h" #include "ui_api.h"
#include "ultralcd.h" #include "../ultralcd.h"
#include "../sd/cardreader.h" #include "../../sd/cardreader.h"
#include "../module/temperature.h" #include "../../module/temperature.h"
#include "../module/stepper.h" #include "../../module/stepper.h"
#include "../module/motion.h" #include "../../module/motion.h"
#include "../libs/duration_t.h" #include "../../libs/duration_t.h"
#include "../module/printcounter.h" #include "../../module/printcounter.h"
#include "../gcode/queue.h" #include "../../gcode/queue.h"
#define DEBUG_OUT ENABLED(DEBUG_MALYAN_LCD) #define DEBUG_OUT ENABLED(DEBUG_MALYAN_LCD)
#include "../core/debug_out.h" #include "../../core/debug_out.h"
// On the Malyan M200, this will be Serial1. On a RAMPS board, // On the Malyan M200, this will be Serial1. On a RAMPS board,
// it might not be. // it might not be.

16
platformio.ini

@ -49,12 +49,12 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
-<src/lcd/menu/menu_touch_screen.cpp> -<src/lcd/menu/menu_touch_screen.cpp>
-<src/lcd/menu/menu_ubl.cpp> -<src/lcd/menu/menu_ubl.cpp>
-<src/lcd/extui/lib/mks_ui> -<src/lcd/extui/lib/mks_ui>
-<src/lcd/extui/lib/dgus> -<src/lcd/extui_dgus_lcd.cpp> -<src/lcd/extui/lib/dgus> -<src/lcd/extui/dgus_lcd.cpp>
-<src/lcd/extui_example.cpp> -<src/lcd/extui/example.cpp>
-<src/lcd/extui_malyan_lcd.cpp> -<src/lcd/extui/malyan_lcd.cpp>
-<src/lcd/extui/lib/ftdi_eve_touch_ui> -<src/lcd/extui/lib/ftdi_eve_touch_ui>
-<src/lcd/extui/lib/anycubic_i3mega> -<src/lcd/extui/lib/anycubic_i3mega>
-<src/lcd/extui_anycubic_tft.cpp> -<src/lcd/extui/anycubic_tft.cpp>
-<src/lcd/lcdprint.cpp> -<src/lcd/lcdprint.cpp>
-<src/sd/usb_flashdrive> -<src/sd/usb_flashdrive>
-<src/feature/backlash.cpp> -<src/feature/backlash.cpp>
@ -241,11 +241,11 @@ HAS_MENU_TMC = src_filter=+<src/lcd/menu/menu_tmc.cpp>
HAS_MENU_TOUCH_SCREEN = src_filter=+<src/lcd/menu/menu_touch_screen.cpp> HAS_MENU_TOUCH_SCREEN = src_filter=+<src/lcd/menu/menu_touch_screen.cpp>
HAS_MENU_UBL = src_filter=+<src/lcd/menu/menu_ubl.cpp> HAS_MENU_UBL = src_filter=+<src/lcd/menu/menu_ubl.cpp>
ANYCUBIC_LCD_I3MEGA = src_filter=+<src/lcd/extui/lib/anycubic_i3mega> ANYCUBIC_LCD_I3MEGA = src_filter=+<src/lcd/extui/lib/anycubic_i3mega>
HAS_DGUS_LCD = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui_dgus_lcd.cpp> HAS_DGUS_LCD = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui/dgus_lcd.cpp>
TOUCH_UI_FTDI_EVE = src_filter=+<src/lcd/extui/lib/ftdi_eve_touch_ui> TOUCH_UI_FTDI_EVE = src_filter=+<src/lcd/extui/lib/ftdi_eve_touch_ui>
HAS_ANYCUBIC_TFT_EXTUI = src_filter=+<src/lcd/extui_anycubic_tft.cpp> HAS_ANYCUBIC_TFT_EXTUI = src_filter=+<src/lcd/extui/anycubic_tft.cpp>
EXTUI_EXAMPLE = src_filter=+<src/lcd/extui_example.cpp> EXTUI_EXAMPLE = src_filter=+<src/lcd/extui/example.cpp>
MALYAN_LCD = src_filter=+<src/lcd/extui_malyan_lcd.cpp> MALYAN_LCD = src_filter=+<src/lcd/extui/malyan_lcd.cpp>
HAS_SPI_LCD = src_filter=+<src/lcd/lcdprint.cpp> HAS_SPI_LCD = src_filter=+<src/lcd/lcdprint.cpp>
USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive> USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive>
AUTO_BED_LEVELING_BILINEAR = src_filter=+<src/feature/bedlevel/abl> AUTO_BED_LEVELING_BILINEAR = src_filter=+<src/feature/bedlevel/abl>

Loading…
Cancel
Save