Changeset 1218 in ntrip for trunk/BNC/RTCM3

Timestamp:

Nov 19, 2008, 2:56:05 PM (16 years ago)

Author:

mervart

Message:

Zdenek Lukes:
a) changed logic how the ephemerides are stored for decoding of message 20/21 RTCM 2.3
b) added some debugging output (enabled is macro DEBUG_RTCM2_2021 is defined)

Location:

trunk/BNC/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (3 diffs)
• RTCM3Decoder.h (modified) (1 diff)
• RTCM3coDecoder.cpp (modified) (1 diff)
• RTCM3coDecoder.h (modified) (1 diff)

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -121 +121 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-t_irc RTCM3Decoder::Decode(char* buffer, int bufLen) {
+t_irc RTCM3Decoder::Decode(char* buffer, int bufLen, vector<string>& errmsg) {
+
+  errmsg.clear();
 
   bool decoded = false;
@@ -128 +130 @@
   // -----------------------------------------
   if (_mode == unknown || _mode == corrections) {
-    if ( _coDecoder->Decode(buffer, bufLen) == success ) {
+    if ( _coDecoder->Decode(buffer, bufLen, errmsg) == success ) {
       decoded = true;
 
@@ -354 +356 @@
             decoded = true;
             gpsephemeris* ep = new gpsephemeris(_Parser.ephemerisGPS);
+
+#ifdef DEBUG_RTCM2_2021
+            QString msg = QString("%1: got eph %2 IODC %3 GPSweek %4 TOC %5 TOE %6")
+              .arg(_staID)
+              .arg(ep->satellite, 2)
+              .arg(ep->IODC,      4)
+              .arg(ep->GPSweek,   4)
+              .arg(ep->TOC,       6)
+              .arg(ep->TOE,       6);
+            emit(newMessage(msg.toAscii()));
+#endif
+
             emit newGPSEph(ep);
           }

trunk/BNC/RTCM3/RTCM3Decoder.h

@@ -40 +40 @@
   RTCM3Decoder(const QString& fileName);
   virtual ~RTCM3Decoder();
-  virtual t_irc Decode(char* buffer = 0, int bufLen = 0);
+  virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg);
  signals:
   void newMessage(QByteArray msg);

trunk/BNC/RTCM3/RTCM3coDecoder.cpp

@@ -109 +109 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-t_irc RTCM3coDecoder::Decode(char* buffer, int bufLen) {
+t_irc RTCM3coDecoder::Decode(char* buffer, int bufLen, vector<string>& errmsg) {
+
+  errmsg.clear();
 
   _buffer.append(buffer, bufLen);

trunk/BNC/RTCM3/RTCM3coDecoder.h

@@ -42 +42 @@
   RTCM3coDecoder(const QString& staID);
   virtual ~RTCM3coDecoder();
-  virtual t_irc Decode(char* buffer = 0, int bufLen = 0);
+  virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg);
 
  signals: