Diff: MbedLogger/MbedLogger.cpp

Revision:

84:eccd8e837134

Parent:

82:0981b9ada820

--- a/MbedLogger/MbedLogger.cpp	Fri Feb 15 16:14:22 2019 +0000
+++ b/MbedLogger/MbedLogger.cpp	Tue Feb 19 20:11:43 2019 +0000
@@ -189,7 +189,9 @@
 //prints current log file to the screen (terminal)
 void MbedLogger::printCurrentLogFile() {
     //open the file for reading
-    string file_name_string = _file_system_string + "LOG000.csv";
+    // string file_name_string = _file_system_string + "LOG000.csv";
+    string file_name_string = _file_system_string + configFileIO().logFilesStruct.logFileName;   //  "DIAG000.txt";
+    //string file_name_string = _file_system_string + "LOG000.csv";  // how to pass in log file name as a string?
     
     _log_file_line_counter = 0;
 
@@ -220,7 +222,9 @@
 
 //OPEN FILE FOR READING
 
-    string file_name_string = _file_system_string + "LOG000.csv";
+    //string file_name_string = _file_system_string + "LOG000.csv";
+    string file_name_string = _file_system_string + configFileIO().logFilesStruct.logFileName;   //  "DIAG000.txt";
+    //string file_name_string = _file_system_string + "LOG000.csv";  // how to pass in log file name as a string?
 
     _fp = fopen(file_name_string.c_str(), "r");
 
@@ -336,7 +340,9 @@
 
 
 void MbedLogger::continuouslyTransmitDataNoTimer() {
-    string file_name_string = _file_system_string + "LOG000.csv";
+    // string file_name_string = _file_system_string + "LOG000.csv";
+    string file_name_string = _file_system_string + configFileIO().logFilesStruct.logFileName;   //  "DIAG000.txt";
+    //string file_name_string = _file_system_string + "LOG000.csv";  // how to pass in log file name as a string?
     
     _fp = fopen(file_name_string.c_str(), "r");
     
@@ -448,7 +454,9 @@
     setTransmitPacketNumber(0);
     
     //open the file
-    string file_name_string = _file_system_string + "LOG000.csv";
+    // string file_name_string = _file_system_string + "LOG000.csv";
+    string file_name_string = _file_system_string + configFileIO().logFilesStruct.logFileName;   //  "DIAG000.txt";
+    //string file_name_string = _file_system_string + "LOG000.csv";  // how to pass in log file name as a string?
     _fp = fopen(file_name_string.c_str(), "r");
     
     //receive correct checksum, immediately send this packet
@@ -479,7 +487,9 @@
 //GET TOTAL NUMBER OF PACKETS!
         
     //open the file
-    string file_name_string = _file_system_string + "LOG000.csv";
+    // string file_name_string = _file_system_string + "LOG000.csv";
+    string file_name_string = _file_system_string + configFileIO().logFilesStruct.logFileName;   //  "DIAG000.txt";
+    //string file_name_string = _file_system_string + "LOG000.csv";  // how to pass in log file name as a string?
     _fp = fopen(file_name_string.c_str(), "r");
     
     //DEFAULT STATE
@@ -810,7 +820,9 @@
 
 void MbedLogger::reOpenLineReader() {      
     //open a new one
-    string file_name_string = _file_system_string + "LOG000.csv";
+    // string file_name_string = _file_system_string + "LOG000.csv";
+    string file_name_string = _file_system_string + configFileIO().logFilesStruct.logFileName;   //  "DIAG000.txt";
+    //string file_name_string = _file_system_string + "LOG000.csv";  // how to pass in log file name as a string?
 
     _fp = fopen(file_name_string.c_str(), "r");               //open the log file to read
     
@@ -819,12 +831,15 @@
         xbee().printf("ERROR: Log file could not be opened\n\r");
     }
     else {
-        xbee().printf("Current Log file (LOG000.csv) was opened.\n\r");
+        xbee().printf("Current Log file (%s) was opened.\n\r", configFileIO().logFilesStruct.logFileName);
     }
 }
 
 bool MbedLogger::openLineReader() {  
-    string file_name_string = _file_system_string + "LOG000.csv";
+    // string file_name_string = _file_system_string + "LOG000.csv";
+    string file_name_string = _file_system_string + configFileIO().logFilesStruct.logFileName;   //  "DIAG000.txt";
+    //string file_name_string = _file_system_string + "LOG000.csv";  // how to pass in log file name as a string?
+
 
     _fp = fopen(file_name_string.c_str(), "r");               //open the log file to read
     
@@ -854,7 +869,10 @@
     //takes less than a second to complete, verified 7/24/2018
    
     //open the file
-    string file_name_string = _file_system_string + "LOG000.csv";
+    // string file_name_string = _file_system_string + "LOG000.csv";
+    string file_name_string = _file_system_string + configFileIO().logFilesStruct.logFileName;   //  "DIAG000.txt";
+    //string file_name_string = _file_system_string + "LOG000.csv";  // how to pass in log file name as a string?
+
     _fp = fopen(file_name_string.c_str(), "r");
     
     fseek(_fp, 0L, SEEK_END);
@@ -888,7 +906,10 @@
 void MbedLogger::openWriteFile() {
     xbee().printf("Opening file for reception.\n\r");
     
-    string file_name_string = _file_system_string + "LOG000.csv";
+   // string file_name_string = _file_system_string + "LOG000.csv";
+    string file_name_string = _file_system_string + configFileIO().logFilesStruct.logFileName;   //  "DIAG000.txt";
+    //string file_name_string = _file_system_string + "LOG000.csv";  // how to pass in log file name as a string?
+
 
     _fp = fopen(file_name_string.c_str(), "w");
 }
@@ -1344,7 +1365,9 @@
 }
 
 void MbedLogger::createEmptyLog() {    
-    string file_name_string = _file_system_string + "LOG000.csv";
+    // string file_name_string = _file_system_string + "LOG000.csv";
+    string file_name_string = _file_system_string + configFileIO().logFilesStruct.logFileName;   //  "DIAG000.txt";
+    //string file_name_string = _file_system_string + "LOG000.csv";  // how to pass in log file name as a string?
     string empty_log = "EMPTY LOG";
 
     _fp = fopen(file_name_string.c_str(), "w");