mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-12-03 15:18:08 +00:00
Merge branch 'next' into smart_acq_resampler
This commit is contained in:
@@ -81,13 +81,10 @@ bool ChannelFsm::Event_start_acquisition()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
d_state = 1;
|
||||
start_acquisition();
|
||||
DLOG(INFO) << "CH = " << channel_ << ". Ev start acquisition";
|
||||
return true;
|
||||
}
|
||||
d_state = 1;
|
||||
start_acquisition();
|
||||
DLOG(INFO) << "CH = " << channel_ << ". Ev start acquisition";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -98,13 +95,10 @@ bool ChannelFsm::Event_valid_acquisition()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
d_state = 2;
|
||||
start_tracking();
|
||||
DLOG(INFO) << "CH = " << channel_ << ". Ev valid acquisition";
|
||||
return true;
|
||||
}
|
||||
d_state = 2;
|
||||
start_tracking();
|
||||
DLOG(INFO) << "CH = " << channel_ << ". Ev valid acquisition";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -115,13 +109,10 @@ bool ChannelFsm::Event_failed_acquisition_repeat()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
d_state = 1;
|
||||
start_acquisition();
|
||||
DLOG(INFO) << "CH = " << channel_ << ". Ev failed acquisition repeat";
|
||||
return true;
|
||||
}
|
||||
d_state = 1;
|
||||
start_acquisition();
|
||||
DLOG(INFO) << "CH = " << channel_ << ". Ev failed acquisition repeat";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -132,13 +123,10 @@ bool ChannelFsm::Event_failed_acquisition_no_repeat()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
d_state = 3;
|
||||
request_satellite();
|
||||
DLOG(INFO) << "CH = " << channel_ << ". Ev failed acquisition no repeat";
|
||||
return true;
|
||||
}
|
||||
d_state = 3;
|
||||
request_satellite();
|
||||
DLOG(INFO) << "CH = " << channel_ << ". Ev failed acquisition no repeat";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -149,13 +137,10 @@ bool ChannelFsm::Event_failed_tracking_standby()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
d_state = 0U;
|
||||
notify_stop_tracking();
|
||||
DLOG(INFO) << "CH = " << channel_ << ". Ev failed tracking standby";
|
||||
return true;
|
||||
}
|
||||
d_state = 0U;
|
||||
notify_stop_tracking();
|
||||
DLOG(INFO) << "CH = " << channel_ << ". Ev failed tracking standby";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user