mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-14 20:20:35 +00:00
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into acq_performance
This commit is contained in:
commit
b4e1a9d5dd
@ -683,8 +683,11 @@ int pcps_acquisition::general_work(int noutput_items __attribute__((unused)),
|
|||||||
gr::thread::scoped_lock lk(d_setlock);
|
gr::thread::scoped_lock lk(d_setlock);
|
||||||
if (!d_active or d_worker_active)
|
if (!d_active or d_worker_active)
|
||||||
{
|
{
|
||||||
d_sample_counter += d_fft_size * ninput_items[0];
|
if (!acq_parameters.blocking_on_stanby)
|
||||||
consume_each(ninput_items[0]);
|
{
|
||||||
|
d_sample_counter += d_fft_size * ninput_items[0];
|
||||||
|
consume_each(ninput_items[0]);
|
||||||
|
}
|
||||||
if (d_step_two)
|
if (d_step_two)
|
||||||
{
|
{
|
||||||
d_doppler_center_step_two = static_cast<float>(d_gnss_synchro->Acq_doppler_hz);
|
d_doppler_center_step_two = static_cast<float>(d_gnss_synchro->Acq_doppler_hz);
|
||||||
@ -708,8 +711,11 @@ int pcps_acquisition::general_work(int noutput_items __attribute__((unused)),
|
|||||||
d_input_power = 0.0;
|
d_input_power = 0.0;
|
||||||
d_test_statistics = 0.0;
|
d_test_statistics = 0.0;
|
||||||
d_state = 1;
|
d_state = 1;
|
||||||
d_sample_counter += d_fft_size * ninput_items[0]; // sample counter
|
if (!acq_parameters.blocking_on_stanby)
|
||||||
consume_each(ninput_items[0]);
|
{
|
||||||
|
d_sample_counter += d_fft_size * ninput_items[0]; // sample counter
|
||||||
|
consume_each(ninput_items[0]);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,4 +50,5 @@ Acq_Conf::Acq_Conf()
|
|||||||
dump_filename = "";
|
dump_filename = "";
|
||||||
dump_channel = 0;
|
dump_channel = 0;
|
||||||
it_size = sizeof(char);
|
it_size = sizeof(char);
|
||||||
|
blocking_on_stanby = false;
|
||||||
}
|
}
|
||||||
|
@ -51,6 +51,7 @@ public:
|
|||||||
bool use_CFAR_algorithm_flag;
|
bool use_CFAR_algorithm_flag;
|
||||||
bool dump;
|
bool dump;
|
||||||
bool blocking;
|
bool blocking;
|
||||||
|
bool blocking_on_stanby; //enable it only for unit testing to avoid sample consume on idle status
|
||||||
bool make_2_steps;
|
bool make_2_steps;
|
||||||
std::string dump_filename;
|
std::string dump_filename;
|
||||||
unsigned int dump_channel;
|
unsigned int dump_channel;
|
||||||
|
@ -293,7 +293,7 @@ void GpsL1CATelemetryDecoderTest::check_results(arma::vec& true_time_s,
|
|||||||
|
|
||||||
//2. RMSE
|
//2. RMSE
|
||||||
//arma::vec err = meas_value - true_value_interp + 0.001;
|
//arma::vec err = meas_value - true_value_interp + 0.001;
|
||||||
arma::vec err = meas_value - true_value_interp - 0.001;
|
arma::vec err = meas_value - true_value_interp; // - 0.001;
|
||||||
|
|
||||||
arma::vec err2 = arma::square(err);
|
arma::vec err2 = arma::square(err);
|
||||||
double rmse = sqrt(arma::mean(err2));
|
double rmse = sqrt(arma::mean(err2));
|
||||||
|
Loading…
Reference in New Issue
Block a user