PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 151 - Add support for Multi-GNSS NMEA sentences.

This commit is contained in:
wb2osz 2018-11-24 17:20:45 -05:00
parent c5526524b6
commit 79df808d5d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
decode_aprs.c
View File

@ -920,14 +920,16 @@ static void aprs_ll_pos_time (decode_aprs_t *A, unsigned char *info, int ilen)
static void aprs_raw_nmea (decode_aprs_t *A, unsigned char *info, int ilen) static void aprs_raw_nmea (decode_aprs_t *A, unsigned char *info, int ilen)
{ {
if (strncmp((char*)info, "$GPRMC,", 7) == 0) if (strncmp((char*)info, "$GPRMC,", 7) == 0 ||
strncmp((char*)info, "$GNRMC,", 7) == 0)
{ {
float speed_knots = G_UNKNOWN; float speed_knots = G_UNKNOWN;
(void) dwgpsnmea_gprmc ((char*)info, A->g_quiet, &(A->g_lat), &(A->g_lon), &speed_knots, &(A->g_course)); (void) dwgpsnmea_gprmc ((char*)info, A->g_quiet, &(A->g_lat), &(A->g_lon), &speed_knots, &(A->g_course));
A->g_speed_mph = DW_KNOTS_TO_MPH(speed_knots); A->g_speed_mph = DW_KNOTS_TO_MPH(speed_knots);
} }
else if (strncmp((char*)info, "$GPGGA,", 7) == 0) else if (strncmp((char*)info, "$GPGGA,", 7) == 0 ||
strncmp((char*)info, "$GNGGA,", 7) == 0)
{ {
float alt_meters = G_UNKNOWN; float alt_meters = G_UNKNOWN;
int num_sat = 0; int num_sat = 0;

6
dwgpsnmea.c
View File

@ -274,7 +274,8 @@ static void * read_gpsnmea_thread (void *arg)
/* Process sentence. */ /* Process sentence. */
if (strncmp(gps_msg, "$GPRMC", 6) == 0) { if (strncmp(gps_msg, "$GPRMC", 6) == 0 ||
strncmp(gps_msg, "$GNRMC", 6) == 0) {
f = dwgpsnmea_gprmc (gps_msg, 0, &info.dlat, &info.dlon, &info.speed_knots, &info.track); f = dwgpsnmea_gprmc (gps_msg, 0, &info.dlat, &info.dlon, &info.speed_knots, &info.track);
@ -318,7 +319,8 @@ static void * read_gpsnmea_thread (void *arg)
} }
} }
else if (strncmp(gps_msg, "$GPGGA", 6) == 0) { else if (strncmp(gps_msg, "$GPGGA", 6) == 0 ||
strncmp(gps_msg, "$GNGGA", 6) == 0) {
int nsat; int nsat;
f = dwgpsnmea_gpgga (gps_msg, 0, &info.dlat, &info.dlon, &info.altitude, &nsat); f = dwgpsnmea_gpgga (gps_msg, 0, &info.dlat, &info.dlon, &info.altitude, &nsat);