From e74f47a26e1bc14e73b54990a2e22ef73bbc9964 Mon Sep 17 00:00:00 2001 From: Bruce Luckcuck Date: Sun, 7 Mar 2021 09:20:36 -0500 Subject: [PATCH] Fix CMS RSSI dBm alarm data type and range Data type was `uint8` and needed to be `int16` to accomodate the range change to negative numbers. --- src/main/cli/settings.c | 2 +- src/main/cms/cms_menu_osd.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/cli/settings.c b/src/main/cli/settings.c index bad004424a..c1296665fc 100644 --- a/src/main/cli/settings.c +++ b/src/main/cli/settings.c @@ -1326,7 +1326,7 @@ const clivalue_t valueTable[] = { { "osd_link_quality_alarm", VAR_UINT16 | MASTER_VALUE, .config.minmaxUnsigned = { 0, 100 }, PG_OSD_CONFIG, offsetof(osdConfig_t, link_quality_alarm) }, #endif #ifdef USE_RX_RSSI_DBM - { "osd_rssi_dbm_alarm", VAR_INT16 | MASTER_VALUE, .config.minmaxUnsigned = { CRSF_RSSI_MIN, CRSF_SNR_MAX }, PG_OSD_CONFIG, offsetof(osdConfig_t, rssi_dbm_alarm) }, + { "osd_rssi_dbm_alarm", VAR_INT16 | MASTER_VALUE, .config.minmax = { CRSF_RSSI_MIN, CRSF_SNR_MAX }, PG_OSD_CONFIG, offsetof(osdConfig_t, rssi_dbm_alarm) }, #endif { "osd_cap_alarm", VAR_UINT16 | MASTER_VALUE, .config.minmaxUnsigned = { 0, 20000 }, PG_OSD_CONFIG, offsetof(osdConfig_t, cap_alarm) }, { "osd_alt_alarm", VAR_UINT16 | MASTER_VALUE, .config.minmaxUnsigned = { 0, 10000 }, PG_OSD_CONFIG, offsetof(osdConfig_t, alt_alarm) }, diff --git a/src/main/cms/cms_menu_osd.c b/src/main/cms/cms_menu_osd.c index 70021a8987..177a765acf 100644 --- a/src/main/cms/cms_menu_osd.c +++ b/src/main/cms/cms_menu_osd.c @@ -49,6 +49,8 @@ #include "pg/pg.h" #include "pg/pg_ids.h" +#include "rx/crsf.h" + #include "sensors/battery.h" #ifdef USE_EXTENDED_CMS_MENUS @@ -180,7 +182,7 @@ static CMS_Menu menuOsdActiveElems = { static uint8_t osdConfig_rssi_alarm; static uint16_t osdConfig_link_quality_alarm; -static uint8_t osdConfig_rssi_dbm_alarm; +static int16_t osdConfig_rssi_dbm_alarm; static uint16_t osdConfig_cap_alarm; static uint16_t osdConfig_alt_alarm; static uint16_t osdConfig_distance_alarm; @@ -225,7 +227,7 @@ const OSD_Entry menuAlarmsEntries[] = {"--- ALARMS ---", OME_Label, NULL, NULL, 0}, {"RSSI", OME_UINT8, NULL, &(OSD_UINT8_t){&osdConfig_rssi_alarm, 5, 90, 5}, 0}, {"LINK QUALITY", OME_UINT16, NULL, &(OSD_UINT16_t){&osdConfig_link_quality_alarm, 5, 300, 5}, 0}, - {"RSSI DBM", OME_UINT8, NULL, &(OSD_UINT8_t){&osdConfig_rssi_dbm_alarm, 5, 130, 5}, 0}, + {"RSSI DBM", OME_INT16, NULL, &(OSD_INT16_t){&osdConfig_rssi_dbm_alarm, CRSF_RSSI_MIN, CRSF_SNR_MAX, 5}, 0}, {"MAIN BAT", OME_UINT16, NULL, &(OSD_UINT16_t){&osdConfig_cap_alarm, 50, 30000, 50}, 0}, {"MAX ALT", OME_UINT16, NULL, &(OSD_UINT16_t){&osdConfig_alt_alarm, 1, 200, 1}, 0}, {"MAX DISTANCE", OME_UINT16, NULL, &(OSD_UINT16_t){&osdConfig_distance_alarm, 0, UINT16_MAX, 10}, 0},