Changeset 2235 in ntrip

Timestamp:

Jan 12, 2010, 1:14:30 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/ephemeris.cpp (modified) (1 diff)
• RTCM3/rtcm3torinex.c (modified) (4 diffs)
• RTCM3/rtcm3torinex.h (modified) (3 diffs)
• bncapp.cpp (modified) (1 diff)

trunk/BNC/RTCM3/ephemeris.cpp

@@ -293 +293 @@
   _xv(5) = _y_velocity * 1.e3; 
   _xv(6) = _z_velocity * 1.e3; 
-
-  cout << _prn << " " << _GPSweek << " " << _GPSweeks << " " 
-       << _tki << " "  << _xv << endl;
-
-}
+}

trunk/BNC/RTCM3/rtcm3torinex.c

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.26 2009/11/04 16:19:40 zdenek Exp $
+  $Id: rtcm3torinex.c,v 1.27 2009/11/04 16:40:16 zdenek Exp $
   Copyright (C) 2005-2008 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -55 +55 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.26 $";
+static char revisionstr[] = "$Revision: 1.27 $";
 
 #ifndef COMPILEDATE
@@ -837 +837 @@
 };
 
-struct converttimeinfo {
-  int second;    /* seconds of GPS time [0..59] */
-  int minute;    /* minutes of GPS time [0..59] */
-  int hour;      /* hour of GPS time [0..24] */
-  int day;       /* day of GPS time [1..28..30(31)*/
-  int month;     /* month of GPS time [1..12]*/
-  int year;      /* year of GPS time [1980..] */
-};
-
 void converttime(struct converttimeinfo *c, int week, int tow)
 {
@@ -1692 +1683 @@
 
 #ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2009/11/04 16:19:40 $";
+static char datestr[]     = "$Date: 2009/11/04 16:40:16 $";
 
 /* 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.17 2009/05/07 09:27:19 mervart Exp $
+  $Id: rtcm3torinex.h,v 1.18 2009/11/04 16:19:40 zdenek Exp $
   Copyright (C) 2005-2006 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -99 +99 @@
 #define GNSSDF_LOCKLOSSL1     (1<<29)  /* lost lock on L1 */
 #define GNSSDF_LOCKLOSSL2     (1<<30)  /* lost lock on L2 */
+
+struct converttimeinfo {
+  int second;    /* seconds of GPS time [0..59] */
+  int minute;    /* minutes of GPS time [0..59] */
+  int hour;      /* hour of GPS time [0..24] */
+  int day;       /* day of GPS time [1..28..30(31)*/
+  int month;     /* month of GPS time [1..12]*/
+  int year;      /* year of GPS time [1980..] */
+};
 
 struct gnssdata {
@@ -234 +243 @@
 
 int gnumleap(int year, int month, int day);
+void updatetime(int *week, int *tow, int tk, int fixnumleap);
+void converttime(struct converttimeinfo *c, int week, int tow);
+
 void HandleHeader(struct RTCM3ParserData *Parser);
 int RTCM3Parser(struct RTCM3ParserData *handle);

trunk/BNC/bncapp.cpp

@@ -52 +52 @@
 using namespace std;
 
-struct converttimeinfo {
-  int second;    /* seconds of GPS time [0..59] */
-  int minute;    /* minutes of GPS time [0..59] */
-  int hour;      /* hour of GPS time [0..24] */
-  int day;       /* day of GPS time [1..28..30(31)*/
-  int month;     /* month of GPS time [1..12]*/
-  int year;      /* year of GPS time [1980..] */
-};
-
-extern "C" {
-  void converttime(struct converttimeinfo *c, int week, int tow);
-  void updatetime(int *week, int *tow, int tk, int fixnumleap);
-}
-
 // Constructor
 ////////////////////////////////////////////////////////////////////////////