Changeset 207 in ntrip for trunk/BNC/RTCM

Timestamp:

Oct 6, 2006, 12:52:22 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC/RTCM

Files:

• GPSDecoder.h (modified) (3 diffs)
• RTCM.cpp (deleted)
• RTCM.h (deleted)
• RTCM2.cpp (modified) (1 diff)
• RTCM2.h (modified) (1 diff)
• format.h (deleted)
• m_data.h (deleted)
• m_date.cpp (deleted)
• m_date.h (deleted)

trunk/BNC/RTCM/GPSDecoder.h

@@ -1 +1 @@
 // -*- C++ -*-
 //
-// $Id: GPSDecoder.h,v 1.1.1.1 2006/01/11 09:34:31 mervart Exp $
+// $Id: GPSDecoder.h,v 1.1.1.1 2006/05/30 11:05:27 mervart Exp $
 // 2005/04/11: include 'int iPCode' into class 'GPSDecoder' (BKG)
 #if !defined(__GPSDecoder_h__)
@@ -10 +10 @@
 
 using namespace std;
-
-
-#include "format.h"
 
 //
@@ -73 +70 @@
     int   pCodeIndicator;  // 0 ... CA Code, 1 ... P Code
     u_int cumuLossOfCont;  // 0 to 31
-
-    // Operator to write ascii formatted members of Observation to an outstream
-    friend ostream& operator<<(ostream& os, const Observation & o) {
-        os <<format("%3d%3d",(int) o.StatID,(int) o.SVPRN)
-           <<format(" %4d %10d",(int)o.GPSWeek, o.GPSWeeks)
-           <<format("\t%15.3f\t%15.3f\t%15.3f\t%15.3f\t%15.3f\t%15.3f"
-                    ,o.C1, o.P2, o.L1, o.L2, 0.1*o.SNR1, 0.1*o.SNR2)
-           <<endl;
-        return os;
-    }
 } ;
 

trunk/BNC/RTCM/RTCM2.cpp

@@ -1039 +1039 @@
 
 }; // End of namespace rtcm2
+
+// ---------------- begin added by LM --------------------------------------
+
+// Constructor
+////////////////////////////////////////////////////////////////////////////
+RTCM2::RTCM2() {
+
+}
+
+// Destructor
+////////////////////////////////////////////////////////////////////////////
+RTCM2::~RTCM2() {
+
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void RTCM2::Decode(char* buffer, int bufLen) {
+
+  rtcm2::RTCM2packet PP;
+  rtcm2::RTCM2_Obs   ObsBlock;
+  
+  _buffer.append(buffer, bufLen);
+
+  while(true) {
+    PP.getPacket(_buffer);
+    if (!PP.valid()) break;
+
+    if ( PP.ID()==18 || PP.ID()==19 ) {   
+      ObsBlock.extract(PP);
+      if (!ObsBlock.valid()) continue;
+        
+      for (int iSat=0;iSat<ObsBlock.nSat;iSat++) {
+        cout << iSat << " " << ObsBlock.resolvedPhase_L1(iSat) << endl;
+      }
+
+      ObsBlock.clear();
+    }
+  }
+}
+
+// ----------------- end added by LM ---------------------------------------

trunk/BNC/RTCM/RTCM2.h

@@ -38 +38 @@
 #include <vector>
 
-// begin added by LM 
+// ---------------- begin added by LM --------------------------------------
 #include "GPSDecoder.h"
 class RTCM2 : public GPSDecoder {
-public:
-  RTCM2();
-  ~RTCM2();
-  void Decode(char* buffer = 0, int bufLen = 0);
-private:
-  string _buffer;
-} ;
-// end added by LM 
+  public:
+    RTCM2();
+    ~RTCM2();
+    void Decode(char* buffer = 0, int bufLen = 0);
+  private:
+    string _buffer;
+};
+// ----------------- end added by LM ---------------------------------------
 
 //