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

Update RSSI_DBM to include diversity antenna in OSD element (CRSF) #12359

Merged
merged 1 commit into from Mar 27, 2023
Merged

Update RSSI_DBM to include diversity antenna in OSD element (CRSF) #12359

Show file tree
Hide file tree
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
10 changes: 9 additions & 1 deletion src/main/osd/osd_elements.c
View file
Open in desktop
Expand Up @@ -1451,7 +1451,15 @@ static void osdElementRtcTime(osdElementParms_t *element)
#ifdef USE_RX_RSSI_DBM
static void osdElementRssiDbm(osdElementParms_t *element)
{
tfp_sprintf(element->buff, "%c%3d", SYM_RSSI, getRssiDbm());
const int8_t antenna = getActiveAntenna();
static bool diversity = false;

if (antenna || diversity) {
diversity = true;
tfp_sprintf(element->buff, "%c%3d:%d", SYM_RSSI, getRssiDbm(), antenna + 1);
} else {
tfp_sprintf(element->buff, "%c%3d", SYM_RSSI, getRssiDbm());
}
}
#endif // USE_RX_RSSI_DBM

Expand Down
1 change: 1 addition & 0 deletions src/main/rx/crsf.c
View file
Open in desktop
Expand Up @@ -234,6 +234,7 @@ static void handleCrsfLinkStatisticsFrame(const crsfLinkStatistics_t* statsPtr,
}
#ifdef USE_RX_RSSI_DBM
setRssiDbm(rssiDbm, RSSI_SOURCE_RX_PROTOCOL_CRSF);
setActiveAntenna(stats.active_antenna);
#endif

#ifdef USE_RX_RSNR
Expand Down
12 changes: 12 additions & 0 deletions src/main/rx/rx.c
View file
Open in desktop
Expand Up @@ -79,6 +79,7 @@ static uint16_t rssi = 0; // range: [0;1023]
static uint16_t rssiRaw = 0; // range: [0;1023]
static timeUs_t lastRssiSmoothingUs = 0;
#ifdef USE_RX_RSSI_DBM
static int8_t activeAntenna;
static int16_t rssiDbm = CRSF_RSSI_MIN; // range: [-130,0]
static int16_t rssiDbmRaw = CRSF_RSSI_MIN; // range: [-130,0]
#endif //USE_RX_RSSI_DBM
Expand Down Expand Up @@ -949,6 +950,17 @@ void setRssiDbmDirect(int16_t newRssiDbm, rssiSource_e source)
rssiDbm = newRssiDbm;
rssiDbmRaw = newRssiDbm;
}

int8_t getActiveAntenna(void)
{
return activeAntenna;
}

void setActiveAntenna(int8_t antenna)
{
activeAntenna = antenna;
}

#endif //USE_RX_RSSI_DBM

#ifdef USE_RX_RSNR
Expand Down
2 changes: 2 additions & 0 deletions src/main/rx/rx.h
View file
Open in desktop
Expand Up @@ -207,6 +207,8 @@ uint16_t rxGetLinkQualityPercent(void);
int16_t getRssiDbm(void);
void setRssiDbm(int16_t newRssiDbm, rssiSource_e source);
void setRssiDbmDirect(int16_t newRssiDbm, rssiSource_e source);
int8_t getActiveAntenna(void);
void setActiveAntenna(int8_t antenna);
#endif //USE_RX_RSSI_DBM

#ifdef USE_RX_RSNR
Expand Down