1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-13 19:50:34 +00:00

removed unused variables

This commit is contained in:
Marc Majoral 2019-12-18 16:22:17 +01:00
parent b41973065b
commit cf8e327414

View File

@ -347,7 +347,6 @@ bool GpsL1CaPcpsAcquisitionTestFpga::acquire_signal()
std::shared_ptr<AcquisitionInterface> acquisition; std::shared_ptr<AcquisitionInterface> acquisition;
std::string System_and_Signal;
std::string signal; std::string signal;
struct DMA_handler_args_gps_l1_acq_test args; struct DMA_handler_args_gps_l1_acq_test args;
struct acquisition_handler_args_gps_l1_acq_test args_acq; struct acquisition_handler_args_gps_l1_acq_test args_acq;
@ -367,7 +366,6 @@ bool GpsL1CaPcpsAcquisitionTestFpga::acquire_signal()
const char* str = signal.c_str(); // get a C style null terminated string const char* str = signal.c_str(); // get a C style null terminated string
std::memcpy(static_cast<void*>(tmp_gnss_synchro.Signal), str, 3); // copy string into synchro char array: 2 char + null std::memcpy(static_cast<void*>(tmp_gnss_synchro.Signal), str, 3); // copy string into synchro char array: 2 char + null
tmp_gnss_synchro.PRN = SV_ID; tmp_gnss_synchro.PRN = SV_ID;
System_and_Signal = "GPS L1 CA";
const std::string& role = "Acquisition"; const std::string& role = "Acquisition";
acquisition = std::make_shared<GpsL1CaPcpsAcquisitionFpga>(config.get(), "Acquisition", 0, 0); acquisition = std::make_shared<GpsL1CaPcpsAcquisitionFpga>(config.get(), "Acquisition", 0, 0);
@ -381,14 +379,8 @@ bool GpsL1CaPcpsAcquisitionTestFpga::acquire_signal()
acquisition->set_doppler_center(0); acquisition->set_doppler_center(0);
acquisition->set_threshold(0.001); acquisition->set_threshold(0.001);
std::chrono::time_point<std::chrono::system_clock> start, end;
std::chrono::duration<double> elapsed_seconds;
start = std::chrono::system_clock::now();
nsamples_to_transfer = static_cast<unsigned int>(std::round(static_cast<double>(BASEBAND_SAMPLING_FREQ) / (GPS_L1_CA_CODE_RATE_CPS / GPS_L1_CA_CODE_LENGTH_CHIPS))); nsamples_to_transfer = static_cast<unsigned int>(std::round(static_cast<double>(BASEBAND_SAMPLING_FREQ) / (GPS_L1_CA_CODE_RATE_CPS / GPS_L1_CA_CODE_LENGTH_CHIPS)));
unsigned int PRN = SV_ID;
channel_fsm_->Event_clear_test_result(); channel_fsm_->Event_clear_test_result();
acquisition->stop_acquisition(); // reset the whole system including the sample counters acquisition->stop_acquisition(); // reset the whole system including the sample counters
@ -430,12 +422,6 @@ bool GpsL1CaPcpsAcquisitionTestFpga::acquire_signal()
gnss_synchro_vec.push_back(tmp_gnss_synchro); gnss_synchro_vec.push_back(tmp_gnss_synchro);
} }
// report the elapsed time
end = std::chrono::system_clock::now();
elapsed_seconds = end - start;
std::cout << "Total signal acquisition run time "
<< elapsed_seconds.count()
<< " [seconds]" << std::endl;
if (!gnss_synchro_vec.empty()) if (!gnss_synchro_vec.empty())
{ {
return true; return true;
@ -470,9 +456,6 @@ void GpsL1CaPcpsAcquisitionTestFpga::init()
TEST_F(GpsL1CaPcpsAcquisitionTestFpga, ValidationOfResults) TEST_F(GpsL1CaPcpsAcquisitionTestFpga, ValidationOfResults)
{ {
// pointer to the DMA thread that sends the samples to the acquisition engine
pthread_t thread_DMA;
struct DMA_handler_args_gps_l1_acq_test args; struct DMA_handler_args_gps_l1_acq_test args;
std::chrono::time_point<std::chrono::system_clock> start, end; std::chrono::time_point<std::chrono::system_clock> start, end;
@ -491,11 +474,8 @@ TEST_F(GpsL1CaPcpsAcquisitionTestFpga, ValidationOfResults)
elapsed_seconds = end - start; elapsed_seconds = end - start;
uint32_t n = 0; // there is only one channel uint32_t n = 0; // there is only one channel
uint64_t nsamples = gnss_synchro_vec.at(n).Acq_samplestamp_samples;
std::cout << "Acquired " << nsamples_to_transfer << " samples in " << elapsed_seconds.count() * 1e6 << " microseconds" << std::endl; std::cout << "Acquired " << nsamples_to_transfer << " samples in " << elapsed_seconds.count() * 1e6 << " microseconds" << std::endl;
double integration_period = static_cast<unsigned int>(std::round(static_cast<double>(GpsL1CaPcpsAcquisitionTestFpga::BASEBAND_SAMPLING_FREQ) / (GPS_L1_CA_CODE_RATE_CPS / GPS_L1_CA_CODE_LENGTH_CHIPS)));
double delay_error_samples = std::abs(expected_delay_samples - gnss_synchro_vec.at(n).Acq_delay_samples); double delay_error_samples = std::abs(expected_delay_samples - gnss_synchro_vec.at(n).Acq_delay_samples);
auto delay_error_chips = static_cast<float>(delay_error_samples * 1023 / 4000); auto delay_error_chips = static_cast<float>(delay_error_samples * 1023 / 4000);
double doppler_error_hz = std::abs(expected_doppler_hz - gnss_synchro_vec.at(n).Acq_doppler_hz); double doppler_error_hz = std::abs(expected_doppler_hz - gnss_synchro_vec.at(n).Acq_doppler_hz);