Skip to content

Commit

Permalink
Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next
Browse files Browse the repository at this point in the history 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
  • Loading branch information
@carlesfernandez
carlesfernandez committed Apr 18, 2016
2 parents 2eb4973 + 31ae25c commit 1f8f63a
Show file tree
Hide file tree
Showing 122 changed files with 298 additions and 980 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ $ python setup.py build
$ sudo python setup.py install
$ pybombs recipes add gr-recipes https://github.com/gnuradio/gr-recipes.git
$ pybombs recipes add gr-etcetera https://github.com/gnuradio/gr-etcetera.git
$ pybombs prefix init /usr/local -a myprefix
$ sudo pybombs prefix init /usr/local -a myprefix
$ pybombs config default_prefix myprefix
$ pybombs install gnuradio gr-osmosdr armadillo glog
~~~~~~
Expand Down
10 changes: 5 additions & 5 deletions conf/gnss-sdr_Hybrid_short.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@ Resampler.sample_freq_out=4000000

;######### CHANNELS GLOBAL CONFIG ############
;#count: Number of available GPS satellite channels.
Channels_1C.count=2
Channels_1C.count=5
;#count: Number of available Galileo satellite channels.
Channels_1B.count=4
Channels_1B.count=0
;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver
Channels.in_acquisition=1

Expand All @@ -185,9 +185,9 @@ Channels.in_acquisition=1
;# "5X" GALILEO E5a I+Q
Channel0.signal=1C
Channel1.signal=1C
Channel2.signal=1B
Channel3.signal=1B
Channel4.signal=1B
Channel2.signal=1C
Channel3.signal=1C
Channel4.signal=1C
Channel5.signal=1B
Channel6.signal=1B
Channel7.signal=1B
Expand Down
13 changes: 0 additions & 13 deletions src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition(
threshold_ = 0.0;
doppler_max_ = 5000;
doppler_step_ = 250;
channel_internal_queue_ = 0;
channel_ = 0;
}

Expand Down Expand Up @@ -178,18 +177,6 @@ GalileoE1Pcps8msAmbiguousAcquisition::set_doppler_step(unsigned int doppler_step
}


void
GalileoE1Pcps8msAmbiguousAcquisition::set_channel_queue(
concurrent_queue<int> *channel_internal_queue)
{
channel_internal_queue_ = channel_internal_queue;
if (item_type_.compare("gr_complex") == 0)
{
acquisition_cc_->set_channel_queue(channel_internal_queue_);
}
}


void
GalileoE1Pcps8msAmbiguousAcquisition::set_gnss_synchro(
Gnss_Synchro* gnss_synchro)
Expand Down
6 changes: 0 additions & 6 deletions src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@ class GalileoE1Pcps8msAmbiguousAcquisition: public AcquisitionInterface
*/
void set_doppler_step(unsigned int doppler_step);

/*!
* \brief Set tracking channel internal queue
*/
void set_channel_queue(concurrent_queue<int> *channel_internal_queue);

/*!
* \brief Initializes acquisition algorithm.
*/
Expand Down Expand Up @@ -154,7 +149,6 @@ class GalileoE1Pcps8msAmbiguousAcquisition: public AcquisitionInterface
unsigned int in_streams_;
unsigned int out_streams_;
boost::shared_ptr<gr::msg_queue> queue_;
concurrent_queue<int> *channel_internal_queue_;
float calculate_threshold(float pfa);
};

Expand Down
11 changes: 0 additions & 11 deletions src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
threshold_ = 0.0;
doppler_max_ = 5000;
doppler_step_ = 250;
channel_internal_queue_ = 0;
channel_ = 0;
}

Expand Down Expand Up @@ -176,16 +175,6 @@ void GalileoE1PcpsAmbiguousAcquisition::set_doppler_step(unsigned int doppler_st
}


void GalileoE1PcpsAmbiguousAcquisition::set_channel_queue(concurrent_queue<int> *channel_internal_queue)
{
channel_internal_queue_ = channel_internal_queue;
if (item_type_.compare("gr_complex") == 0)
{
acquisition_cc_->set_channel_queue(channel_internal_queue_);
}
}


void GalileoE1PcpsAmbiguousAcquisition::set_gnss_synchro(Gnss_Synchro* gnss_synchro)
{
gnss_synchro_ = gnss_synchro;
Expand Down
6 changes: 0 additions & 6 deletions src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ class GalileoE1PcpsAmbiguousAcquisition: public AcquisitionInterface
*/
void set_doppler_step(unsigned int doppler_step);

/*!
* \brief Set tracking channel internal queue
*/
void set_channel_queue(concurrent_queue<int> *channel_internal_queue);

/*!
* \brief Initializes acquisition algorithm.
*/
Expand Down Expand Up @@ -159,7 +154,6 @@ class GalileoE1PcpsAmbiguousAcquisition: public AcquisitionInterface
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
concurrent_queue<int> *channel_internal_queue_;
float calculate_threshold(float pfa);
};

Expand Down
14 changes: 0 additions & 14 deletions src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition
threshold_ = 0.0;
doppler_max_ = 5000;
doppler_step_ = 250;
channel_internal_queue_ = 0;
channel_ = 0;
}

Expand Down Expand Up @@ -181,19 +180,6 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::set_doppler_step(unsigned int doppler_s
}
}


void
GalileoE1PcpsCccwsrAmbiguousAcquisition::set_channel_queue(
concurrent_queue<int> *channel_internal_queue)
{
channel_internal_queue_ = channel_internal_queue;
if (item_type_.compare("gr_complex") == 0)
{
acquisition_cc_->set_channel_queue(channel_internal_queue_);
}
}


void
GalileoE1PcpsCccwsrAmbiguousAcquisition::set_gnss_synchro(
Gnss_Synchro* gnss_synchro)
Expand Down
6 changes: 0 additions & 6 deletions src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@ class GalileoE1PcpsCccwsrAmbiguousAcquisition: public AcquisitionInterface
*/
void set_doppler_step(unsigned int doppler_step);

/*!
* \brief Set tracking channel internal queue
*/
void set_channel_queue(concurrent_queue<int> *channel_internal_queue);

/*!
* \brief Initializes acquisition algorithm.
*/
Expand Down Expand Up @@ -158,7 +153,6 @@ class GalileoE1PcpsCccwsrAmbiguousAcquisition: public AcquisitionInterface
unsigned int in_streams_;
unsigned int out_streams_;
boost::shared_ptr<gr::msg_queue> queue_;
concurrent_queue<int> *channel_internal_queue_;
float calculate_threshold(float pfa);
};

Expand Down
14 changes: 0 additions & 14 deletions src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcqui
threshold_ = 0.0;
doppler_max_ = 5000;
doppler_step_ = 250;
channel_internal_queue_ = 0;
channel_ = 0;
}

Expand Down Expand Up @@ -212,19 +211,6 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::set_doppler_step(unsigned int dopple
}
}


void
GalileoE1PcpsQuickSyncAmbiguousAcquisition::set_channel_queue(
concurrent_queue<int> *channel_internal_queue)
{
channel_internal_queue_ = channel_internal_queue;
if (item_type_.compare("gr_complex") == 0)
{
acquisition_cc_->set_channel_queue(channel_internal_queue_);
}
}


void
GalileoE1PcpsQuickSyncAmbiguousAcquisition::set_gnss_synchro(
Gnss_Synchro* gnss_synchro)
Expand Down
6 changes: 0 additions & 6 deletions src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@ class GalileoE1PcpsQuickSyncAmbiguousAcquisition: public AcquisitionInterface
*/
void set_doppler_step(unsigned int doppler_step);

/*!
* \brief Set tracking channel internal queue
*/
void set_channel_queue(concurrent_queue<int> *channel_internal_queue);

/*!
* \brief Initializes acquisition algorithm.
*/
Expand Down Expand Up @@ -161,7 +156,6 @@ class GalileoE1PcpsQuickSyncAmbiguousAcquisition: public AcquisitionInterface
unsigned int in_streams_;
unsigned int out_streams_;
boost::shared_ptr<gr::msg_queue> queue_;
concurrent_queue<int> *channel_internal_queue_;
float calculate_threshold(float pfa);
};

Expand Down
13 changes: 0 additions & 13 deletions src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition(
threshold_ = 0.0;
doppler_max_ = 5000;
doppler_step_ = 250;
channel_internal_queue_ = 0;
channel_ = 0;
bit_transition_flag_ = false;
}
Expand Down Expand Up @@ -183,18 +182,6 @@ GalileoE1PcpsTongAmbiguousAcquisition::set_doppler_step(unsigned int doppler_ste
}


void
GalileoE1PcpsTongAmbiguousAcquisition::set_channel_queue(
concurrent_queue<int> *channel_internal_queue)
{
channel_internal_queue_ = channel_internal_queue;
if (item_type_.compare("gr_complex") == 0)
{
acquisition_cc_->set_channel_queue(channel_internal_queue_);
}
}


void
GalileoE1PcpsTongAmbiguousAcquisition::set_gnss_synchro(
Gnss_Synchro* gnss_synchro)
Expand Down
6 changes: 0 additions & 6 deletions src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@ class GalileoE1PcpsTongAmbiguousAcquisition: public AcquisitionInterface
*/
void set_doppler_step(unsigned int doppler_step);

/*!
* \brief Set tracking channel internal queue
*/
void set_channel_queue(concurrent_queue<int> *channel_internal_queue);

/*!
* \brief Initializes acquisition algorithm.
*/
Expand Down Expand Up @@ -161,7 +156,6 @@ class GalileoE1PcpsTongAmbiguousAcquisition: public AcquisitionInterface
unsigned int in_streams_;
unsigned int out_streams_;
boost::shared_ptr<gr::msg_queue> queue_;
concurrent_queue<int> *channel_internal_queue_;
float calculate_threshold(float pfa);
};

Expand Down
12 changes: 0 additions & 12 deletions src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf(
threshold_ = 0.0;
doppler_max_ = 5000;
doppler_step_ = 250;
channel_internal_queue_ = 0;
channel_ = 0;
bit_transition_flag_ = false;
}
Expand Down Expand Up @@ -182,17 +181,6 @@ void GalileoE5aNoncoherentIQAcquisitionCaf::set_doppler_step(unsigned int dopple
}


void GalileoE5aNoncoherentIQAcquisitionCaf::set_channel_queue(
concurrent_queue<int> *channel_internal_queue)
{
channel_internal_queue_ = channel_internal_queue;
if (item_type_.compare("gr_complex") == 0)
{
acquisition_cc_->set_channel_queue(channel_internal_queue_);
}
}


void GalileoE5aNoncoherentIQAcquisitionCaf::set_gnss_synchro(
Gnss_Synchro* gnss_synchro)
{
Expand Down
6 changes: 0 additions & 6 deletions src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@ class GalileoE5aNoncoherentIQAcquisitionCaf: public AcquisitionInterface
*/
void set_doppler_step(unsigned int doppler_step);

/*!
* \brief Set tracking channel internal queue
*/
void set_channel_queue(concurrent_queue<int> *channel_internal_queue);

/*!
* \brief Initializes acquisition algorithm.
*/
Expand Down Expand Up @@ -168,7 +163,6 @@ class GalileoE5aNoncoherentIQAcquisitionCaf: public AcquisitionInterface
unsigned int in_streams_;
unsigned int out_streams_;
boost::shared_ptr<gr::msg_queue> queue_;
concurrent_queue<int> *channel_internal_queue_;
float calculate_threshold(float pfa);
};
#endif /* GALILEO_E5A_NONCOHERENT_IQ_ACQUISITION_CAF_H_ */
18 changes: 0 additions & 18 deletions src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
doppler_max_ = 0;
doppler_step_ = 0;
gnss_synchro_ = 0;
channel_internal_queue_ = 0;
}


Expand Down Expand Up @@ -202,23 +201,6 @@ void GpsL1CaPcpsAcquisition::set_doppler_step(unsigned int doppler_step)

}


void GpsL1CaPcpsAcquisition::set_channel_queue(
concurrent_queue<int> *channel_internal_queue)
{
channel_internal_queue_ = channel_internal_queue;

if (item_type_.compare("cshort") == 0)
{
acquisition_sc_->set_channel_queue(channel_internal_queue_);
}
else
{
acquisition_cc_->set_channel_queue(channel_internal_queue_);
}
}


void GpsL1CaPcpsAcquisition::set_gnss_synchro(Gnss_Synchro* gnss_synchro)
{
gnss_synchro_ = gnss_synchro;
Expand Down
6 changes: 0 additions & 6 deletions src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,6 @@ class GpsL1CaPcpsAcquisition: public AcquisitionInterface
*/
void set_doppler_step(unsigned int doppler_step);

/*!
* \brief Set tracking channel internal queue
*/
void set_channel_queue(concurrent_queue<int> *channel_internal_queue);

/*!
* \brief Initializes acquisition algorithm.
*/
Expand Down Expand Up @@ -175,7 +170,6 @@ class GpsL1CaPcpsAcquisition: public AcquisitionInterface
unsigned int in_streams_;
unsigned int out_streams_;
boost::shared_ptr<gr::msg_queue> queue_;
concurrent_queue<int> *channel_internal_queue_;

float calculate_threshold(float pfa);
};
Expand Down
9 changes: 0 additions & 9 deletions src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
threshold_ = 0.0;
doppler_step_ = 0;
gnss_synchro_ = 0;
channel_internal_queue_ = 0;
}


Expand Down Expand Up @@ -121,14 +120,6 @@ void GpsL1CaPcpsAcquisitionFineDoppler::set_doppler_step(unsigned int doppler_st
}


void GpsL1CaPcpsAcquisitionFineDoppler::set_channel_queue(
concurrent_queue<int> *channel_internal_queue)
{
channel_internal_queue_ = channel_internal_queue;
acquisition_cc_->set_channel_queue(channel_internal_queue_);
}


void GpsL1CaPcpsAcquisitionFineDoppler::set_gnss_synchro(Gnss_Synchro* gnss_synchro)
{
gnss_synchro_ = gnss_synchro;
Expand Down
Loading

0 comments on commit 1f8f63a

Please sign in to comment.