mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-04-20 05:41:25 +00:00
Code Issues Releases Wiki Activity

Fix inconsistencies in BeiDou system designation by consistently using C

Browse Source
This commit is contained in:
Carles Fernandez
2026-01-23 17:37:13 +01:00
parent 1b5ff4c69e
commit 8ec3c911db
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/PVT/libs/rinex_printer.cc
View File

@@ -148,7 +148,7 @@ std::map<char, std::set<signal_flag>> get_constel_signal_flags(const Signal_Enab
{
std::map<char, std::set<signal_flag>> constel_signal_flags;
for (const auto& it : std::map<char, std::set<signal_flag>>{{'G', {GPS_1C, GPS_2S, GPS_L5}}, {'E', {GAL_1B, GAL_E5a, GAL_E5b, GAL_E6}}, {'R', {GLO_1G, GLO_2G}}, {'B', {BDS_B1, BDS_B3}}})
for (const auto& it : std::map<char, std::set<signal_flag>>{{'G', {GPS_1C, GPS_2S, GPS_L5}}, {'E', {GAL_1B, GAL_E5a, GAL_E5b, GAL_E6}}, {'R', {GLO_1G, GLO_2G}}, {'C', {BDS_B1, BDS_B3}}})
{
for (const auto flag : it.second)
{

2
src/core/system_parameters/beidou_dnav_almanac.h
View File

@@ -38,7 +38,7 @@ public:
*/
Beidou_Dnav_Almanac()
{
this->System = 'B';
this->System = 'C';
};
int SV_health{}; //!< SV Health

2
src/core/system_parameters/beidou_dnav_ephemeris.cc
View File

@@ -26,5 +26,5 @@ Beidou_Dnav_Ephemeris::Beidou_Dnav_Ephemeris()
{
satelliteBlock[i] = gnss_sat.what_block(_system, i);
}
this->System = 'B';
this->System = 'C';
}

6
src/core/system_parameters/gnss_almanac.cc
View File

@@ -130,7 +130,7 @@ double Gnss_Almanac::predicted_doppler(double rx_time_s,
predicted_doppler = 0.0;
}
}
else if (this->System == 'B') // Beidou
else if (this->System == 'C') // Beidou
{
if (band == 1)
{
@@ -168,7 +168,7 @@ void Gnss_Almanac::satellitePosVelComputation(double transmitTime, std::array<do
{
n = sqrt(GALILEO_GM / (a * a * a));
}
else if (this->System == 'B')
else if (this->System == 'C')
{
n = sqrt(BEIDOU_GM / (a * a * a));
}
@@ -242,7 +242,7 @@ void Gnss_Almanac::satellitePosVelComputation(double transmitTime, std::array<do
// Compute the angle between the ascending node and the Greenwich meridian
double Omega;
double Omega_dot;
if (this->System == 'B')
if (this->System == 'C')
{
Omega_dot = this->OMEGAdot * GNSS_PI - BEIDOU_OMEGA_EARTH_DOT;
Omega = this->OMEGA_0 * GNSS_PI + Omega_dot * tk - BEIDOU_OMEGA_EARTH_DOT * static_cast<double>(this->toa);

2
src/core/system_parameters/gnss_almanac.h
View File

@@ -92,7 +92,7 @@ public:
double af1{}; //!< Coefficient 1 of code phase offset model [s/s]
protected:
char System{}; //!< Character ID of the GNSS system. 'G': GPS. 'E': Galileo. 'B': BeiDou
char System{}; //!< Character ID of the GNSS system. 'G': GPS. 'E': Galileo. 'C': BeiDou
private:
double check_t(double time) const;
};

12
src/core/system_parameters/gnss_ephemeris.cc
View File

@@ -126,7 +126,7 @@ double Gnss_Ephemeris::predicted_doppler(double rx_time_s,
predicted_doppler = 0.0;
}
}
else if (this->System == 'B') // Beidou
else if (this->System == 'C') // Beidou
{
if (band == 1)
{
@@ -178,7 +178,7 @@ void Gnss_Ephemeris::satellitePosVelComputation(double transmitTime, std::array<
{
n0 = sqrt(GALILEO_GM / (a * a * a));
}
else if (this->System == 'B')
else if (this->System == 'C')
{
n0 = sqrt(BEIDOU_GM / (a * a * a));
}
@@ -252,7 +252,7 @@ void Gnss_Ephemeris::satellitePosVelComputation(double transmitTime, std::array<
// Compute the angle between the ascending node and the Greenwich meridian
double Omega;
double Omega_dot;
if (this->System == 'B')
if (this->System == 'C')
{
Omega_dot = this->OMEGAdot - BEIDOU_OMEGA_EARTH_DOT;
Omega = this->OMEGA_0 + Omega_dot * tk - BEIDOU_OMEGA_EARTH_DOT * static_cast<double>(this->toe);
@@ -292,7 +292,7 @@ void Gnss_Ephemeris::satellitePosVelComputation(double transmitTime, std::array<
{
pos_vel_dtr[6] -= 2.0 * sqrt(GALILEO_GM * a) * this->ecc * sek / (SPEED_OF_LIGHT_M_S * SPEED_OF_LIGHT_M_S);
}
else if (this->System == 'B')
else if (this->System == 'C')
{
pos_vel_dtr[6] -= 2.0 * sqrt(BEIDOU_GM * a) * this->ecc * sek / (SPEED_OF_LIGHT_M_S * SPEED_OF_LIGHT_M_S);
}
@@ -333,7 +333,7 @@ double Gnss_Ephemeris::sv_clock_relativistic_term(double transmitTime) const
{
n0 = sqrt(GALILEO_GM / (a * a * a));
}
else if (this->System == 'B')
else if (this->System == 'C')
{
n0 = sqrt(BEIDOU_GM / (a * a * a));
}
@@ -371,7 +371,7 @@ double Gnss_Ephemeris::sv_clock_relativistic_term(double transmitTime) const
{
dtr_ = GALILEO_F * this->ecc * this->sqrtA * sek;
}
else if (this->System == 'B')
else if (this->System == 'C')
{
dtr_ = BEIDOU_F * this->ecc * this->sqrtA * sek;
}

2
src/core/system_parameters/gnss_ephemeris.h
View File

@@ -109,7 +109,7 @@ public:
double satvel_Z{}; //!< Earth-fixed velocity coordinate z of the satellite [m]
protected:
char System{}; //!< Character ID of the GNSS system. 'G': GPS. 'E': Galileo. 'B': BeiDou
char System{}; //!< Character ID of the GNSS system. 'G': GPS. 'E': Galileo. 'C': BeiDou
private:
void satellitePosVelComputation(double transmitTime, std::array<double, 7>& pos_vel_dtr) const;