Changeset 1867 in ntrip for trunk/BNS

Timestamp:

Jul 13, 2009, 5:33:32 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bns.cpp (modified) (1 diff)
• bnseph.cpp (modified) (6 diffs)
• bnseph.h (modified) (3 diffs)

trunk/BNS/bns.cpp

@@ -256 +256 @@
   if (_casterEph) {
     _casterEph->open();
-    // TODO encode ephemerides into RTCM v3 format
-    QByteArray buffer = "New Ephemeris " + ep->prn().toAscii() + "\n";
-    _casterEph->write(buffer.data(), buffer.length());
-    int len = buffer.length();
-    if (len > 0) {
-      emit(newOutEphBytes(len));
-    }
+    unsigned char Array[67];
+    int size = ep->RTCM3(Array);
+    if (size > 0) {
+      _casterEph->write((char*) Array, size);
+      emit(newOutEphBytes(size));
+    }
+    ////    QByteArray buffer = "New Ephemeris " + ep->prn().toAscii() + "\n";
+    ////    _casterEph->write(buffer.data(), buffer.length());
+    ////    int len = buffer.length();
+    ////    if (len > 0) {
+    ////      emit(newOutEphBytes(len));
+    ////    }
   }
 

trunk/BNS/bnseph.cpp

@@ -230 +230 @@
     }
   }
-  unsigned char Array[67];
-  int size = RTCM3GPS(Array);
-  fwrite(Array,size, 1, stdout);
 }
 
@@ -282 +279 @@
                              GPSADDBITS(a,i)};
 
-int t_ephGPS::RTCM3GPS(unsigned char *buffer)
+int t_ephGPS::RTCM3(unsigned char *buffer)
 {
 
@@ -340 +337 @@
   size += 3;
   return size;
-} /* RTCM3GPS */
+}
 
 // Compute GPS Satellite Position
@@ -481 +478 @@
   _xv(5) = _y_velocity * 1.e3; 
   _xv(6) = _z_velocity * 1.e3; 
-  unsigned char Array[51];
-  int size = RTCM3GLO(Array);
-  fwrite(Array,size, 1, stdout);
 }
 
@@ -511 +505 @@
                        GLONASSADDBITS(a-1,i)}
 
-int t_ephGlo::RTCM3GLO(unsigned char *buffer)
+int t_ephGlo::RTCM3(unsigned char *buffer)
 {
 
@@ -572 +566 @@
   size += 3;
   return size;
-} /* RTCM3GLO */
+}
 
 // Derivative of the state vector using a simple force model (static)

trunk/BNS/bnseph.h

@@ -21 +21 @@
   virtual void read(const QStringList& lines) = 0;
   virtual int  IOD() const = 0;
+  virtual int  RTCM3(unsigned char *) = 0;
  protected:  
   QString _prn;
@@ -38 +39 @@
                         ColumnVector& vv) const;
   virtual int  IOD() const;
-  virtual int  RTCM3GLO(unsigned char *);
+  virtual int  RTCM3(unsigned char *);
  private:
   static ColumnVector glo_deriv(double /* tt */, const ColumnVector& xv);
@@ -71 +72 @@
                         ColumnVector& vv) const;
   virtual int  IOD() const {return int(_IODE);}
-  virtual int  RTCM3GPS(unsigned char *);
+  virtual int  RTCM3(unsigned char *);
  private:
   double  _TOW;              //  [s]