mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-21 17:44:52 +00:00
Code Issues Releases Wiki Activity

implemented 64-bit global sample counter

Browse Source 
started programming the FPGA tracking unit tests
This commit is contained in:
Marc Majoral
2018-08-10 13:12:06 +02:00
parent 3b154c57c2
commit b1524a3afe
8 changed files with 1067 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc
View File

@@ -223,7 +223,7 @@ void pcps_acquisition_fpga::set_active(bool active)
// no CFAR algorithm in the FPGA
<< ", use_CFAR_algorithm_flag: false";
unsigned int initial_sample;
unsigned long int initial_sample;
float input_power_all = 0.0;
float input_power_computed = 0.0;
@@ -328,7 +328,7 @@ void pcps_acquisition_fpga::set_active(bool active)
printf("##### d_test_statistics = %f\n", d_test_statistics);
printf("##### debug_d_max_absolute =%f\n",debug_d_max_absolute);
printf("##### debug_d_input_power_absolute =%f\n",debug_d_input_power_absolute);
printf("##### initial_sample = %d\n",initial_sample);
printf("##### initial_sample = %lu\n",initial_sample);
printf("##### debug_doppler_index = %d\n",debug_doppler_index);
send_positive_acquisition();
d_state = 0; // Positive acquisition

13
src/algorithms/acquisition/libs/fpga_acquisition.cc
View File

@@ -369,13 +369,20 @@ void fpga_acquisition::set_phase_step(unsigned int doppler_index)
void fpga_acquisition::read_acquisition_results(uint32_t *max_index,
float *max_magnitude, unsigned *initial_sample, float *power_sum, unsigned *doppler_index)
float *max_magnitude, unsigned long int *initial_sample, float *power_sum, unsigned *doppler_index)
{
unsigned long int initial_sample_tmp;
unsigned readval = 0;
unsigned long int readval_long = 0;
readval = d_map_base[1];
*initial_sample = readval;
initial_sample_tmp = readval;
//*initial_sample = readval;
//printf("read initial sample dmap 1 = %d\n", readval);
readval = d_map_base[2];
readval_long = d_map_base[2];
initial_sample_tmp = initial_sample_tmp + (readval_long * (2^32));
*initial_sample = initial_sample_tmp;
readval = d_map_base[6];
*max_magnitude = static_cast<float>(readval);
//printf("read max_magnitude dmap 2 = %d\n", readval);
readval = d_map_base[4];

2
src/algorithms/acquisition/libs/fpga_acquisition.h
View File

@@ -61,7 +61,7 @@ public:
void run_acquisition(void);
void set_phase_step(unsigned int doppler_index);
void read_acquisition_results(uint32_t *max_index, float *max_magnitude,
unsigned *initial_sample, float *power_sum, unsigned *doppler_index);
unsigned long int *initial_sample, float *power_sum, unsigned *doppler_index);
void block_samples();
void unblock_samples();