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

SDCARD_READONLY (#17884)

Browse Source
This commit is contained in:
Leandro A. F. Pereira
2020-05-30 21:59:29 -07:00
committed by GitHub
parent 2ad3da98d4
commit 801f99edad
7 changed files with 108 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Marlin/src/sd/cardreader.cpp
View File

@@ -446,8 +446,8 @@ void CardReader::endFilePrint(TERN_(SD_RESORT, const bool re_sort/*=false*/)) {
}
void CardReader::openLogFile(char * const path) {
flag.logging = true;
openFileWrite(path);
flag.logging = DISABLED(SDCARD_READONLY);
TERN(SDCARD_READONLY,,openFileWrite(path));
}
//
@@ -573,15 +573,19 @@ void CardReader::openFileWrite(char * const path) {
const char * const fname = diveToFile(false, curDir, path);
if (!fname) return;
if (file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
flag.saving = true;
selectFileByName(fname);
TERN_(EMERGENCY_PARSER, emergency_parser.disable());
echo_write_to_file(fname);
ui.set_status(fname);
}
else
#if ENABLED(SDCARD_READONLY)
openFailed(fname);
#else
if (file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
flag.saving = true;
selectFileByName(fname);
TERN_(EMERGENCY_PARSER, emergency_parser.disable());
echo_write_to_file(fname);
ui.set_status(fname);
}
else
openFailed(fname);
#endif
}
//
@@ -596,13 +600,17 @@ void CardReader::removeFile(const char * const name) {
const char * const fname = diveToFile(false, curDir, name);
if (!fname) return;
if (file.remove(curDir, fname)) {
SERIAL_ECHOLNPAIR("File deleted:", fname);
sdpos = 0;
TERN_(SDCARD_SORT_ALPHA, presort());
}
else
SERIAL_ECHOLNPAIR("Deletion failed, File: ", fname, ".");
#if ENABLED(SDCARD_READONLY)
SERIAL_ECHOLNPAIR("Deletion failed (read-only), File: ", fname, ".");
#else
if (file.remove(curDir, fname)) {
SERIAL_ECHOLNPAIR("File deleted:", fname);
sdpos = 0;
TERN_(SDCARD_SORT_ALPHA, presort());
}
else
SERIAL_ECHOLNPAIR("Deletion failed, File: ", fname, ".");
#endif
}
void CardReader::report_status() {