Changeset 1909 in ntrip for trunk/BNC/RTCM3

Timestamp:

Nov 4, 2009, 5:19:40 PM (15 years ago)

Author:

zdenek

Message:

Zdenek Lukes: added output of Glonass channel number in output binary format

Location:

trunk/BNC/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (1 diff)
• rtcm3torinex.c (modified) (4 diffs)
• rtcm3torinex.h (modified) (2 diffs)

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -212 +212 @@
                 obs->_o.satSys = 'R';
                 obs->_o.satNum = _Parser.Data.satellites[ii] - PRN_GLONASS_START + 1;
+                obs->_o.slot   = _Parser.Data.channels[ii];
               }
               else {

trunk/BNC/RTCM3/rtcm3torinex.c

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.24 2009/05/04 10:38:37 mervart Exp $
+  $Id: rtcm3torinex.c,v 1.25 2009/05/07 09:27:19 mervart Exp $
   Copyright (C) 2005-2008 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -55 +55 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.24 $";
+static char revisionstr[] = "$Revision: 1.25 $";
 
 #ifndef COMPILEDATE
@@ -669 +669 @@
             ;
 
-          if(num == gnss->numsats)
-            gnss->satellites[gnss->numsats++] = fullsat;
+          if(num == gnss->numsats) {
+            gnss->satellites[gnss->numsats] = fullsat;
+            gnss->channels  [gnss->numsats] = freq;
+            gnss->numsats++;
+          }
 
           /* L1 */
@@ -1689 +1692 @@
 
 #ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2009/05/04 10:38:37 $";
+static char datestr[]     = "$Date: 2009/05/07 09:27:19 $";
 
 /* The string, which is send as agent in HTTP request */

trunk/BNC/RTCM3/rtcm3torinex.h

@@ -4 +4 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.h,v 1.16 2008/12/08 10:50:42 mervart Exp $
+  $Id: rtcm3torinex.h,v 1.17 2009/05/07 09:27:19 mervart Exp $
   Copyright (C) 2005-2006 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -108 +108 @@
   int    dataflags[24];      /* GPSDF_xxx */
   int    satellites[24];     /* SV - IDs */
+  int    channels[24];       /* Glonass channels - valid of Glonass SV only */
   int    snrL1[24];          /* Important: all the 5 SV-specific fields must */
   int    snrL2[24];          /* have the same SV-order */