chiark / gitweb /
made prepare->autostart independent of current folder.
authorBernhard <bkubicek@x201.(none)>
Mon, 19 Mar 2012 19:24:40 +0000 (20:24 +0100)
committerBernhard <bkubicek@x201.(none)>
Mon, 19 Mar 2012 19:24:40 +0000 (20:24 +0100)
Marlin/cardreader.cpp

index c3ee3e212df15030df46c26302bd98680892c39a..222632f5527b17d08802adbd7b942d72fdb9a155 100644 (file)
@@ -95,9 +95,11 @@ void  CardReader::lsDive(const char *prepend,SdFile parent)
         if ( p.name[1] != '.')
         continue;
       }
+      
       if (!DIR_IS_FILE_OR_SUBDIR(&p)) continue;
       filenameIsDir=DIR_IS_SUBDIR(&p);
       
+      
       if(!filenameIsDir)
       {
         if(p.name[8]!='G') continue;
@@ -163,20 +165,26 @@ void CardReader::initsd()
     SERIAL_ECHO_START;
     SERIAL_ECHOLNPGM(MSG_SD_CARD_OK);
   }
+  workDir=root;
   curDir=&root;
+  /*
   if(!workDir.openRoot(&volume))
   {
     SERIAL_ECHOLNPGM(MSG_SD_WORKDIR_FAIL);
   }
+  */
+  
 }
 
 void CardReader::setroot()
 {
- curDir=&root;
-  if(!workDir.openRoot(&volume))
+  /*if(!workDir.openRoot(&volume))
   {
     SERIAL_ECHOLNPGM(MSG_SD_WORKDIR_FAIL);
-  } 
+  }*/
+  workDir=root;
+  
+  curDir=&workDir;
 }
 void CardReader::release()
 {