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

Jump to bottom

Reorganize FTDI Touch UI variants #22066

Merged
merged 1 commit into from
Jun 7, 2021
Merged

Reorganize FTDI Touch UI variants #22066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...ouch_ui/screens/bio_advanced_settings.cpp → ...touch_ui/bioprinter/advanced_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
****************************************************************************/

#include "../config.h"
#include "screens.h"
#include "../screens.h"

#ifdef FTDI_BIO_ADVANCED_SETTINGS_MENU

Expand Down
0 ..._touch_ui/screens/bio_advanced_settings.h → ...e_touch_ui/bioprinter/advanced_settings.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...e_touch_ui/screens/bio_confirm_home_e.cpp → ...ve_touch_ui/bioprinter/confirm_home_e.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
****************************************************************************/

#include "../config.h"
#include "screens.h"
#include "../screens.h"

#ifdef FTDI_BIO_CONFIRM_HOME_E

Expand Down
0 ...eve_touch_ui/screens/bio_confirm_home_e.h → ..._eve_touch_ui/bioprinter/confirm_home_e.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...touch_ui/screens/bio_confirm_home_xyz.cpp → ..._touch_ui/bioprinter/confirm_home_xyz.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
****************************************************************************/

#include "../config.h"
#include "screens.h"
#include "../screens.h"

#ifdef FTDI_BIO_CONFIRM_HOME_XYZ

Expand Down
0 ...e_touch_ui/screens/bio_confirm_home_xyz.h → ...ve_touch_ui/bioprinter/confirm_home_xyz.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...di_eve_touch_ui/screens/bio_main_menu.cpp → ...tdi_eve_touch_ui/bioprinter/main_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
****************************************************************************/

#include "../config.h"
#include "screens.h"
#include "../screens.h"

#ifdef FTDI_BIO_MAIN_MENU

Expand Down
0 ...ftdi_eve_touch_ui/screens/bio_main_menu.h → .../ftdi_eve_touch_ui/bioprinter/main_menu.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ch_ui/screens/bio_printing_dialog_box.cpp → ...uch_ui/bioprinter/printing_dialog_box.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
****************************************************************************/

#include "../config.h"
#include "screens.h"
#include "../screens.h"

#ifdef FTDI_BIO_PRINTING_DIALOG_BOX

Expand Down
0 ...ouch_ui/screens/bio_printing_dialog_box.h → ...touch_ui/bioprinter/printing_dialog_box.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ve_touch_ui/screens/bio_status_screen.cpp → ...eve_touch_ui/bioprinter/status_screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ..._eve_touch_ui/screens/bio_status_screen.h → ...i_eve_touch_ui/bioprinter/status_screen.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...di_eve_touch_ui/screens/bio_tune_menu.cpp → ...tdi_eve_touch_ui/bioprinter/tune_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
****************************************************************************/

#include "../config.h"
#include "screens.h"
#include "../screens.h"

#ifdef FTDI_BIO_TUNE_MENU

Expand Down
0 ...ftdi_eve_touch_ui/screens/bio_tune_menu.h → .../ftdi_eve_touch_ui/bioprinter/tune_menu.h
View file
Open in desktop
File renamed without changes.
0 ...uch_ui/screens/bio_printer_ui_landscape.h → ...di_eve_touch_ui/bioprinter/ui_landscape.h
View file
Open in desktop
File renamed without changes.
0 ...ouch_ui/screens/bio_printer_ui_portrait.h → ...tdi_eve_touch_ui/bioprinter/ui_portrait.h
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...ns/cocoa_press_advanced_settings_menu.cpp → ...ui/cocoa_press/advanced_settings_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*****************************************
* cocoa_press_advance_settings_menu.cpp *
* cocoa_press/advance_settings_menu.cpp *
*****************************************/

/****************************************************************************
Expand All @@ -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;
Expand Down Expand Up @@ -92,4 +92,4 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
}
return true;
}
#endif // FTDI_COCOA_ADVANCED_SETTINGS_MENU
#endif // COCOA_ADVANCED_SETTINGS_MENU
6 changes: 3 additions & 3 deletions ...eens/cocoa_press_advanced_settings_menu.h → ...h_ui/cocoa_press/advanced_settings_menu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***************************************
* cocoa_press_advance_settings_menu.h *
* cocoa_press/advance_settings_menu.h *
***************************************/

/****************************************************************************
Expand All @@ -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:
Expand Down
0 ...tdi_eve_touch_ui/screens/cocoa_press_ui.h → ...eve_touch_ui/cocoa_press/cocoa_press_ui.h
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ...ui/screens/cocoa_press_load_chocolate.cpp → ...e_touch_ui/cocoa_press/load_chocolate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/************************************
* cocoa_press_unload_cartridge.cpp *
************************************/
/**********************************
* cocoa_press/load_chocolate.cpp *
**********************************/

/****************************************************************************
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *
Expand All @@ -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"

Expand Down Expand Up @@ -215,4 +215,4 @@ void LoadChocolateScreen::onIdle() {
}
BaseScreen::onIdle();
}
#endif // FTDI_COCOA_LOAD_CHOCOLATE_SCREEN
#endif // COCOA_LOAD_CHOCOLATE_SCREEN
6 changes: 3 additions & 3 deletions ...h_ui/screens/cocoa_press_load_chocolate.h → ...eve_touch_ui/cocoa_press/load_chocolate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************
* cocoa_press_load_chocolate.h *
* cocoa_press/load_chocolate.h *
********************************/

/****************************************************************************
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...ouch_ui/screens/cocoa_press_main_menu.cpp → ...di_eve_touch_ui/cocoa_press/main_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*****************************
* cocoa_press_main_menu.cpp *
* cocoa_press/main_menu.cpp *
*****************************/

/****************************************************************************
Expand All @@ -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;
Expand Down Expand Up @@ -97,4 +97,4 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
return true;
}

#endif // FTDI_COCOA_MAIN_MENU
#endif // COCOA_MAIN_MENU
6 changes: 3 additions & 3 deletions ..._touch_ui/screens/cocoa_press_main_menu.h → ...ftdi_eve_touch_ui/cocoa_press/main_menu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***************************
* cocoa_press_main_menu.h *
* cocoa_press/main_menu.h *
***************************/

/****************************************************************************
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions ..._ui/screens/cocoa_press_move_e_screen.cpp → ...ve_touch_ui/cocoa_press/move_e_screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*********************************
* cocoa_press_move_e_screen.cpp *
* cocoa_press/move_e_screen.cpp *
*********************************/

/****************************************************************************
Expand All @@ -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;
Expand Down Expand Up @@ -60,4 +60,4 @@ void MoveEScreen::onIdle() {
}
BaseScreen::onIdle();
}
#endif // FTDI_COCOA_MOVE_E_SCREEN
#endif // COCOA_MOVE_E_SCREEN
6 changes: 3 additions & 3 deletions ...ch_ui/screens/cocoa_press_move_e_screen.h → ..._eve_touch_ui/cocoa_press/move_e_screen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************
* cocoa_press_move_e_screen.h *
* cocoa_press/move_e_screen.h *
*******************************/

/****************************************************************************
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions ...i/screens/cocoa_press_move_xyz_screen.cpp → ..._touch_ui/cocoa_press/move_xyz_screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***********************************
* cocoa_press_move_xyz_screen.cpp *
* cocoa_press/move_xyz_screen.cpp *
***********************************/

/****************************************************************************
Expand All @@ -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;
Expand All @@ -49,4 +49,4 @@ void MoveXYZScreen::onIdle() {
}
BaseScreen::onIdle();
}
#endif // FTDI_COCOA_MOVE_XYZ_SCREEN
#endif // COCOA_MOVE_XYZ_SCREEN
6 changes: 3 additions & 3 deletions ..._ui/screens/cocoa_press_move_xyz_screen.h → ...ve_touch_ui/cocoa_press/move_xyz_screen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*********************************
* cocoa_press_move_xyz_screen.h *
* cocoa_press/move_xyz_screen.h *
*********************************/

/****************************************************************************
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions ...h_ui/screens/cocoa_press_preheat_menu.cpp → ...eve_touch_ui/cocoa_press/preheat_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************
* cocoa_press_preheat_menu.cpp *
* cocoa_press/preheat_menu.cpp *
********************************/

/****************************************************************************
Expand All @@ -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;
Expand Down Expand Up @@ -113,4 +113,4 @@ bool PreheatMenu::onTouchEnd(uint8_t tag) {
return true;
}

#endif // FTDI_COCOA_PREHEAT_MENU
#endif // COCOA_PREHEAT_MENU
6 changes: 3 additions & 3 deletions ...uch_ui/screens/cocoa_press_preheat_menu.h → ...i_eve_touch_ui/cocoa_press/preheat_menu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/******************************
* cocoa_press_preheat_menu.h *
* cocoa_press/preheat_menu.h *
******************************/

/****************************************************************************
Expand All @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions ...ui/screens/cocoa_press_preheat_screen.cpp → ...e_touch_ui/cocoa_press/preheat_screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************
* preheat_timer_screen.cpp *
****************************/
/***************************************
* cocoapress/preheat_timer_screen.cpp *
***************************************/

/****************************************************************************
* Written By Marcio Teixeira 2019 - Cocoa Press *
Expand All @@ -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;
Expand Down Expand Up @@ -168,4 +168,4 @@ void PreheatTimerScreen::onIdle() {
BaseScreen::onIdle();
}

#endif // FTDI_COCOA_PREHEAT_SCREEN
#endif // COCOA_PREHEAT_SCREEN
6 changes: 3 additions & 3 deletions ...h_ui/screens/cocoa_press_preheat_screen.h → ...eve_touch_ui/cocoa_press/preheat_screen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*********************************
* cocoapress_preheat_screen.cpp *
* cocoapress/preheat_screen.cpp *
*********************************/

/****************************************************************************
Expand All @@ -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;
Expand Down
Loading