mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-15 19:55:47 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2019-08-04 13:15:24 +02:00
commit 608e8122cf
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
11 changed files with 33 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/algorithms/PVT/libs/rinex_printer.cc
View File

@ -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); boost::posix_time::ptime p_time(boost::gregorian::date(2019, 4, 7), t);
return p_time; return p_time;
} }
else boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
{ return p_time;
boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
return p_time;
}
} }

2
src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
View File

@ -300,7 +300,7 @@ gr::basic_block_sptr BeidouB1iPcpsAcquisition::get_left_block()
{ {
return acquisition_; return acquisition_;
} }
else if (item_type_ == "cbyte") if (item_type_ == "cbyte")
{ {
return cbyte_to_float_x2_; return cbyte_to_float_x2_;
} }

2
src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc
View File

@ -301,7 +301,7 @@ gr::basic_block_sptr BeidouB3iPcpsAcquisition::get_left_block()
{ {
return acquisition_; return acquisition_;
} }
else if (item_type_ == "cbyte") if (item_type_ == "cbyte")
{ {
return cbyte_to_float_x2_; return cbyte_to_float_x2_;
} }

16
src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc
View File

@ -339,11 +339,9 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_left_block()
{ {
return gr_char_to_short_; return gr_char_to_short_;
} }
else
{ LOG(WARNING) << " Unknown input filter input/output item type conversion";
return nullptr; 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_; return complex_to_complex_byte_;
} }
else
{ LOG(WARNING) << " Unknown input filter input/output item type conversion";
return nullptr; return nullptr;
LOG(ERROR) << " Unknown input filter input/output item type conversion";
}
} }

2
src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
View File

@ -4241,7 +4241,7 @@ double satwavelen(int sat, int frq, const nav_t *nav)
{ {
return SPEED_OF_LIGHT / FREQ8; /* E5a+b */ return SPEED_OF_LIGHT / FREQ8; /* E5a+b */
} }
else if (frq == 6) if (frq == 6)
{ {
return SPEED_OF_LIGHT / FREQ9; /* S */ return SPEED_OF_LIGHT / FREQ9; /* S */
} }

4
src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc
View File

@ -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; // old_time_debug = out[0][0].RX_time * 1000.0;
return 1; return 1;
} }
else
{
return 0;
}
} }
return 0; return 0;
} }

5
src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc
View File

@ -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)); d_pcap_thread = new boost::thread(boost::bind(&Gr_Complex_Ip_Packet_Source::my_pcap_loop_thread, this, descr));
return true; return true;
} }
else return false;
{
return false;
}
} }

43
src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
View File

@ -114,10 +114,7 @@ std::string labsat23_source::generate_filename()
{ {
return d_signal_file_basename; return d_signal_file_basename;
} }
else return std::string("donotexist"); // just to stop processing
{
return std::string("donotexist"); // just to stop processing
}
} }
std::ostringstream ss; std::ostringstream ss;
ss << std::setw(4) << std::setfill('0') << d_current_file_number; ss << std::setw(4) << std::setfill('0') << d_current_file_number;
@ -458,20 +455,18 @@ int labsat23_source::general_work(int noutput_items,
std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl; std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl;
return 0; return 0;
} }
if (d_labsat_version == 3)
{
std::cout << "Last file reached, LabSat source stop" << std::endl;
}
else else
{ {
if (d_labsat_version == 3) std::cout << "End of file reached, LabSat source stop" << std::endl;
{
std::cout << "Last file reached, LabSat source stop" << std::endl;
}
else
{
std::cout << "End of file reached, LabSat source stop" << std::endl;
}
d_queue->push(pmt::make_any(command_event_make(200, 0)));
return -1;
} }
d_queue->push(pmt::make_any(command_event_make(200, 0)));
return -1;
} }
else else
{ {
@ -518,19 +513,17 @@ int labsat23_source::general_work(int noutput_items,
std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl; std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl;
return 0; return 0;
} }
if (d_labsat_version == 3)
{
std::cout << "Last file reached, LabSat source stop" << std::endl;
}
else else
{ {
if (d_labsat_version == 3) std::cout << "End of file reached, LabSat source stop" << std::endl;
{
std::cout << "Last file reached, LabSat source stop" << std::endl;
}
else
{
std::cout << "End of file reached, LabSat source stop" << std::endl;
}
d_queue->push(pmt::make_any(command_event_make(200, 0)));
return -1;
} }
d_queue->push(pmt::make_any(command_event_make(200, 0)));
return -1;
} }
else else
{ {

9
src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc
View File

@ -300,15 +300,8 @@ bool gps_l1_ca_telemetry_decoder_gs::decode_subframe()
} }
return true; return true;
} }
else
{
return false;
}
}
else
{
return false;
} }
return false;
} }

2
src/algorithms/tracking/libs/tracking_discriminators.cc
View File

@ -44,7 +44,7 @@ double phase_unwrap(double phase_rad)
{ {
return phase_rad - PI; return phase_rad - PI;
} }
else if (phase_rad <= -HALF_PI) if (phase_rad <= -HALF_PI)
{ {
return phase_rad + PI; return phase_rad + PI;
} }

5
src/core/libs/supl/supl.c
View File

@ -333,10 +333,7 @@ static int server_connect(char *server)
} }
return -1; return -1;
} }
else break;
{
break;
}
} }
freeaddrinfo(aip); freeaddrinfo(aip);
return fd; return fd;