Mirrors_Framework/ardupilot
1
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot.git synced 2026-10-06 19:00:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rover: rename get_relative_position_NED_origin methods to include 'float'

Browse Source 
can't have both postype and these methods, something has to shift names
This commit is contained in:
Peter Barker
2025-05-24 09:23:35 +09:00
committed by Randy Mackay
parent 26c15001cf
commit 19b6cebce3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Rover/mode_circle.cpp
+4 -4
View File
@@ -82,7 +82,7 @@ bool ModeCircle::set_center(const Location& center_loc, float radius_m, bool dir
bool ModeCircle::_enter()
{
// capture starting point and yaw
if (!AP::ahrs().get_relative_position_NE_origin(config.center_pos)) {
if (!AP::ahrs().get_relative_position_NE_origin_float(config.center_pos)) {
return false;
}
config.radius = MAX(fabsf(radius), AR_CIRCLE_RADIUS_MIN);
@@ -129,7 +129,7 @@ void ModeCircle::init_target_yaw_rad()
{
// if no position estimate use vehicle yaw
Vector2f curr_pos_NE;
if (!AP::ahrs().get_relative_position_NE_origin(curr_pos_NE)) {
if (!AP::ahrs().get_relative_position_NE_origin_float(curr_pos_NE)) {
target.yaw_rad = AP::ahrs().get_yaw();
return;
}
@@ -150,7 +150,7 @@ void ModeCircle::update()
{
// get current position
Vector2f curr_pos;
const bool position_ok = AP::ahrs().get_relative_position_NE_origin(curr_pos);
const bool position_ok = AP::ahrs().get_relative_position_NE_origin_float(curr_pos);
// if no position estimate stop vehicle
if (!position_ok) {
@@ -242,7 +242,7 @@ void ModeCircle::update_circling()
float ModeCircle::wp_bearing() const
{
Vector2f curr_pos_NE;
if (!AP::ahrs().get_relative_position_NE_origin(curr_pos_NE)) {
if (!AP::ahrs().get_relative_position_NE_origin_float(curr_pos_NE)) {
return 0;
}
// calc vector from circle center to vehicle
Rover/mode_dock.cpp
+1 -1
View File
@@ -248,7 +248,7 @@ float ModeDock::apply_slowdown(float desired_speed)
// we can calculate it based on most recent value from precland because the dock is assumed stationary wrt ekf origin
bool ModeDock::calc_dock_pos_rel_vehicle_NE(Vector2f &dock_pos_rel_vehicle) const {
Vector2f current_pos_m;
if (!AP::ahrs().get_relative_position_NE_origin(current_pos_m)) {
if (!AP::ahrs().get_relative_position_NE_origin_float(current_pos_m)) {
return false;
}