bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

LULZBOT_TOUCH_UI => TOUCH_UI_FTDI_EVE

Browse Source
This commit is contained in:
Scott Lahteine
2019-11-23 16:53:44 -06:00
parent 47c19aa2b3
commit 441e822fb3
309 changed files with 615 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/archim2-flash/flash_storage.cpp
View File

@ -22,7 +22,7 @@
#include "../compat.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "../ftdi_eve_lib/ftdi_eve_lib.h"
@ -556,4 +556,4 @@ bool UIFlashStorage::is_present = false;
int16_t UIFlashStorage::BootMediaReader::read(void *, const size_t) {return -1;}
int16_t UIFlashStorage::BootMediaReader::read(void *, void *, const size_t) {return -1;}
#endif // SPI_FLASH_SS
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/archim2-flash/media_file_reader.cpp
View File

@ -22,7 +22,7 @@
#include "../compat.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "media_file_reader.h"
#if ENABLED(SDSUPPORT)
@ -60,4 +60,4 @@
void MediaFileReader::rewind() {}
int16_t MediaFileReader::read(void *, void *, size_t) {return 0;}
#endif
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

2
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/boards.h
View File

@ -179,5 +179,5 @@
#else
#error Unknown or no LULZBOT_TOUCH_UI board specified. To add a new board, modify "ftdi_eve_boards.h"
#error Unknown or no TOUCH_UI_FTDI_EVE board specified. To add a new board, modify "ftdi_eve_boards.h"
#endif

2
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/resolutions.h
View File

@ -124,5 +124,5 @@
}
#else
#error Unknown or no LULZBOT_TOUCH_UI display resolution specified. To add a display resolution, modify "ftdi_eve_resolutions.h"
#error Unknown or no TOUCH_UI_FTDI_EVE display resolution specified. To add a display resolution, modify "ftdi_eve_resolutions.h"
#endif

2
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/compat.h
View File

@ -22,7 +22,7 @@
#ifdef __MARLIN_FIRMWARE__
// Marlin will define the I/O functions for us
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#define FTDI_BASIC
#define FTDI_EXTENDED
#endif

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/marlin_events.cpp
View File

@ -22,7 +22,7 @@
#include "compat.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens/screens.h"
@ -132,4 +132,4 @@ namespace ExtUI {
#endif
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/about_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -91,4 +91,4 @@ bool AboutScreen::onTouchEnd(uint8_t tag) {
}
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/advanced_settings_menu.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && !defined(TOUCH_UI_LULZBOT_BIO)
#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO)
#include "screens.h"
@ -188,4 +188,4 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/alert_dialog_box.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
#include "screen_data.h"
@ -67,4 +67,4 @@ template void AlertDialogBox::show(const progmem_str);
template void AlertDialogBox::showError(const char *);
template void AlertDialogBox::showError(const progmem_str);
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/backlash_compensation_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, BACKLASH_GCODE)
#if BOTH(TOUCH_UI_FTDI_EVE, BACKLASH_GCODE)
#include "screens.h"
@ -69,4 +69,4 @@ bool BacklashCompensationScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/base_numeric_adjustment_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
#include "screen_data.h"
@ -381,4 +381,4 @@ float BaseNumericAdjustmentScreen::getIncrement() {
}
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/base_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -87,4 +87,4 @@ void BaseScreen::reset_menu_timeout() {
uint32_t BaseScreen::last_interaction;
#endif
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_advanced_settings.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && defined(TOUCH_UI_LULZBOT_BIO)
#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO)
#include "screens.h"
@ -134,4 +134,4 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_confirm_home_e.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && defined(TOUCH_UI_LULZBOT_BIO)
#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO)
#include "screens.h"
@ -51,4 +51,4 @@ bool BioConfirmHomeE::onTouchEnd(uint8_t tag) {
}
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_confirm_home_xyz.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && defined(TOUCH_UI_LULZBOT_BIO)
#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO)
#include "screens.h"
@ -50,4 +50,4 @@ bool BioConfirmHomeXYZ::onTouchEnd(uint8_t tag) {
}
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_main_menu.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && defined(TOUCH_UI_LULZBOT_BIO)
#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO)
#include "screens.h"
@ -83,4 +83,4 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_printing_dialog_box.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && defined(TOUCH_UI_LULZBOT_BIO)
#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO)
#include "screens.h"
@ -154,4 +154,4 @@ void BioPrintingDialogBox::show() {
GOTO_SCREEN(BioPrintingDialogBox);
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_status_screen.cpp
View File

@ -23,7 +23,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && (ENABLED(TOUCH_UI_LULZBOT_BIO) || ENABLED(TOUCH_UI_COCOA_PRESS))
#if ENABLED(TOUCH_UI_FTDI_EVE) && (ENABLED(TOUCH_UI_LULZBOT_BIO) || ENABLED(TOUCH_UI_COCOA_PRESS))
#include "screens.h"
@ -436,4 +436,4 @@ void StatusScreen::onIdle() {
}
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_tune_menu.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && defined(TOUCH_UI_LULZBOT_BIO)
#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO)
#include "screens.h"
@ -80,4 +80,4 @@ bool TuneMenu::onTouchEnd(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/boot_screen.cpp
View File

@ -23,7 +23,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -124,4 +124,4 @@ void BootScreen::showSplashScreen() {
ExtUI::delay_ms(2500);
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/change_filament_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
#include "screen_data.h"
@ -347,4 +347,4 @@ void ChangeFilamentScreen::onIdle() {
BaseScreen::onIdle();
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_abort_print_dialog_box.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -44,4 +44,4 @@ bool ConfirmAbortPrintDialogBox::onTouchEnd(uint8_t tag) {
}
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_auto_calibration_dialog_box.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, CALIBRATION_GCODE)
#if BOTH(TOUCH_UI_FTDI_EVE, CALIBRATION_GCODE)
#include "screens.h"
@ -45,4 +45,4 @@ bool ConfirmAutoCalibrationDialogBox::onTouchEnd(uint8_t tag) {
}
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_erase_flash_dialog_box.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, TOUCH_UI_DEVELOPER_MENU)
#if BOTH(TOUCH_UI_FTDI_EVE, TOUCH_UI_DEVELOPER_MENU)
#include "screens.h"
@ -51,4 +51,4 @@ bool ConfirmEraseFlashDialogBox::onTouchEnd(uint8_t tag) {
}
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_start_print_dialog_box.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
#include "screen_data.h"
@ -67,4 +67,4 @@ void ConfirmStartPrintDialogBox::show(uint8_t file_index) {
GOTO_SCREEN(ConfirmStartPrintDialogBox);
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_user_request_alert_box.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
#include "screen_data.h"
@ -55,4 +55,4 @@ void ConfirmUserRequestAlertBox::hide() {
if (AT_SCREEN(ConfirmUserRequestAlertBox))
GOTO_PREVIOUS();
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/default_acceleration_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -60,4 +60,4 @@ bool DefaultAccelerationScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/developer_menu.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, TOUCH_UI_DEVELOPER_MENU)
#if BOTH(TOUCH_UI_FTDI_EVE, TOUCH_UI_DEVELOPER_MENU)
#include "screens.h"
@ -147,4 +147,4 @@ bool DeveloperMenu::onTouchEnd(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/dialog_box_base_class.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -84,4 +84,4 @@ void DialogBoxBaseClass::onIdle() {
reset_menu_timeout();
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/display_tuning_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -58,4 +58,4 @@ bool DisplayTuningScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/endstop_state_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -147,4 +147,4 @@ void EndstopStatesScreen::onIdle() {
BaseScreen::onIdle();
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/feedrate_percent_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -49,4 +49,4 @@ bool FeedratePercentScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/filament_menu.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && ANY(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
#if ENABLED(TOUCH_UI_FTDI_EVE) && ANY(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
#include "screens.h"
@ -99,4 +99,4 @@ bool FilamentMenu::onTouchEnd(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/filament_runout_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, FILAMENT_RUNOUT_SENSOR)
#if BOTH(TOUCH_UI_FTDI_EVE, FILAMENT_RUNOUT_SENSOR)
#include "screens.h"
@ -63,4 +63,4 @@ bool FilamentRunoutScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/files_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
#include "screen_data.h"
@ -261,4 +261,4 @@ void FilesScreen::onIdle() {
#endif
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/interface_settings_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
#include "screen_data.h"
@ -282,4 +282,4 @@ void InterfaceSettingsScreen::loadSettings(const char *buff) {
}
#endif
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/interface_sounds_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
#include "screen_data.h"
@ -157,4 +157,4 @@ void InterfaceSoundsScreen::onIdle() {
BaseScreen::onIdle();
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/jerk_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, CLASSIC_JERK)
#if BOTH(TOUCH_UI_FTDI_EVE, CLASSIC_JERK)
#include "screens.h"
@ -62,4 +62,4 @@ bool JerkScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI && CLASSIC_JERK
#endif // TOUCH_UI_FTDI_EVE && CLASSIC_JERK

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/junction_deviation_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && DISABLED(CLASSIC_JERK)
#if ENABLED(TOUCH_UI_FTDI_EVE) && DISABLED(CLASSIC_JERK)
#include "screens.h"
@ -51,4 +51,4 @@ bool JunctionDeviationScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI && !CLASSIC_JERK
#endif // TOUCH_UI_FTDI_EVE && !CLASSIC_JERK

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/kill_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -59,4 +59,4 @@ void KillScreen::show(const char *message) {
InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_FAILED, PLAY_SYNCHRONOUS);
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/language_menu.cpp
View File

@ -23,7 +23,7 @@
#include "../config.h"
#include "../language/language.h"
#if ENABLED(LULZBOT_TOUCH_UI) && NUM_LANGUAGES > 1
#if ENABLED(TOUCH_UI_FTDI_EVE) && NUM_LANGUAGES > 1
#include "screens.h"
@ -63,4 +63,4 @@ bool LanguageMenu::onTouchEnd(uint8_t tag) {
return false;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/linear_advance_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, LIN_ADVANCE)
#if BOTH(TOUCH_UI_FTDI_EVE, LIN_ADVANCE)
#include "screens.h"
@ -74,4 +74,4 @@ bool LinearAdvanceScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/lock_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
#include "screen_data.h"
@ -211,4 +211,4 @@ void LockScreen::enable() {
GOTO_SCREEN(LockScreen);
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/main_menu.cpp
View File

@ -23,7 +23,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && !defined(TOUCH_UI_LULZBOT_BIO)
#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO)
#include "screens.h"
@ -131,4 +131,4 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/max_acceleration_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -82,4 +82,4 @@ bool MaxAccelerationScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/max_velocity_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -84,4 +84,4 @@ bool MaxVelocityScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/media_player_screen.cpp
View File

@ -39,7 +39,7 @@
* ffmpeg -i video.avi -i silence.wav -c copy -map 0:v:0 -map 1:a:0 startup.avi
*/
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -165,4 +165,4 @@ void MediaPlayerScreen::playStream(void *obj, media_streamer_func_t *data_stream
#endif // FTDI_API_LEVEL >= 810
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/move_axis_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
#include "screen_data.h"
@ -130,4 +130,4 @@ void MoveAxisScreen::onIdle() {
BaseScreen::onIdle();
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/nozzle_offsets_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && HOTENDS > 1
#if ENABLED(TOUCH_UI_FTDI_EVE) && HOTENDS > 1
#include "screens.h"
@ -70,4 +70,4 @@ bool NozzleOffsetScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/nudge_nozzle_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, BABYSTEPPING)
#if BOTH(TOUCH_UI_FTDI_EVE, BABYSTEPPING)
#include "screens.h"
#include "screen_data.h"
@ -121,4 +121,4 @@ void NudgeNozzleScreen::onIdle() {
reset_menu_timeout();
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/restore_failsafe_dialog_box.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -48,4 +48,4 @@ bool RestoreFailsafeDialogBox::onTouchEnd(uint8_t tag) {
}
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/save_settings_dialog_box.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -62,4 +62,4 @@ void SaveSettingsDialogBox::promptToSaveSettings() {
}
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
#include "screen_data.h"
@ -114,4 +114,4 @@ SCREEN_TABLE {
SCREEN_TABLE_POST
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/spinner_dialog_box.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
#include "screen_data.h"
@ -65,4 +65,4 @@ void SpinnerDialogBox::onIdle() {
}
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/statistics_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, PRINTCOUNTER)
#if BOTH(TOUCH_UI_FTDI_EVE, PRINTCOUNTER)
#include "screens.h"
@ -74,4 +74,4 @@ bool StatisticsScreen::onTouchEnd(uint8_t tag) {
}
}
#endif // LULZBOT_TOUCH_UI && PRINTCOUNTER
#endif // TOUCH_UI_FTDI_EVE && PRINTCOUNTER

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/status_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && DISABLED(TOUCH_UI_LULZBOT_BIO) && DISABLED(TOUCH_UI_COCOA_PRESS)
#if ENABLED(TOUCH_UI_FTDI_EVE) && DISABLED(TOUCH_UI_LULZBOT_BIO) && DISABLED(TOUCH_UI_COCOA_PRESS)
#include "screens.h"
#include "screen_data.h"
@ -410,4 +410,4 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/stepper_bump_sensitivity_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && HAS_TRINAMIC
#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC
#include "screens.h"
@ -74,4 +74,4 @@ bool StepperBumpSensitivityScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI && HAS_TRINAMIC
#endif // TOUCH_UI_FTDI_EVE && HAS_TRINAMIC

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/stepper_current_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && HAS_TRINAMIC
#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC
#include "screens.h"
@ -83,4 +83,4 @@ bool StepperCurrentScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/steps_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -83,4 +83,4 @@ bool StepsScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/stress_test_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, TOUCH_UI_DEVELOPER_MENU)
#if BOTH(TOUCH_UI_FTDI_EVE, TOUCH_UI_DEVELOPER_MENU)
#include "screens.h"
#include "screen_data.h"
@ -149,4 +149,4 @@ void StressTestScreen::onIdle() {
BaseScreen::onIdle();
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/string_format.cpp
View File

@ -21,7 +21,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -80,4 +80,4 @@ void format_position(char *str, float x, float y, float z) {
#pragma GCC diagnostic pop
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/temperature_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -100,4 +100,4 @@ bool TemperatureScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/touch_calibration_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "screens.h"
@ -86,4 +86,4 @@ void TouchCalibrationScreen::onIdle() {
}
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/touch_registers_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, TOUCH_UI_DEVELOPER_MENU)
#if BOTH(TOUCH_UI_FTDI_EVE, TOUCH_UI_DEVELOPER_MENU)
#include "screens.h"
@ -83,4 +83,4 @@ void TouchRegistersScreen::onRedraw(draw_mode_t) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/tune_menu.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && !defined(TOUCH_UI_LULZBOT_BIO)
#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO)
#include "screens.h"
@ -161,4 +161,4 @@ bool TuneMenu::onTouchEnd(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/widget_demo_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, TOUCH_UI_DEVELOPER_MENU)
#if BOTH(TOUCH_UI_FTDI_EVE, TOUCH_UI_DEVELOPER_MENU)
#include "screens.h"
@ -155,4 +155,4 @@ void WidgetsScreen::onIdle() {
BaseScreen::onIdle();
}
#endif // LULZBOT_TOUCH_UI && TOUCH_UI_DEVELOPER_MENU
#endif // TOUCH_UI_FTDI_EVE && TOUCH_UI_DEVELOPER_MENU

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/z_offset_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && HAS_BED_PROBE
#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_BED_PROBE
#include "screens.h"
@ -51,4 +51,4 @@ bool ZOffsetScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI && HAS_BED_PROBE
#endif // TOUCH_UI_FTDI_EVE && HAS_BED_PROBE

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/theme/sounds.cpp
View File

@ -22,7 +22,7 @@
#include "../compat.h"
#if ENABLED(LULZBOT_TOUCH_UI)
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "../ftdi_eve_lib/ftdi_eve_lib.h"
@ -407,4 +407,4 @@ const SoundList::list_t SoundList::list[] = {
const uint8_t SoundList::n = N_ELEMENTS(SoundList::list);
#endif // LULZBOT_TOUCH_UI
#endif // TOUCH_UI_FTDI_EVE