mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-06-25 22:43:14 +00:00
Code Issues Releases Wiki Activity

Cleaning includes

Browse Source
This commit is contained in:
Carles Fernandez 2016-01-10 22:21:31 +01:00
parent bc0e4f188b
commit 2697fb6198
23 changed files with 31 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
View File

@ -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;

1
src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
View File

@ -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;

1
src/algorithms/data_type_adapter/adapters/byte_to_short.h
View File

@ -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"

1
src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
View File

@ -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"

1
src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
View File

@ -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"

1
src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
View File

@ -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"

1
src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
View File

@ -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"

1
src/algorithms/input_filter/adapters/fir_filter.h
View File

@ -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"

1
src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
View File

@ -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"

2
src/algorithms/libs/galileo_e1_signal_processing.cc
View File

@ -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)

5
src/algorithms/libs/galileo_e1_signal_processing.h
View File

@ -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).

5
src/algorithms/libs/galileo_e5_signal_processing.cc
View File

@ -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])
{

5
src/algorithms/libs/galileo_e5_signal_processing.h
View File

@ -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

1
src/algorithms/libs/gnss_signal_processing.cc
View File

@ -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)); };

3
src/algorithms/libs/gnss_signal_processing.h
View File

@ -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.

20
src/algorithms/libs/gps_l2c_signal.cc
View File

@ -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
{

1
src/algorithms/libs/gps_l2c_signal.h
View File

@ -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

2
src/algorithms/libs/gps_sdr_signal_processing.cc
View File

@ -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)); };

2
src/algorithms/libs/gps_sdr_signal_processing.h
View File

@ -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);

2
src/algorithms/libs/nco_lib.cc
View File

@ -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)

3
src/algorithms/libs/nco_lib.h
View File

@ -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>
/*!

2
src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
View File

@ -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

10
src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc
View File

@ -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