Bmag incl gps rettelse

Dependencies:   mbed WDT MODSERIAL BME280

Revision:
24:099df3fa2b13
Parent:
21:325cb82f1838
Child:
28:ed0d29f63b55
diff -r 2e914b705b99 -r 099df3fa2b13 SPS/SPS.h
--- a/SPS/SPS.h	Tue May 16 09:33:12 2017 +0000
+++ b/SPS/SPS.h	Wed May 31 07:02:02 2017 +0000
@@ -22,10 +22,13 @@
     SPS();    
     
     //Updates current string     
-    void UpdateCurrentString(string tag, string identifier_id, string group_id, string date, string time, string ZZZ,string s1, string source_id, string interpreter_id, string data_line_version, string source_firmware_version, string interpreter_firmware_version, string barcode, string latitude, string longitude, bool gpsFixFlag, string batteryvoltage, string mag_time, string mag_nt, string mag_sq, Serial * dbg);
+    void UpdateCurrentString(string tag, string identifier_id, string group_id, string date, string time, string ZZZ,string encoding, string source_id, string interpreter_id, string data_line_version, string source_firmware_version, string interpreter_firmware_version, string barcode, string latitude, string longitude, bool gpsFixFlag, string batteryvoltage, string mag_time, string mag_nt, string mag_sq, Serial * dbg);
+    
+    //Updates current header string
+    void UpdateHeaderString(string barcode, string identifier_id, string group_id, string ZZZ, string encoding,string source_id, string interpreter_id, string data_line_version, string source_firmware_version, string interpreter_firmware_version);
 
     //Updates current ERR     
-    void UpdateCurrentErrString(string tag, string identifier_id, string group_id, string date, string time, string ZZZ,string s1, string source_id, string interpreter_id, string data_line_version, string source_firmware_version, string interpreter_firmware_version, string latitude, string longitude, bool gpsFixFlag, string mag_time, string mag_nt, string mag_sq, Serial * dbg);
+    void UpdateCurrentErrString(string tag, string identifier_id, string group_id, string date, string time, string ZZZ,string encoding, string source_id, string interpreter_id, string data_line_version, string source_firmware_version, string interpreter_firmware_version, string latitude, string longitude, bool gpsFixFlag, string mag_time, string mag_nt, string mag_sq, Serial * dbg);
     
     //Fills the array for calculation of the CRC-16 with values
     void init_crc16_tab();
@@ -55,7 +58,11 @@
     
     //add data to current Errstring
     void addToCurrentErrString(string data);
-    void addToCurrentErrString(char data);
+    void addToCurrentErrString(char data); 
+    
+    //add data to current Header string
+    void addToCurrentHeaderString(string data);
+    void addToCurrentHeaderString(char data);
     
     //generate sps filename
     void generateSpsFilename(string formattedDate);