Revision 54:a6073442bcef, committed 2016-05-15

Comitter:

caseyquinn

Date:

Sun May 15 15:29:19 2016 +0000

Parent:

53:5b4991d93cb1

Child:

55:2fb27f1ddff5

Commit message:

fixed the eternal loop after data transfer

Changed in this revision

--- a/main.cpp	Sun May 15 05:22:44 2016 +0000
+++ b/main.cpp	Sun May 15 15:29:19 2016 +0000
@@ -445,7 +445,7 @@
     
     char transfer_fileName[] = "MS000LOG_000000_000000_000000_000000_---------------_xxx.txt";
     char transfer_fileNamedir[] = "/sd/MS000LOG_000000_000000_000000_000000_---------------_xxx.txt";
-    char transfer_fileNamedirCopy[] = "/sd/c/MS000LOG_000000_000000_000000_000000_---------------_xxx.txt";
+    //char transfer_fileNamedirCopy[] = "/sd/c/MS000LOG_000000_000000_000000_000000_---------------_xxx.txt";
     
 
     vector<string> filenames; //filenames are stored in a vector string
@@ -453,25 +453,33 @@
     struct dirent *dirp;
     dp = opendir("/sd");
     //read all directory and file names in current directory into filename vector
+
     while((dirp = readdir(dp)) != NULL) {
-        filenames.push_back(string(dirp->d_name));
+        
+         if (strcmp(dirp->d_name, ".txt") )
+        {
+            filenames.push_back(string(dirp->d_name));
+        } else {}
     }
     closedir(dp);
     vector<string>::iterator it;
+
     
+   
     for(it=filenames.begin(); it < filenames.end(); it++) {
        // string str ((*it).c_str());
+       
         if((*it).substr((*it).length()-3) == "txt"){
             //if(((it - filenames.begin())+1) == 1){
                 pc.printf("%d: %s\r\n", ((it - filenames.begin())+1), (*it).c_str());
                 sprintf(transfer_fileName, "%s", (*it).c_str());
                 sprintf(transfer_fileNamedir, "/sd/%s", (*it).c_str());
-                sprintf(transfer_fileNamedirCopy, "/sd/c/%s", (*it).c_str());
-                pc.printf("%s", transfer_fileNamedirCopy);
+                //sprintf(transfer_fileNamedirCopy, "/sd/c/%s", (*it).c_str());
+                //pc.printf("%s", transfer_fileNamedirCopy);
                 FILE *fp = fopen(transfer_fileNamedir, "r");
                 if(fp == NULL) {
                     pc.printf("Could not open file, check disk.\r\n");
-                    while(1) {};
+                    //while(1) {};
                 } else {
                     pc.printf("file opened\r\n");
                 }
@@ -493,10 +501,12 @@
                 printf("\r\n");
                 fclose(fp); 
     
-                int status = file_copy(transfer_fileNamedir, transfer_fileNamedirCopy);
+                //int status = file_copy(transfer_fileNamedir, transfer_fileNamedirCopy);
                 remove(transfer_fileNamedir);
-                break;                              // close the file
-        }
+                //break;                              // close the file
+        }else{
+            //pc.printf("%d: %s\r\n", ((it - filenames.begin())+1), (*it).c_str());
+            }
         
     }