LP-518 Allow Mavlink and MSP Rssi for OpenLRS and use OPLinkStatus.RSSI

Author: f5soh

flight/modules/UAVOMSPBridge/UAVOMSPBridge.c

@@ -43,7 +43,7 @@
 #include "gpspositionsensor.h"
 #include "manualcontrolcommand.h"
 #include "manualcontrolsettings.h"
-#include "oplinkreceiver.h"
+#include "oplinkstatus.h"
 #include "accessorydesired.h"
 #include "attitudestate.h"
 #include "airspeedstate.h"
@@ -479,9 +479,10 @@ static void msp_send_analog(struct msp_bridge *m)
     ManualControlSettingsChannelGroupsGet(&channelGroups);
 
 #ifdef PIOS_INCLUDE_OPLINKRCVR
-    if (channelGroups.Throttle == MANUALCONTROLSETTINGS_CHANNELGROUPS_OPLINK) {
+    if ((channelGroups.Throttle == MANUALCONTROLSETTINGS_CHANNELGROUPS_OPLINK) ||
+        (channelGroups.Throttle == MANUALCONTROLSETTINGS_CHANNELGROUPS_OPENLRS)) {
         int8_t rssi;
-        OPLinkReceiverRSSIGet(&rssi);
+        OPLinkStatusRSSIGet(&rssi);
 
         // MSP values have no units, and OSD rssi display requires calibration anyway, so we will translate OPLINK_LOW_RSSI to OPLINK_HIGH_RSSI -> 0-1023
         if (rssi < OPLINK_LOW_RSSI) {

flight/modules/UAVOMavlinkBridge/UAVOMavlinkBridge.c

@@ -52,7 +52,7 @@
 #include "taskinfo.h"
 #include "mavlink.h"
 #include "hwsettings.h"
-#include "oplinkreceiver.h"
+#include "oplinkstatus.h"
 #include "receiverstatus.h"
 #include "manualcontrolsettings.h"
 
@@ -248,9 +248,10 @@ static void mavlink_send_rc_channels()
     ManualControlSettingsChannelGroupsGet(&channelGroups);
 
 #ifdef PIOS_INCLUDE_OPLINKRCVR
-    if (channelGroups.Throttle == MANUALCONTROLSETTINGS_CHANNELGROUPS_OPLINK) {
+    if ((channelGroups.Throttle == MANUALCONTROLSETTINGS_CHANNELGROUPS_OPLINK) ||
+        (channelGroups.Throttle == MANUALCONTROLSETTINGS_CHANNELGROUPS_OPENLRS)) {
         int8_t rssi;
-        OPLinkReceiverRSSIGet(&rssi);
+        OPLinkStatusRSSIGet(&rssi);
 
         if (rssi < OPLINK_LOW_RSSI) {
             rssi = OPLINK_LOW_RSSI;