Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move ExtUI displays to sub-folder #19070

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
*/

/**
* extui_anycubic_chiron_lcd.cpp
* anycubic_chiron_lcd.cpp
*
* Anycubic Chiron TFT support for Marlin
*/

#include "../inc/MarlinConfigPre.h"
#include "../../inc/MarlinConfigPre.h"

#if ENABLED(ANYCUBIC_LCD_CHIRON)

#include "extui/ui_api.h"
#include "ui_api.h"

#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
#if GRID_MAX_POINTS_X != 5 || GRID_MAX_POINTS_Y != 5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

#include "extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.h"
#include "extui/ui_api.h"
#include "lib/anycubic_i3mega/anycubic_i3mega_lcd.h"
#include "ui_api.h"

#include <Arduino.h> // for the ::tone() call

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@
*/

/**
* extui_dgus_lcd.cpp
* dgus_lcd.cpp
*
* DGUS implementation for Marlin by coldtobi, Feb-May 2019
*/

#include "../inc/MarlinConfigPre.h"
#include "../../inc/MarlinConfigPre.h"

#if HAS_DGUS_LCD

#include "extui/ui_api.h"
#include "extui/lib/dgus/DGUSDisplay.h"
#include "extui/lib/dgus/DGUSDisplayDef.h"
#include "extui/lib/dgus/DGUSScreenHandler.h"
#include "ui_api.h"
#include "lib/dgus/DGUSDisplay.h"
#include "lib/dgus/DGUSDisplayDef.h"
#include "lib/dgus/DGUSScreenHandler.h"

extern const char NUL_STR[];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*********************
* extui_example.cpp *
* example.cpp *
*********************/

/****************************************************************************
Expand All @@ -19,11 +19,11 @@
* location: <https://www.gnu.org/licenses/>. *
****************************************************************************/

#include "../inc/MarlinConfigPre.h"
#include "../../inc/MarlinConfigPre.h"

#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
// read or update Marlin's state using the methods in the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

/**
* extui_malyan_lcd.cpp
* malyan_lcd.cpp
*
* LCD implementation for Malyan's LCD, a separate ESP8266 MCU running
* on Serial1 for the M200 board. This module outputs a pseudo-gcode
Expand All @@ -41,25 +41,25 @@
* Copyright (c) 2017 Jason Nelson (xC0000005)
*/

#include "../inc/MarlinConfigPre.h"
#include "../../inc/MarlinConfigPre.h"

#if ENABLED(MALYAN_LCD)

#define DEBUG_MALYAN_LCD

#include "extui/ui_api.h"
#include "ui_api.h"

#include "ultralcd.h"
#include "../sd/cardreader.h"
#include "../module/temperature.h"
#include "../module/stepper.h"
#include "../module/motion.h"
#include "../libs/duration_t.h"
#include "../module/printcounter.h"
#include "../gcode/queue.h"
#include "../ultralcd.h"
#include "../../sd/cardreader.h"
#include "../../module/temperature.h"
#include "../../module/stepper.h"
#include "../../module/motion.h"
#include "../../libs/duration_t.h"
#include "../../module/printcounter.h"
#include "../../gcode/queue.h"

#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,
// it might not be.
Expand Down
16 changes: 8 additions & 8 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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_ubl.cpp>
-<src/lcd/extui/lib/mks_ui>
-<src/lcd/extui/lib/dgus> -<src/lcd/extui_dgus_lcd.cpp>
-<src/lcd/extui_example.cpp>
-<src/lcd/extui_malyan_lcd.cpp>
-<src/lcd/extui/lib/dgus> -<src/lcd/extui/dgus_lcd.cpp>
-<src/lcd/extui/example.cpp>
-<src/lcd/extui/malyan_lcd.cpp>
-<src/lcd/extui/lib/ftdi_eve_touch_ui>
-<src/lcd/extui/lib/anycubic_i3mega>
-<src/lcd/extui_anycubic_tft.cpp>
-<src/lcd/extui/anycubic_tft.cpp>
-<src/lcd/lcdprint.cpp>
-<src/sd/usb_flashdrive>
-<src/feature/backlash.cpp>
Expand Down Expand Up @@ -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_UBL = src_filter=+<src/lcd/menu/menu_ubl.cpp>
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>
HAS_ANYCUBIC_TFT_EXTUI = src_filter=+<src/lcd/extui_anycubic_tft.cpp>
EXTUI_EXAMPLE = src_filter=+<src/lcd/extui_example.cpp>
MALYAN_LCD = src_filter=+<src/lcd/extui_malyan_lcd.cpp>
HAS_ANYCUBIC_TFT_EXTUI = src_filter=+<src/lcd/extui/anycubic_tft.cpp>
EXTUI_EXAMPLE = src_filter=+<src/lcd/extui/example.cpp>
MALYAN_LCD = src_filter=+<src/lcd/extui/malyan_lcd.cpp>
HAS_SPI_LCD = src_filter=+<src/lcd/lcdprint.cpp>
USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive>
AUTO_BED_LEVELING_BILINEAR = src_filter=+<src/feature/bedlevel/abl>
Expand Down