Changeset 1105 in ntrip

Timestamp:

Sep 8, 2008, 6:24:37 PM (16 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC/RTCM

Files:

• RTCM2.cpp (modified) (6 diffs)
• RTCM2.h (modified) (2 diffs)

trunk/BNC/RTCM/RTCM2.cpp

@@ -50 +50 @@
 //   2008/03/10  AHA  Corrected buffer length check in getPacket()
 //   2008/03/11  AHA  isGPS-flag in RTCM2_Obs is now set to false on clear()
-//   2008/03/13  AHA  Added checks for data consistency in extraction routines
+//   2008/03/14  AHA  Added checks for data consistency in extraction routines
+//   2008/09/01  AHA  Harmonization with newest BNC version
 //
 // (c) DLR/GSOC
@@ -756 +757 @@
 //------------------------------------------------------------------------------
 
+// Constructor
+RTCM2_03::RTCM2_03(){
+  validMsg = false;
+  x = 0.0; 
+  y = 0.0; 
+  z=0.0;
+};
+
 void RTCM2_03::extract(const RTCM2packet& P) {
 
@@ -1116 +1125 @@
       
       prn = (isGPS? sid : sid+200 );
-
+      
       // Carrier phase measurement (mod 2^23 [cy]; sign matched to range)
       cph = -P.getBits(iSat*48+40,32)/256.0;
@@ -1137 +1146 @@
         cph_L1.push_back(0.0);
         cph_L2.push_back(0.0);
-        slip_L1.push_back(-1);
-        slip_L2.push_back(-1);
+        slip_L1.push_back(-1);
+        slip_L2.push_back(-1);
       };
       
       // Store measurement
       if (isL1) {
-        cph_L1 [idx] = cph;
-        slip_L1[idx] = slip_cnt;
+        cph_L1[idx] = cph;
+        slip_L1[idx] = slip_cnt;
       }
       else {
-        cph_L2 [idx] = cph;
-        slip_L2[idx] = slip_cnt;
+        cph_L2[idx] = cph;
+        slip_L2[idx] = slip_cnt;
       };
            
@@ -1260 +1269 @@
         cph_L1.push_back(0.0);
         cph_L2.push_back(0.0);
-        slip_L1.push_back(-1);
-        slip_L2.push_back(-1);
+        slip_L1.push_back(-1);
+              slip_L2.push_back(-1);
       };
       
@@ -1350 +1359 @@
 
 }; // End of namespace rtcm2
-
-
-

trunk/BNC/RTCM/RTCM2.h

@@ -29 +29 @@
 //   2006/11/25  OMO  Revised check for presence of GLONASS data
 //   2008/03/07  AHA  Removed unnecessary failure flag
+//   2008/09/01  AHA  Harmonization with newest BNC version
 //
 // (c) DLR/GSOC
@@ -201 +202 @@
 
 class RTCM2_03 {
- public:
-  
-  RTCM2_03() : validMsg(false), x(0.0), y(0.0), z(0.0) { }
-  
-  void extract(const RTCM2packet& P);
-  
- public:
-  bool    validMsg;          // Validity flag
-  double  x,y,z;             // Station coordinates
+  
+  public:
+    // Constructor
+    RTCM2_03();
+
+    void extract(const RTCM2packet& P);
+
+  public:
+
+    bool    validMsg;          // Validity flag
+    double  x,y,z;             // Station coordinates
+
 };