Changeset 1834 in ntrip for trunk/BNC/RTCM3

Timestamp:

May 7, 2009, 11:27:19 AM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC/RTCM3

Files:

• RTCM3coDecoder.cpp (modified) (2 diffs)
• rtcm3torinex.c (modified) (4 diffs)
• rtcm3torinex.h (modified) (2 diffs)

trunk/BNC/RTCM3/RTCM3coDecoder.cpp

@@ -47 +47 @@
 #include "bncapp.h"
 #include "bncsettings.h"
+#include "rtcm3torinex.h"
 
 using namespace std;
@@ -163 +164 @@
         }
         else {
-          double GPSdaysec = fmod(_GPSweeks, 86400.0);
-          int    weekDay   = int((_GPSweeks - GPSdaysec) / 86400.0);
-          if      (GPSdaysec > _co.GLONASSEpochTime + 3600.0) {
+
+          // Guess GPS week and sec using system time
+          // ----------------------------------------
+          int week;
+          double sec;
+          currentGPSWeeks(week, sec); 
+          int weekDay      = int(sec/86400.0); 
+          int GPSDaySecHlp = int(sec) - weekDay * 86400;
+
+          // cout << "week, sec " << week << " " << sec << endl;
+
+          // Second of day (GPS time) from Glonass Epoch
+          // -------------------------------------------
+          QDate date = dateAndTimeFromGPSweek(week, sec).date();
+          int leapSecond = gnumleap(date.year(), date.month(), date.day());
+          int GPSDaySec  = _co.GLONASSEpochTime + 3 * 3600 + leapSecond;
+
+          // cout << "GlonassEpoch, leapSecond, GPSDaySec "
+          //      << _co.GLONASSEpochTime << " " << leapSecond << " "
+          //      << GPSDaySec << endl;
+
+          // Handle the difference between system clock and correction epoch
+          // ---------------------------------------------------------------
+          if      (GPSDaySec < GPSDaySecHlp - 3600) {
             weekDay += 1;
-            if (weekDay > 6) {
-              weekDay = 0;
-              GPSweek += 1;
-            }
           }
-          else if (GPSdaysec < _co.GLONASSEpochTime - 3600.0) {
+          else if (GPSDaySec > GPSDaySecHlp + 3600) {
             weekDay -= 1;
-            if (weekDay < 0) {
-              weekDay = 6;
-              GPSweek -= 1;
-            }
-          }
-          _GPSweeks = weekDay * 86400.0 + _co.GLONASSEpochTime;
+          } 
+
+          _GPSweeks = weekDay * 86400.0 + GPSDaySec;
+                      
+          // cout << "weekDay, _GPSweeks " << weekDay << " " 
+          //      << _GPSweeks << endl;
         }
 

trunk/BNC/RTCM3/rtcm3torinex.c

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.23 2009/04/30 11:40:45 mervart Exp $
+  $Id: rtcm3torinex.c,v 1.24 2009/05/04 10:38:37 mervart Exp $
   Copyright (C) 2005-2008 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -55 +55 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.23 $";
+static char revisionstr[] = "$Revision: 1.24 $";
 
 #ifndef COMPILEDATE
@@ -238 +238 @@
 }
 
-static int gnumleap(int year, int month, int day)
+int gnumleap(int year, int month, int day)
 {
   int ls = 0;
@@ -1689 +1689 @@
 
 #ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2009/04/30 11:40:45 $";
+static char datestr[]     = "$Date: 2009/05/04 10:38:37 $";
 
 /* 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.15 2008/11/26 12:17:13 weber Exp $
+  $Id: rtcm3torinex.h,v 1.16 2008/12/08 10:50:42 mervart Exp $
   Copyright (C) 2005-2006 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -232 +232 @@
 #endif /* PRINTFARG */
 
+int gnumleap(int year, int month, int day);
 void HandleHeader(struct RTCM3ParserData *Parser);
 int RTCM3Parser(struct RTCM3ParserData *handle);