Skip to content
Snippets Groups Projects
Commit 6ce24eb2 authored by Adam Wujek's avatar Adam Wujek
Browse files

[FEATURE: #335] userspace/tools/nmea: don't use pr_* for printouts


Signed-off-by: default avatarAdam Wujek <dev_public@wujek.eu>
parent 2e25760e
Branches
Tags
No related merge requests found
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <libwr/wrs-msg.h>
#include "serial.h" #include "serial.h"
#include "wr_nmea.h" #include "wr_nmea.h"
...@@ -27,7 +25,7 @@ int nmea_init(struct wr_nmea *nmea, char *dev, int baud, char *fmt) ...@@ -27,7 +25,7 @@ int nmea_init(struct wr_nmea *nmea, char *dev, int baud, char *fmt)
nmea->parse = nmea_parse_gprmc; nmea->parse = nmea_parse_gprmc;
nmea->utc = &(nmea_gprmc.utc); nmea->utc = &(nmea_gprmc.utc);
} else { } else {
pr_error("%s unsupported format\n", __func__); fprintf(stderr, "NMEA: unsupported format %s\n", fmt);
} }
return 0; return 0;
} }
...@@ -49,6 +47,7 @@ static int read_nmea_msg(char *msgbuf, int len) ...@@ -49,6 +47,7 @@ static int read_nmea_msg(char *msgbuf, int len)
c = serial_read_byte_w_timeout(&nmea_timeout); c = serial_read_byte_w_timeout(&nmea_timeout);
if (nmea_timeout == 0) { if (nmea_timeout == 0) {
nmea_timeout_max--; nmea_timeout_max--;
fprintf(stderr, "NMEA: receive timeout\n");
continue; continue;
} }
...@@ -70,6 +69,7 @@ static int read_nmea_msg(char *msgbuf, int len) ...@@ -70,6 +69,7 @@ static int read_nmea_msg(char *msgbuf, int len)
c = serial_read_byte_w_timeout(&nmea_timeout); c = serial_read_byte_w_timeout(&nmea_timeout);
if (nmea_timeout == 0) { if (nmea_timeout == 0) {
nmea_timeout_max--; nmea_timeout_max--;
fprintf(stderr, "NMEA: receive timeout\n");
continue; continue;
} }
...@@ -112,14 +112,14 @@ int nmea_read_utc(struct wr_nmea *nmea, int64_t *t_out) ...@@ -112,14 +112,14 @@ int nmea_read_utc(struct wr_nmea *nmea, int64_t *t_out)
if(nmea->parse(buf, strlen(buf), (nmea->utc)) < 0) if(nmea->parse(buf, strlen(buf), (nmea->utc)) < 0)
return -2; return -2;
pr_info("NMEA time: %d/%d/%d %02d:%02d:%02d.%02d\n", printf("NMEA time: %d/%d/%d %02d:%02d:%02d.%02d\n",
nmea->utc->year+1900, nmea->utc->year+1900,
nmea->utc->mon+1, nmea->utc->mon+1,
nmea->utc->day, nmea->utc->day,
nmea->utc->hour, nmea->utc->hour,
nmea->utc->min, nmea->utc->min,
nmea->utc->sec, nmea->utc->sec,
nmea->utc->hsec); nmea->utc->hsec);
*t_out = utc_time_to_utc_seconds(*(nmea->utc)); *t_out = utc_time_to_utc_seconds(*(nmea->utc));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment