From f289f17b8341363db66e76b011bdc346d1b0d586 Mon Sep 17 00:00:00 2001 From: Brian Webb Date: Mon, 18 Sep 2017 18:54:31 -0700 Subject: [PATCH] LP-552 Moves call to PIOS_BOARD_IO_Configure_OPLink_RCVR from pios_board.c to pios_board_io.c (conditional on OpenLRS protocol not being configured). --- flight/pios/common/pios_board_io.c | 5 +++++ flight/targets/boards/revolution/firmware/pios_board.c | 4 ---- flight/targets/boards/sparky2/firmware/pios_board.c | 4 ---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/flight/pios/common/pios_board_io.c b/flight/pios/common/pios_board_io.c index 9a0d453c8..61fcfc7d0 100644 --- a/flight/pios/common/pios_board_io.c +++ b/flight/pios/common/pios_board_io.c @@ -703,6 +703,11 @@ void PIOS_BOARD_IO_Configure_RFM22B() break; } + /* Initialize the OPLink Receiver */ +#ifdef PIOS_INCLUDE_OPLINKRCVR + PIOS_BOARD_IO_Configure_OPLink_RCVR(); +#endif + /* Reinitialize the modem. */ PIOS_RFM22B_Reinit(pios_rfm22b_id); } diff --git a/flight/targets/boards/revolution/firmware/pios_board.c b/flight/targets/boards/revolution/firmware/pios_board.c index 0f2bc336a..273d4a052 100644 --- a/flight/targets/boards/revolution/firmware/pios_board.c +++ b/flight/targets/boards/revolution/firmware/pios_board.c @@ -315,10 +315,6 @@ void PIOS_Board_Init(void) PIOS_BOARD_IO_Configure_GCS_RCVR(); #endif -#ifdef PIOS_INCLUDE_OPLINKRCVR - PIOS_BOARD_IO_Configure_OPLink_RCVR(); -#endif - #ifndef PIOS_ENABLE_DEBUG_PINS // pios_servo_cfg points to the correct configuration based on input port settings PIOS_Servo_Init(pios_servo_cfg); diff --git a/flight/targets/boards/sparky2/firmware/pios_board.c b/flight/targets/boards/sparky2/firmware/pios_board.c index f65cc1de7..3843d0f25 100644 --- a/flight/targets/boards/sparky2/firmware/pios_board.c +++ b/flight/targets/boards/sparky2/firmware/pios_board.c @@ -274,10 +274,6 @@ void PIOS_Board_Init(void) PIOS_BOARD_IO_Configure_GCS_RCVR(); #endif -#ifdef PIOS_INCLUDE_OPLINKRCVR - PIOS_BOARD_IO_Configure_OPLink_RCVR(); -#endif - #ifndef PIOS_ENABLE_DEBUG_PINS PIOS_Servo_Init(&pios_servo_cfg_out); #else