[hamradio-commits] [gnss-sdr] 88/251: fixing coverity issues
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Wed Sep 2 00:22:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.
commit 4e2c95d5f5815025c4547e86a4ebdb84702095dc
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Fri May 15 04:41:32 2015 +0200
fixing coverity issues
---
.../galileo_e1_pcps_8ms_ambiguous_acquisition.cc | 1 +
.../galileo_e1_pcps_ambiguous_acquisition.cc | 1 +
...galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc | 1 +
...ileo_e1_pcps_quicksync_ambiguous_acquisition.cc | 1 +
.../galileo_e1_pcps_tong_ambiguous_acquisition.cc | 1 +
.../galileo_e5a_noncoherent_iq_acquisition_caf.cc | 2 +-
.../adapters/gps_l1_ca_pcps_acquisition.cc | 1 +
.../gps_l1_ca_pcps_acquisition_fine_doppler.cc | 1 +
.../gps_l1_ca_pcps_assisted_acquisition.cc | 1 +
.../gps_l1_ca_pcps_multithread_acquisition.cc | 1 +
.../adapters/gps_l1_ca_pcps_opencl_acquisition.cc | 1 +
.../gps_l1_ca_pcps_quicksync_acquisition.cc | 2 +-
.../adapters/gps_l1_ca_pcps_tong_acquisition.cc | 1 +
.../adapters/gps_l2_m_pcps_acquisition.cc | 1 +
.../observables/adapters/galileo_e1_observables.cc | 2 -
.../observables/adapters/galileo_e1_observables.h | 1 -
.../observables/adapters/gps_l1_ca_observables.cc | 4 +-
.../observables/adapters/gps_l1_ca_observables.h | 2 +-
.../observables/adapters/hybrid_observables.cc | 2 -
.../observables/adapters/hybrid_observables.h | 1 -
.../gnuradio_blocks/galileo_e1_observables_cc.cc | 2 +-
.../gnuradio_blocks/galileo_e1_observables_cc.h | 4 +-
.../gnuradio_blocks/gps_l1_ca_observables_cc.cc | 1 -
.../gnuradio_blocks/gps_l1_ca_observables_cc.h | 4 +-
.../gnuradio_blocks/hybrid_observables_cc.cc | 2 +-
.../gnuradio_blocks/hybrid_observables_cc.h | 4 +-
src/tests/gnss_block/fir_filter_test.cc | 1 +
.../galileo_e1_dll_pll_veml_tracking_test.cc | 1 +
...pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc | 1 +
..._e1_pcps_ambiguous_acquisition_gsoc2013_test.cc | 1 +
...ileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc | 1 +
.../galileo_e1_pcps_ambiguous_acquisition_test.cc | 1 +
...s_cccwsr_ambiguous_acquisition_gsoc2013_test.cc | 1 +
...uicksync_ambiguous_acquisition_gsoc2014_test.cc | 1 +
...cps_tong_ambiguous_acquisition_gsoc2013_test.cc | 1 +
...e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 1 +
src/tests/gnss_block/galileo_e5a_tracking_test.cc | 1 +
.../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 1 +
.../gnss_block/gps_l1_ca_pcps_acquisition_test.cc | 1 +
...a_pcps_multithread_acquisition_gsoc2013_test.cc | 35 +++++++++---------
..._l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc | 1 +
..._ca_pcps_quicksync_acquisition_gsoc2014_test.cc | 43 +++++++++++-----------
...ps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc | 1 +
.../gnss_block/gps_l2_m_dll_pll_tracking_test.cc | 1 +
.../gnss_block/gps_l2_m_pcps_acquisition_test.cc | 3 +-
45 files changed, 80 insertions(+), 62 deletions(-)
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
index 99ed34d..314272a 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
@@ -106,6 +106,7 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition(
LOG(WARNING) << item_type_
<< " unknown acquisition item type";
}
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
index 2bf588b..67d706b 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
@@ -116,6 +116,7 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
LOG(WARNING) << item_type_
<< " unknown acquisition item type";
}
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
index 43f8b30..524f5e4 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
@@ -106,6 +106,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition
LOG(WARNING) << item_type_
<< " unknown acquisition item type";
}
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
index 1d52425..982063a 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
@@ -140,6 +140,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcqui
LOG(WARNING) << item_type_
<< " unknown acquisition item type";
}
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
index 20f6f49..7d4609d 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
@@ -107,6 +107,7 @@ GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition(
LOG(WARNING) << item_type_
<< " unknown acquisition item type";
}
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
index 740a6d9..9906bce 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
@@ -114,7 +114,7 @@ GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf(
LOG(WARNING) << item_type_
<< " unknown acquisition item type";
}
-
+ gnss_synchro_ = {0};
}
GalileoE5aNoncoherentIQAcquisitionCaf::~GalileoE5aNoncoherentIQAcquisitionCaf()
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
index 22f1699..bbebe9a 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
@@ -121,6 +121,7 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
threshold_ = 0.0;
doppler_max_ = 0;
doppler_step_ = 0;
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
index 0dfbcbb..597bbcf 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
@@ -86,6 +86,7 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
{
LOG(WARNING) << item_type_ << " unknown acquisition item type";
}
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc
index 4eff7d2..dccbb10 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc
@@ -85,6 +85,7 @@ GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition(
{
LOG(WARNING) << item_type_ << " unknown acquisition item type";
}
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc
index 0cd57fd..0c549fc 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc
@@ -103,6 +103,7 @@ GpsL1CaPcpsMultithreadAcquisition::GpsL1CaPcpsMultithreadAcquisition(
{
LOG(WARNING) << item_type_ << " unknown acquisition item type";
}
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc
index 84ade51..8172e7f 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc
@@ -102,6 +102,7 @@ GpsL1CaPcpsOpenClAcquisition::GpsL1CaPcpsOpenClAcquisition(
{
LOG(WARNING) << item_type_ << " unknown acquisition item type";
}
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
index eb24b86..b2ae278 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
@@ -135,7 +135,7 @@ GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition(
LOG(WARNING) << item_type_ << " unknown acquisition item type";
}
-
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
index 10ffc7c..655b20e 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
@@ -95,6 +95,7 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
{
LOG(WARNING) << item_type_ << " unknown acquisition item type";
}
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
index 855bb95..e3a77c5 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
@@ -118,6 +118,7 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
// LOG(WARNING) << item_type_
// << " unknown acquisition item type";
// }
+ gnss_synchro_ = {0};
}
diff --git a/src/algorithms/observables/adapters/galileo_e1_observables.cc b/src/algorithms/observables/adapters/galileo_e1_observables.cc
index d402662..504514a 100644
--- a/src/algorithms/observables/adapters/galileo_e1_observables.cc
+++ b/src/algorithms/observables/adapters/galileo_e1_observables.cc
@@ -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() << ")";
}
diff --git a/src/algorithms/observables/adapters/galileo_e1_observables.h b/src/algorithms/observables/adapters/galileo_e1_observables.h
index c59979c..2c7ce44 100644
--- a/src/algorithms/observables/adapters/galileo_e1_observables.h
+++ b/src/algorithms/observables/adapters/galileo_e1_observables.h
@@ -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_;
diff --git a/src/algorithms/observables/adapters/gps_l1_ca_observables.cc b/src/algorithms/observables/adapters/gps_l1_ca_observables.cc
index c970362..40a5a92 100644
--- a/src/algorithms/observables/adapters/gps_l1_ca_observables.cc
+++ b/src/algorithms/observables/adapters/gps_l1_ca_observables.cc
@@ -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() << ")";
}
diff --git a/src/algorithms/observables/adapters/gps_l1_ca_observables.h b/src/algorithms/observables/adapters/gps_l1_ca_observables.h
index bf7d64e..8e8f49f 100644
--- a/src/algorithms/observables/adapters/gps_l1_ca_observables.h
+++ b/src/algorithms/observables/adapters/gps_l1_ca_observables.h
@@ -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_;
diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc
index e9fb49f..145c5d0 100644
--- a/src/algorithms/observables/adapters/hybrid_observables.cc
+++ b/src/algorithms/observables/adapters/hybrid_observables.cc
@@ -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() << ")";
}
diff --git a/src/algorithms/observables/adapters/hybrid_observables.h b/src/algorithms/observables/adapters/hybrid_observables.h
index 59c7120..49fa99f 100644
--- a/src/algorithms/observables/adapters/hybrid_observables.h
+++ b/src/algorithms/observables/adapters/hybrid_observables.h
@@ -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_;
diff --git a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
index 7ad6561..ea542db 100644
--- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
@@ -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
*/
diff --git a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
index d043db4..131d76f 100644
--- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
@@ -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;
diff --git a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
index 0e707c5..8df2646 100644
--- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
@@ -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
*/
diff --git a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
index b312b1a..7f7dacb 100644
--- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
@@ -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;
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
index c06af36..fee182c 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
@@ -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
*/
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
index e6a7134..5749726 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
@@ -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;
diff --git a/src/tests/gnss_block/fir_filter_test.cc b/src/tests/gnss_block/fir_filter_test.cc
index 03994a8..4ba9a06 100644
--- a/src/tests/gnss_block/fir_filter_test.cc
+++ b/src/tests/gnss_block/fir_filter_test.cc
@@ -57,6 +57,7 @@ protected:
Fir_Filter_Test()
{
queue = gr::msg_queue::make(0);
+ item_size = sizeof(gr_complex);
config = std::make_shared<InMemoryConfiguration>();
}
~Fir_Filter_Test()
diff --git a/src/tests/gnss_block/galileo_e1_dll_pll_veml_tracking_test.cc b/src/tests/gnss_block/galileo_e1_dll_pll_veml_tracking_test.cc
index 5d02ccf..b2c628e 100644
--- a/src/tests/gnss_block/galileo_e1_dll_pll_veml_tracking_test.cc
+++ b/src/tests/gnss_block/galileo_e1_dll_pll_veml_tracking_test.cc
@@ -59,6 +59,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GalileoE1DllPllVemlTrackingInternalTest()
diff --git a/src/tests/gnss_block/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
index 0e67f11..02d5854 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
@@ -61,6 +61,7 @@ protected:
stop = false;
message = 0;
factory = std::make_shared<GNSSBlockFactory>();
+ gnss_synchro = {0};
}
~GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test()
diff --git a/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
index 3782655..7cb8cb4 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
@@ -61,6 +61,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test()
diff --git a/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
index 53f84ed..bb96f56 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
@@ -70,6 +70,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GalileoE1PcpsAmbiguousAcquisitionGSoCTest()
diff --git a/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc
index 88fe3a1..5531b14 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc
@@ -60,6 +60,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GalileoE1PcpsAmbiguousAcquisitionTest()
diff --git a/src/tests/gnss_block/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
index 8076208..76f4d60 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
@@ -61,6 +61,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GalileoE1PcpsCccwsrAmbiguousAcquisitionTest()
diff --git a/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
index b333a12..d63e389 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
@@ -67,6 +67,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test()
diff --git a/src/tests/gnss_block/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
index 2fa3256..eba137a 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
@@ -67,6 +67,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test()
diff --git a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
index 0da42fe..bace632 100644
--- a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
+++ b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
@@ -62,6 +62,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GalileoE5aPcpsAcquisitionGSoC2014GensourceTest()
diff --git a/src/tests/gnss_block/galileo_e5a_tracking_test.cc b/src/tests/gnss_block/galileo_e5a_tracking_test.cc
index 108941a..3639cc3 100644
--- a/src/tests/gnss_block/galileo_e5a_tracking_test.cc
+++ b/src/tests/gnss_block/galileo_e5a_tracking_test.cc
@@ -58,6 +58,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GalileoE5aTrackingTest()
diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
index bb7b217..42fffb7 100644
--- a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
@@ -62,6 +62,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GpsL1CaPcpsAcquisitionGSoC2013Test()
diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc
index 3d0ead1..cfd14c8 100644
--- a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc
@@ -62,6 +62,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GpsL1CaPcpsAcquisitionTest()
diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc
index b2d60a4..2bd1709 100644
--- a/src/tests/gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc
@@ -66,6 +66,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GpsL1CaPcpsMultithreadAcquisitionGSoC2013Test()
@@ -91,27 +92,27 @@ protected:
int message;
boost::thread ch_thread;
- unsigned int integration_time_ms;
- unsigned int fs_in;
+ unsigned int integration_time_ms = 0;
+ unsigned int fs_in = 0;
- double expected_delay_chips;
- double expected_doppler_hz;
- float max_doppler_error_hz;
- float max_delay_error_chips;
+ double expected_delay_chips = 0.0;
+ double expected_doppler_hz = 0.0;
+ float max_doppler_error_hz = 0.0;
+ float max_delay_error_chips = 0.0;
- unsigned int num_of_realizations;
- unsigned int realization_counter;
- unsigned int detection_counter;
- unsigned int correct_estimation_counter;
- unsigned int acquired_samples;
- unsigned int mean_acq_time_us;
+ unsigned int num_of_realizations = 0;
+ unsigned int realization_counter = 0;
+ unsigned int detection_counter = 0;
+ unsigned int correct_estimation_counter = 0;
+ unsigned int acquired_samples = 0;
+ unsigned int mean_acq_time_us = 0;
- double mse_doppler;
- double mse_delay;
+ double mse_doppler = 0.0;
+ double mse_delay = 0.0;
- double Pd;
- double Pfa_p;
- double Pfa_a;
+ double Pd = 0.0;
+ double Pfa_p = 0.0;
+ double Pfa_a = 0.0;
};
void GpsL1CaPcpsMultithreadAcquisitionGSoC2013Test::init()
diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
index c8294a8..5a15cc3 100644
--- a/src/tests/gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
@@ -62,6 +62,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GpsL1CaPcpsOpenClAcquisitionGSoC2013Test()
diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
index 859bacf..e4bb8ae 100644
--- a/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
+++ b/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
@@ -66,6 +66,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test()
@@ -92,33 +93,33 @@ protected:
int message;
boost::thread ch_thread;
- unsigned int integration_time_ms;
- unsigned int fs_in;
- unsigned int folding_factor;
+ unsigned int integration_time_ms = 0;
+ unsigned int fs_in = 0;
+ unsigned int folding_factor = 0;
- double expected_delay_chips;
- double expected_doppler_hz;
- float max_doppler_error_hz;
- float max_delay_error_chips;
+ double expected_delay_chips = 0.0;
+ double expected_doppler_hz = 0.0;
+ float max_doppler_error_hz = 0.0;
+ float max_delay_error_chips = 0.0;
- unsigned int num_of_realizations;
- unsigned int realization_counter;
- unsigned int detection_counter;
- unsigned int correct_estimation_counter;
- unsigned int acquired_samples;
- unsigned int mean_acq_time_us;
+ unsigned int num_of_realizations = 0;
+ unsigned int realization_counter = 0;
+ unsigned int detection_counter = 0;
+ unsigned int correct_estimation_counter = 0;
+ unsigned int acquired_samples = 0;
+ unsigned int mean_acq_time_us = 0;
- double mse_doppler;
- double mse_delay;
+ double mse_doppler = 0.0;
+ double mse_delay = 0.0;
- double Pd;
- double Pfa_p;
- double Pfa_a;
- double Pmd;
+ double Pd = 0.0;
+ double Pfa_p = 0.0;
+ double Pfa_a = 0.0;
+ double Pmd = 0.0;
std::ofstream pdpfafile;
- unsigned int miss_detection_counter;
- bool dump_test_results;
+ unsigned int miss_detection_counter = 0;
+ bool dump_test_results = false;
};
diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
index 55ea5a6..ca7d462 100644
--- a/src/tests/gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
@@ -63,6 +63,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GpsL1CaPcpsTongAcquisitionGSoC2013Test()
diff --git a/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc b/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc
index 3ff9709..18b1340 100644
--- a/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc
+++ b/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc
@@ -60,6 +60,7 @@ protected:
item_size = sizeof(gr_complex);
stop = false;
message = 0;
+ gnss_synchro = {0};
}
~GpsL2MDllPllTrackingTest()
diff --git a/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc b/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc
index 92579b0..ef5c2df 100644
--- a/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc
+++ b/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc
@@ -67,7 +67,8 @@ protected:
stop = false;
message = 0;
sampling_freqeuncy_hz = 0;
- nsamples=0;
+ nsamples = 0;
+ gnss_synchro = {0};
}
~GpsL2MPcpsAcquisitionTest()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list