🎨 Reorganize FTDI Touch UI variants (MarlinFirmware#22066)

ptoal · Dec 16, 2021 · 1603acf · 1603acf
1 parent 15de345
commit 1603acf
Show file tree

Hide file tree

Showing 159 changed files with 237 additions and 372 deletions.
diff --git a/...ouch_ui/screens/bio_advanced_settings.cpp → ...touch_ui/bioprinter/advanced_settings.cpp b/...ouch_ui/screens/bio_advanced_settings.cpp → ...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
 

diff --git a/..._touch_ui/screens/bio_advanced_settings.h → ...e_touch_ui/bioprinter/advanced_settings.h b/..._touch_ui/screens/bio_advanced_settings.h → ...e_touch_ui/bioprinter/advanced_settings.h
diff --git a/...e_touch_ui/screens/bio_confirm_home_e.cpp → ...ve_touch_ui/bioprinter/confirm_home_e.cpp b/...e_touch_ui/screens/bio_confirm_home_e.cpp → ...ve_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
 

diff --git a/...eve_touch_ui/screens/bio_confirm_home_e.h → ..._eve_touch_ui/bioprinter/confirm_home_e.h b/...eve_touch_ui/screens/bio_confirm_home_e.h → ..._eve_touch_ui/bioprinter/confirm_home_e.h
diff --git a/...touch_ui/screens/bio_confirm_home_xyz.cpp → ..._touch_ui/bioprinter/confirm_home_xyz.cpp b/...touch_ui/screens/bio_confirm_home_xyz.cpp → ..._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
 

diff --git a/...e_touch_ui/screens/bio_confirm_home_xyz.h → ...ve_touch_ui/bioprinter/confirm_home_xyz.h b/...e_touch_ui/screens/bio_confirm_home_xyz.h → ...ve_touch_ui/bioprinter/confirm_home_xyz.h
diff --git a/...di_eve_touch_ui/screens/bio_main_menu.cpp → ...tdi_eve_touch_ui/bioprinter/main_menu.cpp b/...di_eve_touch_ui/screens/bio_main_menu.cpp → ...tdi_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
 

diff --git a/...ftdi_eve_touch_ui/screens/bio_main_menu.h → .../ftdi_eve_touch_ui/bioprinter/main_menu.h b/...ftdi_eve_touch_ui/screens/bio_main_menu.h → .../ftdi_eve_touch_ui/bioprinter/main_menu.h
diff --git a/...ch_ui/screens/bio_printing_dialog_box.cpp → ...uch_ui/bioprinter/printing_dialog_box.cpp b/...ch_ui/screens/bio_printing_dialog_box.cpp → ...uch_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
 

diff --git a/...ouch_ui/screens/bio_printing_dialog_box.h → ...touch_ui/bioprinter/printing_dialog_box.h b/...ouch_ui/screens/bio_printing_dialog_box.h → ...touch_ui/bioprinter/printing_dialog_box.h
diff --git a/...ve_touch_ui/screens/bio_status_screen.cpp → ...eve_touch_ui/bioprinter/status_screen.cpp b/...ve_touch_ui/screens/bio_status_screen.cpp → ...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

diff --git a/..._eve_touch_ui/screens/bio_status_screen.h → ...i_eve_touch_ui/bioprinter/status_screen.h b/..._eve_touch_ui/screens/bio_status_screen.h → ...i_eve_touch_ui/bioprinter/status_screen.h
diff --git a/...di_eve_touch_ui/screens/bio_tune_menu.cpp → ...tdi_eve_touch_ui/bioprinter/tune_menu.cpp b/...di_eve_touch_ui/screens/bio_tune_menu.cpp → ...tdi_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
 

diff --git a/...ftdi_eve_touch_ui/screens/bio_tune_menu.h → .../ftdi_eve_touch_ui/bioprinter/tune_menu.h b/...ftdi_eve_touch_ui/screens/bio_tune_menu.h → .../ftdi_eve_touch_ui/bioprinter/tune_menu.h
diff --git a/...uch_ui/screens/bio_printer_ui_landscape.h → ...di_eve_touch_ui/bioprinter/ui_landscape.h b/...uch_ui/screens/bio_printer_ui_landscape.h → ...di_eve_touch_ui/bioprinter/ui_landscape.h
diff --git a/...ouch_ui/screens/bio_printer_ui_portrait.h → ...tdi_eve_touch_ui/bioprinter/ui_portrait.h b/...ouch_ui/screens/bio_printer_ui_portrait.h → ...tdi_eve_touch_ui/bioprinter/ui_portrait.h
diff --git a/...ns/cocoa_press_advanced_settings_menu.cpp → ...ui/cocoa_press/advanced_settings_menu.cpp b/...ns/cocoa_press_advanced_settings_menu.cpp → ...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
diff --git a/...eens/cocoa_press_advanced_settings_menu.h → ...h_ui/cocoa_press/advanced_settings_menu.h b/...eens/cocoa_press_advanced_settings_menu.h → ...h_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:

diff --git a/...tdi_eve_touch_ui/screens/cocoa_press_ui.h → ...eve_touch_ui/cocoa_press/cocoa_press_ui.h b/...tdi_eve_touch_ui/screens/cocoa_press_ui.h → ...eve_touch_ui/cocoa_press/cocoa_press_ui.h
diff --git a/...ui/screens/cocoa_press_load_chocolate.cpp → ...e_touch_ui/cocoa_press/load_chocolate.cpp b/...ui/screens/cocoa_press_load_chocolate.cpp → ...e_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
diff --git a/...h_ui/screens/cocoa_press_load_chocolate.h → ...eve_touch_ui/cocoa_press/load_chocolate.h b/...h_ui/screens/cocoa_press_load_chocolate.h → ...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;

diff --git a/...ouch_ui/screens/cocoa_press_main_menu.cpp → ...di_eve_touch_ui/cocoa_press/main_menu.cpp b/...ouch_ui/screens/cocoa_press_main_menu.cpp → ...di_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
diff --git a/..._touch_ui/screens/cocoa_press_main_menu.h → ...ftdi_eve_touch_ui/cocoa_press/main_menu.h b/..._touch_ui/screens/cocoa_press_main_menu.h → ...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:

diff --git a/..._ui/screens/cocoa_press_move_e_screen.cpp → ...ve_touch_ui/cocoa_press/move_e_screen.cpp b/..._ui/screens/cocoa_press_move_e_screen.cpp → ...ve_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
diff --git a/...ch_ui/screens/cocoa_press_move_e_screen.h → ..._eve_touch_ui/cocoa_press/move_e_screen.h b/...ch_ui/screens/cocoa_press_move_e_screen.h → ..._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:

diff --git a/...i/screens/cocoa_press_move_xyz_screen.cpp → ..._touch_ui/cocoa_press/move_xyz_screen.cpp b/...i/screens/cocoa_press_move_xyz_screen.cpp → ..._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
diff --git a/..._ui/screens/cocoa_press_move_xyz_screen.h → ...ve_touch_ui/cocoa_press/move_xyz_screen.h b/..._ui/screens/cocoa_press_move_xyz_screen.h → ...ve_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:

diff --git a/...h_ui/screens/cocoa_press_preheat_menu.cpp → ...eve_touch_ui/cocoa_press/preheat_menu.cpp b/...h_ui/screens/cocoa_press_preheat_menu.cpp → ...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
diff --git a/...uch_ui/screens/cocoa_press_preheat_menu.h → ...i_eve_touch_ui/cocoa_press/preheat_menu.h b/...uch_ui/screens/cocoa_press_preheat_menu.h → ...i_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:

diff --git a/...ui/screens/cocoa_press_preheat_screen.cpp → ...e_touch_ui/cocoa_press/preheat_screen.cpp b/...ui/screens/cocoa_press_preheat_screen.cpp → ...e_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
diff --git a/...h_ui/screens/cocoa_press_preheat_screen.h → ...eve_touch_ui/cocoa_press/preheat_screen.h b/...h_ui/screens/cocoa_press_preheat_screen.h → ...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;