Skip to content

Commit 4e6077c

Browse files
committed
LP-548 Removes OPLinkReceiver from coptercontrol and fixes setting of OPLinkReceiver RSSI and quality on revolution and sparky2.
1 parent 59d20ee commit 4e6077c

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

flight/pios/common/pios_oplinkrcvr.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ static void PIOS_oplinkrcvr_ppm_callback(uint32_t oplinkrcvr_id, const int16_t *
8686

8787
// Update the RSSI and quality fields.
8888
int8_t rssi;
89-
OPLinkReceiverRSSIGet(&rssi);
89+
OPLinkStatusRSSIGet(&rssi);
9090
oplinkrcvr_dev->oplinkreceiverdata.RSSI = rssi;
91-
uint8_t quality;
92-
OPLinkReceiverLinkQualityGet(&quality);
91+
uint16_t quality;
92+
OPLinkStatusLinkQualityGet(&quality);
9393
// Link quality is 0-128, so scale it down to 0-100
9494
oplinkrcvr_dev->oplinkreceiverdata.LinkQuality = quality * 100 / 128;
9595

flight/targets/boards/coptercontrol/firmware/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ ifndef TESTAPP
133133
SRC += $(FLIGHT_UAVOBJ_DIR)/txpidsettings.c
134134
SRC += $(FLIGHT_UAVOBJ_DIR)/txpidstatus.c
135135
SRC += $(FLIGHT_UAVOBJ_DIR)/mpugyroaccelsettings.c
136-
SRC += $(FLIGHT_UAVOBJ_DIR)/gcsreceiver.c
137-
SRC += $(FLIGHT_UAVOBJ_DIR)/oplinkreceiver.c
138136
# Command line option for Gcsreceiver module
139137
ifeq ($(GCSRECEIVER), YES)
140138
SRC += $(FLIGHT_UAVOBJ_DIR)/gcsreceiver.c

flight/targets/boards/coptercontrol/firmware/inc/pios_config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@
107107
#define PIOS_INCLUDE_SRXL
108108
#define PIOS_INCLUDE_HOTT
109109
#define PIOS_INCLUDE_IBUS
110-
#define PIOS_INCLUDE_GCSRCVR
111-
#define PIOS_INCLUDE_OPLINKRCVR
110+
/* #define PIOS_INCLUDE_GCSRCVR */
111+
/* #define PIOS_INCLUDE_OPLINKRCVR */
112112

113113
/* PIOS abstract receiver interface */
114114
#define PIOS_INCLUDE_RCVR

0 commit comments

Comments
 (0)