aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-04-24 17:16:20 +0200
committerThomas Gubler <thomasgubler@gmail.com>2014-04-24 17:16:20 +0200
commit4e30784d6c506cdfdf58c623da20cffcb799e496 (patch)
treec62dacc2136a4a9946ce8bd450752515ee189094
parentb249d04e52ae34d43d9d80638d6f1ead476f39ea (diff)
downloadpx4-firmware-4e30784d6c506cdfdf58c623da20cffcb799e496.tar.gz
px4-firmware-4e30784d6c506cdfdf58c623da20cffcb799e496.tar.bz2
px4-firmware-4e30784d6c506cdfdf58c623da20cffcb799e496.zip
rename map_projection_inited to map_projection_initialized
-rw-r--r--src/lib/geo/geo.c6
-rw-r--r--src/lib/geo/geo.h2
-rw-r--r--src/modules/position_estimator_inav/position_estimator_inav_main.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/geo/geo.c b/src/lib/geo/geo.c
index 1e3ef56ae..725a04a29 100644
--- a/src/lib/geo/geo.c
+++ b/src/lib/geo/geo.c
@@ -57,7 +57,7 @@
static struct map_projection_reference_s mp_ref;
-__EXPORT bool map_projection_inited()
+__EXPORT bool map_projection_initialized()
{
return mp_ref.init_done;
}
@@ -81,7 +81,7 @@ __EXPORT void map_projection_init(double lat_0, double lon_0) //lat_0, lon_0 are
__EXPORT bool map_projection_project(double lat, double lon, float *x, float *y)
{
- if (!map_projection_inited()) {
+ if (!map_projection_initialized()) {
return false;
}
@@ -103,7 +103,7 @@ __EXPORT bool map_projection_project(double lat, double lon, float *x, float *y)
__EXPORT bool map_projection_reproject(float x, float y, double *lat, double *lon)
{
- if (!map_projection_inited()) {
+ if (!map_projection_initialized()) {
return false;
}
diff --git a/src/lib/geo/geo.h b/src/lib/geo/geo.h
index 913e83b6e..66e4dc75e 100644
--- a/src/lib/geo/geo.h
+++ b/src/lib/geo/geo.h
@@ -79,7 +79,7 @@ struct map_projection_reference_s {
* Initializes the map transformation.
* @return true if map_projection_init was called before, false else
*/
-__EXPORT bool map_projection_inited();
+__EXPORT bool map_projection_initialized();
/**
diff --git a/src/modules/position_estimator_inav/position_estimator_inav_main.c b/src/modules/position_estimator_inav/position_estimator_inav_main.c
index d01bf488f..e88493a5e 100644
--- a/src/modules/position_estimator_inav/position_estimator_inav_main.c
+++ b/src/modules/position_estimator_inav/position_estimator_inav_main.c
@@ -549,7 +549,7 @@ int position_estimator_inav_thread_main(int argc, char *argv[])
if (updated) {
orb_copy(ORB_ID(home_position), home_position_sub, &home);
- if (home.timestamp != home_timestamp && map_projection_inited()) {
+ if (home.timestamp != home_timestamp && map_projection_initialized()) {
home_timestamp = home.timestamp;
double est_lat, est_lon;
@@ -602,7 +602,7 @@ int position_estimator_inav_thread_main(int argc, char *argv[])
}
}
- if (gps_valid && map_projection_inited()) {
+ if (gps_valid && map_projection_initialized()) {
double lat = gps.lat * 1e-7;
double lon = gps.lon * 1e-7;
float alt = gps.alt * 1e-3;