|
|
|
@ -7,91 +7,69 @@
|
|
|
|
|
|
|
|
|
|
#ifdef SDSUPPORT
|
|
|
|
|
|
|
|
|
|
CardReader::CardReader() {
|
|
|
|
|
filesize = 0;
|
|
|
|
|
sdpos = 0;
|
|
|
|
|
sdprinting = false;
|
|
|
|
|
cardOK = false;
|
|
|
|
|
saving = false;
|
|
|
|
|
logging = false;
|
|
|
|
|
workDirDepth = 0;
|
|
|
|
|
file_subcall_ctr = 0;
|
|
|
|
|
memset(workDirParents, 0, sizeof(workDirParents));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
CardReader::CardReader()
|
|
|
|
|
{
|
|
|
|
|
filesize = 0;
|
|
|
|
|
sdpos = 0;
|
|
|
|
|
sdprinting = false;
|
|
|
|
|
cardOK = false;
|
|
|
|
|
saving = false;
|
|
|
|
|
logging = false;
|
|
|
|
|
autostart_atmillis=0;
|
|
|
|
|
workDirDepth = 0;
|
|
|
|
|
file_subcall_ctr=0;
|
|
|
|
|
memset(workDirParents, 0, sizeof(workDirParents));
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
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;
|
|
|
|
|
//power to SD reader
|
|
|
|
|
#if SDPOWER > -1
|
|
|
|
|
SET_OUTPUT(SDPOWER);
|
|
|
|
|
WRITE(SDPOWER,HIGH);
|
|
|
|
|
WRITE(SDPOWER, HIGH);
|
|
|
|
|
#endif //SDPOWER
|
|
|
|
|
|
|
|
|
|
autostart_atmillis=millis()+5000;
|
|
|
|
|
autostart_atmillis = millis() + 5000;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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];
|
|
|
|
|
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];
|
|
|
|
|
}
|
|
|
|
|
*pos++=0;
|
|
|
|
|
*pos++ = 0;
|
|
|
|
|
return buffer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void CardReader::lsDive(const char *prepend, SdFile parent, const char * const match/*=NULL*/)
|
|
|
|
|
{
|
|
|
|
|
void CardReader::lsDive(const char *prepend, SdFile parent, const char * const match/*=NULL*/) {
|
|
|
|
|
dir_t p;
|
|
|
|
|
uint8_t cnt=0;
|
|
|
|
|
|
|
|
|
|
while (parent.readDir(p, longFilename) > 0)
|
|
|
|
|
{
|
|
|
|
|
if( DIR_IS_SUBDIR(&p) && lsAction!=LS_Count && lsAction!=LS_GetFilename) // hence LS_SerialPrint
|
|
|
|
|
{
|
|
|
|
|
uint8_t cnt = 0;
|
|
|
|
|
|
|
|
|
|
while (parent.readDir(p, longFilename) > 0) {
|
|
|
|
|
if (DIR_IS_SUBDIR(&p) && lsAction != LS_Count && lsAction != LS_GetFilename) { // hence LS_SerialPrint
|
|
|
|
|
char path[FILENAME_LENGTH*2];
|
|
|
|
|
char lfilename[FILENAME_LENGTH];
|
|
|
|
|
createFilename(lfilename,p);
|
|
|
|
|
createFilename(lfilename, p);
|
|
|
|
|
|
|
|
|
|
path[0]=0;
|
|
|
|
|
if(prepend[0]==0) //avoid leading / if already in prepend
|
|
|
|
|
{
|
|
|
|
|
strcat(path,"/");
|
|
|
|
|
}
|
|
|
|
|
strcat(path,prepend);
|
|
|
|
|
strcat(path,lfilename);
|
|
|
|
|
strcat(path,"/");
|
|
|
|
|
path[0] = 0;
|
|
|
|
|
if (prepend[0] == 0) strcat(path, "/"); //avoid leading / if already in prepend
|
|
|
|
|
strcat(path, prepend);
|
|
|
|
|
strcat(path, lfilename);
|
|
|
|
|
strcat(path, "/");
|
|
|
|
|
|
|
|
|
|
//Serial.print(path);
|
|
|
|
|
|
|
|
|
|
SdFile dir;
|
|
|
|
|
if(!dir.open(parent,lfilename, O_READ))
|
|
|
|
|
{
|
|
|
|
|
if(lsAction==LS_SerialPrint)
|
|
|
|
|
{
|
|
|
|
|
if (!dir.open(parent, lfilename, O_READ)) {
|
|
|
|
|
if (lsAction == LS_SerialPrint) {
|
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
|
SERIAL_ECHOLN(MSG_SD_CANT_OPEN_SUBDIR);
|
|
|
|
|
SERIAL_ECHOLN(lfilename);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
lsDive(path,dir);
|
|
|
|
|
lsDive(path, dir);
|
|
|
|
|
//close done automatically by destructor of SdFile
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
else {
|
|
|
|
|
char pn0 = p.name[0];
|
|
|
|
|
if (pn0 == DIR_NAME_FREE) break;
|
|
|
|
|
if (pn0 == DIR_NAME_DELETED || pn0 == '.' || pn0 == '_') continue;
|
|
|
|
@ -99,164 +77,124 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
|
|
|
|
|
if (lf0 == '.' || lf0 == '_') continue;
|
|
|
|
|
|
|
|
|
|
if (!DIR_IS_FILE_OR_SUBDIR(&p)) continue;
|
|
|
|
|
filenameIsDir=DIR_IS_SUBDIR(&p);
|
|
|
|
|
|
|
|
|
|
filenameIsDir = DIR_IS_SUBDIR(&p);
|
|
|
|
|
|
|
|
|
|
if(!filenameIsDir)
|
|
|
|
|
{
|
|
|
|
|
if(p.name[8]!='G') continue;
|
|
|
|
|
if(p.name[9]=='~') continue;
|
|
|
|
|
}
|
|
|
|
|
//if(cnt++!=nr) continue;
|
|
|
|
|
createFilename(filename,p);
|
|
|
|
|
if(lsAction==LS_SerialPrint)
|
|
|
|
|
{
|
|
|
|
|
if (!filenameIsDir && (p.name[8] != 'G' || p.name[9] == '~')) continue;
|
|
|
|
|
|
|
|
|
|
//if (cnt++ != nr) continue;
|
|
|
|
|
createFilename(filename, p);
|
|
|
|
|
if (lsAction == LS_SerialPrint) {
|
|
|
|
|
SERIAL_PROTOCOL(prepend);
|
|
|
|
|
SERIAL_PROTOCOLLN(filename);
|
|
|
|
|
}
|
|
|
|
|
else if(lsAction==LS_Count)
|
|
|
|
|
{
|
|
|
|
|
else if (lsAction == LS_Count) {
|
|
|
|
|
nrFiles++;
|
|
|
|
|
}
|
|
|
|
|
else if(lsAction==LS_GetFilename)
|
|
|
|
|
{
|
|
|
|
|
else if (lsAction == LS_GetFilename) {
|
|
|
|
|
if (match != NULL) {
|
|
|
|
|
if (strcasecmp(match, filename) == 0) return;
|
|
|
|
|
}
|
|
|
|
|
else if (cnt == nrFiles) return;
|
|
|
|
|
cnt++;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::ls()
|
|
|
|
|
{
|
|
|
|
|
lsAction=LS_SerialPrint;
|
|
|
|
|
if(lsAction==LS_Count)
|
|
|
|
|
nrFiles=0;
|
|
|
|
|
|
|
|
|
|
void CardReader::ls() {
|
|
|
|
|
lsAction = LS_SerialPrint;
|
|
|
|
|
root.rewind();
|
|
|
|
|
lsDive("",root);
|
|
|
|
|
lsDive("", root);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void CardReader::initsd()
|
|
|
|
|
{
|
|
|
|
|
void CardReader::initsd() {
|
|
|
|
|
cardOK = false;
|
|
|
|
|
if(root.isOpen())
|
|
|
|
|
root.close();
|
|
|
|
|
#ifdef SDSLOW
|
|
|
|
|
if (!card.init(SPI_HALF_SPEED,SDSS)
|
|
|
|
|
#if defined(LCD_SDSS) && (LCD_SDSS != SDSS)
|
|
|
|
|
&& !card.init(SPI_HALF_SPEED,LCD_SDSS)
|
|
|
|
|
#endif
|
|
|
|
|
)
|
|
|
|
|
#else
|
|
|
|
|
if (!card.init(SPI_FULL_SPEED,SDSS)
|
|
|
|
|
#if defined(LCD_SDSS) && (LCD_SDSS != SDSS)
|
|
|
|
|
&& !card.init(SPI_FULL_SPEED,LCD_SDSS)
|
|
|
|
|
if (root.isOpen()) root.close();
|
|
|
|
|
|
|
|
|
|
#ifdef SDSLOW
|
|
|
|
|
#define SPI_SPEED SPI_HALF_SPEED
|
|
|
|
|
#else
|
|
|
|
|
#define SPI_SPEED SPI_FULL_SPEED
|
|
|
|
|
#endif
|
|
|
|
|
)
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
if (!card.init(SPI_SPEED,SDSS)
|
|
|
|
|
#if defined(LCD_SDSS) && (LCD_SDSS != SDSS)
|
|
|
|
|
&& !card.init(SPI_SPEED, LCD_SDSS)
|
|
|
|
|
#endif
|
|
|
|
|
) {
|
|
|
|
|
//if (!card.init(SPI_HALF_SPEED,SDSS))
|
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
|
SERIAL_ECHOLNPGM(MSG_SD_INIT_FAIL);
|
|
|
|
|
}
|
|
|
|
|
else if (!volume.init(&card))
|
|
|
|
|
{
|
|
|
|
|
else if (!volume.init(&card)) {
|
|
|
|
|
SERIAL_ERROR_START;
|
|
|
|
|
SERIAL_ERRORLNPGM(MSG_SD_VOL_INIT_FAIL);
|
|
|
|
|
}
|
|
|
|
|
else if (!root.openRoot(&volume))
|
|
|
|
|
{
|
|
|
|
|
else if (!root.openRoot(&volume)) {
|
|
|
|
|
SERIAL_ERROR_START;
|
|
|
|
|
SERIAL_ERRORLNPGM(MSG_SD_OPENROOT_FAIL);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
else {
|
|
|
|
|
cardOK = true;
|
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
|
SERIAL_ECHOLNPGM(MSG_SD_CARD_OK);
|
|
|
|
|
}
|
|
|
|
|
workDir=root;
|
|
|
|
|
curDir=&root;
|
|
|
|
|
workDir = root;
|
|
|
|
|
curDir = &root;
|
|
|
|
|
/*
|
|
|
|
|
if(!workDir.openRoot(&volume))
|
|
|
|
|
{
|
|
|
|
|
if (!workDir.openRoot(&volume)) {
|
|
|
|
|
SERIAL_ECHOLNPGM(MSG_SD_WORKDIR_FAIL);
|
|
|
|
|
}
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::setroot()
|
|
|
|
|
{
|
|
|
|
|
/*if(!workDir.openRoot(&volume))
|
|
|
|
|
{
|
|
|
|
|
void CardReader::setroot() {
|
|
|
|
|
/*if (!workDir.openRoot(&volume)) {
|
|
|
|
|
SERIAL_ECHOLNPGM(MSG_SD_WORKDIR_FAIL);
|
|
|
|
|
}*/
|
|
|
|
|
workDir=root;
|
|
|
|
|
|
|
|
|
|
curDir=&workDir;
|
|
|
|
|
workDir = root;
|
|
|
|
|
curDir = &workDir;
|
|
|
|
|
}
|
|
|
|
|
void CardReader::release()
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
void CardReader::release() {
|
|
|
|
|
sdprinting = false;
|
|
|
|
|
cardOK = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::startFileprint()
|
|
|
|
|
{
|
|
|
|
|
if(cardOK)
|
|
|
|
|
{
|
|
|
|
|
void CardReader::startFileprint() {
|
|
|
|
|
if (cardOK) {
|
|
|
|
|
sdprinting = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::pauseSDPrint()
|
|
|
|
|
{
|
|
|
|
|
if(sdprinting)
|
|
|
|
|
{
|
|
|
|
|
sdprinting = false;
|
|
|
|
|
}
|
|
|
|
|
void CardReader::pauseSDPrint() {
|
|
|
|
|
if (sdprinting) sdprinting = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void CardReader::openLogFile(char* name)
|
|
|
|
|
{
|
|
|
|
|
void CardReader::openLogFile(char* name) {
|
|
|
|
|
logging = true;
|
|
|
|
|
openFile(name, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::getAbsFilename(char *t)
|
|
|
|
|
{
|
|
|
|
|
uint8_t cnt=0;
|
|
|
|
|
*t='/';t++;cnt++;
|
|
|
|
|
for(uint8_t i=0;i<workDirDepth;i++)
|
|
|
|
|
{
|
|
|
|
|
void CardReader::getAbsFilename(char *t) {
|
|
|
|
|
uint8_t cnt = 0;
|
|
|
|
|
*t = '/'; t++; cnt++;
|
|
|
|
|
for (uint8_t i = 0; i < workDirDepth; i++) {
|
|
|
|
|
workDirParents[i].getFilename(t); //SDBaseFile.getfilename!
|
|
|
|
|
while(*t!=0 && cnt< MAXPATHNAMELENGTH)
|
|
|
|
|
{t++;cnt++;} //crawl counter forward.
|
|
|
|
|
while(*t && cnt < MAXPATHNAMELENGTH) { t++; cnt++; } //crawl counter forward.
|
|
|
|
|
}
|
|
|
|
|
if(cnt<MAXPATHNAMELENGTH-FILENAME_LENGTH)
|
|
|
|
|
if (cnt < MAXPATHNAMELENGTH - FILENAME_LENGTH)
|
|
|
|
|
file.getFilename(t);
|
|
|
|
|
else
|
|
|
|
|
t[0]=0;
|
|
|
|
|
t[0] = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::openFile(char* name,bool read, bool replace_current/*=true*/)
|
|
|
|
|
{
|
|
|
|
|
if(!cardOK)
|
|
|
|
|
return;
|
|
|
|
|
if(file.isOpen()) //replacing current file by new file, or subfile call
|
|
|
|
|
{
|
|
|
|
|
if(!replace_current)
|
|
|
|
|
{
|
|
|
|
|
if((int)file_subcall_ctr>(int)SD_PROCEDURE_DEPTH-1)
|
|
|
|
|
{
|
|
|
|
|
void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/) {
|
|
|
|
|
if (!cardOK) return;
|
|
|
|
|
if (file.isOpen()) { //replacing current file by new file, or subfile call
|
|
|
|
|
if (!replace_current) {
|
|
|
|
|
if (file_subcall_ctr > SD_PROCEDURE_DEPTH - 1) {
|
|
|
|
|
SERIAL_ERROR_START;
|
|
|
|
|
SERIAL_ERRORPGM("trying to call sub-gcode files with too many levels. MAX level is:");
|
|
|
|
|
SERIAL_ERRORLN(SD_PROCEDURE_DEPTH);
|
|
|
|
@ -275,79 +213,67 @@ void CardReader::openFile(char* name,bool read, bool replace_current/*=true*/)
|
|
|
|
|
SERIAL_ECHO(filenames[file_subcall_ctr]);
|
|
|
|
|
SERIAL_ECHOPGM("\" pos");
|
|
|
|
|
SERIAL_ECHOLN(sdpos);
|
|
|
|
|
filespos[file_subcall_ctr]=sdpos;
|
|
|
|
|
filespos[file_subcall_ctr] = sdpos;
|
|
|
|
|
file_subcall_ctr++;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
else {
|
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
|
SERIAL_ECHOPGM("Now doing file: ");
|
|
|
|
|
SERIAL_ECHOLN(name);
|
|
|
|
|
}
|
|
|
|
|
file.close();
|
|
|
|
|
}
|
|
|
|
|
else //opening fresh file
|
|
|
|
|
{
|
|
|
|
|
file_subcall_ctr=0; //resetting procedure depth in case user cancels print while in procedure
|
|
|
|
|
else { //opening fresh file
|
|
|
|
|
file_subcall_ctr = 0; //resetting procedure depth in case user cancels print while in procedure
|
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
|
SERIAL_ECHOPGM("Now fresh file: ");
|
|
|
|
|
SERIAL_ECHOLN(name);
|
|
|
|
|
}
|
|
|
|
|
sdprinting = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SdFile myDir;
|
|
|
|
|
curDir=&root;
|
|
|
|
|
char *fname=name;
|
|
|
|
|
|
|
|
|
|
char *dirname_start,*dirname_end;
|
|
|
|
|
if(name[0]=='/')
|
|
|
|
|
{
|
|
|
|
|
dirname_start=strchr(name,'/')+1;
|
|
|
|
|
while(dirname_start>0)
|
|
|
|
|
{
|
|
|
|
|
dirname_end=strchr(dirname_start,'/');
|
|
|
|
|
//SERIAL_ECHO("start:");SERIAL_ECHOLN((int)(dirname_start-name));
|
|
|
|
|
//SERIAL_ECHO("end :");SERIAL_ECHOLN((int)(dirname_end-name));
|
|
|
|
|
if(dirname_end>0 && dirname_end>dirname_start)
|
|
|
|
|
{
|
|
|
|
|
curDir = &root;
|
|
|
|
|
char *fname = name;
|
|
|
|
|
|
|
|
|
|
char *dirname_start, *dirname_end;
|
|
|
|
|
if (name[0] == '/') {
|
|
|
|
|
dirname_start = &name[1];
|
|
|
|
|
while(dirname_start > 0) {
|
|
|
|
|
dirname_end = strchr(dirname_start, '/');
|
|
|
|
|
//SERIAL_ECHO("start:");SERIAL_ECHOLN((int)(dirname_start - name));
|
|
|
|
|
//SERIAL_ECHO("end :");SERIAL_ECHOLN((int)(dirname_end - name));
|
|
|
|
|
if (dirname_end > 0 && dirname_end > dirname_start) {
|
|
|
|
|
char subdirname[FILENAME_LENGTH];
|
|
|
|
|
strncpy(subdirname, dirname_start, dirname_end-dirname_start);
|
|
|
|
|
subdirname[dirname_end-dirname_start]=0;
|
|
|
|
|
strncpy(subdirname, dirname_start, dirname_end - dirname_start);
|
|
|
|
|
subdirname[dirname_end - dirname_start] = 0;
|
|
|
|
|
SERIAL_ECHOLN(subdirname);
|
|
|
|
|
if(!myDir.open(curDir,subdirname,O_READ))
|
|
|
|
|
{
|
|
|
|
|
if (!myDir.open(curDir, subdirname, O_READ)) {
|
|
|
|
|
SERIAL_PROTOCOLPGM(MSG_SD_OPEN_FILE_FAIL);
|
|
|
|
|
SERIAL_PROTOCOL(subdirname);
|
|
|
|
|
SERIAL_PROTOCOLLNPGM(".");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
else {
|
|
|
|
|
//SERIAL_ECHOLN("dive ok");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
curDir=&myDir;
|
|
|
|
|
dirname_start=dirname_end+1;
|
|
|
|
|
curDir = &myDir;
|
|
|
|
|
dirname_start = dirname_end + 1;
|
|
|
|
|
}
|
|
|
|
|
else // the reminder after all /fsa/fdsa/ is the filename
|
|
|
|
|
{
|
|
|
|
|
fname=dirname_start;
|
|
|
|
|
//SERIAL_ECHOLN("remaider");
|
|
|
|
|
else { // the remainder after all /fsa/fdsa/ is the filename
|
|
|
|
|
fname = dirname_start;
|
|
|
|
|
//SERIAL_ECHOLN("remainder");
|
|
|
|
|
//SERIAL_ECHOLN(fname);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else //relative path
|
|
|
|
|
{
|
|
|
|
|
curDir=&workDir;
|
|
|
|
|
else { //relative path
|
|
|
|
|
curDir = &workDir;
|
|
|
|
|
}
|
|
|
|
|
if(read)
|
|
|
|
|
{
|
|
|
|
|
if (file.open(curDir, fname, O_READ))
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
if (read) {
|
|
|
|
|
if (file.open(curDir, fname, O_READ)) {
|
|
|
|
|
filesize = file.fileSize();
|
|
|
|
|
SERIAL_PROTOCOLPGM(MSG_SD_FILE_OPENED);
|
|
|
|
|
SERIAL_PROTOCOL(fname);
|
|
|
|
@ -359,124 +285,105 @@ void CardReader::openFile(char* name,bool read, bool replace_current/*=true*/)
|
|
|
|
|
getfilename(0, fname);
|
|
|
|
|
lcd_setstatus(longFilename[0] ? longFilename : fname);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
else {
|
|
|
|
|
SERIAL_PROTOCOLPGM(MSG_SD_OPEN_FILE_FAIL);
|
|
|
|
|
SERIAL_PROTOCOL(fname);
|
|
|
|
|
SERIAL_PROTOCOLLNPGM(".");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{ //write
|
|
|
|
|
if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC))
|
|
|
|
|
{
|
|
|
|
|
else { //write
|
|
|
|
|
if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
|
|
|
|
|
SERIAL_PROTOCOLPGM(MSG_SD_OPEN_FILE_FAIL);
|
|
|
|
|
SERIAL_PROTOCOL(fname);
|
|
|
|
|
SERIAL_PROTOCOLLNPGM(".");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
else {
|
|
|
|
|
saving = true;
|
|
|
|
|
SERIAL_PROTOCOLPGM(MSG_SD_WRITE_TO_FILE);
|
|
|
|
|
SERIAL_PROTOCOLLN(name);
|
|
|
|
|
lcd_setstatus(fname);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::removeFile(char* name)
|
|
|
|
|
{
|
|
|
|
|
if(!cardOK)
|
|
|
|
|
return;
|
|
|
|
|
void CardReader::removeFile(char* name) {
|
|
|
|
|
if (!cardOK) return;
|
|
|
|
|
|
|
|
|
|
file.close();
|
|
|
|
|
sdprinting = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SdFile myDir;
|
|
|
|
|
curDir=&root;
|
|
|
|
|
char *fname=name;
|
|
|
|
|
|
|
|
|
|
char *dirname_start,*dirname_end;
|
|
|
|
|
if(name[0]=='/')
|
|
|
|
|
{
|
|
|
|
|
dirname_start=strchr(name,'/')+1;
|
|
|
|
|
while(dirname_start>0)
|
|
|
|
|
{
|
|
|
|
|
dirname_end=strchr(dirname_start,'/');
|
|
|
|
|
//SERIAL_ECHO("start:");SERIAL_ECHOLN((int)(dirname_start-name));
|
|
|
|
|
//SERIAL_ECHO("end :");SERIAL_ECHOLN((int)(dirname_end-name));
|
|
|
|
|
if(dirname_end>0 && dirname_end>dirname_start)
|
|
|
|
|
{
|
|
|
|
|
curDir = &root;
|
|
|
|
|
char *fname = name;
|
|
|
|
|
|
|
|
|
|
char *dirname_start, *dirname_end;
|
|
|
|
|
if (name[0] == '/') {
|
|
|
|
|
dirname_start = strchr(name, '/') + 1;
|
|
|
|
|
while (dirname_start > 0) {
|
|
|
|
|
dirname_end = strchr(dirname_start, '/');
|
|
|
|
|
//SERIAL_ECHO("start:");SERIAL_ECHOLN((int)(dirname_start - name));
|
|
|
|
|
//SERIAL_ECHO("end :");SERIAL_ECHOLN((int)(dirname_end - name));
|
|
|
|
|
if (dirname_end > 0 && dirname_end > dirname_start) {
|
|
|
|
|
char subdirname[FILENAME_LENGTH];
|
|
|
|
|
strncpy(subdirname, dirname_start, dirname_end-dirname_start);
|
|
|
|
|
subdirname[dirname_end-dirname_start]=0;
|
|
|
|
|
strncpy(subdirname, dirname_start, dirname_end - dirname_start);
|
|
|
|
|
subdirname[dirname_end - dirname_start] = 0;
|
|
|
|
|
SERIAL_ECHOLN(subdirname);
|
|
|
|
|
if(!myDir.open(curDir,subdirname,O_READ))
|
|
|
|
|
{
|
|
|
|
|
if (!myDir.open(curDir, subdirname, O_READ)) {
|
|
|
|
|
SERIAL_PROTOCOLPGM("open failed, File: ");
|
|
|
|
|
SERIAL_PROTOCOL(subdirname);
|
|
|
|
|
SERIAL_PROTOCOLLNPGM(".");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
else {
|
|
|
|
|
//SERIAL_ECHOLN("dive ok");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
curDir=&myDir;
|
|
|
|
|
dirname_start=dirname_end+1;
|
|
|
|
|
curDir = &myDir;
|
|
|
|
|
dirname_start = dirname_end + 1;
|
|
|
|
|
}
|
|
|
|
|
else // the reminder after all /fsa/fdsa/ is the filename
|
|
|
|
|
{
|
|
|
|
|
fname=dirname_start;
|
|
|
|
|
//SERIAL_ECHOLN("remaider");
|
|
|
|
|
else { // the remainder after all /fsa/fdsa/ is the filename
|
|
|
|
|
fname = dirname_start;
|
|
|
|
|
//SERIAL_ECHOLN("remainder");
|
|
|
|
|
//SERIAL_ECHOLN(fname);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else //relative path
|
|
|
|
|
{
|
|
|
|
|
curDir=&workDir;
|
|
|
|
|
else { // relative path
|
|
|
|
|
curDir = &workDir;
|
|
|
|
|
}
|
|
|
|
|
if (file.remove(curDir, fname))
|
|
|
|
|
{
|
|
|
|
|
SERIAL_PROTOCOLPGM("File deleted:");
|
|
|
|
|
SERIAL_PROTOCOLLN(fname);
|
|
|
|
|
sdpos = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
SERIAL_PROTOCOLPGM("Deletion failed, File: ");
|
|
|
|
|
SERIAL_PROTOCOL(fname);
|
|
|
|
|
SERIAL_PROTOCOLLNPGM(".");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (file.remove(curDir, fname)) {
|
|
|
|
|
SERIAL_PROTOCOLPGM("File deleted:");
|
|
|
|
|
SERIAL_PROTOCOLLN(fname);
|
|
|
|
|
sdpos = 0;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
SERIAL_PROTOCOLPGM("Deletion failed, File: ");
|
|
|
|
|
SERIAL_PROTOCOL(fname);
|
|
|
|
|
SERIAL_PROTOCOLLNPGM(".");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::getStatus()
|
|
|
|
|
{
|
|
|
|
|
if(cardOK){
|
|
|
|
|
void CardReader::getStatus() {
|
|
|
|
|
if (cardOK) {
|
|
|
|
|
SERIAL_PROTOCOLPGM(MSG_SD_PRINTING_BYTE);
|
|
|
|
|
SERIAL_PROTOCOL(sdpos);
|
|
|
|
|
SERIAL_PROTOCOLPGM("/");
|
|
|
|
|
SERIAL_PROTOCOLLN(filesize);
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
else {
|
|
|
|
|
SERIAL_PROTOCOLLNPGM(MSG_SD_NOT_PRINTING);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
void CardReader::write_command(char *buf)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
void CardReader::write_command(char *buf) {
|
|
|
|
|
char* begin = buf;
|
|
|
|
|
char* npos = 0;
|
|
|
|
|
char* end = buf + strlen(buf) - 1;
|
|
|
|
|
|
|
|
|
|
file.writeError = false;
|
|
|
|
|
if((npos = strchr(buf, 'N')) != NULL)
|
|
|
|
|
{
|
|
|
|
|
if ((npos = strchr(buf, 'N')) != NULL) {
|
|
|
|
|
begin = strchr(npos, ' ') + 1;
|
|
|
|
|
end = strchr(npos, '*') - 1;
|
|
|
|
|
}
|
|
|
|
@ -484,162 +391,129 @@ void CardReader::write_command(char *buf)
|
|
|
|
|
end[2] = '\n';
|
|
|
|
|
end[3] = '\0';
|
|
|
|
|
file.write(begin);
|
|
|
|
|
if (file.writeError)
|
|
|
|
|
{
|
|
|
|
|
if (file.writeError) {
|
|
|
|
|
SERIAL_ERROR_START;
|
|
|
|
|
SERIAL_ERRORLNPGM(MSG_SD_ERR_WRITE_TO_FILE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::checkautostart(bool force) {
|
|
|
|
|
if (!force && (!autostart_stilltocheck || autostart_atmillis < millis()))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
void CardReader::checkautostart(bool force)
|
|
|
|
|
{
|
|
|
|
|
if(!force)
|
|
|
|
|
{
|
|
|
|
|
if(!autostart_stilltocheck)
|
|
|
|
|
return;
|
|
|
|
|
if(autostart_atmillis<millis())
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
autostart_stilltocheck=false;
|
|
|
|
|
if(!cardOK)
|
|
|
|
|
{
|
|
|
|
|
autostart_stilltocheck = false;
|
|
|
|
|
|
|
|
|
|
if (!cardOK) {
|
|
|
|
|
initsd();
|
|
|
|
|
if(!cardOK) //fail
|
|
|
|
|
return;
|
|
|
|
|
if (!cardOK) return; // fail
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char autoname[30];
|
|
|
|
|
sprintf_P(autoname, PSTR("auto%i.g"), autostart_index);
|
|
|
|
|
for(int8_t i=0;i<(int8_t)strlen(autoname);i++)
|
|
|
|
|
autoname[i]=tolower(autoname[i]);
|
|
|
|
|
for (int8_t i = 0; i < (int8_t)strlen(autoname); i++) autoname[i] = tolower(autoname[i]);
|
|
|
|
|
|
|
|
|
|
dir_t p;
|
|
|
|
|
|
|
|
|
|
root.rewind();
|
|
|
|
|
|
|
|
|
|
bool found=false;
|
|
|
|
|
while (root.readDir(p, NULL) > 0)
|
|
|
|
|
{
|
|
|
|
|
for(int8_t i=0;i<(int8_t)strlen((char*)p.name);i++)
|
|
|
|
|
p.name[i]=tolower(p.name[i]);
|
|
|
|
|
//Serial.print((char*)p.name);
|
|
|
|
|
//Serial.print(" ");
|
|
|
|
|
//Serial.println(autoname);
|
|
|
|
|
if(p.name[9]!='~') //skip safety copies
|
|
|
|
|
if(strncmp((char*)p.name,autoname,5)==0)
|
|
|
|
|
{
|
|
|
|
|
bool found = false;
|
|
|
|
|
while (root.readDir(p, NULL) > 0) {
|
|
|
|
|
for (int8_t i = 0; i < (int8_t)strlen((char*)p.name); i++) p.name[i] = tolower(p.name[i]);
|
|
|
|
|
if (p.name[9] != '~' && strncmp((char*)p.name, autoname, 5) == 0) {
|
|
|
|
|
char cmd[30];
|
|
|
|
|
|
|
|
|
|
sprintf_P(cmd, PSTR("M23 %s"), autoname);
|
|
|
|
|
enquecommand(cmd);
|
|
|
|
|
enquecommands_P(PSTR("M24"));
|
|
|
|
|
found=true;
|
|
|
|
|
found = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(!found)
|
|
|
|
|
autostart_index=-1;
|
|
|
|
|
if (!found)
|
|
|
|
|
autostart_index = -1;
|
|
|
|
|
else
|
|
|
|
|
autostart_index++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::closefile(bool store_location)
|
|
|
|
|
{
|
|
|
|
|
void CardReader::closefile(bool store_location) {
|
|
|
|
|
file.sync();
|
|
|
|
|
file.close();
|
|
|
|
|
saving = false;
|
|
|
|
|
logging = false;
|
|
|
|
|
saving = logging = false;
|
|
|
|
|
|
|
|
|
|
if(store_location)
|
|
|
|
|
{
|
|
|
|
|
if (store_location) {
|
|
|
|
|
//future: store printer state, filename and position for continuing a stopped print
|
|
|
|
|
// so one can unplug the printer and continue printing the next day.
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::getfilename(uint16_t nr, const char * const match/*=NULL*/)
|
|
|
|
|
{
|
|
|
|
|
curDir=&workDir;
|
|
|
|
|
lsAction=LS_GetFilename;
|
|
|
|
|
nrFiles=nr;
|
|
|
|
|
/**
|
|
|
|
|
* Get the name of a file in the current directory by index
|
|
|
|
|
*/
|
|
|
|
|
void CardReader::getfilename(uint16_t nr, const char * const match/*=NULL*/) {
|
|
|
|
|
curDir = &workDir;
|
|
|
|
|
lsAction = LS_GetFilename;
|
|
|
|
|
nrFiles = nr;
|
|
|
|
|
curDir->rewind();
|
|
|
|
|
lsDive("",*curDir,match);
|
|
|
|
|
|
|
|
|
|
lsDive("", *curDir, match);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint16_t CardReader::getnrfilenames()
|
|
|
|
|
{
|
|
|
|
|
curDir=&workDir;
|
|
|
|
|
lsAction=LS_Count;
|
|
|
|
|
nrFiles=0;
|
|
|
|
|
uint16_t CardReader::getnrfilenames() {
|
|
|
|
|
curDir = &workDir;
|
|
|
|
|
lsAction = LS_Count;
|
|
|
|
|
nrFiles = 0;
|
|
|
|
|
curDir->rewind();
|
|
|
|
|
lsDive("",*curDir);
|
|
|
|
|
lsDive("", *curDir);
|
|
|
|
|
//SERIAL_ECHOLN(nrFiles);
|
|
|
|
|
return nrFiles;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::chdir(const char * relpath)
|
|
|
|
|
{
|
|
|
|
|
void CardReader::chdir(const char * relpath) {
|
|
|
|
|
SdFile newfile;
|
|
|
|
|
SdFile *parent=&root;
|
|
|
|
|
SdFile *parent = &root;
|
|
|
|
|
|
|
|
|
|
if(workDir.isOpen())
|
|
|
|
|
parent=&workDir;
|
|
|
|
|
if (workDir.isOpen()) parent = &workDir;
|
|
|
|
|
|
|
|
|
|
if(!newfile.open(*parent,relpath, O_READ))
|
|
|
|
|
{
|
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
|
SERIAL_ECHOPGM(MSG_SD_CANT_ENTER_SUBDIR);
|
|
|
|
|
SERIAL_ECHOLN(relpath);
|
|
|
|
|
if (!newfile.open(*parent, relpath, O_READ)) {
|
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
|
SERIAL_ECHOPGM(MSG_SD_CANT_ENTER_SUBDIR);
|
|
|
|
|
SERIAL_ECHOLN(relpath);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
else {
|
|
|
|
|
if (workDirDepth < MAX_DIR_DEPTH) {
|
|
|
|
|
for (int d = ++workDirDepth; d--;)
|
|
|
|
|
workDirParents[d+1] = workDirParents[d];
|
|
|
|
|
workDirParents[0]=*parent;
|
|
|
|
|
++workDirDepth;
|
|
|
|
|
for (int d = workDirDepth; d--;) workDirParents[d + 1] = workDirParents[d];
|
|
|
|
|
workDirParents[0] = *parent;
|
|
|
|
|
}
|
|
|
|
|
workDir=newfile;
|
|
|
|
|
workDir = newfile;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CardReader::updir()
|
|
|
|
|
{
|
|
|
|
|
if(workDirDepth > 0)
|
|
|
|
|
{
|
|
|
|
|
void CardReader::updir() {
|
|
|
|
|
if (workDirDepth > 0) {
|
|
|
|
|
--workDirDepth;
|
|
|
|
|
workDir = workDirParents[0];
|
|
|
|
|
int d;
|
|
|
|
|
for (int d = 0; d < workDirDepth; d++)
|
|
|
|
|
workDirParents[d] = workDirParents[d+1];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void CardReader::printingHasFinished()
|
|
|
|
|
{
|
|
|
|
|
st_synchronize();
|
|
|
|
|
if(file_subcall_ctr>0) //heading up to a parent file that called current as a procedure.
|
|
|
|
|
{
|
|
|
|
|
file.close();
|
|
|
|
|
file_subcall_ctr--;
|
|
|
|
|
openFile(filenames[file_subcall_ctr],true,true);
|
|
|
|
|
setIndex(filespos[file_subcall_ctr]);
|
|
|
|
|
startFileprint();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
quickStop();
|
|
|
|
|
file.close();
|
|
|
|
|
sdprinting = false;
|
|
|
|
|
if(SD_FINISHED_STEPPERRELEASE)
|
|
|
|
|
{
|
|
|
|
|
//finishAndDisableSteppers();
|
|
|
|
|
enquecommands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
|
|
|
|
|
}
|
|
|
|
|
autotempShutdown();
|
|
|
|
|
void CardReader::printingHasFinished() {
|
|
|
|
|
st_synchronize();
|
|
|
|
|
if (file_subcall_ctr > 0) { // Heading up to a parent file that called current as a procedure.
|
|
|
|
|
file.close();
|
|
|
|
|
file_subcall_ctr--;
|
|
|
|
|
openFile(filenames[file_subcall_ctr], true, true);
|
|
|
|
|
setIndex(filespos[file_subcall_ctr]);
|
|
|
|
|
startFileprint();
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
quickStop();
|
|
|
|
|
file.close();
|
|
|
|
|
sdprinting = false;
|
|
|
|
|
if (SD_FINISHED_STEPPERRELEASE) {
|
|
|
|
|
//finishAndDisableSteppers();
|
|
|
|
|
enquecommands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
|
|
|
|
|
}
|
|
|
|
|
autotempShutdown();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif //SDSUPPORT
|
|
|
|
|