SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

host-based sd card printing seems now to work with folders

Browse source
This commit is contained in:
Bernhard Kubicek 2011-11-19 14:34:27 +01:00
parent 70abca195a
commit 869cee74e6
1 changed files with 72 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
Marlin/cardreader.pde
View file

@ -64,7 +64,7 @@ void CardReader::lsDive(char *prepend,SdFile parent)
strcat(path,lfilename); strcat(path,lfilename);
strcat(path,"/"); strcat(path,"/");
Serial.print(path); //Serial.print(path);
SdFile dir; SdFile dir;
if(!dir.open(parent,lfilename, O_READ)) if(!dir.open(parent,lfilename, O_READ))
@ -81,30 +81,33 @@ void CardReader::lsDive(char *prepend,SdFile parent)
} }
if (p.name[0] == DIR_NAME_FREE) break; else
if (p.name[0] == DIR_NAME_DELETED || p.name[0] == '.'|| p.name[0] == '_') continue;
if (!DIR_IS_FILE_OR_SUBDIR(&p)) continue;
if(p.name[8]!='G') continue;
if(p.name[9]=='~') continue;
//if(cnt++!=nr) continue;
createFilename(filename,p);
if(lsAction==LS_SerialPrint)
{ {
SERIAL_PROTOCOL(prepend); if (p.name[0] == DIR_NAME_FREE) break;
SERIAL_PROTOCOLLN(filename); if (p.name[0] == DIR_NAME_DELETED || p.name[0] == '.'|| p.name[0] == '_') continue;
} if (!DIR_IS_FILE_OR_SUBDIR(&p)) continue;
else if(lsAction==LS_Count)
{
nrFiles++;
}
else if(lsAction==LS_GetFilename)
{
if(cnt==nrFiles)
return;
cnt++;
if(p.name[8]!='G') continue;
if(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)
{
nrFiles++;
}
else if(lsAction==LS_GetFilename)
{
if(cnt==nrFiles)
return;
cnt++;
}
} }
} }
} }
@ -180,17 +183,57 @@ void CardReader::openFile(char* name,bool read)
{ {
if(!cardOK) if(!cardOK)
return; return;
file.close(); file.close();
sdprinting = false; sdprinting = false;
SdFile myDir;
curDir=&root;
char *fname=name;
char *dirname_start,*dirname_end;
dirname_start=strchr(name,'/')+1;
while(dirname_start!=NULL)
{
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!=NULL && dirname_end>dirname_start)
{
char subdirname[13];
strncpy(subdirname, dirname_start, dirname_end-dirname_start);
subdirname[dirname_end-dirname_start]=0;
SERIAL_ECHOLN(subdirname);
if(!myDir.open(curDir,subdirname,O_READ))
{
SERIAL_PROTOCOLPGM("open failed, File: ");
SERIAL_PROTOCOL(subdirname);
SERIAL_PROTOCOLLNPGM(".");
return;
}
else
SERIAL_ECHOLN("dive ok");
curDir=&myDir;
dirname_start=dirname_end+1;
}
else // the reminder after all /fsa/fdsa/ is the filename
{
fname=dirname_start;
//SERIAL_ECHOLN("remaider");
//SERIAL_ECHOLN(fname);
break;
}
}
if(read) if(read)
{ {
if (file.open(&root, name, O_READ)) if (file.open(curDir, fname, O_READ))
{ {
filesize = file.fileSize(); filesize = file.fileSize();
SERIAL_PROTOCOLPGM("File opened:"); SERIAL_PROTOCOLPGM("File opened:");
SERIAL_PROTOCOL(name); SERIAL_PROTOCOL(fname);
SERIAL_PROTOCOLPGM(" Size:"); SERIAL_PROTOCOLPGM(" Size:");
SERIAL_PROTOCOLLN(filesize); SERIAL_PROTOCOLLN(filesize);
sdpos = 0; sdpos = 0;
@ -204,10 +247,10 @@ void CardReader::openFile(char* name,bool read)
} }
else else
{ //write { //write
if (!file.open(&root, name, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC))
{ {
SERIAL_PROTOCOLPGM("open failed, File: "); SERIAL_PROTOCOLPGM("open failed, File: ");
SERIAL_PROTOCOL(name); SERIAL_PROTOCOL(fname);
SERIAL_PROTOCOLLNPGM("."); SERIAL_PROTOCOLLNPGM(".");
} }
else else