sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix FTDI Eve Touch UI (#22530)

Browse Source
This commit is contained in:
Marcio T
2021-08-07 21:23:06 -06:00
committed by GitHub
parent c1a533b45e
commit 26b1ed7c2a
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
View File

@@ -42,7 +42,7 @@ namespace FTDI {
strcat_P(str, (const char*) units); strcat_P(str, (const char*) units);
} }
cmd.text(VAL_POS, str); cmd.tag(0).text(VAL_POS, str);
} }
void draw_adjuster(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, uint8_t tag, float value, progmem_str units, int8_t width, uint8_t precision, draw_mode_t what) { void draw_adjuster(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, uint8_t tag, float value, progmem_str units, int8_t width, uint8_t precision, draw_mode_t what) {

3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
View File

@@ -36,6 +36,7 @@ using namespace Theme;
constexpr static SpinnerDialogBoxData &mydata = screen_data.SpinnerDialogBox; constexpr static SpinnerDialogBoxData &mydata = screen_data.SpinnerDialogBox;
void SpinnerDialogBox::onEntry() { void SpinnerDialogBox::onEntry() {
UIScreen::onEntry();
mydata.auto_hide = true; mydata.auto_hide = true;
} }
@@ -98,7 +99,7 @@ void SpinnerDialogBox::enqueueAndWait(progmem_str message, char *commands) {
} }
void SpinnerDialogBox::onIdle() { void SpinnerDialogBox::onIdle() {
if (mydata.auto_hide && !commandsInQueue()) { if (mydata.auto_hide && !commandsInQueue() && TERN1(HOST_KEEPALIVE_FEATURE, GcodeSuite::busy_state == GcodeSuite::NOT_BUSY)) {
mydata.auto_hide = false; mydata.auto_hide = false;
hide(); hide();
} }

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
View File

@@ -29,7 +29,7 @@ struct SpinnerDialogBoxData {
bool auto_hide; bool auto_hide;
}; };
class SpinnerDialogBox : public BaseScreen { class SpinnerDialogBox : public UIScreen {
public: public:
static void onEntry(); static void onEntry();
static void onExit(); static void onExit();