1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-17 15:24:56 +00:00
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

View File

@ -128,9 +128,20 @@ Rtcm_Printer::Rtcm_Printer(std::string filename, bool flag_rtcm_server, bool fla
Rtcm_Printer::~Rtcm_Printer() Rtcm_Printer::~Rtcm_Printer()
{ {
if(rtcm->is_server_running()) if(rtcm->is_server_running())
{
try
{ {
rtcm->stop_server(); 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()) if (rtcm_file_descriptor.is_open())
{ {
long pos; long pos;

View File

@ -205,7 +205,7 @@ class kernel_class:
__file__ = os.path.abspath(__file__) __file__ = os.path.abspath(__file__)
srcdir = os.path.dirname(os.path.dirname(__file__)) srcdir = os.path.dirname(os.path.dirname(__file__))
kernel_files = glob.glob(os.path.join(srcdir, "kernels", "volk_gnsssdr", "*.h")) 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__': if __name__ == '__main__':
print(kernels) print(kernels)

View File

@ -60,9 +60,20 @@ Rtcm::Rtcm(unsigned short port)
Rtcm::~Rtcm() Rtcm::~Rtcm()
{ {
if(server_is_running) if(server_is_running)
{
try
{ {
stop_server(); 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();
}
}
} }

View File

@ -92,7 +92,7 @@ int main(int argc, char** argv)
const std::string intro_help( const std::string intro_help(
std::string("\nGNSS-SDR is an Open Source GNSS Software Defined Receiver\n") 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" "This program comes with ABSOLUTELY NO WARRANTY;\n"
+ +

View File

@ -271,7 +271,7 @@ int main(int argc, char** argv)
const std::string intro_help( 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") 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" "This program comes with ABSOLUTELY NO WARRANTY;\n"
+ +