Browse Source
Clear menu history for browse media on insert (#20236)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
vanilla_fb_2.0.x
qwewer0
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
5 additions and
3 deletions
-
Marlin/src/lcd/marlinui.cpp
-
Marlin/src/lcd/menu/menu.cpp
-
Marlin/src/lcd/menu/menu.h
-
Marlin/src/lcd/menu/menu_media.cpp
|
|
@ -1625,6 +1625,7 @@ void MarlinUI::update() { |
|
|
|
if (old_status < 2) { |
|
|
|
TERN_(EXTENSIBLE_UI, ExtUI::onMediaInserted()); // ExtUI response
|
|
|
|
#if ENABLED(BROWSE_MEDIA_ON_INSERT) |
|
|
|
clear_menu_history(); |
|
|
|
quick_feedback(); |
|
|
|
goto_screen(MEDIA_MENU_GATEWAY); |
|
|
|
#else |
|
|
|
|
|
@ -206,8 +206,8 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co |
|
|
|
screen_items = items; |
|
|
|
if (on_status_screen()) { |
|
|
|
defer_status_screen(false); |
|
|
|
clear_menu_history(); |
|
|
|
TERN_(AUTO_BED_LEVELING_UBL, ubl.lcd_map_control = false); |
|
|
|
screen_history_depth = 0; |
|
|
|
} |
|
|
|
|
|
|
|
clear_lcd(); |
|
|
|
|
|
@ -249,3 +249,6 @@ void _lcd_draw_homing(); |
|
|
|
#if ENABLED(TOUCH_SCREEN_CALIBRATION) |
|
|
|
void touch_screen_calibration(); |
|
|
|
#endif |
|
|
|
|
|
|
|
extern uint8_t screen_history_depth; |
|
|
|
inline void clear_menu_history() { screen_history_depth = 0; } |
|
|
|
|
|
@ -104,8 +104,6 @@ class MenuItem_sdfolder : public MenuItem_sdbase { |
|
|
|
} |
|
|
|
}; |
|
|
|
|
|
|
|
extern uint8_t screen_history_depth; |
|
|
|
|
|
|
|
void menu_media() { |
|
|
|
ui.encoder_direction_menus(); |
|
|
|
|
|
|
|