From 50c16c912940e948ec37cbcae94193c1bf3f77da Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 8 May 2016 08:31:38 +0200 Subject: [PATCH] Remove unused variables --- .../adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h | 1 - .../adapters/galileo_e1_pcps_ambiguous_acquisition.h | 1 - .../adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h | 1 - .../galileo_e1_pcps_quicksync_ambiguous_acquisition.h | 1 - .../adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h | 1 - .../adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h | 1 - .../acquisition/adapters/gps_l1_ca_pcps_acquisition.h | 1 - .../adapters/gps_l1_ca_pcps_multithread_acquisition.h | 1 - .../acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h | 1 - .../adapters/gps_l1_ca_pcps_quicksync_acquisition.h | 1 - .../acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h | 1 - .../acquisition/adapters/gps_l2_m_pcps_acquisition.h | 1 - .../gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc | 4 ++-- .../gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h | 2 +- 14 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h index c63dc22fd..bdaaac077 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h @@ -136,7 +136,6 @@ private: float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; - unsigned int shift_resolution_; unsigned int sampled_ms_; unsigned int max_dwells_; long fs_in_; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h index 5c9c46c31..a0b1dc27f 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -142,7 +142,6 @@ private: float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; - unsigned int shift_resolution_; unsigned int sampled_ms_; unsigned int max_dwells_; long fs_in_; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h index 0aa1a7ae9..e1aba2c65 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h @@ -139,7 +139,6 @@ private: float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; - unsigned int shift_resolution_; unsigned int sampled_ms_; unsigned int max_dwells_; long fs_in_; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h index e52070f9d..5a6876b18 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h @@ -142,7 +142,6 @@ private: float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; - unsigned int shift_resolution_; unsigned int sampled_ms_; unsigned int max_dwells_; unsigned int folding_factor_; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h index bc4090a85..c89d31137 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h @@ -141,7 +141,6 @@ private: float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; - unsigned int shift_resolution_; unsigned int sampled_ms_; unsigned int tong_init_val_; unsigned int tong_max_val_; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h index 489c391de..033e57569 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h @@ -146,7 +146,6 @@ private: float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; - unsigned int shift_resolution_; unsigned int sampled_ms_; unsigned int max_dwells_; long fs_in_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h index d8686024a..8218669c4 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -157,7 +157,6 @@ private: float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; - unsigned int shift_resolution_; unsigned int sampled_ms_; unsigned int max_dwells_; long fs_in_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h index 95d6ec897..15e439eaf 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h @@ -138,7 +138,6 @@ private: float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; - unsigned int shift_resolution_; unsigned int sampled_ms_; unsigned int max_dwells_; long fs_in_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h index f1de99f21..435cf6bb7 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h @@ -138,7 +138,6 @@ private: float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; - unsigned int shift_resolution_; unsigned int sampled_ms_; unsigned int max_dwells_; long fs_in_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h index 8142b24bc..40eb96a74 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h @@ -144,7 +144,6 @@ private: float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; - unsigned int shift_resolution_; unsigned int sampled_ms_; unsigned int max_dwells_; unsigned int folding_factor_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h index 646fdfcbf..2e523af34 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h @@ -141,7 +141,6 @@ private: float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; - unsigned int shift_resolution_; unsigned int sampled_ms_; unsigned int tong_init_val_; unsigned int tong_max_val_; diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h index 84eac9876..5589c079d 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h @@ -151,7 +151,6 @@ private: float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; - unsigned int shift_resolution_; unsigned int max_dwells_; long fs_in_; long if_; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc index bacee7954..74ad064c0 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc @@ -323,7 +323,7 @@ int pcps_acquisition_fine_doppler_cc::compute_and_accumulate_grid(gr_vector_cons return d_fft_size; } -int pcps_acquisition_fine_doppler_cc::estimate_Doppler(gr_vector_const_void_star &input_items, int available_samples) +int pcps_acquisition_fine_doppler_cc::estimate_Doppler(gr_vector_const_void_star &input_items) { // Direct FFT @@ -487,7 +487,7 @@ int pcps_acquisition_fine_doppler_cc::general_work(int noutput_items, case 3: // Fine doppler estimation //DLOG(INFO) <<"S3"<