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.

Sign up for GitHub

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

resolve #555; DJIwarning only if OSD defined #559

Closed
wants to merge 3 commits into from
Closed

resolve #555; DJIwarning only if OSD defined #559

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f173450
resolve #555; DJIwarning only if OSD defined
nerdCopter May 8, 2021
0e0b3ba
resolve #555; DJIwarning only if OSD defined
nerdCopter May 8, 2021
0d81d58
Merge branch 'master' into 20210508_ifdefOSD_DJI_issue555
nerdCopter Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/interface/msp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,10 +768,12 @@ bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst) {
case MSP_NAME: {
// Show warning for DJI OSD instead of pilot name
// works if osd warnings enabled, osd_warn_dji is on and usb is not connected
nerdCopter marked this conversation as resolved.
Show resolved Hide resolved
#ifdef USE_OSD
Copy link
Member

Choose a reason for hiding this comment

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

This should be okay, however, if the FC does not have an analog OSD chip, it still technically could perform DJI OSD functions. But DJI custom osd would not work without enabling USE_OSD. I feel like theres a small user base that would lose DJI OSD on these FCs

Copy link
Member Author

Choose a reason for hiding this comment

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

interesting. i don't know how to resolve such.

if (osdWarnGetState(OSD_WARNING_DJI)) {
sbufWriteString(dst, djiWarningBuffer);
break;
}
#endif
const int nameLen = strlen(pilotConfig()->name);
for (int i = 0; i < nameLen; i++) {
sbufWriteU8(dst, pilotConfig()->name[i]);
Expand Down