summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2016-07-08 09:47:45 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2016-07-08 09:47:45 +0200
commit12b4b308762621be65bfceed96c68bb26dff6759 (patch)
tree6a21383f81700e8558fee38db71f4a72557524fc /src
parent6458edb901be6107455b9fecbdf0b7c82eae15ab (diff)
refactor of flags
Change-Id: Iea4afa37bcb44698c6191e4eebdb395b4c3495d3 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src')
-rw-r--r--src/af-gps-binding.c59
1 files changed, 34 insertions, 25 deletions
diff --git a/src/af-gps-binding.c b/src/af-gps-binding.c
index cd9d021..e78c7fd 100644
--- a/src/af-gps-binding.c
+++ b/src/af-gps-binding.c
@@ -41,21 +41,17 @@
* http://www.gpsinformation.org/dale/nmea.htm
*/
-/* declare the connection routine */
-static int nmea_connect();
-
-/*
- * the interface to afb-daemon
- */
-const struct afb_binding_interface *afbitf;
+struct flags {
+ unsigned time: 1;
+ unsigned latitude: 1;
+ unsigned longitude: 1;
+ unsigned altitude: 1;
+ unsigned speed: 1;
+ unsigned track: 1;
+};
struct gps {
- unsigned time_is_set: 1;
- unsigned latitude_is_set: 1;
- unsigned longitude_is_set: 1;
- unsigned altitude_is_set: 1;
- unsigned speed_is_set: 1;
- unsigned track_is_set: 1;
+ struct flags set;
uint32_t time;
double latitude;
@@ -65,10 +61,23 @@ struct gps {
double track;
};
+/* declare the connection routine */
+static int nmea_connect();
+
+/*
+ * the interface to afb-daemon
+ */
+const struct afb_binding_interface *afbitf;
+
static struct gps frames[10];
static int frameidx;
static int newframes;
+static const char type_wgs84_name[] = "WGS84";
+static const char type_dms_kmh_name[] = "DMS.km/H";
+static const char type_dms_Mh_name[] = "DMS.M/H";
+static const char type_dms_Knh_name[] = "DMS.Kn/H";
+
static struct json_object *last_position;
static struct json_object *position()
@@ -176,16 +185,16 @@ static int nmea_set(
/* get the time in milliseconds */
if (tim == NULL)
- gps.time_is_set = 0;
+ gps.set.time = 0;
else {
if (!nmea_time(tim, &gps.time))
return 0;
- gps.time_is_set = 1;
+ gps.set.time = 1;
}
/* get the latitude */
if (lat == NULL || latu == NULL)
- gps.latitude_is_set = 0;
+ gps.set.latitude = 0;
else {
if ((latu[0] != 'N' && latu[0] != 'S') || latu[1] != 0)
return 0;
@@ -193,12 +202,12 @@ static int nmea_set(
return 0;
if (latu[0] == 'S')
gps.latitude = -gps.latitude;
- gps.latitude_is_set = 1;
+ gps.set.latitude = 1;
}
/* get the longitude */
if (lon == NULL || lonu == NULL)
- gps.longitude_is_set = 0;
+ gps.set.longitude = 0;
else {
if ((lonu[0] != 'E' && lonu[0] != 'W') || lonu[1] != 0)
return 0;
@@ -206,33 +215,33 @@ static int nmea_set(
return 0;
if (lonu[0] == 'W')
gps.longitude = 360.0 - gps.longitude;
- gps.longitude_is_set = 1;
+ gps.set.longitude = 1;
}
/* get the altitude */
if (alt == NULL || altu == NULL)
- gps.altitude_is_set = 0;
+ gps.set.altitude = 0;
else {
if (altu[0] != 'M' || altu[1] != 0)
return 0;
gps.altitude = atof(alt);
- gps.altitude_is_set = 1;
+ gps.set.altitude = 1;
}
/* get the speed */
if (spe == NULL)
- gps.speed_is_set = 0;
+ gps.set.speed = 0;
else {
gps.speed = atof(spe) * KNOT_TO_METER_PER_SECOND;
- gps.speed_is_set = 1;
+ gps.set.speed = 1;
}
/* get the track */
if (tra != NULL)
- gps.track_is_set = 0;
+ gps.set.track = 0;
else {
gps.track = atof(tra);
- gps.track_is_set = 1;
+ gps.set.track = 1;
}
/* push the frame */