Changeset 3508 in ntrip for trunk/BNC

Timestamp:

Nov 20, 2011, 9:40:26 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• GPSS/hassDecoder.cpp (modified) (1 diff)
• bncephuser.cpp (modified) (1 diff)
• bncephuser.h (modified) (2 diffs)
• bncpppclient.cpp (modified) (1 diff)

trunk/BNC/GPSS/hassDecoder.cpp

@@ -71 +71 @@
     QString corrLine;
 
-    int messageType    = -1;
     int updateInterval =  0;
+    int messageType = 0;
+    if      (prn[0] == 'G') {
+      messageType = -COTYPE_GPSCOMBINED;
+    }
+    else if (prn[0] == 'R') {
+      messageType = -COTYPE_GLONASSCOMBINED;
+    }
 
     corrLine.sprintf("%d %d %d %.1f %s"

trunk/BNC/bncephuser.cpp

@@ -165 +165 @@
   if (!relevantMessageType(messageType)) {
     return failure;
+  }
+
+  if (messageType < 0) {
+    xyzCorr = true;  // correction in xyz instead of rao
   }
 

trunk/BNC/bncephuser.h

@@ -44 +44 @@
     eph     = 0;
     hrClk   = 0.0;
+    xyzCorr = false;
   }
   bool ready() {return raoSet && dClkSet;}
 
   static bool relevantMessageType(int msgType) {
+    if (msgType < 0) {
+      msgType = -msgType;
+    }
     return ( msgType == COTYPE_GPSCOMBINED     || 
              msgType == COTYPE_GLONASSCOMBINED ||
@@ -72 +76 @@
   bool         raoSet;
   bool         dClkSet;
+  bool         xyzCorr;
   const t_eph* eph;
 };

trunk/BNC/bncpppclient.cpp

@@ -409 +409 @@
   }
 
-  RSW_to_XYZ(xc.Rows(1,3), vv, raoHlp, dx);
+  if (cc->xyzCorr) {
+    dx = raoHlp;
+  }
+  else {
+    RSW_to_XYZ(xc.Rows(1,3), vv, raoHlp, dx);
+  }
 
   xc[0] -= dx[0];