mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-09-29 15:30:52 +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 2017-01-20 15:34:01 +01:00
commit 7f58f96897
5 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,18 @@ Rtcm_Printer::~Rtcm_Printer()
{
if(rtcm->is_server_running())
{
rtcm->stop_server();
try
{
rtcm->stop_server();
}
catch( boost::exception & e )
{
LOG(WARNING) << "Boost exception: " << boost::diagnostic_information(e);
}
catch(std::exception const& ex)
{
LOG(WARNING) << "STD exception: " << ex.what();
}
}
if (rtcm_file_descriptor.is_open())
{

2
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py
View File

@ -205,7 +205,7 @@ class kernel_class:
__file__ = os.path.abspath(__file__)
srcdir = os.path.dirname(os.path.dirname(__file__))
kernel_files = glob.glob(os.path.join(srcdir, "kernels", "volk_gnsssdr", "*.h"))
kernels = map(kernel_class, kernel_files)
kernels = list(map(kernel_class, kernel_files))
if __name__ == '__main__':
print(kernels)

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

@ -61,7 +61,18 @@ Rtcm::~Rtcm()
{
if(server_is_running)
{
stop_server();
try
{
stop_server();
}
catch( boost::exception & e )
{
LOG(WARNING) << "Boost exception: " << boost::diagnostic_information(e);
}
catch(std::exception const& ex)
{
LOG(WARNING) << "STD exception: " << ex.what();
}
}
}

2
src/main/main.cc
View File

@ -92,7 +92,7 @@ int main(int argc, char** argv)
const std::string intro_help(
std::string("\nGNSS-SDR is an Open Source GNSS Software Defined Receiver\n")
+
"Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)\n"
"Copyright (C) 2010-2017 (see AUTHORS file for a list of contributors)\n"
+
"This program comes with ABSOLUTELY NO WARRANTY;\n"
+

2
src/utils/front-end-cal/main.cc
View File

@ -271,7 +271,7 @@ int main(int argc, char** argv)
const std::string intro_help(
std::string("\n RTL-SDR E4000 RF front-end center frequency and sampling rate calibration tool that uses GPS signals\n")
+
"Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)\n"
"Copyright (C) 2010-2017 (see AUTHORS file for a list of contributors)\n"
+
"This program comes with ABSOLUTELY NO WARRANTY;\n"
+