1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-07-03 02:13:16 +00:00

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

This commit is contained in:
Carles Fernandez 2018-12-03 02:12:59 +01:00
commit c6ea7192b8
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 9 additions and 7 deletions

View File

@ -1,5 +1,5 @@
/*!
* \file kml_printer.cc
* \file nmea_printer.cc
* \brief Implementation of a NMEA 2.1 printer for GNSS-SDR
* This class provides a implementation of a subset of the NMEA-0183 standard for interfacing
* marine electronic devices as defined by the National Marine Electronics Association (NMEA).
@ -132,7 +132,9 @@ int Nmea_Printer::init_serial(const std::string& serial_device)
* Opens the serial device and sets the default baud rate for a NMEA transmission (9600,8,N,1)
*/
int fd = 0;
struct termios options = {};
struct termios options
{
};
int64_t BAUD;
int64_t DATABITS;
int64_t STOPBITS;

View File

@ -166,7 +166,7 @@ void ControlThread::init()
else
{
// fill agnss_ref_time_
struct tm tm = {};
struct tm tm = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
if (strptime(ref_time_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) != nullptr)
{
agnss_ref_time_.d_tv_sec = timegm(&tm);
@ -876,7 +876,7 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
std::vector<unsigned int> visible_gps;
std::vector<unsigned int> visible_gal;
std::shared_ptr<PvtInterface> pvt_ptr = flowgraph_->get_pvt();
struct tm tstruct = {};
struct tm tstruct = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
char buf[80];
tstruct = *gmtime(&rx_utc_time);
strftime(buf, sizeof(buf), "%d/%m/%Y %H:%M:%S ", &tstruct);

View File

@ -142,7 +142,7 @@ std::string TcpCmdInterface::status(const std::vector<std::string> &commandLine
&course_over_ground_deg,
&UTC_time) == true)
{
struct tm tstruct = {};
struct tm tstruct = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
char buf1[80];
tstruct = *gmtime(&UTC_time);
strftime(buf1, sizeof(buf1), "%d/%m/%Y %H:%M:%S", &tstruct);
@ -173,7 +173,7 @@ std::string TcpCmdInterface::hotstart(const std::vector<std::string> &commandLin
if (commandLine.size() > 5)
{
// Read commandline time parameter
struct tm tm = {};
struct tm tm = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
if (strptime(commandLine.at(1).c_str(), "%d/%m/%Y %H:%M:%S", &tm) == nullptr)
{
response = "ERROR: time parameter malformed\n";
@ -219,7 +219,7 @@ std::string TcpCmdInterface::warmstart(const std::vector<std::string> &commandLi
{
std::string tmp_str;
// Read commandline time parameter
struct tm tm = {};
struct tm tm = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
tmp_str = commandLine.at(1) + commandLine.at(2);
if (strptime(commandLine.at(1).c_str(), "%d/%m/%Y %H:%M:%S", &tm) == nullptr)
{