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

Jump to bottom

Fix OSD VTX band/channel info when direct frequency is used #13032

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Fix OSD VTX band/channel info when direct frequency is used #13032

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/main/osd/osd_elements.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ static void osdElementUpDownReference(osdElementParms_t *element)
// Up/Down reference feature displays reference points on the OSD at Zenith and Nadir
const float earthUpinBodyFrame[3] = {-rMat[2][0], -rMat[2][1], -rMat[2][2]}; //transforum the up vector to the body frame

if (fabsf(earthUpinBodyFrame[2]) < SINE_25_DEG && fabsf(earthUpinBodyFrame[1]) < SINE_25_DEG) {
if (fabsf(earthUpinBodyFrame[2]) < SINE_25_DEG && fabsf(earthUpinBodyFrame[1]) < SINE_25_DEG) {
float thetaB; // pitch from body frame to zenith/nadir
float psiB; // psi from body frame to zenith/nadir
char *symbol[2] = {"U", "D"}; // character buffer
Expand Down Expand Up @@ -1018,7 +1018,7 @@ static void osdElementFlymode(osdElementParms_t *element)
static void osdElementReadyMode(osdElementParms_t *element)
{
if (IS_RC_MODE_ACTIVE(BOXREADY) && !ARMING_FLAG(ARMED)) {
strcpy(element->buff, "READY");
strcpy(element->buff, "READY");
}
}

Expand Down Expand Up @@ -1270,7 +1270,7 @@ static void osdElementWattHoursDrawn(osdElementParms_t *element)
element->attr = DISPLAYPORT_SEVERITY_CRITICAL;
}

if (wattHoursDrawn < 1.0f) {
if (wattHoursDrawn < 1.0f) {
tfp_sprintf(element->buff, "%3dMWH", lrintf(wattHoursDrawn * 1000));
} else {
int wattHourWholeNumber = (int)wattHoursDrawn;
Expand Down Expand Up @@ -1593,8 +1593,14 @@ static void osdElementTimer(osdElementParms_t *element)
static void osdElementVtxChannel(osdElementParms_t *element)
{
const vtxDevice_t *vtxDevice = vtxCommonDevice();
const char vtxBandLetter = vtxCommonLookupBandLetter(vtxDevice, vtxSettingsConfig()->band);
const char *vtxChannelName = vtxCommonLookupChannelName(vtxDevice, vtxSettingsConfig()->channel);
uint8_t band = vtxSettingsConfigMutable()->band;
uint8_t channel = vtxSettingsConfig()->channel;
if (band == 0) {
/* Direct frequency set is used */
vtxCommonLookupBandChan(vtxDevice, vtxSettingsConfig()->freq, &band, &channel);
}
const char vtxBandLetter = vtxCommonLookupBandLetter(vtxDevice, band);
const char *vtxChannelName = vtxCommonLookupChannelName(vtxDevice, channel);
unsigned vtxStatus = 0;
uint8_t vtxPower = vtxSettingsConfig()->power;
if (vtxDevice) {
Expand Down