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.

Sign up for GitHub

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

check for TOUCH_UI_FTDI_EVE, fixes arduino ide build #22276

Merged
merged 2 commits into from
Jul 1, 2021
Merged

check for TOUCH_UI_FTDI_EVE, fixes arduino ide build #22276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c28f626
check for TOUCH_UI_FTDI_EVE
Jul 1, 2021
a548485
wrap compat in config
thinkyhead Jul 1, 2021
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
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
View file
Open in desktop
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
6 changes: 5 additions & 1 deletion Marlin/src/lcd/extui/ftdi_eve_touch_ui/config.h
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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