AP_OSD: support for main rotor rpm #23711
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tridge
requested changes
May 7, 2023
| @@ -1638,6 +1654,22 @@ void AP_OSD_Screen::draw_heading(uint8_t x, uint8_t y) | |||
| backend->write(x, y, false, "%3d%c", yaw, SYMBOL(SYM_DEGR)); | |||
| } | |||
|
|
|||
| void AP_OSD_Screen::draw_rrpm(uint8_t x, uint8_t y) | |||
| { | |||
There was a problem hiding this comment.
we need to check for #if AP_RPM_ENABLED and include AP_RPM/AP_RPM_config.h
There was a problem hiding this comment.
Hi Andrew thank you so much for the recommendations: I have pushed mods in the "fix" commit below, don't know if there's better way to do it though.
libraries/AP_OSD/AP_OSD_Screen.cpp
Outdated
| // No RPM because pointer is null | ||
| _rrpm = -1; | ||
| } | ||
| backend->write(x, y, false, "%4.0f%c", (double)_rrpm, SYMBOL(SYM_RPM)); |
There was a problem hiding this comment.
it is a little more efficient to cast to an integer than double
tridge
requested changes
May 10, 2023
tridge
requested changes
May 12, 2023
| @@ -2251,6 +2290,7 @@ void AP_OSD_Screen::draw(void) | |||
| DRAW_SETTING(heading); | |||
| DRAW_SETTING(wind); | |||
| DRAW_SETTING(home); | |||
| DRAW_SETTING(rrpm); | |||
There was a problem hiding this comment.
i'm surprised this compiles with RPM disabled? It will call a non-existant function
tridge
requested changes
May 12, 2023
displays main rotor rpm in OSD
|
Thank you! |
.... otherwise include chain on bootloaders can try to include mavlink
|
I've pushed up a patch to resolve the compilation problem this was having in CI |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
displays main rotor rpm in OSD