🎨 Reorganize FTDI Touch UI variants (#22066)

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_ADVANCED_SETTINGS_MENU
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_CONFIRM_HOME_E
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_CONFIRM_HOME_XYZ
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_MAIN_MENU
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_PRINTING_DIALOG_BOX
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp

@@ -22,14 +22,14 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_STATUS_SCREEN
 
 #if ENABLED(TOUCH_UI_PORTRAIT)
-  #include "bio_printer_ui_portrait.h"
+  #include "ui_portrait.h"
 #else
-  #include "bio_printer_ui_landscape.h"
+  #include "ui_landscape.h"
 #endif
 
 #define GRID_COLS 2

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_TUNE_MENU
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp

@@ -1,5 +1,5 @@
 /*****************************************
- * cocoa_press_advance_settings_menu.cpp *
+ * cocoa_press/advance_settings_menu.cpp *
  *****************************************/
 
 /****************************************************************************
@@ -21,9 +21,9 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
-#ifdef FTDI_COCOA_ADVANCED_SETTINGS_MENU
+#ifdef COCOA_ADVANCED_SETTINGS_MENU
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -92,4 +92,4 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
   }
   return true;
 }
-#endif // FTDI_COCOA_ADVANCED_SETTINGS_MENU
+#endif // COCOA_ADVANCED_SETTINGS_MENU

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.h

@@ -1,5 +1,5 @@
 /***************************************
- * cocoa_press_advance_settings_menu.h *
+ * cocoa_press/advance_settings_menu.h *
  ***************************************/
 
 /****************************************************************************
@@ -22,8 +22,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_ADVANCED_SETTINGS_MENU
-#define FTDI_COCOA_ADVANCED_SETTINGS_MENU_CLASS AdvancedSettingsMenu
+#define COCOA_ADVANCED_SETTINGS_MENU
+#define COCOA_ADVANCED_SETTINGS_MENU_CLASS AdvancedSettingsMenu
 
 class AdvancedSettingsMenu : public BaseScreen, public CachedScreen<ADVANCED_SETTINGS_SCREEN_CACHE> {
   public:

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp

@@ -1,6 +1,6 @@
-/************************************
- * cocoa_press_unload_cartridge.cpp *
- ************************************/
+/**********************************
+ * cocoa_press/load_chocolate.cpp *
+ **********************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
@@ -22,10 +22,10 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
-#ifdef FTDI_COCOA_LOAD_CHOCOLATE_SCREEN
+#ifdef COCOA_LOAD_CHOCOLATE_SCREEN
 
 #include "cocoa_press_ui.h"
 
@@ -215,4 +215,4 @@ void LoadChocolateScreen::onIdle() {
   }
   BaseScreen::onIdle();
 }
-#endif // FTDI_COCOA_LOAD_CHOCOLATE_SCREEN
+#endif // COCOA_LOAD_CHOCOLATE_SCREEN

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.h

@@ -1,5 +1,5 @@
 /********************************
- * cocoa_press_load_chocolate.h *
+ * cocoa_press/load_chocolate.h *
  ********************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_LOAD_CHOCOLATE_SCREEN
-#define FTDI_COCOA_LOAD_CHOCOLATE_SCREEN_CLASS LoadChocolateScreen
+#define COCOA_LOAD_CHOCOLATE_SCREEN
+#define COCOA_LOAD_CHOCOLATE_SCREEN_CLASS LoadChocolateScreen
 
 struct LoadChocolateScreenData {
   uint8_t repeat_tag;

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp

@@ -1,5 +1,5 @@
 /*****************************
- * cocoa_press_main_menu.cpp *
+ * cocoa_press/main_menu.cpp *
  *****************************/
 
 /****************************************************************************
@@ -22,9 +22,9 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
-#ifdef FTDI_COCOA_MAIN_MENU
+#ifdef COCOA_MAIN_MENU
 
 using namespace FTDI;
 using namespace Theme;
@@ -97,4 +97,4 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
   return true;
 }
 
-#endif // FTDI_COCOA_MAIN_MENU
+#endif // COCOA_MAIN_MENU

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.h

@@ -1,5 +1,5 @@
 /***************************
- * cocoa_press_main_menu.h *
+ * cocoa_press/main_menu.h *
  ***************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_MAIN_MENU
-#define FTDI_COCOA_MAIN_MENU_CLASS MainMenu
+#define COCOA_MAIN_MENU
+#define COCOA_MAIN_MENU_CLASS MainMenu
 
 class MainMenu : public BaseScreen, public CachedScreen<MENU_SCREEN_CACHE> {
   public:

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.cpp

@@ -1,5 +1,5 @@
 /*********************************
- * cocoa_press_move_e_screen.cpp *
+ * cocoa_press/move_e_screen.cpp *
  *********************************/
 
 /****************************************************************************
@@ -22,10 +22,10 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
-#ifdef FTDI_COCOA_MOVE_E_SCREEN
+#ifdef COCOA_MOVE_E_SCREEN
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -60,4 +60,4 @@ void MoveEScreen::onIdle() {
   }
   BaseScreen::onIdle();
 }
-#endif // FTDI_COCOA_MOVE_E_SCREEN
+#endif // COCOA_MOVE_E_SCREEN

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.h

@@ -1,5 +1,5 @@
 /*******************************
- * cocoa_press_move_e_screen.h *
+ * cocoa_press/move_e_screen.h *
  *******************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_MOVE_E_SCREEN
-#define FTDI_COCOA_MOVE_E_SCREEN_CLASS MoveEScreen
+#define COCOA_MOVE_E_SCREEN
+#define COCOA_MOVE_E_SCREEN_CLASS MoveEScreen
 
 class MoveEScreen : public BaseMoveAxisScreen, public CachedScreen<MOVE_E_SCREEN_CACHE> {
   public:

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.cpp

@@ -1,5 +1,5 @@
 /***********************************
- * cocoa_press_move_xyz_screen.cpp *
+ * cocoa_press/move_xyz_screen.cpp *
  ***********************************/
 
 /****************************************************************************
@@ -22,10 +22,10 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
-#ifdef FTDI_COCOA_MOVE_XYZ_SCREEN
+#ifdef COCOA_MOVE_XYZ_SCREEN
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -49,4 +49,4 @@ void MoveXYZScreen::onIdle() {
   }
   BaseScreen::onIdle();
 }
-#endif // FTDI_COCOA_MOVE_XYZ_SCREEN
+#endif // COCOA_MOVE_XYZ_SCREEN

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.h

@@ -1,5 +1,5 @@
 /*********************************
- * cocoa_press_move_xyz_screen.h *
+ * cocoa_press/move_xyz_screen.h *
  *********************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_MOVE_XYZ_SCREEN
-#define FTDI_COCOA_MOVE_XYZ_SCREEN_CLASS MoveXYZScreen
+#define COCOA_MOVE_XYZ_SCREEN
+#define COCOA_MOVE_XYZ_SCREEN_CLASS MoveXYZScreen
 
 class MoveXYZScreen : public BaseMoveAxisScreen, public CachedScreen<MOVE_XYZ_SCREEN_CACHE> {
   public:

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp

@@ -1,5 +1,5 @@
 /********************************
- * cocoa_press_preheat_menu.cpp *
+ * cocoa_press/preheat_menu.cpp *
  ********************************/
 
 /****************************************************************************
@@ -20,9 +20,9 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
-#ifdef FTDI_COCOA_PREHEAT_MENU
+#ifdef COCOA_PREHEAT_MENU
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -113,4 +113,4 @@ bool PreheatMenu::onTouchEnd(uint8_t tag) {
   return true;
 }
 
-#endif // FTDI_COCOA_PREHEAT_MENU
+#endif // COCOA_PREHEAT_MENU

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.h

@@ -1,5 +1,5 @@
 /******************************
- * cocoa_press_preheat_menu.h *
+ * cocoa_press/preheat_menu.h *
  ******************************/
 
 /****************************************************************************
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_PREHEAT_MENU
-#define FTDI_COCOA_PREHEAT_MENU_CLASS PreheatMenu
+#define COCOA_PREHEAT_MENU
+#define COCOA_PREHEAT_MENU_CLASS PreheatMenu
 
 class PreheatMenu : public BaseScreen, public CachedScreen<PREHEAT_MENU_CACHE> {
   public:

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp

@@ -1,6 +1,6 @@
-/****************************
- * preheat_timer_screen.cpp *
- ****************************/
+/***************************************
+ * cocoapress/preheat_timer_screen.cpp *
+ ***************************************/
 
 /****************************************************************************
  *   Written By Marcio Teixeira 2019 - Cocoa Press                          *
@@ -20,10 +20,10 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
-#ifdef FTDI_COCOA_PREHEAT_SCREEN
+#ifdef COCOA_PREHEAT_SCREEN
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -168,4 +168,4 @@ void PreheatTimerScreen::onIdle() {
   BaseScreen::onIdle();
 }
 
-#endif // FTDI_COCOA_PREHEAT_SCREEN
+#endif // COCOA_PREHEAT_SCREEN

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.h

@@ -1,5 +1,5 @@
 /*********************************
- * cocoapress_preheat_screen.cpp *
+ * cocoapress/preheat_screen.cpp *
  *********************************/
 
 /****************************************************************************
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_PREHEAT_SCREEN
-#define FTDI_COCOA_PREHEAT_SCREEN_CLASS PreheatTimerScreen
+#define COCOA_PREHEAT_SCREEN
+#define COCOA_PREHEAT_SCREEN_CLASS PreheatTimerScreen
 
 struct PreheatTimerScreenData {
     uint32_t start_ms;

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp

@@ -1,5 +1,5 @@
 /*********************************
- * cocoa_press_status_screen.cpp *
+ * cocoa_press/status_screen.cpp *
  *********************************/
 
 /****************************************************************************
@@ -22,9 +22,9 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
-#ifdef FTDI_COCOA_STATUS_SCREEN
+#ifdef COCOA_STATUS_SCREEN
 
 #include "cocoa_press_ui.h"
 
@@ -294,4 +294,4 @@ void StatusScreen::onIdle() {
   }
 }
 
-#endif // FTDI_COCOA_STATUS_SCREEN
+#endif // COCOA_STATUS_SCREEN

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h → Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h

@@ -1,5 +1,5 @@
 /*******************************
- * cocoa_press_status_screen.h *
+ * cocoa_press/status_screen.h *
  *******************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_STATUS_SCREEN
-#define FTDI_COCOA_STATUS_SCREEN_CLASS StatusScreen
+#define COCOA_STATUS_SCREEN
+#define COCOA_STATUS_SCREEN_CLASS StatusScreen
 
 class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE> {
   private:

Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp

@@ -28,7 +28,7 @@
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
-#include "screens/screens.h"
+#include "screens.h"
 
 namespace ExtUI {
   using namespace Theme;

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_ABOUT_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_ADVANCED_SETTINGS_MENU
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp

@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_ALERT_DIALOG_BOX
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/backlash_compensation_screen.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BACKLASH_COMP_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp

@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_BASE_NUMERIC_ADJ_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BASE_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_base.cpp

@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BED_MESH_BASE
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp

@@ -20,8 +20,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_BED_MESH_EDIT_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp

@@ -20,8 +20,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_BED_MESH_VIEW_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.cpp

@@ -22,7 +22,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BOOT_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/case_light_screen.cpp

@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CASE_LIGHT_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp

@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_CHANGE_FILAMENT_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CONFIRM_ABORT_PRINT_DIALOG_BOX
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CONFIRM_AUTO_CALIBRATION_DIALOG_BOX
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_erase_flash_dialog_box.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CONFIRM_ERASE_FLASH_DIALOG_BOX
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp

@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_CONFIRM_START_PRINT_DIALOG_BOX
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp

@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_CONFIRM_USER_REQUEST_ALERT_BOX
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CUSTOM_USER_MENUS
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/default_acceleration_screen.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_DEFAULT_ACCELERATION_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_DEVELOPER_MENU
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_DIALOG_BOX_BASE_CLASS
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/display_tuning_screen.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_DISPLAY_TUNING_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_ENDSTOP_STATE_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/feedrate_percent_screen.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_FEEDRATE_PERCENT_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_FILAMENT_MENU
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_FILAMENT_RUNOUT_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp

@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_FILES_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/flow_percent_screen.cpp

@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_FLOW_PERCENT_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp

@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_INTERFACE_SETTINGS_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp

@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_INTERFACE_SOUNDS_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/jerk_screen.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_JERK_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/junction_deviation_screen.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_JUNCTION_DEVIATION_SCREEN
 

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.cpp → Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_KILL_SCREEN