Changeset 9212 in ntrip


Ignore:
Timestamp:
Nov 4, 2020, 3:28:55 PM (3 weeks ago)
Author:
stuerze
Message:
 
Location:
trunk/BNC/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

    r9210 r9212  
    10231023
    10241024    eph._receptDateTime = currentDateAndTimeGPS();
     1025    eph._receptStaID = _staID;
    10251026
    10261027    GETBITS(i, 6)
     
    11001101
    11011102    eph._receptDateTime = currentDateAndTimeGPS();
     1103    eph._receptStaID = _staID;
    11021104
    11031105    GETBITS(sv, 6)
     
    12241226
    12251227    eph._receptDateTime = currentDateAndTimeGPS();
     1228    eph._receptStaID = _staID;
    12261229
    12271230    GETBITS(i, 4)
     
    13061309
    13071310    eph._receptDateTime = currentDateAndTimeGPS();
     1311    eph._receptStaID = _staID;
    13081312
    13091313    GETBITS(i, 6)
     
    13961400
    13971401    eph._receptDateTime = currentDateAndTimeGPS();
     1402    eph._receptStaID = _staID;
    13981403
    13991404    GETBITS(i, 6)
     
    14501455
    14511456    eph._receptDateTime = currentDateAndTimeGPS();
     1457    eph._receptStaID = _staID;
    14521458
    14531459    eph._inav = (i == 1046);
     
    15551561
    15561562    eph._receptDateTime = currentDateAndTimeGPS();
     1563    eph._receptStaID = _staID;
    15571564
    15581565    GETBITS(i, 6)
     
    17291736       * else. */
    17301737      if ((id >= 1057 && id <= 1068) ||
    1731           (id >= 1240 && id <= 1270) ||
    1732                   (id == 4076)) {
     1738          (id >= 1240 && id <= 1270) ||
     1739          (id == 4076)) {
    17331740        if (!_coDecoders.contains(_staID.toLatin1())) {
    17341741          _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID);
     
    17411748          coDecoder->setSsrFormatType(RTCM3coDecoder::RTCMssr);
    17421749        }
    1743         if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize,
    1744             errmsg) == success) {
     1750        if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize, errmsg) == success) {
    17451751          decoded = true;
    17461752        }
  • trunk/BNC/src/bnccore.cpp

    r9158 r9212  
    206206  }
    207207  else if (eph->checkState() == t_eph::outdated) {
    208     messagePrivate("OUTDATED EPHEMERIS\n" + eph->toString(3.0).toLatin1());
     208    messagePrivate(QString("OUTDATED EPHEMERIS %1 received from %2 (%4)")
     209                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
     210                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toLatin1());
    209211    return failure;
    210212  }
    211213  else if (eph->checkState() == t_eph::unhealthy) {
    212     messagePrivate("UNHEALTHY EPHEMERIS\n" + eph->toString(3.0).toLatin1());
     214    messagePrivate(QString("UNHEALTHY EPHEMERIS %1 received from %2 (%4)")
     215                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
     216                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toLatin1());
    213217  }
    214218  printEphHeader();
  • trunk/BNC/src/ephemeris.h

    r8925 r9212  
    3737  void    setClkCorr(const t_clkCorr* clkCorr);
    3838  const QDateTime& receptDateTime() const {return _receptDateTime;}
     39  const QString receptStaID() const {return _receptStaID;}
    3940  static QString rinexDateStr(const bncTime& tt, const t_prn& prn, double version);
    4041  static QString rinexDateStr(const bncTime& tt, const QString& prnStr, double version);
     
    4748  bncTime      _TOC;
    4849  QDateTime    _receptDateTime;
     50  QString      _receptStaID;
    4951  e_checkState _checkState;
    5052  t_orbCorr*   _orbCorr;
     
    8789    _TOT              = 0.0;
    8890    _fitInterval      = 0.0;
     91    _receptStaID      = "";
    8992  }
    9093  t_ephGPS(float rnxVersion, const QStringList& lines);
     
    186189    _M_tau_GPS        = 0.0;
    187190    _M_l5             = 0.0;
     191    _receptStaID      = "";
    188192  }
    189193  t_ephGlo(float rnxVersion, const QStringList& lines);
     
    278282    _BGD_1_5B        = 0.0;
    279283    _TOT             = 0.0;
     284    _receptStaID     = "";
    280285  };
    281286  t_ephGal(float rnxVersion, const QStringList& lines);
     
    358363    _ura            = 0.0;
    359364    _health         = 0.0;
     365    _receptStaID    = "";
    360366  }
    361367  t_ephSBAS(float rnxVersion, const QStringList& lines);
     
    425431   _TOEsec          = 0.0;
    426432   _TOEweek         =-1.0;
     433   _receptStaID     = "";
    427434 }
    428435 t_ephBDS(float rnxVersion, const QStringList& lines);
Note: See TracChangeset for help on using the changeset viewer.