Changeset 210 in ntrip

Timestamp:

Oct 6, 2006, 2:38:53 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM/RTCM2.cpp (modified) (4 diffs)
• bncutils.cpp (modified) (1 diff)
• bncutils.h (modified) (1 diff)

trunk/BNC/RTCM/RTCM2.cpp

@@ -30 +30 @@
 #include "RTCM2.h"
 
+#include "../bncutils.h"
 
 using namespace std;
@@ -1063 +1064 @@
   _buffer.append(buffer, bufLen);
 
+  int    refWeek;
+  double refSecs;
+  gpsWeekAndSec(refWeek, refSecs);
+
   while(true) {
     PP.getPacket(_buffer);
@@ -1070 +1075 @@
       ObsBlock.extract(PP);
       if (!ObsBlock.valid()) continue;
+
+      int    epochWeek;
+      double epochSecs;
+      ObsBlock.resolveEpoch(refWeek, refSecs, epochWeek, epochSecs);
         
       for (int iSat=0; iSat < ObsBlock.nSat; iSat++) {
@@ -1076 +1085 @@
 
           obs->SVPRN          = ObsBlock.PRN[iSat];
-          obs->GPSWeek        = 1390;
-          obs->GPSWeeks       = ObsBlock.secs;
+          obs->GPSWeek        = epochWeek;
+          obs->GPSWeeks       = (int) epochSecs;
           obs->sec            = ObsBlock.secs;
           obs->pCodeIndicator = 0;

trunk/BNC/bncutils.cpp

@@ -53 +53 @@
   return QDateTime(date,time);
 }
+
+
+void gpsWeekAndSec(int& week, double& sec) {
+
+  QDate date = QDate::currentDate();
+  QTime time = QTime::currentTime();
+
+  double deltat = date.toJulianDay() - 2400000.5 - 44244.0 +
+           ((( time.msec() / 1000.0 
+             + time.second() ) / 60.0
+             + time.minute()  ) / 60.0
+             + time.hour()     ) / 24.0;
+
+  week = (int) floor(deltat/7.0);
+  sec  = (deltat - (week)*7.0)*86400.0;
+}

trunk/BNC/bncutils.h

@@ -10 +10 @@
 QDateTime dateAndTimeFromGPSweek(int GPSWeek, double GPSWeeks);
 
+void gpsWeekAndSec(int& week, double& sec);
+
 #endif