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

Long filename file create/write #23526

Merged
merged 17 commits into from
Jan 18, 2022
Merged

Long filename file create/write #23526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e5bc716
Show short names when no long filenames found
GHGiampy Jan 15, 2022
d384991
Support for long filenames (R/W)
GHGiampy Jan 15, 2022
4764bd2
Support for long filenames in firmware upload
GHGiampy Jan 15, 2022
2f570c8
Remove debug
GHGiampy Jan 15, 2022
7f33fc5
Follow LONG_FILENAME_HOST_SUPPORT in firmware upload
GHGiampy Jan 15, 2022
74e7d65
Flag for random filename in firmware upload
GHGiampy Jan 15, 2022
af15ea0
LONG_FILENAME_WRITE_SUPPORT (costs >2KB flash)
thinkyhead Jan 17, 2022
5b9b248
script var
thinkyhead Jan 17, 2022
e592dce
not needed
thinkyhead Jan 17, 2022
671b574
Fix SFN generation
GHGiampy Jan 17, 2022
079735e
Added LONG_FILENAME_WRITE and CUSTOM_FIRMWARE_UPLOAD to M115
GHGiampy Jan 17, 2022
58ed637
More info on comment
GHGiampy Jan 17, 2022
5d9a9db
Other comment
GHGiampy Jan 17, 2022
7bc2126
Avoid writing LFN without reading
GHGiampy Jan 17, 2022
63f3b5a
tweak descriptions
thinkyhead Jan 18, 2022
49b620a
shorter capability string
thinkyhead Jan 18, 2022
f0efe10
etc.
thinkyhead Jan 18, 2022
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
28 changes: 9 additions & 19 deletions Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,33 +1526,23 @@
// LCD's font must contain the characters. Check your selected LCD language.
//#define UTF_FILENAME_SUPPORT

// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT
//#define LONG_FILENAME_HOST_SUPPORT // Get the long filename of a file/folder with 'M33 <dosname>' and list long filenames with 'M20 L'
//#define LONG_FILENAME_WRITE_SUPPORT // Create / delete files with long filenames via M28, M30, and Binary Transfer Protocol

// Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES
//#define SCROLL_LONG_FILENAMES // Scroll long filenames in the SD card menu

// Leave the heaters on after Stop Print (not recommended!)
//#define SD_ABORT_NO_COOLDOWN
//#define SD_ABORT_NO_COOLDOWN // Leave the heaters on after Stop Print (not recommended!)

/**
* This option allows you to abort SD printing when any endstop is triggered.
* This feature must be enabled with "M540 S1" or from the LCD menu.
* To have any effect, endstops must be enabled during SD printing.
* Abort SD printing when any endstop is triggered.
* This feature is enabled with 'M540 S1' or from the LCD menu.
* Endstops must be activated for this option to work.
*/
//#define SD_ABORT_ON_ENDSTOP_HIT

/**
* This option makes it easier to print the same SD Card file again.
* On print completion the LCD Menu will open with the file selected.
* You can just click to start the print, or navigate elsewhere.
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
//#define SD_REPRINT_LAST_SELECTED_FILE // On print completion open the LCD Menu and select the same file

/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
//#define AUTO_REPORT_SD_STATUS // Auto-report media status with 'M27 S<seconds>'

/**
* Support for USB thumb drives using an Arduino USB Host Shield or
Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/gcode/eeprom/M500-M504.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ void GcodeSuite::M502() {
/**
* M503: print settings currently in memory
*
* S<bool> : Include / exclude header comments in the output. (Default: S1)
*
* With CONFIGURATION_EMBEDDING:
* C<flag> : Save the full Marlin configuration to SD Card as "mc.zip"
*/
Expand Down
8 changes: 7 additions & 1 deletion Marlin/src/gcode/host/M115.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,12 @@ void GcodeSuite::M115() {
// LONG_FILENAME_HOST_SUPPORT (M33)
cap_line(F("LONG_FILENAME"), ENABLED(LONG_FILENAME_HOST_SUPPORT));

// LONG_FILENAME_WRITE_SUPPORT (M23, M28, M30...)
cap_line(F("LFN_WRITE"), ENABLED(LONG_FILENAME_WRITE_SUPPORT));

// CUSTOM_FIRMWARE_UPLOAD (M20 F)
cap_line(F("CUSTOM_FIRMWARE_UPLOAD"), ENABLED(CUSTOM_FIRMWARE_UPLOAD));

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

…added to https://reprap.org/wiki/Firmware_Capabilities_Protocol

// EXTENDED_M20 (M20 L)
cap_line(F("EXTENDED_M20"), ENABLED(LONG_FILENAME_HOST_SUPPORT));

Expand All @@ -179,7 +185,7 @@ void GcodeSuite::M115() {
cap_line(F("MEATPACK"), SERIAL_IMPL.has_feature(port, SerialFeature::MeatPack));

// CONFIG_EXPORT
cap_line(F("CONFIG_EXPORT"), ENABLED(CONFIG_EMBED_AND_SAVE_TO_SD));
cap_line(F("CONFIG_EXPORT"), ENABLED(CONFIGURATION_EMBEDDING));

// Machine Geometry
#if ENABLED(M115_GEOMETRY_REPORT)
Expand Down
Loading