mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-31 15:23:04 +00:00 
			
		
		
		
	Expose the blocking_on_standby parameter to the documentation. Useful for unit testing
This commit is contained in:
		| @@ -104,6 +104,7 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition( | |||||||
|     acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); |     acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); | ||||||
|     acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); |     acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); | ||||||
|     acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); |     acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); | ||||||
|  |     acq_parameters.blocking_on_standby = configuration_->property(role + ".blocking_on_standby", false); | ||||||
|     acquisition_ = pcps_make_acquisition(acq_parameters); |     acquisition_ = pcps_make_acquisition(acq_parameters); | ||||||
|     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; |     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -106,6 +106,7 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con | |||||||
|     acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); |     acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); | ||||||
|     acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); |     acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); | ||||||
|     acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); |     acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); | ||||||
|  |     acq_parameters.blocking_on_standby = configuration_->property(role + ".blocking_on_standby", false); | ||||||
|     acquisition_ = pcps_make_acquisition(acq_parameters); |     acquisition_ = pcps_make_acquisition(acq_parameters); | ||||||
|  |  | ||||||
|     stream_to_vector_ = gr::blocks::stream_to_vector::make(item_size_, vector_length_); |     stream_to_vector_ = gr::blocks::stream_to_vector::make(item_size_, vector_length_); | ||||||
|   | |||||||
| @@ -104,6 +104,7 @@ GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition( | |||||||
|     acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); |     acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); | ||||||
|     acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); |     acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); | ||||||
|     acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); |     acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); | ||||||
|  |     acq_parameters.blocking_on_standby = configuration_->property(role + ".blocking_on_standby", false); | ||||||
|     acquisition_ = pcps_make_acquisition(acq_parameters); |     acquisition_ = pcps_make_acquisition(acq_parameters); | ||||||
|     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; |     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -103,6 +103,7 @@ GlonassL2CaPcpsAcquisition::GlonassL2CaPcpsAcquisition( | |||||||
|     acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); |     acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); | ||||||
|     acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); |     acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); | ||||||
|     acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); |     acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); | ||||||
|  |     acq_parameters.blocking_on_standby = configuration_->property(role + ".blocking_on_standby", false); | ||||||
|     acquisition_ = pcps_make_acquisition(acq_parameters); |     acquisition_ = pcps_make_acquisition(acq_parameters); | ||||||
|     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; |     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -104,6 +104,7 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition( | |||||||
|     acq_parameters.samples_per_ms = code_length_; |     acq_parameters.samples_per_ms = code_length_; | ||||||
|     acq_parameters.samples_per_code = code_length_; |     acq_parameters.samples_per_code = code_length_; | ||||||
|     acq_parameters.it_size = item_size_; |     acq_parameters.it_size = item_size_; | ||||||
|  |     acq_parameters.blocking_on_standby = configuration_->property(role + ".blocking_on_standby", false); | ||||||
|     acquisition_ = pcps_make_acquisition(acq_parameters); |     acquisition_ = pcps_make_acquisition(acq_parameters); | ||||||
|     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; |     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -103,6 +103,7 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition( | |||||||
|     acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); |     acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); | ||||||
|     acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); |     acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); | ||||||
|     acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", true); |     acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", true); | ||||||
|  |     acq_parameters.blocking_on_standby = configuration_->property(role + ".blocking_on_standby", false); | ||||||
|     acquisition_ = pcps_make_acquisition(acq_parameters); |     acquisition_ = pcps_make_acquisition(acq_parameters); | ||||||
|     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; |     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -102,6 +102,7 @@ GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition( | |||||||
|     acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); |     acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); | ||||||
|     acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); |     acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); | ||||||
|     acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); |     acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); | ||||||
|  |     acq_parameters.blocking_on_standby = configuration_->property(role + ".blocking_on_standby", false); | ||||||
|     acquisition_ = pcps_make_acquisition(acq_parameters); |     acquisition_ = pcps_make_acquisition(acq_parameters); | ||||||
|     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; |     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -683,7 +683,7 @@ 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) | ||||||
|         { |         { | ||||||
|             if (!acq_parameters.blocking_on_stanby) |             if (!acq_parameters.blocking_on_standby) | ||||||
|                 { |                 { | ||||||
|                     d_sample_counter += d_fft_size * ninput_items[0]; |                     d_sample_counter += d_fft_size * ninput_items[0]; | ||||||
|                     consume_each(ninput_items[0]); |                     consume_each(ninput_items[0]); | ||||||
| @@ -711,7 +711,7 @@ 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; | ||||||
|                 if (!acq_parameters.blocking_on_stanby) |                 if (!acq_parameters.blocking_on_standby) | ||||||
|                     { |                     { | ||||||
|                         d_sample_counter += d_fft_size * ninput_items[0];  // sample counter |                         d_sample_counter += d_fft_size * ninput_items[0];  // sample counter | ||||||
|                         consume_each(ninput_items[0]); |                         consume_each(ninput_items[0]); | ||||||
|   | |||||||
| @@ -50,5 +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; |     blocking_on_standby = false; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -51,7 +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 blocking_on_standby;  // 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; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez