Changeset 223 in ntrip

Timestamp:

Oct 7, 2006, 12:08:31 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnchelp.html (modified) (1 diff)
• bncrinex.cpp (modified) (2 diffs)

trunk/BNC/bnchelp.html

@@ -161 +161 @@
 const char endEpoch = 'C';
 struct Observation {
-  char     StatID[5+1];    // Station ID
-  char     SVPRN;          // Satellite PRN
-  short    GPSWeek;        // Week of GPS-Time
-  int      GPSWeeks;       // Second of Week (GPS-Time)
-  double   sec;            // second 
-  double   C1;             // CA or P1-code pseudorange (meters)
-  double   P2;             // P2-code pseudorange (meters)
-  double   L1;             // L1-carrier phase (meters)
-  double   L2;             // L2-carrier phase (meters)
-  short    SNR1;           // Signal-to noise ratio (0.1 dB)
-  short    SNR2;           // Signal-to noise ratio (0.1 dB)
-  int      pCodeIndicator; // 0 ... CA Code, 1 ... P Code
-  unsigned cumuLossOfCont; // Loss of lock indicator (0 to 31)
+  int    flags;
+  char   StatID[5+1]; // Station ID
+  int    SVPRN;       // Satellite PRN
+  int    GPSWeek;     // Week of GPS-Time
+  double GPSWeeks;    // Second of Week (GPS-Time)
+  double C1;          // CA-code pseudorange (meters)
+  double P1;          // P1-code pseudorange (meters)
+  double P2;          // P2-code pseudorange (meters)
+  double L1;          // L1 carrier phase (cycles)
+  double L2;          // L2 carrier phase (cycles)
+  int    SNR1;        // L1 signal-to noise ratio (0.1 dB)
+  int    SNR2;        // L2 signal-to noise ratio (0.1 dB)
 } ;
 </pre>

trunk/BNC/bncrinex.cpp

@@ -29 +29 @@
 #include "bncutils.h"
 #include "bncconst.h"
+#include "RTCM3/rtcm3torinex.h"
 
 using namespace std;
@@ -321 +322 @@
     iSat++;
     Observation* ob = it.next();
-    _out << " " << setw(2) << int(ob->SVPRN);
+    int prn = ob->SVPRN;
+    if        (prn <= PRN_GPS_END) {
+      _out << "G" << setw(2) << prn;
+    }
+    else if (prn >= PRN_GLONASS_START && prn <= PRN_GLONASS_END) {
+      _out << "R" << setw(2) << prn - PRN_GLONASS_START + 1;
+    }
+    else {
+      _out << setw(3) << prn;
+    }
     if (iSat == 12 && it.hasNext()) {
       _out << endl << "                                ";