mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-07-05 19:42:56 +00:00
Code Issues Releases Wiki Activity

some cleaning

Browse Source
This commit is contained in:
Carles Fernandez 2015-02-14 11:49:06 +01:00
parent 59a158c576
commit d76b6060f5
1 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
code_= new gr_complex[vector_length_]; code_= new gr_complex[vector_length_];
// if (item_type_.compare("gr_complex") == 0 || (item_type_.compare("cshort") == 0)) // if (item_type_.compare("gr_complex") == 0 )
// { // {
item_size_ = sizeof(gr_complex); item_size_ = sizeof(gr_complex);
acquisition_cc_ = pcps_make_acquisition_cc(sampled_ms_, max_dwells_, acquisition_cc_ = pcps_make_acquisition_cc(sampled_ms_, max_dwells_,
@ -132,10 +132,10 @@ GpsL1CaPcpsAcquisition::~GpsL1CaPcpsAcquisition()
void GpsL1CaPcpsAcquisition::set_channel(unsigned int channel) void GpsL1CaPcpsAcquisition::set_channel(unsigned int channel)
{ {
channel_ = channel; channel_ = channel;
if (item_type_.compare("gr_complex") == 0) //if (item_type_.compare("gr_complex") == 0)
{ //{
acquisition_cc_->set_channel(channel_); acquisition_cc_->set_channel(channel_);
} //}
} }
@ -322,6 +322,8 @@ void GpsL1CaPcpsAcquisition::disconnect(gr::top_block_sptr top_block)
} }
else if (item_type_.compare("cshort") == 0) else if (item_type_.compare("cshort") == 0)
{ {
// Since a short-based acq implementation is not available,
// we just convert cshorts to gr_complex
top_block->disconnect(cshort_to_float_x2_, 0, float_to_complex_, 0); top_block->disconnect(cshort_to_float_x2_, 0, float_to_complex_, 0);
top_block->disconnect(cshort_to_float_x2_, 1, float_to_complex_, 1); top_block->disconnect(cshort_to_float_x2_, 1, float_to_complex_, 1);
top_block->disconnect(float_to_complex_, 0, stream_to_vector_, 0); top_block->disconnect(float_to_complex_, 0, stream_to_vector_, 0);
@ -329,6 +331,8 @@ void GpsL1CaPcpsAcquisition::disconnect(gr::top_block_sptr top_block)
} }
else if (item_type_.compare("cbyte") == 0) else if (item_type_.compare("cbyte") == 0)
{ {
// Since a byte-based acq implementation is not available,
// we just convert cshorts to gr_complex
top_block->disconnect(cbyte_to_float_x2_, 0, float_to_complex_, 0); top_block->disconnect(cbyte_to_float_x2_, 0, float_to_complex_, 0);
top_block->disconnect(cbyte_to_float_x2_, 1, float_to_complex_, 1); top_block->disconnect(cbyte_to_float_x2_, 1, float_to_complex_, 1);
top_block->disconnect(float_to_complex_, 0, stream_to_vector_, 0); top_block->disconnect(float_to_complex_, 0, stream_to_vector_, 0);