Changeset 554 in ntrip

Timestamp:

Oct 28, 2007, 11:04:23 AM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (1 diff)
• bncrinex.cpp (modified) (2 diffs)

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -111 +111 @@
           for (int ii = 0; ii < _Parser.Data.numsats; ii++) {
             Observation* obs = new Observation();
-            if (_Parser.Data.satellites[ii] <= PRN_GPS_END) {
+            if      (_Parser.Data.satellites[ii] <= PRN_GPS_END) {
               obs->satSys = 'G';
               obs->satNum = _Parser.Data.satellites[ii];
             }
-            else {
+            else if (_Parser.Data.satellites[ii] <= PRN_GLONASS_END) {
               obs->satSys = 'R';
               obs->satNum = _Parser.Data.satellites[ii] - PRN_GLONASS_START + 1;
+            }
+            else {
+              obs->satSys = 'S';
+              obs->satNum = _Parser.Data.satellites[ii] - PRN_WAAS_START + 20;
             }
             obs->GPSWeek  = _Parser.Data.week;

trunk/BNC/bncrinex.cpp

@@ -374 +374 @@
           _out << "G    6 C1C L1C S1C C2P L2P S2P                              SYS / # / OBS TYPES" << endl;
           _out << "R    6 C1C L1C S1C C2P L2P S2P                              SYS / # / OBS TYPES" << endl;
+          _out << "S    6 C1C L1C S1C C2P L2P S2P                              SYS / # / OBS TYPES" << endl;
         }
         else { 
@@ -433 +434 @@
       _out << "G    6 C1C L1C S1C C2P L2P S2P                              SYS / # / OBS TYPES" << endl;
       _out << "R    6 C1C L1C S1C C2P L2P S2P                              SYS / # / OBS TYPES" << endl;
+      _out << "S    6 C1C L1C S1C C2P L2P S2P                              SYS / # / OBS TYPES" << endl;
 
     }