Skip to content

Commit

Permalink
wrap compat in config
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Jul 1, 2021
1 parent c28f626 commit 1e1bcb9
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* location: <https://www.gnu.org/licenses/>. *
****************************************************************************/

#include "../compat.h"
#include "../config.h"

#if ENABLED(TOUCH_UI_FTDI_EVE)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* location: <https://www.gnu.org/licenses/>. *
****************************************************************************/

#include "../compat.h"
#include "../config.h"

#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "media_file_reader.h"
Expand Down
3 changes: 0 additions & 3 deletions Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@

#pragma once

#include "../../../inc/MarlinConfigPre.h"
#if ENABLED(TOUCH_UI_FTDI_EVE)

/**
* This following provides compatibility whether compiling
* as a part of Marlin or outside it
Expand Down
6 changes: 5 additions & 1 deletion Marlin/src/lcd/extui/ftdi_eve_touch_ui/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@

#pragma once

// Configure this display with options in Configuration_adv.h
#include "../../../inc/MarlinConfigPre.h"
#if ENABLED(TOUCH_UI_FTDI_EVE)

#include "compat.h"

// Configure this display with options in Configuration_adv.h
#endif
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#pragma once

#include "compat.h"
#include "config.h"

#if ENABLED(TOUCH_UI_FTDI_EVE)

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* location: <https://www.gnu.org/licenses/>. *
****************************************************************************/

#include "../compat.h"
#include "../config.h"

#if ENABLED(TOUCH_UI_FTDI_EVE)

Expand Down

0 comments on commit 1e1bcb9

Please sign in to comment.