Add RSSI dBm alarm configurable in the OSD tab (#4020)

betaflight · Jun 13, 2024 · cf2662c · cf2662c
1 parent 08214ef
commit cf2662c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/locales/en/messages.json b/locales/en/messages.json
@@ -6236,6 +6236,11 @@
         "message": "Link Quality",
         "description": "Text of the link quality alarm"
       },
+      "osdTimerAlarmOptionRssiDbm": {
+        "message": "RSSI dBm",
+        "description": "Text of the RSSI dBm alarm"
+      },
+
     "osdWarningTextArmingDisabled": {
         "message": "Arming disabled",
         "description": "One of the warnings that can be selected to be shown in the OSD"

diff --git a/src/js/data_storage.js b/src/js/data_storage.js
@@ -7,7 +7,7 @@ export const API_VERSION_1_47 = '1.47.0';
 const CONFIGURATOR = {
     // all versions are specified and compared using semantic versioning http://semver.org/
     API_VERSION_ACCEPTED: API_VERSION_1_44,
-    API_VERSION_MAX_SUPPORTED: API_VERSION_1_46,
+    API_VERSION_MAX_SUPPORTED: API_VERSION_1_47,
 
     connectionValid: false,
     connectionValidCliOnly: false,

diff --git a/src/js/tabs/osd.js b/src/js/tabs/osd.js
@@ -6,7 +6,7 @@ import VirtualFC from "../VirtualFC";
 import FC from "../fc";
 import MSP from "../msp";
 import MSPCodes from "../msp/MSPCodes";
-import CONFIGURATOR, { API_VERSION_1_45, API_VERSION_1_46 } from "../data_storage";
+import CONFIGURATOR, { API_VERSION_1_45, API_VERSION_1_46, API_VERSION_1_47 } from "../data_storage";
 import LogoManager from "../LogoManager";
 import { gui_log } from "../gui_log";
 import semver from "semver";
@@ -2188,6 +2188,11 @@ OSD.msp = {
             if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
                 result.push16(OSD.data.alarms.link_quality.value);
             }
+
+            if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_47)) {
+                result.push16(OSD.data.alarms.rssi_dbm.value);
+            }
+
         }
         return result;
     },
@@ -2402,6 +2407,10 @@ OSD.msp = {
             d.alarms['link_quality'] = { display_name: i18n.getMessage('osdTimerAlarmOptionLinkQuality'), value: view.readU16() };
         }
 
+        if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_47)) {
+            d.alarms['rssi_dbm'] = { display_name: i18n.getMessage('osdTimerAlarmOptionRssiDbm'), value: view.read16() };
+        }
+
         this.processOsdElements(d, itemsPositionsRead);
 
         OSD.updateDisplaySize();