aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBan Siesta <bansiesta@gmail.com>2014-12-21 14:09:30 +0000
committerBan Siesta <bansiesta@gmail.com>2014-12-21 14:09:30 +0000
commit82383533c169e44ac769ce77f9e8ddfbd3082ed9 (patch)
treed118e06256f119ef9d9767104f6db40eb1d7bc0b /src
parentb1f462a26638f252b0849083f1c3a81c52d49053 (diff)
downloadpx4-firmware-82383533c169e44ac769ce77f9e8ddfbd3082ed9.tar.gz
px4-firmware-82383533c169e44ac769ce77f9e8ddfbd3082ed9.tar.bz2
px4-firmware-82383533c169e44ac769ce77f9e8ddfbd3082ed9.zip
geofence: be more verbose if import fails
Diffstat (limited to 'src')
-rw-r--r--src/modules/navigator/geofence.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/modules/navigator/geofence.cpp b/src/modules/navigator/geofence.cpp
index 406137169..4482fb36b 100644
--- a/src/modules/navigator/geofence.cpp
+++ b/src/modules/navigator/geofence.cpp
@@ -297,8 +297,10 @@ Geofence::loadFromFile(const char *filename)
/* Handle degree minute second format */
float lat_d, lat_m, lat_s, lon_d, lon_m, lon_s;
- if (sscanf(line, "DMS %f %f %f %f %f %f", &lat_d, &lat_m, &lat_s, &lon_d, &lon_m, &lon_s) != 6)
+ if (sscanf(line, "DMS %f %f %f %f %f %f", &lat_d, &lat_m, &lat_s, &lon_d, &lon_m, &lon_s) != 6) {
+ warnx("Scanf to parse DMS geofence vertex failed.");
return ERROR;
+ }
// warnx("Geofence DMS: %.5f %.5f %.5f ; %.5f %.5f %.5f", (double)lat_d, (double)lat_m, (double)lat_s, (double)lon_d, (double)lon_m, (double)lon_s);
@@ -307,9 +309,10 @@ Geofence::loadFromFile(const char *filename)
} else {
/* Handle decimal degree format */
-
- if (sscanf(line, "%f %f", &(vertex.lat), &(vertex.lon)) != 2)
+ if (sscanf(line, "%f %f", &(vertex.lat), &(vertex.lon)) != 2) {
+ warnx("Scanf to parse geofence vertex failed.");
return ERROR;
+ }
}
if (dm_write(DM_KEY_FENCE_POINTS, pointCounter, DM_PERSIST_POWER_ON_RESET, &vertex, sizeof(vertex)) != sizeof(vertex))