Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tools: autotest: Use GLOBAL keyword to match WGS-84 MSL alt frames #28489

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Tools/autotest/vehicle_test_suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@
# check for timeout
if now - tstart > self.timeout:
self.print_failure_text(now, current_value)
raise self.timeoutexception()

Check failure on line 501 in Tools/autotest/vehicle_test_suite.py

View workflow job for this annotation

GitHub Actions / autotest (sitltest-copter-tests1c)

vehicle_test_suite.AutoTestTimeoutException: Failed to attain location

# handle the case where we are are achieving our value:
if self.validate_value(current_value):
Expand Down Expand Up @@ -11404,10 +11404,8 @@
raise ValueError()

def to_alt_frame(alt, mav_frame):
if mav_frame in ["MAV_FRAME_GLOBAL_RELATIVE_ALT",
"MAV_FRAME_GLOBAL_RELATIVE_ALT_INT",
"MAV_FRAME_GLOBAL_TERRAIN_ALT",
"MAV_FRAME_GLOBAL_TERRAIN_ALT_INT"]:
# Per MAVLink spec, GLOBAL is a keyword to represent MSL.
if "GLOBAL" in mav_frame:
Ryanf55 marked this conversation as resolved.
Show resolved Hide resolved
home = self.home_position_as_mav_location()
return alt - home.alt
else:
Expand Down
Loading