mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

removing tabs and tailing whitespaces

This commit is contained in:
Carles Fernandez 2015-11-27 17:37:21 +01:00
parent bfbea68c8f
commit e6cf773a2b
5 changed files with 32 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -763,7 +763,7 @@ SignalSource.dump_filename=../data/signal_source.dat
Example for a dual-frequency receiver: Example for a dual-frequency receiver:
~~~~~~ ~~~~~~
;######### SIGNAL_SOURCE CONFIG ############ ;######### SIGNAL_SOURCE CONFIG ############
SignalSource.implementation=UHD_Signal_Source SignalSource.implementation=UHD_Signal_Source
SignalSource.device_address=192.168.40.2 ; Put your USRP IP address here SignalSource.device_address=192.168.40.2 ; Put your USRP IP address here
@ -782,7 +782,7 @@ SignalSource.freq1=1227600000
SignalSource.gain1=50 SignalSource.gain1=50
SignalSource.samples1=0 SignalSource.samples1=0
SignalSource.dump1=false SignalSource.dump1=false
~~~~~~ ~~~~~~
Other examples are available at [gnss-sdr/conf/](./conf/). Other examples are available at [gnss-sdr/conf/](./conf/).

22
src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
View File

@ -226,14 +226,14 @@ int gps_l1_ca_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_i
{ {
d_flag_frame_sync = true; d_flag_frame_sync = true;
if (corr_value < 0) if (corr_value < 0)
{ {
flag_PLL_180_deg_phase_locked = true; //PLL is locked to opposite phase! flag_PLL_180_deg_phase_locked = true; //PLL is locked to opposite phase!
LOG(INFO) << " PLL in opposite phase for Sat "<< this->d_satellite.get_PRN(); LOG(INFO) << " PLL in opposite phase for Sat "<< this->d_satellite.get_PRN();
} }
else else
{ {
flag_PLL_180_deg_phase_locked = false; flag_PLL_180_deg_phase_locked = false;
} }
LOG(INFO) << " Frame sync SAT " << this->d_satellite << " with preamble start at " << d_preamble_time_seconds << " [s]"; LOG(INFO) << " Frame sync SAT " << this->d_satellite << " with preamble start at " << d_preamble_time_seconds << " [s]";
} }
} }
@ -344,10 +344,10 @@ int gps_l1_ca_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_i
current_synchro_data.Prn_timestamp_at_preamble_ms = Prn_timestamp_at_preamble_ms; current_synchro_data.Prn_timestamp_at_preamble_ms = Prn_timestamp_at_preamble_ms;
if (flag_PLL_180_deg_phase_locked == true) if (flag_PLL_180_deg_phase_locked == true)
{ {
//correct the accumulated phase for the costas loop phase shift, if required //correct the accumulated phase for the costas loop phase shift, if required
current_synchro_data.Carrier_phase_rads += GPS_PI; current_synchro_data.Carrier_phase_rads += GPS_PI;
} }
if(d_dump == true) if(d_dump == true)
{ {
// MULTIPLEXED FILE RECORDING - Record results to file // MULTIPLEXED FILE RECORDING - Record results to file

20
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
View File

@ -119,9 +119,9 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc::gps_l1_ca_dll_pll_c_aid_tracking_cc(
d_n_correlator_taps = 3; // Early, Prompt, and Late d_n_correlator_taps = 3; // Early, Prompt, and Late
d_correlator_outs = static_cast<gr_complex*>(volk_malloc(d_n_correlator_taps*sizeof(gr_complex), volk_get_alignment())); d_correlator_outs = static_cast<gr_complex*>(volk_malloc(d_n_correlator_taps*sizeof(gr_complex), volk_get_alignment()));
for (int n = 0; n < d_n_correlator_taps; n++) for (int n = 0; n < d_n_correlator_taps; n++)
{ {
d_correlator_outs[n] = gr_complex(0,0); d_correlator_outs[n] = gr_complex(0,0);
} }
d_local_code_shift_chips = static_cast<float*>(volk_malloc(d_n_correlator_taps*sizeof(float), volk_get_alignment())); d_local_code_shift_chips = static_cast<float*>(volk_malloc(d_n_correlator_taps*sizeof(float), volk_get_alignment()));
// Set TAPs delay values [chips] // Set TAPs delay values [chips]
d_local_code_shift_chips[0] = - d_early_late_spc_chips; d_local_code_shift_chips[0] = - d_early_late_spc_chips;
@ -229,9 +229,9 @@ void gps_l1_ca_dll_pll_c_aid_tracking_cc::start_tracking()
multicorrelator_cpu.set_local_code_and_taps(static_cast<int>(GPS_L1_CA_CODE_LENGTH_CHIPS), d_ca_code, d_local_code_shift_chips); multicorrelator_cpu.set_local_code_and_taps(static_cast<int>(GPS_L1_CA_CODE_LENGTH_CHIPS), d_ca_code, d_local_code_shift_chips);
for (int n = 0; n < d_n_correlator_taps; n++) for (int n = 0; n < d_n_correlator_taps; n++)
{ {
d_correlator_outs[n] = gr_complex(0,0); d_correlator_outs[n] = gr_complex(0,0);
} }
d_carrier_lock_fail_counter = 0; d_carrier_lock_fail_counter = 0;
d_rem_code_phase_samples = 0.0; d_rem_code_phase_samples = 0.0;
@ -479,10 +479,10 @@ int gps_l1_ca_dll_pll_c_aid_tracking_cc::general_work (int noutput_items, gr_vec
std::cout << tmp_str_stream.rdbuf() << std::flush; std::cout << tmp_str_stream.rdbuf() << std::flush;
} }
} }
for (int n=0;n<d_n_correlator_taps;n++) for (int n = 0; n < d_n_correlator_taps; n++)
{ {
d_correlator_outs[n] = gr_complex(0,0); d_correlator_outs[n] = gr_complex(0,0);
} }
current_synchro_data.System = {'G'}; current_synchro_data.System = {'G'};
current_synchro_data.Flag_valid_pseudorange = false; current_synchro_data.Flag_valid_pseudorange = false;

40
src/algorithms/tracking/libs/cpu_multicorrelator.h
View File

@ -44,38 +44,13 @@ class cpu_multicorrelator
{ {
public: public:
cpu_multicorrelator(); cpu_multicorrelator();
bool init( bool init(int max_signal_length_samples, int n_correlators);
int max_signal_length_samples, bool set_local_code_and_taps(int code_length_chips, const std::complex<float>* local_code_in, float *shifts_chips);
int n_correlators bool set_input_output_vectors(std::complex<float>* corr_out, const std::complex<float>* sig_in);
); void update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips);
bool set_local_code_and_taps( void update_local_carrier(int correlator_length_samples, float rem_carr_phase_rad, float phase_step_rad);
int code_length_chips, bool Carrier_wipeoff_multicorrelator_resampler(float rem_carrier_phase_in_rad, float phase_step_rad, float rem_code_phase_chips, float code_phase_step_chips, int signal_length_samples);
const std::complex<float>* local_code_in,
float *shifts_chips
);
bool set_input_output_vectors(
std::complex<float>* corr_out,
const std::complex<float>* sig_in
);
void update_local_code(
int correlator_length_samples,
float rem_code_phase_chips,
float code_phase_step_chips
);
void update_local_carrier(
int correlator_length_samples,
float rem_carr_phase_rad,
float phase_step_rad
);
bool Carrier_wipeoff_multicorrelator_resampler(
float rem_carrier_phase_in_rad,
float phase_step_rad,
float rem_code_phase_chips,
float code_phase_step_chips,
int signal_length_samples);
bool free(); bool free();
private: private:
// Allocate the device input vectors // Allocate the device input vectors
const std::complex<float> *d_sig_in; const std::complex<float> *d_sig_in;
@ -84,14 +59,11 @@ private:
std::complex<float> *d_sig_doppler_wiped; std::complex<float> *d_sig_doppler_wiped;
const std::complex<float> *d_local_code_in; const std::complex<float> *d_local_code_in;
std::complex<float> *d_corr_out; std::complex<float> *d_corr_out;
float *d_shifts_chips; float *d_shifts_chips;
int d_code_length_chips; int d_code_length_chips;
int d_n_correlators; int d_n_correlators;
bool update_local_code(); bool update_local_code();
bool update_local_carrier(); bool update_local_carrier();
}; };

6
src/algorithms/tracking/libs/cuda_multicorrelator.h
View File

@ -128,9 +128,9 @@ public:
int n_correlators int n_correlators
); );
bool set_input_output_vectors( bool set_input_output_vectors(
std::complex<float>* corr_out, std::complex<float>* corr_out,
std::complex<float>* sig_in std::complex<float>* sig_in
); );
bool free_cuda(); bool free_cuda();
bool Carrier_wipeoff_multicorrelator_resampler_cuda( bool Carrier_wipeoff_multicorrelator_resampler_cuda(
float rem_carrier_phase_in_rad, float rem_carrier_phase_in_rad,