Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Location: rename set_alt to set_alt_cm

Browse Source
This commit is contained in:
Randy Mackay 2016-04-28 19:52:13 +09:00
parent 3f31a4a1ff
commit 1bfb565e18
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Common/Location.cpp
View File

@ -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;
}

2
libraries/AP_Common/Location.h
View File

@ -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;