mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2026-09-09 10:49:13 +00:00
Remove references to old adapters
This commit is contained in:
Carles Fernandez
@@ -1638,12 +1638,10 @@ can be continuously improved without having any impact neither on the algorithm
|
||||
interface nor the general acquisition interface.
|
||||
|
||||
Check
|
||||
[GpsL1CaPcpsAcquisition](./src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h)
|
||||
and
|
||||
[GalileoE1PcpsAmbiguousAcquisition](./src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h)
|
||||
for examples of adapters from a Parallel Code Phase Search (PCPS) acquisition
|
||||
block, and
|
||||
[pcps_acquisition_cc](./src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h)
|
||||
[PcpsAcquisitionAdapter](./src/algorithms/acquisition/adapters/pcps_acquisition_adapter.h)
|
||||
for an example of an adapter from a Parallel Code Phase Search (PCPS)
|
||||
acquisition block to AcquisitionInterface, and
|
||||
[pcps_acquisition](./src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h)
|
||||
for an example of a block implementation. The source code of all the available
|
||||
acquisition algorithms is located at:
|
||||
|
||||
|
||||
@@ -379,8 +379,8 @@ derived from <tt>gr::block</tt>, and ensures that newly developed implementation
|
||||
Moreover, it adds still another layer of abstraction, since each given acquisition algorithm can have different implementations (for instance using
|
||||
different numerical libraries). In such a way, implementations can be continuously improved without having any impact neither on the algorithm interface nor the general acquisition interface.
|
||||
|
||||
Check GpsL1CaPcpsAcquisition and GalileoE1PcpsAmbiguousAcquisition for examples of adapters from a Parallel Code Phase Search (PCPS) acquisition block, and
|
||||
pcps_acquisition_cc for an example of a block implementation. The source code of all the available acquisition algorithms is located at:
|
||||
Check PcpsAcquisitionAdapter for an example of an adapter from a Parallel Code Phase Search (PCPS) acquisition block to AcquisitionInterface, and
|
||||
pcps_acquisition for an example of a block implementation. The source code of all the available acquisition algorithms is located at:
|
||||
|
||||
\verbatim
|
||||
|-gnss-sdr
|
||||
@@ -422,7 +422,7 @@ second stage of the signal processing unit, aiming to perform a local search for
|
||||
variations.
|
||||
|
||||
Again, a class hierarchy consisting of a TrackingInterface class and subclasses implementing algorithms provides a way of testing different approaches,
|
||||
with full access to their parameters. Check GpsL1CaDllPllTracking or GalileoE1DllPllVemlTracking for examples of adapters, and Gps_L1_Ca_Dll_Pll_Tracking_cc for an example
|
||||
with full access to their parameters. Check DllPllTrackingAdapter for an example of an adapter from a DLL/PLL tracking block to TrackingInterface, and dll_pll_veml_tracking for an example
|
||||
of a signal processing block implementation. There are also available some useful classes and functions for signal tracking; take a look at Correlator, lock_detectors.h, tracking_discriminators.h or
|
||||
tracking_2nd_DLL_filter.h.
|
||||
|
||||
@@ -476,7 +476,7 @@ spread over different words, and values extracted from different frames are requ
|
||||
error control an others contain actual information. There are also error control mechanisms, from parity checks to forward error correction (FEC) encoding and
|
||||
interleaving, depending on the system.
|
||||
|
||||
The common interface is TelemetryDecoderInterface. Check GpsL1CaTelemetryDecoder for an example of the GPS L1 NAV message decoding adapter, and gps_l1_ca_telemetry_decoder_cc
|
||||
The common interface is TelemetryDecoderInterface. Check TelemetryDecoderAdapter for an example of an adapter from a telemetry decoder block to TelemetryDecoderInterface, and gps_l1_ca_telemetry_decoder_gs
|
||||
for an actual implementation of a signal processing block. Configuration example:
|
||||
|
||||
\verbatim
|
||||
|
||||
@@ -306,7 +306,7 @@ TEST(GNSSBlockFactoryTest, InstantiateWrongAcquisition)
|
||||
}
|
||||
|
||||
|
||||
TEST(GNSSBlockFactoryTest, InstantiateGpsL1CaDllPllTracking)
|
||||
TEST(GNSSBlockFactoryTest, InstantiateDllPllTrackingAdapterGpsL1Ca)
|
||||
{
|
||||
std::shared_ptr<InMemoryConfiguration> configuration = std::make_shared<InMemoryConfiguration>();
|
||||
configuration->set_property("Tracking.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
|
||||
@@ -330,7 +330,7 @@ TEST(GNSSBlockFactoryTest, InstantiateGpsL1CaTcpConnectorTracking)
|
||||
}
|
||||
|
||||
|
||||
TEST(GNSSBlockFactoryTest, InstantiateGalileoE1DllPllVemlTracking)
|
||||
TEST(GNSSBlockFactoryTest, InstantiateDllPllTrackingAdapterGalileoE1)
|
||||
{
|
||||
std::shared_ptr<InMemoryConfiguration> configuration = std::make_shared<InMemoryConfiguration>();
|
||||
configuration->set_property("Tracking.implementation", "Galileo_E1_DLL_PLL_VEML_Tracking");
|
||||
@@ -352,7 +352,7 @@ TEST(GNSSBlockFactoryTest, InstantiateWrongTracking)
|
||||
}
|
||||
|
||||
|
||||
TEST(GNSSBlockFactoryTest, InstantiateGpsL1CaTelemetryDecoder)
|
||||
TEST(GNSSBlockFactoryTest, InstantiateTelemetryDecoderAdapterGpsL1Ca)
|
||||
{
|
||||
std::shared_ptr<InMemoryConfiguration> configuration = std::make_shared<InMemoryConfiguration>();
|
||||
configuration->set_property("TelemetryDecoder.implementation", "GPS_L1_CA_Telemetry_Decoder");
|
||||
|
||||
+12
-12
@@ -20,12 +20,12 @@
|
||||
#include "configuration_interface.h"
|
||||
#include "fir_filter.h"
|
||||
#include "gen_signal_source.h"
|
||||
#include "glonass_l2_ca_pcps_acquisition.h"
|
||||
#include "gnss_block_interface.h"
|
||||
#include "gnss_sdr_valve.h"
|
||||
#include "gnss_synchro.h"
|
||||
#include "in_memory_configuration.h"
|
||||
#include "pass_through.h"
|
||||
#include "pcps_acquisition_adapter.h"
|
||||
#include "signal_generator.h"
|
||||
#include "signal_generator_c.h"
|
||||
#include "boost/shared_ptr.hpp"
|
||||
@@ -58,16 +58,16 @@ class GlonassL2CaPcpsAcquisitionTest_msg_rx;
|
||||
|
||||
using GlonassL2CaPcpsAcquisitionTest_msg_rx_sptr = gnss_shared_ptr<GlonassL2CaPcpsAcquisitionTest_msg_rx>;
|
||||
|
||||
GlonassL2CaPcpsAcquisitionTest_msg_rx_sptr GlonassL2CaPcpsAcquisitionTest_msg_rx_make(concurrent_queue<int>& queue);
|
||||
GlonassL2CaPcpsAcquisitionTest_msg_rx_sptr GlonassL2CaPcpsAcquisitionTest_msg_rx_make(Concurrent_Queue<int>& queue);
|
||||
|
||||
|
||||
class GlonassL2CaPcpsAcquisitionTest_msg_rx : public gr::block
|
||||
{
|
||||
private:
|
||||
friend GlonassL2CaPcpsAcquisitionTest_msg_rx_sptr GlonassL2CaPcpsAcquisitionTest_msg_rx_make(concurrent_queue<int>& queue);
|
||||
friend GlonassL2CaPcpsAcquisitionTest_msg_rx_sptr GlonassL2CaPcpsAcquisitionTest_msg_rx_make(Concurrent_Queue<int>& queue);
|
||||
void msg_handler_channel_events(const pmt::pmt_t msg);
|
||||
explicit GlonassL2CaPcpsAcquisitionTest_msg_rx(concurrent_queue<int>& queue);
|
||||
concurrent_queue<int>& channel_internal_queue;
|
||||
explicit GlonassL2CaPcpsAcquisitionTest_msg_rx(Concurrent_Queue<int>& queue);
|
||||
Concurrent_Queue<int>& channel_internal_queue;
|
||||
|
||||
public:
|
||||
int rx_message;
|
||||
@@ -75,7 +75,7 @@ public:
|
||||
};
|
||||
|
||||
|
||||
GlonassL2CaPcpsAcquisitionTest_msg_rx_sptr GlonassL2CaPcpsAcquisitionTest_msg_rx_make(concurrent_queue<int>& queue)
|
||||
GlonassL2CaPcpsAcquisitionTest_msg_rx_sptr GlonassL2CaPcpsAcquisitionTest_msg_rx_make(Concurrent_Queue<int>& queue)
|
||||
{
|
||||
return GlonassL2CaPcpsAcquisitionTest_msg_rx_sptr(new GlonassL2CaPcpsAcquisitionTest_msg_rx(queue));
|
||||
}
|
||||
@@ -97,7 +97,7 @@ void GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_channel_events(const pmt
|
||||
}
|
||||
|
||||
|
||||
GlonassL2CaPcpsAcquisitionTest_msg_rx::GlonassL2CaPcpsAcquisitionTest_msg_rx(concurrent_queue<int>& queue) : gr::block("GlonassL2CaPcpsAcquisitionTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
|
||||
GlonassL2CaPcpsAcquisitionTest_msg_rx::GlonassL2CaPcpsAcquisitionTest_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GlonassL2CaPcpsAcquisitionTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
|
||||
{
|
||||
this->message_port_register_in(pmt::mp("events"));
|
||||
this->set_msg_handler(pmt::mp("events"),
|
||||
@@ -150,7 +150,7 @@ protected:
|
||||
|
||||
std::shared_ptr<Concurrent_Queue<pmt::pmt_t> > queue;
|
||||
gr::top_block_sptr top_block;
|
||||
std::shared_ptr<GlonassL2CaPcpsAcquisition> acquisition;
|
||||
std::shared_ptr<PcpsAcquisitionAdapter> acquisition;
|
||||
std::shared_ptr<InMemoryConfiguration> config;
|
||||
Gnss_Synchro gnss_synchro;
|
||||
size_t item_size;
|
||||
@@ -436,7 +436,7 @@ void GlonassL2CaPcpsAcquisitionTest::stop_queue()
|
||||
TEST_F(GlonassL2CaPcpsAcquisitionTest, Instantiate)
|
||||
{
|
||||
config_1();
|
||||
acquisition = std::make_shared<GlonassL2CaPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
|
||||
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition_2G", "GLONASS_L2_CA_PCPS_Acquisition", 1, 0, GLO_2G);
|
||||
}
|
||||
|
||||
|
||||
@@ -449,7 +449,7 @@ TEST_F(GlonassL2CaPcpsAcquisitionTest, ConnectAndRun)
|
||||
top_block = gr::make_top_block("Acquisition test");
|
||||
|
||||
config_1();
|
||||
acquisition = std::make_shared<GlonassL2CaPcpsAcquisition>(config.get(), "Acquisition_2G", 1, 0);
|
||||
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition_2G", "GLONASS_L2_CA_PCPS_Acquisition", 1, 0, GLO_2G);
|
||||
auto msg_rx = GlonassL2CaPcpsAcquisitionTest_msg_rx_make(channel_internal_queue);
|
||||
|
||||
ASSERT_NO_THROW({
|
||||
@@ -478,7 +478,7 @@ TEST_F(GlonassL2CaPcpsAcquisitionTest, ValidationOfResults)
|
||||
queue = std::make_shared<Concurrent_Queue<pmt::pmt_t> >();
|
||||
top_block = gr::make_top_block("Acquisition test");
|
||||
|
||||
acquisition = std::make_shared<GlonassL2CaPcpsAcquisition>(config.get(), "Acquisition_2G", 1, 0);
|
||||
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition_2G", "GLONASS_L2_CA_PCPS_Acquisition", 1, 0, GLO_2G);
|
||||
auto msg_rx = GlonassL2CaPcpsAcquisitionTest_msg_rx_make(channel_internal_queue);
|
||||
|
||||
ASSERT_NO_THROW({
|
||||
@@ -550,7 +550,7 @@ TEST_F(GlonassL2CaPcpsAcquisitionTest, ValidationOfResultsProbabilities)
|
||||
config_2();
|
||||
queue = std::make_shared<Concurrent_Queue<pmt::pmt_t> >();
|
||||
top_block = gr::make_top_block("Acquisition test");
|
||||
acquisition = std::make_shared<GlonassL2CaPcpsAcquisition>(config.get(), "Acquisition_2G", 1, 0);
|
||||
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition_2G", "GLONASS_L2_CA_PCPS_Acquisition", 1, 0, GLO_2G);
|
||||
auto msg_rx = GlonassL2CaPcpsAcquisitionTest_msg_rx_make(channel_internal_queue);
|
||||
|
||||
ASSERT_NO_THROW({
|
||||
|
||||
@@ -99,7 +99,18 @@ bool Acquisition_Dump_Reader::read_binary_acq()
|
||||
sample_counter = *static_cast<uint64_t*>(var2_->data);
|
||||
Mat_VarFree(var2_);
|
||||
|
||||
var2_ = Mat_VarRead(matfile, "d_positive_acq");
|
||||
var2_ = Mat_VarRead(matfile, "positive_acq");
|
||||
if (var2_ == nullptr)
|
||||
{
|
||||
var2_ = Mat_VarRead(matfile, "d_positive_acq");
|
||||
}
|
||||
if (var2_ == nullptr)
|
||||
{
|
||||
std::cout << "Unreachable positive acquisition variable in Acquisition dump file.\n";
|
||||
Mat_VarFree(var_);
|
||||
Mat_Close(matfile);
|
||||
return false;
|
||||
}
|
||||
positive_acq = *static_cast<int*>(var2_->data);
|
||||
Mat_VarFree(var2_);
|
||||
|
||||
@@ -303,4 +314,4 @@ Acquisition_Dump_Reader& Acquisition_Dump_Reader::operator=(Acquisition_Dump_Rea
|
||||
sample_counter = other.sample_counter;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
}
|
||||
|
||||
+40
-40
@@ -1,7 +1,7 @@
|
||||
/*!
|
||||
* \file gps_l1_ca_dll_pll_tracking_test.cc
|
||||
* \brief This class implements a telemetry decoder test for GPS_L1_CA_Telemetry_Decoder
|
||||
* implementation based on some input parameters.
|
||||
* \file gps_l1_ca_telemetry_decoder_test.cc
|
||||
* \brief This class implements a telemetry decoder test for TelemetryDecoderAdapter
|
||||
* configured for GPS L1 C/A based on some input parameters.
|
||||
* \author Javier Arribas, 2015. jarribas(at)cttc.es
|
||||
*
|
||||
*
|
||||
@@ -64,30 +64,30 @@ namespace wht = std;
|
||||
#endif
|
||||
|
||||
// ######## GNURADIO BLOCK MESSAGE RECEIVER FOR TRACKING MESSAGES #########
|
||||
class GpsL1CADllPllTelemetryDecoderTest_msg_rx;
|
||||
class TelemetryDecoderAdapterGpsL1CaTest_msg_rx;
|
||||
|
||||
using GpsL1CADllPllTelemetryDecoderTest_msg_rx_sptr = gnss_shared_ptr<GpsL1CADllPllTelemetryDecoderTest_msg_rx>;
|
||||
using TelemetryDecoderAdapterGpsL1CaTest_msg_rx_sptr = gnss_shared_ptr<TelemetryDecoderAdapterGpsL1CaTest_msg_rx>;
|
||||
|
||||
GpsL1CADllPllTelemetryDecoderTest_msg_rx_sptr GpsL1CADllPllTelemetryDecoderTest_msg_rx_make();
|
||||
TelemetryDecoderAdapterGpsL1CaTest_msg_rx_sptr TelemetryDecoderAdapterGpsL1CaTest_msg_rx_make();
|
||||
|
||||
class GpsL1CADllPllTelemetryDecoderTest_msg_rx : public gr::block
|
||||
class TelemetryDecoderAdapterGpsL1CaTest_msg_rx : public gr::block
|
||||
{
|
||||
private:
|
||||
friend GpsL1CADllPllTelemetryDecoderTest_msg_rx_sptr GpsL1CADllPllTelemetryDecoderTest_msg_rx_make();
|
||||
friend TelemetryDecoderAdapterGpsL1CaTest_msg_rx_sptr TelemetryDecoderAdapterGpsL1CaTest_msg_rx_make();
|
||||
void msg_handler_channel_events(const pmt::pmt_t msg);
|
||||
GpsL1CADllPllTelemetryDecoderTest_msg_rx();
|
||||
TelemetryDecoderAdapterGpsL1CaTest_msg_rx();
|
||||
|
||||
public:
|
||||
int rx_message;
|
||||
~GpsL1CADllPllTelemetryDecoderTest_msg_rx(); //!< Default destructor
|
||||
~TelemetryDecoderAdapterGpsL1CaTest_msg_rx(); //!< Default destructor
|
||||
};
|
||||
|
||||
GpsL1CADllPllTelemetryDecoderTest_msg_rx_sptr GpsL1CADllPllTelemetryDecoderTest_msg_rx_make()
|
||||
TelemetryDecoderAdapterGpsL1CaTest_msg_rx_sptr TelemetryDecoderAdapterGpsL1CaTest_msg_rx_make()
|
||||
{
|
||||
return GpsL1CADllPllTelemetryDecoderTest_msg_rx_sptr(new GpsL1CADllPllTelemetryDecoderTest_msg_rx());
|
||||
return TelemetryDecoderAdapterGpsL1CaTest_msg_rx_sptr(new TelemetryDecoderAdapterGpsL1CaTest_msg_rx());
|
||||
}
|
||||
|
||||
void GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg)
|
||||
void TelemetryDecoderAdapterGpsL1CaTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -101,7 +101,7 @@ void GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_channel_events(const
|
||||
}
|
||||
}
|
||||
|
||||
GpsL1CADllPllTelemetryDecoderTest_msg_rx::GpsL1CADllPllTelemetryDecoderTest_msg_rx() : gr::block("GpsL1CADllPllTelemetryDecoderTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0))
|
||||
TelemetryDecoderAdapterGpsL1CaTest_msg_rx::TelemetryDecoderAdapterGpsL1CaTest_msg_rx() : gr::block("TelemetryDecoderAdapterGpsL1CaTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0))
|
||||
{
|
||||
this->message_port_register_in(pmt::mp("events"));
|
||||
this->set_msg_handler(pmt::mp("events"),
|
||||
@@ -109,45 +109,45 @@ GpsL1CADllPllTelemetryDecoderTest_msg_rx::GpsL1CADllPllTelemetryDecoderTest_msg_
|
||||
[this](auto&& PH1) { msg_handler_channel_events(std::forward<decltype(PH1)>(PH1)); });
|
||||
#else
|
||||
#if USE_BOOST_BIND_PLACEHOLDERS
|
||||
boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1));
|
||||
boost::bind(&TelemetryDecoderAdapterGpsL1CaTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1));
|
||||
#else
|
||||
boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_channel_events, this, _1));
|
||||
boost::bind(&TelemetryDecoderAdapterGpsL1CaTest_msg_rx::msg_handler_channel_events, this, _1));
|
||||
#endif
|
||||
#endif
|
||||
rx_message = 0;
|
||||
}
|
||||
|
||||
GpsL1CADllPllTelemetryDecoderTest_msg_rx::~GpsL1CADllPllTelemetryDecoderTest_msg_rx() = default;
|
||||
TelemetryDecoderAdapterGpsL1CaTest_msg_rx::~TelemetryDecoderAdapterGpsL1CaTest_msg_rx() = default;
|
||||
|
||||
|
||||
// ###########################################################
|
||||
|
||||
|
||||
// ######## GNURADIO BLOCK MESSAGE RECEIVER FOR TLM MESSAGES #########
|
||||
class GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx;
|
||||
class TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx;
|
||||
|
||||
using GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_sptr = std::shared_ptr<GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx>;
|
||||
using TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx_sptr = std::shared_ptr<TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx>;
|
||||
|
||||
GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_sptr GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_make();
|
||||
TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx_sptr TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx_make();
|
||||
|
||||
class GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx : public gr::block
|
||||
class TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx : public gr::block
|
||||
{
|
||||
private:
|
||||
friend GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_sptr GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_make();
|
||||
friend TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx_sptr TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx_make();
|
||||
void msg_handler_channel_events(const pmt::pmt_t msg);
|
||||
GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx();
|
||||
TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx();
|
||||
|
||||
public:
|
||||
int rx_message;
|
||||
~GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx(); //!< Default destructor
|
||||
~TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx(); //!< Default destructor
|
||||
};
|
||||
|
||||
GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_sptr GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_make()
|
||||
TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx_sptr TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx_make()
|
||||
{
|
||||
return GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_sptr(new GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx());
|
||||
return TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx_sptr(new TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx());
|
||||
}
|
||||
|
||||
void GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg)
|
||||
void TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -161,25 +161,25 @@ void GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::msg_handler_channel_events(co
|
||||
}
|
||||
}
|
||||
|
||||
GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx() : gr::block("GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0))
|
||||
TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx::TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx() : gr::block("TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0))
|
||||
{
|
||||
this->message_port_register_in(pmt::mp("events"));
|
||||
this->set_msg_handler(pmt::mp("events"),
|
||||
#if HAS_GENERIC_LAMBDA
|
||||
[this](auto&& PH1) { msg_handler_channel_events(std::forward<decltype(PH1)>(PH1)); });
|
||||
#else
|
||||
boost::bind(&GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1));
|
||||
boost::bind(&TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1));
|
||||
#endif
|
||||
rx_message = 0;
|
||||
}
|
||||
|
||||
GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::~GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx() = default;
|
||||
TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx::~TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx() = default;
|
||||
|
||||
|
||||
// ###########################################################
|
||||
|
||||
|
||||
class GpsL1CATelemetryDecoderTest : public ::testing::Test
|
||||
class TelemetryDecoderAdapterGpsL1CaTest : public ::testing::Test
|
||||
{
|
||||
public:
|
||||
std::string generator_binary;
|
||||
@@ -205,14 +205,14 @@ public:
|
||||
arma::vec& meas_time_s,
|
||||
arma::vec& meas_value);
|
||||
|
||||
GpsL1CATelemetryDecoderTest()
|
||||
TelemetryDecoderAdapterGpsL1CaTest()
|
||||
{
|
||||
config = std::make_shared<InMemoryConfiguration>();
|
||||
item_size = sizeof(gr_complex);
|
||||
gnss_synchro = Gnss_Synchro();
|
||||
}
|
||||
|
||||
~GpsL1CATelemetryDecoderTest() = default;
|
||||
~TelemetryDecoderAdapterGpsL1CaTest() = default;
|
||||
|
||||
void configure_receiver();
|
||||
|
||||
@@ -223,7 +223,7 @@ public:
|
||||
};
|
||||
|
||||
|
||||
int GpsL1CATelemetryDecoderTest::configure_generator()
|
||||
int TelemetryDecoderAdapterGpsL1CaTest::configure_generator()
|
||||
{
|
||||
#if USE_GLOG_AND_GFLAGS
|
||||
// Configure signal generator
|
||||
@@ -263,7 +263,7 @@ int GpsL1CATelemetryDecoderTest::configure_generator()
|
||||
}
|
||||
|
||||
|
||||
int GpsL1CATelemetryDecoderTest::generate_signal()
|
||||
int TelemetryDecoderAdapterGpsL1CaTest::generate_signal()
|
||||
{
|
||||
int child_status;
|
||||
|
||||
@@ -288,7 +288,7 @@ int GpsL1CATelemetryDecoderTest::generate_signal()
|
||||
}
|
||||
|
||||
|
||||
void GpsL1CATelemetryDecoderTest::configure_receiver()
|
||||
void TelemetryDecoderAdapterGpsL1CaTest::configure_receiver()
|
||||
{
|
||||
gnss_synchro.Channel_ID = 0;
|
||||
gnss_synchro.System = 'G';
|
||||
@@ -313,7 +313,7 @@ void GpsL1CATelemetryDecoderTest::configure_receiver()
|
||||
}
|
||||
|
||||
|
||||
void GpsL1CATelemetryDecoderTest::check_results(arma::vec& true_time_s,
|
||||
void TelemetryDecoderAdapterGpsL1CaTest::check_results(arma::vec& true_time_s,
|
||||
arma::vec& true_value,
|
||||
arma::vec& meas_time_s,
|
||||
arma::vec& meas_value)
|
||||
@@ -363,7 +363,7 @@ void GpsL1CATelemetryDecoderTest::check_results(arma::vec& true_time_s,
|
||||
}
|
||||
|
||||
|
||||
TEST_F(GpsL1CATelemetryDecoderTest, ValidationOfResults)
|
||||
TEST_F(TelemetryDecoderAdapterGpsL1CaTest, ValidationOfResults)
|
||||
{
|
||||
// Configure the signal generator
|
||||
configure_generator();
|
||||
@@ -405,7 +405,7 @@ TEST_F(GpsL1CATelemetryDecoderTest, ValidationOfResults)
|
||||
std::shared_ptr<TrackingInterface> tracking = std::make_shared<DllPllTrackingAdapter>(config.get(), "Tracking_1C", "GPS_L1_CA_DLL_PLL_Tracking", 1, 1, GPS_1C);
|
||||
// std::shared_ptr<TrackingInterface> tracking = std::make_shared<GpsL1CaDllPllCAidTracking>(config.get(), "Tracking_1C", 1, 1);
|
||||
|
||||
auto msg_rx = GpsL1CADllPllTelemetryDecoderTest_msg_rx_make();
|
||||
auto msg_rx = TelemetryDecoderAdapterGpsL1CaTest_msg_rx_make();
|
||||
|
||||
// load acquisition data based on the first epoch of the true observations
|
||||
ASSERT_NO_THROW({
|
||||
@@ -429,7 +429,7 @@ TEST_F(GpsL1CATelemetryDecoderTest, ValidationOfResults)
|
||||
std::shared_ptr<TelemetryDecoderInterface> tlm = std::make_shared<TelemetryDecoderAdapter>("TelemetryDecoder_1C", "GPS_L1_CA_Telemetry_Decoder", 1, 1, std::move(telemetry_decoder));
|
||||
tlm->set_channel(0);
|
||||
|
||||
std::shared_ptr<GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx> tlm_msg_rx = GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_make();
|
||||
std::shared_ptr<TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx> tlm_msg_rx = TelemetryDecoderAdapterGpsL1CaTest_tlm_msg_rx_make();
|
||||
|
||||
ASSERT_NO_THROW({
|
||||
tracking->set_channel(gnss_synchro.Channel_ID);
|
||||
|
||||
+8
-8
@@ -1,7 +1,7 @@
|
||||
/*!
|
||||
* \file galileo_e1_dll_pll_veml_tracking_test.cc
|
||||
* \brief This class implements a tracking test for GalileoE1DllPllVemlTracking
|
||||
* class based on some input parameters.
|
||||
* \brief This class implements a tracking test for DllPllTrackingAdapter
|
||||
* configured for Galileo E1 based on some input parameters.
|
||||
* \author Luis Esteve, 2012. luis(at)epsilon-formacion.com
|
||||
*
|
||||
*
|
||||
@@ -37,10 +37,10 @@
|
||||
#include <gnuradio/analog/sig_source_c.h>
|
||||
#endif
|
||||
|
||||
class GalileoE1DllPllVemlTrackingInternalTest : public ::testing::Test
|
||||
class DllPllTrackingAdapterGalileoE1Test : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
GalileoE1DllPllVemlTrackingInternalTest()
|
||||
DllPllTrackingAdapterGalileoE1Test()
|
||||
: item_size(sizeof(gr_complex))
|
||||
{
|
||||
factory = std::make_shared<GNSSBlockFactory>();
|
||||
@@ -60,7 +60,7 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
void GalileoE1DllPllVemlTrackingInternalTest::init()
|
||||
void DllPllTrackingAdapterGalileoE1Test::init()
|
||||
{
|
||||
gnss_synchro.Channel_ID = 0;
|
||||
gnss_synchro.System = 'E';
|
||||
@@ -80,7 +80,7 @@ void GalileoE1DllPllVemlTrackingInternalTest::init()
|
||||
}
|
||||
|
||||
|
||||
TEST_F(GalileoE1DllPllVemlTrackingInternalTest, Instantiate)
|
||||
TEST_F(DllPllTrackingAdapterGalileoE1Test, Instantiate)
|
||||
{
|
||||
init();
|
||||
auto tracking = factory->GetBlock(config.get(), "Tracking_1B", 1, 1);
|
||||
@@ -88,7 +88,7 @@ TEST_F(GalileoE1DllPllVemlTrackingInternalTest, Instantiate)
|
||||
}
|
||||
|
||||
|
||||
TEST_F(GalileoE1DllPllVemlTrackingInternalTest, ConnectAndRun)
|
||||
TEST_F(DllPllTrackingAdapterGalileoE1Test, ConnectAndRun)
|
||||
{
|
||||
int fs_in = 8000000;
|
||||
int nsamples = 40000000;
|
||||
@@ -134,7 +134,7 @@ TEST_F(GalileoE1DllPllVemlTrackingInternalTest, ConnectAndRun)
|
||||
}
|
||||
|
||||
|
||||
TEST_F(GalileoE1DllPllVemlTrackingInternalTest, ValidationOfResults)
|
||||
TEST_F(DllPllTrackingAdapterGalileoE1Test, ValidationOfResults)
|
||||
{
|
||||
std::chrono::time_point<std::chrono::system_clock> start;
|
||||
std::chrono::time_point<std::chrono::system_clock> end;
|
||||
|
||||
+29
-29
@@ -1,7 +1,7 @@
|
||||
/*!
|
||||
* \file gps_l1_ca_dll_pll_tracking_test.cc
|
||||
* \brief This class implements a tracking test for GPS_L1_CA_DLL_PLL_Tracking
|
||||
* implementation based on some input parameters.
|
||||
* \brief This class implements a tracking test for DllPllTrackingAdapter
|
||||
* configured for GPS L1 C/A based on some input parameters.
|
||||
* \author Javier Arribas, 2017. jarribas(at)cttc.es
|
||||
*
|
||||
*
|
||||
@@ -62,32 +62,32 @@ namespace wht = std;
|
||||
#endif
|
||||
|
||||
// ######## GNURADIO BLOCK MESSAGE RECEIVER #########
|
||||
class GpsL1CADllPllTrackingTest_msg_rx;
|
||||
class DllPllTrackingAdapterGpsL1CaTest_msg_rx;
|
||||
|
||||
using GpsL1CADllPllTrackingTest_msg_rx_sptr = gnss_shared_ptr<GpsL1CADllPllTrackingTest_msg_rx>;
|
||||
using DllPllTrackingAdapterGpsL1CaTest_msg_rx_sptr = gnss_shared_ptr<DllPllTrackingAdapterGpsL1CaTest_msg_rx>;
|
||||
|
||||
GpsL1CADllPllTrackingTest_msg_rx_sptr GpsL1CADllPllTrackingTest_msg_rx_make();
|
||||
DllPllTrackingAdapterGpsL1CaTest_msg_rx_sptr DllPllTrackingAdapterGpsL1CaTest_msg_rx_make();
|
||||
|
||||
class GpsL1CADllPllTrackingTest_msg_rx : public gr::block
|
||||
class DllPllTrackingAdapterGpsL1CaTest_msg_rx : public gr::block
|
||||
{
|
||||
private:
|
||||
friend GpsL1CADllPllTrackingTest_msg_rx_sptr GpsL1CADllPllTrackingTest_msg_rx_make();
|
||||
friend DllPllTrackingAdapterGpsL1CaTest_msg_rx_sptr DllPllTrackingAdapterGpsL1CaTest_msg_rx_make();
|
||||
void msg_handler_channel_events(const pmt::pmt_t msg);
|
||||
GpsL1CADllPllTrackingTest_msg_rx();
|
||||
DllPllTrackingAdapterGpsL1CaTest_msg_rx();
|
||||
|
||||
public:
|
||||
int rx_message;
|
||||
~GpsL1CADllPllTrackingTest_msg_rx(); //!< Default destructor
|
||||
~DllPllTrackingAdapterGpsL1CaTest_msg_rx(); //!< Default destructor
|
||||
};
|
||||
|
||||
|
||||
GpsL1CADllPllTrackingTest_msg_rx_sptr GpsL1CADllPllTrackingTest_msg_rx_make()
|
||||
DllPllTrackingAdapterGpsL1CaTest_msg_rx_sptr DllPllTrackingAdapterGpsL1CaTest_msg_rx_make()
|
||||
{
|
||||
return GpsL1CADllPllTrackingTest_msg_rx_sptr(new GpsL1CADllPllTrackingTest_msg_rx());
|
||||
return DllPllTrackingAdapterGpsL1CaTest_msg_rx_sptr(new DllPllTrackingAdapterGpsL1CaTest_msg_rx());
|
||||
}
|
||||
|
||||
|
||||
void GpsL1CADllPllTrackingTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg)
|
||||
void DllPllTrackingAdapterGpsL1CaTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -103,8 +103,8 @@ void GpsL1CADllPllTrackingTest_msg_rx::msg_handler_channel_events(const pmt::pmt
|
||||
}
|
||||
|
||||
|
||||
GpsL1CADllPllTrackingTest_msg_rx::GpsL1CADllPllTrackingTest_msg_rx()
|
||||
: gr::block("GpsL1CADllPllTrackingTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)),
|
||||
DllPllTrackingAdapterGpsL1CaTest_msg_rx::DllPllTrackingAdapterGpsL1CaTest_msg_rx()
|
||||
: gr::block("DllPllTrackingAdapterGpsL1CaTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)),
|
||||
rx_message(0)
|
||||
{
|
||||
this->message_port_register_in(pmt::mp("events"));
|
||||
@@ -113,20 +113,20 @@ GpsL1CADllPllTrackingTest_msg_rx::GpsL1CADllPllTrackingTest_msg_rx()
|
||||
[this](auto&& PH1) { msg_handler_channel_events(std::forward<decltype(PH1)>(PH1)); });
|
||||
#else
|
||||
#if USE_BOOST_BIND_PLACEHOLDERS
|
||||
boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1));
|
||||
boost::bind(&DllPllTrackingAdapterGpsL1CaTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1));
|
||||
#else
|
||||
boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_channel_events, this, _1));
|
||||
boost::bind(&DllPllTrackingAdapterGpsL1CaTest_msg_rx::msg_handler_channel_events, this, _1));
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
GpsL1CADllPllTrackingTest_msg_rx::~GpsL1CADllPllTrackingTest_msg_rx() = default;
|
||||
DllPllTrackingAdapterGpsL1CaTest_msg_rx::~DllPllTrackingAdapterGpsL1CaTest_msg_rx() = default;
|
||||
|
||||
|
||||
// ###########################################################
|
||||
|
||||
class GpsL1CADllPllTrackingTest : public ::testing::Test
|
||||
class DllPllTrackingAdapterGpsL1CaTest : public ::testing::Test
|
||||
{
|
||||
public:
|
||||
std::string generator_binary;
|
||||
@@ -173,14 +173,14 @@ public:
|
||||
double& rmse);
|
||||
|
||||
bool save_mat_xy(std::vector<double>& x, std::vector<double>& y, std::string filename);
|
||||
GpsL1CADllPllTrackingTest() : item_size(sizeof(gr_complex))
|
||||
DllPllTrackingAdapterGpsL1CaTest() : item_size(sizeof(gr_complex))
|
||||
{
|
||||
factory = std::make_shared<GNSSBlockFactory>();
|
||||
config = std::make_shared<InMemoryConfiguration>();
|
||||
gnss_synchro = Gnss_Synchro();
|
||||
}
|
||||
|
||||
~GpsL1CADllPllTrackingTest() = default;
|
||||
~DllPllTrackingAdapterGpsL1CaTest() = default;
|
||||
|
||||
void configure_receiver(double PLL_wide_bw_hz,
|
||||
double DLL_wide_bw_hz,
|
||||
@@ -196,7 +196,7 @@ public:
|
||||
};
|
||||
|
||||
|
||||
int GpsL1CADllPllTrackingTest::configure_generator(double CN0_dBHz, int file_idx)
|
||||
int DllPllTrackingAdapterGpsL1CaTest::configure_generator(double CN0_dBHz, int file_idx)
|
||||
{
|
||||
#if USE_GLOG_AND_GFLAGS
|
||||
// Configure signal generator
|
||||
@@ -238,7 +238,7 @@ int GpsL1CADllPllTrackingTest::configure_generator(double CN0_dBHz, int file_idx
|
||||
}
|
||||
|
||||
|
||||
int GpsL1CADllPllTrackingTest::generate_signal()
|
||||
int DllPllTrackingAdapterGpsL1CaTest::generate_signal()
|
||||
{
|
||||
int child_status;
|
||||
|
||||
@@ -263,7 +263,7 @@ int GpsL1CADllPllTrackingTest::generate_signal()
|
||||
}
|
||||
|
||||
|
||||
void GpsL1CADllPllTrackingTest::configure_receiver(
|
||||
void DllPllTrackingAdapterGpsL1CaTest::configure_receiver(
|
||||
double PLL_wide_bw_hz,
|
||||
double DLL_wide_bw_hz,
|
||||
double PLL_narrow_bw_hz,
|
||||
@@ -309,7 +309,7 @@ void GpsL1CADllPllTrackingTest::configure_receiver(
|
||||
}
|
||||
|
||||
|
||||
std::vector<double> GpsL1CADllPllTrackingTest::check_results_doppler(arma::vec& true_time_s,
|
||||
std::vector<double> DllPllTrackingAdapterGpsL1CaTest::check_results_doppler(arma::vec& true_time_s,
|
||||
arma::vec& true_value,
|
||||
arma::vec& meas_time_s,
|
||||
arma::vec& meas_value,
|
||||
@@ -360,7 +360,7 @@ std::vector<double> GpsL1CADllPllTrackingTest::check_results_doppler(arma::vec&
|
||||
}
|
||||
|
||||
|
||||
std::vector<double> GpsL1CADllPllTrackingTest::check_results_acc_carrier_phase(arma::vec& true_time_s,
|
||||
std::vector<double> DllPllTrackingAdapterGpsL1CaTest::check_results_acc_carrier_phase(arma::vec& true_time_s,
|
||||
arma::vec& true_value,
|
||||
arma::vec& meas_time_s,
|
||||
arma::vec& meas_value,
|
||||
@@ -409,7 +409,7 @@ std::vector<double> GpsL1CADllPllTrackingTest::check_results_acc_carrier_phase(a
|
||||
}
|
||||
|
||||
|
||||
std::vector<double> GpsL1CADllPllTrackingTest::check_results_codephase(arma::vec& true_time_s,
|
||||
std::vector<double> DllPllTrackingAdapterGpsL1CaTest::check_results_codephase(arma::vec& true_time_s,
|
||||
arma::vec& true_value,
|
||||
arma::vec& meas_time_s,
|
||||
arma::vec& meas_value,
|
||||
@@ -459,7 +459,7 @@ std::vector<double> GpsL1CADllPllTrackingTest::check_results_codephase(arma::vec
|
||||
}
|
||||
|
||||
|
||||
TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
|
||||
TEST_F(DllPllTrackingAdapterGpsL1CaTest, ValidationOfResults)
|
||||
{
|
||||
// *************************************************
|
||||
// ***** STEP 2: Prepare the parameters sweep ******
|
||||
@@ -693,7 +693,7 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
|
||||
std::shared_ptr<GNSSBlockInterface> trk_ = factory->GetBlock(config.get(), "Tracking_1C", 1, 1);
|
||||
std::shared_ptr<TrackingInterface> tracking = std::dynamic_pointer_cast<TrackingInterface>(trk_);
|
||||
|
||||
auto msg_rx = GpsL1CADllPllTrackingTest_msg_rx_make();
|
||||
auto msg_rx = DllPllTrackingAdapterGpsL1CaTest_msg_rx_make();
|
||||
|
||||
gnss_synchro.Acq_delay_samples = acq_delay_samples;
|
||||
gnss_synchro.Acq_doppler_hz = acq_doppler_hz;
|
||||
@@ -1352,7 +1352,7 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
|
||||
}
|
||||
|
||||
|
||||
bool GpsL1CADllPllTrackingTest::save_mat_xy(std::vector<double>& x, std::vector<double>& y, std::string filename)
|
||||
bool DllPllTrackingAdapterGpsL1CaTest::save_mat_xy(std::vector<double>& x, std::vector<double>& y, std::string filename)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user