Changeset 9216 in ntrip


Ignore:
Timestamp:
Nov 4, 2020, 4:02:19 PM (4 weeks ago)
Author:
stuerze
Message:

ephemeris checks + debugging output added

Location:
branches/BNC_2.12/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp

    r9209 r9216  
    10231023
    10241024    eph._receptDateTime = currentDateAndTimeGPS();
     1025    eph._receptStaID = _staID;   
    10251026
    10261027    GETBITS(i, 6)
     
    11001101
    11011102    eph._receptDateTime = currentDateAndTimeGPS();
    1102 
     1103    eph._receptStaID = _staID;
     1104   
    11031105    GETBITS(sv, 6)
    11041106    eph._prn.set('R', sv);
     
    12241226
    12251227    eph._receptDateTime = currentDateAndTimeGPS();
    1226 
     1228    eph._receptStaID = _staID;
     1229   
    12271230    GETBITS(i, 4)
    12281231    eph._prn.set('J', i);
     
    13061309
    13071310    eph._receptDateTime = currentDateAndTimeGPS();
    1308 
     1311    eph._receptStaID = _staID;
     1312   
    13091313    GETBITS(i, 6)
    13101314    eph._prn.set('I', i);
     
    13961400
    13971401    eph._receptDateTime = currentDateAndTimeGPS();
    1398 
     1402    eph._receptStaID = _staID;
     1403   
    13991404    GETBITS(i, 6)
    14001405    eph._prn.set('S', 20 + i);
     
    14501455
    14511456    eph._receptDateTime = currentDateAndTimeGPS();
    1452 
     1457    eph._receptStaID = _staID;
     1458   
    14531459    eph._inav = (i == 1046);
    14541460    eph._fnav = (i == 1045);
     
    15551561
    15561562    eph._receptDateTime = currentDateAndTimeGPS();
    1557 
     1563    eph._receptStaID = _staID;
     1564   
    15581565    GETBITS(i, 6)
    15591566    eph._prn.set('C', i);
  • branches/BNC_2.12/src/bnccore.cpp

    r8351 r9216  
    202202  t_irc ircPut = _ephUser.putNewEph(eph, true);
    203203  if      (eph->checkState() == t_eph::bad) {
    204     messagePrivate("WRONG EPHEMERIS\n" + eph->toString(3.0).toAscii());
     204    messagePrivate(QString("WRONG EPHEMERIS %1 received from %2 (%4)")
     205                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
     206                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toAscii());
    205207    return failure;
    206208  }
    207209  else if (eph->checkState() == t_eph::outdated) {
    208     messagePrivate("OUTDATED EPHEMERIS\n" + eph->toString(3.0).toAscii());
     210    messagePrivate(QString("OUTDATED EPHEMERIS %1 received from %2 (%4)")
     211                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
     212                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toAscii());
    209213    return failure;
    210214  }
    211215  else if (eph->checkState() == t_eph::unhealthy) {
    212     messagePrivate("UNHEALTHY EPHEMERIS\n" + eph->toString(3.0).toLatin1());
     216    messagePrivate(QString("UNHEALTHY EPHEMERIS %1 received from %2 (%4)")
     217                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
     218                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toAscii());
    213219  }
    214220  printEphHeader();
  • branches/BNC_2.12/src/ephemeris.h

    r8926 r9216  
    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);
     
    187190    _M_tau_GPS        = 0.0;
    188191    _M_l5             = 0.0;
     192    _receptStaID      = "";   
    189193  }
    190194  t_ephGlo(float rnxVersion, const QStringList& lines);
     
    279283    _BGD_1_5B        = 0.0;
    280284    _TOT             = 0.0;
     285    _receptStaID     = "";   
    281286  };
    282287  t_ephGal(float rnxVersion, const QStringList& lines);
     
    359364    _ura            = 0.0;
    360365    _health         = 0.0;
     366    _receptStaID    = "";   
    361367  }
    362368  t_ephSBAS(float rnxVersion, const QStringList& lines);
     
    426432   _TOEsec          = 0.0;
    427433   _TOEweek         =-1.0;
     434    _receptStaID    = "";   
    428435 }
    429436 t_ephBDS(float rnxVersion, const QStringList& lines);
  • branches/BNC_2.12/src/src.pri

    r9209 r9216  
    2727debug:DEFINES  += BNC_DEBUG_BCEP
    2828#debug:DEFINES  += BNC_DEBUG_SSR
     29release:DEFINES += BNC_DEBUG_BCEP
    2930
    3031# Include Path
Note: See TracChangeset for help on using the changeset viewer.