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

Add OSD Stats pages and some crsf formatting fixes #6598

Merged
merged 16 commits into from
Apr 6, 2021

Conversation

OptimusTi
Copy link
Contributor

@OptimusTi OptimusTi commented Feb 11, 2021

Resolves NTSC bug mentioned on #6045

This PR allows to page through OSD Disarm Statistics info and frees lines for other data in the future.

Roll left or right to change pages.

pages_2

Divides disarm stats into pages. Roll stick can be used to go back and forth pages.
Puts Current and Power in one line and moves values one char left as suggested on iNavFlight#6045
To keep inline with other stats
Reverted to separate lines for these values. Will work on reformatting on a separate PR
@OptimusTi OptimusTi mentioned this pull request Feb 19, 2021
@OptimusTi OptimusTi changed the title OSD Stats pages Add OSD Stats pages Feb 26, 2021
@avsaase
Copy link
Member

avsaase commented Feb 26, 2021

There is a bug in this PR, or it is incompatible with #6430 which I tested at the same time.

If you arm with auto-launch permanently enabled, and you wiggle the sticks to disable auto-launch before take-off, then the disarm screen shows while you are still armed with "DISARMED BY UNKNOWN".

@OptimusTi
Copy link
Contributor Author

There is a bug in this PR, or it is incompatible with #6430 which I tested at the same time.

If you arm with auto-launch permanently enabled, and you wiggle the sticks to disable auto-launch before take-off, then the disarm screen shows while you are still armed with "DISARMED BY UNKNOWN".

Weird. I'll test tomorrow. This just splits the original code into two functions.

Added check to prevent stats pages outside of disarm screen
@OptimusTi
Copy link
Contributor Author

There is a bug in this PR, or it is incompatible with #6430 which I tested at the same time.

If you arm with auto-launch permanently enabled, and you wiggle the sticks to disable auto-launch before take-off, then the disarm screen shows while you are still armed with "DISARMED BY UNKNOWN".

Should be fixed now.

@OptimusTi
Copy link
Contributor Author

Added new data as proof of concept. :)

@avsaase
Copy link
Member

avsaase commented Mar 8, 2021

You have min battery voltage on both pages now. Is that intentional?

@OptimusTi
Copy link
Contributor Author

OptimusTi commented Mar 8, 2021

You have min battery voltage on both pages now. Is that intentional?

oops, no. I overlooked this when merging two branches. fixed!

There was a typo in the SNR symbol name
Simplified to make it look pretty
removed a couple of unneeded lines
@OptimusTi OptimusTi changed the title Add OSD Stats pages Add OSD Stats pages and some crsf formatting fixes Mar 21, 2021
@avsaase
Copy link
Member

avsaase commented Mar 24, 2021

This is great! Now that there is some free space, I'd like to add a few things from #6548: the option to display cell voltage instead of total battery voltage, and to display both mAh and Wh consumption (could also be an option). Is it okay if I do a PR against your branch?

@OptimusTi
Copy link
Contributor Author

This is great! Now that there is some free space, I'd like to add a few things from #6548: the option to display cell voltage instead of total battery voltage, and to display both mAh and Wh consumption (could also be an option). Is it okay if I do a PR against your branch?

Yes sure, go for it and see how it works.

@avsaase
Copy link
Member

avsaase commented Mar 29, 2021

I probably won't have time to make a PR against your branch in the next week so I think it is best if this is merged so I can make a separate PR later. @DzikuVx?

@avsaase avsaase requested a review from DzikuVx April 6, 2021 07:19
@DzikuVx DzikuVx added this to the 3.0 milestone Apr 6, 2021
@DzikuVx DzikuVx merged commit d019eeb into iNavFlight:master Apr 6, 2021
@OptimusTi OptimusTi deleted the stats-pages branch April 6, 2021 11:22
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.

3 participants