bds_b3i: merging new changes, fixing D2 decoding bug

2025-10-31 07:13:03 +00:00 · 2019-03-07 09:38:49 -06:00
parent de964d4a77 361a5d471d
commit 2b4a395dc8
270 changed files with 1283 additions and 1448 deletions
--- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
@@ -41,8 +41,6 @@
 #include <glog/logging.h>


-using google::LogMessage;
-
 BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition(
    ConfigurationInterface* configuration,
    const std::string& role,
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
@@ -37,8 +37,6 @@
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>

-using google::LogMessage;
-

 GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition(
    ConfigurationInterface* configuration,
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
@@ -39,9 +39,6 @@
 #include <glog/logging.h>


-using google::LogMessage;
-
-
 GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
    ConfigurationInterface* configuration,
    const std::string& role,
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
@@ -37,9 +37,6 @@
 #include <glog/logging.h>


-using google::LogMessage;
-
-
 GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
    ConfigurationInterface* configuration,
    const std::string& role,
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
@@ -37,8 +37,6 @@
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>

-using google::LogMessage;
-

 GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition(
    ConfigurationInterface* configuration,
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
@@ -37,8 +37,6 @@
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>

-using google::LogMessage;
-

 GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcquisition(
    ConfigurationInterface* configuration,
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
@@ -37,8 +37,6 @@
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>

-using google::LogMessage;
-

 GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition(
    ConfigurationInterface* configuration,
--- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
@@ -43,8 +43,6 @@
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>

-using google::LogMessage;
-

 GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf(
    ConfigurationInterface* configuration,
--- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
@@ -39,9 +39,6 @@
 #include <volk_gnsssdr/volk_gnsssdr_complex.h>


-using google::LogMessage;
-
-
 GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* configuration,
    const std::string& role,
    unsigned int in_streams,
--- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc
@@ -39,9 +39,6 @@
 #include <volk_gnsssdr/volk_gnsssdr_complex.h>


-using google::LogMessage;
-
-
 GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterface* configuration,
    const std::string& role,
    unsigned int in_streams,
--- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
@@ -41,9 +41,6 @@
 #include <glog/logging.h>


-using google::LogMessage;
-
-
 GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition(
    ConfigurationInterface* configuration,
    const std::string& role,
--- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc
@@ -40,9 +40,6 @@
 #include <glog/logging.h>


-using google::LogMessage;
-
-
 GlonassL2CaPcpsAcquisition::GlonassL2CaPcpsAcquisition(
    ConfigurationInterface* configuration,
    const std::string& role,
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
@@ -43,9 +43,6 @@
 #include <glog/logging.h>


-using google::LogMessage;
-
-
 GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
    ConfigurationInterface* configuration,
    const std::string& role,
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
@@ -40,8 +40,6 @@
 #include "gps_sdr_signal_processing.h"
 #include <glog/logging.h>

-using google::LogMessage;
-

 GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
    ConfigurationInterface* configuration,
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc
@@ -44,8 +44,6 @@

 #define NUM_PRNs 32

-using google::LogMessage;
-

 GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga(
    ConfigurationInterface* configuration,
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc
@@ -40,9 +40,6 @@
 #include <glog/logging.h>


-using google::LogMessage;
-
-
 GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition(
    ConfigurationInterface* configuration,
    const std::string& role,
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc
@@ -38,9 +38,6 @@
 #include <glog/logging.h>


-using google::LogMessage;
-
-
 GpsL1CaPcpsOpenClAcquisition::GpsL1CaPcpsOpenClAcquisition(
    ConfigurationInterface* configuration,
    const std::string& role,
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
@@ -39,9 +39,6 @@
 #include <glog/logging.h>


-using google::LogMessage;
-
-
 GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition(
    ConfigurationInterface* configuration,
    const std::string& role,
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
@@ -38,9 +38,6 @@
 #include <glog/logging.h>


-using google::LogMessage;
-
-
 GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
    ConfigurationInterface* configuration,
    const std::string& role,
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
@@ -41,9 +41,6 @@
 #include <glog/logging.h>


-using google::LogMessage;
-
-
 GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
    ConfigurationInterface* configuration,
    const std::string& role,
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc
@@ -41,8 +41,6 @@

 #define NUM_PRNs 32

-using google::LogMessage;
-

 GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga(
    ConfigurationInterface* configuration,
@@ -85,6 +83,10 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga(
    //acq_parameters.samples_per_ms = static_cast<int>(std::round(static_cast<double>(fs_in_) * 0.001));
    acq_parameters.samples_per_code = nsamples_total;

+    acq_parameters.downsampling_factor = configuration_->property(role + ".downsampling_factor", 1.0);
+    acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 14);
+    acq_parameters.excludelimit = static_cast<uint32_t>(std::round(static_cast<double>(fs_in_) / GPS_L2_M_CODE_RATE_HZ));
+
    // compute all the GPS L1 PRN Codes (this is done only once upon the class constructor in order to avoid re-computing the PRN codes every time
    // a channel is assigned)
    auto* fft_if = new gr::fft::fft_complex(vector_length, true);  // Direct FFT
@@ -220,6 +222,7 @@ void GpsL2MPcpsAcquisitionFpga::reset()
    acquisition_fpga_->set_active(true);
 }

+
 void GpsL2MPcpsAcquisitionFpga::set_state(int state)
 {
    acquisition_fpga_->set_state(state);
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
@@ -41,9 +41,6 @@
 #include <glog/logging.h>


-using google::LogMessage;
-
-
 GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition(
    ConfigurationInterface* configuration,
    const std::string& role,
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc
@@ -42,8 +42,6 @@

 #define NUM_PRNs 32

-using google::LogMessage;
-

 GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(
    ConfigurationInterface* configuration,
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
@@ -44,7 +44,6 @@
 #include <sstream>
 #include <utility>

-using google::LogMessage;

 galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr galileo_e5a_noncoherentIQ_make_acquisition_caf_cc(
    unsigned int sampled_ms,
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
@@ -38,7 +38,6 @@
 #include <sstream>
 #include <utility>

-using google::LogMessage;

 galileo_pcps_8ms_acquisition_cc_sptr galileo_pcps_8ms_make_acquisition_cc(
    uint32_t sampled_ms,
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc
@@ -45,8 +45,6 @@
 #include <cstring>


-using google::LogMessage;
-
 pcps_acquisition_sptr pcps_make_acquisition(const Acq_Conf& conf_)
 {
    return pcps_acquisition_sptr(new pcps_acquisition(conf_));
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
@@ -44,8 +44,6 @@
 #include <sstream>


-using google::LogMessage;
-
 pcps_acquisition_fine_doppler_cc_sptr pcps_make_acquisition_fine_doppler_cc(const Acq_Conf &conf_)
 {
    return pcps_acquisition_fine_doppler_cc_sptr(
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc
@@ -39,7 +39,6 @@

 #define AQ_DOWNSAMPLING_DELAY 40  // delay due to the downsampling filter in the acquisition

-using google::LogMessage;

 pcps_acquisition_fpga_sptr pcps_make_acquisition_fpga(pcpsconf_fpga_t conf_)
 {
@@ -63,6 +62,7 @@ pcps_acquisition_fpga::pcps_acquisition_fpga(pcpsconf_fpga_t conf_) : gr::block(
    d_num_doppler_bins = 0U;
    d_threshold = 0.0;
    d_doppler_step = 0U;
+    d_doppler_index = 0U;
    d_test_statistics = 0.0;
    d_channel = 0U;
    d_gnss_synchro = nullptr;
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
@@ -44,7 +44,6 @@

 extern Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;

-using google::LogMessage;

 pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc(
    int32_t max_dwells, uint32_t sampled_ms, int32_t doppler_max, int32_t doppler_min,
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
@@ -44,7 +44,6 @@
 #include <sstream>
 #include <utility>

-using google::LogMessage;

 pcps_cccwsr_acquisition_cc_sptr pcps_cccwsr_make_acquisition_cc(
    uint32_t sampled_ms,
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
@@ -64,8 +64,6 @@
 #include <utility>


-using google::LogMessage;
-
 pcps_opencl_acquisition_cc_sptr pcps_make_opencl_acquisition_cc(
    uint32_t sampled_ms, uint32_t max_dwells,
    uint32_t doppler_max, int64_t fs_in,
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
@@ -40,8 +40,6 @@
 #include <utility>


-using google::LogMessage;
-
 pcps_quicksync_acquisition_cc_sptr pcps_quicksync_make_acquisition_cc(
    uint32_t folding_factor,
    uint32_t sampled_ms,
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
@@ -58,7 +58,6 @@
 #include <sstream>
 #include <utility>

-using google::LogMessage;

 pcps_tong_acquisition_cc_sptr pcps_tong_make_acquisition_cc(
    uint32_t sampled_ms,