fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 03:53:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename map_projection_inited to map_projection_initialized

Browse Source
This commit is contained in:
Thomas Gubler
2014-04-24 17:16:20 +02:00
parent b249d04e52
commit 4e30784d6c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/geo/geo.c
+3 -3
View File
@@ -57,7 +57,7 @@
static struct map_projection_reference_s mp_ref; static struct map_projection_reference_s mp_ref;
__EXPORT bool map_projection_inited() __EXPORT bool map_projection_initialized()
{ {
return mp_ref.init_done; 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) __EXPORT bool map_projection_project(double lat, double lon, float *x, float *y)
{ {
if (!map_projection_inited()) { if (!map_projection_initialized()) {
return false; 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) __EXPORT bool map_projection_reproject(float x, float y, double *lat, double *lon)
{ {
if (!map_projection_inited()) { if (!map_projection_initialized()) {
return false; return false;
} }
src/lib/geo/geo.h
+1 -1
View File
@@ -79,7 +79,7 @@ struct map_projection_reference_s {
* Initializes the map transformation. * Initializes the map transformation.
* @return true if map_projection_init was called before, false else * @return true if map_projection_init was called before, false else
*/ */
__EXPORT bool map_projection_inited(); __EXPORT bool map_projection_initialized();
/** /**
src/modules/position_estimator_inav/position_estimator_inav_main.c
+2 -2
View File
@@ -549,7 +549,7 @@ int position_estimator_inav_thread_main(int argc, char *argv[])
if (updated) { if (updated) {
orb_copy(ORB_ID(home_position), home_position_sub, &home); 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; home_timestamp = home.timestamp;
double est_lat, est_lon; 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 lat = gps.lat * 1e-7;
double lon = gps.lon * 1e-7; double lon = gps.lon * 1e-7;
float alt = gps.alt * 1e-3; float alt = gps.alt * 1e-3;