LiXiaoqi/minmea
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed spelling/codestyle

Browse Source
This commit is contained in:
Eketh 2014-04-23 19:57:30 +02:00
parent d6a02269d4
commit 24968cb3ba
4 changed files with 100 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
example.c
View File

@ -45,17 +45,17 @@ int main()
case MINMEA_SENTENCE_GST: { case MINMEA_SENTENCE_GST: {
struct minmea_sentence_gst frame; struct minmea_sentence_gst frame;
if (minmea_parse_gst(&frame, line)) { if (minmea_parse_gst(&frame, line)) {
printf("+++ raw lattitude,longitude and altitude error deviation: (%d/%d,%d/%d,%d/d)\n", printf("+++ raw latitude,longitude and altitude error deviation: (%d/%d,%d/%d,%d/d)\n",
frame.lattitude_error_deviation, frame.lattitude_error_deviation_scale, frame.latitude_error_deviation, frame.latitude_error_deviation_scale,
frame.longitude_error_deviation, frame.longitude_error_deviation_scale, frame.longitude_error_deviation, frame.longitude_error_deviation_scale,
frame.altitude_error_deviation, frame.altitude_error_deviation_scale); frame.altitude_error_deviation, frame.altitude_error_deviation_scale);
printf("+++ fixed point lattitude,longitude and altitude error deviation \ printf("+++ fixed point latitude,longitude and altitude error deviation \
scaled to three decimal places: (%d,%d,%d)\n", scaled to one decimal place: (%d,%d,%d)\n",
minmea_rescale(frame.lattitude_error_deviation, frame.lattitude_error_deviation_scale,1000), minmea_rescale(frame.latitude_error_deviation, frame.latitude_error_deviation_scale,10),
minmea_rescale(frame.longitude_error_deviation, frame.longitude_error_deviation_scale,1000), minmea_rescale(frame.longitude_error_deviation, frame.longitude_error_deviation_scale,10),
minmea_rescale(frame.altitude_error_deviation, frame.altitude_error_deviation_scale,1000)); minmea_rescale(frame.altitude_error_deviation, frame.altitude_error_deviation_scale,10));
printf("+++ floating point degree lattitude,longitude and altitude error deviation: (%f,%f,%f)", printf("+++ floating point degree latitude,longitude and altitude error deviation: (%f,%f,%f)",
minmea_coord(frame.lattitude_error_deviation, frame.lattitude_error_deviation_scale), minmea_coord(frame.latitude_error_deviation, frame.latitude_error_deviation_scale),
minmea_coord(frame.longitude_error_deviation, frame.longitude_error_deviation_scale), minmea_coord(frame.longitude_error_deviation, frame.longitude_error_deviation_scale),
minmea_coord(frame.altitude_error_deviation, frame.altitude_error_deviation_scale)); minmea_coord(frame.altitude_error_deviation, frame.altitude_error_deviation_scale));
} }

16
minmea.c
View File

@ -287,7 +287,7 @@ enum minmea_sentence_id minmea_sentence_id(const char *sentence)
return MINMEA_SENTENCE_GGA; return MINMEA_SENTENCE_GGA;
if (!strcmp(type+2, "GSA")) if (!strcmp(type+2, "GSA"))
return MINMEA_SENTENCE_GSA; return MINMEA_SENTENCE_GSA;
if (!strcmp(type+2,"GST")) if (!strcmp(type+2, "GST"))
return MINMEA_SENTENCE_GST; return MINMEA_SENTENCE_GST;
return MINMEA_UNKNOWN; return MINMEA_UNKNOWN;
@ -395,13 +395,13 @@ bool minmea_parse_gst(struct minmea_sentence_gst *frame, const char *sentence)
if (!minmea_scan(sentence, "tTfffffff", if (!minmea_scan(sentence, "tTfffffff",
type, type,
&frame->time, &frame->time,
&frame->rms_deviation,&frame->rms_deviation_scale, &frame->rms_deviation, &frame->rms_deviation_scale,
&frame->semi_major_deviation,&frame->semi_major_deviation_scale, &frame->semi_major_deviation, &frame->semi_major_deviation_scale,
&frame->semi_minor_deviation,&frame->semi_minor_deviation_scale, &frame->semi_minor_deviation, &frame->semi_minor_deviation_scale,
&frame->semi_major_orientation,&frame->semi_major_orientation_scale, &frame->semi_major_orientation, &frame->semi_major_orientation_scale,
&frame->lattitude_error_deviation,&frame->lattitude_error_deviation_scale, &frame->latitude_error_deviation, &frame->latitude_error_deviation_scale,
&frame->longitude_error_deviation,&frame->longitude_error_deviation_scale, &frame->longitude_error_deviation, &frame->longitude_error_deviation_scale,
&frame->altitude_error_deviation,&frame->altitude_error_deviation_scale)) &frame->altitude_error_deviation, &frame->altitude_error_deviation_scale))
return false; return false;
if (strcmp(type+2, "GST")) if (strcmp(type+2, "GST"))
return false; return false;

4
minmea.h
View File

@ -29,7 +29,7 @@ enum minmea_sentence_id {
MINMEA_SENTENCE_RMC, MINMEA_SENTENCE_RMC,
MINMEA_SENTENCE_GGA, MINMEA_SENTENCE_GGA,
MINMEA_SENTENCE_GSA, MINMEA_SENTENCE_GSA,
MINMEA_SENTENCE_GST MINMEA_SENTENCE_GST,
}; };
struct minmea_date { struct minmea_date {
@ -74,7 +74,7 @@ struct minmea_sentence_gst {
int semi_major_deviation, semi_major_deviation_scale; int semi_major_deviation, semi_major_deviation_scale;
int semi_minor_deviation, semi_minor_deviation_scale; int semi_minor_deviation, semi_minor_deviation_scale;
int semi_major_orientation, semi_major_orientation_scale; int semi_major_orientation, semi_major_orientation_scale;
int lattitude_error_deviation, lattitude_error_deviation_scale; int latitude_error_deviation, latitude_error_deviation_scale;
int longitude_error_deviation, longitude_error_deviation_scale; int longitude_error_deviation, longitude_error_deviation_scale;
int altitude_error_deviation, altitude_error_deviation_scale; int altitude_error_deviation, altitude_error_deviation_scale;
}; };

85
tests.c
View File

@ -32,6 +32,7 @@ static const char *valid_sequences[] = {
"$GPGLL,5106.94086,N,01701.51680,E,123204.00,A,A*63", "$GPGLL,5106.94086,N,01701.51680,E,123204.00,A,A*63",
"$GPRMC,123205.00,A,5106.94085,N,01701.51689,E,0.016,,280214,,,A*7B", "$GPRMC,123205.00,A,5106.94085,N,01701.51689,E,0.016,,280214,,,A*7B",
"$GPVTG,,T,,M,0.016,N,0.030,K,A*27", "$GPVTG,,T,,M,0.016,N,0.030,K,A*27",
"$GPGST,024603.00,3.2,6.6,4.7,47.3,5.8,5.6,22.0*58".
NULL, NULL,
}; };
@ -284,6 +285,50 @@ START_TEST(test_minmea_scan_complex2)
} }
END_TEST END_TEST
START_TEST(test_minmea_scan_complex3)
{
const char *sentence = "$GPGST,024603.00,3.2,6.6,4.7,47.3,5.8,5.6,22.0*58";
char type[6];
struct minmea_time time;
int rms_deviation, rms_deviation_scale;
int semi_major_deviation, semi_major_deviation_scale;
int semi_minor_deviation, semi_minor_deviation_scale;
int semi_major_orientation, semi_major_orientation_scale;
int latitude_error_deviation, latitude_error_deviation_scale;
int longitude_error_deviation, longitude_error_deviation_scale;
int altitude_error_deviation, altitude_error_deviation_scale;
ck_assert(minmea_scan(sentence, "tTfffffff",
type,
&time,
&rms_deviation, &rms_deviation_scale,
&semi_major_deviation, &semi_major_deviation_scale,
&semi_minor_deviation, &semi_minor_deviation_scale,
&semi_major_orientation, &semi_major_orientation_scale,
&latitude_error_deviation, &latitude_error_deviation_scale,
&longitude_error_deviation, &longitude_error_deviation_scale,
&altitude_error_deviation, &altitude_error_deviation_scale) == true);
ck_assert_str_eq(type, "GPGST");
ck_assert_int_eq(time.hours, 2);
ck_assert_int_eq(time.minutes, 46);
ck_assert_int_eq(time.seconds, 3);
ck_assert_int_eq(time.microseconds, 0);
ck_assert_int_eq(rms_deviation, 32);
ck_assert_int_eq(rms_deviation_scale, 10);
ck_assert_int_eq(semi_major_deviation, 66);
ck_assert_int_eq(semi_major_deviation_scale, 10);
ck_assert_int_eq(semi_minor_deviation, 47);
ck_assert_int_eq(semi_minor_deviation_scale, 10);
ck_assert_int_eq(semi_major_orientation, 473);
ck_assert_int_eq(semi_major_orientation_scale, 10);
ck_assert_int_eq(latitude_error_deviation, 58);
ck_assert_int_eq(latitude_error_deviation, 10);
ck_assert_int_eq(longitude_error_deviation, 56);
ck_assert_int_eq(longitude_error_deviation, 10);
ck_assert_int_eq(altitude_error_deviation, 220);
ck_assert_int_eq(altitude_error_deviation_scale,10);
}
END_TEST
START_TEST(test_minmea_parse_rmc1) START_TEST(test_minmea_parse_rmc1)
{ {
const char *sentence = "$GPRMC,081836.75,A,3751.65,S,14507.36,E,000.0,360.0,130998,011.3,E"; const char *sentence = "$GPRMC,081836.75,A,3751.65,S,14507.36,E,000.0,360.0,130998,011.3,E";
@ -356,6 +401,33 @@ START_TEST(test_minmea_parse_gga1)
} }
END_TEST END_TEST
START_TEST(test_minmea_parse_gst1)
{
const char *sentence = "$GPGST,024603.00,3.2,6.6,4.7,47.3,5.8,5.6,22.0*58";
struct minmea_sentence_gst frame = {};
struct minmea_sentence_gst expected = {
.time = { 2, 46, 3, 0 },
.rms_deviation = 32,
.rms_deviation_scale = 10,
.semi_major_deviation = 66,
.semi_major_deviation_scale = 10,
.semi_minor_deviation = 47,
.semi_minor_deviation_scale = 10,
.semi_major_orientation = 473,
.semi_major_orientation_scale = 10,
.latitude_error_deviation = 58,
.latitude_error_deviation_scale = 10,
.longitude_error_deviation = 56,
.longitude_error_deviation_scale = 10,
.altitude_error_deviation = 220,
.altitude_error_deviation_scale = 10,
};
ck_assert(minmea_check(sentence) == true);
ck_assert(minmea_parse_gst(&frame, sentence) == true);
ck_assert(!memcmp(&frame, &expected, sizeof(frame)));
}
END_TEST
START_TEST(test_minmea_parse_gsa1) START_TEST(test_minmea_parse_gsa1)
{ {
const char *sentence = "$GPGSA,A,3,04,05,,09,12,,,24,,,,,2.5,1.3,2.1*39"; const char *sentence = "$GPGSA,A,3,04,05,,09,12,,,24,,,,,2.5,1.3,2.1*39";
@ -383,6 +455,7 @@ START_TEST(test_minmea_usage1)
"$GPRMC,081836,A,3751.65,S,14507.36,E,000.0,360.0,130998,011.3,E*62", "$GPRMC,081836,A,3751.65,S,14507.36,E,000.0,360.0,130998,011.3,E*62",
"$GPGGA,123519,4807.038,N,01131.000,E,1,08,0.9,545.4,M,46.9,M,,*47", "$GPGGA,123519,4807.038,N,01131.000,E,1,08,0.9,545.4,M,46.9,M,,*47",
"$GNGSA,A,3,04,05,,09,12,,,24,,,,,2.5,1.3,2.1", "$GNGSA,A,3,04,05,,09,12,,,24,,,,,2.5,1.3,2.1",
"$GPGST,024603.00,3.2,6.6,4.7,47.3,5.8,5.6,22.0*58",
NULL, NULL,
}; };
@ -392,17 +465,21 @@ START_TEST(test_minmea_usage1)
struct minmea_sentence_rmc frame; struct minmea_sentence_rmc frame;
ck_assert(minmea_parse_rmc(&frame, *sentence) == true); ck_assert(minmea_parse_rmc(&frame, *sentence) == true);
} break; } break;
case MINMEA_SENTENCE_GGA: { case MINMEA_SENTENCE_GGA: {
struct minmea_sentence_gga frame; struct minmea_sentence_gga frame;
ck_assert(minmea_parse_gga(&frame, *sentence) == true); ck_assert(minmea_parse_gga(&frame, *sentence) == true);
} break; } break;
case MINMEA_SENTENCE_GSA: { case MINMEA_SENTENCE_GSA: {
struct minmea_sentence_gsa frame; struct minmea_sentence_gsa frame;
ck_assert(minmea_parse_gsa(&frame, *sentence) == true); ck_assert(minmea_parse_gsa(&frame, *sentence) == true);
} break; } break;
case MINMEA_SENTENCE_GST: {
struct minmea_sentence_gst frame;
ck_assert(minmea_parse_gst(&frame, *sentence) == true);
} break;
default: { default: {
} break; } break;
@ -473,7 +550,7 @@ END_TEST
Suite *minmea_suite(void) Suite *minmea_suite(void)
{ {
Suite *s = suite_create ("minmea"); Suite *s = suite_create ("minmea");
TCase *tc_check = tcase_create("minmea_check"); TCase *tc_check = tcase_create("minmea_check");
tcase_add_test(tc_check, test_minmea_check); tcase_add_test(tc_check, test_minmea_check);
suite_add_tcase(s, tc_check); suite_add_tcase(s, tc_check);
@ -489,7 +566,7 @@ Suite *minmea_suite(void)
tcase_add_test(tc_scan, test_minmea_scan_complex1); tcase_add_test(tc_scan, test_minmea_scan_complex1);
tcase_add_test(tc_scan, test_minmea_scan_complex2); tcase_add_test(tc_scan, test_minmea_scan_complex2);
suite_add_tcase(s, tc_scan); suite_add_tcase(s, tc_scan);
TCase *tc_parse = tcase_create("minmea_parse"); TCase *tc_parse = tcase_create("minmea_parse");
tcase_add_test(tc_parse, test_minmea_parse_rmc1); tcase_add_test(tc_parse, test_minmea_parse_rmc1);
tcase_add_test(tc_parse, test_minmea_parse_rmc2); tcase_add_test(tc_parse, test_minmea_parse_rmc2);