rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

LP-298 Use PIOS_IBUS_NUM_INPUTS like other inputs

Browse Source
This commit is contained in:
Laurent Lalanne 2016-08-03 19:52:34 +02:00
parent 848638d6e7
commit e52d2636f0
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
flight/pios/common/pios_ibus.c
View File

@ -1,7 +1,8 @@
/**
******************************************************************************
* @file pios_ibus.c
* @author dRonin, http://dRonin.org/, Copyright (C) 2016
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
* dRonin, http://dRonin.org/, Copyright (C) 2016
* @addtogroup PIOS PIOS Core hardware abstraction layer
* @{
* @addtogroup PIOS_IBus PiOS IBus receiver driver
@ -32,10 +33,8 @@
#ifdef PIOS_INCLUDE_IBUS
// private
#define PIOS_IBUS_CHANNELS 10
// 1 sync byte, 1 unknown byte, 10x channels (uint16_t), 8 unknown bytes, 2 crc bytes
#define PIOS_IBUS_BUFLEN (1 + 1 + PIOS_IBUS_CHANNELS * 2 + 8 + 2)
#define PIOS_IBUS_BUFLEN (1 + 1 + PIOS_IBUS_NUM_INPUTS * 2 + 8 + 2)
#define PIOS_IBUS_SYNCBYTE 0x20
#define PIOS_IBUS_MAGIC 0x84fd9a39
@ -48,7 +47,7 @@ struct pios_ibus_dev {
int rx_timer;
int failsafe_timer;
uint16_t checksum;
uint16_t channel_data[PIOS_IBUS_CHANNELS];
uint16_t channel_data[PIOS_IBUS_NUM_INPUTS];
uint8_t rx_buf[PIOS_IBUS_BUFLEN];
};
@ -154,7 +153,7 @@ int32_t PIOS_IBUS_Init(uint32_t *ibus_id, const struct pios_com_driver *driver,
static int32_t PIOS_IBUS_Read(uint32_t context, uint8_t channel)
{
if (channel > PIOS_IBUS_CHANNELS) {
if (channel > PIOS_IBUS_NUM_INPUTS) {
return PIOS_RCVR_INVALID;
}
@ -168,7 +167,7 @@ static int32_t PIOS_IBUS_Read(uint32_t context, uint8_t channel)
static void PIOS_IBUS_SetAllChannels(struct pios_ibus_dev *ibus_dev, uint16_t value)
{
for (int i = 0; i < PIOS_IBUS_CHANNELS; i++) {
for (int i = 0; i < PIOS_IBUS_NUM_INPUTS; i++) {
ibus_dev->channel_data[i] = value;
}
}
@ -223,7 +222,7 @@ static void PIOS_IBUS_UnpackFrame(struct pios_ibus_dev *ibus_dev)
}
uint16_t *chan = (uint16_t *)&ibus_dev->rx_buf[2];
for (int i = 0; i < PIOS_IBUS_CHANNELS; i++) {
for (int i = 0; i < PIOS_IBUS_NUM_INPUTS; i++) {
ibus_dev->channel_data[i] = *chan++;
}

6
flight/targets/boards/revolution/pios_board.h
View File

@ -287,6 +287,12 @@ extern uint32_t pios_packet_handler;
#define PIOS_DSM_MAX_DEVS 2
#define PIOS_DSM_NUM_INPUTS 12
// -------------------------
// Receiver FlySky IBus input
// -------------------------
#define PIOS_IBUS_MAX_DEVS 1
#define PIOS_IBUS_NUM_INPUTS 10
// -------------------------
// Servo outputs
// -------------------------

6
flight/targets/boards/revonano/pios_board.h
View File

@ -287,6 +287,12 @@ extern uint32_t pios_packet_handler;
#define PIOS_DSM_MAX_DEVS 2
#define PIOS_DSM_NUM_INPUTS 12
// -------------------------
// Receiver FlySky IBus input
// -------------------------
#define PIOS_IBUS_MAX_DEVS 1
#define PIOS_IBUS_NUM_INPUTS 10
// -------------------------
// Servo outputs
// -------------------------

6
flight/targets/boards/sparky2/pios_board.h
View File

@ -289,6 +289,12 @@ extern uint32_t pios_packet_handler;
#define PIOS_DSM_MAX_DEVS 2
#define PIOS_DSM_NUM_INPUTS 12
// -------------------------
// Receiver FlySky IBus input
// -------------------------
#define PIOS_IBUS_MAX_DEVS 1
#define PIOS_IBUS_NUM_INPUTS 10
// -------------------------
// Servo outputs
// -------------------------