rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Merge branch 'thread/LP-196_Jeti_Ex_Bus_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09

Browse Source 
# Conflicts:
#	flight/targets/boards/coptercontrol/board_hw_defs.c
#	flight/targets/boards/coptercontrol/firmware/pios_board.c
#	flight/targets/boards/revolution/board_hw_defs.c
#	flight/targets/boards/revolution/firmware/inc/pios_config.h
#	flight/targets/boards/revolution/firmware/pios_board.c
#	flight/targets/boards/revonano/firmware/inc/pios_config.h
#	flight/targets/boards/revonano/firmware/pios_board.c
#	shared/uavobjectdefinition/hwsettings.xml
#	shared/uavobjectdefinition/manualcontrolsettings.xml
#	shared/uavobjectdefinition/receiveractivity.xml
This commit is contained in:
Fredrik Arvidsson 2016-01-09 16:59:24 +01:00
commit 02c981388a
21 changed files with 774 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flight/make/apps-defs.mk
View File

@ -88,6 +88,7 @@ SRC += $(PIOSCOMMON)/pios_rcvr.c
SRC += $(PIOSCOMMON)/pios_sbus.c
SRC += $(PIOSCOMMON)/pios_hott.c
SRC += $(PIOSCOMMON)/pios_srxl.c
SRC += $(PIOSCOMMON)/pios_exbus.c
SRC += $(PIOSCOMMON)/pios_sdcard.c
SRC += $(PIOSCOMMON)/pios_sensors.c

3
flight/modules/Receiver/receiver.c
View File

@ -655,6 +655,9 @@ static bool updateRcvrActivityCompare(uint32_t rcvr_id, struct rcvr_activity_fsm
case MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMFLEXIPORT:
group = RECEIVERACTIVITY_ACTIVEGROUP_DSMFLEXIPORT;
break;
case MANUALCONTROLSETTINGS_CHANNELGROUPS_EXBUS:
group = RECEIVERACTIVITY_ACTIVEGROUP_EXBUS;
break;
case MANUALCONTROLSETTINGS_CHANNELGROUPS_SBUS:
group = RECEIVERACTIVITY_ACTIVEGROUP_SBUS;
break;

439
flight/pios/common/pios_exbus.c Normal file
View File

@ -0,0 +1,439 @@
/**
******************************************************************************
* @file pios_exbus.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
* Tau Labs, http://taulabs.org, Copyright (C) 2013
* @addtogroup PIOS PIOS Core hardware abstraction layer
* @{
* @addtogroup PIOS_EXBUS Jeti EX Bus receiver functions
* @{
* @brief Jeti EX Bus receiver functions
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Project Includes */
#include "pios_exbus_priv.h"
#if defined(PIOS_INCLUDE_EXBUS)
#if !defined(PIOS_INCLUDE_RTC)
#error PIOS_INCLUDE_RTC must be used to use EXBUS
#endif
/**
* Based on Jeti EX Bus protocol version 1.21
* Available at http://www.jetimodel.com/en/Telemetry-Protocol/
*/
/* EXBUS frame size and contents definitions */
#define EXBUS_HEADER_LENGTH 4
#define EXBUS_CRC_LENGTH 2
#define EXBUS_MAX_CHANNELS 16
#define EXBUS_OVERHEAD_LENGTH (EXBUS_HEADER_LENGTH + EXBUS_CRC_LENGTH)
#define EXBUS_MAX_FRAME_LENGTH (EXBUS_MAX_CHANNELS*2+10 + EXBUS_OVERHEAD_LENGTH)
#define EXBUS_SYNC_CHANNEL 0x3E
#define EXBUS_SYNC_TELEMETRY 0x3D
#define EXBUS_BYTE_REQ 0x01
#define EXBUS_BYTE_NOREQ 0x03
#define EXBUS_DATA_CHANNEL 0x31
#define EXBUS_DATA_TELEMETRY 0x3A
#define EXBUS_DATA_JETIBOX 0x3B
#define EXBUS_LOW_BAUD_RATE 125000
#define EXBUS_HIGH_BAUD_RATE 250000
#define EXBUS_BAUD_RATE_LIMIT 64
/* Forward Declarations */
static int32_t PIOS_EXBUS_Get(uint32_t rcvr_id, uint8_t channel);
static uint16_t PIOS_EXBUS_RxInCallback(uint32_t context,
uint8_t *buf,
uint16_t buf_len,
uint16_t *headroom,
bool *need_yield);
static void PIOS_EXBUS_Supervisor(uint32_t exbus_id);
static uint16_t PIOS_EXBUS_CRC_Update(uint16_t crc, uint8_t data);
/* Local Variables */
const struct pios_rcvr_driver pios_exbus_rcvr_driver = {
.read = PIOS_EXBUS_Get,
};
enum pios_exbus_dev_magic {
PIOS_EXBUS_DEV_MAGIC = 0x485355FF,
};
enum pios_exbus_frame_state {
EXBUS_STATE_SYNC,
EXBUS_STATE_REQ,
EXBUS_STATE_LEN,
EXBUS_STATE_PACKET_ID,
EXBUS_STATE_DATA_ID,
EXBUS_STATE_SUBLEN,
EXBUS_STATE_DATA
};
struct pios_exbus_state {
uint16_t channel_data[PIOS_EXBUS_NUM_INPUTS];
uint8_t received_data[EXBUS_MAX_FRAME_LENGTH];
uint8_t receive_timer;
uint8_t failsafe_timer;
uint8_t failsafe_count;
uint8_t byte_count;
uint8_t frame_length;
uint16_t crc;
bool high_baud_rate;
bool frame_found;
};
struct pios_exbus_dev {
enum pios_exbus_dev_magic magic;
uint32_t com_port_id;
const struct pios_com_driver *driver;
struct pios_exbus_state state;
};
/* Allocate EXBUS device descriptor */
#if defined(PIOS_INCLUDE_FREERTOS)
static struct pios_exbus_dev *PIOS_EXBUS_Alloc(void)
{
struct pios_exbus_dev *exbus_dev;
exbus_dev = (struct pios_exbus_dev *)pios_malloc(sizeof(*exbus_dev));
if (!exbus_dev)
return NULL;
exbus_dev->magic = PIOS_EXBUS_DEV_MAGIC;
return exbus_dev;
}
#else
static struct pios_exbus_dev pios_exbus_devs[PIOS_EXBUS_MAX_DEVS];
static uint8_t pios_exbus_num_devs;
static struct pios_exbus_dev *PIOS_EXBUS_Alloc(void)
{
struct pios_exbus_dev *exbus_dev;
if (pios_exbus_num_devs >= PIOS_EXBUS_MAX_DEVS)
return NULL;
exbus_dev = &pios_exbus_devs[pios_exbus_num_devs++];
exbus_dev->magic = PIOS_EXBUS_DEV_MAGIC;
return exbus_dev;
}
#endif
/* Validate EXBUS device descriptor */
static bool PIOS_EXBUS_Validate(struct pios_exbus_dev *exbus_dev)
{
return (exbus_dev->magic == PIOS_EXBUS_DEV_MAGIC);
}
/* Reset channels in case of lost signal or explicit failsafe receiver flag */
static void PIOS_EXBUS_ResetChannels(struct pios_exbus_dev *exbus_dev)
{
struct pios_exbus_state *state = &(exbus_dev->state);
for (int i = 0; i < PIOS_EXBUS_NUM_INPUTS; i++) {
state->channel_data[i] = PIOS_RCVR_TIMEOUT;
}
}
/* Reset EXBUS receiver state */
static void PIOS_EXBUS_ResetState(struct pios_exbus_dev *exbus_dev)
{
struct pios_exbus_state *state = &(exbus_dev->state);
state->receive_timer = 0;
state->failsafe_timer = 0;
state->failsafe_count = 0;
state->high_baud_rate = false;
state->frame_found = false;
PIOS_EXBUS_ResetChannels(exbus_dev);
}
/**
* Check and unroll complete frame data.
* \output 0 frame data accepted
* \output -1 frame error found
*/
static int PIOS_EXBUS_UnrollChannels(struct pios_exbus_dev *exbus_dev)
{
struct pios_exbus_state *state = &(exbus_dev->state);
if(state->crc != 0) {
/* crc failed */
DEBUG_PRINTF(2, "Jeti CRC error!%d\r\n");
return -1;
}
enum pios_exbus_frame_state exbus_state = EXBUS_STATE_SYNC;
uint8_t *byte = state->received_data;
uint8_t sub_length;
uint8_t n_channels = 0;
uint8_t channel = 0;
while((byte - state->received_data) < state->frame_length) {
switch(exbus_state) {
case EXBUS_STATE_SYNC:
/* sync byte */
if(*byte == EXBUS_SYNC_CHANNEL) {
exbus_state = EXBUS_STATE_REQ;
}
else {
return -1;
}
byte += sizeof(uint8_t);
break;
case EXBUS_STATE_REQ:
/*
* tells us whether the rx is requesting a reply or not,
* currently nothing is actually done with this information...
*/
if(*byte == EXBUS_BYTE_REQ) {
exbus_state = EXBUS_STATE_LEN;
}
else if(*byte == EXBUS_BYTE_NOREQ) {
exbus_state = EXBUS_STATE_LEN;
}
else {
return -1;
}
byte += sizeof(uint8_t);
break;
case EXBUS_STATE_LEN:
/* total frame length */
exbus_state = EXBUS_STATE_PACKET_ID;
byte += sizeof(uint8_t);
break;
case EXBUS_STATE_PACKET_ID:
/* packet id */
exbus_state = EXBUS_STATE_DATA_ID;
byte += sizeof(uint8_t);
break;
case EXBUS_STATE_DATA_ID:
/* checks the type of data, ignore non-rc data */
if(*byte == EXBUS_DATA_CHANNEL) {
exbus_state = EXBUS_STATE_SUBLEN;
}
else {
return -1;
}
byte += sizeof(uint8_t);
break;
case EXBUS_STATE_SUBLEN:
sub_length = *byte;
n_channels = sub_length / 2;
exbus_state = EXBUS_STATE_DATA;
byte += sizeof(uint8_t);
break;
case EXBUS_STATE_DATA:
if(channel < n_channels) {
/* 1 lsb = 1/8 us */
state->channel_data[channel++] = (byte[1] << 8 | byte[0]) / 8;
}
byte += sizeof(uint16_t);
break;
}
}
return 0;
}
/* Update decoder state processing input byte from the stream */
static void PIOS_EXBUS_UpdateState(struct pios_exbus_dev *exbus_dev, uint8_t byte)
{
struct pios_exbus_state *state = &(exbus_dev->state);
if(!state->frame_found) {
if(byte == EXBUS_SYNC_CHANNEL) {
state->frame_found = true;
state->byte_count = 0;
state->frame_length = EXBUS_MAX_FRAME_LENGTH;
state->crc = PIOS_EXBUS_CRC_Update(0, byte);
state->received_data[state->byte_count++] = byte;
}
}
else if(state->byte_count < EXBUS_MAX_FRAME_LENGTH) {
state->crc = PIOS_EXBUS_CRC_Update(state->crc, byte);
state->received_data[state->byte_count++] = byte;
if(state->byte_count == 3) {
state->frame_length = byte;
}
if(state->byte_count == state->frame_length) {
if (!PIOS_EXBUS_UnrollChannels(exbus_dev)) {
/* data looking good */
state->failsafe_timer = 0;
state->failsafe_count = 0;
}
/* get ready for the next frame */
state->frame_found = false;
}
}
else {
state->frame_found = false;
}
}
/* Initialise EX Bus receiver interface */
int32_t PIOS_EXBUS_Init(uint32_t *exbus_id,
const struct pios_com_driver *driver,
uint32_t lower_id)
{
PIOS_DEBUG_Assert(exbus_id);
PIOS_DEBUG_Assert(driver);
struct pios_exbus_dev *exbus_dev;
exbus_dev = (struct pios_exbus_dev *)PIOS_EXBUS_Alloc();
if (!exbus_dev)
return -1;
PIOS_EXBUS_ResetState(exbus_dev);
*exbus_id = (uint32_t)exbus_dev;
/* Set comm driver callback */
(driver->bind_rx_cb)(lower_id, PIOS_EXBUS_RxInCallback, *exbus_id);
if (!PIOS_RTC_RegisterTickCallback(PIOS_EXBUS_Supervisor, *exbus_id)) {
PIOS_DEBUG_Assert(0);
}
exbus_dev->driver = driver;
exbus_dev->com_port_id = lower_id;
return 0;
}
/* Comm byte received callback */
static uint16_t PIOS_EXBUS_RxInCallback(uint32_t context,
uint8_t *buf,
uint16_t buf_len,
uint16_t *headroom,
bool *need_yield)
{
struct pios_exbus_dev *exbus_dev = (struct pios_exbus_dev *)context;
bool valid = PIOS_EXBUS_Validate(exbus_dev);
PIOS_Assert(valid);
/* process byte(s) and clear receive timer */
for (uint8_t i = 0; i < buf_len; i++) {
PIOS_EXBUS_UpdateState(exbus_dev, buf[i]);
exbus_dev->state.receive_timer = 0;
}
/* Always signal that we can accept more data */
if (headroom)
*headroom = EXBUS_MAX_FRAME_LENGTH;
/* We never need a yield */
*need_yield = false;
/* Always indicate that all bytes were consumed */
return buf_len;
}
/**
* Get the value of an input channel
* \param[in] channel Number of the channel desired (zero based)
* \output PIOS_RCVR_INVALID channel not available
* \output PIOS_RCVR_TIMEOUT failsafe condition or missing receiver
* \output >=0 channel value
*/
static int32_t PIOS_EXBUS_Get(uint32_t rcvr_id, uint8_t channel)
{
struct pios_exbus_dev *exbus_dev = (struct pios_exbus_dev *)rcvr_id;
if (!PIOS_EXBUS_Validate(exbus_dev))
return PIOS_RCVR_INVALID;
/* return error if channel is not available */
if (channel >= PIOS_EXBUS_NUM_INPUTS)
return PIOS_RCVR_INVALID;
/* may also be PIOS_RCVR_TIMEOUT set by other function */
return exbus_dev->state.channel_data[channel];
}
static void PIOS_EXBUS_Change_BaudRate(struct pios_exbus_dev *device) {
struct pios_exbus_state *state = &(device->state);
if (++state->failsafe_count >= EXBUS_BAUD_RATE_LIMIT) {
state->high_baud_rate = !state->high_baud_rate;
(device->driver->set_baud) (device->com_port_id,
state->high_baud_rate ? EXBUS_HIGH_BAUD_RATE : EXBUS_LOW_BAUD_RATE);
state->failsafe_count = 0;
}
}
/**
* Input data supervisor is called periodically and provides
* two functions: frame syncing and failsafe triggering.
*
* EX.Bus frames come at 20ms or 10ms rate at 125 or 250 kbaud.
* RTC timer is running at 625Hz (1.6ms). So with divider 5 it gives
* 8ms pause between frames which is good for both EX.Bus frame rates.
*
* Data receive function must clear the receive_timer to confirm new
* data reception. If no new data received in 100ms, we must call the
* failsafe function which clears all channels.
*/
static void PIOS_EXBUS_Supervisor(uint32_t exbus_id)
{
struct pios_exbus_dev *exbus_dev = (struct pios_exbus_dev *)exbus_id;
bool valid = PIOS_EXBUS_Validate(exbus_dev);
PIOS_Assert(valid);
struct pios_exbus_state *state = &(exbus_dev->state);
/* waiting for new frame if no bytes were received in 8ms */
if (++state->receive_timer > 4) {
state->frame_found = false;
state->byte_count = 0;
state->receive_timer = 0;
state->frame_length = EXBUS_MAX_FRAME_LENGTH;
}
/* activate failsafe if no frames have arrived in 102.4ms */
if (++state->failsafe_timer > 64) {
PIOS_EXBUS_ResetChannels(exbus_dev);
state->failsafe_timer = 0;
PIOS_EXBUS_Change_BaudRate(exbus_dev);
}
}
static uint16_t PIOS_EXBUS_CRC_Update(uint16_t crc, uint8_t data)
{
data ^= (uint8_t)crc & (uint8_t)0xFF;
data ^= data << 4;
crc = ((((uint16_t)data << 8) | ((crc & 0xFF00) >> 8))
^ (uint8_t)(data >> 4) ^ ((uint16_t)data << 3));
return crc;
}
#endif /* PIOS_INCLUDE_EXBUS */
/**
* @}
* @}
*/

43
flight/pios/inc/pios_exbus.h Normal file
View File

@ -0,0 +1,43 @@
/**
******************************************************************************
* @addtogroup PIOS PIOS Core hardware abstraction layer
* @{
* @addtogroup PIOS_SBus Futaba S.Bus receiver functions
* @{
*
* @file pios_sbus.h
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
* Tau Labs, http://taulabs.org, Copyright (C) 2013
* @brief Futaba S.Bus functions header.
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef PIOS_EXBUS_H
#define PIOS_EXBUS_H
/* Global Types */
/* Public Functions */
#endif /* PIOS_EXBUS_H */
/**
* @}
* @}
*/

47
flight/pios/inc/pios_exbus_priv.h Normal file
View File

@ -0,0 +1,47 @@
/**
******************************************************************************
* @file pios_exbus_priv.h
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
* Tau Labs, http://taulabs.org, Copyright (C) 2013
* @addtogroup PIOS PIOS Core hardware abstraction layer
* @{
* @addtogroup PIOS_EXBUS Jeti EX Bus receiver functions
* @{
* @brief Jeti EX Bus receiver functions
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef PIOS_EXBUS_PRIV_H
#define PIOS_EXBUS_PRIV_H
#include <pios.h>
#include <pios_usart_priv.h>
/* EXBUS receiver instance configuration */
extern const struct pios_rcvr_driver pios_exbus_rcvr_driver;
extern int32_t PIOS_EXBUS_Init(uint32_t *exbus_id,
const struct pios_com_driver *driver,
uint32_t lower_id);
#endif /* PIOS_EXBUS_PRIV_H */
/**
* @}
* @}
*/

44
flight/targets/boards/coptercontrol/board_hw_defs.c
View File

@ -1062,9 +1062,51 @@ static const struct pios_usart_cfg pios_usart_hott_flexi_cfg = {
},
},
};
#endif /* PIOS_INCLUDE_HOTT */
#if defined(PIOS_INCLUDE_EXBUS)
/*
* EXBUS USART
*/
#include <pios_exbus_priv.h>
static const struct pios_usart_cfg pios_usart_exbus_flexi_cfg = {
.regs = USART3,
.init = {
.USART_BaudRate = 125000,
.USART_WordLength = USART_WordLength_8b,
.USART_Parity = USART_Parity_No,
.USART_StopBits = USART_StopBits_1,
.USART_HardwareFlowControl = USART_HardwareFlowControl_None,
.USART_Mode = USART_Mode_Rx,
},
.irq = {
.init = {
.NVIC_IRQChannel = USART3_IRQn,
.NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_HIGH,
.NVIC_IRQChannelSubPriority = 0,
.NVIC_IRQChannelCmd = ENABLE,
},
},
.rx = {
.gpio = GPIOB,
.init = {
.GPIO_Pin = GPIO_Pin_11,
.GPIO_Speed = GPIO_Speed_2MHz,
.GPIO_Mode = GPIO_Mode_IPU,
},
},
.tx = {
.gpio = GPIOB,
.init = {
.GPIO_Pin = GPIO_Pin_10,
.GPIO_Speed = GPIO_Speed_2MHz,
.GPIO_Mode = GPIO_Mode_IN_FLOATING,
},
},
};
#endif /* PIOS_INCLUDE_EXBUS */
#if defined(PIOS_INCLUDE_SRXL)
/*
* SRXL USART

1
flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
View File

@ -101,6 +101,7 @@
#define PIOS_INCLUDE_PPM_FLEXI
#define PIOS_INCLUDE_DSM
#define PIOS_INCLUDE_SBUS
#define PIOS_INCLUDE_EXBUS
#define PIOS_INCLUDE_SRXL
#define PIOS_INCLUDE_HOTT
/* #define PIOS_INCLUDE_GCSRCVR */

22
flight/targets/boards/coptercontrol/firmware/pios_board.c
View File

@ -698,6 +698,28 @@ void PIOS_Board_Init(void)
}
#endif /* PIOS_INCLUDE_HOTT */
break;
case HWSETTINGS_CC_FLEXIPORT_EXBUS:
#if defined(PIOS_INCLUDE_EXBUS)
{
uint32_t pios_usart_exbus_id;
if (PIOS_USART_Init(&pios_usart_exbus_id, &pios_usart_exbus_flexi_cfg)) {
PIOS_Assert(0);
}
uint32_t pios_exbus_id;
if (PIOS_EXBUS_Init(&pios_exbus_id, &pios_usart_com_driver, pios_usart_exbus_id)) {
PIOS_Assert(0);
}
uint32_t pios_exbus_rcvr_id;
if (PIOS_RCVR_Init(&pios_exbus_rcvr_id, &pios_exbus_rcvr_driver, pios_exbus_id)) {
PIOS_Assert(0);
}
pios_rcvr_group_map[MANUALCONTROLSETTINGS_CHANNELGROUPS_EXBUS] = pios_exbus_rcvr_id;
}
#endif /* PIOS_INCLUDE_EXBUS */
break;
case HWSETTINGS_CC_FLEXIPORT_SRXL:
#if defined(PIOS_INCLUDE_SRXL)

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

@ -254,6 +254,12 @@ extern uint32_t pios_com_hkosd_id;
#define PIOS_HOTT_MAX_DEVS 1
#define PIOS_HOTT_NUM_INPUTS 32
// -------------------------
// Receiver EX.Bus input
// -------------------------
#define PIOS_EXBUS_MAX_DEVS 1
#define PIOS_EXBUS_NUM_INPUTS 16
// -------------------------
// Receiver Multiplex SRXL input
// -------------------------

51
flight/targets/boards/revolution/board_hw_defs.c
View File

@ -1055,6 +1055,7 @@ static const struct pios_usart_cfg pios_usart_srxl_flexi_cfg = {
};
#endif /* PIOS_INCLUDE_SRXL */
#if defined(PIOS_INCLUDE_HOTT)
/*
* HOTT USART
@ -1103,6 +1104,56 @@ static const struct pios_usart_cfg pios_usart_hott_flexi_cfg = {
};
#endif /* PIOS_INCLUDE_HOTT */
#if defined(PIOS_INCLUDE_EXBUS)
/*
* EXBUS USART
*/
#include <pios_exbus_priv.h>
static const struct pios_usart_cfg pios_usart_exbus_flexi_cfg = {
.regs = USART3,
.remap = GPIO_AF_USART3,
.init = {
.USART_BaudRate = 125000,
.USART_WordLength = USART_WordLength_8b,
.USART_Parity = USART_Parity_No,
.USART_StopBits = USART_StopBits_1,
.USART_HardwareFlowControl = USART_HardwareFlowControl_None,
.USART_Mode = USART_Mode_Rx,
},
.irq = {
.init = {
.NVIC_IRQChannel = USART3_IRQn,
.NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_HIGH,
.NVIC_IRQChannelSubPriority = 0,
.NVIC_IRQChannelCmd = ENABLE,
},
},
.rx = {
.gpio = GPIOB,
.init = {
.GPIO_Pin = GPIO_Pin_11,
.GPIO_Speed = GPIO_Speed_2MHz,
.GPIO_Mode = GPIO_Mode_AF,
.GPIO_OType = GPIO_OType_PP,
.GPIO_PuPd = GPIO_PuPd_UP
},
},
.tx = {
.gpio = GPIOB,
.init = {
.GPIO_Pin = GPIO_Pin_10,
.GPIO_Speed = GPIO_Speed_2MHz,
.GPIO_Mode = GPIO_Mode_OUT,
.GPIO_OType = GPIO_OType_PP,
.GPIO_PuPd = GPIO_PuPd_UP
},
},
};
#endif /* PIOS_INCLUDE_EXBUS */
/*
* HK OSD
*/

1
flight/targets/boards/revolution/firmware/inc/pios_config.h
View File

@ -106,6 +106,7 @@
#define PIOS_INCLUDE_SBUS
#define PIOS_INCLUDE_SRXL
#define PIOS_INCLUDE_HOTT
#define PIOS_INCLUDE_EXBUS
#define PIOS_INCLUDE_GCSRCVR
#define PIOS_INCLUDE_OPLINKRCVR

26
flight/targets/boards/revolution/firmware/pios_board.c
View File

@ -500,6 +500,7 @@ void PIOS_Board_Init(void)
case HWSETTINGS_RM_FLEXIPORT_OSDHK:
PIOS_Board_configure_com(&pios_usart_hkosd_flexi_cfg, PIOS_COM_HKOSD_RX_BUF_LEN, PIOS_COM_HKOSD_TX_BUF_LEN, &pios_usart_com_driver, &pios_com_hkosd_id);
break;
case HWSETTINGS_RM_FLEXIPORT_SRXL:
#if defined(PIOS_INCLUDE_SRXL)
{
@ -519,8 +520,9 @@ void PIOS_Board_Init(void)
}
pios_rcvr_group_map[MANUALCONTROLSETTINGS_CHANNELGROUPS_SRXL] = pios_srxl_rcvr_id;
}
#endif
#endif /* PIOS_INCLUDE_SRXL */
break;
case HWSETTINGS_RM_FLEXIPORT_HOTTSUMD:
case HWSETTINGS_RM_FLEXIPORT_HOTTSUMH:
#if defined(PIOS_INCLUDE_HOTT)
@ -545,6 +547,28 @@ void PIOS_Board_Init(void)
#endif /* PIOS_INCLUDE_HOTT */
break;
case HWSETTINGS_RM_FLEXIPORT_EXBUS:
#if defined(PIOS_INCLUDE_EXBUS)
{
uint32_t pios_usart_exbus_id;
if (PIOS_USART_Init(&pios_usart_exbus_id, &pios_usart_exbus_flexi_cfg)) {
PIOS_Assert(0);
}
uint32_t pios_exbus_id;
if (PIOS_EXBUS_Init(&pios_exbus_id, &pios_usart_com_driver, pios_usart_exbus_id)) {
PIOS_Assert(0);
}
uint32_t pios_exbus_rcvr_id;
if (PIOS_RCVR_Init(&pios_exbus_rcvr_id, &pios_exbus_rcvr_driver, pios_exbus_id)) {
PIOS_Assert(0);
}
pios_rcvr_group_map[MANUALCONTROLSETTINGS_CHANNELGROUPS_EXBUS] = pios_exbus_rcvr_id;
}
#endif /* PIOS_INCLUDE_EXBUS */
break;
} /* hwsettings_rm_flexiport */
/* Moved this here to allow binding on flexiport */

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

@ -264,6 +264,12 @@ extern uint32_t pios_packet_handler;
#define PIOS_HOTT_MAX_DEVS 1
#define PIOS_HOTT_NUM_INPUTS 32
// -------------------------
// Receiver EX.Bus input
// -------------------------
#define PIOS_EXBUS_MAX_DEVS 1
#define PIOS_EXBUS_NUM_INPUTS 16
// -------------------------
// Receiver Multiplex SRXL input
// -------------------------

50
flight/targets/boards/revonano/board_hw_defs.c
View File

@ -633,6 +633,56 @@ static const struct pios_usart_cfg pios_usart_srxl_flexi_cfg = {
};
#endif /* PIOS_INCLUDE_SRXL */
#if defined(PIOS_INCLUDE_EXBUS)
/*
* EXBUS USART
*/
#include <pios_exbus_priv.h>
static const struct pios_usart_cfg pios_usart_exbus_flexi_cfg = {
.regs = FLEXI_USART_REGS,
.remap = FLEXI_USART_REMAP,
.init = {
.USART_BaudRate = 125000,
.USART_WordLength = USART_WordLength_8b,
.USART_Parity = USART_Parity_No,
.USART_StopBits = USART_StopBits_1,
.USART_HardwareFlowControl = USART_HardwareFlowControl_None,
.USART_Mode = USART_Mode_Rx,
},
.irq = {
.init = {
.NVIC_IRQChannel = FLEXI_USART_IRQ,
.NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_HIGH,
.NVIC_IRQChannelSubPriority = 0,
.NVIC_IRQChannelCmd = ENABLE,
},
},
.rx = {
.gpio = FLEXI_USART_RX_GPIO,
.init = {
.GPIO_Pin = FLEXI_USART_RX_PIN,
.GPIO_Speed = GPIO_Speed_2MHz,
.GPIO_Mode = GPIO_Mode_AF,
.GPIO_OType = GPIO_OType_PP,
.GPIO_PuPd = GPIO_PuPd_UP
},
},
.tx = {
.gpio = FLEXI_USART_TX_GPIO,
.init = {
.GPIO_Pin = FLEXI_USART_TX_PIN,
.GPIO_Speed = GPIO_Speed_2MHz,
.GPIO_Mode = GPIO_Mode_OUT,
.GPIO_OType = GPIO_OType_PP,
.GPIO_PuPd = GPIO_PuPd_UP
},
},
};
#endif /* PIOS_INCLUDE_EXBUS */
/*
* HK OSD
*/

1
flight/targets/boards/revonano/firmware/inc/pios_config.h
View File

@ -110,6 +110,7 @@
#define PIOS_INCLUDE_SBUS
#define PIOS_INCLUDE_SRXL
#define PIOS_INCLUDE_HOTT
#define PIOS_INCLUDE_EXBUS
#define PIOS_INCLUDE_GCSRCVR
// #define PIOS_INCLUDE_OPLINKRCVR

24
flight/targets/boards/revonano/firmware/pios_board.c
View File

@ -667,6 +667,7 @@ void PIOS_Board_Init(void)
}
#endif
break;
case HWSETTINGS_RM_FLEXIPORT_HOTTSUMD:
case HWSETTINGS_RM_FLEXIPORT_HOTTSUMH:
#if defined(PIOS_INCLUDE_HOTT)
@ -690,6 +691,29 @@ void PIOS_Board_Init(void)
}
#endif /* PIOS_INCLUDE_HOTT */
break;
case HWSETTINGS_RM_FLEXIPORT_EXBUS:
#if defined(PIOS_INCLUDE_EXBUS)
{
uint32_t pios_usart_exbus_id;
if (PIOS_USART_Init(&pios_usart_exbus_id, &pios_usart_exbus_flexi_cfg)) {
PIOS_Assert(0);
}
uint32_t pios_exbus_id;
if (PIOS_EXBUS_Init(&pios_exbus_id, &pios_usart_com_driver, pios_usart_exbus_id)) {
PIOS_Assert(0);
}
uint32_t pios_exbus_rcvr_id;
if (PIOS_RCVR_Init(&pios_exbus_rcvr_id, &pios_exbus_rcvr_driver, pios_exbus_id)) {
PIOS_Assert(0);
}
pios_rcvr_group_map[MANUALCONTROLSETTINGS_CHANNELGROUPS_EXBUS] = pios_exbus_rcvr_id;
}
#endif /* PIOS_INCLUDE_EXBUS */
break;
} /* hwsettings_rm_flexiport */

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

@ -264,6 +264,12 @@ extern uint32_t pios_packet_handler;
#define PIOS_HOTT_MAX_DEVS 1
#define PIOS_HOTT_NUM_INPUTS 32
// -------------------------
// Receiver EX.Bus input
// -------------------------
#define PIOS_EXBUS_MAX_DEVS 1
#define PIOS_EXBUS_NUM_INPUTS 16
// -------------------------
// Receiver Multiplex SRXL input
// -------------------------

1
ground/gcs/src/plugins/config/inputchannelform.cpp
View File

@ -159,6 +159,7 @@ void InputChannelForm::groupUpdated()
count = 18;
break;
case ManualControlSettings::CHANNELGROUPS_SRXL:
case ManualControlSettings::CHANNELGROUPS_JETIEXBUSFLEXIPORT:
count = 16;
break;
case ManualControlSettings::CHANNELGROUPS_HOTTFLEXIPORT:

6
shared/uavobjectdefinition/hwsettings.xml
View File

@ -3,8 +3,7 @@
<description>Selection of optional hardware configurations.</description>
<field name="CC_RcvrPort" units="function" type="enum" elements="1" options="Disabled+OneShot,PWM+NoOneShot,PPM+NoOneShot,PPM+PWM+NoOneShot,PPM+Outputs+NoOneShot,PPM_PIN8+OneShot, Outputs+OneShot" defaultvalue="PWM+NoOneShot"/>
<field name="CC_MainPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,S.Bus,DSM,DebugConsole,ComBridge,OsdHk" defaultvalue="Telemetry"/>
<field name="CC_FlexiPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,I2C,PPM,DSM,HoTT SUMD,HoTT SUMH,SRXL,DebugConsole,ComBridge,OsdHk" defaultvalue="Disabled"/>
<field name="CC_FlexiPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,I2C,PPM,DSM,EX.Bus,HoTT SUMD,HoTT SUMH,SRXL,DebugConsole,ComBridge,OsdHk" defaultvalue="Disabled"/>
<field name="RV_RcvrPort" units="function" type="enum" elements="1" options="Disabled,PWM,PPM,PPM+Outputs,Outputs" defaultvalue="PWM"/>
<field name="RV_AuxPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,DSM,ComAux,ComBridge,OsdHk" defaultvalue="Disabled"/>
<field name="RV_AuxSBusPort" units="function" type="enum" elements="1" options="Disabled,S.Bus,DSM,ComAux,ComBridge,OsdHk" defaultvalue="Disabled"/>
@ -16,8 +15,7 @@
defaultvalue="PWM"
limits="%0905NE:PPM+PWM:PPM+Telemetry:Telemetry:ComBridge;"/>
<field name="RM_MainPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,S.Bus,DSM,DebugConsole,ComBridge,OsdHk" defaultvalue="Disabled"/>
<field name="RM_FlexiPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,I2C,DSM,HoTT SUMD,HoTT SUMH,SRXL,DebugConsole,ComBridge,OsdHk" defaultvalue="Disabled"/>
<field name="RM_FlexiPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,I2C,DSM,EX.Bus,HoTT SUMD,HoTT SUMH,SRXL,DebugConsole,ComBridge,OsdHk" defaultvalue="Disabled"/>
<field name="TelemetrySpeed" units="bps" type="enum" elements="1" options="2400,4800,9600,19200,38400,57600,115200" defaultvalue="57600"/>
<field name="GPSSpeed" units="bps" type="enum" elements="1" options="2400,4800,9600,19200,38400,57600,115200,230400" defaultvalue="57600"/>
<field name="ComUsbBridgeSpeed" units="bps" type="enum" elements="1" options="2400,4800,9600,19200,38400,57600,115200" defaultvalue="57600"/>

2
shared/uavobjectdefinition/manualcontrolsettings.xml
View File

@ -3,7 +3,7 @@
<description>Settings to indicate how to decode receiver input by @ref ManualControlModule.</description>
<field name="ChannelGroups" units="Channel Group" type="enum"
elementnames="Throttle,Roll,Pitch,Yaw,FlightMode,Collective,Accessory0,Accessory1,Accessory2,Accessory3"
options="PWM,PPM,DSM (MainPort),DSM (FlexiPort),S.Bus,HoTT,SRXL,GCS,OPLink,None" defaultvalue="None"/>
options="PWM,PPM,DSM (MainPort),DSM (FlexiPort),S.Bus,EX.Bus,HoTT,SRXL,GCS,OPLink,None" defaultvalue="None"/>
<field name="ChannelNumber" units="channel" type="uint8" defaultvalue="0"
elementnames="Throttle,Roll,Pitch,Yaw,FlightMode,Collective,Accessory0,Accessory1,Accessory2,Accessory3"/>
<field name="ChannelMin" units="us" type="int16" defaultvalue="1000"

2
shared/uavobjectdefinition/receiveractivity.xml
View File

@ -2,7 +2,7 @@
<object name="ReceiverActivity" singleinstance="true" settings="false" category="System">
<description>Monitors which receiver channels have been active within the last second.</description>
<field name="ActiveGroup" units="Channel Group" type="enum" elements="1"
options="PWM,PPM,DSM (MainPort),DSM (FlexiPort),S.Bus,HoTT,SRXL,GCS,OPLink,None"
options="PWM,PPM,DSM (MainPort),DSM (FlexiPort),S.Bus,EX.Bus,HoTT,SRXL,GCS,OPLink,None"
defaultvalue="None"/>
<field name="ActiveChannel" units="channel" type="uint8" elements="1"
defaultvalue="255"/>