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

Mission Control: Bug fixes related to P3 field #1722

Merged
merged 7 commits into from
Feb 15, 2023

Conversation

MrD-RC
Copy link
Collaborator

@MrD-RC MrD-RC commented Feb 14, 2023

Fixes #1721

  • Added const to make bitfield stuff more readable
  • changed checkAltElevationSanity() as it was treating P3 as a Boolean. Some times this function was called with explicitly not using absolute altitude. This is still possible. The function can accept a Boolean or the P3 bitfield.
  • Fixed issue where alt and user action checkboxes could not be unset.
  • Added .mission filter to the load mission from file dialog box.

- Added const to make bitfield stuff more readable
- changed `checkAltElevationSanity()` as it was treating P3 as a Boolean. Some times this function was called with explicitly not using absolute altitude. This is still possible. The function can accept a Boolean _or_ the P3 bitfield.
- Fixed issue where alt and user action checkboxes could not be unset.
- Added **.mission** filter to the load mission from file dialog box.
One other change to stop using P3 as a Boolean.
tabs/mission_control.js Outdated Show resolved Hide resolved
Fixed the cat's contribution.
tabs/mission_control.js Outdated Show resolved Hide resolved
tabs/mission_control.js Outdated Show resolved Hide resolved
@MrD-RC
Copy link
Collaborator Author

MrD-RC commented Feb 15, 2023

This seems to be correct now, after moving the storing of P3 around line 2125. Changing the toggle now changes the alt in the Alt (cm) box above.

image

image

test mission.mission.txt

Copy link
Collaborator

@breadoven breadoven left a comment

Choose a reason for hiding this comment

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

Other than the slightly odd setBit function it all seems to work as expected now so all good.

Revise setBit function
@MrD-RC
Copy link
Collaborator Author

MrD-RC commented Feb 15, 2023

Other than the slightly odd setBit function it all seems to work as expected now so all good.

I tried your function and it worked fine. So I swapped it in as it it neater too. I'm still fairly new to all the bitwise stuff. Also, I remembered I found a bug in it which I fixed. That could have also been causing the unwanted behaviour.

Either way. This is all working nicely now, so I'll get it merged, ready for RC3.

@MrD-RC MrD-RC merged commit feba353 into release_6.0.0 Feb 15, 2023
@MrD-RC MrD-RC deleted the MrD_Fix-alt-type-in-mission-planner branch February 15, 2023 20:27
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.

None yet

2 participants