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

Remove some magic numbers in acq adapters, make formatting more readable

Browse Source
This commit is contained in:
Carles Fernandez
2025-11-06 08:57:49 +01:00
parent 6ed1ec3d78
commit 2161dd18e5
16 changed files with 101 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
View File

@@ -26,7 +26,15 @@ BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition(
const ConfigurationInterface* configuration,
const std::string& role,
unsigned int in_streams,
unsigned int out_streams) : BasePcpsAcquisition(configuration, role, in_streams, out_streams, BEIDOU_B1I_CODE_RATE_CPS, 10e6, BEIDOU_B1I_CODE_LENGTH_CHIPS, 1)
unsigned int out_streams)
: BasePcpsAcquisition(configuration,
role,
in_streams,
out_streams,
BEIDOU_B1I_CODE_RATE_CPS,
BEIDOU_B1I_OPT_ACQ_FS_SPS,
BEIDOU_B1I_CODE_LENGTH_CHIPS,
BEIDOU_B1I_CODE_PERIOD_MS)
{
}

10
src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc
View File

@@ -24,7 +24,15 @@ BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition(
const ConfigurationInterface* configuration,
const std::string& role,
unsigned int in_streams,
unsigned int out_streams) : BasePcpsAcquisition(configuration, role, in_streams, out_streams, BEIDOU_B3I_CODE_RATE_CPS, 100e6, BEIDOU_B3I_CODE_LENGTH_CHIPS, 1)
unsigned int out_streams)
: BasePcpsAcquisition(configuration,
role,
in_streams,
out_streams,
BEIDOU_B3I_CODE_RATE_CPS,
BEIDOU_B3I_OPT_ACQ_FS_SPS,
BEIDOU_B3I_CODE_LENGTH_CHIPS,
BEIDOU_B3I_CODE_PERIOD_MS)
{
}

10
src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
View File

@@ -25,8 +25,14 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
const std::string& role,
unsigned int in_streams,
unsigned int out_streams)
: BasePcpsAcquisition(configuration, role, in_streams, out_streams, GALILEO_E1_CODE_CHIP_RATE_CPS, GALILEO_E1_OPT_ACQ_FS_SPS, GALILEO_E1_B_CODE_LENGTH_CHIPS, 4),
configuration_(configuration),
: BasePcpsAcquisition(configuration,
role,
in_streams,
out_streams,
GALILEO_E1_CODE_CHIP_RATE_CPS,
GALILEO_E1_OPT_ACQ_FS_SPS,
GALILEO_E1_B_CODE_LENGTH_CHIPS,
GALILEO_E1_CODE_PERIOD_MS),
acquire_pilot_(configuration->property(role + ".acquire_pilot", false)),
cboc_(configuration->property(role + ".cboc", false))
{

1
src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
View File

@@ -57,7 +57,6 @@ public:
private:
void code_gen_complex_sampled(own::span<std::complex<float>> dest, uint32_t prn, int32_t sampling_freq) override;
const ConfigurationInterface* configuration_;
const bool acquire_pilot_;
const bool cboc_;
Gnss_Synchro* gnss_synchro_;

9
src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
View File

@@ -43,7 +43,14 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(
const std::string& role,
unsigned int in_streams,
unsigned int out_streams)
: BasePcpsAcquisition(configuration, role, in_streams, out_streams, GALILEO_E5A_CODE_CHIP_RATE_CPS, GALILEO_E5A_OPT_ACQ_FS_SPS, GALILEO_E5A_CODE_LENGTH_CHIPS, 1),
: BasePcpsAcquisition(configuration,
role,
in_streams,
out_streams,
GALILEO_E5A_CODE_CHIP_RATE_CPS,
GALILEO_E5A_OPT_ACQ_FS_SPS,
GALILEO_E5A_CODE_LENGTH_CHIPS,
GALILEO_E5A_CODE_PERIOD_MS),
acq_pilot_(configuration->property(role + ".acquire_pilot", false)),
acq_iq_(configuration->property(role + ".acquire_iq", false))
{

9
src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc
View File

@@ -24,7 +24,14 @@ GalileoE5bPcpsAcquisition::GalileoE5bPcpsAcquisition(const ConfigurationInterfac
const std::string& role,
unsigned int in_streams,
unsigned int out_streams)
: BasePcpsAcquisition(configuration, role, in_streams, out_streams, GALILEO_E5B_CODE_CHIP_RATE_CPS, GALILEO_E5B_OPT_ACQ_FS_SPS, GALILEO_E5B_CODE_LENGTH_CHIPS, 1),
: BasePcpsAcquisition(configuration,
role,
in_streams,
out_streams,
GALILEO_E5B_CODE_CHIP_RATE_CPS,
GALILEO_E5B_OPT_ACQ_FS_SPS,
GALILEO_E5B_CODE_LENGTH_CHIPS,
GALILEO_E5B_CODE_PERIOD_MS),
acq_pilot_(configuration->property(role + ".acquire_pilot", false)),
acq_iq_(configuration->property(role + ".acquire_iq", false))
{

10
src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.cc
View File

@@ -24,7 +24,15 @@ GalileoE6PcpsAcquisition::GalileoE6PcpsAcquisition(
const ConfigurationInterface* configuration,
const std::string& role,
unsigned int in_streams,
unsigned int out_streams) : BasePcpsAcquisition(configuration, role, in_streams, out_streams, GALILEO_E6_B_CODE_CHIP_RATE_CPS, GALILEO_E6_OPT_ACQ_FS_SPS, GALILEO_E6_B_CODE_LENGTH_CHIPS, 1)
unsigned int out_streams)
: BasePcpsAcquisition(configuration,
role,
in_streams,
out_streams,
GALILEO_E6_B_CODE_CHIP_RATE_CPS,
GALILEO_E6_OPT_ACQ_FS_SPS,
GALILEO_E6_B_CODE_LENGTH_CHIPS,
GALILEO_E6_CODE_PERIOD_MS)
{
}

10
src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
View File

@@ -26,7 +26,15 @@ GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition(
const ConfigurationInterface* configuration,
const std::string& role,
unsigned int in_streams,
unsigned int out_streams) : BasePcpsAcquisition(configuration, role, in_streams, out_streams, GLONASS_L1_CA_CODE_RATE_CPS, 100e6, GLONASS_L1_CA_CODE_LENGTH_CHIPS, 1)
unsigned int out_streams)
: BasePcpsAcquisition(configuration,
role,
in_streams,
out_streams,
GLONASS_L1_CA_CODE_RATE_CPS,
100e6,
GLONASS_L1_CA_CODE_LENGTH_CHIPS,
GLONASS_L1_CA_CODE_PEROD_MS)
{
}

10
src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc
View File

@@ -25,7 +25,15 @@ GlonassL2CaPcpsAcquisition::GlonassL2CaPcpsAcquisition(
const ConfigurationInterface* configuration,
const std::string& role,
unsigned int in_streams,
unsigned int out_streams) : BasePcpsAcquisition(configuration, role, in_streams, out_streams, GLONASS_L2_CA_CODE_RATE_CPS, 100e6, GLONASS_L2_CA_CODE_LENGTH_CHIPS, 1)
unsigned int out_streams)
: BasePcpsAcquisition(configuration,
role,
in_streams,
out_streams,
GLONASS_L2_CA_CODE_RATE_CPS,
100e6,
GLONASS_L2_CA_CODE_LENGTH_CHIPS,
GLONASS_L2_CA_CODE_PEROD_MS)
{
}

10
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
View File

@@ -28,7 +28,15 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
const ConfigurationInterface* configuration,
const std::string& role,
unsigned int in_streams,
unsigned int out_streams) : BasePcpsAcquisition(configuration, role, in_streams, out_streams, GPS_L1_CA_CODE_RATE_CPS, GPS_L1_CA_OPT_ACQ_FS_SPS, GPS_L1_CA_CODE_LENGTH_CHIPS, 1)
unsigned int out_streams)
: BasePcpsAcquisition(configuration,
role,
in_streams,
out_streams,
GPS_L1_CA_CODE_RATE_CPS,
GPS_L1_CA_OPT_ACQ_FS_SPS,
GPS_L1_CA_CODE_LENGTH_CHIPS,
GPS_L1_CA_CODE_PERIOD_MS)
{
}

10
src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
View File

@@ -26,7 +26,15 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
const ConfigurationInterface* configuration,
const std::string& role,
unsigned int in_streams,
unsigned int out_streams) : BasePcpsAcquisition(configuration, role, in_streams, out_streams, GPS_L2_M_CODE_RATE_CPS, GPS_L2C_OPT_ACQ_FS_SPS, GPS_L2_M_CODE_LENGTH_CHIPS, 20)
unsigned int out_streams)
: BasePcpsAcquisition(configuration,
role,
in_streams,
out_streams,
GPS_L2_M_CODE_RATE_CPS,
GPS_L2C_OPT_ACQ_FS_SPS,
GPS_L2_M_CODE_LENGTH_CHIPS,
GPS_L2_M_CODE_PERIOD_MS)
{
}

10
src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
View File

@@ -26,7 +26,15 @@ GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition(
const ConfigurationInterface* configuration,
const std::string& role,
unsigned int in_streams,
unsigned int out_streams) : BasePcpsAcquisition(configuration, role, in_streams, out_streams, GPS_L5I_CODE_RATE_CPS, GPS_L5_OPT_ACQ_FS_SPS, GPS_L5I_CODE_LENGTH_CHIPS, 1)
unsigned int out_streams)
: BasePcpsAcquisition(configuration,
role,
in_streams,
out_streams,
GPS_L5I_CODE_RATE_CPS,
GPS_L5_OPT_ACQ_FS_SPS,
GPS_L5I_CODE_LENGTH_CHIPS,
GPS_L5I_PERIOD_MS)
{
}

1
src/core/system_parameters/Beidou_B1I.h
View File

@@ -34,6 +34,7 @@ constexpr double BEIDOU_B1I_CODE_RATE_CPS = 2.046e6; //!< Beidou B1I code ra
constexpr double BEIDOU_B1I_CODE_LENGTH_CHIPS = 2046.0; //!< Beidou B1I code length [chips]
constexpr double BEIDOU_B1I_CODE_PERIOD_S = 0.001; //!< Beidou B1I code period [seconds]
constexpr double BEIDOU_B1I_PREAMBLE_DURATION_S = 0.220;
constexpr double BEIDOU_B1I_OPT_ACQ_FS_SPS = 10e6;
constexpr uint32_t BEIDOU_B1I_CODE_PERIOD_MS = 1; //!< Beidou B1I code period [ms]
constexpr uint32_t BEIDOU_B1I_PREAMBLE_LENGTH_BITS = 11;
constexpr uint32_t BEIDOU_B1I_PREAMBLE_LENGTH_SYMBOLS = 220;

1
src/core/system_parameters/Beidou_B3I.h
View File

@@ -33,6 +33,7 @@ constexpr double BEIDOU_B3I_CODE_RATE_CPS = 10.23e6; //!< BeiDou B3I code r
constexpr double BEIDOU_B3I_CODE_LENGTH_CHIPS = 10230.0; //!< BeiDou B3I code length [chips]
constexpr double BEIDOU_B3I_CODE_PERIOD_S = 0.001; //!< BeiDou B3I code period [seconds]
constexpr double BEIDOU_B3I_PREAMBLE_DURATION_S = 0.220;
constexpr double BEIDOU_B3I_OPT_ACQ_FS_SPS = 10e6;
constexpr uint32_t BEIDOU_B3I_CODE_PERIOD_MS = 1; //!< BeiDou B3I code period [ms]
constexpr uint32_t BEIDOU_B3I_PREAMBLE_LENGTH_BITS = 11;
constexpr uint32_t BEIDOU_B3I_PREAMBLE_LENGTH_SYMBOLS = 220; // **************

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

@@ -81,6 +81,8 @@ constexpr double GLONASS_L1_CA_CODE_PERIOD_S = 0.001; //!< GLONASS L1 C/A
constexpr double GLONASS_L1_CA_CHIP_PERIOD_S = 1.9569e-06; //!< GLONASS L1 C/A chip period [seconds]
constexpr double GLONASS_L1_CA_SYMBOL_RATE_BPS = 1000.0;
constexpr uint32_t GLONASS_L1_CA_CODE_PEROD_MS = 1;
constexpr uint32_t GLONASS_L2_CA_CODE_PEROD_MS = 1;
constexpr int32_t GLONASS_CA_NBR_SATS = 24; // STRING DATA WITHOUT PREAMBLE
// OBSERVABLE HISTORY DEEP FOR INTERPOLATION

1
src/core/system_parameters/GPS_L2C.h
View File

@@ -37,6 +37,7 @@ constexpr double GPS_L2_L_PERIOD_S = 1.5; //!< GPS L2 L code perio
constexpr double GPS_L2_M_CODE_RATE_CPS = 0.5115e6; //!< GPS L2 M code rate [chips/s]
constexpr double GPS_L2_M_PERIOD_S = 0.02; //!< GPS L2 M code period [seconds]
constexpr double GPS_L2_L_CODE_RATE_CPS = 0.5115e6; //!< GPS L2 L code rate [chips/s]
constexpr uint32_t GPS_L2_M_CODE_PERIOD_MS = 20; //!< GPS L2 L code period [ms]
constexpr int32_t GPS_L2_M_CODE_LENGTH_CHIPS = 10230; //!< GPS L2 M code length [chips]
constexpr int32_t GPS_L2_L_CODE_LENGTH_CHIPS = 767250; //!< GPS L2 L code length [chips]
constexpr int32_t GPS_L2_CNAV_DATA_PAGE_BITS = 300; //!< GPS L2 CNAV page length, including preamble and CRC [bits]