Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-13 19:40:27 +03:00
Code Issues Wiki Activity

Merge pull request #10450 from iNavFlight/MrD_Have-RSSI-go-to-100%,-rather-than-99%

Browse source 
Have RSSI go from 0-100%, rather than 0-99%
This commit is contained in:
Darren Lines 2024-11-06 20:12:10 +00:00 • committed by GitHub
commit b8a5d9a2d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/io/osd.c
View file

@ -181,7 +181,7 @@ typedef struct statistic_s {
uint16_t min_voltage; // /100 uint16_t min_voltage; // /100
int16_t max_current; int16_t max_current;
int32_t max_power; int32_t max_power;
int16_t min_rssi; uint8_t min_rssi;
int16_t min_lq; // for CRSF int16_t min_lq; // for CRSF
int16_t min_rssi_dbm; // for CRSF int16_t min_rssi_dbm; // for CRSF
int32_t max_altitude; int32_t max_altitude;
@ -616,11 +616,11 @@ char *osdFormatTrimWhiteSpace(char *buff)
/** /**
* Converts RSSI into a % value used by the OSD. * 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, 100);
return constrain(getRSSI() * 100 / RSSI_MAX_VALUE, 0, 99);
} }
static uint16_t osdGetCrsfLQ(void) static uint16_t osdGetCrsfLQ(void)
@ -1712,9 +1712,13 @@ static bool osdDrawSingleElement(uint8_t item)
} }
case OSD_RSSI_VALUE: case OSD_RSSI_VALUE:
{ {
uint16_t osdRssi = osdConvertRSSI(); uint8_t osdRssi = osdConvertRSSI();
buff[0] = SYM_RSSI; buff[0] = SYM_RSSI;
if (osdRssi < 100)
tfp_sprintf(buff + 1, "%2d", osdRssi); tfp_sprintf(buff + 1, "%2d", osdRssi);
else
tfp_sprintf(buff + 1, "%c ", SYM_MAX);
if (osdRssi < osdConfig()->rssi_alarm) { if (osdRssi < osdConfig()->rssi_alarm) {
TEXT_ATTRIBUTES_ADD_BLINK(elemAttr); TEXT_ATTRIBUTES_ADD_BLINK(elemAttr);
} }
@ -4582,7 +4586,7 @@ static void osdResetStats(void)
stats.max_3D_speed = 0; stats.max_3D_speed = 0;
stats.max_air_speed = 0; stats.max_air_speed = 0;
stats.min_voltage = 12000; stats.min_voltage = 12000;
stats.min_rssi = 99; stats.min_rssi = 100;
stats.min_lq = 300; stats.min_lq = 300;
stats.min_rssi_dbm = 0; stats.min_rssi_dbm = 0;
stats.max_altitude = 0; stats.max_altitude = 0;