From 1bfb565e1868af55980e05083f6e591b0f135ea2 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Thu, 28 Apr 2016 19:52:13 +0900 Subject: [PATCH] Location: rename set_alt to set_alt_cm --- libraries/AP_Common/Location.cpp | 8 ++++---- libraries/AP_Common/Location.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/AP_Common/Location.cpp b/libraries/AP_Common/Location.cpp index 0de4d8609a..69686f9027 100644 --- a/libraries/AP_Common/Location.cpp +++ b/libraries/AP_Common/Location.cpp @@ -29,7 +29,7 @@ Location_Class::Location_Class(int32_t latitude, int32_t longitude, int32_t alt_ lat = latitude; lng = longitude; options = 0; - set_alt(alt_in_cm, frame); + set_alt_cm(alt_in_cm, frame); } Location_Class::Location_Class(const Location& loc) @@ -43,7 +43,7 @@ Location_Class::Location_Class(const Location& loc) Location_Class::Location_Class(const Vector3f &ekf_offset_neu) { // store alt and alt frame - set_alt(ekf_offset_neu.z, ALT_FRAME_ABOVE_ORIGIN); + set_alt_cm(ekf_offset_neu.z, ALT_FRAME_ABOVE_ORIGIN); // calculate lat, lon if (_ahrs != NULL) { @@ -65,7 +65,7 @@ Location_Class& Location_Class::operator=(const struct Location loc) return *this; } -void Location_Class::set_alt(int32_t alt_cm, ALT_FRAME frame) +void Location_Class::set_alt_cm(int32_t alt_cm, ALT_FRAME frame) { alt = alt_cm; flags.relative_alt = false; @@ -97,7 +97,7 @@ bool Location_Class::change_alt_frame(ALT_FRAME desired_frame) if (!get_alt_cm(desired_frame, new_alt_cm)) { return false; } - set_alt(new_alt_cm, desired_frame); + set_alt_cm(new_alt_cm, desired_frame); return true; } diff --git a/libraries/AP_Common/Location.h b/libraries/AP_Common/Location.h index b15a655958..abd8ce3d54 100644 --- a/libraries/AP_Common/Location.h +++ b/libraries/AP_Common/Location.h @@ -40,7 +40,7 @@ public: Location_Class& operator=(const struct Location loc); // set altitude - void set_alt(int32_t alt_cm, ALT_FRAME frame); + void set_alt_cm(int32_t alt_cm, ALT_FRAME frame); // get altitude in desired frame bool get_alt_cm(ALT_FRAME desired_frame, int32_t &ret_alt_cm) const;