mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-06-25 22:43:14 +00:00
Code Issues Releases Wiki Activity

moved to 16 bits per local code.

Browse Source
This commit is contained in:
Marc Majoral 2019-03-20 16:59:32 +01:00
parent 6da82535ba
commit e6b661494c
9 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
View File

@ -45,7 +45,7 @@
#include <cstring> // for memcpy
#define QUANT_BITS_LOCAL_CODE 10
#define QUANT_BITS_LOCAL_CODE 16
GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
ConfigurationInterface* configuration,

1
src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h
View File

@ -104,6 +104,7 @@ public:
*/
inline void set_channel_fsm(std::shared_ptr<ChannelFsm> channel_fsm)
{
channel_fsm = nullptr;
channel_fsm_ = channel_fsm;
acquisition_fpga_->set_channel_fsm(channel_fsm);
}

2
src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc
View File

@ -44,7 +44,7 @@
#include <complex> // for complex
#include <cstring> // for strcpy, memcpy
#define QUANT_BITS_LOCAL_CODE 10
#define QUANT_BITS_LOCAL_CODE 16
GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterface* configuration,
const std::string& role,

1
src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h
View File

@ -103,6 +103,7 @@ public:
*/
inline void set_channel_fsm(std::shared_ptr<ChannelFsm> channel_fsm)
{
channel_fsm = nullptr;
channel_fsm_ = channel_fsm;
acquisition_fpga_->set_channel_fsm(channel_fsm);
}

2
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc
View File

@ -49,7 +49,7 @@
#define NUM_PRNs 32
#define QUANT_BITS_LOCAL_CODE 10
#define QUANT_BITS_LOCAL_CODE 16
GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga(

1
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h
View File

@ -104,6 +104,7 @@ public:
*/
inline void set_channel_fsm(std::shared_ptr<ChannelFsm> channel_fsm)
{
channel_fsm = nullptr;
channel_fsm_ = channel_fsm;
acquisition_fpga_->set_channel_fsm(channel_fsm);
}

2
src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc
View File

@ -48,7 +48,7 @@
#include <cstring> // for memcpy
#define NUM_PRNs 32
#define QUANT_BITS_LOCAL_CODE 10
#define QUANT_BITS_LOCAL_CODE 16
GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(

1
src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h
View File

@ -106,6 +106,7 @@ public:
*/
inline void set_channel_fsm(std::shared_ptr<ChannelFsm> channel_fsm)
{
channel_fsm = nullptr;
channel_fsm_ = channel_fsm;
acquisition_fpga_->set_channel_fsm(channel_fsm);
}

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

@ -53,15 +53,15 @@
#define MEM_LOCAL_CODE_WR_ENABLE 0x0C000000 // command to enable the ENA and WR pins of the internal memory of the multicorrelator
#define POW_2_2 4 // 2^2 (used for the conversion of floating point numbers to integers)
#define POW_2_29 536870912 // 2^29 (used for the conversion of floating point numbers to integers)
#define SELECT_LSBits 0x000003FF // Select the 10 LSbits out of a 20-bit word
#define SELECT_MSBbits 0x000FFC00 // Select the 10 MSbits out of a 20-bit word
#define SELECT_ALL_CODE_BITS 0x000FFFFF // Select a 20 bit word
#define SHL_CODE_BITS 1024 // shift left by 10 bits
//#define SELECT_LSBits 0x000003FF // Select the 10 LSbits out of a 20-bit word
//#define SELECT_MSBbits 0x000FFC00 // Select the 10 MSbits out of a 20-bit word
//#define SELECT_ALL_CODE_BITS 0x000FFFFF // Select a 20 bit word
//#define SHL_CODE_BITS 1024 // shift left by 10 bits
//#define SELECT_LSBits 0x0000FFFF // Select the 10 LSbits out of a 20-bit word
//#define SELECT_MSBbits 0xFFFF0000 // Select the 10 MSbits out of a 20-bit word
//#define SELECT_ALL_CODE_BITS 0xFFFFFFFF // Select a 20 bit word
//#define SHL_CODE_BITS 65536 // shift left by 10 bits
#define SELECT_LSBits 0x0000FFFF // Select the 10 LSbits out of a 20-bit word
#define SELECT_MSBbits 0xFFFF0000 // Select the 10 MSbits out of a 20-bit word
#define SELECT_ALL_CODE_BITS 0xFFFFFFFF // Select a 20 bit word
#define SHL_CODE_BITS 65536 // shift left by 10 bits
#ifndef TEMP_FAILURE_RETRY
@ -188,9 +188,25 @@ void Fpga_Acquisition::fpga_acquisition_test_register()
void Fpga_Acquisition::fpga_configure_acquisition_local_code(lv_16sc_t fft_local_code[])
{
// uint32_t local_code;
// uint32_t k, tmp, tmp2;
// uint32_t fft_data;
//
// d_map_base[9] = LOCAL_CODE_CLEAR_MEM;
// // write local code
// for (k = 0; k < d_vector_length; k++)
// {
// tmp = fft_local_code[k].real();
// tmp2 = fft_local_code[k].imag();
//
// local_code = (tmp & SELECT_LSBits) | ((tmp2 * SHL_CODE_BITS) & SELECT_MSBbits); // put together the real part and the imaginary part
// fft_data = local_code & SELECT_ALL_CODE_BITS;
// d_map_base[6] = fft_data;
// }
uint32_t local_code;
uint32_t k, tmp, tmp2;
uint32_t fft_data;
int32_t k, tmp, tmp2;
int32_t fft_data;
d_map_base[9] = LOCAL_CODE_CLEAR_MEM;
// write local code