[hamradio-commits] [gnss-sdr] 39/149: Cleaning includes
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Sat Feb 6 19:43:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.
commit 2697fb61989ce0cbf7b94c6cc1b1ac2e174b41e0
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Sun Jan 10 22:21:31 2016 +0100
Cleaning includes
---
.../pcps_acquisition_fine_doppler_cc.cc | 1 +
.../gnuradio_blocks/pcps_assisted_acquisition_cc.cc | 1 +
.../data_type_adapter/adapters/byte_to_short.h | 1 -
.../data_type_adapter/adapters/ibyte_to_cbyte.h | 1 -
.../data_type_adapter/adapters/ibyte_to_complex.h | 1 -
.../data_type_adapter/adapters/ishort_to_complex.h | 1 -
.../data_type_adapter/adapters/ishort_to_cshort.h | 1 -
src/algorithms/input_filter/adapters/fir_filter.h | 1 -
.../input_filter/adapters/freq_xlating_fir_filter.h | 1 -
src/algorithms/libs/galileo_e1_signal_processing.cc | 2 ++
src/algorithms/libs/galileo_e1_signal_processing.h | 5 +----
src/algorithms/libs/galileo_e5_signal_processing.cc | 5 +++++
src/algorithms/libs/galileo_e5_signal_processing.h | 5 +----
src/algorithms/libs/gnss_signal_processing.cc | 1 +
src/algorithms/libs/gnss_signal_processing.h | 3 +--
src/algorithms/libs/gps_l2c_signal.cc | 20 ++++++++++----------
src/algorithms/libs/gps_l2c_signal.h | 1 -
src/algorithms/libs/gps_sdr_signal_processing.cc | 2 --
src/algorithms/libs/gps_sdr_signal_processing.h | 2 --
src/algorithms/libs/nco_lib.cc | 2 +-
src/algorithms/libs/nco_lib.h | 3 ---
.../gnuradio_blocks/signal_generator_c.cc | 2 ++
.../galileo_volk_e1_dll_pll_veml_tracking_cc.cc | 10 +++++-----
23 files changed, 31 insertions(+), 41 deletions(-)
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 06e1fe5..9be375c 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
@@ -41,6 +41,7 @@
#include "gnss_signal_processing.h"
#include "gps_sdr_signal_processing.h"
#include "control_message_factory.h"
+#include "GPS_L1_CA.h"
using google::LogMessage;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
index b303e7f..b1ecea8 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
@@ -40,6 +40,7 @@
#include "gnss_signal_processing.h"
#include "control_message_factory.h"
#include "gps_acq_assist.h"
+#include "GPS_L1_CA.h"
extern concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.h b/src/algorithms/data_type_adapter/adapters/byte_to_short.h
index 7e19ce2..a251092 100644
--- a/src/algorithms/data_type_adapter/adapters/byte_to_short.h
+++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.h
@@ -35,7 +35,6 @@
#include <gnuradio/blocks/char_to_short.h>
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/msg_queue.h>
-#include "gnss_synchro.h"
#include "gnss_block_interface.h"
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
index 005fd2b..6430d3c 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
@@ -35,7 +35,6 @@
#include <string>
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/msg_queue.h>
-#include "gnss_synchro.h"
#include "gnss_block_interface.h"
#include "interleaved_byte_to_complex_byte.h"
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
index ebbc841..83ea734 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
@@ -36,7 +36,6 @@
#include <gnuradio/blocks/char_to_short.h>
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/msg_queue.h>
-#include "gnss_synchro.h"
#include "gnss_block_interface.h"
diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
index 493d198..23fe7e3 100644
--- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
+++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
@@ -35,7 +35,6 @@
#include <gnuradio/blocks/interleaved_short_to_complex.h>
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/msg_queue.h>
-#include "gnss_synchro.h"
#include "gnss_block_interface.h"
diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
index 0866adc..05033c4 100644
--- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
+++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
@@ -34,7 +34,6 @@
#include <string>
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/msg_queue.h>
-#include "gnss_synchro.h"
#include "gnss_block_interface.h"
#include "interleaved_short_to_complex_short.h"
diff --git a/src/algorithms/input_filter/adapters/fir_filter.h b/src/algorithms/input_filter/adapters/fir_filter.h
index ce1da90..c4025a1 100644
--- a/src/algorithms/input_filter/adapters/fir_filter.h
+++ b/src/algorithms/input_filter/adapters/fir_filter.h
@@ -44,7 +44,6 @@
#include <gnuradio/filter/fir_filter_ccf.h>
#include <gnuradio/filter/fir_filter_fff.h>
#include <gnuradio/msg_queue.h>
-#include "gnss_synchro.h"
#include "gnss_block_interface.h"
#include "complex_byte_to_float_x2.h"
#include "byte_x2_to_complex_byte.h"
diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
index cacde1b..6ab31cb 100644
--- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
+++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
@@ -43,7 +43,6 @@
#include <gnuradio/blocks/char_to_short.h>
#include <gnuradio/blocks/float_to_short.h>
#include <gnuradio/msg_queue.h>
-#include "gnss_synchro.h"
#include "gnss_block_interface.h"
#include "short_x2_to_cshort.h"
#include "complex_float_to_complex_byte.h"
diff --git a/src/algorithms/libs/galileo_e1_signal_processing.cc b/src/algorithms/libs/galileo_e1_signal_processing.cc
index 77f2d4f..6d5790b 100644
--- a/src/algorithms/libs/galileo_e1_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e1_signal_processing.cc
@@ -32,6 +32,8 @@
#include "galileo_e1_signal_processing.h"
#include <string>
+#include "Galileo_E1.h"
+#include "gnss_signal_processing.h"
void galileo_e1_code_gen_int(int* _dest, char _Signal[3], signed int _prn, unsigned int _chip_shift)
diff --git a/src/algorithms/libs/galileo_e1_signal_processing.h b/src/algorithms/libs/galileo_e1_signal_processing.h
index d2a60d3..28007e4 100644
--- a/src/algorithms/libs/galileo_e1_signal_processing.h
+++ b/src/algorithms/libs/galileo_e1_signal_processing.h
@@ -33,10 +33,7 @@
#define GNSS_SDR_GALILEO_E1_SIGNAL_PROCESSING_H_
#include <complex>
-#include <iostream>
-#include <gnuradio/math.h>
-#include "Galileo_E1.h"
-#include "gnss_signal_processing.h"
+
/*!
* \brief This function generates Galileo E1 code (one sample per chip).
diff --git a/src/algorithms/libs/galileo_e5_signal_processing.cc b/src/algorithms/libs/galileo_e5_signal_processing.cc
index a76f2f1..f5963b6 100644
--- a/src/algorithms/libs/galileo_e5_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e5_signal_processing.cc
@@ -32,6 +32,11 @@
*/
#include "galileo_e5_signal_processing.h"
+#include <gnuradio/math.h>
+#include "Galileo_E5a.h"
+#include "gnss_signal_processing.h"
+
+
void galileo_e5_a_code_gen_complex_primary(std::complex<float>* _dest, signed int _prn, char _Signal[3])
{
diff --git a/src/algorithms/libs/galileo_e5_signal_processing.h b/src/algorithms/libs/galileo_e5_signal_processing.h
index f1ec86b..d8fcca9 100644
--- a/src/algorithms/libs/galileo_e5_signal_processing.h
+++ b/src/algorithms/libs/galileo_e5_signal_processing.h
@@ -35,10 +35,7 @@
#define GNSS_SDR_GALILEO_E5_SIGNAL_PROCESSING_H_
#include <complex>
-#include <iostream>
-#include <gnuradio/math.h>
-#include "Galileo_E5a.h"
-#include "gnss_signal_processing.h"
+
/*!
* \brief Generates Galileo E5a code at 1 sample/chip
diff --git a/src/algorithms/libs/gnss_signal_processing.cc b/src/algorithms/libs/gnss_signal_processing.cc
index ce1439b..e25e2f7 100644
--- a/src/algorithms/libs/gnss_signal_processing.cc
+++ b/src/algorithms/libs/gnss_signal_processing.cc
@@ -33,6 +33,7 @@
#include "gnss_signal_processing.h"
#include <gnuradio/fxpt_nco.h>
+#include "GPS_L1_CA.h"
auto auxCeil2 = [](float x){ return static_cast<int>(static_cast<long>((x)+1)); };
diff --git a/src/algorithms/libs/gnss_signal_processing.h b/src/algorithms/libs/gnss_signal_processing.h
index ee7b740..2449dfa 100644
--- a/src/algorithms/libs/gnss_signal_processing.h
+++ b/src/algorithms/libs/gnss_signal_processing.h
@@ -36,8 +36,7 @@
#define GNSS_SDR_GNSS_SIGNAL_PROCESSING_H_
#include <complex>
-#include <iostream>
-#include "GPS_L1_CA.h"
+
/*!
* \brief This function generates a complex exponential in _dest.
diff --git a/src/algorithms/libs/gps_l2c_signal.cc b/src/algorithms/libs/gps_l2c_signal.cc
index cceb45d..d4e9cd2 100644
--- a/src/algorithms/libs/gps_l2c_signal.cc
+++ b/src/algorithms/libs/gps_l2c_signal.cc
@@ -33,23 +33,24 @@
#include <gps_l2c_signal.h>
#include <cstdint>
#include <cmath>
+#include "GPS_L2C.h"
int32_t gps_l2c_m_shift(int32_t x)
{
- return static_cast<int32_t>((x >> 1)^((x & 1) * 0445112474));
+ return static_cast<int32_t>((x >> 1)^((x & 1) * 0445112474));
}
void gps_l2c_m_code(int32_t * _dest, unsigned int _prn)
{
- int32_t x;
- x = GPS_L2C_M_INIT_REG[ _prn - 1];
- for (int n = 0; n < GPS_L2_M_CODE_LENGTH_CHIPS; n++)
- {
- _dest[n] = (int8_t)(x&1);
- x = gps_l2c_m_shift(x);
- }
+ int32_t x;
+ x = GPS_L2C_M_INIT_REG[ _prn - 1];
+ for (int n = 0; n < GPS_L2_M_CODE_LENGTH_CHIPS; n++)
+ {
+ _dest[n] = (int8_t)(x&1);
+ x = gps_l2c_m_shift(x);
+ }
}
@@ -100,7 +101,7 @@ void gps_l2c_m_code_gen_complex_sampled(std::complex<float>* _dest, unsigned int
//=== Digitizing =======================================================
//--- Make index array to read L2C code values -------------------------
- //TODO: Check this formula! Seems to start with an extra sample
+ //TODO: Check this formula! Seems to start with an extra sample
_codeValueIndex = ceil((_ts * ((float)i + 1)) / _tc) - 1;
//aux = (_ts * (i + 1)) / _tc;
//_codeValueIndex = static_cast<int>(static_cast<long>(aux)) - 1;
@@ -110,7 +111,6 @@ void gps_l2c_m_code_gen_complex_sampled(std::complex<float>* _dest, unsigned int
{
//--- Correct the last index (due to number rounding issues) -----------
_dest[i] = std::complex<float>(1.0 - 2.0 * _code[_codeLength - 1], 0);
-
}
else
{
diff --git a/src/algorithms/libs/gps_l2c_signal.h b/src/algorithms/libs/gps_l2c_signal.h
index d0868c2..8179ec5 100644
--- a/src/algorithms/libs/gps_l2c_signal.h
+++ b/src/algorithms/libs/gps_l2c_signal.h
@@ -34,7 +34,6 @@
#define GNSS_GPS_L2C_SIGNAL_H_
#include <complex>
-#include "GPS_L2C.h"
//!Generates complex GPS L2C M code for the desired SV ID
diff --git a/src/algorithms/libs/gps_sdr_signal_processing.cc b/src/algorithms/libs/gps_sdr_signal_processing.cc
index bd05354..4419afe 100644
--- a/src/algorithms/libs/gps_sdr_signal_processing.cc
+++ b/src/algorithms/libs/gps_sdr_signal_processing.cc
@@ -31,8 +31,6 @@
*/
#include "gps_sdr_signal_processing.h"
-#include <stdlib.h>
-#include <cmath>
auto auxCeil = [](float x){ return static_cast<int>(static_cast<long>((x)+1)); };
diff --git a/src/algorithms/libs/gps_sdr_signal_processing.h b/src/algorithms/libs/gps_sdr_signal_processing.h
index 3aa2161..2f01b56 100644
--- a/src/algorithms/libs/gps_sdr_signal_processing.h
+++ b/src/algorithms/libs/gps_sdr_signal_processing.h
@@ -34,8 +34,6 @@
#define GNSS_SDR_GPS_SDR_SIGNAL_PROCESSING_H_
#include <complex>
-#include <iostream>
-#include "GPS_L1_CA.h"
//!Generates complex GPS L1 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency
void gps_l1_ca_code_gen_complex(std::complex<float>* _dest, signed int _prn, unsigned int _chip_shift);
diff --git a/src/algorithms/libs/nco_lib.cc b/src/algorithms/libs/nco_lib.cc
index a1d5af1..bd884a2 100644
--- a/src/algorithms/libs/nco_lib.cc
+++ b/src/algorithms/libs/nco_lib.cc
@@ -33,7 +33,7 @@
*/
#include "nco_lib.h"
-
+#include <cmath>
void fxp_nco(std::complex<float> *dest, int n_samples, float start_phase_rad, float phase_step_rad)
diff --git a/src/algorithms/libs/nco_lib.h b/src/algorithms/libs/nco_lib.h
index 901fe61..d153a28 100644
--- a/src/algorithms/libs/nco_lib.h
+++ b/src/algorithms/libs/nco_lib.h
@@ -37,10 +37,7 @@
#ifndef GNSS_SDR_NCO_LIB_CC_H_
#define GNSS_SDR_NCO_LIB_CC_H_
-#include <cmath>
#include <gnuradio/fxpt.h>
-//#include <xmmintrin.h>
-//#include <sse_mathfun.h>
/*!
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
index 68a8947..8ac39f7 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
@@ -38,7 +38,9 @@
#include "galileo_e1_signal_processing.h"
#include "nco_lib.h"
#include "galileo_e5_signal_processing.h"
+#include "Galileo_E1.h"
#include "Galileo_E5a.h"
+#include "GPS_L1_CA.h"
/*
* Create a new instance of signal_generator_c and return
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc
index ce5792e..0d64893 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc
@@ -290,7 +290,7 @@ void galileo_volk_e1_dll_pll_veml_tracking_cc::update_local_carrier()
{
float phase_rad, phase_step_rad;
// Compute the carrier phase step for the K-1 carrier doppler estimation
- phase_step_rad = static_cast<float> (GPS_TWO_PI * d_carrier_doppler_hz / static_cast<double>(d_fs_in));
+ phase_step_rad = static_cast<float> (GALILEO_TWO_PI * d_carrier_doppler_hz / static_cast<double>(d_fs_in));
// Initialize the carrier phase with the remanent carrier phase of the K-2 loop
phase_rad = static_cast<float> (d_rem_carr_phase_rad);
@@ -414,7 +414,7 @@ int galileo_volk_e1_dll_pll_veml_tracking_cc::general_work (int noutput_items, g
// ################## PLL ##########################################################
// PLL discriminator
- carr_error_hz = pll_cloop_two_quadrant_atan(*d_Prompt) / GPS_TWO_PI;
+ carr_error_hz = pll_cloop_two_quadrant_atan(*d_Prompt) / GALILEO_TWO_PI;
// Carrier discriminator filter
carr_error_filt_hz = d_carrier_loop_filter.get_carrier_nco(carr_error_hz);
// New carrier Doppler frequency estimation
@@ -422,10 +422,10 @@ int galileo_volk_e1_dll_pll_veml_tracking_cc::general_work (int noutput_items, g
// New code Doppler frequency estimation
d_code_freq_chips = Galileo_E1_CODE_CHIP_RATE_HZ + ((d_carrier_doppler_hz * Galileo_E1_CODE_CHIP_RATE_HZ) / Galileo_E1_FREQ_HZ);
//carrier phase accumulator for (K) Doppler estimation
- d_acc_carrier_phase_rad -= GPS_TWO_PI * d_carrier_doppler_hz * Galileo_E1_CODE_PERIOD;
+ d_acc_carrier_phase_rad -= GALILEO_TWO_PI * d_carrier_doppler_hz * Galileo_E1_CODE_PERIOD;
//remnant carrier phase to prevent overflow in the code NCO
- d_rem_carr_phase_rad = d_rem_carr_phase_rad + GPS_TWO_PI * d_carrier_doppler_hz * Galileo_E1_CODE_PERIOD;
- d_rem_carr_phase_rad = fmod(d_rem_carr_phase_rad, GPS_TWO_PI);
+ d_rem_carr_phase_rad = d_rem_carr_phase_rad + GALILEO_TWO_PI * d_carrier_doppler_hz * Galileo_E1_CODE_PERIOD;
+ d_rem_carr_phase_rad = fmod(d_rem_carr_phase_rad, GALILEO_TWO_PI);
// ################## DLL ##########################################################
// DLL discriminator
--
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