Skip to content

Conversation

@peterbarker
Copy link
Contributor

.... so we can have minimum_duration which wait_attitude does not

self.arm_vehicle()
self.wait_disarmed()

def WaitAndMaintainAttitude(self):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change the test name to not exactly match the test class.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Fixed.

@peterbarker peterbarker force-pushed the pr/add-WaitAndMaintainAttitude branch from 4cb1307 to 8a25c29 Compare January 23, 2026 04:40
Comment on lines 782 to 786
if self.desroll is not None:
axis_progress.append(f"r={achieved_roll:.03} des-r={self.desroll}")

if self.despitch is not None:
axis_progress.append(f"p={achieved_pitch:.3} des-p={self.despitch}")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These format specifiers don't make a lot of sense. They will convert the values to scientific notation above 100 degrees. Which is admittedly unlikely. In any case they should be the same on both axes!

Also unsure if it's worth abbreviating the axes, they are not abbreviated in the start text. But I don't mind either way.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

AT-0004.0: Waiting for roll=0 and pitch=0
AT-0004.0: r= -19.345 des-r=0 p= -17.824 des-p=0
AT-0004.0: r=   8.664 des-r=0 p=   9.096 des-p=0
AT-0004.1: r=  12.462 des-r=0 p=  11.692 des-p=0
AT-0004.1: r=   1.952 des-r=0 p=   1.725 des-p=0

.... so we can have minimum_duration which wait_attitude does not
@peterbarker peterbarker force-pushed the pr/add-WaitAndMaintainAttitude branch from 8a25c29 to 87f640e Compare January 23, 2026 05:30
@peterbarker peterbarker moved this to ReadyForDevCall in Peter's ArduPilot 4.7 Queue Jan 25, 2026
@peterbarker peterbarker requested a review from tpwrules January 25, 2026 22:56
Copy link
Contributor

@tpwrules tpwrules left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable, test passes and log makes sense.

@tpwrules tpwrules merged commit 93ecad5 into ArduPilot:master Jan 26, 2026
70 checks passed
@github-project-automation github-project-automation bot moved this from ReadyForDevCall to Done in Peter's ArduPilot 4.7 Queue Jan 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants