mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-01-15 19:55:47 +00:00
Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next
This commit is contained in:
commit
608e8122cf
@ -11779,11 +11779,8 @@ boost::posix_time::ptime Rinex_Printer::compute_UTC_time(const Gps_Navigation_Me
|
||||
boost::posix_time::ptime p_time(boost::gregorian::date(2019, 4, 7), t);
|
||||
return p_time;
|
||||
}
|
||||
else
|
||||
{
|
||||
boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
|
||||
return p_time;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -300,7 +300,7 @@ gr::basic_block_sptr BeidouB1iPcpsAcquisition::get_left_block()
|
||||
{
|
||||
return acquisition_;
|
||||
}
|
||||
else if (item_type_ == "cbyte")
|
||||
if (item_type_ == "cbyte")
|
||||
{
|
||||
return cbyte_to_float_x2_;
|
||||
}
|
||||
|
@ -301,7 +301,7 @@ gr::basic_block_sptr BeidouB3iPcpsAcquisition::get_left_block()
|
||||
{
|
||||
return acquisition_;
|
||||
}
|
||||
else if (item_type_ == "cbyte")
|
||||
if (item_type_ == "cbyte")
|
||||
{
|
||||
return cbyte_to_float_x2_;
|
||||
}
|
||||
|
@ -339,11 +339,9 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_left_block()
|
||||
{
|
||||
return gr_char_to_short_;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
LOG(WARNING) << " Unknown input filter input/output item type conversion";
|
||||
return nullptr;
|
||||
LOG(ERROR) << " Unknown input filter input/output item type conversion";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -373,9 +371,7 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_right_block()
|
||||
{
|
||||
return complex_to_complex_byte_;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
LOG(WARNING) << " Unknown input filter input/output item type conversion";
|
||||
return nullptr;
|
||||
LOG(ERROR) << " Unknown input filter input/output item type conversion";
|
||||
}
|
||||
}
|
||||
|
@ -4241,7 +4241,7 @@ double satwavelen(int sat, int frq, const nav_t *nav)
|
||||
{
|
||||
return SPEED_OF_LIGHT / FREQ8; /* E5a+b */
|
||||
}
|
||||
else if (frq == 6)
|
||||
if (frq == 6)
|
||||
{
|
||||
return SPEED_OF_LIGHT / FREQ9; /* S */
|
||||
}
|
||||
|
@ -664,10 +664,6 @@ int hybrid_observables_gs::general_work(int noutput_items __attribute__((unused)
|
||||
// old_time_debug = out[0][0].RX_time * 1000.0;
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -162,10 +162,7 @@ bool Gr_Complex_Ip_Packet_Source::start()
|
||||
d_pcap_thread = new boost::thread(boost::bind(&Gr_Complex_Ip_Packet_Source::my_pcap_loop_thread, this, descr));
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -114,11 +114,8 @@ std::string labsat23_source::generate_filename()
|
||||
{
|
||||
return d_signal_file_basename;
|
||||
}
|
||||
else
|
||||
{
|
||||
return std::string("donotexist"); // just to stop processing
|
||||
}
|
||||
}
|
||||
std::ostringstream ss;
|
||||
ss << std::setw(4) << std::setfill('0') << d_current_file_number;
|
||||
return d_signal_file_basename + "_" + ss.str() + ".LS3";
|
||||
@ -458,8 +455,7 @@ int labsat23_source::general_work(int noutput_items,
|
||||
std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl;
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
if (d_labsat_version == 3)
|
||||
{
|
||||
std::cout << "Last file reached, LabSat source stop" << std::endl;
|
||||
@ -472,7 +468,6 @@ int labsat23_source::general_work(int noutput_items,
|
||||
d_queue->push(pmt::make_any(command_event_make(200, 0)));
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
@ -518,8 +513,7 @@ int labsat23_source::general_work(int noutput_items,
|
||||
std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl;
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
if (d_labsat_version == 3)
|
||||
{
|
||||
std::cout << "Last file reached, LabSat source stop" << std::endl;
|
||||
@ -531,7 +525,6 @@ int labsat23_source::general_work(int noutput_items,
|
||||
d_queue->push(pmt::make_any(command_event_make(200, 0)));
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
|
@ -300,15 +300,8 @@ bool gps_l1_ca_telemetry_decoder_gs::decode_subframe()
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -44,7 +44,7 @@ double phase_unwrap(double phase_rad)
|
||||
{
|
||||
return phase_rad - PI;
|
||||
}
|
||||
else if (phase_rad <= -HALF_PI)
|
||||
if (phase_rad <= -HALF_PI)
|
||||
{
|
||||
return phase_rad + PI;
|
||||
}
|
||||
|
@ -333,11 +333,8 @@ static int server_connect(char *server)
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
freeaddrinfo(aip);
|
||||
return fd;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user