Changeset 2667 in ntrip

Timestamp:

Nov 11, 2010, 10:06:51 AM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• RTCM/GPSDecoder.h (modified) (3 diffs)
• RTCM3/RTCM3Decoder.cpp (modified) (1 diff)
• bncpppclient.cpp (modified) (1 diff)

trunk/BNC/RTCM/GPSDecoder.h

@@ -42 +42 @@
     satSys(' '),
     satNum(0),
-    slot(0),
+    slotNum(0),
     GPSWeek(0),
     GPSWeeks(0.0),
@@ -65 +65 @@
   char   satSys;        // Satellite System ('G' or 'R')
   int    satNum;        // Satellite Number (PRN for GPS NAVSTAR)
-  int    slot;          // Slot Number (for Glonass)
+  int    slotNum;       // Slot Number (for Glonass)
   int    GPSWeek;       // Week of GPS-Time
   double GPSWeeks;      // Second of Week (GPS-Time)
@@ -95 +95 @@
     _o.satSys        = 'G';
     _o.satNum        = 0;
-    _o.slot          = 0;
+    _o.slotNum       = 0;
     _o.GPSWeek       = 0;
     _o.GPSWeeks      = 0.0;

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -243 +243 @@
                 obs->_o.satSys = 'R';
                 obs->_o.satNum = parser.Data.satellites[ii] - PRN_GLONASS_START + 1;
-                ////  obs->_o.slot   = parser.Data.channels[ii];
-                obs->_o.slot   = parser.GLOFreq[obs->_o.satNum];
+                ////  obs->_o.slotNum   = parser.Data.channels[ii];
+                obs->_o.slotNum   = parser.GLOFreq[obs->_o.satNum] - 100;
               }
               else {

trunk/BNC/bncpppclient.cpp

@@ -193 +193 @@
 
   if (obs->satSys == 'R') {
-    f1 = 1602000000.0 + 562500.0 * obs->slot; 
-    f2 = 1246000000.0 + 437500.0 * obs->slot;
+    f1 = 1602000000.0 + 562500.0 * obs->slotNum; 
+    f2 = 1246000000.0 + 437500.0 * obs->slotNum;
   }