Changeset 9785 in ntrip for trunk/BNC

Timestamp:

Jun 29, 2022, 12:03:05 PM (22 months ago)

Author:

stuerze

Message:

 

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (4 diffs)
• ephemeris.cpp (modified) (5 diffs)
• ephemeris.h (modified) (2 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -1587 +1587 @@
     eph._prn.set('C', i);
 
-    SKIPBITS(13)
-    /* week */
+    GETBITS(eph._BDTweek, 13)
     GETBITS(i, 4)
     eph._URA = accuracyFromIndex(i, eph.type());
@@ -1595 +1594 @@
     GETBITS(i, 17)
     i <<= 3;
-    eph._TOC.setBDS(i * 1000);
+    eph._TOC.setBDS(eph._BDTweek, i);
     GETFLOATSIGN(eph._clock_driftrate, 11,  1.0 / (double )(1 << 30) / (double )(1 << 30) / (double )(1 << 6))
     GETFLOATSIGN(eph._clock_drift,     22,  1.0 / (double )(1 << 30) / (double )(1 << 20))
@@ -1618 +1617 @@
     i <<= 3;
     eph._TOEsec = i;
-    eph._TOE.setBDS(i * 1000);
+    eph._TOE.setBDS(eph._BDTweek, i);
     GETFLOATSIGN(eph._Cic,      18, 1.0 / (double )(1 << 30) / (double )(1 << 1))
     GETFLOATSIGN(eph._OMEGA0,   32, R2R_PI/(double)(1<<30)/(double)(1<<1))
@@ -1637 +1636 @@
       eph._navType = t_eph::D2;
     }
-
 
     emit newBDSEph(eph);

trunk/BNC/src/ephemeris.cpp

@@ -1700 +1700 @@
     else if ( iLine == 5 ) {
       if ( readDbl(line, pos[0], fieldLen, _IDOT    ) ||
-           readDbl(line, pos[2], fieldLen, _TOEweek)) {
+           readDbl(line, pos[2], fieldLen, _BDTweek)) {
         _checkState = bad;
         return;
@@ -1732 +1732 @@
   }
 
-  _TOE.setBDS(int(_TOEweek), _TOEsec);
+  _TOE.setBDS(int(_BDTweek), _TOEsec);
 
   // remark: actually should be computed from second_tot
@@ -1940 +1940 @@
     .arg(_sqrt_A, 19, 'e', 12);
 
-  double toes = 0.0;
-  if (_TOEweek > -1.0) {// RINEX input
-    toes = _TOEsec;
-  }
-  else {// RTCM stream input
-    toes = _TOE.bdssec();
-  }
-  out << QString(fmt)
-    .arg(toes,    19, 'e', 12)
+  out << QString(fmt)
+    .arg(_TOEsec, 19, 'e', 12)
     .arg(_Cic,    19, 'e', 12)
     .arg(_OMEGA0, 19, 'e', 12)
@@ -1959 +1952 @@
     .arg(_OMEGADOT, 19, 'e', 12);
 
-  double toew = 0.0;
-  if (_TOEweek > -1.0) {// RINEX input
-    toew = _TOEweek;
-  }
-  else {// RTCM stream input
-    toew = double(_TOE.bdsw());
-  }
-  out << QString(fmt)
-    .arg(_IDOT, 19, 'e', 12)
-    .arg(0.0,   19, 'e', 12)
-    .arg(toew,  19, 'e', 12)
-    .arg(0.0,   19, 'e', 12);
+  out << QString(fmt)
+    .arg(_IDOT,    19, 'e', 12)
+    .arg(0.0,      19, 'e', 12)
+    .arg(_BDTweek, 19, 'e', 12)
+    .arg(0.0,      19, 'e', 12);
 
   out << QString(fmt)
@@ -1979 +1965 @@
 
   double tots = 0.0;
-  if (_TOEweek > -1.0) {// RINEX input
+  if (_receptDateTime.isValid()) {// RTCM stream input
+    tots = _TOE.bdssec();
+  }
+  else { // RINEX input
     tots = _TOT;
-  }
-  else {// RTCM stream input
-    tots = _TOE.bdssec();
   }
   out << QString(fmt)

trunk/BNC/src/ephemeris.h

@@ -445 +445 @@
    _TGD2            = 0.0;
    _SatH1           = 0.0;
-   _TOW             = 0.0;
    _TOEsec          = 0.0;
-   _TOEweek         =-1.0;
+   _BDTweek         = 0.0;
    _receptStaID     = "";
  }
@@ -488 +487 @@
   double  _TGD2;             //  [s]
   int     _SatH1;            //
-  double  _TOW;              //  [s] of BDT week
   double  _TOEsec;           //  [s] of BDT week
-  double  _TOEweek;          //  BDT week will be set only in case of RINEX file input
+  double  _BDTweek;          //  BDT week
 };
 #endif