mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-09-12 15:56:02 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'gitlab/prs_codeless' into prs_codeless

Browse Source
This commit is contained in:
Cillian O'Driscoll
2016-05-23 23:01:14 +01:00
parent 17578dee30 05f8d3598c
commit 955349d869
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/algorithms/tracking/gnuradio_blocks/galileo_e1_prs_codeless_tracking_cc.cc
View File

@@ -1252,10 +1252,10 @@ int galileo_e1_prs_codeless_tracking_cc::general_work (int noutput_items,gr_vect
// By default we simply update the PRS frequencies from the OS:
d_carrier_doppler_hz_prs = d_carrier_doppler_hz;
d_code_freq_chips_prs = d_code_freq_chips * Galileo_E1_A_CODE_CHIP_RATE_HZ/
Galileo_E1_CODE_CHIP_RATE_HZ;
d_subcarrier_freq_cycles_prs = d_subcarrier_freq_cycles * Galileo_E1_A_SUB_CARRIER_RATE_HZ/
Galileo_E1_SUB_CARRIER_A_RATE_HZ;
d_code_freq_chips_prs = Galileo_E1_A_CODE_CHIP_RATE_HZ +
d_carrier_doppler_hz * Galileo_E1_A_CODE_CHIP_RATE_HZ/Galileo_E1_FREQ_HZ;
d_subcarrier_freq_cycles_prs = Galileo_E1_A_SUB_CARRIER_RATE_HZ +
d_carrier_doppler_hz * Galileo_E1_A_SUB_CARRIER_RATE_HZ/Galileo_E1_FREQ_HZ;
if( d_close_prs_loops )
{

4
src/algorithms/tracking/gnuradio_blocks/galileo_e1_prs_veml_tracking_cc.cc
View File

@@ -1708,7 +1708,8 @@ int galileo_e1_prs_veml_tracking_cc::general_work (int noutput_items,gr_vector_i
// AUX vars (for debug purposes)
//tmp_float = d_rem_code_phase_samples/static_cast< float >( d_fs_in )*Galileo_E1_CODE_CHIP_RATE_HZ;
tmp_float = d_code_phase_chips;
d_dump_file.write(reinterpret_cast<char*>(&tmp_float), sizeof(float));
d_dump_file.write(reinterpret_cast<char*>(&d_code_phase_chips), sizeof(double));
d_dump_file.write(reinterpret_cast<char*>(&d_subcarrier_phase_cycles), sizeof(double));
//tmp_double = static_cast<double>(d_sample_counter + d_current_prn_length_samples);
tmp_double = static_cast<double>( code_error_chips_veml );;
d_dump_file.write(reinterpret_cast<char*>(&tmp_double), sizeof(double));
@@ -1749,6 +1750,7 @@ int galileo_e1_prs_veml_tracking_cc::general_work (int noutput_items,gr_vector_i
d_dump_file.write(reinterpret_cast<char*>(&tmp_double), sizeof(double));
d_dump_file.write(reinterpret_cast<char*>(&code_error_chips_veml_prs), sizeof(float));
d_dump_file.write(reinterpret_cast<char*>(&code_error_filt_chips_veml_prs), sizeof(float));
d_dump_file.write(reinterpret_cast<char*>(&d_subcarrier_phase_cycles_prs), sizeof(double));
}
catch (std::ifstream::failure e)
{

18
src/utils/matlab/libs/galileo_e1_prs_veml_read_tracking_dump.m
View File

@@ -34,9 +34,9 @@ function [GNSS_tracking] = galileo_e1_prs_veml_read_tracking_dump (filename, cou
%%
m = nargchk (1,2,nargin);
num_float_vars=32;
num_float_vars=31;
num_unsigned_long_int_vars=1;
num_double_vars=3;
num_double_vars=6;
double_size_bytes=8;
unsigned_long_int_size_bytes=8;
float_size_bytes=4;
@@ -104,8 +104,10 @@ function [GNSS_tracking] = galileo_e1_prs_veml_read_tracking_dump (filename, cou
v19 = fread (f, count, 'float',skip_bytes_each_read-float_size_bytes);
bytes_shift=bytes_shift+float_size_bytes;
fseek(f,bytes_shift,'bof'); % move to next interleaved float
v20 = fread (f, count, 'float',skip_bytes_each_read-float_size_bytes);
bytes_shift=bytes_shift+float_size_bytes;
v20 = fread (f, count, 'float64',skip_bytes_each_read-double_size_bytes);
bytes_shift=bytes_shift+double_size_bytes;
v20a = fread (f, count, 'float64',skip_bytes_each_read-double_size_bytes);
bytes_shift=bytes_shift+double_size_bytes;
fseek(f,bytes_shift,'bof'); % move to next interleaved float
v21 = fread (f, count, 'float64',skip_bytes_each_read-double_size_bytes);
bytes_shift=bytes_shift+double_size_bytes;
@@ -159,6 +161,9 @@ function [GNSS_tracking] = galileo_e1_prs_veml_read_tracking_dump (filename, cou
bytes_shift=bytes_shift+float_size_bytes;
fseek(f,bytes_shift,'bof'); % move to next interleaved float
v41 = fread (f, count, 'float',skip_bytes_each_read-float_size_bytes);
bytes_shift=bytes_shift+float_size_bytes;
fseek(f,bytes_shift,'bof'); % move to next interleaved float
v42 = fread (f, count, 'float64',skip_bytes_each_read-double_size_bytes);
fclose (f);
%%%%%%%% output vars %%%%%%%%
% // EPR
@@ -215,6 +220,7 @@ function [GNSS_tracking] = galileo_e1_prs_veml_read_tracking_dump (filename, cou
CN0_SNV_dB_Hz=v18;
carrier_lock_test=v19;
rem_code_phase=v20;
subcarrier_phase=v20;
code_error_veml=v21;
code_nco_veml=v22;
VE_prs=v23;
@@ -233,6 +239,7 @@ function [GNSS_tracking] = galileo_e1_prs_veml_read_tracking_dump (filename, cou
code_phase_chips_prs=v39;
code_error_veml_prs=v40;
code_nco_veml_prs=v41;
subcarrier_phase_cycles_prs=v42;
GNSS_tracking.VE=VE;
GNSS_tracking.E=E;
@@ -252,6 +259,7 @@ function [GNSS_tracking] = galileo_e1_prs_veml_read_tracking_dump (filename, cou
GNSS_tracking.CN0_SNV_dB_Hz=CN0_SNV_dB_Hz;
GNSS_tracking.carrier_lock_test=carrier_lock_test;
GNSS_tracking.rem_code_phase=rem_code_phase;
GNSS_tracking.subcarrier_phase_cycles=subcarrier_phase;
GNSS_tracking.code_error_veml=code_error_veml;
GNSS_tracking.code_nco_veml=code_nco_veml;
GNSS_tracking.VE_prs=VE_prs;
@@ -270,7 +278,7 @@ function [GNSS_tracking] = galileo_e1_prs_veml_read_tracking_dump (filename, cou
GNSS_tracking.code_phase_chips_prs=code_phase_chips_prs;
GNSS_tracking.code_error_veml_prs=code_error_veml_prs;
GNSS_tracking.code_nco_veml_prs=code_nco_veml_prs;
GNSS_tracking.subcarrier_phase_cycles_prs=subcarrier_phase_cycles_prs;
end