Changeset 1313 in ntrip for trunk/BNC/GPSS

Timestamp:

Dec 20, 2008, 1:59:44 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/GPSS/gpssDecoder.cpp (modified) (7 diffs)

trunk/BNC/GPSS/gpssDecoder.cpp

@@ -39 +39 @@
 ////////////////////////////////////////////////////////////////////////////
 gpssDecoder::gpssDecoder() : GPSDecoder() {
-  _mode = MODE_SEARCH;
+  _mode       = MODE_SEARCH;
+  _recordSize = 0;
 }
 
@@ -53 +54 @@
   errmsg.clear();
 
+  if (_mode == MODE_SEARCH) {
+    _buffer.clear();
+  }
   _buffer.append(data, dataLen);
 
   EPOCHHEADER   epochHdr;
-  t_obsInternal gpsObs;
   gpsephemeris  gpsEph;
-  int           recordSize;
 
   unsigned offset     = 0;
@@ -84 +86 @@
       case MODE_EPOCH:
       case MODE_EPH:
-        if (offset+sizeof(recordSize) > _buffer.size()) {
+        if (offset+sizeof(_recordSize) > _buffer.size()) {
           errmsg.push_back("Record size too large (A)");
           _mode = MODE_SEARCH;
         } else {
-          memcpy(&recordSize, &_buffer[offset], sizeof(recordSize)); 
+          memcpy(&_recordSize, &_buffer[offset], sizeof(_recordSize)); 
           if (_mode == MODE_EPOCH) {
             _mode = MODE_EPOCH_BODY;
@@ -95 +97 @@
             _mode = MODE_EPH_BODY;
           }
-          offset += sizeof(recordSize) - 1;
+          offset += sizeof(_recordSize) - 1;
         }
         continue;
 
       case MODE_EPOCH_BODY:
-        if (offset + recordSize > _buffer.size()) {
+        if (offset + _recordSize > _buffer.size()) {
           errmsg.push_back("Record size too large (B)");
           _mode = MODE_SEARCH;
@@ -107 +109 @@
           offset += sizeof(epochHdr);
           for (int is = 1; is <= epochHdr.n_svs; is++) {
-            memcpy(&gpsObs, &_buffer[offset], sizeof(gpsObs));
-            offset += sizeof(gpsObs);
+            t_obs* obs = new t_obs();
+            memcpy(&(obs->_o), &_buffer[offset], sizeof(obs->_o));
+            _obsList.push_back(obs);
+            offset += sizeof(obs->_o);
           }
           _mode = MODE_EPOCH_CRC;
@@ -116 +120 @@
 
       case MODE_EPH_BODY:
-        if (offset + recordSize > _buffer.size()) {
+        if (offset + _recordSize > _buffer.size()) {
           errmsg.push_back("Record size too large (C)");
           _mode = MODE_SEARCH;
         } else {
           memcpy(&gpsEph, &_buffer[offset], sizeof(gpsEph));
+          emit newGPSEph(&gpsEph);
           offset += sizeof(gpsEph) - 1;
           _mode = MODE_EPH_CRC;
@@ -144 +149 @@
   }
 
-  return success;
+  if (errmsg.size() == 0) {
+    return success;
+  }
+  else {
+    return failure;
+  }
 }