MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Update TOUCH_UI_LULZBOT_BIO wrappers

Browse Source
This commit is contained in:
Scott Lahteine 2020-11-24 18:29:11 -06:00
parent 0eae28a663
commit e38abef720
9 changed files with 25 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
View File

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

4
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
View File

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

5
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
View File

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

5
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
View File

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

4
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
View File

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

10
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h" #include "../config.h"
#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO) #if BOTH(TOUCH_UI_FTDI_EVE, TOUCH_UI_LULZBOT_BIO)
#include "screens.h" #include "screens.h"
@ -78,11 +78,7 @@ void BioPrintingDialogBox::draw_interaction_buttons(draw_mode_t what) {
.font(font_medium) .font(font_medium)
.colors(isPrinting() ? action_btn : normal_btn) .colors(isPrinting() ? action_btn : normal_btn)
.tag(2).button(BTN_POS(1,9), BTN_SIZE(1,1), F("Menu")) .tag(2).button(BTN_POS(1,9), BTN_SIZE(1,1), F("Menu"))
#if ENABLED(SDSUPPORT) .enabled(isPrinting() ? TERN0(SDSUPPORT, isPrintingFromMedia()) : 1)
.enabled(isPrinting() ? isPrintingFromMedia() : 1)
#else
.enabled(isPrinting() ? 0 : 1)
#endif
.tag(3) .tag(3)
.colors(isPrinting() ? normal_btn : action_btn) .colors(isPrinting() ? normal_btn : action_btn)
.button( BTN_POS(2,9), BTN_SIZE(1,1), isPrinting() ? F("Cancel") : F("Back")); .button( BTN_POS(2,9), BTN_SIZE(1,1), isPrinting() ? F("Cancel") : F("Back"));
@ -152,4 +148,4 @@ void BioPrintingDialogBox::show() {
GOTO_SCREEN(BioPrintingDialogBox); GOTO_SCREEN(BioPrintingDialogBox);
} }
#endif // TOUCH_UI_FTDI_EVE #endif // TOUCH_UI_FTDI_EVE && TOUCH_UI_LULZBOT_BIO

4
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
View File

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

32
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
View File

@ -23,7 +23,7 @@
#include "../config.h" #include "../config.h"
#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO) #if ENABLED(TOUCH_UI_FTDI_EVE) && DISABLED(TOUCH_UI_LULZBOT_BIO)
#include "screens.h" #include "screens.h"
@ -75,34 +75,14 @@ void MainMenu::onRedraw(draw_mode_t what) {
1 1
#endif #endif
) )
.tag(3).button( CLEAN_NOZZLE_POS, GET_TEXT_F( .tag(3).button( CLEAN_NOZZLE_POS, GET_TEXT_F(TERN(TOUCH_UI_COCOA_PRESS, MSG_PREHEAT_1, MSG_CLEAN_NOZZLE)))
#if ENABLED(TOUCH_UI_COCOA_PRESS)
MSG_PREHEAT_1
#else
MSG_CLEAN_NOZZLE
#endif
))
.tag(4).button( MOVE_AXIS_POS, GET_TEXT_F(MSG_MOVE_AXIS)) .tag(4).button( MOVE_AXIS_POS, GET_TEXT_F(MSG_MOVE_AXIS))
.tag(5).button( DISABLE_STEPPERS_POS, GET_TEXT_F(MSG_DISABLE_STEPPERS)) .tag(5).button( DISABLE_STEPPERS_POS, GET_TEXT_F(MSG_DISABLE_STEPPERS))
.tag(6).button( TEMPERATURE_POS, GET_TEXT_F(MSG_TEMPERATURE)) .tag(6).button( TEMPERATURE_POS, GET_TEXT_F(MSG_TEMPERATURE))
.enabled( .enabled(IF_DISABLED(TOUCH_UI_LULZBOT_BIO, 1))
#if DISABLED(TOUCH_UI_LULZBOT_BIO) .tag(7).button( FILAMENTCHANGE_POS, GET_TEXT_F(TERN(TOUCH_UI_COCOA_PRESS, MSG_CASE_LIGHT, MSG_FILAMENTCHANGE))
1
#endif
)
.tag(7).button( FILAMENTCHANGE_POS, GET_TEXT_F(
#if ENABLED(TOUCH_UI_COCOA_PRESS)
MSG_CASE_LIGHT
#else
MSG_FILAMENTCHANGE
#endif
))
.tag(8).button( ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS)) .tag(8).button( ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
.enabled( .enabled(TERN_(HAS_LEVELING, 1))
#ifdef HAS_LEVELING
1
#endif
)
.tag(9).button( LEVELING_POS, GET_TEXT_F(MSG_LEVELING)) .tag(9).button( LEVELING_POS, GET_TEXT_F(MSG_LEVELING))
.tag(10).button( ABOUT_PRINTER_POS, GET_TEXT_F(MSG_INFO_MENU)) .tag(10).button( ABOUT_PRINTER_POS, GET_TEXT_F(MSG_INFO_MENU))
.colors(action_btn) .colors(action_btn)
@ -140,4 +120,4 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
return true; return true;
} }
#endif // TOUCH_UI_FTDI_EVE #endif // TOUCH_UI_FTDI_EVE && !TOUCH_UI_LULZBOT_BIO

2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h" #include "../config.h"
#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO) #if ENABLED(TOUCH_UI_FTDI_EVE) && DISABLED(TOUCH_UI_LULZBOT_BIO)
#include "screens.h" #include "screens.h"