mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-01-15 03:35:46 +00:00
Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next
This commit is contained in:
commit
d8816e7355
@ -1218,7 +1218,7 @@ void GNSSFlowgraph::acquisition_manager(unsigned int who)
|
|||||||
estimated_doppler,
|
estimated_doppler,
|
||||||
RX_time);
|
RX_time);
|
||||||
channels_[current_channel]->set_signal(gnss_signal);
|
channels_[current_channel]->set_signal(gnss_signal);
|
||||||
start_acquisition = is_primary_freq or assistance_available or !configuration_->property("GNSS-SDR.assist_dual_frequency_acq", false);
|
start_acquisition = is_primary_freq or assistance_available or !configuration_->property("GNSS-SDR.assist_dual_frequency_acq", true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -1233,7 +1233,7 @@ void GNSSFlowgraph::acquisition_manager(unsigned int who)
|
|||||||
DLOG(INFO) << "Channel " << current_channel
|
DLOG(INFO) << "Channel " << current_channel
|
||||||
<< " Starting acquisition " << channels_[current_channel]->get_signal().get_satellite()
|
<< " Starting acquisition " << channels_[current_channel]->get_signal().get_satellite()
|
||||||
<< ", Signal " << channels_[current_channel]->get_signal().get_signal_str();
|
<< ", Signal " << channels_[current_channel]->get_signal().get_signal_str();
|
||||||
if (assistance_available == true and configuration_->property("GNSS-SDR.assist_dual_frequency_acq", false))
|
if (assistance_available == true and configuration_->property("GNSS-SDR.assist_dual_frequency_acq", true))
|
||||||
{
|
{
|
||||||
channels_[current_channel]->assist_acquisition_doppler(project_doppler(channels_[current_channel]->get_signal().get_signal_str(), estimated_doppler));
|
channels_[current_channel]->assist_acquisition_doppler(project_doppler(channels_[current_channel]->get_signal().get_signal_str(), estimated_doppler));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user