Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Common: Location: add set_alt_m 

we have get_alt_m already, and there's a bunch of places that *100
This commit is contained in:
Peter Barker 2024-10-28 12:01:07 +09:00 committed by Peter Barker
parent c0ee3b2216
commit 0077066ffb
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Common/Location.h
View File

@ -35,6 +35,10 @@ public:
// set altitude // set altitude
void set_alt_cm(int32_t alt_cm, AltFrame frame); void set_alt_cm(int32_t alt_cm, AltFrame frame);
// set_alt_m - set altitude in metres
void set_alt_m(float alt_m, AltFrame frame) {
set_alt_cm(alt_m*100, frame);
}
// get altitude (in cm) in the desired frame // get altitude (in cm) in the desired frame
// returns false on failure to get altitude in the desired frame which can only happen if the original frame or desired frame is: // returns false on failure to get altitude in the desired frame which can only happen if the original frame or desired frame is:

7
libraries/AP_Common/tests/test_location.cpp
View File

@ -280,6 +280,13 @@ TEST(Location, Tests)
EXPECT_EQ(0, test_location4.loiter_xtrack); EXPECT_EQ(0, test_location4.loiter_xtrack);
EXPECT_TRUE(test_location4.initialised()); EXPECT_TRUE(test_location4.initialised());
// test set_alt_m API:
Location loc = test_home;
loc.set_alt_m(1.71, Location::AltFrame::ABSOLUTE);
int32_t alt_in_cm_from_m;
EXPECT_TRUE(loc.get_alt_cm(Location::AltFrame::ABSOLUTE, alt_in_cm_from_m));
EXPECT_EQ(171, alt_in_cm_from_m);
// can't create a Location using a vector here as there's no origin for the vector to be relative to: // can't create a Location using a vector here as there's no origin for the vector to be relative to:
// const Location test_location_empty{test_vect, Location::AltFrame::ABOVE_HOME}; // const Location test_location_empty{test_vect, Location::AltFrame::ABOVE_HOME};
// EXPECT_FALSE(test_location_empty.get_vector_from_origin_NEU(test_vec3)); // EXPECT_FALSE(test_location_empty.get_vector_from_origin_NEU(test_vec3));