3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

and…

Browse source
This commit is contained in:
Scott Lahteine 2020-11-12 22:24:26 -06:00 • committed by GitHub
parent 6eee9bbaa9
commit 8008c6c897
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Marlin/src/sd/SdBaseFile.cpp
View file

@ -1110,7 +1110,7 @@ int8_t SdBaseFile::readDir(dir_t* dir, char* longFilename) {
// needs static bytes addressing. So here just store full UTF-16LE words to re-convert later.
uint16_t idx = (n + i) * 2; // This is fixed as FAT LFN always contain UTF-16LE encoding
longFilename[idx] = utf16_ch & 0xFF;
longFilename[idx+1] = (utf16_ch >> 8) & 0xFF;
longFilename[idx + 1] = (utf16_ch >> 8) & 0xFF;
#else
// Replace all multibyte characters to '_'
longFilename[n + i] = (utf16_ch > 0xFF) ? '_' : (utf16_ch & 0xFF);
@ -1122,10 +1122,9 @@ int8_t SdBaseFile::readDir(dir_t* dir, char* longFilename) {
}
}
#if ENABLED(UTF_FILENAME_SUPPORT)
// Return if normal file or subdirectory
// Post-process normal file or subdirectory longname, if any
if (DIR_IS_FILE_OR_SUBDIR(dir)) {
// Convert filename from utf-16 to utf-8 as Marlin expects
#if ENABLED(UTF_FILENAME_SUPPORT)
#if LONG_FILENAME_CHARSIZE > 2
// Add warning for developers for currently not supported 3-byte cases (Conversion series of 2-byte
// codepoints to 3-byte in-place will break the rest of filename)
@ -1133,8 +1132,7 @@ int8_t SdBaseFile::readDir(dir_t* dir, char* longFilename) {
#endif
// Is there a long filename to decode?
if (!longFilename) return n; // sizeof(dir_t)
if (longFilename) {
// Reset n to the start of the long name
n = 0;
for (uint16_t idx = 0; idx < (LONG_FILENAME_LENGTH) / 2; idx += 2) { // idx is fixed since FAT LFN always contains UTF-16LE encoding
@ -1157,10 +1155,11 @@ int8_t SdBaseFile::readDir(dir_t* dir, char* longFilename) {
#endif
}
if (0 == utf16_ch) break; // End of filename
}
return n;
}
} // idx
} // longFilename
#endif
return n;
} // DIR_IS_FILE_OR_SUBDIR
}
}