Changeset 10754 in ntrip for trunk


Ignore:
Timestamp:
Sep 2, 2025, 1:23:45 PM (3 months ago)
Author:
stuerze
Message:

initial preparation for adding the new RTCM-SSR format

Location:
trunk/BNC/src
Files:
3 added
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

    r10617 r10754  
    700700    // =========//
    701701    case RTCMssr:
     702    case RTCMnewssr:
    702703      if (coSat.Clock.DeltaA0 < -209.7151 ||
    703704          coSat.Clock.DeltaA0 > +209.7151)   {

  • trunk/BNC/src/RTCM3/RTCM3coDecoder.h

    r10599 r10754  
    3333#include "../RTCM3/clock_and_orbit/clock_orbit_igs.h"
    3434#include "../RTCM3/clock_and_orbit/clock_orbit_rtcm.h"
     35#include "../RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h"
    3536#include "ephemeris.h"
    3637
    … …  
    3839Q_OBJECT
    3940 public:
    40   enum e_type {RTCMssr, IGSssr};
     41  enum e_type {RTCMssr, IGSssr, RTCMnewssr};
    4142  RTCM3coDecoder(const QString& staID);
    4243  virtual ~RTCM3coDecoder();
    … …  
    4849      _ssrCorr = new SsrCorrRtcm();
    4950    }
    50     else {
     51    else if (_type == IGSssr) {
    5152      _ssrCorr = new SsrCorrIgs();
     53    }
     54    else if (_type == RTCMnewssr) {
     55      _ssrCorr = new SsrCorrRtcmNew();
    5256    }
    5357  }

  • trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h

    r10658 r10754  
    9494
    9595public:
    96   SsrCorr() {};
    97   virtual ~SsrCorr() {};
     96  SsrCorr();
     97  virtual ~SsrCorr();
    9898  virtual void setCorBase() = 0;
    9999  virtual void setCorOffset() = 0;
    … …  
    101101  virtual void setCbType() = 0;
    102102  virtual void setPbType() = 0;
     103  virtual void setPbExtType() = 0;
    103104  virtual void setVtecType() = 0;
    104105  virtual void setCodeType() = 0;
    … …  
    184185  PhaseBiasType PBTYPE_BDS;
    185186  PhaseBiasType PBTYPE_AUTO;
     187
     188  typedef unsigned int PhaseBiasExtType;
     189  PhaseBiasExtType PBEXTTYPE_BASE;
     190  PhaseBiasExtType PBEXTTYPE_GPS;
     191  PhaseBiasExtType PBEXTTYPE_GLONASS;
     192  PhaseBiasExtType PBEXTTYPE_GALILEO;
     193  PhaseBiasExtType PBEXTTYPE_QZSS;
     194  PhaseBiasExtType PBEXTTYPE_BDS;
     195  PhaseBiasExtType PBEXTTYPE_AUTO;
    186196
    187197  typedef unsigned int VtecType;

  • trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp

    r10227 r10754  
    1616#include <sys/types.h>
    1717#endif
    18 #include <clock_orbit_igs.h>
    19 
     18#include "clock_orbit_igs.h"
     19
     20SsrCorrIgs::SsrCorrIgs() {
     21    setCorBase();
     22    setCorOffset();
     23    setCoType();
     24    setCbType();
     25    setPbType();
     26    setPbExtType();
     27    setVtecType();
     28    setCodeType();
     29
     30    satoffset << CLOCKORBIT_OFFSETGPS
     31        << CLOCKORBIT_OFFSETGLONASS
     32        << CLOCKORBIT_OFFSETGALILEO
     33        << CLOCKORBIT_OFFSETQZSS
     34        << CLOCKORBIT_OFFSETSBAS
     35        << CLOCKORBIT_OFFSETBDS
     36        << CLOCKORBIT_COUNTSAT;
     37};
     38
     39SsrCorrIgs::~SsrCorrIgs() {};
    2040
    2141size_t SsrCorrIgs::MakeClockOrbit(const struct ClockOrbit *co, ClockOrbitType type,

  • trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h

    r9114 r10754  
    1010 Description:    state space approach: IGS
    1111 */
    12 #include <QDebug>
     12
    1313#include <string.h>
    1414#include "clock_orbit.h"
    1515
    1616class SsrCorrIgs: public SsrCorr {
    17   //Q_OBJECT
    1817
    1918public:
    20   SsrCorrIgs() {
    21     setCorBase();
    22     setCorOffset();
    23     setCoType();
    24     setCbType();
    25     setPbType();
    26     setVtecType();
    27     setCodeType();
    28 
    29     satoffset << CLOCKORBIT_OFFSETGPS
    30         << CLOCKORBIT_OFFSETGLONASS
    31         << CLOCKORBIT_OFFSETGALILEO
    32         << CLOCKORBIT_OFFSETQZSS
    33         << CLOCKORBIT_OFFSETSBAS
    34         << CLOCKORBIT_OFFSETBDS
    35         << CLOCKORBIT_COUNTSAT;
    36   };
    37 
    38   ~SsrCorrIgs() {};
     19  SsrCorrIgs();
     20  ~SsrCorrIgs();
    3921
    4022  void setCorBase() {
    … …  
    125107    PBTYPE_AUTO = 0;
    126108  };
     109
     110  void setPbExtType() { };
    127111
    128112  void setVtecType() {
    … …  
    248232       struct VTEC *v, struct PhaseBias *pb, const char *buffer, size_t size,
    249233       int *bytesused);
    250   };
     234};
    251235
    252236#endif /* RTCM3_CLOCK_ORBIT_IGS_H */

  • trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp

    r9962 r10754  
    1818#include "clock_orbit_rtcm.h"
    1919
     20  SsrCorrRtcm::SsrCorrRtcm() {
     21    setCorBase();
     22    setCorOffset();
     23    setCoType();
     24    setCbType();
     25    setPbType();
     26    setPbExtType();
     27    setVtecType();
     28    setCodeType();
     29
     30    satoffset << CLOCKORBIT_OFFSETGPS
     31        << CLOCKORBIT_OFFSETGLONASS
     32        << CLOCKORBIT_OFFSETGALILEO
     33        << CLOCKORBIT_OFFSETQZSS
     34        << CLOCKORBIT_OFFSETSBAS
     35        << CLOCKORBIT_OFFSETBDS
     36        << CLOCKORBIT_COUNTSAT;
     37  };
     38
     39  SsrCorrRtcm::~SsrCorrRtcm() {};
    2040
    2141size_t SsrCorrRtcm::MakeClockOrbit(const struct ClockOrbit *co, ClockOrbitType type,

  • trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h

    r9050 r10754  
    1515
    1616class SsrCorrRtcm: public SsrCorr {
    17   //Q_OBJECT
    1817
    1918public:
    20   SsrCorrRtcm() {
    21     setCorBase();
    22     setCorOffset();
    23     setCoType();
    24     setCbType();
    25     setPbType();
    26     setVtecType();
    27     setCodeType();
    28 
    29     satoffset << CLOCKORBIT_OFFSETGPS
    30         << CLOCKORBIT_OFFSETGLONASS
    31         << CLOCKORBIT_OFFSETGALILEO
    32         << CLOCKORBIT_OFFSETQZSS
    33         << CLOCKORBIT_OFFSETSBAS
    34         << CLOCKORBIT_OFFSETBDS
    35         << CLOCKORBIT_COUNTSAT;
    36   };
    37 
    38   ~SsrCorrRtcm() {};
     19  SsrCorrRtcm();
     20  ~SsrCorrRtcm();
    3921
    4022  void setCorBase() {
    … …  
    124106    PBTYPE_AUTO = 0;
    125107  };
     108
     109  void setPbExtType() {};
    126110
    127111  void setVtecType() {

  • trunk/BNC/src/combination/bnccomb.cpp

    r10694 r10754  
    208208    _ssrCorr = new SsrCorrRtcm();
    209209  }
     210  else if (ssrFormat == "RTCM-NEW-SSR") {
     211    _ssrCorr = new SsrCorrRtcmNew();
     212  }
    210213  else { // default
    211214    _ssrCorr = new SsrCorrIgs();

  • trunk/BNC/src/combination/bnccomb.h

    r10694 r10754  
    1919#include "bncoutf.h"
    2020#include "../RTCM3/clock_and_orbit/clock_orbit_rtcm.h"
     21#include "../RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h"
    2122#include "../RTCM3/clock_and_orbit/clock_orbit_igs.h"
    2223

  • trunk/BNC/src/upload/bncephuploadcaster.cpp

    r10619 r10754  
    2727bncEphUploadCaster::bncEphUploadCaster() : bncEphUser(true) {
    2828  bncSettings settings;
    29   int     sampl    = settings.value("uploadSamplRtcmEph").toInt();
     29  int sampl = settings.value("uploadSamplRtcmEph").toInt();
    3030
    31   // List of upload casters
    32   // ----------------------
     31  // List of upload ephUploadCasters
     32  // -------------------------------
    3333  int iRow = -1;
    3434  QListIterator<QString> it(settings.value("uploadEphMountpointsOut").toStringList());

  • trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

    r10667 r10754  
    7070    else if (_ssrFormat == "RTCM-SSR") {
    7171        _ssrCorr = new SsrCorrRtcm();
     72    }
     73    else if (ssrFormat == "RTCM-NEW-SSR") {
     74      _ssrCorr = new SsrCorrRtcmNew();
    7275    }
    7376

  • trunk/BNC/src/upload/bncrtnetuploadcaster.h

    r10657 r10754  
    88#include "ephemeris.h"
    99#include "../RTCM3/clock_and_orbit/clock_orbit_rtcm.h"
     10#include "../RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h"
    1011#include "../RTCM3/clock_and_orbit/clock_orbit_igs.h"
    1112#include "../RTCM3/crs.h"
    … …  
    5455
    5556    QString        _casterID;
    56     bncEphUser* _ephUser;
     57    bncEphUser*    _ephUser;
    5758    QString        _rtnetStreamBuffer;
    5859    QString        _crdTrafoStr;
Note: See TracChangeset for help on using the changeset viewer.