2016-03-25 07:19:46 +01:00
|
|
|
/**
|
2016-03-24 19:01:20 +01:00
|
|
|
* Marlin 3D Printer Firmware
|
|
|
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
|
|
|
*
|
|
|
|
* Based on Sprinter and grbl.
|
|
|
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2017-09-06 13:28:32 +02:00
|
|
|
#include "../inc/MarlinConfig.h"
|
2016-08-03 04:36:58 +02:00
|
|
|
|
2017-09-06 13:28:32 +02:00
|
|
|
#if ENABLED(SDSUPPORT)
|
2012-03-03 16:51:47 +01:00
|
|
|
|
2017-09-06 13:28:32 +02:00
|
|
|
#include "cardreader.h"
|
2016-08-03 04:36:58 +02:00
|
|
|
|
2017-09-06 13:28:32 +02:00
|
|
|
#include "../Marlin.h"
|
|
|
|
#include "../lcd/ultralcd.h"
|
|
|
|
#include "../module/stepper.h"
|
|
|
|
#include "../module/printcounter.h"
|
|
|
|
#include "../core/language.h"
|
2017-09-08 05:33:16 +02:00
|
|
|
#include "../gcode/queue.h"
|
2017-09-06 13:28:32 +02:00
|
|
|
|
|
|
|
#include <ctype.h>
|
2011-11-06 21:39:53 +01:00
|
|
|
|
2017-02-09 14:02:25 +01:00
|
|
|
#define LONGEST_FILENAME (longFilename[0] ? longFilename : filename)
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
CardReader::CardReader() {
|
2017-02-09 14:02:25 +01:00
|
|
|
#if ENABLED(SDCARD_SORT_ALPHA)
|
|
|
|
sort_count = 0;
|
|
|
|
#if ENABLED(SDSORT_GCODE)
|
|
|
|
sort_alpha = true;
|
|
|
|
sort_folders = FOLDER_SORTING;
|
|
|
|
//sort_reverse = false;
|
|
|
|
#endif
|
|
|
|
#endif
|
2016-08-12 12:22:02 +02:00
|
|
|
sdprinting = cardOK = saving = logging = false;
|
2015-03-02 16:06:01 +01:00
|
|
|
filesize = 0;
|
|
|
|
sdpos = 0;
|
|
|
|
file_subcall_ctr = 0;
|
2017-11-15 07:06:20 +01:00
|
|
|
|
|
|
|
workDirDepth = 0;
|
2016-10-22 17:07:18 +02:00
|
|
|
ZERO(workDirParents);
|
2011-12-22 14:55:45 +01:00
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
autostart_stilltocheck = true; //the SD start is delayed, because otherwise the serial cannot answer fast enough to make contact with the host software.
|
|
|
|
autostart_index = 0;
|
2015-05-13 11:02:19 +02:00
|
|
|
|
2011-11-06 21:39:53 +01:00
|
|
|
//power to SD reader
|
|
|
|
#if SDPOWER > -1
|
2015-03-03 09:48:20 +01:00
|
|
|
OUT_WRITE(SDPOWER, HIGH);
|
2017-05-09 19:35:43 +02:00
|
|
|
#endif // SDPOWER
|
2015-03-02 16:06:01 +01:00
|
|
|
|
2015-04-13 03:07:08 +02:00
|
|
|
next_autostart_ms = millis() + 5000;
|
2011-11-06 21:39:53 +01:00
|
|
|
}
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
char *createFilename(char *buffer, const dir_t &p) { //buffer > 12characters
|
|
|
|
char *pos = buffer;
|
|
|
|
for (uint8_t i = 0; i < 11; i++) {
|
|
|
|
if (p.name[i] == ' ') continue;
|
|
|
|
if (i == 8) *pos++ = '.';
|
|
|
|
*pos++ = p.name[i];
|
2011-11-19 13:13:34 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
*pos++ = 0;
|
2011-11-19 13:13:34 +01:00
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
2015-05-15 12:19:07 +02:00
|
|
|
/**
|
|
|
|
* Dive into a folder and recurse depth-first to perform a pre-set operation lsAction:
|
|
|
|
* LS_Count - Add +1 to nrFiles for every file within the parent
|
2017-07-30 07:02:41 +02:00
|
|
|
* LS_GetFilename - Get the filename of the file indexed by nrFile_index
|
2017-04-12 21:35:31 +02:00
|
|
|
* LS_SerialPrint - Print the full path and size of each file to serial output
|
2015-05-15 12:19:07 +02:00
|
|
|
*/
|
2017-09-06 13:28:32 +02:00
|
|
|
|
2017-07-30 07:02:41 +02:00
|
|
|
uint16_t nrFile_index;
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
void CardReader::lsDive(const char *prepend, SdFile parent, const char * const match/*=NULL*/) {
|
2011-11-19 13:13:34 +01:00
|
|
|
dir_t p;
|
2015-03-02 16:06:01 +01:00
|
|
|
uint8_t cnt = 0;
|
2011-11-19 13:13:34 +01:00
|
|
|
|
2015-05-15 12:19:07 +02:00
|
|
|
// Read the next entry from a directory
|
2015-03-02 16:06:01 +01:00
|
|
|
while (parent.readDir(p, longFilename) > 0) {
|
2015-05-15 12:19:07 +02:00
|
|
|
|
|
|
|
// If the entry is a directory and the action is LS_SerialPrint
|
|
|
|
if (DIR_IS_SUBDIR(&p) && lsAction != LS_Count && lsAction != LS_GetFilename) {
|
|
|
|
|
|
|
|
// Get the short name for the item, which we know is a folder
|
2015-01-24 07:55:13 +01:00
|
|
|
char lfilename[FILENAME_LENGTH];
|
2015-03-02 16:06:01 +01:00
|
|
|
createFilename(lfilename, p);
|
|
|
|
|
2015-07-16 21:10:38 +02:00
|
|
|
// Allocate enough stack space for the full path to a folder, trailing slash, and nul
|
2017-01-13 13:03:52 +01:00
|
|
|
bool prepend_is_empty = (prepend[0] == '\0');
|
2015-07-16 21:42:57 +02:00
|
|
|
int len = (prepend_is_empty ? 1 : strlen(prepend)) + strlen(lfilename) + 1 + 1;
|
2015-07-16 21:10:38 +02:00
|
|
|
char path[len];
|
|
|
|
|
2015-05-15 12:19:07 +02:00
|
|
|
// Append the FOLDERNAME12/ to the passed string.
|
|
|
|
// It contains the full path to the "parent" argument.
|
|
|
|
// We now have the full path to the item in this folder.
|
2015-07-16 21:42:57 +02:00
|
|
|
strcpy(path, prepend_is_empty ? "/" : prepend); // root slash if prepend is empty
|
2015-07-16 21:10:38 +02:00
|
|
|
strcat(path, lfilename); // FILENAME_LENGTH-1 characters maximum
|
|
|
|
strcat(path, "/"); // 1 character
|
2015-03-02 16:06:01 +01:00
|
|
|
|
2015-05-15 12:19:07 +02:00
|
|
|
// Serial.print(path);
|
2015-03-02 16:06:01 +01:00
|
|
|
|
2015-05-15 12:19:07 +02:00
|
|
|
// Get a new directory object using the full path
|
|
|
|
// and dive recursively into it.
|
2011-11-19 13:13:34 +01:00
|
|
|
SdFile dir;
|
2015-03-02 16:06:01 +01:00
|
|
|
if (!dir.open(parent, lfilename, O_READ)) {
|
|
|
|
if (lsAction == LS_SerialPrint) {
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_ECHO_START();
|
2016-06-28 01:29:35 +02:00
|
|
|
SERIAL_ECHOPGM(MSG_SD_CANT_OPEN_SUBDIR);
|
2011-11-19 13:13:34 +01:00
|
|
|
SERIAL_ECHOLN(lfilename);
|
|
|
|
}
|
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
lsDive(path, dir);
|
2015-05-15 12:19:07 +02:00
|
|
|
// close() is done automatically by destructor of SdFile
|
2011-11-19 13:13:34 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
else {
|
2016-03-15 18:47:58 +01:00
|
|
|
uint8_t pn0 = p.name[0];
|
2014-12-18 08:07:36 +01:00
|
|
|
if (pn0 == DIR_NAME_FREE) break;
|
2015-03-02 16:56:11 +01:00
|
|
|
if (pn0 == DIR_NAME_DELETED || pn0 == '.') continue;
|
2015-05-15 12:19:07 +02:00
|
|
|
if (longFilename[0] == '.') continue;
|
2014-12-18 16:49:16 +01:00
|
|
|
|
2016-11-26 13:26:28 +01:00
|
|
|
if (!DIR_IS_FILE_OR_SUBDIR(&p) || (p.attributes & DIR_ATT_HIDDEN)) continue;
|
2015-03-02 16:06:01 +01:00
|
|
|
|
|
|
|
filenameIsDir = DIR_IS_SUBDIR(&p);
|
|
|
|
|
|
|
|
if (!filenameIsDir && (p.name[8] != 'G' || p.name[9] == '~')) continue;
|
|
|
|
|
2017-07-30 07:02:41 +02:00
|
|
|
switch (lsAction) { // 1 based file count
|
2015-05-15 12:19:07 +02:00
|
|
|
case LS_Count:
|
|
|
|
nrFiles++;
|
|
|
|
break;
|
2017-04-12 21:35:31 +02:00
|
|
|
|
2015-05-15 12:19:07 +02:00
|
|
|
case LS_SerialPrint:
|
|
|
|
createFilename(filename, p);
|
|
|
|
SERIAL_PROTOCOL(prepend);
|
2017-04-12 21:35:31 +02:00
|
|
|
SERIAL_PROTOCOL(filename);
|
|
|
|
SERIAL_PROTOCOLCHAR(' ');
|
|
|
|
SERIAL_PROTOCOLLN(p.fileSize);
|
2015-05-15 12:19:07 +02:00
|
|
|
break;
|
2017-04-12 21:35:31 +02:00
|
|
|
|
2015-05-15 12:19:07 +02:00
|
|
|
case LS_GetFilename:
|
|
|
|
createFilename(filename, p);
|
|
|
|
if (match != NULL) {
|
|
|
|
if (strcasecmp(match, filename) == 0) return;
|
|
|
|
}
|
2017-07-30 07:02:41 +02:00
|
|
|
else if (cnt == nrFile_index) return; // 0 based index
|
2015-05-15 12:19:07 +02:00
|
|
|
cnt++;
|
|
|
|
break;
|
2011-11-19 14:34:27 +01:00
|
|
|
}
|
2015-05-15 12:19:07 +02:00
|
|
|
|
2011-11-19 13:13:34 +01:00
|
|
|
}
|
2015-05-15 12:19:07 +02:00
|
|
|
} // while readDir
|
2011-11-19 13:13:34 +01:00
|
|
|
}
|
|
|
|
|
2017-03-20 07:42:41 +01:00
|
|
|
void CardReader::ls() {
|
2015-03-02 16:06:01 +01:00
|
|
|
lsAction = LS_SerialPrint;
|
2011-11-19 13:13:34 +01:00
|
|
|
root.rewind();
|
2015-03-02 16:06:01 +01:00
|
|
|
lsDive("", root);
|
2011-11-19 13:13:34 +01:00
|
|
|
}
|
|
|
|
|
2015-07-31 07:21:18 +02:00
|
|
|
#if ENABLED(LONG_FILENAME_HOST_SUPPORT)
|
2015-05-18 02:36:32 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Get a long pretty path based on a DOS 8.3 path
|
|
|
|
*/
|
|
|
|
void CardReader::printLongPath(char *path) {
|
|
|
|
lsAction = LS_GetFilename;
|
|
|
|
|
|
|
|
int i, pathLen = strlen(path);
|
|
|
|
|
|
|
|
// SERIAL_ECHOPGM("Full Path: "); SERIAL_ECHOLN(path);
|
|
|
|
|
|
|
|
// Zero out slashes to make segments
|
|
|
|
for (i = 0; i < pathLen; i++) if (path[i] == '/') path[i] = '\0';
|
|
|
|
|
|
|
|
SdFile diveDir = root; // start from the root for segment 1
|
|
|
|
for (i = 0; i < pathLen;) {
|
|
|
|
|
|
|
|
if (path[i] == '\0') i++; // move past a single nul
|
|
|
|
|
|
|
|
char *segment = &path[i]; // The segment after most slashes
|
|
|
|
|
|
|
|
// If a segment is empty (extra-slash) then exit
|
|
|
|
if (!*segment) break;
|
|
|
|
|
|
|
|
// Go to the next segment
|
|
|
|
while (path[++i]) { }
|
|
|
|
|
|
|
|
// SERIAL_ECHOPGM("Looking for segment: "); SERIAL_ECHOLN(segment);
|
|
|
|
|
|
|
|
// Find the item, setting the long filename
|
|
|
|
diveDir.rewind();
|
|
|
|
lsDive("", diveDir, segment);
|
|
|
|
|
|
|
|
// Print /LongNamePart to serial output
|
|
|
|
SERIAL_PROTOCOLCHAR('/');
|
|
|
|
SERIAL_PROTOCOL(longFilename[0] ? longFilename : "???");
|
|
|
|
|
|
|
|
// If the filename was printed then that's it
|
|
|
|
if (!filenameIsDir) break;
|
|
|
|
|
|
|
|
// SERIAL_ECHOPGM("Opening dir: "); SERIAL_ECHOLN(segment);
|
|
|
|
|
|
|
|
// Open the sub-item as the new dive parent
|
|
|
|
SdFile dir;
|
|
|
|
if (!dir.open(diveDir, segment, O_READ)) {
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_EOL();
|
|
|
|
SERIAL_ECHO_START();
|
2015-05-18 02:36:32 +02:00
|
|
|
SERIAL_ECHOPGM(MSG_SD_CANT_OPEN_SUBDIR);
|
|
|
|
SERIAL_ECHO(segment);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
diveDir.close();
|
|
|
|
diveDir = dir;
|
|
|
|
|
|
|
|
} // while i<pathLen
|
|
|
|
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_EOL();
|
2015-05-18 02:36:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif // LONG_FILENAME_HOST_SUPPORT
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
void CardReader::initsd() {
|
2011-11-06 22:48:15 +01:00
|
|
|
cardOK = false;
|
2015-03-02 16:06:01 +01:00
|
|
|
if (root.isOpen()) root.close();
|
|
|
|
|
2015-12-14 05:23:01 +01:00
|
|
|
#ifndef SPI_SPEED
|
2015-03-02 16:06:01 +01:00
|
|
|
#define SPI_SPEED SPI_FULL_SPEED
|
2014-03-27 18:02:17 +01:00
|
|
|
#endif
|
2015-03-02 16:06:01 +01:00
|
|
|
|
2017-05-01 05:27:47 +02:00
|
|
|
if (!card.init(SPI_SPEED, SDSS)
|
2015-03-02 16:06:01 +01:00
|
|
|
#if defined(LCD_SDSS) && (LCD_SDSS != SDSS)
|
|
|
|
&& !card.init(SPI_SPEED, LCD_SDSS)
|
|
|
|
#endif
|
|
|
|
) {
|
2011-11-20 14:43:47 +01:00
|
|
|
//if (!card.init(SPI_HALF_SPEED,SDSS))
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_ECHO_START();
|
2012-03-03 16:51:47 +01:00
|
|
|
SERIAL_ECHOLNPGM(MSG_SD_INIT_FAIL);
|
2011-11-20 14:43:47 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
else if (!volume.init(&card)) {
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_ERROR_START();
|
2012-03-03 16:51:47 +01:00
|
|
|
SERIAL_ERRORLNPGM(MSG_SD_VOL_INIT_FAIL);
|
2011-11-20 14:43:47 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
else if (!root.openRoot(&volume)) {
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_ERROR_START();
|
2012-03-03 16:51:47 +01:00
|
|
|
SERIAL_ERRORLNPGM(MSG_SD_OPENROOT_FAIL);
|
2011-11-20 14:43:47 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
else {
|
2011-11-20 14:43:47 +01:00
|
|
|
cardOK = true;
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_ECHO_START();
|
2012-03-03 16:51:47 +01:00
|
|
|
SERIAL_ECHOLNPGM(MSG_SD_CARD_OK);
|
2011-11-20 14:43:47 +01:00
|
|
|
}
|
2017-11-15 07:06:20 +01:00
|
|
|
setroot();
|
2011-11-06 21:39:53 +01:00
|
|
|
}
|
2011-12-26 09:20:33 +01:00
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
void CardReader::setroot() {
|
|
|
|
/*if (!workDir.openRoot(&volume)) {
|
2012-03-03 16:51:47 +01:00
|
|
|
SERIAL_ECHOLNPGM(MSG_SD_WORKDIR_FAIL);
|
2012-03-19 20:24:40 +01:00
|
|
|
}*/
|
2015-03-02 16:06:01 +01:00
|
|
|
workDir = root;
|
|
|
|
curDir = &workDir;
|
2017-02-09 14:02:25 +01:00
|
|
|
#if ENABLED(SDCARD_SORT_ALPHA)
|
|
|
|
presort();
|
|
|
|
#endif
|
2011-12-26 09:20:33 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
|
|
|
|
void CardReader::release() {
|
2011-11-06 22:48:15 +01:00
|
|
|
sdprinting = false;
|
|
|
|
cardOK = false;
|
|
|
|
}
|
|
|
|
|
2016-02-21 02:35:35 +01:00
|
|
|
void CardReader::openAndPrintFile(const char *name) {
|
2016-03-29 11:34:33 +02:00
|
|
|
char cmd[4 + strlen(name) + 1]; // Room for "M23 ", filename, and null
|
2016-02-21 02:35:35 +01:00
|
|
|
sprintf_P(cmd, PSTR("M23 %s"), name);
|
|
|
|
for (char *c = &cmd[4]; *c; c++) *c = tolower(*c);
|
2016-03-29 12:20:23 +02:00
|
|
|
enqueue_and_echo_command(cmd);
|
2016-02-21 02:35:35 +01:00
|
|
|
enqueue_and_echo_commands_P(PSTR("M24"));
|
|
|
|
}
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
void CardReader::startFileprint() {
|
2017-02-09 14:02:25 +01:00
|
|
|
if (cardOK) {
|
|
|
|
sdprinting = true;
|
|
|
|
#if ENABLED(SDCARD_SORT_ALPHA)
|
|
|
|
flush_presort();
|
|
|
|
#endif
|
|
|
|
}
|
2011-11-06 22:48:15 +01:00
|
|
|
}
|
|
|
|
|
2016-06-18 03:27:14 +02:00
|
|
|
void CardReader::stopSDPrint() {
|
2016-08-12 12:21:10 +02:00
|
|
|
sdprinting = false;
|
|
|
|
if (isFileOpen()) file.close();
|
2016-06-18 03:27:14 +02:00
|
|
|
}
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
void CardReader::openLogFile(char* name) {
|
2013-03-16 23:02:57 +01:00
|
|
|
logging = true;
|
|
|
|
openFile(name, false);
|
|
|
|
}
|
2011-11-19 13:13:34 +01:00
|
|
|
|
2017-11-15 07:15:57 +01:00
|
|
|
void appendAtom(SdFile &file, char *& dst, uint8_t &cnt) {
|
|
|
|
file.getFilename(dst);
|
|
|
|
while (*dst && cnt < MAXPATHNAMELENGTH) { dst++; cnt++; }
|
|
|
|
if (cnt < MAXPATHNAMELENGTH) { *dst = '/'; dst++; cnt++; }
|
|
|
|
}
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
void CardReader::getAbsFilename(char *t) {
|
2017-11-15 07:15:57 +01:00
|
|
|
*t++ = '/'; // Root folder
|
|
|
|
uint8_t cnt = 1;
|
|
|
|
|
|
|
|
for (uint8_t i = 0; i < workDirDepth; i++) // Loop to current work dir
|
|
|
|
appendAtom(workDirParents[i], t, cnt);
|
|
|
|
|
|
|
|
if (cnt < MAXPATHNAMELENGTH - (FILENAME_LENGTH)) {
|
|
|
|
appendAtom(file, t, cnt);
|
|
|
|
--t;
|
2013-10-22 10:02:18 +02:00
|
|
|
}
|
2017-11-15 07:15:57 +01:00
|
|
|
*t = '\0';
|
2013-10-22 10:02:18 +02:00
|
|
|
}
|
|
|
|
|
2017-11-15 07:15:57 +01:00
|
|
|
void CardReader::openFile(char* name, const bool read, const bool subcall/*=false*/) {
|
2016-08-12 12:22:02 +02:00
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
if (!cardOK) return;
|
2016-08-12 12:22:02 +02:00
|
|
|
|
|
|
|
uint8_t doing = 0;
|
2017-11-15 07:15:57 +01:00
|
|
|
if (isFileOpen()) { // Replacing current file or doing a subroutine
|
|
|
|
if (subcall) {
|
2015-10-03 08:08:58 +02:00
|
|
|
if (file_subcall_ctr > SD_PROCEDURE_DEPTH - 1) {
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_ERROR_START();
|
2015-10-03 08:08:58 +02:00
|
|
|
SERIAL_ERRORPGM("trying to call sub-gcode files with too many levels. MAX level is:");
|
|
|
|
SERIAL_ERRORLN(SD_PROCEDURE_DEPTH);
|
|
|
|
kill(PSTR(MSG_KILLED));
|
|
|
|
return;
|
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
|
2017-11-15 07:15:57 +01:00
|
|
|
// Store current filename (based on workDirParents) and position
|
2016-03-29 12:15:01 +02:00
|
|
|
getAbsFilename(proc_filenames[file_subcall_ctr]);
|
2017-11-15 07:15:57 +01:00
|
|
|
filespos[file_subcall_ctr] = sdpos;
|
2015-03-02 16:06:01 +01:00
|
|
|
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_ECHO_START();
|
2016-08-12 12:22:02 +02:00
|
|
|
SERIAL_ECHOPAIR("SUBROUTINE CALL target:\"", name);
|
|
|
|
SERIAL_ECHOPAIR("\" parent:\"", proc_filenames[file_subcall_ctr]);
|
|
|
|
SERIAL_ECHOLNPAIR("\" pos", sdpos);
|
2015-10-03 08:08:58 +02:00
|
|
|
file_subcall_ctr++;
|
2016-03-29 13:57:19 +02:00
|
|
|
}
|
2017-11-15 07:06:20 +01:00
|
|
|
else
|
2016-08-12 12:22:02 +02:00
|
|
|
doing = 1;
|
2013-10-22 10:02:18 +02:00
|
|
|
}
|
2017-11-15 07:15:57 +01:00
|
|
|
else if (subcall) { // Returning from a subcall?
|
|
|
|
SERIAL_ECHO_START();
|
|
|
|
SERIAL_ECHOLNPGM("END SUBROUTINE");
|
|
|
|
}
|
|
|
|
else { // Opening fresh file
|
2016-08-12 12:22:02 +02:00
|
|
|
doing = 2;
|
|
|
|
file_subcall_ctr = 0; // Reset procedure depth in case user cancels print while in procedure
|
|
|
|
}
|
|
|
|
|
|
|
|
if (doing) {
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_ECHO_START();
|
2016-08-12 12:22:02 +02:00
|
|
|
SERIAL_ECHOPGM("Now ");
|
2017-11-15 07:06:20 +01:00
|
|
|
serialprintPGM(doing == 1 ? PSTR("doing") : PSTR("fresh"));
|
2016-08-12 12:22:02 +02:00
|
|
|
SERIAL_ECHOLNPAIR(" file: ", name);
|
2013-10-22 10:02:18 +02:00
|
|
|
}
|
2016-08-12 12:21:10 +02:00
|
|
|
|
|
|
|
stopSDPrint();
|
2015-03-02 16:06:01 +01:00
|
|
|
|
2011-11-19 14:34:27 +01:00
|
|
|
SdFile myDir;
|
2015-03-02 16:06:01 +01:00
|
|
|
curDir = &root;
|
|
|
|
char *fname = name;
|
|
|
|
char *dirname_start, *dirname_end;
|
2016-08-12 12:22:02 +02:00
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
if (name[0] == '/') {
|
|
|
|
dirname_start = &name[1];
|
2016-04-02 23:28:17 +02:00
|
|
|
while (dirname_start != NULL) {
|
2015-03-02 16:06:01 +01:00
|
|
|
dirname_end = strchr(dirname_start, '/');
|
2016-06-28 01:29:35 +02:00
|
|
|
//SERIAL_ECHOPGM("start:");SERIAL_ECHOLN((int)(dirname_start - name));
|
|
|
|
//SERIAL_ECHOPGM("end :");SERIAL_ECHOLN((int)(dirname_end - name));
|
2016-04-02 23:28:17 +02:00
|
|
|
if (dirname_end != NULL && dirname_end > dirname_start) {
|
2015-01-24 07:55:13 +01:00
|
|
|
char subdirname[FILENAME_LENGTH];
|
2015-03-02 16:06:01 +01:00
|
|
|
strncpy(subdirname, dirname_start, dirname_end - dirname_start);
|
2017-11-15 07:06:20 +01:00
|
|
|
subdirname[dirname_end - dirname_start] = '\0';
|
2015-03-02 16:06:01 +01:00
|
|
|
if (!myDir.open(curDir, subdirname, O_READ)) {
|
2012-03-03 16:51:47 +01:00
|
|
|
SERIAL_PROTOCOLPGM(MSG_SD_OPEN_FILE_FAIL);
|
2011-11-19 15:36:49 +01:00
|
|
|
SERIAL_PROTOCOL(subdirname);
|
2015-04-04 06:43:30 +02:00
|
|
|
SERIAL_PROTOCOLCHAR('.');
|
2011-11-19 15:36:49 +01:00
|
|
|
return;
|
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
else {
|
2016-06-28 01:29:35 +02:00
|
|
|
//SERIAL_ECHOLNPGM("dive ok");
|
2012-11-12 15:35:28 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
|
|
|
|
curDir = &myDir;
|
|
|
|
dirname_start = dirname_end + 1;
|
2011-11-19 14:34:27 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
else { // the remainder after all /fsa/fdsa/ is the filename
|
|
|
|
fname = dirname_start;
|
2016-06-28 01:29:35 +02:00
|
|
|
//SERIAL_ECHOLNPGM("remainder");
|
2011-11-19 15:36:49 +01:00
|
|
|
//SERIAL_ECHOLN(fname);
|
|
|
|
break;
|
|
|
|
}
|
2011-11-19 14:34:27 +01:00
|
|
|
}
|
|
|
|
}
|
2017-11-15 07:06:20 +01:00
|
|
|
else
|
|
|
|
curDir = &workDir; // Relative paths start in current directory
|
2015-03-02 16:06:01 +01:00
|
|
|
|
|
|
|
if (read) {
|
|
|
|
if (file.open(curDir, fname, O_READ)) {
|
2011-11-06 22:48:15 +01:00
|
|
|
filesize = file.fileSize();
|
2017-11-15 07:06:20 +01:00
|
|
|
sdpos = 0;
|
2016-06-28 01:29:35 +02:00
|
|
|
SERIAL_PROTOCOLPAIR(MSG_SD_FILE_OPENED, fname);
|
2016-08-11 03:49:25 +02:00
|
|
|
SERIAL_PROTOCOLLNPAIR(MSG_SD_SIZE, filesize);
|
2012-03-03 16:51:47 +01:00
|
|
|
SERIAL_PROTOCOLLNPGM(MSG_SD_FILE_SELECTED);
|
2014-12-18 08:07:36 +01:00
|
|
|
getfilename(0, fname);
|
|
|
|
lcd_setstatus(longFilename[0] ? longFilename : fname);
|
2011-11-06 22:48:15 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
else {
|
2016-06-28 01:29:35 +02:00
|
|
|
SERIAL_PROTOCOLPAIR(MSG_SD_OPEN_FILE_FAIL, fname);
|
|
|
|
SERIAL_PROTOCOLCHAR('.');
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_EOL();
|
2011-11-06 22:48:15 +01:00
|
|
|
}
|
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
else { //write
|
|
|
|
if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
|
2016-06-28 01:29:35 +02:00
|
|
|
SERIAL_PROTOCOLPAIR(MSG_SD_OPEN_FILE_FAIL, fname);
|
|
|
|
SERIAL_PROTOCOLCHAR('.');
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_EOL();
|
2011-11-06 22:48:15 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
else {
|
2011-11-06 22:48:15 +01:00
|
|
|
saving = true;
|
2016-08-11 03:49:25 +02:00
|
|
|
SERIAL_PROTOCOLLNPAIR(MSG_SD_WRITE_TO_FILE, name);
|
2012-12-03 12:52:00 +01:00
|
|
|
lcd_setstatus(fname);
|
2011-11-06 22:48:15 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-15 07:06:20 +01:00
|
|
|
void CardReader::removeFile(const char * const name) {
|
2015-03-02 16:06:01 +01:00
|
|
|
if (!cardOK) return;
|
|
|
|
|
2016-08-12 12:21:10 +02:00
|
|
|
stopSDPrint();
|
2015-03-02 16:06:01 +01:00
|
|
|
|
2012-03-03 21:58:12 +01:00
|
|
|
SdFile myDir;
|
2015-03-02 16:06:01 +01:00
|
|
|
curDir = &root;
|
2017-11-15 07:06:20 +01:00
|
|
|
const char *fname = name;
|
2015-03-02 16:06:01 +01:00
|
|
|
|
|
|
|
char *dirname_start, *dirname_end;
|
|
|
|
if (name[0] == '/') {
|
|
|
|
dirname_start = strchr(name, '/') + 1;
|
2016-04-02 23:28:17 +02:00
|
|
|
while (dirname_start != NULL) {
|
2015-03-02 16:06:01 +01:00
|
|
|
dirname_end = strchr(dirname_start, '/');
|
2016-06-28 01:29:35 +02:00
|
|
|
//SERIAL_ECHOPGM("start:");SERIAL_ECHOLN((int)(dirname_start - name));
|
|
|
|
//SERIAL_ECHOPGM("end :");SERIAL_ECHOLN((int)(dirname_end - name));
|
2016-04-02 23:28:17 +02:00
|
|
|
if (dirname_end != NULL && dirname_end > dirname_start) {
|
2015-01-24 07:55:13 +01:00
|
|
|
char subdirname[FILENAME_LENGTH];
|
2015-03-02 16:06:01 +01:00
|
|
|
strncpy(subdirname, dirname_start, dirname_end - dirname_start);
|
|
|
|
subdirname[dirname_end - dirname_start] = 0;
|
2012-03-03 21:58:12 +01:00
|
|
|
SERIAL_ECHOLN(subdirname);
|
2015-03-02 16:06:01 +01:00
|
|
|
if (!myDir.open(curDir, subdirname, O_READ)) {
|
2017-11-15 07:06:20 +01:00
|
|
|
SERIAL_PROTOCOLPAIR(MSG_SD_OPEN_FILE_FAIL, subdirname);
|
2015-04-04 06:43:30 +02:00
|
|
|
SERIAL_PROTOCOLCHAR('.');
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_EOL();
|
2012-03-03 21:58:12 +01:00
|
|
|
return;
|
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
|
|
|
|
curDir = &myDir;
|
|
|
|
dirname_start = dirname_end + 1;
|
2012-03-03 21:58:12 +01:00
|
|
|
}
|
2017-11-15 07:06:20 +01:00
|
|
|
else {
|
2015-03-02 16:06:01 +01:00
|
|
|
fname = dirname_start;
|
2012-03-03 21:58:12 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-11-15 07:06:20 +01:00
|
|
|
else // Relative paths are rooted in the current directory
|
2015-03-02 16:06:01 +01:00
|
|
|
curDir = &workDir;
|
|
|
|
|
|
|
|
if (file.remove(curDir, fname)) {
|
|
|
|
SERIAL_PROTOCOLPGM("File deleted:");
|
|
|
|
SERIAL_PROTOCOLLN(fname);
|
|
|
|
sdpos = 0;
|
2017-02-09 14:02:25 +01:00
|
|
|
#if ENABLED(SDCARD_SORT_ALPHA)
|
|
|
|
presort();
|
|
|
|
#endif
|
2015-03-02 16:06:01 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
SERIAL_PROTOCOLPGM("Deletion failed, File: ");
|
|
|
|
SERIAL_PROTOCOL(fname);
|
2015-04-04 06:43:30 +02:00
|
|
|
SERIAL_PROTOCOLCHAR('.');
|
2012-03-03 21:58:12 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
void CardReader::getStatus() {
|
|
|
|
if (cardOK) {
|
2012-03-03 16:51:47 +01:00
|
|
|
SERIAL_PROTOCOLPGM(MSG_SD_PRINTING_BYTE);
|
2011-11-09 20:27:15 +01:00
|
|
|
SERIAL_PROTOCOL(sdpos);
|
2015-04-04 06:43:30 +02:00
|
|
|
SERIAL_PROTOCOLCHAR('/');
|
2011-11-09 20:27:15 +01:00
|
|
|
SERIAL_PROTOCOLLN(filesize);
|
2011-11-06 22:48:15 +01:00
|
|
|
}
|
2017-11-15 07:06:20 +01:00
|
|
|
else
|
2012-03-03 16:51:47 +01:00
|
|
|
SERIAL_PROTOCOLLNPGM(MSG_SD_NOT_PRINTING);
|
2011-11-06 22:48:15 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
|
|
|
|
void CardReader::write_command(char *buf) {
|
2011-11-06 21:39:53 +01:00
|
|
|
char* begin = buf;
|
2017-11-15 07:06:20 +01:00
|
|
|
char* npos = NULL;
|
2011-11-06 21:39:53 +01:00
|
|
|
char* end = buf + strlen(buf) - 1;
|
|
|
|
|
|
|
|
file.writeError = false;
|
2015-03-02 16:06:01 +01:00
|
|
|
if ((npos = strchr(buf, 'N')) != NULL) {
|
2011-11-06 21:39:53 +01:00
|
|
|
begin = strchr(npos, ' ') + 1;
|
|
|
|
end = strchr(npos, '*') - 1;
|
|
|
|
}
|
|
|
|
end[1] = '\r';
|
|
|
|
end[2] = '\n';
|
|
|
|
end[3] = '\0';
|
|
|
|
file.write(begin);
|
2015-03-02 16:06:01 +01:00
|
|
|
if (file.writeError) {
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_ERROR_START();
|
2012-03-03 16:51:47 +01:00
|
|
|
SERIAL_ERRORLNPGM(MSG_SD_ERR_WRITE_TO_FILE);
|
2011-11-06 21:39:53 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
void CardReader::checkautostart(bool force) {
|
2017-09-25 00:53:39 +02:00
|
|
|
if (!force && (!autostart_stilltocheck || PENDING(millis(), next_autostart_ms)))
|
2015-08-04 22:22:56 +02:00
|
|
|
return;
|
2011-11-06 21:39:53 +01:00
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
autostart_stilltocheck = false;
|
|
|
|
|
|
|
|
if (!cardOK) {
|
2011-11-06 21:39:53 +01:00
|
|
|
initsd();
|
2015-03-02 16:06:01 +01:00
|
|
|
if (!cardOK) return; // fail
|
2011-11-06 21:39:53 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
|
2015-05-18 02:36:32 +02:00
|
|
|
char autoname[10];
|
2015-01-24 07:55:13 +01:00
|
|
|
sprintf_P(autoname, PSTR("auto%i.g"), autostart_index);
|
2015-03-02 16:06:01 +01:00
|
|
|
for (int8_t i = 0; i < (int8_t)strlen(autoname); i++) autoname[i] = tolower(autoname[i]);
|
|
|
|
|
2011-11-06 21:39:53 +01:00
|
|
|
dir_t p;
|
|
|
|
|
|
|
|
root.rewind();
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
bool found = false;
|
|
|
|
while (root.readDir(p, NULL) > 0) {
|
2017-05-04 05:14:40 +02:00
|
|
|
for (int8_t i = (int8_t)strlen((char*)p.name); i--;) p.name[i] = tolower(p.name[i]);
|
2015-03-02 16:06:01 +01:00
|
|
|
if (p.name[9] != '~' && strncmp((char*)p.name, autoname, 5) == 0) {
|
2016-02-21 02:35:35 +01:00
|
|
|
openAndPrintFile(autoname);
|
2015-03-02 16:06:01 +01:00
|
|
|
found = true;
|
2011-11-06 21:39:53 +01:00
|
|
|
}
|
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
if (!found)
|
|
|
|
autostart_index = -1;
|
2011-11-06 21:39:53 +01:00
|
|
|
else
|
2015-01-24 07:55:13 +01:00
|
|
|
autostart_index++;
|
2011-11-06 21:39:53 +01:00
|
|
|
}
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
void CardReader::closefile(bool store_location) {
|
2011-11-06 22:48:15 +01:00
|
|
|
file.sync();
|
2011-11-06 21:39:53 +01:00
|
|
|
file.close();
|
2015-03-02 16:06:01 +01:00
|
|
|
saving = logging = false;
|
|
|
|
|
|
|
|
if (store_location) {
|
2014-02-17 11:58:36 +01:00
|
|
|
//future: store printer state, filename and position for continuing a stopped print
|
2013-10-22 10:04:08 +02:00
|
|
|
// so one can unplug the printer and continue printing the next day.
|
|
|
|
}
|
2011-11-06 21:39:53 +01:00
|
|
|
}
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
/**
|
|
|
|
* Get the name of a file in the current directory by index
|
|
|
|
*/
|
|
|
|
void CardReader::getfilename(uint16_t nr, const char * const match/*=NULL*/) {
|
2017-02-09 14:02:25 +01:00
|
|
|
#if ENABLED(SDSORT_CACHE_NAMES)
|
|
|
|
if (match != NULL) {
|
|
|
|
while (nr < sort_count) {
|
|
|
|
if (strcasecmp(match, sortshort[nr]) == 0) break;
|
|
|
|
nr++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (nr < sort_count) {
|
|
|
|
strcpy(filename, sortshort[nr]);
|
|
|
|
strcpy(longFilename, sortnames[nr]);
|
|
|
|
filenameIsDir = TEST(isDir[nr>>3], nr & 0x07);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif // SDSORT_CACHE_NAMES
|
2015-03-02 16:06:01 +01:00
|
|
|
curDir = &workDir;
|
|
|
|
lsAction = LS_GetFilename;
|
2017-07-30 07:02:41 +02:00
|
|
|
nrFile_index = nr;
|
2011-11-19 13:13:34 +01:00
|
|
|
curDir->rewind();
|
2015-03-02 16:06:01 +01:00
|
|
|
lsDive("", *curDir, match);
|
2011-11-06 21:39:53 +01:00
|
|
|
}
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
uint16_t CardReader::getnrfilenames() {
|
|
|
|
curDir = &workDir;
|
|
|
|
lsAction = LS_Count;
|
|
|
|
nrFiles = 0;
|
2011-11-19 13:13:34 +01:00
|
|
|
curDir->rewind();
|
2015-03-02 16:06:01 +01:00
|
|
|
lsDive("", *curDir);
|
2011-11-20 14:43:47 +01:00
|
|
|
//SERIAL_ECHOLN(nrFiles);
|
2011-11-19 13:13:34 +01:00
|
|
|
return nrFiles;
|
2011-11-06 21:39:53 +01:00
|
|
|
}
|
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
void CardReader::chdir(const char * relpath) {
|
2017-11-15 07:15:57 +01:00
|
|
|
SdFile newDir;
|
2015-03-02 16:06:01 +01:00
|
|
|
SdFile *parent = &root;
|
|
|
|
|
|
|
|
if (workDir.isOpen()) parent = &workDir;
|
|
|
|
|
2017-11-15 07:15:57 +01:00
|
|
|
if (!newDir.open(*parent, relpath, O_READ)) {
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_ECHO_START();
|
2015-03-02 16:06:01 +01:00
|
|
|
SERIAL_ECHOPGM(MSG_SD_CANT_ENTER_SUBDIR);
|
|
|
|
SERIAL_ECHOLN(relpath);
|
2011-11-20 14:43:47 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
else {
|
2017-11-15 07:15:57 +01:00
|
|
|
workDir = newDir;
|
2016-03-29 12:18:53 +02:00
|
|
|
if (workDirDepth < MAX_DIR_DEPTH)
|
2017-11-15 07:15:57 +01:00
|
|
|
workDirParents[workDirDepth++] = workDir;
|
2017-02-09 14:02:25 +01:00
|
|
|
#if ENABLED(SDCARD_SORT_ALPHA)
|
|
|
|
presort();
|
|
|
|
#endif
|
2011-11-20 14:43:47 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-26 08:14:18 +01:00
|
|
|
int8_t CardReader::updir() {
|
|
|
|
if (workDirDepth > 0) { // At least 1 dir has been saved
|
|
|
|
workDir = --workDirDepth ? workDirParents[workDirDepth - 1] : root; // Use parent, or root if none
|
2017-02-09 14:02:25 +01:00
|
|
|
#if ENABLED(SDCARD_SORT_ALPHA)
|
|
|
|
presort();
|
|
|
|
#endif
|
|
|
|
}
|
2017-11-26 08:14:18 +01:00
|
|
|
return workDirDepth;
|
2014-11-24 23:03:20 +01:00
|
|
|
}
|
|
|
|
|
2017-02-09 14:02:25 +01:00
|
|
|
#if ENABLED(SDCARD_SORT_ALPHA)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the name of a file in the current directory by sort-index
|
|
|
|
*/
|
|
|
|
void CardReader::getfilename_sorted(const uint16_t nr) {
|
|
|
|
getfilename(
|
|
|
|
#if ENABLED(SDSORT_GCODE)
|
|
|
|
sort_alpha &&
|
|
|
|
#endif
|
|
|
|
(nr < sort_count) ? sort_order[nr] : nr
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Read all the files and produce a sort key
|
|
|
|
*
|
|
|
|
* We can do this in 3 ways...
|
|
|
|
* - Minimal RAM: Read two filenames at a time sorting along...
|
|
|
|
* - Some RAM: Buffer the directory just for this sort
|
|
|
|
* - Most RAM: Buffer the directory and return filenames from RAM
|
|
|
|
*/
|
|
|
|
void CardReader::presort() {
|
|
|
|
|
|
|
|
// Sorting may be turned off
|
|
|
|
#if ENABLED(SDSORT_GCODE)
|
|
|
|
if (!sort_alpha) return;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// Throw away old sort index
|
|
|
|
flush_presort();
|
|
|
|
|
|
|
|
// If there are files, sort up to the limit
|
|
|
|
uint16_t fileCnt = getnrfilenames();
|
|
|
|
if (fileCnt > 0) {
|
|
|
|
|
|
|
|
// Never sort more than the max allowed
|
|
|
|
// If you use folders to organize, 20 may be enough
|
|
|
|
if (fileCnt > SDSORT_LIMIT) fileCnt = SDSORT_LIMIT;
|
|
|
|
|
2017-02-09 14:05:34 +01:00
|
|
|
// Sort order is always needed. May be static or dynamic.
|
|
|
|
#if ENABLED(SDSORT_DYNAMIC_RAM)
|
|
|
|
sort_order = new uint8_t[fileCnt];
|
|
|
|
#endif
|
|
|
|
|
2017-02-09 14:02:25 +01:00
|
|
|
// Use RAM to store the entire directory during pre-sort.
|
|
|
|
// SDSORT_LIMIT should be set to prevent over-allocation.
|
|
|
|
#if ENABLED(SDSORT_USES_RAM)
|
|
|
|
|
2017-02-09 14:05:34 +01:00
|
|
|
// If using dynamic ram for names, allocate on the heap.
|
|
|
|
#if ENABLED(SDSORT_CACHE_NAMES)
|
|
|
|
#if ENABLED(SDSORT_DYNAMIC_RAM)
|
|
|
|
sortshort = new char*[fileCnt];
|
|
|
|
sortnames = new char*[fileCnt];
|
2017-02-09 14:02:25 +01:00
|
|
|
#endif
|
2017-02-09 14:05:34 +01:00
|
|
|
#elif ENABLED(SDSORT_USES_STACK)
|
2017-10-19 05:18:51 +02:00
|
|
|
char sortnames[fileCnt][SORTED_LONGNAME_MAXLEN];
|
2017-02-09 14:05:34 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
// Folder sorting needs 1 bit per entry for flags.
|
|
|
|
#if HAS_FOLDER_SORTING
|
|
|
|
#if ENABLED(SDSORT_DYNAMIC_RAM)
|
|
|
|
isDir = new uint8_t[(fileCnt + 7) >> 3];
|
|
|
|
#elif ENABLED(SDSORT_USES_STACK)
|
2017-02-09 14:02:25 +01:00
|
|
|
uint8_t isDir[(fileCnt + 7) >> 3];
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#else // !SDSORT_USES_RAM
|
|
|
|
|
|
|
|
// By default re-read the names from SD for every compare
|
|
|
|
// retaining only two filenames at a time. This is very
|
|
|
|
// slow but is safest and uses minimal RAM.
|
|
|
|
char name1[LONG_FILENAME_LENGTH + 1];
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (fileCnt > 1) {
|
|
|
|
|
|
|
|
// Init sort order.
|
|
|
|
for (uint16_t i = 0; i < fileCnt; i++) {
|
|
|
|
sort_order[i] = i;
|
|
|
|
// If using RAM then read all filenames now.
|
|
|
|
#if ENABLED(SDSORT_USES_RAM)
|
|
|
|
getfilename(i);
|
2017-02-09 14:05:34 +01:00
|
|
|
#if ENABLED(SDSORT_DYNAMIC_RAM)
|
|
|
|
// Use dynamic method to copy long filename
|
|
|
|
sortnames[i] = strdup(LONGEST_FILENAME);
|
|
|
|
#if ENABLED(SDSORT_CACHE_NAMES)
|
|
|
|
// When caching also store the short name, since
|
|
|
|
// we're replacing the getfilename() behavior.
|
|
|
|
sortshort[i] = strdup(filename);
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
// Copy filenames into the static array
|
2017-10-19 05:18:51 +02:00
|
|
|
#if SORTED_LONGNAME_MAXLEN != LONG_FILENAME_LENGTH
|
|
|
|
strncpy(sortnames[i], LONGEST_FILENAME, SORTED_LONGNAME_MAXLEN);
|
|
|
|
sortnames[i][SORTED_LONGNAME_MAXLEN - 1] = '\0';
|
|
|
|
#else
|
2017-10-27 20:42:19 +02:00
|
|
|
strncpy(sortnames[i], LONGEST_FILENAME, SORTED_LONGNAME_MAXLEN);
|
2017-10-19 05:18:51 +02:00
|
|
|
#endif
|
2017-02-09 14:05:34 +01:00
|
|
|
#if ENABLED(SDSORT_CACHE_NAMES)
|
|
|
|
strcpy(sortshort[i], filename);
|
|
|
|
#endif
|
2017-02-09 14:02:25 +01:00
|
|
|
#endif
|
|
|
|
// char out[30];
|
|
|
|
// sprintf_P(out, PSTR("---- %i %s %s"), i, filenameIsDir ? "D" : " ", sortnames[i]);
|
|
|
|
// SERIAL_ECHOLN(out);
|
|
|
|
#if HAS_FOLDER_SORTING
|
|
|
|
const uint16_t bit = i & 0x07, ind = i >> 3;
|
|
|
|
if (bit == 0) isDir[ind] = 0x00;
|
|
|
|
if (filenameIsDir) isDir[ind] |= _BV(bit);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
// Bubble Sort
|
|
|
|
for (uint16_t i = fileCnt; --i;) {
|
|
|
|
bool didSwap = false;
|
|
|
|
for (uint16_t j = 0; j < i; ++j) {
|
|
|
|
const uint16_t o1 = sort_order[j], o2 = sort_order[j + 1];
|
|
|
|
|
|
|
|
// Compare names from the array or just the two buffered names
|
|
|
|
#if ENABLED(SDSORT_USES_RAM)
|
|
|
|
#define _SORT_CMP_NODIR() (strcasecmp(sortnames[o1], sortnames[o2]) > 0)
|
|
|
|
#else
|
|
|
|
#define _SORT_CMP_NODIR() (strcasecmp(name1, name2) > 0)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if HAS_FOLDER_SORTING
|
|
|
|
#if ENABLED(SDSORT_USES_RAM)
|
|
|
|
// Folder sorting needs an index and bit to test for folder-ness.
|
|
|
|
const uint8_t ind1 = o1 >> 3, bit1 = o1 & 0x07,
|
|
|
|
ind2 = o2 >> 3, bit2 = o2 & 0x07;
|
|
|
|
#define _SORT_CMP_DIR(fs) \
|
|
|
|
(((isDir[ind1] & _BV(bit1)) != 0) == ((isDir[ind2] & _BV(bit2)) != 0) \
|
|
|
|
? _SORT_CMP_NODIR() \
|
|
|
|
: (isDir[fs > 0 ? ind1 : ind2] & (fs > 0 ? _BV(bit1) : _BV(bit2))) != 0)
|
|
|
|
#else
|
|
|
|
#define _SORT_CMP_DIR(fs) ((dir1 == filenameIsDir) ? _SORT_CMP_NODIR() : (fs > 0 ? dir1 : !dir1))
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// The most economical method reads names as-needed
|
|
|
|
// throughout the loop. Slow if there are many.
|
|
|
|
#if DISABLED(SDSORT_USES_RAM)
|
|
|
|
getfilename(o1);
|
|
|
|
strcpy(name1, LONGEST_FILENAME); // save (or getfilename below will trounce it)
|
|
|
|
#if HAS_FOLDER_SORTING
|
|
|
|
bool dir1 = filenameIsDir;
|
|
|
|
#endif
|
|
|
|
getfilename(o2);
|
|
|
|
char *name2 = LONGEST_FILENAME; // use the string in-place
|
|
|
|
#endif // !SDSORT_USES_RAM
|
|
|
|
|
|
|
|
// Sort the current pair according to settings.
|
|
|
|
if (
|
|
|
|
#if HAS_FOLDER_SORTING
|
|
|
|
#if ENABLED(SDSORT_GCODE)
|
|
|
|
sort_folders ? _SORT_CMP_DIR(sort_folders) : _SORT_CMP_NODIR()
|
|
|
|
#else
|
|
|
|
_SORT_CMP_DIR(FOLDER_SORTING)
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
_SORT_CMP_NODIR()
|
|
|
|
#endif
|
|
|
|
) {
|
|
|
|
sort_order[j] = o2;
|
|
|
|
sort_order[j + 1] = o1;
|
|
|
|
didSwap = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!didSwap) break;
|
|
|
|
}
|
2017-02-09 14:05:34 +01:00
|
|
|
// Using RAM but not keeping names around
|
|
|
|
#if ENABLED(SDSORT_USES_RAM) && DISABLED(SDSORT_CACHE_NAMES)
|
|
|
|
#if ENABLED(SDSORT_DYNAMIC_RAM)
|
|
|
|
for (uint16_t i = 0; i < fileCnt; ++i) free(sortnames[i]);
|
|
|
|
#if HAS_FOLDER_SORTING
|
|
|
|
free(isDir);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
2017-02-09 14:02:25 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
sort_order[0] = 0;
|
|
|
|
#if ENABLED(SDSORT_USES_RAM) && ENABLED(SDSORT_CACHE_NAMES)
|
|
|
|
getfilename(0);
|
2017-02-09 14:05:34 +01:00
|
|
|
#if ENABLED(SDSORT_DYNAMIC_RAM)
|
|
|
|
sortnames = new char*[1];
|
|
|
|
sortnames[0] = strdup(LONGEST_FILENAME); // malloc
|
2017-10-19 05:18:51 +02:00
|
|
|
#if ENABLED(SDSORT_CACHE_NAMES)
|
|
|
|
sortshort = new char*[1];
|
|
|
|
sortshort[0] = strdup(filename); // malloc
|
|
|
|
#endif
|
2017-02-09 14:05:34 +01:00
|
|
|
isDir = new uint8_t[1];
|
|
|
|
#else
|
2017-10-19 05:18:51 +02:00
|
|
|
#if SORTED_LONGNAME_MAXLEN != LONG_FILENAME_LENGTH
|
|
|
|
strncpy(sortnames[0], LONGEST_FILENAME, SORTED_LONGNAME_MAXLEN);
|
|
|
|
sortnames[0][SORTED_LONGNAME_MAXLEN - 1] = '\0';
|
|
|
|
#else
|
2017-10-27 20:42:19 +02:00
|
|
|
strncpy(sortnames[0], LONGEST_FILENAME, SORTED_LONGNAME_MAXLEN);
|
2017-10-19 05:18:51 +02:00
|
|
|
#endif
|
|
|
|
#if ENABLED(SDSORT_CACHE_NAMES)
|
|
|
|
strcpy(sortshort[0], filename);
|
|
|
|
#endif
|
2017-02-09 14:05:34 +01:00
|
|
|
#endif
|
2017-02-09 14:02:25 +01:00
|
|
|
isDir[0] = filenameIsDir ? 0x01 : 0x00;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
sort_count = fileCnt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void CardReader::flush_presort() {
|
2017-02-09 14:05:34 +01:00
|
|
|
if (sort_count > 0) {
|
|
|
|
#if ENABLED(SDSORT_DYNAMIC_RAM)
|
|
|
|
delete sort_order;
|
|
|
|
#if ENABLED(SDSORT_CACHE_NAMES)
|
|
|
|
for (uint8_t i = 0; i < sort_count; ++i) {
|
|
|
|
free(sortshort[i]); // strdup
|
|
|
|
free(sortnames[i]); // strdup
|
|
|
|
}
|
|
|
|
delete sortshort;
|
|
|
|
delete sortnames;
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
sort_count = 0;
|
|
|
|
}
|
2017-02-09 14:02:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif // SDCARD_SORT_ALPHA
|
|
|
|
|
2017-09-06 13:28:32 +02:00
|
|
|
uint16_t CardReader::get_num_Files() {
|
|
|
|
return
|
|
|
|
#if ENABLED(SDCARD_SORT_ALPHA) && SDSORT_USES_RAM && SDSORT_CACHE_NAMES
|
|
|
|
nrFiles // no need to access the SD card for filenames
|
|
|
|
#else
|
|
|
|
getnrfilenames()
|
|
|
|
#endif
|
|
|
|
;
|
|
|
|
}
|
2017-07-30 07:02:41 +02:00
|
|
|
|
2015-03-02 16:06:01 +01:00
|
|
|
void CardReader::printingHasFinished() {
|
2016-04-27 16:15:20 +02:00
|
|
|
stepper.synchronize();
|
2016-07-14 18:59:42 +02:00
|
|
|
file.close();
|
2015-03-02 16:06:01 +01:00
|
|
|
if (file_subcall_ctr > 0) { // Heading up to a parent file that called current as a procedure.
|
|
|
|
file_subcall_ctr--;
|
2016-03-29 12:15:01 +02:00
|
|
|
openFile(proc_filenames[file_subcall_ctr], true, true);
|
2015-03-02 16:06:01 +01:00
|
|
|
setIndex(filespos[file_subcall_ctr]);
|
|
|
|
startFileprint();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
sdprinting = false;
|
2016-03-29 12:19:27 +02:00
|
|
|
if (SD_FINISHED_STEPPERRELEASE)
|
2016-02-21 02:35:35 +01:00
|
|
|
enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
|
2016-07-14 18:59:42 +02:00
|
|
|
print_job_timer.stop();
|
2016-08-03 04:56:35 +02:00
|
|
|
if (print_job_timer.duration() > 60)
|
|
|
|
enqueue_and_echo_commands_P(PSTR("M31"));
|
2017-02-09 14:02:25 +01:00
|
|
|
#if ENABLED(SDCARD_SORT_ALPHA)
|
|
|
|
presort();
|
|
|
|
#endif
|
2017-10-26 22:50:18 +02:00
|
|
|
|
|
|
|
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
|
2017-10-27 06:39:51 +02:00
|
|
|
lcd_reselect_last_file();
|
2017-10-26 22:50:18 +02:00
|
|
|
#endif
|
2015-03-02 16:06:01 +01:00
|
|
|
}
|
2011-11-26 11:51:38 +01:00
|
|
|
}
|
2015-03-02 16:06:01 +01:00
|
|
|
|
2017-05-09 19:35:43 +02:00
|
|
|
#endif // SDSUPPORT
|