Diff: SPS/SPS.cpp

Branch:

MbedBMAGThrRev

Revision:

51:dbd8e6c2211b

Parent:

44:14ec59d2170c

Child:

55:06c5f76e1a8c

Child:

63:168f5498a3c5

--- a/SPS/SPS.cpp	Thu Feb 08 07:59:43 2018 +0000
+++ b/SPS/SPS.cpp	Thu Apr 05 08:32:10 2018 +0000
@@ -520,29 +520,46 @@
 
 //! generateSpsFilename, generates a sps file name, including file postfix, using the current date as input.
 /*! 
-    \param formattedDate: Date string using a formatted date with format: "YYYY/MM/DD" 
+    \param formattedDate: Date string using a formatted date with format: "YYYY/MM/DD"
+    \param barcode: Char array with barcode serial number in ASCII
+    \param time: String containing a timestamp formatted "HH:MM:SS.FFF" 
 */ 
-void SPS::generateSpsFilename(string formattedDate){
+void SPS::generateSpsFilename(string formattedDate, string barcode, string time){
     
-    fileNameString.resize(25);
+    fileNameString.resize(40);
     
-    fileNameString.replace(0, 10, "/usb/BMAG_");   
+    fileNameString.replace(0, 5, "/usb/");   
 
-    fileNameString[10] = formattedDate[0];
-    fileNameString[11] = formattedDate[1];
-    fileNameString[12] = formattedDate[2];
-    fileNameString[13] = formattedDate[3];
-    fileNameString[14] = '-';
-    fileNameString[15] = formattedDate[5];
-    fileNameString[16] = formattedDate[6];
-    fileNameString[17] = '-';
-    fileNameString[18] = formattedDate[8];
-    fileNameString[19] = formattedDate[9];
-        
-    fileNameString[20] = '.';
-    fileNameString[21] = 's';
-    fileNameString[22] = 'p';
-    fileNameString[23] = 's';   
+    fileNameString[5] = formattedDate[0];
+    fileNameString[6] = formattedDate[1];
+    fileNameString[7] = formattedDate[2];
+    fileNameString[8] = formattedDate[3];
+    fileNameString[9] = formattedDate[5];
+    fileNameString[10] = formattedDate[6];
+    fileNameString[11] = formattedDate[8];
+    fileNameString[12] = formattedDate[9];
+    fileNameString[13] = '_';
+    fileNameString[14] = time[0];
+    fileNameString[15] = time[1];
+    fileNameString[16] = time[3];
+    fileNameString[17] = time[4];
+    fileNameString[18] = time[6];
+    fileNameString[19] = time[7]; 
+    fileNameString[20] = '_';
+    fileNameString[21] = 'B';
+    fileNameString[22] = 'M';
+    fileNameString[23] = 'A';
+    fileNameString[24] = 'G';
+    fileNameString[25] = '_';
+    fileNameString[26] = barcode[0];
+    fileNameString[27] = barcode[1];
+    fileNameString[28] = barcode[2];
+    fileNameString[29] = barcode[3];
+    fileNameString[30] = barcode[4];        
+    fileNameString[31] = '.';
+    fileNameString[32] = 's';
+    fileNameString[33] = 'p';
+    fileNameString[34] = 's';   
 
 };