mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-31 23:33:03 +00:00
Code Issues Releases Wiki Activity

remove old code and unrequired includes

Browse Source
This commit is contained in:
Carles Fernandez
2016-01-27 21:09:23 +01:00
parent 5d207ffcbc
commit b270d1ca61
3 changed files with 10 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/tracking/libs/cpu_multicorrelator.cc
View File

@@ -130,7 +130,7 @@ bool cpu_multicorrelator::Carrier_wipeoff_multicorrelator_resampler(
lv_32fc_t phase_offset_as_complex[1]; lv_32fc_t phase_offset_as_complex[1];
phase_offset_as_complex[0] = lv_cmake(std::cos(rem_carrier_phase_in_rad), -std::sin(rem_carrier_phase_in_rad)); phase_offset_as_complex[0] = lv_cmake(std::cos(rem_carrier_phase_in_rad), -std::sin(rem_carrier_phase_in_rad));
volk_32fc_s32fc_x2_rotator_32fc(d_sig_doppler_wiped, d_sig_in, std::exp(lv_32fc_t(0, -phase_step_rad)),phase_offset_as_complex, signal_length_samples); volk_32fc_s32fc_x2_rotator_32fc(d_sig_doppler_wiped, d_sig_in, std::exp(lv_32fc_t(0, -phase_step_rad)), phase_offset_as_complex, signal_length_samples);
update_local_code(signal_length_samples,rem_code_phase_chips, code_phase_step_chips); update_local_code(signal_length_samples,rem_code_phase_chips, code_phase_step_chips);
for (int current_correlator_tap = 0; current_correlator_tap < d_n_correlators; current_correlator_tap++) for (int current_correlator_tap = 0; current_correlator_tap < d_n_correlators; current_correlator_tap++)
{ {

47
src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc
View File

@@ -34,9 +34,7 @@
#include "cpu_multicorrelator_16sc.h" #include "cpu_multicorrelator_16sc.h"
#include <cmath> #include <cmath>
#include <iostream>
#include <gnuradio/fxpt.h> // fixed point sine and cosine
#include "volk_gnsssdr/volk_gnsssdr.h"
bool cpu_multicorrelator_16sc::init( bool cpu_multicorrelator_16sc::init(
@@ -47,15 +45,15 @@ bool cpu_multicorrelator_16sc::init(
size_t size = max_signal_length_samples * sizeof(lv_16sc_t); size_t size = max_signal_length_samples * sizeof(lv_16sc_t);
// NCO signal // NCO signal
d_nco_in = static_cast<lv_16sc_t*>(volk_malloc(size, volk_get_alignment())); d_nco_in = static_cast<lv_16sc_t*>(volk_gnsssdr_malloc(size, volk_gnsssdr_get_alignment()));
// Doppler-free signal // Doppler-free signal
d_sig_doppler_wiped = static_cast<lv_16sc_t*>(volk_malloc(size, volk_get_alignment())); d_sig_doppler_wiped = static_cast<lv_16sc_t*>(volk_gnsssdr_malloc(size, volk_gnsssdr_get_alignment()));
d_local_codes_resampled = new lv_16sc_t*[n_correlators]; d_local_codes_resampled = new lv_16sc_t*[n_correlators];
for (int n = 0; n < n_correlators; n++) for (int n = 0; n < n_correlators; n++)
{ {
d_local_codes_resampled[n] = static_cast<lv_16sc_t*>(volk_malloc(size, volk_get_alignment())); d_local_codes_resampled[n] = static_cast<lv_16sc_t*>(volk_gnsssdr_malloc(size, volk_gnsssdr_get_alignment()));
} }
d_n_correlators = n_correlators; d_n_correlators = n_correlators;
return true; return true;
@@ -88,7 +86,7 @@ bool cpu_multicorrelator_16sc::set_input_output_vectors(lv_16sc_t* corr_out, con
void cpu_multicorrelator_16sc::update_local_code(int correlator_length_samples,float rem_code_phase_chips, float code_phase_step_chips) void cpu_multicorrelator_16sc::update_local_code(int correlator_length_samples,float rem_code_phase_chips, float code_phase_step_chips)
{ {
float *tmp_code_phases_chips; float *tmp_code_phases_chips;
tmp_code_phases_chips = static_cast<float*>(volk_malloc(d_n_correlators*sizeof(float), volk_get_alignment())); tmp_code_phases_chips = static_cast<float*>(volk_gnsssdr_malloc(d_n_correlators*sizeof(float), volk_gnsssdr_get_alignment()));
for (int n = 0; n < d_n_correlators; n++) for (int n = 0; n < d_n_correlators; n++)
{ {
tmp_code_phases_chips[n] = d_shifts_chips[n] - rem_code_phase_chips; tmp_code_phases_chips[n] = d_shifts_chips[n] - rem_code_phase_chips;
@@ -102,37 +100,10 @@ void cpu_multicorrelator_16sc::update_local_code(int correlator_length_samples,f
d_n_correlators, d_n_correlators,
d_code_length_chips); d_code_length_chips);
volk_free(tmp_code_phases_chips); volk_gnsssdr_free(tmp_code_phases_chips);
// float local_code_chip_index;
// for (int current_correlator_tap = 0; current_correlator_tap < d_n_correlators; current_correlator_tap++)
// {
// for (int n = 0; n < correlator_length_samples; n++)
// {
// // resample code for current tap
// local_code_chip_index = std::fmod(code_phase_step_chips*static_cast<float>(n)+ d_shifts_chips[current_correlator_tap] - rem_code_phase_chips, d_code_length_chips);
// //Take into account that in multitap correlators, the shifts can be negative!
// if (local_code_chip_index < 0.0) local_code_chip_index += d_code_length_chips;
// d_local_codes_resampled[current_correlator_tap][n] = d_local_code_in[static_cast<int>(round(local_code_chip_index))];
// }
// }
} }
void cpu_multicorrelator_16sc::update_local_carrier(int correlator_length_samples, float rem_carr_phase_rad, float phase_step_rad)
{
float sin_f, cos_f;
int phase_step_rad_i = gr::fxpt::float_to_fixed(phase_step_rad);
int phase_rad_i = gr::fxpt::float_to_fixed(rem_carr_phase_rad);
for(int i = 0; i < correlator_length_samples; i++)
{
gr::fxpt::sincos(phase_rad_i, &sin_f, &cos_f);
d_nco_in[i] = lv_16sc_t((short int)(cos_f*2.0), (short int)(-sin_f*2.0));
phase_rad_i += phase_step_rad_i;
}
}
bool cpu_multicorrelator_16sc::Carrier_wipeoff_multicorrelator_resampler( bool cpu_multicorrelator_16sc::Carrier_wipeoff_multicorrelator_resampler(
float rem_carrier_phase_in_rad, float rem_carrier_phase_in_rad,
float phase_step_rad, float phase_step_rad,
@@ -165,11 +136,11 @@ cpu_multicorrelator_16sc::cpu_multicorrelator_16sc()
bool cpu_multicorrelator_16sc::free() bool cpu_multicorrelator_16sc::free()
{ {
// Free memory // Free memory
if (d_sig_doppler_wiped != NULL) volk_free(d_sig_doppler_wiped); if (d_sig_doppler_wiped != NULL) volk_gnsssdr_free(d_sig_doppler_wiped);
if (d_nco_in != NULL) volk_free(d_nco_in); if (d_nco_in != NULL) volk_gnsssdr_free(d_nco_in);
for (int n = 0; n < d_n_correlators; n++) for (int n = 0; n < d_n_correlators; n++)
{ {
volk_free(d_local_codes_resampled[n]); volk_gnsssdr_free(d_local_codes_resampled[n]);
} }
delete d_local_codes_resampled; delete d_local_codes_resampled;
return true; return true;

2
src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h
View File

@@ -35,7 +35,6 @@
#ifndef GNSS_SDR_CPU_MULTICORRELATOR_16SC_H_ #ifndef GNSS_SDR_CPU_MULTICORRELATOR_16SC_H_
#define GNSS_SDR_CPU_MULTICORRELATOR_16SC_H_ #define GNSS_SDR_CPU_MULTICORRELATOR_16SC_H_
#include <volk/volk.h> //include original volk first!
#include <volk_gnsssdr/volk_gnsssdr.h> #include <volk_gnsssdr/volk_gnsssdr.h>
@@ -50,7 +49,6 @@ public:
bool set_local_code_and_taps(int code_length_chips, const lv_16sc_t* local_code_in, float *shifts_chips); bool set_local_code_and_taps(int code_length_chips, const lv_16sc_t* local_code_in, float *shifts_chips);
bool set_input_output_vectors(lv_16sc_t* corr_out, const lv_16sc_t* sig_in); bool set_input_output_vectors(lv_16sc_t* corr_out, const lv_16sc_t* sig_in);
void update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips); 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 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();