Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_MSP: add and use AP_RSSI_ENABLED

Browse Source
This commit is contained in:
Peter Barker 2023-12-08 13:02:40 +11:00 committed by Andrew Tridgell
parent e95b1e5dd3
commit 03218b11ac
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/AP_MSP/AP_MSP_Telem_Backend.cpp
View File

@ -1261,6 +1261,7 @@ bool AP_MSP_Telem_Backend::displaying_stats_screen() const
bool AP_MSP_Telem_Backend::get_rssi(float &rssi) const bool AP_MSP_Telem_Backend::get_rssi(float &rssi) const
{ {
#if AP_RSSI_ENABLED
AP_RSSI* ap_rssi = AP::rssi(); AP_RSSI* ap_rssi = AP::rssi();
if (ap_rssi == nullptr) { if (ap_rssi == nullptr) {
return false; return false;
@ -1270,5 +1271,9 @@ bool AP_MSP_Telem_Backend::get_rssi(float &rssi) const
} }
rssi = ap_rssi->read_receiver_rssi(); // range is [0-1] rssi = ap_rssi->read_receiver_rssi(); // range is [0-1]
return true; return true;
#else
return false;
#endif
} }
#endif //HAL_MSP_ENABLED #endif //HAL_MSP_ENABLED

4
libraries/AP_MSP/AP_MSP_Telem_DJI.cpp
View File

@ -224,6 +224,7 @@ bool AP_MSP_Telem_DJI::get_rssi(float &rssi) const
if (!displaying_stats_screen()) { if (!displaying_stats_screen()) {
return true; return true;
} }
#if AP_RSSI_ENABLED
AP_RSSI* ap_rssi = AP::rssi(); AP_RSSI* ap_rssi = AP::rssi();
if (ap_rssi == nullptr) { if (ap_rssi == nullptr) {
return false; return false;
@ -231,6 +232,9 @@ bool AP_MSP_Telem_DJI::get_rssi(float &rssi) const
if (!ap_rssi->enabled()) { if (!ap_rssi->enabled()) {
return false; return false;
} }
#else
return false;
#endif
AP_OSD *osd = AP::osd(); AP_OSD *osd = AP::osd();
if (osd == nullptr) { if (osd == nullptr) {
return false; return false;