Merge pull request jacketizer#58 from igrr/support_gnss

parsers: check only sentence ID, not talker ID
ramyezzatmapzon · Dec 3, 2022 · 91fd433 · 91fd433
2 parents e10384e + 1b12415
commit 91fd433
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/src/nmea/parser.c b/src/nmea/parser.c
@@ -216,7 +216,8 @@ nmea_get_parser_by_sentence(const char *sentence)
 
 	for (i = 0; i < n_parsers; i++) {
 		parser = parsers[i];
-		if (0 == strncmp(sentence + 1, parser->parser.type_word, NMEA_PREFIX_LENGTH)) {
+		/* compare only the sentence ID, ignore the talker ID */
+		if (0 == strncmp(sentence + 3, parser->parser.type_word + 2, NMEA_PREFIX_LENGTH - 2)) {
 			return parser;
 		}
 	}

diff --git a/src/nmea/parser_static.c b/src/nmea/parser_static.c
@@ -109,7 +109,8 @@ nmea_get_parser_by_sentence(const char *sentence)
 	int i;
 
 	for (i = 0; i < PARSER_COUNT; i++) {
-		if (0 == strncmp(sentence + 1, parsers[i].parser.type_word, NMEA_PREFIX_LENGTH)) {
+		/* compare only the sentence ID, ignore the talker ID */
+		if (0 == strncmp(sentence + 3, parsers[i].parser.type_word + 2, NMEA_PREFIX_LENGTH - 2)) {
 			return &(parsers[i]);
 		}
 	}

diff --git a/src/nmea/parser_types.h b/src/nmea/parser_types.h
@@ -5,6 +5,10 @@
 
 typedef struct {
 	nmea_t type;
+	/* For compatibility with older versions, type_word also contains the talker ID (e.g. "GP".)
+	 * However the talker ID is not taken account when looking for a parser. For example, the parser
+	 * with type_word="GPRMC" will also be used for a "GNRMC" sentence.
+	 */
 	char type_word[NMEA_PREFIX_LENGTH];
 	nmea_s *data;
 } nmea_parser_s;

diff --git a/tests/unit-tests/test_lib.c b/tests/unit-tests/test_lib.c
@@ -23,6 +23,11 @@ test_get_type_ok()
 	mu_assert("should return correct type (GPGGA)", NMEA_GPGGA == res);
 	free(sentence);
 
+	sentence = strdup("$GNGGA,4916.45,N,12311.12,W,225444,A\r\n");
+	res = nmea_get_type(sentence);
+	mu_assert("should return correct type (GPGGA) even if talker is GN", NMEA_GPGGA == res);
+	free(sentence);
+
 	return 0;
 }