Skip to content

Commit

Permalink
Merge pull request #10450 from iNavFlight/MrD_Have-RSSI-go-to-100%,-r…
Browse files Browse the repository at this point in the history
…ather-than-99%

Have RSSI go from 0-100%, rather than 0-99%
  • Loading branch information
MrD-RC authored Nov 6, 2024
2 parents de0d603 + 6a77be5 commit b8a5d9a
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions src/main/io/osd.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ typedef struct statistic_s {
uint16_t min_voltage; // /100
int16_t max_current;
int32_t max_power;
int16_t min_rssi;
uint8_t min_rssi;
int16_t min_lq; // for CRSF
int16_t min_rssi_dbm; // for CRSF
int32_t max_altitude;
Expand Down Expand Up @@ -616,11 +616,11 @@ char *osdFormatTrimWhiteSpace(char *buff)

/**
* Converts RSSI into a % value used by the OSD.
* Range is [0, 100]
*/
static uint16_t osdConvertRSSI(void)
static uint8_t osdConvertRSSI(void)
{
// change range to [0, 99]
return constrain(getRSSI() * 100 / RSSI_MAX_VALUE, 0, 99);
return constrain(getRSSI() * 100 / RSSI_MAX_VALUE, 0, 100);
}

static uint16_t osdGetCrsfLQ(void)
Expand Down Expand Up @@ -1712,9 +1712,13 @@ static bool osdDrawSingleElement(uint8_t item)
}
case OSD_RSSI_VALUE:
{
uint16_t osdRssi = osdConvertRSSI();
uint8_t osdRssi = osdConvertRSSI();
buff[0] = SYM_RSSI;
tfp_sprintf(buff + 1, "%2d", osdRssi);
if (osdRssi < 100)
tfp_sprintf(buff + 1, "%2d", osdRssi);
else
tfp_sprintf(buff + 1, "%c ", SYM_MAX);

if (osdRssi < osdConfig()->rssi_alarm) {
TEXT_ATTRIBUTES_ADD_BLINK(elemAttr);
}
Expand Down Expand Up @@ -4582,7 +4586,7 @@ static void osdResetStats(void)
stats.max_3D_speed = 0;
stats.max_air_speed = 0;
stats.min_voltage = 12000;
stats.min_rssi = 99;
stats.min_rssi = 100;
stats.min_lq = 300;
stats.min_rssi_dbm = 0;
stats.max_altitude = 0;
Expand Down

0 comments on commit b8a5d9a

Please sign in to comment.