Diff: SPS/SPS.cpp

Branch:

MbedBMAGThrRev

Revision:

28:ed0d29f63b55

Parent:

26:68277a308839

Child:

30:072e918663b8

--- a/SPS/SPS.cpp	Wed Aug 23 13:22:54 2017 +0000
+++ b/SPS/SPS.cpp	Thu Aug 31 09:27:37 2017 +0000
@@ -38,12 +38,15 @@
     \param longitude: string containing the longitude of the unit in decimal degrees. For further info read the *.sps documentation.
     \param gpsFixFlag: bool containing the gps fix status, 1 if gps fix is present, else 0.
     \param batteryvoltage: string containing the battery voltage of the units battery pack, eg. "14.2"
+    \param preassure: string containing preassure measurement in hPa
+    \param temperature: string containing temperature measured in deg C
+    \param humidity: string containing air humidity percentage
     \param mag_time: string containing the last timestamp received from GSM-19 device eg. "000048.0"
     \param mag_nt: string containing the last mag measurement in nT eg. "036418.77"
     \param mag_sq: string containing info about the measurement quality of the last mag measurement eg. "99"
               
 */
-void SPS::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){
+void SPS::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 preassure, string temperature, string humidity, string mag_time, string mag_nt, string mag_sq, Serial * dbg){
 
     this->currentString = "";
     this->currentString.resize(256);
@@ -112,6 +115,12 @@
     addToCurrentString(SPACE);
     addToCurrentString(batteryvoltage);
     addToCurrentString(SPACE);
+    addToCurrentString(preassure);
+    addToCurrentString(SPACE);
+    addToCurrentString(temperature);
+    addToCurrentString(SPACE);
+    addToCurrentString(humidity);
+    addToCurrentString(SPACE);
     addToCurrentString(mag_time);
     addToCurrentString(SPACE);
     addToCurrentString(mag_nt);
@@ -204,6 +213,12 @@
     addToCurrentHeaderString(SPACE);
     addToCurrentHeaderString("batteryVoltage");
     addToCurrentHeaderString(SPACE);
+    addToCurrentHeaderString("preassure");
+    addToCurrentHeaderString(SPACE);
+    addToCurrentHeaderString("temperature");
+    addToCurrentHeaderString(SPACE);
+    addToCurrentHeaderString("humidity");
+    addToCurrentHeaderString(SPACE);
     addToCurrentHeaderString("mag_time");
     addToCurrentHeaderString(SPACE);
     addToCurrentHeaderString("mag_value");