Changeset 2317 in ntrip

Timestamp:

Feb 20, 2010, 9:32:12 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

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

trunk/BNC/bncpppclient.cpp

@@ -138 +138 @@
   // ---------------------  
   if      (obs->P1) {
-    satData->P1         = obs->P1 + (bb ? bb->p1 : 0.0);
+    satData->P1         = obs->P1;
     satData->codeTypeF1 = t_satData::P_CODE;
   }
   else if (obs->C1) {
-    satData->P1         = obs->C1 + (bb ? bb->c1 : 0.0);
+    satData->P1         = obs->C1 + (bb ? bb->p1c1 : 0.0);
     satData->codeTypeF1 = t_satData::C_CODE;
   }
@@ -151 +151 @@
     
   if      (obs->P2) {
-    satData->P2         = obs->P2 + (bb ? bb->p2 : 0.0);
+    satData->P2         = obs->P2 + (bb ? bb->p1p2 : 0.0);
     satData->codeTypeF2 = t_satData::P_CODE;
   }
   else if (obs->C2) {
-    satData->P2         = obs->C2 + (bb ? bb->c2 : 0.0);
+    satData->P2         = obs->C2;
     satData->codeTypeF2 = t_satData::C_CODE;
   }
@@ -332 +332 @@
       }
     }
-    else if ( messageType == BTYPE_GPS     || 
-              messageType == BTYPE_GLONASS ) {
+    else if ( messageType == BTYPE_GPS ) { 
 
       t_bias* bb = 0;
@@ -352 +351 @@
         double bValue;
         in >> bType >> bValue;
-        if      (bType == 0) {
-          bb->c1 = bValue;
+        if      (bType ==  0) {
+          bb->p1c1 = -bValue;
         }
-        else if (bType >= 1 && bType <= 4) {
-          bb->p1 = bValue;
-        }
-        else if (bType == 5) {
-          bb->c2 = bValue;
-        }
-        else if (bType >= 6 && bType <= 13) {
-          bb->p2 = bValue;
+        else if (bType == 10) {
+          bb->p1p2 = -bValue;
         }
       }

trunk/BNC/bncpppclient.h

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