[hamradio-commits] [gnss-sdr] 73/126: removing tabs and tailing whitespaces
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Sat Dec 26 18:38:03 UTC 2015
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 e6cf773a2bb234d229ea0cd10dba49c100b9efdd
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Fri Nov 27 17:37:21 2015 +0100
removing tabs and tailing whitespaces
---
README.md | 4 +--
.../gps_l1_ca_telemetry_decoder_cc.cc | 22 ++++++------
.../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc | 20 +++++------
src/algorithms/tracking/libs/cpu_multicorrelator.h | 40 ++++------------------
.../tracking/libs/cuda_multicorrelator.h | 6 ++--
5 files changed, 32 insertions(+), 60 deletions(-)
diff --git a/README.md b/README.md
index 00afe01..120cc0a 100644
--- a/README.md
+++ b/README.md
@@ -763,7 +763,7 @@ SignalSource.dump_filename=../data/signal_source.dat
Example for a dual-frequency receiver:
-~~~~~~
+~~~~~~
;######### SIGNAL_SOURCE CONFIG ############
SignalSource.implementation=UHD_Signal_Source
SignalSource.device_address=192.168.40.2 ; Put your USRP IP address here
@@ -782,7 +782,7 @@ SignalSource.freq1=1227600000
SignalSource.gain1=50
SignalSource.samples1=0
SignalSource.dump1=false
-~~~~~~
+~~~~~~
Other examples are available at [gnss-sdr/conf/](./conf/).
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
index 0df1c0a..92ca95e 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
@@ -226,14 +226,14 @@ int gps_l1_ca_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_i
{
d_flag_frame_sync = true;
if (corr_value < 0)
- {
- 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();
- }
+ {
+ 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();
+ }
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]";
}
}
@@ -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;
if (flag_PLL_180_deg_phase_locked == true)
- {
- //correct the accumulated phase for the costas loop phase shift, if required
- current_synchro_data.Carrier_phase_rads += GPS_PI;
- }
+ {
+ //correct the accumulated phase for the costas loop phase shift, if required
+ current_synchro_data.Carrier_phase_rads += GPS_PI;
+ }
if(d_dump == true)
{
// MULTIPLEXED FILE RECORDING - Record results to file
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 195f412..8201d80 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -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_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++)
- {
- 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()));
// Set TAPs delay values [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);
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_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;
}
}
- for (int n=0;n<d_n_correlator_taps;n++)
- {
- d_correlator_outs[n] = gr_complex(0,0);
- }
+ for (int n = 0; n < d_n_correlator_taps; n++)
+ {
+ d_correlator_outs[n] = gr_complex(0,0);
+ }
current_synchro_data.System = {'G'};
current_synchro_data.Flag_valid_pseudorange = false;
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator.h b/src/algorithms/tracking/libs/cpu_multicorrelator.h
index 1d7b7c6..bce16fc 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator.h
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator.h
@@ -44,38 +44,13 @@ class cpu_multicorrelator
{
public:
cpu_multicorrelator();
- bool init(
- int max_signal_length_samples,
- int n_correlators
- );
- bool set_local_code_and_taps(
- int code_length_chips,
- 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 init(int max_signal_length_samples, int n_correlators);
+ bool set_local_code_and_taps(int code_length_chips, 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();
-
private:
// Allocate the device input vectors
const std::complex<float> *d_sig_in;
@@ -84,14 +59,11 @@ private:
std::complex<float> *d_sig_doppler_wiped;
const std::complex<float> *d_local_code_in;
std::complex<float> *d_corr_out;
-
float *d_shifts_chips;
int d_code_length_chips;
int d_n_correlators;
-
bool update_local_code();
bool update_local_carrier();
-
};
diff --git a/src/algorithms/tracking/libs/cuda_multicorrelator.h b/src/algorithms/tracking/libs/cuda_multicorrelator.h
index e55b17d..2f8610c 100644
--- a/src/algorithms/tracking/libs/cuda_multicorrelator.h
+++ b/src/algorithms/tracking/libs/cuda_multicorrelator.h
@@ -128,9 +128,9 @@ public:
int n_correlators
);
bool set_input_output_vectors(
- std::complex<float>* corr_out,
- std::complex<float>* sig_in
- );
+ std::complex<float>* corr_out,
+ std::complex<float>* sig_in
+ );
bool free_cuda();
bool Carrier_wipeoff_multicorrelator_resampler_cuda(
float rem_carrier_phase_in_rad,
--
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