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

SDIO storage Read/write, M21, and print from media menu selectable access #25683

Open
wants to merge 26 commits into
base: bugfix-2.1.x
Choose a base branch
from
+83 −20
Open

SDIO storage Read/write, M21, and print from media menu selectable access #25683

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
152c3c6
Update SdVolume.h
ansonl Apr 15, 2023
173c007
Update Conditionals_post.h
ansonl Apr 15, 2023
7fda542
Update cardreader.h
ansonl Apr 15, 2023
8f41dcf
Update cardreader.cpp
ansonl Apr 15, 2023
7a40ece
Update language_en.h
ansonl Apr 15, 2023
a5f50bd
Update menu_media.cpp
ansonl Apr 15, 2023
7978fc7
Update Configuration.h
ansonl Apr 15, 2023
0146597
Update Configuration_adv.h
ansonl Apr 15, 2023
20d800f
Update cardreader.h
ansonl Apr 15, 2023
b9a919c
Update M21_M22.cpp
ansonl Apr 15, 2023
71aed05
already defined in configuration_adv.h
thinkyhead Apr 16, 2023
64f6773
Tweaks to M21
thinkyhead Apr 16, 2023
7cdecba
shared lambda
thinkyhead Apr 16, 2023
baf4fbe
DEFAULT_VOLUME is obsolete
thinkyhead Apr 16, 2023
b9e9627
Merge branch 'MarlinFirmware:bugfix-2.1.x' into sdio-support
ansonl Apr 19, 2023
14da059
Refactor code for user friendly onboard SD label
ansonl Apr 20, 2023
79cb734
Add external SD card label option
ansonl Apr 20, 2023
51e9ee3
Update Configuration.h
ansonl Apr 20, 2023
7a2bd81
Update Configuration_adv.h
ansonl Apr 20, 2023
42be78d
Update Conditionals_post.h
ansonl Apr 20, 2023
7ce7d97
Update cardreader.h
ansonl Apr 20, 2023
f4160ec
cleanup
thinkyhead Apr 20, 2023
b806822
Merge branch 'MarlinFirmware:bugfix-2.1.x' into sdio-support
ansonl Apr 20, 2023
16da160
Merge branch 'bugfix-2.1.x' into pr/25683
thinkyhead Aug 4, 2023
4eaab03
Merge branch 'bugfix-2.1.x' into pr/25683
thinkyhead Oct 26, 2023
852fd6f
Merge branch 'bugfix-2.1.x' into pr/25683
thinkyhead Jan 22, 2024
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
Prev Previous commit
Next Next commit
Update menu_media.cpp
  • Loading branch information
@ansonl
ansonl authored Apr 15, 2023
commit a5f50bde15ecdfd2ae2bb94f09aa0b2fdc7cb1d7
7 changes: 6 additions & 1 deletion Marlin/src/lcd/menu/menu_media.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,12 @@ void menu_media_filelist() {
START_MENU();
BACK_ITEM_F(TERN1(BROWSE_MEDIA_ON_INSERT, screen_history_depth) ? GET_TEXT_F(MSG_MAIN) : GET_TEXT_F(MSG_BACK));
#if ENABLED(VOLUME_SD_ONBOARD)
ACTION_ITEM(MSG_SD_CARD, []{ card.changeMedia(&card.media_driver_sdcard); card.mount(); ui.goto_screen(menu_media_filelist); });
#if ENABLED(SDSUPPORT)
ACTION_ITEM(MSG_SD_CARD, []{ card.changeMedia(&card.media_driver_sdcard); card.mount(); ui.goto_screen(menu_media_filelist); });
#endif
#if ENABLED(SDIO_SUPPORT)
ACTION_ITEM(MSG_SDIO_CARD, []{ card.changeMedia(&card.media_driver_sdiocard); card.mount(); ui.goto_screen(menu_media_filelist); });
#endif
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
#endif
#if ENABLED(VOLUME_USB_FLASH_DRIVE)
ACTION_ITEM(MSG_USB_DISK, []{ card.changeMedia(&card.media_driver_usbFlash); card.mount(); ui.goto_screen(menu_media_filelist); });
Expand Down