bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Cardreader read/write open methods

Browse Source
This commit is contained in:
Scott Lahteine
2019-12-12 18:46:49 -06:00
parent 98382fcea5
commit f3d64b7115
6 changed files with 86 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/sdcard/M23.cpp
View File

@ -36,7 +36,7 @@
void GcodeSuite::M23() {
// Simplify3D includes the size, so zero out all spaces (#7227)
for (char *fn = parser.string_arg; *fn; ++fn) if (*fn == ' ') *fn = '\0';
card.openFile(parser.string_arg, true);
card.openFileRead(parser.string_arg);
#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
ui.set_progress(0);

4
Marlin/src/gcode/sdcard/M28_M29.cpp
View File

@ -54,11 +54,11 @@ void GcodeSuite::M28() {
#endif
}
else
card.openFile(p, false);
card.openFileWrite(p);
#else
card.openFile(parser.string_arg, false);
card.openFileWrite(parser.string_arg);
#endif
}

7
Marlin/src/gcode/sdcard/M32.cpp
View File

@ -26,8 +26,7 @@
#include "../gcode.h"
#include "../../sd/cardreader.h"
#include "../../module/printcounter.h"
#include "../../module/planner.h"
#include "../../module/planner.h" // for synchronize()
#include "../../Marlin.h" // for startOrResumeJob
@ -45,9 +44,9 @@ void GcodeSuite::M32() {
if (IS_SD_PRINTING()) planner.synchronize();
if (card.isMounted()) {
const bool call_procedure = parser.boolval('P');
const uint8_t call_procedure = parser.boolval('P');
card.openFile(parser.string_arg, true, call_procedure);
card.openFileRead(parser.string_arg, call_procedure);
if (parser.seenval('S')) card.setIndex(parser.value_long());