Merge branch 'xiaoxiang781216-pr-68'

This commit is contained in:
Kosma Moczek 2022-08-04 12:01:27 +01:00
commit 296c71cbc0
4 changed files with 5 additions and 7 deletions

View File

@ -8,7 +8,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <ctype.h>
#include "minmea.h" #include "minmea.h"

View File

@ -12,7 +12,6 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <stdarg.h> #include <stdarg.h>
#include <time.h>
#define boolstr(s) ((s) ? "true" : "false") #define boolstr(s) ((s) ? "true" : "false")

View File

@ -13,10 +13,8 @@
extern "C" { extern "C" {
#endif #endif
#include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <errno.h>
#include <time.h> #include <time.h>
#include <math.h> #include <math.h>
#ifdef MINMEA_INCLUDE_COMPAT #ifdef MINMEA_INCLUDE_COMPAT
@ -201,11 +199,14 @@ enum minmea_sentence_id minmea_sentence_id(const char *sentence, bool strict);
* Scanf-like processor for NMEA sentences. Supports the following formats: * Scanf-like processor for NMEA sentences. Supports the following formats:
* c - single character (char *) * c - single character (char *)
* d - direction, returned as 1/-1, default 0 (int *) * d - direction, returned as 1/-1, default 0 (int *)
* f - fractional, returned as value + scale (int *, int *) * f - fractional, returned as value + scale (struct minmea_float *)
* i - decimal, default zero (int *) * i - decimal, default zero (int *)
* s - string (char *) * s - string (char *)
* t - talker identifier and type (char *) * t - talker identifier and type (char *)
* T - date/time stamp (int *, int *, int *) * D - date (struct minmea_date *)
* T - time stamp (struct minmea_time *)
* _ - ignore this field
* ; - following fields are optional
* Returns true on success. See library source code for details. * Returns true on success. See library source code for details.
*/ */
bool minmea_scan(const char *sentence, const char *format, ...); bool minmea_scan(const char *sentence, const char *format, ...);

View File

@ -11,7 +11,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <math.h>
#include <check.h> #include <check.h>
#include "minmea.h" #include "minmea.h"