Changeset 2285 in ntrip

Timestamp:

Feb 9, 2010, 11:34:51 AM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk

Files:

• BNC/RTCM3/ephemeris.cpp (modified) (3 diffs)
• BNC/bncmodel.cpp (modified) (1 diff)
• BNS/bnseph.cpp (modified) (1 diff)

trunk/BNC/RTCM3/ephemeris.cpp

@@ -10 +10 @@
 #include "bncutils.h"
 #include "timeutils.h"
+#include "bnctime.h"
 
 using namespace std;
@@ -233 +234 @@
 int t_ephGlo::IOD() const {
 
-  bool old = true;
+  bool old = false;
 
   if (old) { // 5 LSBs of iod are equal to 5 LSBs of tb
@@ -242 +243 @@
   }
   else     {  
-    return int(fmod(_tki, 3600)) / 30;
+    bncTime tGPS(_GPSweek, _GPSweeks);
+    int hlpWeek = _GPSweek;
+    int hlpSec  = int(_GPSweeks);
+    int hlpMsec = int(_GPSweeks * 1000);
+    updatetime(&hlpWeek, &hlpSec, hlpMsec, 0);
+    bncTime tHlp(hlpWeek, hlpSec);
+    double diffSec = tGPS - tHlp;
+    bncTime tMoscow = tGPS + diffSec;
+    return int(tMoscow.daysec() / 900);
   }
 }

trunk/BNC/bncmodel.cpp

@@ -65 +65 @@
 const double   sig_amb_0_GPS    =  100.0;
 const double   sig_amb_0_GLO    = 1000.0;
-const double   sig_P3           =    1.0;
+const double   sig_P3           =    3.0;
 const double   sig_L3_GPS       =    0.01;
 const double   sig_L3_GLO       =    0.01;

trunk/BNS/bnseph.cpp

@@ -707 +707 @@
 int t_ephGlo::IOD() const {
 
-  bool old = true;
+  bool old = false;
 
   if (old) { // 5 LSBs of iod are equal to 5 LSBs of tb