mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-30 23:03:05 +00:00
Code Issues Releases Wiki Activity

Cleaning includes

Browse Source 
plus some code cleaning
This commit is contained in:
Carles Fernandez
2016-01-05 10:59:37 +01:00
parent 1c3a9f98ee
commit 0a1aa50c4a
25 changed files with 196 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h
View File

@@ -51,10 +51,8 @@ class ConfigurationInterface;
*/
class GalileoE1DllPllVemlTracking : public TrackingInterface
{
public:
GalileoE1DllPllVemlTracking(ConfigurationInterface* configuration,
GalileoE1DllPllVemlTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
@@ -103,12 +101,9 @@ public:
void start_tracking();
private:
galileo_e1_dll_pll_veml_tracking_cc_sptr tracking_;
size_t item_size_;
unsigned int channel_;
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;

8
src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h
View File

@@ -52,10 +52,8 @@ class ConfigurationInterface;
*/
class GalileoE1TcpConnectorTracking : public TrackingInterface
{
public:
GalileoE1TcpConnectorTracking(ConfigurationInterface* configuration,
GalileoE1TcpConnectorTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
@@ -67,6 +65,7 @@ public:
{
return role_;
}
//! Returns "Galileo_E1_TCP_CONNECTOR_Tracking"
std::string implementation()
{
@@ -103,12 +102,9 @@ public:
void start_tracking();
private:
galileo_e1_tcp_connector_tracking_cc_sptr tracking_;
size_t item_size_;
unsigned int channel_;
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;

2
src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
View File

@@ -53,7 +53,6 @@ class ConfigurationInterface;
class GalileoE5aDllPllTracking : public TrackingInterface
{
public:
GalileoE5aDllPllTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
@@ -82,7 +81,6 @@ public:
gr::basic_block_sptr get_left_block();
gr::basic_block_sptr get_right_block();
/*!
* \brief Set tracking channel unique ID
*/

7
src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.h
View File

@@ -51,10 +51,8 @@ class ConfigurationInterface;
*/
class GalileoVolkE1DllPllVemlTracking : public TrackingInterface
{
public:
GalileoVolkE1DllPllVemlTracking(ConfigurationInterface* configuration,
GalileoVolkE1DllPllVemlTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
@@ -103,12 +101,9 @@ public:
void start_tracking();
private:
galileo_volk_e1_dll_pll_veml_tracking_cc_sptr tracking_;
size_t item_size_;
unsigned int channel_;
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;

2
src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.h
View File

@@ -52,7 +52,7 @@ class ConfigurationInterface;
class GpsL1CaDllFllPllTracking : public TrackingInterface
{
public:
GpsL1CaDllFllPllTracking(ConfigurationInterface* configuration,
GpsL1CaDllFllPllTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,

3
src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc
View File

@@ -37,8 +37,7 @@
*/
#include "gps_l1_ca_dll_pll_optim_tracking.h"
#include <boost/math/special_functions/round.hpp>
#include <gnuradio/io_signature.h>
#include <cmath>
#include <glog/logging.h>
#include "GPS_L1_CA.h"
#include "configuration_interface.h"

19
src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
View File

@@ -64,7 +64,6 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
float dll_bw_hz;
float early_late_space_chips;
item_type = configuration->property(role + ".item_type", default_item_type);
//vector_length = configuration->property(role + ".vector_length", 2048);
fs_in = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
f_if = configuration->property(role + ".if", 0);
dump = configuration->property(role + ".dump", false);
@@ -72,8 +71,7 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
std::string default_dump_filename = "./track_ch";
dump_filename = configuration->property(role + ".dump_filename",
default_dump_filename); //unused!
dump_filename = configuration->property(role + ".dump_filename", default_dump_filename); //unused!
vector_length = std::round(fs_in / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS));
//################# MAKE TRACKING GNURadio object ###################
@@ -111,6 +109,7 @@ void GpsL1CaDllPllTracking::start_tracking()
tracking_->start_tracking();
}
/*
* Set tracking channel unique ID
*/
@@ -120,6 +119,7 @@ void GpsL1CaDllPllTracking::set_channel(unsigned int channel)
tracking_->set_channel(channel);
}
/*
* Set tracking channel internal queue
*/
@@ -130,28 +130,33 @@ void GpsL1CaDllPllTracking::set_channel_queue(
tracking_->set_channel_queue(channel_internal_queue_);
}
void GpsL1CaDllPllTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
{
tracking_->set_gnss_synchro(p_gnss_synchro);
}
void GpsL1CaDllPllTracking::connect(gr::top_block_sptr top_block)
{
if(top_block) { /* top_block is not null */};
//nothing to connect, now the tracking uses gr_sync_decimator
if(top_block) { /* top_block is not null */};
//nothing to connect, now the tracking uses gr_sync_decimator
}
void GpsL1CaDllPllTracking::disconnect(gr::top_block_sptr top_block)
{
if(top_block) { /* top_block is not null */};
//nothing to disconnect, now the tracking uses gr_sync_decimator
if(top_block) { /* top_block is not null */};
//nothing to disconnect, now the tracking uses gr_sync_decimator
}
gr::basic_block_sptr GpsL1CaDllPllTracking::get_left_block()
{
return tracking_;
}
gr::basic_block_sptr GpsL1CaDllPllTracking::get_right_block()
{
return tracking_;

4
src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h
View File

@@ -52,8 +52,7 @@ class ConfigurationInterface;
class GpsL1CaDllPllTracking : public TrackingInterface
{
public:
GpsL1CaDllPllTracking(ConfigurationInterface* configuration,
GpsL1CaDllPllTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
@@ -71,6 +70,7 @@ public:
{
return "GPS_L1_CA_DLL_PLL_Tracking";
}
size_t item_size()
{
return item_size_;

4
src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h
View File

@@ -52,8 +52,7 @@ class ConfigurationInterface;
class GpsL2MDllPllTracking : public TrackingInterface
{
public:
GpsL2MDllPllTracking(ConfigurationInterface* configuration,
GpsL2MDllPllTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
@@ -71,6 +70,7 @@ public:
{
return "gps_l2_m_dll_pll_tracking";
}
size_t item_size()
{
return item_size_;