Add cruise mode heading adjustment and heading error OSD indicators #3380
Conversation
This file contains hidden or 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
shellixyz
force-pushed
the
nav_cruise_mode_osd_items
branch
3 times, most recently
from
ebf4b26 to
bf53f0e
Compare
fiam
reviewed
Jun 22, 2018
| int16_t heading_adjust = lrintf(CENTIDEGREES_TO_DEGREES((float)getCruiseHeadingAdjustment())); | ||
|
|
||
| if (ARMING_FLAG(ARMED) && ((!FLIGHT_MODE(NAV_CRUISE_MODE)) || !(isAdjustingPosition() || isAdjustingHeading() || (heading_adjust != 0)))) { | ||
| displayWrite(osdDisplayPort, elemPosX, elemPosY, " "); |
Member
There was a problem hiding this comment.
I don't like this extra call to displayWrite(). In functions as big as this one, I prefer to avoid early returns when possible. Can you make it write to buff the 5-space string? e.g.
if (ARMING_FLAG(ARMED) && ((!FLIGHT_MODE(NAV_CRUISE_MODE)) || !(isAdjustingPosition() || isAdjustingHeading() || (heading_adjust != 0)))) {
strcpy(buff, " ");
} else {
buff[0] = SYM_HEADING;
if (!ARMING_FLAG(ARMED))
buff[1] = buff[2] = buff[3] = buff[4] = '-';
else if (FLIGHT_MODE(NAV_CRUISE_MODE)) {
tfp_sprintf(buff + 1, "%4d", heading_adjust);
}
buff[5] = SYM_DEGREES;
}
buff[6] = '\0';
Member
There was a problem hiding this comment.
Just did a quick test and the early returns save 40 bytes of flash. Given the current state of flash in F3, I guess we're better off taking the flash savings.
shellixyz
force-pushed
the
nav_cruise_mode_osd_items
branch
from
bf53f0e to
c9a69a6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.