Changeset 2426 in ntrip

Timestamp:

Apr 14, 2010, 3:38:29 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncpppclient.cpp (modified) (3 diffs)
• bncpppclient.h (modified) (1 diff)

trunk/BNC/bncpppclient.cpp

@@ -145 +145 @@
   // ---------------------  
   if      (obs->P1) {
-    satData->P1         = obs->P1;
+    satData->P1         = obs->P1 + (bb ? bb->p1 : 0.0);
     satData->codeTypeF1 = t_satData::P_CODE;
   }
   else if (obs->C1) {
-    satData->P1         = obs->C1 + (bb ? bb->p1c1 : 0.0);
+    satData->P1         = obs->C1 + (bb ? bb->c1 : 0.0);
     satData->codeTypeF1 = t_satData::C_CODE;
   }
@@ -158 +158 @@
     
   if      (obs->P2) {
-    satData->P2         = obs->P2 + (bb ? bb->p1p2 : 0.0);
+    satData->P2         = obs->P2 + (bb ? bb->p2 : 0.0);
     satData->codeTypeF2 = t_satData::P_CODE;
   }
@@ -373 +373 @@
         double bValue;
         in >> bType >> bValue;
-
-#define CODETYPEGPS_L1_CA  0
-#define CODETYPEGPS_L1_P   1
-#define CODETYPEGPS_L1_Z   2
-#define CODETYPEGPS_L2_P  10
-#define CODETYPEGPS_L2_Z  11
-
-        if      (bType ==  CODETYPEGPS_L1_CA) {
-          bb->p1c1 = bValue;
+        if      (bType ==  CODETYPEGPS_L1_Z) {
+          bb->p1 = bValue;
+        }
+        else if (bType ==  CODETYPEGPS_L1_CA) {
+          bb->c1 = bValue;
         }
         else if (bType == CODETYPEGPS_L2_Z) {
-          bb->p1p2 = bValue;
+          bb->p2 = bValue;
         }
       }

trunk/BNC/bncpppclient.h

@@ -102 +102 @@
  public:
   t_bias() {
-    p1c1 = 0.0;
-    p1p2 = 0.0;
+    p1 = 0.0;
+    p2 = 0.0;
+    c1 = 0.0;
   }
   bncTime tt;
-  double  p1c1;
-  double  p1p2;
+  double  p1;
+  double  p2;
+  double  c1;
 };