mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-14 06:07:12 +00:00
Code Issues Releases Wiki Activity

fixing coverity issues

Browse Source
This commit is contained in:
Carles Fernandez
2015-05-15 04:41:32 +02:00
parent 4850944e00
commit 4e2c95d5f5
45 changed files with 80 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/observables/adapters/galileo_e1_observables.cc
View File

@@ -55,9 +55,7 @@ GalileoE1Observables::GalileoE1Observables(ConfigurationInterface* configuration
flag_averaging = configuration->property(role + ".flag_averaging", false);
dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
fs_in_ = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
observables_ = galileo_e1_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging);
observables_->set_fs_in(fs_in_);
DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
}

1
src/algorithms/observables/adapters/galileo_e1_observables.h
View File

@@ -82,7 +82,6 @@ public:
private:
galileo_e1_observables_cc_sptr observables_;
bool dump_;
unsigned int fs_in_;
std::string dump_filename_;
std::string role_;
unsigned int in_streams_;

4
src/algorithms/observables/adapters/gps_l1_ca_observables.cc
View File

@@ -55,9 +55,9 @@ GpsL1CaObservables::GpsL1CaObservables(ConfigurationInterface* configuration,
flag_averaging = configuration->property(role + ".flag_averaging", false);
dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
fs_in_ = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
//fs_in_ = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
observables_ = gps_l1_ca_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging);
observables_->set_fs_in(fs_in_);
//observables_->set_fs_in(fs_in_);
DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
}

2
src/algorithms/observables/adapters/gps_l1_ca_observables.h
View File

@@ -81,7 +81,7 @@ public:
private:
gps_l1_ca_observables_cc_sptr observables_;
bool dump_;
unsigned int fs_in_;
//unsigned int fs_in_;
std::string dump_filename_;
std::string role_;
unsigned int in_streams_;

2
src/algorithms/observables/adapters/hybrid_observables.cc
View File

@@ -55,9 +55,7 @@ HybridObservables::HybridObservables(ConfigurationInterface* configuration,
flag_averaging = configuration->property(role + ".flag_averaging", false);
dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
fs_in_ = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
observables_ = hybrid_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging);
observables_->set_fs_in(fs_in_);
DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
}

1
src/algorithms/observables/adapters/hybrid_observables.h
View File

@@ -82,7 +82,6 @@ public:
private:
hybrid_observables_cc_sptr observables_;
bool dump_;
unsigned int fs_in_;
std::string dump_filename_;
std::string role_;
unsigned int in_streams_;

2
src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
View File

@@ -116,7 +116,7 @@ int galileo_e1_observables_cc::general_work (int noutput_items, gr_vector_int &n
Gnss_Synchro current_gnss_synchro[d_nchannels];
std::map<int,Gnss_Synchro> current_gnss_synchro_map;
std::map<int,Gnss_Synchro>::iterator gnss_synchro_iter;
d_sample_counter++; //count for the processed samples
/*
* 1. Read the GNSS SYNCHRO objects from available channels
*/

4
src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
View File

@@ -61,7 +61,7 @@ class galileo_e1_observables_cc : public gr::block
{
public:
~galileo_e1_observables_cc ();
void set_fs_in(unsigned long int fs_in) {d_fs_in = fs_in;};
//void set_fs_in(unsigned long int fs_in) {d_fs_in = fs_in;};
int general_work (int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
@@ -74,9 +74,7 @@ private:
boost::shared_ptr<gr::msg_queue> d_queue;
bool d_dump;
bool d_flag_averaging;
long int d_sample_counter;
unsigned int d_nchannels;
unsigned long int d_fs_in;
int d_output_rate_ms;
std::string d_dump_filename;
std::ofstream d_dump_file;

1
src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
View File

@@ -112,7 +112,6 @@ int gps_l1_ca_observables_cc::general_work (int noutput_items, gr_vector_int &ni
std::map<int,Gnss_Synchro> current_gnss_synchro_map;
std::map<int,Gnss_Synchro>::iterator gnss_synchro_iter;
d_sample_counter++; //count for the processed samples
/*
* 1. Read the GNSS SYNCHRO objects from available channels
*/

4
src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
View File

@@ -59,7 +59,7 @@ class gps_l1_ca_observables_cc : public gr::block
{
public:
~gps_l1_ca_observables_cc ();
void set_fs_in(unsigned long int fs_in) {d_fs_in = fs_in;};
//void set_fs_in(unsigned long int fs_in) {d_fs_in = fs_in;};
int general_work (int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
@@ -72,9 +72,7 @@ private:
boost::shared_ptr<gr::msg_queue> d_queue;
bool d_dump;
bool d_flag_averaging;
long int d_sample_counter;
unsigned int d_nchannels;
unsigned long int d_fs_in;
int d_output_rate_ms;
std::string d_dump_filename;
std::ofstream d_dump_file;

2
src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
View File

@@ -120,7 +120,7 @@ int hybrid_observables_cc::general_work (int noutput_items, gr_vector_int &ninpu
std::map<int,Gnss_Synchro> current_gnss_synchro_map;
std::map<int,Gnss_Synchro> current_gnss_synchro_map_gps_only;
std::map<int,Gnss_Synchro>::iterator gnss_synchro_iter;
d_sample_counter++; //count for the processed samples
/*
* 1. Read the GNSS SYNCHRO objects from available channels
*/

4
src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
View File

@@ -61,7 +61,7 @@ class hybrid_observables_cc : public gr::block
{
public:
~hybrid_observables_cc ();
void set_fs_in(unsigned long int fs_in) {d_fs_in = fs_in;};
//void set_fs_in(unsigned long int fs_in) {d_fs_in = fs_in;};
int general_work (int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
@@ -74,9 +74,7 @@ private:
boost::shared_ptr<gr::msg_queue> d_queue;
bool d_dump;
bool d_flag_averaging;
long int d_sample_counter;
unsigned int d_nchannels;
unsigned long int d_fs_in;
int d_output_rate_ms;
std::string d_dump_filename;
std::ofstream d_dump_file;