mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 12:40:35 +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 2018-12-03 23:56:00 +01:00
commit 0f0c8428f2
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
99 changed files with 373 additions and 709 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
View File

@ -877,11 +877,9 @@ bool rtklib_pvt_cc::save_gnss_synchro_map_xml(const std::string& file_name)
} }
return true; return true;
} }
else
{ LOG(WARNING) << "Failed to save gnss_synchro, map is empty";
LOG(WARNING) << "Failed to save gnss_synchro, map is empty"; return false;
return false;
}
} }
@ -925,10 +923,8 @@ bool rtklib_pvt_cc::get_latest_PVT(double* longitude_deg,
return true; return true;
} }
else
{ return false;
return false;
}
} }

3
src/algorithms/PVT/libs/CMakeLists.txt
View File

@ -80,8 +80,7 @@ else()
) )
endif() endif()
target_link_libraries( target_link_libraries(pvt_lib
pvt_lib
rtklib_lib rtklib_lib
gnss_sdr_flags gnss_sdr_flags
gnss_sp_libs gnss_sp_libs

21
src/algorithms/PVT/libs/geojson_printer.cc
View File

@ -149,19 +149,15 @@ bool GeoJSON_Printer::set_headers(const std::string& filename, bool time_tag_nam
geojson_file << " \"properties\": {" << std::endl; geojson_file << " \"properties\": {" << std::endl;
geojson_file << R"( "name": "Locations generated by GNSS-SDR" )" << std::endl; geojson_file << R"( "name": "Locations generated by GNSS-SDR" )" << std::endl;
geojson_file << " }," << std::endl; geojson_file << " }," << std::endl;
geojson_file << " \"geometry\": {" << std::endl; geojson_file << " \"geometry\": {" << std::endl;
geojson_file << R"( "type": "MultiPoint",)" << std::endl; geojson_file << R"( "type": "MultiPoint",)" << std::endl;
geojson_file << " \"coordinates\": [" << std::endl; geojson_file << " \"coordinates\": [" << std::endl;
return true; return true;
} }
else
{ std::cout << "File " << filename_ << " cannot be saved. Wrong permissions?" << std::endl;
std::cout << "File " << filename_ << " cannot be saved. Wrong permissions?" << std::endl; return false;
return false;
}
} }
@ -200,10 +196,7 @@ bool GeoJSON_Printer::print_position(const std::shared_ptr<Pvt_Solution>& positi
} }
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -222,11 +215,7 @@ bool GeoJSON_Printer::close_file()
{ {
if (remove(filename_.c_str()) != 0) LOG(INFO) << "Error deleting temporary file"; if (remove(filename_.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
} }
return true; return true;
} }
else return false;
{
return false;
}
} }

17
src/algorithms/PVT/libs/gpx_printer.cc
View File

@ -149,11 +149,8 @@ bool Gpx_Printer::set_headers(const std::string& filename, bool time_tag_name)
<< indent << indent << "<trkseg>" << std::endl; << indent << indent << "<trkseg>" << std::endl;
return true; return true;
} }
else std::cout << "File " << gpx_filename << " cannot be saved. Wrong permissions?" << std::endl;
{ return false;
std::cout << "File " << gpx_filename << " cannot be saved. Wrong permissions?" << std::endl;
return false;
}
} }
@ -201,10 +198,7 @@ bool Gpx_Printer::print_position(const std::shared_ptr<rtklib_solver>& position,
<< "</gpxtpx:TrackPointExtension></extensions></trkpt>" << std::endl; << "</gpxtpx:TrackPointExtension></extensions></trkpt>" << std::endl;
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -218,10 +212,7 @@ bool Gpx_Printer::close_file()
gpx_file.close(); gpx_file.close();
return true; return true;
} }
else return false;
{
return false;
}
} }

17
src/algorithms/PVT/libs/kml_printer.cc
View File

@ -206,11 +206,8 @@ bool Kml_Printer::set_headers(const std::string& filename, bool time_tag_name)
return true; return true;
} }
else std::cout << "File " << kml_filename << " cannot be saved. Wrong permissions?" << std::endl;
{ return false;
std::cout << "File " << kml_filename << " cannot be saved. Wrong permissions?" << std::endl;
return false;
}
} }
@ -282,10 +279,7 @@ bool Kml_Printer::print_position(const std::shared_ptr<rtklib_solver>& position,
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -319,10 +313,7 @@ bool Kml_Printer::close_file()
return true; return true;
} }
else return false;
{
return false;
}
} }

2
src/algorithms/PVT/libs/rtcm_printer.cc
View File

@ -46,7 +46,7 @@
using google::LogMessage; using google::LogMessage;
Rtcm_Printer::Rtcm_Printer(const std::string& filename, bool flag_rtcm_file_dump, bool flag_rtcm_server, bool flag_rtcm_tty_port, uint16_t rtcm_tcp_port, uint16_t rtcm_station_id, std::string rtcm_dump_devname, bool time_tag_name, const std::string& base_path) Rtcm_Printer::Rtcm_Printer(const std::string& filename, bool flag_rtcm_file_dump, bool flag_rtcm_server, bool flag_rtcm_tty_port, uint16_t rtcm_tcp_port, uint16_t rtcm_station_id, const std::string& rtcm_dump_devname, bool time_tag_name, const std::string& base_path)
{ {
boost::posix_time::ptime pt = boost::posix_time::second_clock::local_time(); boost::posix_time::ptime pt = boost::posix_time::second_clock::local_time();
tm timeinfo = boost::posix_time::to_tm(pt); tm timeinfo = boost::posix_time::to_tm(pt);

2
src/algorithms/PVT/libs/rtcm_printer.h
View File

@ -48,7 +48,7 @@ public:
/*! /*!
* \brief Default constructor. * \brief Default constructor.
*/ */
Rtcm_Printer(const std::string& filename, bool flag_rtcm_file_dump, bool flag_rtcm_server, bool flag_rtcm_tty_port, uint16_t rtcm_tcp_port, uint16_t rtcm_station_id, std::string rtcm_dump_filename, bool time_tag_name = true, const std::string& base_path = "."); Rtcm_Printer(const std::string& filename, bool flag_rtcm_file_dump, bool flag_rtcm_server, bool flag_rtcm_tty_port, uint16_t rtcm_tcp_port, uint16_t rtcm_station_id, const std::string& rtcm_dump_filename, bool time_tag_name = true, const std::string& base_path = ".");
/*! /*!
* \brief Default destructor. * \brief Default destructor.

5
src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
View File

@ -203,10 +203,7 @@ signed int GalileoE1Pcps8msAmbiguousAcquisition::mag()
{ {
return acquisition_cc_->mag(); return acquisition_cc_->mag();
} }
else return 0;
{
return 0;
}
} }

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

@ -334,7 +334,7 @@ gr::basic_block_sptr GalileoE1PcpsAmbiguousAcquisition::get_left_block()
{ {
return acquisition_; return acquisition_;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return acquisition_; return acquisition_;
} }

5
src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
View File

@ -206,10 +206,7 @@ signed int GalileoE1PcpsCccwsrAmbiguousAcquisition::mag()
{ {
return acquisition_cc_->mag(); return acquisition_cc_->mag();
} }
else return 0;
{
return 0;
}
} }

5
src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
View File

@ -237,10 +237,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::mag()
{ {
return acquisition_cc_->mag(); return acquisition_cc_->mag();
} }
else return 0;
{
return 0;
}
} }

5
src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
View File

@ -207,10 +207,7 @@ signed int GalileoE1PcpsTongAmbiguousAcquisition::mag()
{ {
return acquisition_cc_->mag(); return acquisition_cc_->mag();
} }
else return 0;
{
return 0;
}
} }

5
src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
View File

@ -213,10 +213,7 @@ signed int GalileoE5aNoncoherentIQAcquisitionCaf::mag()
{ {
return acquisition_cc_->mag(); return acquisition_cc_->mag();
} }
else return 0;
{
return 0;
}
} }

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

@ -319,7 +319,7 @@ gr::basic_block_sptr GlonassL1CaPcpsAcquisition::get_left_block()
{ {
return acquisition_; return acquisition_;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return acquisition_; return acquisition_;
} }

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

@ -318,7 +318,7 @@ gr::basic_block_sptr GlonassL2CaPcpsAcquisition::get_left_block()
{ {
return acquisition_; return acquisition_;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return acquisition_; return acquisition_;
} }

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

@ -307,7 +307,7 @@ gr::basic_block_sptr GpsL1CaPcpsAcquisition::get_left_block()
{ {
return acquisition_; return acquisition_;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return acquisition_; return acquisition_;
} }

5
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
View File

@ -231,10 +231,7 @@ signed int GpsL1CaPcpsQuickSyncAcquisition::mag()
{ {
return acquisition_cc_->mag(); return acquisition_cc_->mag();
} }
else return 0;
{
return 0;
}
} }

5
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
View File

@ -193,10 +193,7 @@ signed int GpsL1CaPcpsTongAcquisition::mag()
{ {
return acquisition_cc_->mag(); return acquisition_cc_->mag();
} }
else return 0;
{
return 0;
}
} }

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

@ -321,7 +321,7 @@ gr::basic_block_sptr GpsL2MPcpsAcquisition::get_left_block()
{ {
return acquisition_; return acquisition_;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return acquisition_; return acquisition_;
} }

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

@ -309,7 +309,7 @@ gr::basic_block_sptr GpsL5iPcpsAcquisition::get_left_block()
{ {
return acquisition_; return acquisition_;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return acquisition_; return acquisition_;
} }

2
src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc
View File

@ -268,7 +268,7 @@ bool pcps_acquisition::is_fdma()
LOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << d_old_freq << " in Glonass Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl; LOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << d_old_freq << " in Glonass Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl;
return true; return true;
} }
else if (strcmp(d_gnss_synchro->Signal, "2G") == 0) if (strcmp(d_gnss_synchro->Signal, "2G") == 0)
{ {
d_old_freq += DFRQ2_GLO * GLONASS_PRN.at(d_gnss_synchro->PRN); d_old_freq += DFRQ2_GLO * GLONASS_PRN.at(d_gnss_synchro->PRN);
LOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << d_old_freq << " in Glonass Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl; LOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << d_old_freq << " in Glonass Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl;

55
src/algorithms/channel/libs/channel_fsm.cc
View File

@ -81,13 +81,10 @@ bool ChannelFsm::Event_start_acquisition()
{ {
return false; return false;
} }
else d_state = 1;
{ start_acquisition();
d_state = 1; DLOG(INFO) << "CH = " << channel_ << ". Ev start acquisition";
start_acquisition(); return true;
DLOG(INFO) << "CH = " << channel_ << ". Ev start acquisition";
return true;
}
} }
@ -98,13 +95,10 @@ bool ChannelFsm::Event_valid_acquisition()
{ {
return false; return false;
} }
else d_state = 2;
{ start_tracking();
d_state = 2; DLOG(INFO) << "CH = " << channel_ << ". Ev valid acquisition";
start_tracking(); return true;
DLOG(INFO) << "CH = " << channel_ << ". Ev valid acquisition";
return true;
}
} }
@ -115,13 +109,10 @@ bool ChannelFsm::Event_failed_acquisition_repeat()
{ {
return false; return false;
} }
else d_state = 1;
{ start_acquisition();
d_state = 1; DLOG(INFO) << "CH = " << channel_ << ". Ev failed acquisition repeat";
start_acquisition(); return true;
DLOG(INFO) << "CH = " << channel_ << ". Ev failed acquisition repeat";
return true;
}
} }
@ -132,13 +123,10 @@ bool ChannelFsm::Event_failed_acquisition_no_repeat()
{ {
return false; return false;
} }
else d_state = 3;
{ request_satellite();
d_state = 3; DLOG(INFO) << "CH = " << channel_ << ". Ev failed acquisition no repeat";
request_satellite(); return true;
DLOG(INFO) << "CH = " << channel_ << ". Ev failed acquisition no repeat";
return true;
}
} }
@ -149,13 +137,10 @@ bool ChannelFsm::Event_failed_tracking_standby()
{ {
return false; return false;
} }
else d_state = 0U;
{ notify_stop_tracking();
d_state = 0U; DLOG(INFO) << "CH = " << channel_ << ". Ev failed tracking standby";
notify_stop_tracking(); return true;
DLOG(INFO) << "CH = " << channel_ << ". Ev failed tracking standby";
return true;
}
} }

5
src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc
View File

@ -144,8 +144,5 @@ gr::basic_block_sptr IbyteToCbyte::get_right_block()
{ {
return conjugate_ic_; return conjugate_ic_;
} }
else return ibyte_to_cbyte_;
{
return ibyte_to_cbyte_;
}
} }

5
src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc
View File

@ -142,8 +142,5 @@ gr::basic_block_sptr IbyteToComplex::get_right_block()
{ {
return conjugate_cc_; return conjugate_cc_;
} }
else return gr_interleaved_char_to_complex_;
{
return gr_interleaved_char_to_complex_;
}
} }

5
src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc
View File

@ -141,8 +141,5 @@ gr::basic_block_sptr IbyteToCshort::get_right_block()
{ {
return conjugate_sc_; return conjugate_sc_;
} }
else return interleaved_byte_to_complex_short_;
{
return interleaved_byte_to_complex_short_;
}
} }

5
src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc
View File

@ -142,8 +142,5 @@ gr::basic_block_sptr IshortToComplex::get_right_block()
{ {
return conjugate_cc_; return conjugate_cc_;
} }
else return gr_interleaved_short_to_complex_;
{
return gr_interleaved_short_to_complex_;
}
} }

5
src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc
View File

@ -144,8 +144,5 @@ gr::basic_block_sptr IshortToCshort::get_right_block()
{ {
return conjugate_sc_; return conjugate_sc_;
} }
else return interleaved_short_to_complex_short_;
{
return interleaved_short_to_complex_short_;
}
} }

17
src/algorithms/input_filter/adapters/fir_filter.cc
View File

@ -31,7 +31,6 @@
#include "fir_filter.h" #include "fir_filter.h"
#include "configuration_interface.h" #include "configuration_interface.h"
#include <boost/lexical_cast.hpp>
#include <utility> #include <utility>
#include <gnuradio/filter/pm_remez.h> #include <gnuradio/filter/pm_remez.h>
#include <glog/logging.h> #include <glog/logging.h>
@ -284,7 +283,7 @@ gr::basic_block_sptr FirFilter::get_left_block()
{ {
return fir_filter_ccf_; return fir_filter_ccf_;
} }
else if ((taps_item_type_ == "float") && (input_item_type_ == "cshort") && (output_item_type_ == "cshort")) if ((taps_item_type_ == "float") && (input_item_type_ == "cshort") && (output_item_type_ == "cshort"))
{ {
return cshort_to_float_x2_; return cshort_to_float_x2_;
} }
@ -314,7 +313,7 @@ gr::basic_block_sptr FirFilter::get_right_block()
{ {
return fir_filter_ccf_; return fir_filter_ccf_;
} }
else if ((taps_item_type_ == "float") && (input_item_type_ == "cshort") && (output_item_type_ == "cshort")) if ((taps_item_type_ == "float") && (input_item_type_ == "cshort") && (output_item_type_ == "cshort"))
{ {
return short_x2_to_cshort_; return short_x2_to_cshort_;
} }
@ -369,23 +368,23 @@ void FirFilter::init()
double option_value; double option_value;
for (unsigned int i = 0; i < number_of_bands; i++) for (unsigned int i = 0; i < number_of_bands; i++)
{ {
option = ".band" + boost::lexical_cast<std::string>(i + 1) + "_begin"; option = ".band" + std::to_string(i + 1) + "_begin";
option_value = config_->property(role_ + option, default_bands[i]); option_value = config_->property(role_ + option, default_bands[i]);
bands.push_back(option_value); bands.push_back(option_value);
option = ".band" + boost::lexical_cast<std::string>(i + 1) + "_end"; option = ".band" + std::to_string(i + 1) + "_end";
option_value = config_->property(role_ + option, default_bands[i]); option_value = config_->property(role_ + option, default_bands[i]);
bands.push_back(option_value); bands.push_back(option_value);
option = ".ampl" + boost::lexical_cast<std::string>(i + 1) + "_begin"; option = ".ampl" + std::to_string(i + 1) + "_begin";
option_value = config_->property(role_ + option, default_bands[i]); option_value = config_->property(role_ + option, default_bands[i]);
ampl.push_back(option_value); ampl.push_back(option_value);
option = ".ampl" + boost::lexical_cast<std::string>(i + 1) + "_end"; option = ".ampl" + std::to_string(i + 1) + "_end";
option_value = config_->property(role_ + option, default_bands[i]); option_value = config_->property(role_ + option, default_bands[i]);
ampl.push_back(option_value); ampl.push_back(option_value);
option = ".band" + boost::lexical_cast<std::string>(i + 1) + "_error"; option = ".band" + std::to_string(i + 1) + "_error";
option_value = config_->property(role_ + option, default_bands[i]); option_value = config_->property(role_ + option, default_bands[i]);
error_w.push_back(option_value); error_w.push_back(option_value);
} }
@ -399,7 +398,7 @@ void FirFilter::init()
// those bands, and the weight given to the error in those bands. // those bands, and the weight given to the error in those bands.
std::vector<double> taps_d = gr::filter::pm_remez(number_of_taps - 1, bands, ampl, error_w, filter_type, grid_density); std::vector<double> taps_d = gr::filter::pm_remez(number_of_taps - 1, bands, ampl, error_w, filter_type, grid_density);
taps_.reserve(taps_d.size()); taps_.reserve(taps_d.size());
for (double & it : taps_d) for (double& it : taps_d)
{ {
taps_.push_back(float(it)); taps_.push_back(float(it));
} }

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

@ -31,7 +31,6 @@
#include "freq_xlating_fir_filter.h" #include "freq_xlating_fir_filter.h"
#include "configuration_interface.h" #include "configuration_interface.h"
#include <boost/lexical_cast.hpp>
#include <utility> #include <utility>
#include <gnuradio/blocks/file_sink.h> #include <gnuradio/blocks/file_sink.h>
#include <gnuradio/filter/pm_remez.h> #include <gnuradio/filter/pm_remez.h>
@ -84,23 +83,23 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration
for (unsigned int i = 0; i < number_of_bands; i++) for (unsigned int i = 0; i < number_of_bands; i++)
{ {
option = ".band" + boost::lexical_cast<std::string>(i + 1) + "_begin"; option = ".band" + std::to_string(i + 1) + "_begin";
option_value = config_->property(role_ + option, default_bands[i]); option_value = config_->property(role_ + option, default_bands[i]);
bands.push_back(option_value); bands.push_back(option_value);
option = ".band" + boost::lexical_cast<std::string>(i + 1) + "_end"; option = ".band" + std::to_string(i + 1) + "_end";
option_value = config_->property(role_ + option, default_bands[i]); option_value = config_->property(role_ + option, default_bands[i]);
bands.push_back(option_value); bands.push_back(option_value);
option = ".ampl" + boost::lexical_cast<std::string>(i + 1) + "_begin"; option = ".ampl" + std::to_string(i + 1) + "_begin";
option_value = config_->property(role_ + option, default_bands[i]); option_value = config_->property(role_ + option, default_bands[i]);
ampl.push_back(option_value); ampl.push_back(option_value);
option = ".ampl" + boost::lexical_cast<std::string>(i + 1) + "_end"; option = ".ampl" + std::to_string(i + 1) + "_end";
option_value = config_->property(role_ + option, default_bands[i]); option_value = config_->property(role_ + option, default_bands[i]);
ampl.push_back(option_value); ampl.push_back(option_value);
option = ".band" + boost::lexical_cast<std::string>(i + 1) + "_error"; option = ".band" + std::to_string(i + 1) + "_error";
option_value = config_->property(role_ + option, default_bands[i]); option_value = config_->property(role_ + option, default_bands[i]);
error_w.push_back(option_value); error_w.push_back(option_value);
} }
@ -108,7 +107,7 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration
int grid_density = config_->property(role_ + ".grid_density", default_grid_density); int grid_density = config_->property(role_ + ".grid_density", default_grid_density);
taps_d = gr::filter::pm_remez(number_of_taps - 1, bands, ampl, error_w, filter_type, grid_density); taps_d = gr::filter::pm_remez(number_of_taps - 1, bands, ampl, error_w, filter_type, grid_density);
taps_.reserve(taps_d.size()); taps_.reserve(taps_d.size());
for (double & it : taps_d) for (double& it : taps_d)
{ {
taps_.push_back(static_cast<float>(it)); taps_.push_back(static_cast<float>(it));
} }
@ -324,7 +323,7 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_left_block()
{ {
return freq_xlating_fir_filter_ccf_; return freq_xlating_fir_filter_ccf_;
} }
else if ((taps_item_type_ == "float") && (input_item_type_ == "float") && (output_item_type_ == "gr_complex")) if ((taps_item_type_ == "float") && (input_item_type_ == "float") && (output_item_type_ == "gr_complex"))
{ {
return freq_xlating_fir_filter_fcf_; return freq_xlating_fir_filter_fcf_;
} }
@ -358,7 +357,7 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_right_block()
{ {
return freq_xlating_fir_filter_ccf_; return freq_xlating_fir_filter_ccf_;
} }
else if ((taps_item_type_ == "float") && (input_item_type_ == "float") && (output_item_type_ == "gr_complex")) if ((taps_item_type_ == "float") && (input_item_type_ == "float") && (output_item_type_ == "gr_complex"))
{ {
return freq_xlating_fir_filter_fcf_; return freq_xlating_fir_filter_fcf_;
} }

14
src/algorithms/input_filter/adapters/pulse_blanking_filter.cc
View File

@ -158,15 +158,12 @@ gr::basic_block_sptr PulseBlankingFilter::get_left_block()
{ {
return freq_xlating_; return freq_xlating_;
} }
else return pulse_blanking_cc_;
{
return pulse_blanking_cc_;
}
} }
else else
{ {
return nullptr;
LOG(ERROR) << " Unknown input filter input/output item type conversion"; LOG(ERROR) << " Unknown input filter input/output item type conversion";
return nullptr;
} }
} }
@ -177,9 +174,6 @@ gr::basic_block_sptr PulseBlankingFilter::get_right_block()
{ {
return pulse_blanking_cc_; return pulse_blanking_cc_;
} }
else LOG(ERROR) << " Unknown input filter input/output item type conversion";
{ return nullptr;
return nullptr;
LOG(ERROR) << " Unknown input filter input/output item type conversion";
}
} }

8
src/algorithms/libs/gnss_sdr_create_directory.cc
View File

@ -79,9 +79,7 @@ bool gnss_sdr_create_directory(const std::string& foldername)
} }
return true; return true;
} }
else
{ os_test_file.close();
os_test_file.close(); return false;
return false;
}
} }

15
src/algorithms/libs/gnss_sdr_valve.cc
View File

@ -90,11 +90,8 @@ int gnss_sdr_valve::work(int noutput_items,
{ {
return -1; // Done! return -1; // Done!
} }
else usleep(1000000);
{ return 0; // do not produce or consume
usleep(1000000);
return 0; // do not produce or consume
}
} }
unsigned long long n = std::min(d_nitems - d_ncopied_items, static_cast<long long unsigned int>(noutput_items)); unsigned long long n = std::min(d_nitems - d_ncopied_items, static_cast<long long unsigned int>(noutput_items));
if (n == 0) return 0; if (n == 0) return 0;
@ -102,9 +99,7 @@ int gnss_sdr_valve::work(int noutput_items,
d_ncopied_items += n; d_ncopied_items += n;
return n; return n;
} }
else
{ memcpy(output_items[0], input_items[0], noutput_items * input_signature()->sizeof_stream_item(0));
memcpy(output_items[0], input_items[0], noutput_items * input_signature()->sizeof_stream_item(0)); return noutput_items;
return noutput_items;
}
} }

18
src/algorithms/libs/gps_l5_signal.cc
View File

@ -44,12 +44,9 @@ std::deque<bool> l5i_xa_shift(std::deque<bool> xa)
{ {
return std::deque<bool>{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}; return std::deque<bool>{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
} }
else std::deque<bool> out(xa.begin(), xa.end() - 1);
{ out.push_front(xa[12] xor xa[11] xor xa[9] xor xa[8]);
std::deque<bool> out(xa.begin(), xa.end() - 1); return out;
out.push_front(xa[12] xor xa[11] xor xa[9] xor xa[8]);
return out;
}
} }
@ -59,12 +56,9 @@ std::deque<bool> l5q_xa_shift(std::deque<bool> xa)
{ {
return std::deque<bool>{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}; return std::deque<bool>{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
} }
else std::deque<bool> out(xa.begin(), xa.end() - 1);
{ out.push_front(xa[12] xor xa[11] xor xa[9] xor xa[8]);
std::deque<bool> out(xa.begin(), xa.end() - 1); return out;
out.push_front(xa[12] xor xa[11] xor xa[9] xor xa[8]);
return out;
}
} }

4
src/algorithms/libs/pass_through.cc
View File

@ -149,7 +149,7 @@ gr::basic_block_sptr Pass_Through::get_left_block()
{ {
return conjugate_cc_; return conjugate_cc_;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return conjugate_sc_; return conjugate_sc_;
} }
@ -176,7 +176,7 @@ gr::basic_block_sptr Pass_Through::get_right_block()
{ {
return conjugate_cc_; return conjugate_cc_;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return conjugate_sc_; return conjugate_sc_;
} }

19
src/algorithms/libs/rtklib/rtklib_ionex.cc
View File

@ -400,18 +400,17 @@ void readtec(const char *file, nav_t *nav, int opt)
trace(2, "ionex file open error %s\n", efiles[i]); trace(2, "ionex file open error %s\n", efiles[i]);
continue; continue;
} }
else
/* read ionex header */
if (readionexh(fp, lats, lons, hgts, &rb, &nexp, dcb, rms) <= 0.0)
{ {
/* read ionex header */ trace(2, "ionex file format error %s\n", efiles[i]);
if (readionexh(fp, lats, lons, hgts, &rb, &nexp, dcb, rms) <= 0.0) fclose(fp);
{ continue;
trace(2, "ionex file format error %s\n", efiles[i]);
fclose(fp);
continue;
}
/* read ionex body */
readionexb(fp, lats, lons, hgts, rb, nexp, nav);
} }
/* read ionex body */
readionexb(fp, lats, lons, hgts, rb, nexp, nav);
fclose(fp); fclose(fp);
} }
for (i = 0; i < MAXEXFILE; i++) free(efiles[i]); for (i = 0; i < MAXEXFILE; i++) free(efiles[i]);

12
src/algorithms/libs/rtklib/rtklib_lambda.cc
View File

@ -197,13 +197,11 @@ int search(int n, int m, const double *L, const double *D,
{ {
if (k == n - 1) if (k == n - 1)
break; break;
else
{ k++;
k++; z[k] += step[k];
z[k] += step[k]; y = zb[k] - z[k];
y = zb[k] - z[k]; step[k] = -step[k] - SGN_LAMBDA(step[k]);
step[k] = -step[k] - SGN_LAMBDA(step[k]);
}
} }
} }
for (i = 0; i < m - 1; i++) for (i = 0; i < m - 1; i++)

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

@ -243,7 +243,7 @@ double prange(const obsd_t *obs, const nav_t *nav, const double *azel,
return 0.0; return 0.0;
} }
else if (obs->code[i] != CODE_NONE and obs->code[j] == CODE_NONE) if (obs->code[i] != CODE_NONE and obs->code[j] == CODE_NONE)
{ {
P1 += P1_C1; /* C1->P1 */ P1 += P1_C1; /* C1->P1 */
PC = P1 - P1_P2; PC = P1 - P1_P2;

4
src/algorithms/libs/rtklib/rtklib_rtcm.cc
View File

@ -194,8 +194,8 @@ int input_rtcm2(rtcm_t *rtcm, unsigned char data)
} }
if (++rtcm->nbit < 30) if (++rtcm->nbit < 30)
continue; continue;
else
rtcm->nbit = 0; rtcm->nbit = 0;
/* check parity */ /* check parity */
if (!decode_word(rtcm->word, rtcm->buff + rtcm->nbyte)) if (!decode_word(rtcm->word, rtcm->buff + rtcm->nbyte))

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

@ -1775,11 +1775,9 @@ unsigned int tickget(void)
{ {
return tp.tv_sec * 1000u + tp.tv_nsec / 1000000u; return tp.tv_sec * 1000u + tp.tv_nsec / 1000000u;
} }
else gettimeofday(&tv, nullptr);
{ return tv.tv_sec * 1000u + tv.tv_usec / 1000u;
gettimeofday(&tv, nullptr);
return tv.tv_sec * 1000u + tv.tv_usec / 1000u;
}
#else #else
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
return tv.tv_sec * 1000u + tv.tv_usec / 1000u; return tv.tv_sec * 1000u + tv.tv_usec / 1000u;
@ -3175,7 +3173,7 @@ void freenav(nav_t *nav, int opt)
/* debug trace functions -----------------------------------------------------*/ /* debug trace functions -----------------------------------------------------*/
//#ifdef TRACE //#ifdef TRACE
// //
FILE *fp_trace = nullptr; /* file pointer of trace */ FILE *fp_trace = nullptr; /* file pointer of trace */
char file_trace[1024]; /* trace file */ char file_trace[1024]; /* trace file */
static int level_trace = 0; /* level of trace */ static int level_trace = 0; /* level of trace */
unsigned int tick_trace = 0; /* tick time at traceopen (ms) */ unsigned int tick_trace = 0; /* tick time at traceopen (ms) */
@ -3635,7 +3633,7 @@ double satwavelen(int sat, int frq, const nav_t *nav)
{ {
if (frq == 0) if (frq == 0)
return SPEED_OF_LIGHT / FREQ1_BDS; /* B1 */ return SPEED_OF_LIGHT / FREQ1_BDS; /* B1 */
else if (frq == 1) if (frq == 1)
return SPEED_OF_LIGHT / FREQ2_BDS; /* B2 */ return SPEED_OF_LIGHT / FREQ2_BDS; /* B2 */
else if (frq == 2) else if (frq == 2)
return SPEED_OF_LIGHT / FREQ3_BDS; /* B3 */ return SPEED_OF_LIGHT / FREQ3_BDS; /* B3 */
@ -3644,7 +3642,7 @@ double satwavelen(int sat, int frq, const nav_t *nav)
{ {
if (frq == 0) if (frq == 0)
return SPEED_OF_LIGHT / FREQ1; /* L1/E1 */ return SPEED_OF_LIGHT / FREQ1; /* L1/E1 */
else if (frq == 1) if (frq == 1)
return SPEED_OF_LIGHT / FREQ2; /* L2 */ return SPEED_OF_LIGHT / FREQ2; /* L2 */
else if (frq == 2) else if (frq == 2)
return SPEED_OF_LIGHT / FREQ5; /* L5/E5a */ return SPEED_OF_LIGHT / FREQ5; /* L5/E5a */
@ -3886,7 +3884,7 @@ double interpc(const double coef[], double lat)
int i = (int)(lat / 15.0); int i = (int)(lat / 15.0);
if (i < 1) if (i < 1)
return coef[0]; return coef[0];
else if (i > 4) if (i > 4)
return coef[4]; return coef[4];
return coef[i - 1] * (1.0 - lat / 15.0 + i) + coef[i] * (lat / 15.0 - i); return coef[i - 1] * (1.0 - lat / 15.0 + i) + coef[i] * (lat / 15.0 - i);
} }
@ -3999,7 +3997,7 @@ double interpvar(double ang, const double *var)
int i = (int)a; int i = (int)a;
if (i < 0) if (i < 0)
return var[0]; return var[0];
else if (i >= 18) if (i >= 18)
return var[18]; return var[18];
return var[i] * (1.0 - a + i) + var[i + 1] * (a - i); return var[i] * (1.0 - a + i) + var[i + 1] * (a - i);
} }

5
src/algorithms/libs/rtklib/rtklib_rtkpos.cc
View File

@ -67,7 +67,7 @@ static int resamb_TCAR(rtk_t *rtk __attribute((unused)), const obsd_t *obs __att
/* global variables ----------------------------------------------------------*/ /* global variables ----------------------------------------------------------*/
static int statlevel = 0; /* rtk status output level (0:off) */ static int statlevel = 0; /* rtk status output level (0:off) */
static FILE *fp_stat = nullptr; /* rtk status file pointer */ static FILE *fp_stat = nullptr; /* rtk status file pointer */
static char file_stat[1024] = ""; /* rtk status file original path */ static char file_stat[1024] = ""; /* rtk status file original path */
static gtime_t time_stat = {0, 0}; /* rtk status file time */ static gtime_t time_stat = {0, 0}; /* rtk status file time */
@ -1616,8 +1616,7 @@ int ddmat(rtk_t *rtk, double *D)
rtk->ssat[i - k].fix[f] = 2; /* fix */ rtk->ssat[i - k].fix[f] = 2; /* fix */
break; break;
} }
else rtk->ssat[i - k].fix[f] = 1;
rtk->ssat[i - k].fix[f] = 1;
} }
for (j = k; j < k + MAXSAT; j++) for (j = k; j < k + MAXSAT; j++)
{ {

4
src/algorithms/libs/rtklib/rtklib_solution.cc
View File

@ -79,7 +79,7 @@ const char *opt2sep(const solopt_t *opt)
{ {
if (!*opt->sep) if (!*opt->sep)
return " "; return " ";
else if (!strcmp(opt->sep, "\\t")) if (!strcmp(opt->sep, "\\t"))
return "\t"; return "\t";
return opt->sep; return opt->sep;
} }
@ -343,7 +343,7 @@ int decode_nmea(char *buff, sol_t *sol)
{ {
return decode_nmearmc(val + 1, n - 1, sol); return decode_nmearmc(val + 1, n - 1, sol);
} }
else if (!strcmp(val[0], "$GPGGA")) if (!strcmp(val[0], "$GPGGA"))
{ {
return decode_nmeagga(val + 1, n - 1, sol); return decode_nmeagga(val + 1, n - 1, sol);
} }

6
src/algorithms/libs/rtklib/rtklib_stream.cc
View File

@ -1227,7 +1227,7 @@ int rspntrip_s(ntrip_t *ntrip, char *msg)
tracet(2, "rspntrip_s: response ok nb=%d\n", ntrip->nb); tracet(2, "rspntrip_s: response ok nb=%d\n", ntrip->nb);
return 1; return 1;
} }
else if ((p = strstr((char *)ntrip->buff, NTRIP_RSP_ERROR))) if ((p = strstr((char *)ntrip->buff, NTRIP_RSP_ERROR)))
{ /* error */ { /* error */
nb = ntrip->nb < MAXSTATMSG ? ntrip->nb : MAXSTATMSG; nb = ntrip->nb < MAXSTATMSG ? ntrip->nb : MAXSTATMSG;
// strncpy(msg, (char *)ntrip->buff, nb); This line triggers a warning. Replaced by; // strncpy(msg, (char *)ntrip->buff, nb); This line triggers a warning. Replaced by;
@ -2362,7 +2362,7 @@ void strsendcmd(stream_t *str, const char *cmd)
} }
if (*q == '\0') if (*q == '\0')
break; break;
else
p = q + 1; p = q + 1;
} }
} }

10
src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
View File

@ -409,10 +409,7 @@ bool hybrid_observables_cc::interp_trk_obs(Gnss_Synchro &interpolated_obs, const
// << " ,diff: " << old_abs_diff << " samples (" << static_cast<double>(old_abs_diff) / static_cast<double>(d_gnss_synchro_history->at(ch, nearest_element).fs) << " s)\n"; // << " ,diff: " << old_abs_diff << " samples (" << static_cast<double>(old_abs_diff) / static_cast<double>(d_gnss_synchro_history->at(ch, nearest_element).fs) << " s)\n";
return true; return true;
} }
else return false;
{
return false;
}
} }
else else
{ {
@ -616,8 +613,5 @@ int hybrid_observables_cc::general_work(int noutput_items __attribute__((unused)
} }
return 1; return 1;
} }
else return 0;
{
return 0;
}
} }

2
src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
View File

@ -105,7 +105,7 @@ void signal_generator_c::init()
{ {
start_phase_rad_.push_back(0); start_phase_rad_.push_back(0);
current_data_bit_int_.push_back(1); current_data_bit_int_.push_back(1);
current_data_bits_.push_back(gr_complex(1, 0)); current_data_bits_.emplace_back(1, 0);
ms_counter_.push_back(0); ms_counter_.push_back(0);
data_modulation_.push_back((Galileo_E5a_I_SECONDARY_CODE.at(0) == '0' ? 1 : -1)); data_modulation_.push_back((Galileo_E5a_I_SECONDARY_CODE.at(0) == '0' ? 1 : -1));
pilot_modulation_.push_back((Galileo_E5a_Q_SECONDARY_CODE[PRN_[sat]].at(0) == '0' ? 1 : -1)); pilot_modulation_.push_back((Galileo_E5a_Q_SECONDARY_CODE[PRN_[sat]].at(0) == '0' ? 1 : -1));

12
src/algorithms/signal_source/adapters/file_signal_source.cc
View File

@ -370,15 +370,9 @@ gr::basic_block_sptr FileSignalSource::get_right_block()
{ {
return valve_; return valve_;
} }
else if (enable_throttle_control_ == true)
{ {
if (enable_throttle_control_ == true) return throttle_;
{
return throttle_;
}
else
{
return file_source_;
}
} }
return file_source_;
} }

12
src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
View File

@ -309,15 +309,9 @@ gr::basic_block_sptr NsrFileSignalSource::get_right_block()
{ {
return valve_; return valve_;
} }
else if (enable_throttle_control_ == true)
{ {
if (enable_throttle_control_ == true) return throttle_;
{
return throttle_;
}
else
{
return unpack_byte_;
}
} }
return unpack_byte_;
} }

12
src/algorithms/signal_source/adapters/spir_file_signal_source.cc
View File

@ -308,15 +308,9 @@ gr::basic_block_sptr SpirFileSignalSource::get_right_block()
{ {
return valve_; return valve_;
} }
else if (enable_throttle_control_ == true)
{ {
if (enable_throttle_control_ == true) return throttle_;
{
return throttle_;
}
else
{
return unpack_intspir_;
}
} }
return unpack_intspir_;
} }

12
src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc
View File

@ -318,15 +318,9 @@ gr::basic_block_sptr TwoBitCpxFileSignalSource::get_right_block()
{ {
return valve_; return valve_;
} }
else if (enable_throttle_control_ == true)
{ {
if (enable_throttle_control_ == true) return throttle_;
{
return throttle_;
}
else
{
return unpack_byte_;
}
} }
return unpack_byte_;
} }

17
src/algorithms/signal_source/adapters/uhd_signal_source.cc
View File

@ -92,14 +92,14 @@ UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration,
for (int i = 0; i < RF_channels_; i++) for (int i = 0; i < RF_channels_; i++)
{ {
// Single RF channel UHD operation (backward compatible config file format) // Single RF channel UHD operation (backward compatible config file format)
samples_.push_back(configuration->property(role + ".samples" + boost::lexical_cast<std::string>(i), 0)); samples_.push_back(configuration->property(role + ".samples" + std::to_string(i), 0));
dump_.push_back(configuration->property(role + ".dump" + boost::lexical_cast<std::string>(i), false)); dump_.push_back(configuration->property(role + ".dump" + std::to_string(i), false));
dump_filename_.push_back(configuration->property(role + ".dump_filename" + boost::lexical_cast<std::string>(i), default_dump_file)); dump_filename_.push_back(configuration->property(role + ".dump_filename" + std::to_string(i), default_dump_file));
freq_.push_back(configuration->property(role + ".freq" + boost::lexical_cast<std::string>(i), GPS_L1_FREQ_HZ)); freq_.push_back(configuration->property(role + ".freq" + std::to_string(i), GPS_L1_FREQ_HZ));
gain_.push_back(configuration->property(role + ".gain" + boost::lexical_cast<std::string>(i), 50.0)); gain_.push_back(configuration->property(role + ".gain" + std::to_string(i), 50.0));
IF_bandwidth_hz_.push_back(configuration->property(role + ".IF_bandwidth_hz" + boost::lexical_cast<std::string>(i), sample_rate_ / 2)); IF_bandwidth_hz_.push_back(configuration->property(role + ".IF_bandwidth_hz" + std::to_string(i), sample_rate_ / 2));
} }
} }
// 1. Make the uhd driver instance // 1. Make the uhd driver instance
@ -314,8 +314,5 @@ gr::basic_block_sptr UhdSignalSource::get_right_block(int RF_channel)
{ {
return valve_.at(RF_channel); return valve_.at(RF_channel);
} }
else return uhd_source_;
{
return uhd_source_;
}
} }

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

@ -300,7 +300,7 @@ int labsat23_source::general_work(int noutput_items,
return -1; return -1;
} }
//check if the selected channel in config file match the file encoding // check if the selected channel in config file match the file encoding
if (d_channel_selector_config == 2 and d_channel_selector != 0) if (d_channel_selector_config == 2 and d_channel_selector != 0)
{ {
std::cout << "Labsat source channel config inconsistency: channel 2 is selected but the file has only one channel" << std::endl; std::cout << "Labsat source channel config inconsistency: channel 2 is selected but the file has only one channel" << std::endl;
@ -359,18 +359,15 @@ int labsat23_source::general_work(int noutput_items,
std::cout << "Unknown channel B constellation ID " << static_cast<int>(channel_b_constellation) << std::endl; std::cout << "Unknown channel B constellation ID " << static_cast<int>(channel_b_constellation) << std::endl;
} }
//end of header // end of header
d_header_parsed = true; d_header_parsed = true;
//seek file to the first signal sample // seek file to the first signal sample
binary_input_file->clear(); binary_input_file->clear();
binary_input_file->seekg(header_bytes, binary_input_file->beg); binary_input_file->seekg(header_bytes, binary_input_file->beg);
return 0; return 0;
} }
else std::cout << "Labsat file header error: section 2 is not available." << std::endl;
{ return -1;
std::cout << "Labsat file header error: section 2 is not available." << std::endl;
return -1;
}
} }
else else
{ {
@ -380,7 +377,7 @@ int labsat23_source::general_work(int noutput_items,
} }
else else
{ {
//ready to start reading samples // ready to start reading samples
switch (d_bits_per_sample) switch (d_bits_per_sample)
{ {
case 2: case 2:
@ -391,7 +388,7 @@ int labsat23_source::general_work(int noutput_items,
// dual channel 2 bits per complex sample // dual channel 2 bits per complex sample
break; break;
default: default:
//single channel 2 bits per complex sample (1 bit I + 1 bit Q, 8 samples per int16) // single channel 2 bits per complex sample (1 bit I + 1 bit Q, 8 samples per int16)
int n_int16_to_read = noutput_items / 8; int n_int16_to_read = noutput_items / 8;
if (n_int16_to_read > 0) if (n_int16_to_read > 0)
{ {
@ -408,23 +405,21 @@ int labsat23_source::general_work(int noutput_items,
} }
return output_pointer; return output_pointer;
} }
// trigger the read of the next file in the sequence
std::cout << "End of current file, reading the next Labsat file in sequence: " << generate_filename() << std::endl;
d_current_file_number++;
binary_input_file->close();
binary_input_file->open(generate_filename().c_str(), std::ios::in | std::ios::binary);
if (binary_input_file->is_open())
{
std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl;
}
else else
{ {
//trigger the read of the next file in the sequence std::cout << "Last file reached, LabSat source stop" << std::endl;
std::cout << "End of current file, reading the next Labsat file in sequence: " << generate_filename() << std::endl; return -1;
d_current_file_number++;
binary_input_file->close();
binary_input_file->open(generate_filename().c_str(), std::ios::in | std::ios::binary);
if (binary_input_file->is_open())
{
std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl;
}
else
{
std::cout << "Last file reached, LabSat source stop" << std::endl;
return -1;
}
} }
} }
else else
@ -442,7 +437,7 @@ int labsat23_source::general_work(int noutput_items,
// dual channel // dual channel
break; break;
default: default:
//single channel 4 bits per complex sample (2 bit I + 2 bit Q, 4 samples per int16) // single channel 4 bits per complex sample (2 bit I + 2 bit Q, 4 samples per int16)
int n_int16_to_read = noutput_items / 4; int n_int16_to_read = noutput_items / 4;
if (n_int16_to_read > 0) if (n_int16_to_read > 0)
{ {
@ -459,23 +454,21 @@ int labsat23_source::general_work(int noutput_items,
} }
return output_pointer; return output_pointer;
} }
// trigger the read of the next file in the sequence
std::cout << "End of current file, reading the next Labsat file in sequence: " << generate_filename() << std::endl;
d_current_file_number++;
binary_input_file->close();
binary_input_file->open(generate_filename().c_str(), std::ios::in | std::ios::binary);
if (binary_input_file->is_open())
{
std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl;
}
else else
{ {
//trigger the read of the next file in the sequence std::cout << "Last file reached, LabSat source stop" << std::endl;
std::cout << "End of current file, reading the next Labsat file in sequence: " << generate_filename() << std::endl; return -1;
d_current_file_number++;
binary_input_file->close();
binary_input_file->open(generate_filename().c_str(), std::ios::in | std::ios::binary);
if (binary_input_file->is_open())
{
std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl;
}
else
{
std::cout << "Last file reached, LabSat source stop" << std::endl;
return -1;
}
} }
} }
else else

4
src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc
View File

@ -66,8 +66,8 @@ bool systemBytesAreBigEndian()
b.byte = static_cast<int8_t>(0x01); b.byte = static_cast<int8_t>(0x01);
if (*(char *)&b.byte == 1) if (*(char *)&b.byte == 1)
return false; return false;
else
return true; return true;
} }

32
src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
View File

@ -126,28 +126,26 @@ double rtl_tcp_dongle_info::clip_gain(int gain) const
// no defined gains to clip to // no defined gains to clip to
return gain; return gain;
} }
else
{
double last_stop = gains.front();
BOOST_FOREACH (double g, gains)
{
g /= 10.0;
if (gain < g) double last_stop = gains.front();
BOOST_FOREACH (double g, gains)
{
g /= 10.0;
if (gain < g)
{
if (std::abs(gain - g) < std::abs(gain - last_stop))
{ {
if (std::abs(gain - g) < std::abs(gain - last_stop)) return g;
{ }
return g; else
} {
else return last_stop;
{
return last_stop;
}
} }
last_stop = g;
} }
return last_stop; last_stop = g;
} }
return last_stop;
} }

7
src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc
View File

@ -439,7 +439,7 @@ void galileo_telemetry_decoder_cc::set_channel(int32_t channel)
try try
{ {
d_dump_filename = "telemetry"; d_dump_filename = "telemetry";
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
@ -780,8 +780,5 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
*out[0] = current_symbol; *out[0] = current_symbol;
return 1; return 1;
} }
else return 0;
{
return 0;
}
} }

2
src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.cc
View File

@ -244,7 +244,7 @@ void glonass_l1_ca_telemetry_decoder_cc::set_channel(int32_t channel)
try try
{ {
d_dump_filename = "telemetry"; d_dump_filename = "telemetry";
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);

2
src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.cc
View File

@ -244,7 +244,7 @@ void glonass_l2_ca_telemetry_decoder_cc::set_channel(int32_t channel)
try try
{ {
d_dump_filename = "telemetry"; d_dump_filename = "telemetry";
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);

17
src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
View File

@ -136,9 +136,11 @@ bool gps_l1_ca_telemetry_decoder_cc::gps_word_parityCheck(uint32_t gpsword)
parity = t ^ _rotl(t, 6) ^ _rotl(t, 12) ^ _rotl(t, 18) ^ _rotl(t, 24); parity = t ^ _rotl(t, 6) ^ _rotl(t, 12) ^ _rotl(t, 18) ^ _rotl(t, 24);
parity = parity & 0x3F; parity = parity & 0x3F;
if (parity == (gpsword & 0x3F)) if (parity == (gpsword & 0x3F))
return (true); {
else return (true);
return (false); }
return (false);
} }
@ -165,7 +167,7 @@ void gps_l1_ca_telemetry_decoder_cc::set_channel(int32_t channel)
try try
{ {
d_dump_filename = "telemetry"; d_dump_filename = "telemetry";
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
@ -474,8 +476,7 @@ int gps_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribute__
return 1; return 1;
} }
else
{
return 0; return 0;
}
} }

2
src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc
View File

@ -109,7 +109,7 @@ void gps_l2c_telemetry_decoder_cc::set_channel(int channel)
try try
{ {
d_dump_filename = "telemetry_L2CM_"; d_dump_filename = "telemetry_L2CM_";
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);

7
src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
View File

@ -121,7 +121,7 @@ void gps_l5_telemetry_decoder_cc::set_channel(int32_t channel)
try try
{ {
d_dump_filename = "telemetry_L5_"; d_dump_filename = "telemetry_L5_";
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
@ -282,8 +282,5 @@ int gps_l5_telemetry_decoder_cc::general_work(int noutput_items __attribute__((u
out[0] = current_synchro_data; out[0] = current_synchro_data;
return 1; return 1;
} }
else return 0;
{
return 0;
}
} }

4
src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
View File

@ -302,7 +302,7 @@ void sbas_l1_telemetry_decoder_cc::frame_detector::get_frame_candidates(const st
for (int & candidate_bit_it : candidate) for (int & candidate_bit_it : candidate)
candidate_bit_it = candidate_bit_it == 0 ? 1 : 0; candidate_bit_it = candidate_bit_it == 0 ? 1 : 0;
} }
msg_candidates.push_back(std::pair<int32_t, std::vector<int32_t>>(relative_preamble_start, candidate)); msg_candidates.emplace_back(relative_preamble_start, candidate);
ss.str(""); ss.str("");
ss << "preamble " << preample_it - preambles.begin() << (inv_preamble_detected ? " inverted" : " normal") << " detected! candidate="; ss << "preamble " << preample_it - preambles.begin() << (inv_preamble_detected ? " inverted" : " normal") << " detected! candidate=";
for (auto bit_it = candidate.begin(); bit_it < candidate.end(); ++bit_it) for (auto bit_it = candidate.begin(); bit_it < candidate.end(); ++bit_it)
@ -344,7 +344,7 @@ void sbas_l1_telemetry_decoder_cc::crc_verifier::get_valid_frames(const std::vec
// the final remainder must be zero for a valid message, because the CRC is done over the received CRC value // the final remainder must be zero for a valid message, because the CRC is done over the received CRC value
if (crc == 0) if (crc == 0)
{ {
valid_msgs.push_back(msg_candiate_char_t(candidate_it->first, candidate_bytes)); valid_msgs.emplace_back(candidate_it->first, candidate_bytes);
ss << "Valid message found!"; ss << "Valid message found!";
} }
else else

19
src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc
View File

@ -559,12 +559,9 @@ int Viterbi_Decoder::Prev::get_anchestor_state_of_current_state(int current_stat
{ {
return state[current_state]; return state[current_state];
} }
else //std::cout<<"alarm "<<"num_states="<<num_states<<" current_state="<<current_state<<std::endl;
{ //return state[current_state];
//std::cout<<"alarm "<<"num_states="<<num_states<<" current_state="<<current_state<<std::endl; return 0;
//return state[current_state];
return 0;
}
} }
@ -575,10 +572,7 @@ int Viterbi_Decoder::Prev::get_bit_of_current_state(int current_state)
{ {
return bit[current_state]; return bit[current_state];
} }
else return 0;
{
return 0;
}
} }
@ -588,10 +582,7 @@ float Viterbi_Decoder::Prev::get_metric_of_current_state(int current_state)
{ {
return metric[current_state]; return metric[current_state];
} }
else return 0;
{
return 0;
}
} }

4
src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
View File

@ -220,7 +220,7 @@ gr::basic_block_sptr GlonassL1CaDllPllCAidTracking::get_left_block()
{ {
return tracking_cc; return tracking_cc;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return tracking_sc; return tracking_sc;
} }
@ -238,7 +238,7 @@ gr::basic_block_sptr GlonassL1CaDllPllCAidTracking::get_right_block()
{ {
return tracking_cc; return tracking_cc;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return tracking_sc; return tracking_sc;
} }

4
src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc
View File

@ -218,7 +218,7 @@ gr::basic_block_sptr GlonassL2CaDllPllCAidTracking::get_left_block()
{ {
return tracking_cc; return tracking_cc;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return tracking_sc; return tracking_sc;
} }
@ -236,7 +236,7 @@ gr::basic_block_sptr GlonassL2CaDllPllCAidTracking::get_right_block()
{ {
return tracking_cc; return tracking_cc;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return tracking_sc; return tracking_sc;
} }

4
src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
View File

@ -214,7 +214,7 @@ gr::basic_block_sptr GpsL1CaDllPllCAidTracking::get_left_block()
{ {
return tracking_cc; return tracking_cc;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return tracking_sc; return tracking_sc;
} }
@ -231,7 +231,7 @@ gr::basic_block_sptr GpsL1CaDllPllCAidTracking::get_right_block()
{ {
return tracking_cc; return tracking_cc;
} }
else if (item_type_ == "cshort") if (item_type_ == "cshort")
{ {
return tracking_sc; return tracking_sc;
} }

53
src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
View File

@ -653,17 +653,14 @@ bool dll_pll_veml_tracking::acquire_secondary()
{ {
return true; return true;
} }
else
{ return false;
return false;
}
} }
bool dll_pll_veml_tracking::cn0_and_tracking_lock_status(double coh_integration_time_s) bool dll_pll_veml_tracking::cn0_and_tracking_lock_status(double coh_integration_time_s)
{ {
// ####### CN0 ESTIMATION AND LOCK DETECTORS ###### // ####### CN0 ESTIMATION AND LOCK DETECTORS ######
if (d_cn0_estimation_counter < trk_parameters.cn0_samples) if (d_cn0_estimation_counter < trk_parameters.cn0_samples)
{ {
// fill buffer with prompt correlator output values // fill buffer with prompt correlator output values
@ -671,35 +668,29 @@ bool dll_pll_veml_tracking::cn0_and_tracking_lock_status(double coh_integration_
d_cn0_estimation_counter++; d_cn0_estimation_counter++;
return true; return true;
} }
d_cn0_estimation_counter = 0;
// Code lock indicator
d_CN0_SNV_dB_Hz = cn0_svn_estimator(d_Prompt_buffer, trk_parameters.cn0_samples, coh_integration_time_s);
// Carrier lock indicator
d_carrier_lock_test = carrier_lock_detector(d_Prompt_buffer, trk_parameters.cn0_samples);
// Loss of lock detection
if (d_carrier_lock_test < d_carrier_lock_threshold or d_CN0_SNV_dB_Hz < trk_parameters.cn0_min)
{
d_carrier_lock_fail_counter++;
}
else else
{ {
d_cn0_estimation_counter = 0; if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
// Code lock indicator
d_CN0_SNV_dB_Hz = cn0_svn_estimator(d_Prompt_buffer, trk_parameters.cn0_samples, coh_integration_time_s);
// Carrier lock indicator
d_carrier_lock_test = carrier_lock_detector(d_Prompt_buffer, trk_parameters.cn0_samples);
// Loss of lock detection
if (d_carrier_lock_test < d_carrier_lock_threshold or d_CN0_SNV_dB_Hz < trk_parameters.cn0_min)
{
d_carrier_lock_fail_counter++;
}
else
{
if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
}
if (d_carrier_lock_fail_counter > trk_parameters.max_lock_fail)
{
std::cout << "Loss of lock in channel " << d_channel << "!" << std::endl;
LOG(INFO) << "Loss of lock in channel " << d_channel << "!";
this->message_port_pub(pmt::mp("events"), pmt::from_long(3)); // 3 -> loss of lock
d_carrier_lock_fail_counter = 0;
return false;
}
else
{
return true;
}
} }
if (d_carrier_lock_fail_counter > trk_parameters.max_lock_fail)
{
std::cout << "Loss of lock in channel " << d_channel << "!" << std::endl;
LOG(INFO) << "Loss of lock in channel " << d_channel << "!";
this->message_port_pub(pmt::mp("events"), pmt::from_long(3)); // 3 -> loss of lock
d_carrier_lock_fail_counter = 0;
return false;
}
return true;
} }

10
src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
View File

@ -64,7 +64,7 @@ galileo_e1_tcp_connector_tracking_cc_sptr galileo_e1_tcp_connector_make_tracking
int64_t fs_in, int64_t fs_in,
uint32_t vector_length, uint32_t vector_length,
bool dump, bool dump,
const std::string& dump_filename, const std::string &dump_filename,
float pll_bw_hz, float pll_bw_hz,
float dll_bw_hz, float dll_bw_hz,
float early_late_space_chips, float early_late_space_chips,
@ -90,7 +90,7 @@ Galileo_E1_Tcp_Connector_Tracking_cc::Galileo_E1_Tcp_Connector_Tracking_cc(
int64_t fs_in, int64_t fs_in,
uint32_t vector_length, uint32_t vector_length,
bool dump, bool dump,
std::string dump_filename, const std::string& dump_filename,
float pll_bw_hz __attribute__((unused)), float pll_bw_hz __attribute__((unused)),
float dll_bw_hz __attribute__((unused)), float dll_bw_hz __attribute__((unused)),
float early_late_space_chips, float early_late_space_chips,
@ -544,8 +544,6 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
{ {
return 1; return 1;
} }
else
{ return 0;
return 0;
}
} }

2
src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
View File

@ -97,7 +97,7 @@ private:
Galileo_E1_Tcp_Connector_Tracking_cc( Galileo_E1_Tcp_Connector_Tracking_cc(
int64_t fs_in, uint32_t vector_length, int64_t fs_in, uint32_t vector_length,
bool dump, bool dump,
std::string dump_filename, const std::string& dump_filename,
float pll_bw_hz, float pll_bw_hz,
float dll_bw_hz, float dll_bw_hz,
float early_late_space_chips, float early_late_space_chips,

3
src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
View File

@ -43,7 +43,6 @@
#include "lock_detectors.h" #include "lock_detectors.h"
#include "gnss_sdr_flags.h" #include "gnss_sdr_flags.h"
#include "control_message_factory.h" #include "control_message_factory.h"
#include <boost/lexical_cast.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <matio.h> #include <matio.h>
@ -567,7 +566,7 @@ void glonass_l1_ca_dll_pll_c_aid_tracking_cc::set_channel(uint32_t channel)
{ {
try try
{ {
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);

3
src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
View File

@ -44,7 +44,6 @@
#include "gnss_sdr_flags.h" #include "gnss_sdr_flags.h"
#include "control_message_factory.h" #include "control_message_factory.h"
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/lexical_cast.hpp>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <matio.h> #include <matio.h>
#include <pmt/pmt.h> #include <pmt/pmt.h>
@ -558,7 +557,7 @@ void glonass_l1_ca_dll_pll_c_aid_tracking_sc::set_channel(uint32_t channel)
{ {
try try
{ {
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);

3
src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
View File

@ -43,7 +43,6 @@
#include "lock_detectors.h" #include "lock_detectors.h"
#include "gnss_sdr_flags.h" #include "gnss_sdr_flags.h"
#include "control_message_factory.h" #include "control_message_factory.h"
#include <boost/lexical_cast.hpp>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <glog/logging.h> #include <glog/logging.h>
#include <matio.h> #include <matio.h>
@ -519,7 +518,7 @@ void Glonass_L1_Ca_Dll_Pll_Tracking_cc::set_channel(uint32_t channel)
{ {
try try
{ {
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);

3
src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
View File

@ -41,7 +41,6 @@
#include "GLONASS_L1_L2_CA.h" #include "GLONASS_L1_L2_CA.h"
#include "gnss_sdr_flags.h" #include "gnss_sdr_flags.h"
#include "control_message_factory.h" #include "control_message_factory.h"
#include <boost/lexical_cast.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <matio.h> #include <matio.h>
@ -564,7 +563,7 @@ void glonass_l2_ca_dll_pll_c_aid_tracking_cc::set_channel(uint32_t channel)
{ {
try try
{ {
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);

3
src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
View File

@ -42,7 +42,6 @@
#include "gnss_sdr_flags.h" #include "gnss_sdr_flags.h"
#include "control_message_factory.h" #include "control_message_factory.h"
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/lexical_cast.hpp>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <matio.h> #include <matio.h>
#include <pmt/pmt.h> #include <pmt/pmt.h>
@ -557,7 +556,7 @@ void glonass_l2_ca_dll_pll_c_aid_tracking_sc::set_channel(uint32_t channel)
{ {
try try
{ {
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);

3
src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
View File

@ -43,7 +43,6 @@
#include "GLONASS_L1_L2_CA.h" #include "GLONASS_L1_L2_CA.h"
#include "gnss_sdr_flags.h" #include "gnss_sdr_flags.h"
#include "control_message_factory.h" #include "control_message_factory.h"
#include <boost/lexical_cast.hpp>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <glog/logging.h> #include <glog/logging.h>
#include <matio.h> #include <matio.h>
@ -519,7 +518,7 @@ void Glonass_L2_Ca_Dll_Pll_Tracking_cc::set_channel(uint32_t channel)
{ {
try try
{ {
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);

9
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
View File

@ -35,7 +35,6 @@
#include "gnss_sdr_flags.h" #include "gnss_sdr_flags.h"
#include "GPS_L1_CA.h" #include "GPS_L1_CA.h"
#include "control_message_factory.h" #include "control_message_factory.h"
#include <boost/lexical_cast.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <matio.h> #include <matio.h>
@ -546,7 +545,7 @@ void gps_l1_ca_dll_pll_c_aid_tracking_cc::set_channel(uint32_t channel)
{ {
try try
{ {
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
@ -905,8 +904,6 @@ int gps_l1_ca_dll_pll_c_aid_tracking_cc::general_work(int noutput_items __attrib
{ {
return 1; return 1;
} }
else
{ return 0;
return 0;
}
} }

9
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
View File

@ -36,7 +36,6 @@
#include "gnss_sdr_flags.h" #include "gnss_sdr_flags.h"
#include "control_message_factory.h" #include "control_message_factory.h"
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/lexical_cast.hpp>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <pmt/pmt.h> #include <pmt/pmt.h>
#include <glog/logging.h> #include <glog/logging.h>
@ -548,7 +547,7 @@ void gps_l1_ca_dll_pll_c_aid_tracking_sc::set_channel(uint32_t channel)
{ {
try try
{ {
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
@ -906,8 +905,6 @@ int gps_l1_ca_dll_pll_c_aid_tracking_sc::general_work(int noutput_items __attrib
{ {
return 1; return 1;
} }
else
{ return 0;
return 0;
}
} }

3
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
View File

@ -44,7 +44,6 @@
#include "gnss_sdr_flags.h" #include "gnss_sdr_flags.h"
#include "GPS_L1_CA.h" #include "GPS_L1_CA.h"
#include "control_message_factory.h" #include "control_message_factory.h"
#include <boost/lexical_cast.hpp>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <glog/logging.h> #include <glog/logging.h>
#include <volk_gnsssdr/volk_gnsssdr.h> #include <volk_gnsssdr/volk_gnsssdr.h>
@ -648,7 +647,7 @@ void Gps_L1_Ca_Kf_Tracking_cc::set_channel(uint32_t channel)
{ {
try try
{ {
d_dump_filename.append(boost::lexical_cast<std::string>(d_channel)); d_dump_filename.append(std::to_string(d_channel));
d_dump_filename.append(".dat"); d_dump_filename.append(".dat");
d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);

10
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
View File

@ -62,7 +62,7 @@ gps_l1_ca_tcp_connector_make_tracking_cc(
int64_t fs_in, int64_t fs_in,
uint32_t vector_length, uint32_t vector_length,
bool dump, bool dump,
const std::string& dump_filename, const std::string &dump_filename,
float early_late_space_chips, float early_late_space_chips,
size_t port_ch0) size_t port_ch0)
{ {
@ -85,7 +85,7 @@ Gps_L1_Ca_Tcp_Connector_Tracking_cc::Gps_L1_Ca_Tcp_Connector_Tracking_cc(
int64_t fs_in, int64_t fs_in,
uint32_t vector_length, uint32_t vector_length,
bool dump, bool dump,
std::string dump_filename, const std::string& dump_filename,
float early_late_space_chips, float early_late_space_chips,
size_t port_ch0) : gr::block("Gps_L1_Ca_Tcp_Connector_Tracking_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)), size_t port_ch0) : gr::block("Gps_L1_Ca_Tcp_Connector_Tracking_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)),
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro))) gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
@ -583,8 +583,6 @@ int Gps_L1_Ca_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attrib
{ {
return 1; return 1;
} }
else
{ return 0;
return 0;
}
} }

2
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
View File

@ -93,7 +93,7 @@ private:
Gps_L1_Ca_Tcp_Connector_Tracking_cc( Gps_L1_Ca_Tcp_Connector_Tracking_cc(
int64_t fs_in, uint32_t vector_length, int64_t fs_in, uint32_t vector_length,
bool dump, bool dump,
std::string dump_filename, const std::string& dump_filename,
float early_late_space_chips, float early_late_space_chips,
size_t port_ch0); size_t port_ch0);

4
src/algorithms/tracking/libs/tcp_communication.cc
View File

@ -40,9 +40,7 @@ tcp_communication::tcp_communication() : tcp_socket_(io_service_)
} }
tcp_communication::~tcp_communication() tcp_communication::~tcp_communication() = default;
{
}
int tcp_communication::listen_tcp_connection(size_t d_port_, size_t d_port_ch0_) int tcp_communication::listen_tcp_connection(size_t d_port_, size_t d_port_ch0_)

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

@ -81,10 +81,7 @@ double pll_cloop_two_quadrant_atan(gr_complex prompt_s1)
{ {
return atan(prompt_s1.imag() / prompt_s1.real()); return atan(prompt_s1.imag() / prompt_s1.real());
} }
else return 0.0;
{
return 0.0;
}
} }
@ -105,10 +102,7 @@ double dll_nc_e_minus_l_normalized(gr_complex early_s1, gr_complex late_s1)
{ {
return 0.0; return 0.0;
} }
else return 0.5 * (P_early - P_late) / (P_early + P_late);
{
return 0.5 * (P_early - P_late) / (P_early + P_late);
}
} }
/* /*
@ -129,8 +123,5 @@ double dll_nc_vemlp_normalized(gr_complex very_early_s1, gr_complex early_s1, gr
{ {
return 0.0; return 0.0;
} }
else return (P_early - P_late) / (P_early + P_late);
{
return (P_early - P_late) / (P_early + P_late);
}
} }

50
src/core/libs/string_converter.cc
View File

@ -46,7 +46,7 @@ bool StringConverter::convert(const std::string& value, bool default_value)
{ {
return true; return true;
} }
else if (value == "false") if (value == "false")
{ {
return false; return false;
} }
@ -68,10 +68,8 @@ int64_t StringConverter::convert(const std::string& value, int64_t default_value
{ {
return default_value; return default_value;
} }
else
{ return result;
return result;
}
} }
@ -86,10 +84,8 @@ uint64_t StringConverter::convert(const std::string& value, uint64_t default_val
{ {
return default_value; return default_value;
} }
else
{ return result;
return result;
}
} }
@ -104,10 +100,8 @@ int32_t StringConverter::convert(const std::string& value, int32_t default_value
{ {
return default_value; return default_value;
} }
else
{ return result;
return result;
}
} }
@ -122,10 +116,8 @@ uint32_t StringConverter::convert(const std::string& value, uint32_t default_val
{ {
return default_value; return default_value;
} }
else
{ return result;
return result;
}
} }
@ -140,10 +132,8 @@ uint16_t StringConverter::convert(const std::string& value, uint16_t default_val
{ {
return default_value; return default_value;
} }
else
{ return result;
return result;
}
} }
@ -158,10 +148,8 @@ int16_t StringConverter::convert(const std::string& value, int16_t default_value
{ {
return default_value; return default_value;
} }
else
{ return result;
return result;
}
} }
@ -176,10 +164,8 @@ float StringConverter::convert(const std::string& value, float default_value)
{ {
return default_value; return default_value;
} }
else
{ return result;
return result;
}
} }
@ -194,8 +180,6 @@ double StringConverter::convert(const std::string& value, double default_value)
{ {
return default_value; return default_value;
} }
else
{ return result;
return result;
}
} }

7
src/core/receiver/concurrent_map.h
View File

@ -94,11 +94,8 @@ public:
lock.unlock(); lock.unlock();
return true; return true;
} }
else lock.unlock();
{ return false;
lock.unlock();
return false;
}
} }
}; };

6
src/core/receiver/control_thread.cc
View File

@ -289,10 +289,8 @@ int ControlThread::run()
{ {
return 42; // signal the gnss-sdr-harness.sh to restart the receiver program return 42; // signal the gnss-sdr-harness.sh to restart the receiver program
} }
else
{ return 0; // normal shutdown
return 0; // normal shutdown
}
} }

68
src/core/receiver/file_configuration.cc
View File

@ -69,10 +69,7 @@ std::string FileConfiguration::property(std::string property_name, std::string d
{ {
return overrided_->property(property_name, default_value); return overrided_->property(property_name, default_value);
} }
else return ini_reader_->Get("GNSS-SDR", property_name, default_value);
{
return ini_reader_->Get("GNSS-SDR", property_name, default_value);
}
} }
@ -82,11 +79,8 @@ bool FileConfiguration::property(std::string property_name, bool default_value)
{ {
return overrided_->property(property_name, default_value); return overrided_->property(property_name, default_value);
} }
else std::string empty;
{ return converter_->convert(property(property_name, empty), default_value);
std::string empty;
return converter_->convert(property(property_name, empty), default_value);
}
} }
@ -96,11 +90,8 @@ int64_t FileConfiguration::property(std::string property_name, int64_t default_v
{ {
return overrided_->property(property_name, default_value); return overrided_->property(property_name, default_value);
} }
else std::string empty;
{ return converter_->convert(property(property_name, empty), default_value);
std::string empty;
return converter_->convert(property(property_name, empty), default_value);
}
} }
@ -110,11 +101,8 @@ uint64_t FileConfiguration::property(std::string property_name, uint64_t default
{ {
return overrided_->property(property_name, default_value); return overrided_->property(property_name, default_value);
} }
else std::string empty;
{ return converter_->convert(property(property_name, empty), default_value);
std::string empty;
return converter_->convert(property(property_name, empty), default_value);
}
} }
@ -124,11 +112,8 @@ int FileConfiguration::property(std::string property_name, int default_value)
{ {
return overrided_->property(property_name, default_value); return overrided_->property(property_name, default_value);
} }
else std::string empty;
{ return converter_->convert(property(property_name, empty), default_value);
std::string empty;
return converter_->convert(property(property_name, empty), default_value);
}
} }
@ -138,11 +123,8 @@ unsigned int FileConfiguration::property(std::string property_name, unsigned int
{ {
return overrided_->property(property_name, default_value); return overrided_->property(property_name, default_value);
} }
else std::string empty;
{ return converter_->convert(property(property_name, empty), default_value);
std::string empty;
return converter_->convert(property(property_name, empty), default_value);
}
} }
@ -152,11 +134,8 @@ uint16_t FileConfiguration::property(std::string property_name, uint16_t default
{ {
return overrided_->property(property_name, default_value); return overrided_->property(property_name, default_value);
} }
else std::string empty;
{ return converter_->convert(property(property_name, empty), default_value);
std::string empty;
return converter_->convert(property(property_name, empty), default_value);
}
} }
@ -166,11 +145,8 @@ int16_t FileConfiguration::property(std::string property_name, int16_t default_v
{ {
return overrided_->property(property_name, default_value); return overrided_->property(property_name, default_value);
} }
else std::string empty;
{ return converter_->convert(property(property_name, empty), default_value);
std::string empty;
return converter_->convert(property(property_name, empty), default_value);
}
} }
@ -180,11 +156,8 @@ float FileConfiguration::property(std::string property_name, float default_value
{ {
return overrided_->property(property_name, default_value); return overrided_->property(property_name, default_value);
} }
else std::string empty;
{ return converter_->convert(property(property_name, empty), default_value);
std::string empty;
return converter_->convert(property(property_name, empty), default_value);
}
} }
@ -194,11 +167,8 @@ double FileConfiguration::property(std::string property_name, double default_val
{ {
return overrided_->property(property_name, default_value); return overrided_->property(property_name, default_value);
} }
else std::string empty;
{ return converter_->convert(property(property_name, empty), default_value);
std::string empty;
return converter_->convert(property(property_name, empty), default_value);
}
} }

5
src/core/receiver/in_memory_configuration.cc
View File

@ -55,10 +55,7 @@ std::string InMemoryConfiguration::property(std::string property_name, std::stri
{ {
return iter->second; return iter->second;
} }
else return default_value;
{
return default_value;
}
} }

11
src/core/system_parameters/galileo_fnav_message.cc
View File

@ -224,10 +224,8 @@ bool Galileo_Fnav_Message::_CRC_test(std::bitset<GALILEO_FNAV_DATA_FRAME_BITS> b
{ {
return true; return true;
} }
else
{ return false;
return false;
}
} }
@ -498,10 +496,7 @@ bool Galileo_Fnav_Message::have_new_ephemeris() // Check if we have a new ephem
std::cout << "Batch number: " << IOD_ephemeris << std::endl; std::cout << "Batch number: " << IOD_ephemeris << std::endl;
return true; return true;
} }
else return false;
{
return false;
}
} }
else else
{ {

24
src/core/system_parameters/galileo_navigation_message.cc
View File

@ -253,10 +253,7 @@ bool Galileo_Navigation_Message::CRC_test(std::bitset<GALILEO_DATA_FRAME_BITS> b
{ {
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -442,10 +439,9 @@ bool Galileo_Navigation_Message::have_new_ephemeris() // Check if we have a new
std::cout << "Batch number: " << IOD_ephemeris << std::endl; std::cout << "Batch number: " << IOD_ephemeris << std::endl;
return true; return true;
} }
else
{
return false; return false;
}
} }
else else
return false; return false;
@ -459,8 +455,8 @@ bool Galileo_Navigation_Message::have_new_iono_and_GST() // Check if we have a
flag_iono_and_GST = false; // clear the flag flag_iono_and_GST = false; // clear the flag
return true; return true;
} }
else
return false; return false;
} }
@ -471,8 +467,8 @@ bool Galileo_Navigation_Message::have_new_utc_model() // Check if we have a new
flag_utc_model = false; // clear the flag flag_utc_model = false; // clear the flag
return true; return true;
} }
else
return false; return false;
} }
@ -488,8 +484,8 @@ bool Galileo_Navigation_Message::have_new_almanac() // Check if we have a new a
flag_all_almanac = true; flag_all_almanac = true;
return true; return true;
} }
else
return false; return false;
} }

8
src/core/system_parameters/glonass_gnav_navigation_message.cc
View File

@ -83,7 +83,7 @@ void Glonass_Gnav_Navigation_Message::reset()
// Data update information // Data update information
d_previous_tb = 0.0; d_previous_tb = 0.0;
for (double & i : d_previous_Na) for (double& i : d_previous_Na)
i = 0.0; i = 0.0;
std::map<int, std::string> satelliteBlock; // Map that stores to which block the PRN belongs http://www.navcen.uscg.gov/?Do=constellationStatus std::map<int, std::string> satelliteBlock; // Map that stores to which block the PRN belongs http://www.navcen.uscg.gov/?Do=constellationStatus
@ -200,7 +200,7 @@ bool Glonass_Gnav_Navigation_Message::CRC_test(std::bitset<GLONASS_GNAV_STRING_B
return true; return true;
} }
// (a-ii) Only one of the checksums (C1,...,C7) is equal to zero but C_Sigma = 1 // (a-ii) Only one of the checksums (C1,...,C7) is equal to zero but C_Sigma = 1
else if (C_Sigma == 1 && C1 + C2 + C3 + C4 + C5 + C6 + C7 == 6) if (C_Sigma == 1 && C1 + C2 + C3 + C4 + C5 + C6 + C7 == 6)
{ {
return true; return true;
} }
@ -733,8 +733,8 @@ bool Glonass_Gnav_Navigation_Message::have_new_utc_model() // Check if we have
flag_utc_model_str_5 = false; // clear the flag flag_utc_model_str_5 = false; // clear the flag
return true; return true;
} }
else
return false; return false;
} }

15
src/core/system_parameters/gps_cnav_navigation_message.cc
View File

@ -337,10 +337,7 @@ bool Gps_CNAV_Navigation_Message::have_new_ephemeris() // Check if we have a ne
b_flag_ephemeris_2 = false; // clear the flag b_flag_ephemeris_2 = false; // clear the flag
return true; return true;
} }
else return false;
{
return false;
}
} }
else else
{ {
@ -362,10 +359,7 @@ bool Gps_CNAV_Navigation_Message::have_new_iono() // Check if we have a new ion
b_flag_iono_valid = false; // clear the flag b_flag_iono_valid = false; // clear the flag
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -382,10 +376,7 @@ bool Gps_CNAV_Navigation_Message::have_new_utc_model() // Check if we have a ne
b_flag_utc_valid = false; // clear the flag b_flag_utc_valid = false; // clear the flag
return true; return true;
} }
else return false;
{
return false;
}
} }

6
src/core/system_parameters/rtcm.cc
View File

@ -178,10 +178,8 @@ bool Rtcm::check_CRC(const std::string& message) const
{ {
return true; return true;
} }
else
{ return false;
return false;
}
} }

21
src/tests/common-files/gnuplot_i.h
View File

@ -1011,11 +1011,9 @@ bool Gnuplot::set_GNUPlotPath(const std::string &path)
Gnuplot::m_sGNUPlotPath = path; Gnuplot::m_sGNUPlotPath = path;
return true; return true;
} }
else
{ Gnuplot::m_sGNUPlotPath.clear();
Gnuplot::m_sGNUPlotPath.clear(); return false;
return false;
}
} }
@ -1068,8 +1066,8 @@ void stringtok(Container &container,
container.push_back(in.substr(i)); container.push_back(in.substr(i));
return; return;
} }
else
container.push_back(in.substr(i, j - i)); container.push_back(in.substr(i, j - i));
// set up for next loop // set up for next loop
i = j + 1; i = j + 1;
@ -1876,7 +1874,7 @@ Gnuplot &Gnuplot::cmd(const std::string &cmdstr)
{ {
return *this; return *this;
} }
else if (cmdstr.find("splot") != std::string::npos) if (cmdstr.find("splot") != std::string::npos)
{ {
two_dim = false; two_dim = false;
nplots++; nplots++;
@ -2052,10 +2050,7 @@ bool Gnuplot::file_exists(const std::string &filename, int mode)
{ {
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -2147,7 +2142,7 @@ std::string Gnuplot::create_tmpfile(std::ofstream &tmp)
// //
// Save the temporary filename // Save the temporary filename
// //
tmpfile_list.push_back(name); tmpfile_list.emplace_back(name);
Gnuplot::tmpfile_num++; Gnuplot::tmpfile_num++;
return name; return name;

10
src/tests/system-tests/libs/rtklib_solver_dump_reader.cc
View File

@ -81,10 +81,7 @@ bool rtklib_solver_dump_reader::restart()
d_dump_file.seekg(0, std::ios::beg); d_dump_file.seekg(0, std::ios::beg);
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -99,10 +96,7 @@ int64_t rtklib_solver_dump_reader::num_epochs()
int64_t nepoch = size / epoch_size_bytes; int64_t nepoch = size / epoch_size_bytes;
return nepoch; return nepoch;
} }
else return 0;
{
return 0;
}
} }

10
src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc
View File

@ -186,10 +186,7 @@ bool spirent_motion_csv_dump_reader::restart()
} }
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -206,10 +203,7 @@ int64_t spirent_motion_csv_dump_reader::num_epochs()
} }
return nepoch - header_lines; return nepoch - header_lines;
} }
else return 0;
{
return 0;
}
} }

2
src/tests/unit-tests/arithmetic/matio_test.cc
View File

@ -145,7 +145,7 @@ TEST(MatioTest, WriteAndReadGrComplex)
std::vector<gr_complex> x_v_read; std::vector<gr_complex> x_v_read;
for (unsigned int i = 0; i < size; i++) for (unsigned int i = 0; i < size; i++)
{ {
x_v_read.push_back(gr_complex(x_read_real[i], x_read_imag[i])); x_v_read.emplace_back(x_read_real[i], x_read_imag[i]);
} }
Mat_Close(matfp_read); Mat_Close(matfp_read);

10
src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc
View File

@ -63,10 +63,7 @@ bool observables_dump_reader::restart()
d_dump_file.seekg(0, std::ios::beg); d_dump_file.seekg(0, std::ios::beg);
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -82,10 +79,7 @@ int64_t observables_dump_reader::num_epochs()
int64_t nepoch = size / epoch_size_bytes; int64_t nepoch = size / epoch_size_bytes;
return nepoch; return nepoch;
} }
else return 0;
{
return 0;
}
} }

10
src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc
View File

@ -56,10 +56,7 @@ bool tlm_dump_reader::restart()
d_dump_file.seekg(0, std::ios::beg); d_dump_file.seekg(0, std::ios::beg);
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -75,10 +72,7 @@ int64_t tlm_dump_reader::num_epochs()
int64_t nepoch = size / epoch_size_bytes; int64_t nepoch = size / epoch_size_bytes;
return nepoch; return nepoch;
} }
else return 0;
{
return 0;
}
} }

12
src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc
View File

@ -75,10 +75,7 @@ bool tracking_dump_reader::restart()
d_dump_file.seekg(0, std::ios::beg); d_dump_file.seekg(0, std::ios::beg);
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -96,10 +93,9 @@ int64_t tracking_dump_reader::num_epochs()
int64_t nepoch = size / epoch_size_bytes; int64_t nepoch = size / epoch_size_bytes;
return nepoch; return nepoch;
} }
else
{
return 0; return 0;
}
} }

10
src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc
View File

@ -58,10 +58,7 @@ bool tracking_true_obs_reader::restart()
d_dump_file.seekg(0, std::ios::beg); d_dump_file.seekg(0, std::ios::beg);
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -77,10 +74,7 @@ int64_t tracking_true_obs_reader::num_epochs()
int64_t nepoch = size / epoch_size_bytes; int64_t nepoch = size / epoch_size_bytes;
return nepoch; return nepoch;
} }
else return 0;
{
return 0;
}
} }

10
src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc
View File

@ -63,10 +63,7 @@ bool true_observables_reader::restart()
d_dump_file.seekg(0, std::ios::beg); d_dump_file.seekg(0, std::ios::beg);
return true; return true;
} }
else return false;
{
return false;
}
} }
@ -82,10 +79,7 @@ int64_t true_observables_reader::num_epochs()
int64_t nepoch = size / epoch_size_bytes; int64_t nepoch = size / epoch_size_bytes;
return nepoch; return nepoch;
} }
else return 0;
{
return 0;
}
} }

24
src/utils/front-end-cal/front_end_cal.cc
View File

@ -78,12 +78,9 @@ bool FrontEndCal::read_assistance_from_XML()
} }
return true; return true;
} }
else std::cout << "ERROR: SUPL client error reading XML" << std::endl;
{ LOG(WARNING) << "ERROR: SUPL client error reading XML";
std::cout << "ERROR: SUPL client error reading XML" << std::endl; return false;
LOG(WARNING) << "ERROR: SUPL client error reading XML";
return false;
}
} }
@ -256,10 +253,7 @@ bool FrontEndCal::get_ephemeris()
{ {
return true; return true;
} }
else return false;
{
return false;
}
} }
else else
{ {
@ -274,10 +268,7 @@ bool FrontEndCal::get_ephemeris()
{ {
return true; return true;
} }
else return false;
{
return false;
}
} }
} }
@ -377,10 +368,7 @@ double FrontEndCal::estimate_doppler_from_eph(unsigned int PRN, double TOW, doub
mean_Doppler_Hz = arma::mean(Doppler_Hz); mean_Doppler_Hz = arma::mean(Doppler_Hz);
return mean_Doppler_Hz; return mean_Doppler_Hz;
} }
else throw(1);
{
throw(1);
}
} }