1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00

LP-548 Moves PIOS_OPLINK_RCVR_TIMEOUT_MS to pios_oplinkrcvr.c and adds oplinkreceiver and gcsreceiver modules to coptercontrol.

This commit is contained in:
Brian Webb 2017-09-04 11:25:06 -07:00
parent 1627eb3882
commit 59d20ee752
15 changed files with 8 additions and 18 deletions

View File

@ -37,6 +37,8 @@
#include <oplinkstatus.h>
#include <pios_oplinkrcvr_priv.h>
// Put receiver in failsafe if not updated within timeout
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
/* Provide a RCVR driver */
static int32_t PIOS_OPLinkRCVR_Get(uint32_t rcvr_id, uint8_t channel);

View File

@ -204,7 +204,6 @@ extern uint32_t pios_ws2811_id;
#define PIOS_RCVR_MAX_DEVS 3
#define PIOS_RCVR_MAX_CHANNELS 12
#define PIOS_GCSRCVR_TIMEOUT_MS 100
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
// -------------------------
// Receiver PPM input

View File

@ -133,6 +133,8 @@ ifndef TESTAPP
SRC += $(FLIGHT_UAVOBJ_DIR)/txpidsettings.c
SRC += $(FLIGHT_UAVOBJ_DIR)/txpidstatus.c
SRC += $(FLIGHT_UAVOBJ_DIR)/mpugyroaccelsettings.c
SRC += $(FLIGHT_UAVOBJ_DIR)/gcsreceiver.c
SRC += $(FLIGHT_UAVOBJ_DIR)/oplinkreceiver.c
# Command line option for Gcsreceiver module
ifeq ($(GCSRECEIVER), YES)
SRC += $(FLIGHT_UAVOBJ_DIR)/gcsreceiver.c

View File

@ -228,7 +228,6 @@ extern uint32_t pios_spi_flash_accel_adapter_id;
#define PIOS_RCVR_MAX_DEVS 3
#define PIOS_RCVR_MAX_CHANNELS 12
#define PIOS_GCSRCVR_TIMEOUT_MS 100
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
// -------------------------
// Receiver PPM input

View File

@ -203,8 +203,6 @@ extern uint32_t pios_packet_handler;
#define PIOS_RCVR_MAX_DEVS 3
#define PIOS_RCVR_MAX_CHANNELS 12
#define PIOS_GCSRCVR_TIMEOUT_MS 100
#define PIOS_RFM22B_RCVR_TIMEOUT_MS 200
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
// -------------------------
// Receiver PPM input

View File

@ -28,8 +28,7 @@ include $(FLIGHT_ROOT_DIR)/make/firmware-defs.mk
override USE_DSP_LIB := NO
# List of mandatory modules to include
MODULES += \
RadioComBridge
MODULES += RadioComBridge
# List of optional modules to include
OPTMODULES =

View File

@ -161,7 +161,6 @@ extern uint32_t pios_ws2811_id;
#define PIOS_RCVR_MAX_DEVS 3
#define PIOS_RCVR_MAX_CHANNELS 12
#define PIOS_GCSRCVR_TIMEOUT_MS 100
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
// -------------------------
// Receiver PPM input

View File

@ -1,3 +1,4 @@
/**
******************************************************************************
* @addtogroup OpenPilotSystem OpenPilot System
@ -223,8 +224,6 @@ extern uint32_t pios_packet_handler;
#define PIOS_RCVR_MAX_DEVS 3
#define PIOS_RCVR_MAX_CHANNELS 12
#define PIOS_GCSRCVR_TIMEOUT_MS 100
#define PIOS_RFM22B_RCVR_TIMEOUT_MS 200
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
// -------------------------
// Receiver PPM input

View File

@ -218,8 +218,6 @@ extern uint32_t pios_packet_handler;
#define PIOS_RCVR_MAX_DEVS 3
#define PIOS_RCVR_MAX_CHANNELS 12
#define PIOS_GCSRCVR_TIMEOUT_MS 100
#define PIOS_RFM22B_RCVR_TIMEOUT_MS 200
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
// -------------------------
// Receiver PPM input

View File

@ -196,7 +196,6 @@ extern uint32_t pios_ws2811_id;
#define PIOS_RCVR_MAX_DEVS 3
#define PIOS_RCVR_MAX_CHANNELS 12
#define PIOS_GCSRCVR_TIMEOUT_MS 100
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
// -------------------------
// Receiver PPM input

View File

@ -1,3 +1,4 @@
/**
******************************************************************************
* @addtogroup OpenPilotSystem OpenPilot System
@ -225,8 +226,6 @@ extern uint32_t pios_packet_handler;
#define PIOS_RCVR_MAX_DEVS 3
#define PIOS_RCVR_MAX_CHANNELS 12
#define PIOS_GCSRCVR_TIMEOUT_MS 100
#define PIOS_RFM22B_RCVR_TIMEOUT_MS 200
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
// -------------------------
// Receiver PPM input

View File

@ -167,7 +167,6 @@ extern uint32_t pios_ws2811_id;
#define PIOS_RCVR_MAX_DEVS 3
#define PIOS_RCVR_MAX_CHANNELS 12
#define PIOS_GCSRCVR_TIMEOUT_MS 100
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
// -------------------------
// Receiver PPM input

View File

@ -172,7 +172,6 @@ extern uint32_t pios_ws2811_id;
#define PIOS_RCVR_MAX_DEVS 3
#define PIOS_RCVR_MAX_CHANNELS 12
#define PIOS_GCSRCVR_TIMEOUT_MS 100
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
// -------------------------
// Receiver PPM input

View File

@ -135,7 +135,6 @@ extern uint32_t pios_ws2811_id;
#define PIOS_RCVR_MAX_DEVS 3
#define PIOS_RCVR_MAX_CHANNELS 12
#define PIOS_GCSRCVR_TIMEOUT_MS 100
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
// -------------------------
// Receiver PPM input

View File

@ -56,7 +56,7 @@ class UavtalkDemo():
_port = int(port[3:]) - 1
else:
_port = port
serPort = serial.Serial(port, 57600, timeout=.5)
serPort = serial.Serial(_port, 57600, timeout=.5)
if not serPort.isOpen():
raise IOError("Failed to open serial port")